androidx-6.1.4 优化reset逻辑，更新部分依赖版本。

hecom-rn · Jan 19, 2021 · e0ab915 · e0ab915
1 parent 62ee6f0
commit e0ab915
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/library/build.gradle b/library/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.exifinterface:exifinterface:1.3.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.2'
     api 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
     // glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'

diff --git a/library/src/main/java/cc/shinichi/library/view/ImagePreviewActivity.java b/library/src/main/java/cc/shinichi/library/view/ImagePreviewActivity.java
@@ -320,6 +320,11 @@ public void onBackPressed() {
     public void finish() {
         super.finish();
         overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+
+        ImagePreview.getInstance().reset();
+        if (imagePreviewAdapter != null) {
+            imagePreviewAdapter.closePage();
+        }
     }
 
     public int convertPercentToBlackAlphaColor(float percent) {
@@ -500,15 +505,6 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        ImagePreview.getInstance().reset();
-        if (imagePreviewAdapter != null) {
-            imagePreviewAdapter.closePage();
-        }
-    }
-
     private void gone() {
         handlerHolder.sendEmptyMessage(3);
     }

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "cc.shinichi.bigimageviewpager"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 613
-        versionName "androidx-6.1.3"
+        versionCode 614
+        versionName "androidx-6.1.4"
     }
     buildTypes {
         release {
@@ -50,6 +50,6 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.11.0'
     // library
-//   implementation 'com.github.SherlockGougou:BigImageViewPager:androidx-6.1.3'
+//   implementation 'com.github.SherlockGougou:BigImageViewPager:androidx-6.1.4'
     implementation project(':library')
 }