修复刷新的一些bug

XinYiWorld · May 20, 2017 · ebd319a · ebd319a
1 parent 51b8b06
commit ebd319a
Show file tree

Hide file tree

Showing 20 changed files with 274 additions and 162 deletions.
diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/.gradle/2.14.1/taskArtifacts/cache.properties.lock
diff --git a/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/.gradle/2.14.1/taskArtifacts/fileHashes.bin
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin
diff --git a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin
diff --git a/...asks/_libary_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/...asks/_libary_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
diff --git a/...bary_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/...bary_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
diff --git a/.../tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.../tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
diff --git a/...tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/...tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
diff --git a/...samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/...samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
diff --git a/...amples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/...amples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
@@ -10,13 +10,22 @@
         sha1="debf30ce0a7560396b6235edef77e447006454c2">
         <dex dex="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\transforms\dex\debug\folders\1000\10\com.android.support-recyclerview-v7-23.3.0_067195f18b95e8375354eaab75ddc805bcfda521\classes.dex" />
     </item>
+    <item
+        is-multidex="true"
+        jar="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\incremental-classes\debug\instant-run-bootstrap.jar"
+        jumboMode="true"
+        optimize="true"
+        revision="25.0.1"
+        sha1="80c5630e1d3b8a7e0bce8e2839319479fc80c0b0">
+        <dex dex="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\transforms\dex\debug\folders\1000\10\instant-run-bootstrap_481909628a2c2acfebcbebf06629022aa21c6af0\classes.dex" />
+    </item>
     <item
         is-multidex="true"
         jar="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\incremental-runtime-classes\debug\instant-run.jar"
         jumboMode="true"
         optimize="true"
         revision="25.0.1"
-        sha1="b873dfdf30423ebb20181d97d64772807ad21937">
+        sha1="d8a1442e05e8e10607709e144ad2c89f0ae15490">
         <dex dex="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\transforms\dex\debug\folders\1000\10\instant-run_60d903a5ac4a67793fcd4d56d51422b5ef47640f\classes.dex" />
     </item>
     <item
@@ -46,15 +55,6 @@
         sha1="4da5a4d697d32497c6f85567a5112e62fdfd0676">
         <dex dex="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\transforms\dex\debug\folders\1000\10\internal_impl-23.3.0_327d204468bb6e0873099977df3d5631e66fde02\classes.dex" />
     </item>
-    <item
-        is-multidex="true"
-        jar="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\incremental-classes\debug\instant-run-bootstrap.jar"
-        jumboMode="true"
-        optimize="true"
-        revision="25.0.1"
-        sha1="4fb2dab7b9936fc91b1ef6bd798a3029e0a33485">
-        <dex dex="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\transforms\dex\debug\folders\1000\10\instant-run-bootstrap_481909628a2c2acfebcbebf06629022aa21c6af0\classes.dex" />
-    </item>
     <item
         is-multidex="true"
         jar="D:\DevWork\Code\Demos\QD\PublishedCode\CZSuperAdapter\samples\build\intermediates\exploded-aar\com.android.support\support-v4\23.3.0\jars\classes.jar"

diff --git a/libary/libary.iml b/libary/libary.iml
@@ -67,14 +67,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

diff --git a/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java b/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java
@@ -20,6 +20,8 @@
  *   复用多视图来实现刷新、加载更多、头、脚，最蛋痛的还是复用的问题。
  *  //TODO 复用的问题
  *    1》》使用setIsRecyclable(false)勉强可以解决复用的问题，但是影响性能。
+ * 3)在adapter里对recyclerView的item设置点击事件后，再对recyclerView本身设置touch事件时，捕捉不到Down这个action。
+ * 4）点击事件与刷新冲突（未解决）
  */
 
 public class CZSuperAdapter<T> extends ICRUDAdapter<T> implements IAddTypeMaker,IRemoveTypeMaker {
@@ -160,6 +162,8 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         switch (multiTypeMaker.getType()/*getViewHolderType(getItemViewType(position))*/){
             case MultiTypeMaker.TYPE_HEADER:        //头布局
                 multiTypeMaker = typeManager.getHeader(position - refreshControllerCount);
+                commonViewHolder.setOnItemClickListener(null,position - refreshControllerCount);
+                commonViewHolder.setOnItemLongClickListener(null,position - refreshControllerCount);
                 multiTypeMaker.bindViewHolder(commonViewHolder, multiTypeMaker.getData(), MultiTypeMaker.TYPE_HEADER, position - refreshControllerCount);
                 break;
             case MultiTypeMaker.TYPE_NORMAL:        //主体布局
@@ -169,20 +173,24 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 }
                 ((CommonViewHolder) holder).getParent().setVisibility(View.VISIBLE);
 
-                multiTypeMaker.bindViewHolder(commonViewHolder, mNormalData.get(normalViewStartPosition), multiTypeMaker.getType(normalViewStartPosition), normalViewStartPosition);
                 //绑定点击事件
                 if(onItemClickListener != null){
                     commonViewHolder.setOnItemClickListener(onItemClickListener,normalViewStartPosition);
                 }
                 if(onItemLongClickListener != null){
                     commonViewHolder.setOnItemLongClickListener(onItemLongClickListener,normalViewStartPosition);
                 }
+                multiTypeMaker.bindViewHolder(commonViewHolder, mNormalData.get(normalViewStartPosition), multiTypeMaker.getType(normalViewStartPosition), normalViewStartPosition);
                 break;
             case MultiTypeMaker.TYPE_FOOTER:        //脚布局 (有可能被主体数据利用了)
                 multiTypeMaker = typeManager.getFooter(position - mNormalData.size() - refreshControllerCount - headerCount);
+                commonViewHolder.setOnItemClickListener(null,position - mNormalData.size() - refreshControllerCount - headerCount);
+                commonViewHolder.setOnItemLongClickListener(null,position - mNormalData.size() - refreshControllerCount - headerCount);
                 multiTypeMaker.bindViewHolder(commonViewHolder,multiTypeMaker.getData(),MultiTypeMaker.TYPE_FOOTER,position - mNormalData.size() - refreshControllerCount - headerCount);
                 break;
             default:        //刷新或加载更多
+                commonViewHolder.setOnItemClickListener(null,position);
+                commonViewHolder.setOnItemLongClickListener(null,position);
                 multiTypeMaker.bindViewHolder(commonViewHolder, null, multiTypeMaker.getType(position), position);
                 break;
         }

