优化数据adapter

Yuanarcheannovice · Sep 11, 2018 · 00de16f · 00de16f
1 parent ae95c37
commit 00de16f
Show file tree

Hide file tree

Showing 24 changed files with 1,272 additions and 1,314 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Xadapter/Xadapter.iml b/Xadapter/Xadapter.iml
@@ -50,83 +50,76 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" 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/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/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
+      <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/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" name="android.arch.lifecycle:common:1.0.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
-    <orderEntry type="library" name="com.android.support:support-annotations:27.0.2@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test:rules-0.5" level="project" />
-    <orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-core-ui-27.0.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-compat-27.0.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test:runner-0.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:recyclerview-v7-27.0.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="javax.annotation:javax.annotation-api:1.2@jar" level="project" />
-    <orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-0.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
   </component>
 </module>
diff --git a/Xadapter/build.gradle b/Xadapter/build.gradle
@@ -5,7 +5,6 @@ group='com.github.Yuanarcheannovice'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion

diff --git a/Xadapter/src/main/java/com/xz/xadapter/XRvCommonAdapter.java b/Xadapter/src/main/java/com/xz/xadapter/XRvCommonAdapter.java
@@ -12,6 +12,7 @@
 /**
  * update by xz on 17/7/25.
  */
+@Deprecated
 public abstract class XRvCommonAdapter<T> extends XRvMultiItemTypeAdapter<T> {
 
     /**

diff --git a/Xadapter/src/main/java/com/xz/xadapter/XRvDataAdapter.java b/Xadapter/src/main/java/com/xz/xadapter/XRvDataAdapter.java
@@ -14,6 +14,7 @@
  * <p>
  * 此adapter，着重于 对于数据处理
  */
+@Deprecated
 public abstract class XRvDataAdapter<T> extends RecyclerView.Adapter<XRvViewHolder> {
 
     /**

diff --git a/Xadapter/src/main/java/com/xz/xadapter/XRvMultiItemTypeAdapter.java b/Xadapter/src/main/java/com/xz/xadapter/XRvMultiItemTypeAdapter.java
@@ -20,6 +20,7 @@
  * <p>
  * 此Adapter 拥有 添加Header，Footer，点击，长按，实现不同layout功能;
  */
+@Deprecated
 public class XRvMultiItemTypeAdapter<T> extends XRvDataAdapter<T> {
     protected Context mContext;
     protected XRvItemViewDelegateManager mItemViewDelegateManager;

diff --git a/Xadapter/src/main/java/com/xz/xadapter/XRvPureDataAdapter.java b/Xadapter/src/main/java/com/xz/xadapter/XRvPureDataAdapter.java
@@ -1,10 +1,11 @@
 package com.xz.xadapter;
 
+import android.support.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
  * @author xz
  * @date 2017/7/27 0027
  * 增加了纯净Adapter，的数据操作
@@ -26,14 +27,21 @@ public List<T> getDatas() {
     }
 
 
+    /**
+     * 一般使用 不带刷新
+     */
+    public void setDatas(@NonNull List<T> datas) {
+        setDatas(datas, false);
+    }
+
 
     /**
      * 数据替换 ，带刷新
      *
      * @param datas     数据
      * @param isRefresh 是否刷新
      */
-    public void setDatas(List<T> datas, boolean isRefresh) {
+    public void setDatas(@NonNull List<T> datas, boolean isRefresh) {
         if (datas == null) {
             return;
         }
@@ -49,62 +57,49 @@ public void setDatas(List<T> datas, boolean isRefresh) {
     }
 
     /**
-     * 一般使用 不带刷新
-     */
-    public void setDatas(List<T> datas) {
-        if (datas == null) {
-            return;
-        }
-        if (mDatas == null) {
-            mDatas = new ArrayList<>();
-        } else {
-            mDatas.clear();
-        }
-        this.mDatas.addAll(datas);
-    }
-
-    /**
-     * 数据集合增加数据 带刷新
+     * 增加一个data
      *
      * @param data      数据
      * @param isRefresh 是否刷新
      */
-    public void addDatas(List<T> data, boolean isRefresh) {
+    public void addData(T data, boolean isRefresh) {
         if (this.mDatas == null) {
             this.mDatas = new ArrayList<>();
-            this.mDatas.addAll(data);
+            this.mDatas.add(data);
             if (isRefresh) {
                 notifyDataSetChanged();
             }
         } else {
-            this.mDatas.addAll(data);
-            if(isRefresh) {
-                notifyItemRangeInserted(mDatas.size() - data.size(), data.size());
+            this.mDatas.add(data);
+            if (isRefresh) {
+                notifyItemRangeInserted(mDatas.size() - 1, 1);
             }
         }
     }
 
     /**
-     * 增加一个data
+     * 数据集合增加数据 带刷新
      *
      * @param data      数据
      * @param isRefresh 是否刷新
      */
-    public void addData(T data, boolean isRefresh) {
+    public void addDatas(List<T> data, boolean isRefresh) {
         if (this.mDatas == null) {
             this.mDatas = new ArrayList<>();
-            this.mDatas.add(data);
+            this.mDatas.addAll(data);
             if (isRefresh) {
                 notifyDataSetChanged();
             }
         } else {
-            this.mDatas.add(data);
-            if(isRefresh) {
-                notifyItemRangeInserted(mDatas.size() - 1, 1);
+            this.mDatas.addAll(data);
+            if (isRefresh) {
+                notifyItemRangeInserted(mDatas.size() - 1, data.size());
             }
         }
     }
 
+
+
     /**
      * 移除data
      *
@@ -136,6 +131,7 @@ public boolean removeData(int index) {
         if (mDatas != null && index >= 0) {
             if (index < mDatas.size()) {
                 mDatas.remove(index);
+                notifyItemRangeRemoved(index,1);
                 return true;
             } else {
                 return false;

diff --git a/Xadapter/src/main/java/com/xz/xadapter/xutil/XRvItemViewDelegate.java b/Xadapter/src/main/java/com/xz/xadapter/xutil/XRvItemViewDelegate.java
@@ -5,6 +5,7 @@
  * Created by zhy on 16/6/22.
  * 项目委托
  */
+@Deprecated
 public interface XRvItemViewDelegate<T>
 {
     //获取项目视图布局ID

diff --git a/Xadapter/src/main/java/com/xz/xadapter/xutil/XRvItemViewDelegateManager.java b/Xadapter/src/main/java/com/xz/xadapter/xutil/XRvItemViewDelegateManager.java
@@ -8,6 +8,7 @@
  *
  *
  */
+@Deprecated
 public class XRvItemViewDelegateManager<T> {
     SparseArrayCompat<XRvItemViewDelegate<T>> delegates = new SparseArrayCompat();
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
     /**
      * update by xz on 17/7/25.
      */
+    @Deprecated
     public abstract class XRvCommonAdapter<T> extends XRvMultiItemTypeAdapter<T> {
         /**
@@ Expand Down @@