fix bug

yanyiqun001 · Dec 11, 2017 · 2168729 · 2168729
1 parent c17e58e
commit 2168729
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -34,8 +34,8 @@ module下添加依赖
 
    ```
 dependencies{
-         compile 'com.github.yanyiqun001.goRefresh:refreshlayout:0.6.1'
-         compile 'com.github.yanyiqun001.goRefresh:refreshlayout_lottie:0.6.1' (需要使用lottie动画时添加)
+         compile 'com.github.yanyiqun001.goRefresh:refreshlayout:0.6.2'
+         compile 'com.github.yanyiqun001.goRefresh:refreshlayout_lottie:0.6.2' (需要使用lottie动画时添加)
 }
  ```
 
@@ -209,28 +209,34 @@ dependencies{
 ```
     public class CustomFooter implements IFooterView {
         private LayoutInflater inflater;
+        private View mLoadingView;
+        private View mErrorview;
+        private View mFinishView;
         public CustomFooter(Context context) {
             inflater=LayoutInflater.from(context);
+            mErrorview=inflater.inflate(R.layout.footerview_error,null);
+            mLoadingView=inflater.inflate(R.layout.lottle_loading_animation_footer,null);
+            mFinishView=inflater.inflate(R.layout.footer_finish,null);
         }
     
         @Override
         public View getLoadingView() {
-            return inflater.inflate(R.layout.lottle_loading_animation_footer,null);
+            return mLoadingView;
         }
     
         @Override
         public View getFinishView() {
-            return inflater.inflate(R.layout.footer_finish,null);
+            return mFinishView;
         }
     
         @Override
         public View getFailureView() {
-            return inflater.inflate(R.layout.footer_error,null);
+            return mErrorview;
         }
     
         @Override
         public int getRetryId() {
-            return R.id.tips;
+            return R.id.tv_retry;
         }
     }
 ```

diff --git a/app/src/main/java/com/refreshDemo/CustomFooter.java b/app/src/main/java/com/refreshDemo/CustomFooter.java
@@ -12,28 +12,34 @@
 
 public class CustomFooter implements IFooterView {
     private LayoutInflater inflater;
+    private View mLoadingView;
+    private View mErrorview;
+    private View mFinishView;
     public CustomFooter(Context context) {
         inflater=LayoutInflater.from(context);
+        mErrorview=inflater.inflate(R.layout.footerview_error,null);
+        mLoadingView=inflater.inflate(R.layout.lottle_loading_animation_footer,null);
+        mFinishView=inflater.inflate(R.layout.footer_finish,null);
     }
 
     @Override
     public View getLoadingView() {
-        return inflater.inflate(R.layout.lottle_loading_animation_footer,null);
+        return mLoadingView;
     }
 
     @Override
     public View getFinishView() {
-        return inflater.inflate(R.layout.footer_finish,null);
+        return mFinishView;
     }
 
     @Override
     public View getFailureView() {
-        return inflater.inflate(R.layout.footer_error,null);
+        return mErrorview;
     }
 
     @Override
     public int getRetryId() {
-        return R.id.tips;
+        return R.id.tv_retry;
     }
 
 

diff --git a/app/src/main/java/com/refreshDemo/ListViewActivity.java b/app/src/main/java/com/refreshDemo/ListViewActivity.java
@@ -42,14 +42,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         if (list.size() >= 10) {
             goRefreshLayout.setHasFooter(true);
         }
-        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() {
             @Override
@@ -113,7 +109,7 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
 //                Toast.makeText(ListViewActivity.this, i + "", Toast.LENGTH_SHORT).show();
 //            }
 //        });
-
+        listView.setAdapter(adapter);
 
     }
 

diff --git a/app/src/main/res/layout/footerview_error.xml b/app/src/main/res/layout/footerview_error.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     >
     <TextView
-        android:id="@+id/tips"
+        android:id="@+id/tv_retry"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
         android:layout_gravity="center"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
     <string name="app_name">GoRefresh</string>
 
-    <string name="retry"><u>加载失败，请重试</u></string>
+    <string name="retry"><u>加载失败，点击重试</u></string>
 </resources>
diff --git a/refreshlayout/src/main/java/com/GoRefresh/GoRefreshLayout.java b/refreshlayout/src/main/java/com/GoRefresh/GoRefreshLayout.java
@@ -140,8 +140,6 @@ private void init(Context context, AttributeSet attrs) {
         duration_autotoRefreshHeight = typedArray.getInt(R.styleable.GoRefreshLayout_duration_autotoRefreshHeight, duration_autotoRefreshHeight);
         typedArray.recycle();
         mHeader = new DefaultHeaderLayout(context);
-        mFooter = new DefaultFooterView(context);
-
     }
 
 

diff --git a/refreshlayout/src/main/java/com/GoRefresh/LoadMoreHelper.java b/refreshlayout/src/main/java/com/GoRefresh/LoadMoreHelper.java
@@ -40,6 +40,8 @@ public void setHasFooter(boolean hasFooter, View contentView, IFooterView defaul
             if (hasFooter) {
                 if (mFooter == null) {
                     setFooterView(defaultFooterView, contentView);
+                }else{
+                    setFooterView();
                 }
             } else {
                 removeFooterView((ListView) contentView);
@@ -127,9 +129,11 @@ public void finishLoadMoreWithError(final View contentView) {
             }
         } else if (contentView instanceof ListView) {
             if (mFooterStatus != ERROR) {
-                View view = mFooter.getFailureView().findViewById(mFooter.getRetryId());
-                if (view != null) {
-                    view.setOnClickListener(new View.OnClickListener() {
+                switchFooterView((ListView) contentView, ERROR);
+                View errorView = mFooter.getFailureView();
+                View retryView= errorView.findViewById(mFooter.getRetryId());
+                if (retryView != null) {
+                    retryView.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
                             if (listener != null) {
@@ -141,7 +145,7 @@ public void onClick(View v) {
                         }
                     });
                 }
-                switchFooterView((ListView) contentView, ERROR);
+
             }
         }
     }

diff --git a/refreshlayout/src/main/res/layout/footer_error.xml b/refreshlayout/src/main/res/layout/footer_error.xml
@@ -10,6 +10,6 @@
         android:layout_height="40dp"
         android:layout_gravity="center"
         android:gravity="center"
-        android:text="加载失败请重试"
+        android:text="@string/string_gorefresh_retry"
         android:textColor="@android:color/holo_red_dark" />
 </LinearLayout>
diff --git a/refreshlayout/src/main/res/layout/footer_finish.xml b/refreshlayout/src/main/res/layout/footer_finish.xml
@@ -5,7 +5,7 @@
     android:gravity="center">
     <TextView
         android:gravity="center"
-        android:text="没有更多数据了"
+        android:text="@string/string_gorefresh_nomore"
         android:id="@+id/tips"
         android:layout_width="wrap_content"
         android:layout_height="40dp" />

diff --git a/refreshlayout/src/main/res/layout/footer_loading.xml b/refreshlayout/src/main/res/layout/footer_loading.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="40dp"
+    android:layout_height="wrap_content"
     android:gravity="center">
     <com.GoRefresh.weight.RingProgressBar
         android:id="@+id/progressbar"
@@ -17,6 +17,6 @@
         android:textColor="#9e9e9e"
         android:id="@+id/text"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
         android:text="@string/loadingtext"/>
 </LinearLayout>
diff --git a/refreshlayout/src/main/res/layout/headerview.xml b/refreshlayout/src/main/res/layout/headerview.xml
@@ -30,6 +30,6 @@
         android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
-        android:text="下拉刷新"
+        android:text="@string/pulltorefresh"
         android:textColor="#9e9e9e" />
 </LinearLayout>
diff --git a/refreshlayout/src/main/res/values/strings.xml b/refreshlayout/src/main/res/values/strings.xml
@@ -4,4 +4,6 @@
     <string name="release">释放刷新</string>
     <string name="pulltorefresh">下拉刷新</string>
     <string name="loading">正在加载</string>
+    <string name="string_gorefresh_retry">加载失败，点击重试</string>
+    <string name="string_gorefresh_nomore">没有更多数据了</string>
 </resources>