diff --git a/libary/src/main/java/com/xinyi/czsuperadapter/type_maker/RefreshTypeMaker.java b/libary/src/main/java/com/xinyi/czsuperadapter/type_maker/RefreshTypeMaker.java
@@ -136,6 +136,8 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
                         } else {
                             if (mRefreshingState == RefreshingState.RELEASE_TO_REFRESH) {         //防止箭头反复旋转
                                 setRefreshingState(mRefreshingStateNode.set(RefreshingState.RELEASE_TO_REFRESH, RefreshingState.PULL_TO_REFRESH));
+                            }else if(mRefreshingState == RefreshingState.NONE){     //一定要加这个从NONE到PULL_TO_REFRESH刷新的状态转换
+                                setRefreshingState(mRefreshingStateNode.set(RefreshingState.NONE, RefreshingState.PULL_TO_REFRESH));
                             }
                         }
                         startY = currentY;  //注意起点的传递

diff --git a/samples/build.gradle b/samples/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "xinyi.com.samples"
-        minSdkVersion 9
+        minSdkVersion 12
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"

diff --git a/samples/samples.iml b/samples/samples.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

diff --git a/samples/src/main/java/xinyi/com/samples/MainActivity.java b/samples/src/main/java/xinyi/com/samples/MainActivity.java
@@ -13,6 +13,7 @@
 
 import com.xinyi.czsuperadapter.AVLoadingIndicatorView;
 import com.xinyi.czsuperadapter.interfaces.LoaderListener;
+import com.xinyi.czsuperadapter.interfaces.RefreshListener;
 import com.xinyi.czsuperadapter.main.CZSuperAdapter;
 import com.xinyi.czsuperadapter.main.CommonViewHolder;
 import com.xinyi.czsuperadapter.main.LoadController;
@@ -102,27 +103,27 @@ public boolean onItemLongClick(View convertView, int position) {
 //        recyclerView.requestLayout();
 
 
-//        refreshController = new RefreshController.Builder().setOnRefreshListener(new RefreshListener() {
-//            @Override
-//            public void onRefresh() {
-////                handler.postDelayed(new Runnable() {
-////                    @Override
-////                    public void run() {
-//                        refreshController.finishRefresh();
-////                    }
-////                }, 1000);
-//            }
-//
-//            @Override
-//            public void onPull(int distance) {
-//
-//            }
-//        })
-//                .setRefreshIndicatorStyle(AVLoadingIndicatorView.Pacman)
-//                .setRefreshIndicatorColor(Color.RED)
-//                .build().create();
-//
-//        mAdapter.setRefreshController(refreshController);
+        refreshController = new RefreshController.Builder().setOnRefreshListener(new RefreshListener() {
+            @Override
+            public void onRefresh() {
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        refreshController.finishRefresh();
+                    }
+                }, 1000);
+            }
+
+            @Override
+            public void onPull(int distance) {
+
+            }
+        })
+                .setRefreshIndicatorStyle(AVLoadingIndicatorView.Pacman)
+                .setRefreshIndicatorColor(Color.RED)
+                .build().create();
+
+        mAdapter.setRefreshController(refreshController);
 
 
         loadController = new LoadController.Builder().setOnLoaderListener(new LoaderListener() {

diff --git a/samples/src/main/res/layout/activity_main.xml b/samples/src/main/res/layout/activity_main.xml
@@ -11,5 +11,6 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rcv"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
+        android:layout_height="match_parent"
+        ></android.support.v7.widget.RecyclerView>
 </RelativeLayout>