diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/.gradle/2.14.1/taskArtifacts/cache.properties.lock index 02896ff..0e2d618 100644 Binary files a/.gradle/2.14.1/taskArtifacts/cache.properties.lock and b/.gradle/2.14.1/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/.gradle/2.14.1/taskArtifacts/fileHashes.bin index 2791056..cf464ed 100644 Binary files a/.gradle/2.14.1/taskArtifacts/fileHashes.bin and b/.gradle/2.14.1/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin index bd45c1a..2b87a15 100644 Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin index 0416a13..8140474 100644 Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin and b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin differ diff --git a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin index ce7e765..ba0fbbb 100644 Binary files a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin differ diff --git a/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 3eeb4bc..80bdc85 100644 Binary files a/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index 250f50c..200c756 100644 Binary files a/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/2.14.1/tasks/_libary_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin index a0854c9..f72fdbc 100644 Binary files a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ diff --git a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index e4c661b..e5bba16 100644 Binary files a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin index c023161..acfcf8a 100644 Binary files a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ diff --git a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index d820af7..720d8ce 100644 Binary files a/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/2.14.1/tasks/_samples_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.idea/libraries/animated_vector_drawable_25_1_0.xml b/.idea/libraries/animated_vector_drawable_25_1_0.xml deleted file mode 100644 index 4dc3af2..0000000 --- a/.idea/libraries/animated_vector_drawable_25_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_25_1_0.xml b/.idea/libraries/appcompat_v7_25_1_0.xml deleted file mode 100644 index 6a7b39d..0000000 --- a/.idea/libraries/appcompat_v7_25_1_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml deleted file mode 100644 index ca045a6..0000000 --- a/.idea/libraries/espresso_core_2_2_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml deleted file mode 100644 index 9500d9c..0000000 --- a/.idea/libraries/espresso_idling_resource_2_2_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml deleted file mode 100644 index 9cb124c..0000000 --- a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml deleted file mode 100644 index 157e3f3..0000000 --- a/.idea/libraries/hamcrest_core_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/hamcrest_integration_1_3.xml b/.idea/libraries/hamcrest_integration_1_3.xml deleted file mode 100644 index bab4b95..0000000 --- a/.idea/libraries/hamcrest_integration_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/hamcrest_library_1_3.xml deleted file mode 100644 index 923d5fc..0000000 --- a/.idea/libraries/hamcrest_library_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/javawriter_2_1_1.xml b/.idea/libraries/javawriter_2_1_1.xml deleted file mode 100644 index a66fefb..0000000 --- a/.idea/libraries/javawriter_2_1_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/javax_annotation_api_1_2.xml b/.idea/libraries/javax_annotation_api_1_2.xml deleted file mode 100644 index 811e73f..0000000 --- a/.idea/libraries/javax_annotation_api_1_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/javax_inject_1.xml b/.idea/libraries/javax_inject_1.xml deleted file mode 100644 index eebeedd..0000000 --- a/.idea/libraries/javax_inject_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/jsr305_2_0_1.xml b/.idea/libraries/jsr305_2_0_1.xml deleted file mode 100644 index cdf9878..0000000 --- a/.idea/libraries/jsr305_2_0_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml deleted file mode 100644 index 305df30..0000000 --- a/.idea/libraries/junit_4_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml deleted file mode 100644 index b25e1c7..0000000 --- a/.idea/libraries/rules_0_5.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml deleted file mode 100644 index 22e8d8e..0000000 --- a/.idea/libraries/runner_0_5.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_compat_25_1_0.xml b/.idea/libraries/support_compat_25_1_0.xml index a47bbf1..7e5c771 100644 --- a/.idea/libraries/support_compat_25_1_0.xml +++ b/.idea/libraries/support_compat_25_1_0.xml @@ -2,7 +2,6 @@ - @@ -11,7 +10,6 @@ - \ No newline at end of file diff --git a/.idea/libraries/support_core_ui_25_1_0.xml b/.idea/libraries/support_core_ui_25_1_0.xml index 3587ccb..8e1fc1c 100644 --- a/.idea/libraries/support_core_ui_25_1_0.xml +++ b/.idea/libraries/support_core_ui_25_1_0.xml @@ -2,7 +2,6 @@ - @@ -11,7 +10,6 @@ - \ No newline at end of file diff --git a/.idea/libraries/support_core_utils_25_1_0.xml b/.idea/libraries/support_core_utils_25_1_0.xml deleted file mode 100644 index 90be36b..0000000 --- a/.idea/libraries/support_core_utils_25_1_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_fragment_25_1_0.xml b/.idea/libraries/support_fragment_25_1_0.xml deleted file mode 100644 index ae3f048..0000000 --- a/.idea/libraries/support_fragment_25_1_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_media_compat_25_1_0.xml b/.idea/libraries/support_media_compat_25_1_0.xml deleted file mode 100644 index b4fa119..0000000 --- a/.idea/libraries/support_media_compat_25_1_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_25_1_0.xml b/.idea/libraries/support_v4_25_1_0.xml deleted file mode 100644 index 118f80e..0000000 --- a/.idea/libraries/support_v4_25_1_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_25_1_0.xml b/.idea/libraries/support_vector_drawable_25_1_0.xml deleted file mode 100644 index 345a76c..0000000 --- a/.idea/libraries/support_vector_drawable_25_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 78fb392..e147302 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,10 @@ + + + + + @@ -18,18 +23,15 @@ - - - - - + + @@ -37,13 +39,25 @@ + - + + + + + + + + + + + + @@ -64,6 +78,13 @@ + + + + + + + @@ -71,24 +92,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + @@ -303,11 +379,6 @@ @@ -2989,13 +3097,13 @@ - + - + @@ -3004,7 +3112,7 @@ - + @@ -3023,6 +3131,10 @@ + + + @@ -3056,6 +3168,7 @@ + @@ -3063,29 +3176,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - + + + + - - + + - - + + diff --git a/build.gradle b/build.gradle index 4b72db8..780d2e1 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ allprojects { repositories { jcenter() mavenCentral() + maven { url 'https://jitpack.io' } } } diff --git a/build/generated/mockable-android-23.jar b/build/generated/mockable-android-23.jar index 0ad2e13..1b3c4c7 100644 Binary files a/build/generated/mockable-android-23.jar and b/build/generated/mockable-android-23.jar differ diff --git a/build/generated/mockable-android-25.jar b/build/generated/mockable-android-25.jar index b731bb6..3c00e1e 100644 Binary files a/build/generated/mockable-android-25.jar and b/build/generated/mockable-android-25.jar differ diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index 0427800..9361cbf 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -3,30 +3,12 @@ - - - - - - - + sha1="e9b63380f3a242dbdbf103a2355ad7e43bad17cb"> + - + sha1="aee64634871d88a419d59eb743c1258a60f19700"> + + sha1="0aa03cab2c1e8a0cf4bb2ad5dca2c69a343b6e56"> - - - - - - - - - - - - - - - - + sha1="64cb6b229a8bdfd907bc8dd46839a0053e4c018d"> + - + sha1="ca3c7aa31e2726a400a6e552b93cb9f63c9a1e6d"> + - + sha1="172d0cdeb8587c1f669d481c73305751523e260f"> + diff --git a/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java b/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java index f4ce232..7fa7b85 100644 --- a/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java +++ b/libary/src/main/java/com/xinyi/czsuperadapter/main/CZSuperAdapter.java @@ -93,6 +93,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType CommonViewHolder commonViewHolder = new CommonViewHolder(LayoutInflater.from(mContext).inflate(multiTypeMaker.getLayoutId(0), parent, false)); commonViewHolder.setParent(parent); commonViewHolder.setMultiTypeMaker(multiTypeMaker); + commonViewHolder.setIsRecyclable(false); return commonViewHolder; } else { //viewType就是position了(****************************注意要兼容刷新和加载更多没有情况****************************) int position = viewType; @@ -105,7 +106,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType multiTypeMaker = typeManager.getHeader(position - refreshControllerCount); multiTypeMaker.setType(MultiTypeMaker.TYPE_HEADER); commonViewHolder = new CommonViewHolder(LayoutInflater.from(mContext).inflate(multiTypeMaker.getLayoutId(0), parent, false)); -// commonViewHolder.setIsRecyclable(false); + commonViewHolder.setIsRecyclable(false); break; case MultiTypeMaker.TYPE_NORMAL: //主体布局 multiTypeMaker = mNormalTypeMaker; @@ -137,16 +138,12 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { CommonViewHolder commonViewHolder = (CommonViewHolder) holder; MultiTypeMaker multiTypeMaker = commonViewHolder.getMultiTypeMaker(); int normalViewStartPosition = position - typeManager.getRefreshControllerCount() - typeManager.getHeaderCount(); - switch (/*multiTypeMaker.getType()*/getViewHolderType(getItemViewType(position))){ + switch (multiTypeMaker.getType()/*getViewHolderType(getItemViewType(position))*/){ case MultiTypeMaker.TYPE_HEADER: //头布局 multiTypeMaker = typeManager.getHeader(position - refreshControllerCount); multiTypeMaker.bindViewHolder(commonViewHolder, multiTypeMaker.getData(), MultiTypeMaker.TYPE_HEADER, position - refreshControllerCount); break; case MultiTypeMaker.TYPE_NORMAL: //主体布局 - if(multiTypeMaker.getType() == MultiTypeMaker.TYPE_FOOTER){ //TODO 有可能复用的还是脚布局。multiTypeMaker就是footer,holder的view也是footer的view。 -// multiTypeMaker = mNormalTypeMaker; - onCreateViewHolder(commonViewHolder.getParent(),getItemViewType(position)); - } multiTypeMaker.bindViewHolder((CommonViewHolder) holder, mNormalData.get(normalViewStartPosition), multiTypeMaker.getType(normalViewStartPosition), normalViewStartPosition); break; case MultiTypeMaker.TYPE_FOOTER: //脚布局 (有可能被主体数据利用了) diff --git a/samples/build.gradle b/samples/build.gradle index a47b0db..5f66c1d 100644 --- a/samples/build.gradle +++ b/samples/build.gradle @@ -23,13 +23,6 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile 'com.android.support:appcompat-v7:25.1.0' - testCompile 'junit:junit:4.12' compile project(':libary') - - +// compile 'com.github.XinYiWorld:CZSuperAdapters:1.0' } diff --git a/samples/samples.iml b/samples/samples.iml index 0d250a0..0426a3c 100644 --- a/samples/samples.iml +++ b/samples/samples.iml @@ -87,20 +87,6 @@ - - - - - - - - - - - - - - @@ -123,31 +109,11 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/samples/src/androidTest/java/xinyi/com/samples/ExampleInstrumentedTest.java b/samples/src/androidTest/java/xinyi/com/samples/ExampleInstrumentedTest.java deleted file mode 100644 index c6e6dad..0000000 --- a/samples/src/androidTest/java/xinyi/com/samples/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package xinyi.com.samples; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumentation test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("xinyi.com.samples", appContext.getPackageName()); - } -} diff --git a/samples/src/main/AndroidManifest.xml b/samples/src/main/AndroidManifest.xml index 6da642d..8c58c08 100644 --- a/samples/src/main/AndroidManifest.xml +++ b/samples/src/main/AndroidManifest.xml @@ -2,7 +2,9 @@ + android:label="@string/app_name" android:supportsRtl="true" + android:theme="@android:style/Theme.Light.NoTitleBar" + > diff --git a/samples/src/main/java/xinyi/com/samples/MainActivity.java b/samples/src/main/java/xinyi/com/samples/MainActivity.java index fa7327d..5683686 100644 --- a/samples/src/main/java/xinyi/com/samples/MainActivity.java +++ b/samples/src/main/java/xinyi/com/samples/MainActivity.java @@ -3,7 +3,6 @@ import android.app.Activity; import android.graphics.Color; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; diff --git a/samples/src/main/res/values/styles.xml b/samples/src/main/res/values/styles.xml index 5885930..25fe7ea 100644 --- a/samples/src/main/res/values/styles.xml +++ b/samples/src/main/res/values/styles.xml @@ -1,11 +1,4 @@ - - diff --git a/samples/src/test/java/xinyi/com/samples/ExampleUnitTest.java b/samples/src/test/java/xinyi/com/samples/ExampleUnitTest.java deleted file mode 100644 index 595561e..0000000 --- a/samples/src/test/java/xinyi/com/samples/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package xinyi.com.samples; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file