更新到0.5.1，解决全局刷新问题

jeasonlzy · Apr 5, 2017 · f6035a5 · f6035a5
1 parent ca3ccce
commit f6035a5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,6 +31,6 @@ dependencies {
 
     compile 'com.lzy.widget:view-core:0.2.1'
 
-    compile 'com.lzy.widget:imagepicker:0.5.0'
-//    compile project(':imagepicker')
+//    compile 'com.lzy.widget:imagepicker:0.5.0'
+    compile project(':imagepicker')
 }
diff --git a/bintray.gradle b/bintray.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "0.5.0"              // 数据仓库依赖第三部分
+version = "0.5.1"              // 数据仓库依赖第三部分
 
 def siteUrl = 'https://github.com/jeasonlzy0216/NineGridView'
 def gitUrl = 'https://github.com/jeasonlzy0216/NineGridView.git'

diff --git a/imagepicker/src/main/java/com/lzy/imagepicker/adapter/ImageRecyclerAdapter.java b/imagepicker/src/main/java/com/lzy/imagepicker/adapter/ImageRecyclerAdapter.java
@@ -27,7 +27,9 @@
  *
  * 用于替换原项目的GridView，使用局部刷新解决选中照片出现闪动问题
  *
- * 替换为RecyclerView后并没有通过局部刷新解决，可能是picasso图片加载框架的问题
+ * 替换为RecyclerView后只是不再会导致全局刷新，
+ *
+ * 但还是会出现明显的重新加载图片，可能是picasso图片加载框架的问题
  *
  * Author: nanchen
  * Email: liushilin520@foxmail.com

diff --git a/imagepicker/src/main/java/com/lzy/imagepicker/ui/ImageGridActivity.java b/imagepicker/src/main/java/com/lzy/imagepicker/ui/ImageGridActivity.java
@@ -289,7 +289,7 @@ public void onImageSelected(int position, ImageItem item, boolean isAdd) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (data != null) {
+        if (data != null && data.getExtras() != null) {
             if (resultCode == ImagePicker.RESULT_CODE_BACK) {
                 isOrigin = data.getBooleanExtra(ImagePreviewActivity.ISORIGIN, false);
             } else {
@@ -347,4 +347,5 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             }
         }
     }
+
 }
diff --git a/imagepicker/src/main/res/layout/activity_image_preview.xml b/imagepicker/src/main/res/layout/activity_image_preview.xml
@@ -25,6 +25,7 @@
 
         <com.lzy.imagepicker.view.SuperCheckBox
             android:id="@+id/cb_origin"
+            android:visibility="invisible"
             style="@style/SuperCheckboxTheme"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"