update commit

app/src/main/java/com/refreshDemo/CustomFooter.java

@@ -0,0 +1,37 @@
+package com.refreshDemo;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.GoRefresh.DefaultFooterView;
+
+/**
+ * Created by Administrator on 2017/11/24 0024.
+ * 这里继承了DefaultFooterView 也可直接实现IFooterView接口
+ */
+
+public class CustomFooter extends DefaultFooterView {
+    private LayoutInflater inflater;
+    public CustomFooter(Context context) {
+        super(context);
+        inflater=LayoutInflater.from(context);
+    }
+
+    @Override
+    public View getLoadingView() {
+        return inflater.inflate(R.layout.lottle_loading_animation_footer,null);
+    }
+
+    @Override
+    public View getFinishView() {
+        return super.getFinishView();
+    }
+
+    @Override
+    public View getFailureView() {
+        return super.getFailureView();
+    }
+
+
+}

app/src/main/java/com/refreshDemo/CustomHeader.java

@@ -7,7 +7,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.GoRefresh.IHeaderView;
+import com.GoRefresh.interfaces.IHeaderView;
 
 /**
  * Created by Administrator on 2017/11/5 0005.
@@ -29,7 +29,9 @@ public CustomHeader(Context context) {
         icon.setImageResource(R.drawable.arrow);
         icon.setVisibility(View.VISIBLE);
         progressBar.setVisibility(View.GONE);
-        mTextView.setText("下拉刷新");
+       // progressBar.setColors(R.color.red,R.color.colorAccent,R.color.red_comm_click,R.color.colorPrimary,R.color.defaultbg);
+        progressBar.setColor(R.color.colorAccent);
+        mTextView.setText(R.string.pulltorefresh);
     }
 
     @Override
@@ -49,10 +51,10 @@ public void onReady() {
     @Override
     public void onChange(boolean isPull) {
         if(isPull){//下拉经过临界点
-            mTextView.setText("松手刷新");
+            mTextView.setText(R.string.release);
             arrowUp();
         }else{ //上拉经过临界点
-            mTextView.setText("下拉刷新");
+            mTextView.setText(R.string.pulltorefresh);
             arrowDown();
         }
 
@@ -63,7 +65,7 @@ public void onRefresh() {
         progressBar.setVisibility(View.VISIBLE);
         progressBar.start();
         icon.setVisibility(View.GONE);
-        mTextView.setText("正在加载");
+        mTextView.setText(R.string.loading);
 
     }
 
@@ -86,7 +88,7 @@ private void arrowUp(){
 
 
     private void reset() {
-        mTextView.setText("下拉刷新");
+        mTextView.setText(R.string.pulltorefresh);
         progressBar.setVisibility(View.GONE);
         progressBar.stop();
         icon.setVisibility(View.VISIBLE);

app/src/main/java/com/refreshDemo/ListViewActivity.java

@@ -14,8 +14,8 @@
 import android.widget.TextView;
 
 import com.GoRefresh.GoRefreshLayout;
-import com.GoRefresh.LoadmoreListener;
-import com.GoRefresh.RefreshListener;
+import com.GoRefresh.interfaces.LoadMoreListener;
+import com.GoRefresh.interfaces.RefreshListener;
 import com.bumptech.glide.Glide;
 
 import java.util.ArrayList;
@@ -44,11 +44,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         }
         listView.setAdapter(adapter);
 
+        CustomFooter customFooter = new CustomFooter(this);
+        goRefreshLayout.setFooterView(customFooter);
+
         goRefreshLayout.setLoadingView(R.layout.footer_loading);
         goRefreshLayout.setErrorViewWithRetry(R.layout.footerview_error, R.id.tips);
 
         //下拉刷新
-        goRefreshLayout.setOnRefreshListener(    new RefreshListener() {
+        goRefreshLayout.setOnRefreshListener( new RefreshListener() {
             @Override
             public void onRefresh() {
                 new Handler().postDelayed(new Runnable() {
@@ -65,7 +68,7 @@ public void run() {
         });
         goRefreshLayout.startRefresh();
         //上拉加载
-        goRefreshLayout.setOnLoadmoreListener(new LoadmoreListener() {
+        goRefreshLayout.setOnLoadMoreListener(new LoadMoreListener() {
             @Override
             public void onLoadmore() {
                 new Handler().postDelayed(new Runnable() {

app/src/main/java/com/refreshDemo/LottieActivity.java

@@ -19,8 +19,9 @@
 
 import com.GoRefesh_core.LottieView;
 import com.GoRefresh.GoRefreshLayout;
-import com.GoRefresh.LoadmoreListener;
-import com.GoRefresh.RefreshListener;
+import com.GoRefresh.interfaces.LoadMoreListener;
+import com.GoRefresh.interfaces.RefreshListener;
+import com.GoRefresh.RvLoadMoreWrapper;
 import com.airbnb.lottie.LottieAnimationView;
 import com.bumptech.glide.Glide;
 
@@ -38,7 +39,7 @@ public class LottieActivity extends AppCompatActivity {
     private List<Integer> list = new ArrayList<>();
     private final int COUNT = 10;
     private LottieView lottieView;
-
+    private RvLoadMoreWrapper rvLoadMoreWrapper;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -50,13 +51,10 @@ protected void onCreate(Bundle savedInstanceState) {
         GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2);
         recyclerView.setLayoutManager(gridLayoutManager);
         adapter = new MyAdapter();
-        recyclerView.setAdapter(adapter);
-        addData();
 
         lottieView = new LottieView(this, R.layout.lottie_gift, R.id.animation_view);
         lottieView.setPullOriginProgress(1f);
         refreshLayout.setHeaderView(lottieView);
-
         refreshLayout.setOnRefreshListener(new RefreshListener() {
             @Override
             public void onRefresh() {
@@ -68,8 +66,13 @@ public void run() {
                 }, 4000);
             }
         });
+
         refreshLayout.setHasFooter(true);
-        refreshLayout.setOnLoadmoreListener(new LoadmoreListener() {
+        rvLoadMoreWrapper=refreshLayout.buildRvLoadMoreAdapter(adapter);
+        rvLoadMoreWrapper.setLoadingView(R.layout.lottle_loading_animation_footer);
+        recyclerView.setAdapter(rvLoadMoreWrapper);
+
+        refreshLayout.setOnLoadMoreListener(new LoadMoreListener() {
             @Override
             public void onLoadmore() {
                 new Handler().postDelayed(new Runnable() {
@@ -81,11 +84,13 @@ public void run() {
                 }, 2000);
             }
         });
+
+        addData();
     }
 
     private void addData() {
         DataSource.addData(list);
-        adapter.notifyItemRangeChanged(list.size() - COUNT, list.size());
+        rvLoadMoreWrapper.notifyItemRangeChanged(list.size() - COUNT, list.size());
     }
 
 
@@ -108,7 +113,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 lottieView = new MyLottileView(this, R.layout.lottie_oval, R.id.animation_view);
                 break;
             case R.id.item3: //截取指定部分动画
-                lottieView = new LottieView(this, R.layout.lottie_loading, R.id.animation_view);
+                lottieView = new MyLottileView(this, R.layout.lottie_loading, R.id.animation_view);
                 lottieView.setPullProgressRange(0f, 0.7f);  //设置下拉过程中动画变化范围（0f-1f）默认无动画
                 lottieView.setRefreshProgressRange(0.1f, 0.66f); //设置刷新过程中动画变化范围（0f-1f） 默认0f-1f
                 lottieView.setRefreshDuration(1200); //动画时长
@@ -131,7 +136,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.item6:
                 lottieView = new LottieView(this, R.layout.lottie_jump_loader, R.id.animation_view);
                 break;
-
             case R.id.item7:
                 lottieView = new LottieView(this, R.layout.lottie_simple, R.id.animation_view);
                 lottieView.setPullProgressRange(0f, 1f);
@@ -151,7 +155,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 lottieView.setRefreshProgressRange(0f, 0.5f);
                 lottieView.setPullOriginProgress(0.45f);
                 break;
-
         }
         refreshLayout.setHeaderView(lottieView);
         return true;