Fixed UnionPay pay dialog shown after pay

Author: eritpchy

app/src/main/java/com/surcumference/fingerprint/plugin/impl/unionpay/UnionPayBasePlugin.java

@@ -46,6 +46,7 @@
 import com.wei.android.lib.fingerprintidentify.FingerprintIdentify;
 import com.wei.android.lib.fingerprintidentify.base.BaseFingerprint;
 
+import java.util.Map;
 import java.util.WeakHashMap;
 
 public class UnionPayBasePlugin implements IAppPlugin {
@@ -61,6 +62,8 @@ public class UnionPayBasePlugin implements IAppPlugin {
 
     private int mWeChatVersionCode = 0;
 
+    private Map<Activity, Boolean> mActivityResumedMap = new WeakHashMap<>();
+
     @Override
     public int getVersionCode(Context context) {
         if (mWeChatVersionCode != 0) {
@@ -71,6 +74,7 @@ public int getVersionCode(Context context) {
     }
 
     protected synchronized void initFingerPrintLock(Context context, Runnable onSuccessUnlockRunnable) {
+        L.d("指纹识别开始");
         mMockCurrentUser = true;
         mFingerprintIdentify = new FingerprintIdentify(context.getApplicationContext());
         mFingerprintIdentify.setSupportAndroidL(true);
@@ -173,6 +177,7 @@ public synchronized void showFingerPrintDialog(@Nullable Activity activity, View
                 FingerprintIdentify fingerprintIdentify = mFingerprintIdentify;
                 if (fingerprintIdentify != null) {
                     fingerprintIdentify.cancelIdentify();
+                    L.d("指纹识别取消1");
                 }
                 if (!mPwdActivityDontShowFlag) {
                     Task.onMain(mPwdActivityReShowDelayTimeMsec, () -> finalPayRootLayout.setAlpha(1));
@@ -309,6 +314,7 @@ private void inputDigitPassword(View rootView, String password) {
     @Override
     public void onActivityResumed(Activity activity) {
         L.d("Activity onResume =", activity);
+        mActivityResumedMap.put(activity, true);
         final String activityClzName = activity.getClass().getName();
         if (activityClzName.contains(".UPActivityReactNative")) {
 
@@ -330,12 +336,14 @@ public void onActivityCreated(Activity activity) {
     @Override
     public void onActivityPaused(Activity activity) {
         L.d("Activity onPause =", activity);
+        mActivityResumedMap.remove(activity);
         final String activityClzName = activity.getClass().getName();
         if (activityClzName.contains(".UPActivityReactNative")) {
             hidePreviousPayDialog();
         } else if (activityClzName.contains(".PayWalletActivity")) {
             hidePreviousPayDialog();
         }
+        stopAndRemoveTargetActivityViewObserver(activity);
     }
 
     @Override
@@ -347,6 +355,7 @@ private void watchPayView(Activity activity) {
         stopAndRemoveCurrentActivityViewObserver();
         ActivityViewObserver activityViewObserver = new ActivityViewObserver(activity);
         activityViewObserver.setViewIdentifyText("请输入支付密码");
+        activityViewObserver.setWatchActivityViewOnly(true);
         activityViewObserver.start(100, new ActivityViewObserver.IActivityViewListener() {
             @Override
             public void onViewFounded(ActivityViewObserver observer, View view) {
@@ -368,6 +377,10 @@ public void onViewFounded(ActivityViewObserver observer, View view) {
                 ActivityViewObserver.IActivityViewListener l = this;
                 observer.stop();
 
+                if (!mActivityResumedMap.containsKey(activity)) {
+                    return;
+                }
+
                 onPayDialogShown(observer.getTargetActivity(), (ViewGroup) rootView);
                 View.OnAttachStateChangeListener listener = mView2OnAttachStateChangeListenerMap.get(view);
                 if (listener != null) {
@@ -406,6 +419,7 @@ protected void onPayDialogDismiss(Context context) {
             FingerprintIdentify fingerPrintIdentify = mFingerprintIdentify;
             if (fingerPrintIdentify != null) {
                 fingerPrintIdentify.cancelIdentify();
+                L.d("指纹识别取消2");
             }
             mMockCurrentUser = false;
         }
@@ -419,6 +433,16 @@ protected void stopAndRemoveCurrentActivityViewObserver() {
         }
     }
 
+    protected void stopAndRemoveTargetActivityViewObserver(Activity activity) {
+        ActivityViewObserver activityViewObserver = mActivityViewObserver;
+        if (activityViewObserver != null) {
+            if (activity == activityViewObserver.getTargetActivity()) {
+                activityViewObserver.stop();
+                mActivityViewObserver = null;
+            }
+        }
+    }
+
     protected void doSettingsMenuInject(final Activity activity) {
 
         View rootView = activity.getWindow().getDecorView();

app/src/main/java/com/surcumference/fingerprint/util/ActivityViewObserver.java

@@ -11,6 +11,7 @@
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -21,6 +22,7 @@ public class ActivityViewObserver {
     private boolean mRunning = false;
     private String mViewIdentifyType;
     private String[] mViewIdentifyTexts;
+    private boolean mWatchActivityViewOnly = false;
 
     public ActivityViewObserver(Activity weakRefActivity) {
         this.mActivityRef = new WeakReference<>(weakRefActivity);
@@ -34,6 +36,10 @@ public void setViewIdentifyText(String ...viewIdentifyTexts) {
         this.mViewIdentifyTexts = viewIdentifyTexts;
     }
 
+    public void setWatchActivityViewOnly(boolean on) {
+        this.mWatchActivityViewOnly = on;
+    }
+
     public void start(long loopMSec, IActivityViewListener listener) {
         if (TextUtils.isEmpty(this.mViewIdentifyType) &&  (mViewIdentifyTexts == null || mViewIdentifyTexts.length == 0)) {
             throw new IllegalArgumentException("Error: ViewIdentifyType or ViewIdentifyTexts not set");
@@ -73,7 +79,9 @@ private void task(long loopMSec, IActivityViewListener listener) {
         }
 
         List<View> viewList = new ArrayList<>();
-        List<View> decorViewList = ViewUtils.getWindowManagerViews();
+        List<View> decorViewList = mWatchActivityViewOnly
+                ? Collections.singletonList(activity.getWindow().getDecorView())
+                : ViewUtils.getWindowManagerViews();
         for (View decorView : decorViewList) {
             if (decorView instanceof ViewGroup) {
             } else {