优化大图浏览弹窗的流程度

junixapp · Sep 30, 2021 · 1149493 · 1149493
1 parent a931e34
commit 1149493
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/app/src/main/java/com/lxj/xpopupdemo/fragment/ImageViewerDemo.java b/app/src/main/java/com/lxj/xpopupdemo/fragment/ImageViewerDemo.java
@@ -163,6 +163,7 @@ protected void bind(@NonNull final ViewHolder holder, @NonNull final Object s, f
                 @Override
                 public void onClick(View v) {
                     new XPopup.Builder(holder.itemView.getContext())
+//                            .animationDuration(1000)
                             .asImageViewer(imageView, position, list,
                                     false, true, -1, -1, -1, true,
                                     Color.rgb(32, 36, 46),

diff --git a/app/src/main/java/com/lxj/xpopupdemo/fragment/QuickStartDemo.java b/app/src/main/java/com/lxj/xpopupdemo/fragment/QuickStartDemo.java
@@ -123,7 +123,6 @@ public void onClick(View v) {
                         .isViewMode(true)
                         .isDestroyOnDismiss(true)
 //                        .hasBlurBg(true)
-                         .dismissOnTouchOutside(false)
 //                         .autoDismiss(false)
 //                        .popupAnimation(PopupAnimation.NoAnimation)
 //                        .setPopupCallback(new DemoXPopupListener())

diff --git a/library/src/main/java/com/lxj/xpopup/core/ImageViewerPopupView.java b/library/src/main/java/com/lxj/xpopup/core/ImageViewerPopupView.java
@@ -8,6 +8,7 @@
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -241,7 +242,6 @@ public void doDismissAnimation() {
         pager.setVisibility(INVISIBLE);
         photoViewContainer.isReleasing = true;
         snapshotView.setVisibility(VISIBLE);
-        doAfterDismiss();
         snapshotView.post(new Runnable() {
             @Override
             public void run() {
@@ -252,13 +252,21 @@ public void run() {
                         .addTransition(new ChangeImageTransform())
                         .setInterpolator(new FastOutSlowInInterpolator())
                         .addListener(new TransitionListenerAdapter() {
+                            @Override
+                            public void onTransitionStart(@NonNull Transition transition) {
+                                super.onTransitionStart(transition);
+                                doAfterDismiss();
+                            }
                             @Override
                             public void onTransitionEnd(@NonNull Transition transition) {
                                 pager.setScaleX(1f);
                                 pager.setScaleY(1f);
-//                                snapshotView.setScaleX(1f);
-//                                snapshotView.setScaleY(1f);
+                                snapshotView.setScaleX(1f);
+                                snapshotView.setScaleY(1f);
                                 placeholderView.setVisibility(INVISIBLE);
+                                snapshotView.setTranslationX(rect.left);
+                                snapshotView.setTranslationY(rect.top);
+                                XPopupUtils.setWidthHeight(snapshotView, rect.width(), rect.height());
                             }
                         }));
 

diff --git a/library/src/main/java/com/lxj/xpopup/util/XPopupUtils.java b/library/src/main/java/com/lxj/xpopup/util/XPopupUtils.java
@@ -33,7 +33,6 @@
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;