增加CZSuperAdapter的一个构造方法

XinYiWorld · May 26, 2017 · 51bec3d · 51bec3d
1 parent fa42a2b
commit 51bec3d
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 472 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/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java b/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java
@@ -28,8 +28,8 @@ public class CZSuperAdapter<T> extends ICRUDAdapter<T> implements IAddTypeMaker,
     private static final String TAG = "CZSuperAdapter";
     private RecyclerView recyclerView;
     private MultiTypeMaker mNormalTypeMaker;
-    private final LockObserver lockObserver;
-    private final TypeManager typeManager;
+    private  LockObserver lockObserver;
+    private  TypeManager typeManager;
 
     private CommonViewHolder.OnItemClickListener onItemClickListener;
     private CommonViewHolder.OnItemLongClickListener onItemLongClickListener;
@@ -40,6 +40,19 @@ public void onAttachedToRecyclerView(RecyclerView recyclerView) {
         this.recyclerView = recyclerView;
     }
 
+    //-----------将构造方法分为2部分，解决Cannot reference this before supertype constructor has been called的问题 -----------------------------------------------------------------------
+    public CZSuperAdapter(Context mContext) {
+        super(mContext);
+    }
+
+    public void setmNormalTypeMaker(MultiTypeMaker mNormalTypeMaker) {
+        this.mNormalTypeMaker = mNormalTypeMaker;
+        mNormalTypeMaker.setType(MultiTypeMaker.TYPE_NORMAL);
+        lockObserver = new LockObserver();                  //解决刷新与加载更多冲突
+        typeManager = new TypeManager();                    //管理视图
+    }
+    //----------------------------------------------------------------------------------
+
     //通过onAttachedToRecyclerView即可获得RecyclerView的引用 ，不需要传入RecyclerView参数，但兼容旧代码，不删除旧的构造方法。
     public CZSuperAdapter(Context mContext , MultiTypeMaker mNormalTypeMaker) {
         super(mContext);

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/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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <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" />
@@ -82,6 +74,14 @@
       <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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <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" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />