+ 4.7.3 fixed 网络太慢导致支付设置页面加载超时

eritpchy · eritpchy · commit 79d6a5b0fbb6 · 2023-06-15T23:56:49.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 30
         versionCode 23
-        versionName "4.7.1"
+        versionName "4.7.3"
         buildConfigField "String", "APP_PRODUCT_NAME", "\"FingerprintPay\""
     }
 
diff --git a/app/src/main/java/com/surcumference/fingerprint/plugin/AlipayBasePlugin.java b/app/src/main/java/com/surcumference/fingerprint/plugin/AlipayBasePlugin.java
@@ -24,6 +24,7 @@
 import com.surcumference.fingerprint.BuildConfig;
 import com.surcumference.fingerprint.Lang;
 import com.surcumference.fingerprint.R;
+import com.surcumference.fingerprint.util.ActivityViewObserver;
 import com.surcumference.fingerprint.util.AlipayVersionControl;
 import com.surcumference.fingerprint.util.ApplicationUtils;
 import com.surcumference.fingerprint.util.BlackListUtils;
@@ -57,6 +58,7 @@ public class AlipayBasePlugin {
 
     private boolean mIsViewTreeObserverFirst;
     private int mAlipayVersionCode;
+    private ActivityViewObserver mSettingPageEnteredObserver;
 
     private int getAlipayVersionCode(Context context) {
         if (mAlipayVersionCode != 0) {
@@ -75,8 +77,21 @@ protected void onActivityCreated(Activity activity) {
             }
             int alipayVersionCode = getAlipayVersionCode(activity);
             if (alipayVersionCode >= 773 /** 10.3.80.9100 */ && activityClzName.contains(".FBAppWindowActivity")) {
-                Task.onMain(500, () -> doSettingsMenuInject_10_1_38(activity));
-                Task.onMain(1000, () -> doSettingsMenuInject_10_1_38(activity));
+
+                ActivityViewObserver activityViewObserver = mSettingPageEnteredObserver;
+                if (activityViewObserver != null) {
+                    activityViewObserver.stop();
+                    mSettingPageEnteredObserver = null;
+                }
+                activityViewObserver = new ActivityViewObserver(activity);
+                activityViewObserver.setViewIdentifyText("支付密码", "支付密碼", "Payment Password");
+                activityViewObserver.start(100, (observer, view) -> doSettingsMenuInject_10_1_38(activity));
+                mSettingPageEnteredObserver = activityViewObserver;
+                ActivityViewObserver finalActivityViewObserver = activityViewObserver;
+                Task.onBackground(30000, () -> {
+                    mSettingPageEnteredObserver = null;
+                    finalActivityViewObserver.stop();
+                });
             } else if (activityClzName.contains(".MySettingActivity")) {
                 Task.onMain(100, () -> doSettingsMenuInject_10_1_38(activity));
             } else if (activityClzName.contains(".UserSettingActivity")) {
diff --git a/app/src/main/java/com/surcumference/fingerprint/util/ActivityViewObserver.java b/app/src/main/java/com/surcumference/fingerprint/util/ActivityViewObserver.java
@@ -18,7 +18,7 @@ public class ActivityViewObserver {
     private WeakReference<Activity> mActivityRef;
     private boolean mRunning = false;
     private String mViewIdentifyType;
-    private String mViewIdentifyText;
+    private String[] mViewIdentifyTexts;
 
     public ActivityViewObserver(Activity weakRefActivity) {
         this.mActivityRef = new WeakReference<>(weakRefActivity);
@@ -28,13 +28,13 @@ public void setViewIdentifyType(String viewIdentifyType) {
         this.mViewIdentifyType = viewIdentifyType;
     }
 
-    public void setViewIdentifyText(String viewIdentifyText) {
-        this.mViewIdentifyText = viewIdentifyText;
+    public void setViewIdentifyText(String ...viewIdentifyTexts) {
+        this.mViewIdentifyTexts = viewIdentifyTexts;
     }
 
     public void start(long loopMSec, IActivityViewListener listener) {
-        if (TextUtils.isEmpty(this.mViewIdentifyType) && TextUtils.isEmpty(this.mViewIdentifyText)) {
-            throw new IllegalArgumentException("Error: ViewIdentifyType or ViewIdentifyText not set");
+        if (TextUtils.isEmpty(this.mViewIdentifyType) &&  (mViewIdentifyTexts == null || mViewIdentifyTexts.length == 0)) {
+            throw new IllegalArgumentException("Error: ViewIdentifyType or ViewIdentifyTexts not set");
         }
         if (mRunning) {
             return;
@@ -84,11 +84,15 @@ private void task(long loopMSec, IActivityViewListener listener) {
                     break;
                 }
             }
-            String viewIdentifyText = this.mViewIdentifyText;
-            if (!TextUtils.isEmpty(viewIdentifyText)) {
-                ViewUtils.getChildViews((ViewGroup) decorView, viewIdentifyText, viewList);
-                if (viewList.size() > 0) {
-                    break;
+            String[] viewIdentifyTexts = this.mViewIdentifyTexts;
+            if (viewIdentifyTexts != null) {
+                for (String viewIdentifyText: this.mViewIdentifyTexts) {
+                    if (!TextUtils.isEmpty(viewIdentifyText)) {
+                        ViewUtils.getChildViews((ViewGroup) decorView, viewIdentifyText, viewList);
+                        if (viewList.size() > 0) {
+                            break;
+                        }
+                    }
                 }
             }
         }
diff --git a/release/update_riru_alipay.json b/release/update_riru_alipay.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/riru-module-xfingerprint-pay-alipay-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/riru-module-xfingerprint-pay-alipay-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_riru_qq.json b/release/update_riru_qq.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/riru-module-xfingerprint-pay-qq-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/riru-module-xfingerprint-pay-qq-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_riru_taobao.json b/release/update_riru_taobao.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/riru-module-xfingerprint-pay-taobao-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/riru-module-xfingerprint-pay-taobao-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_riru_unionpay.json b/release/update_riru_unionpay.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/riru-module-xfingerprint-pay-unionpay-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/riru-module-xfingerprint-pay-unionpay-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_riru_wechat.json b/release/update_riru_wechat.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/riru-module-xfingerprint-pay-wechat-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/riru-module-xfingerprint-pay-wechat-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_zygisk_alipay.json b/release/update_zygisk_alipay.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/zygisk-module-xfingerprint-pay-alipay-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/zygisk-module-xfingerprint-pay-alipay-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_zygisk_qq.json b/release/update_zygisk_qq.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/zygisk-module-xfingerprint-pay-qq-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/zygisk-module-xfingerprint-pay-qq-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_zygisk_taobao.json b/release/update_zygisk_taobao.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/zygisk-module-xfingerprint-pay-taobao-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/zygisk-module-xfingerprint-pay-taobao-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_zygisk_unionpay.json b/release/update_zygisk_unionpay.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/zygisk-module-xfingerprint-pay-unionpay-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/zygisk-module-xfingerprint-pay-unionpay-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/release/update_zygisk_wechat.json b/release/update_zygisk_wechat.json
@@ -1,6 +1,6 @@
 {
-    "version": "4.7.1",
+    "version": "4.7.3",
     "versionCode": "23",
-    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/zygisk-module-xfingerprint-pay-wechat-v4.7.1-release.zip",
+    "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/zygisk-module-xfingerprint-pay-wechat-v4.7.3-release.zip",
     "changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"
 }
diff --git a/riru/flash.sh b/riru/flash.sh
@@ -3,13 +3,13 @@ set -e
 cd ${0%/*}
 
 bash ./build.sh :module:flashRelease ./src/gradle/qq.gradle      Zygisk
-bash ./build.sh :module:flashRelease ./src/gradle/qq.gradle      Riru
+#bash ./build.sh :module:flashRelease ./src/gradle/qq.gradle      Riru
 bash ./build.sh :module:flashRelease ./src/gradle/alipay.gradle  Zygisk
-bash ./build.sh :module:flashRelease ./src/gradle/alipay.gradle  Riru
+#bash ./build.sh :module:flashRelease ./src/gradle/alipay.gradle  Riru
 bash ./build.sh :module:flashRelease ./src/gradle/taobao.gradle  Zygisk
-bash ./build.sh :module:flashRelease ./src/gradle/taobao.gradle  Riru
+#bash ./build.sh :module:flashRelease ./src/gradle/taobao.gradle  Riru
 bash ./build.sh :module:flashRelease ./src/gradle/wechat.gradle  Zygisk
-bash ./build.sh :module:flashRelease ./src/gradle/wechat.gradle  Riru
+#bash ./build.sh :module:flashRelease ./src/gradle/wechat.gradle  Riru
 bash ./build.sh :module:flashRelease ./src/gradle/unionpay.gradle  Zygisk
-bash ./build.sh :module:flashRelease ./src/gradle/unionpay.gradle  Riru
+#bash ./build.sh :module:flashRelease ./src/gradle/unionpay.gradle  Riru
 adb shell "rm -f /data/local/tmp/lib*.debug.dex"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ android {`
`9`	`9`	`minSdkVersion 14`
`10`	`10`	`targetSdkVersion 30`
`11`	`11`	`versionCode 23`
`12`		`- versionName "4.7.1"`
	`12`	`+ versionName "4.7.3"`
`13`	`13`	`buildConfigField "String", "APP_PRODUCT_NAME", "\"FingerprintPay\""`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class ActivityViewObserver {`
`18`	`18`	`private WeakReference<Activity> mActivityRef;`
`19`	`19`	`private boolean mRunning = false;`
`20`	`20`	`private String mViewIdentifyType;`
`21`		`- private String mViewIdentifyText;`
	`21`	`+ private String[] mViewIdentifyTexts;`
`22`	`22`
`23`	`23`	`public ActivityViewObserver(Activity weakRefActivity) {`
`24`	`24`	`this.mActivityRef = new WeakReference<>(weakRefActivity);`
`@@ -28,13 +28,13 @@ public void setViewIdentifyType(String viewIdentifyType) {`
`28`	`28`	`this.mViewIdentifyType = viewIdentifyType;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public void setViewIdentifyText(String viewIdentifyText) {`
`32`		`- this.mViewIdentifyText = viewIdentifyText;`
	`31`	`+ public void setViewIdentifyText(String ...viewIdentifyTexts) {`
	`32`	`+ this.mViewIdentifyTexts = viewIdentifyTexts;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public void start(long loopMSec, IActivityViewListener listener) {`
`36`		`- if (TextUtils.isEmpty(this.mViewIdentifyType) && TextUtils.isEmpty(this.mViewIdentifyText)) {`
`37`		`- throw new IllegalArgumentException("Error: ViewIdentifyType or ViewIdentifyText not set");`
	`36`	`+ if (TextUtils.isEmpty(this.mViewIdentifyType) && (mViewIdentifyTexts == null \|\| mViewIdentifyTexts.length == 0)) {`
	`37`	`+ throw new IllegalArgumentException("Error: ViewIdentifyType or ViewIdentifyTexts not set");`
`38`	`38`	`}`
`39`	`39`	`if (mRunning) {`
`40`	`40`	`return;`
`@@ -84,11 +84,15 @@ private void task(long loopMSec, IActivityViewListener listener) {`
`84`	`84`	`break;`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`- String viewIdentifyText = this.mViewIdentifyText;`
`88`		`- if (!TextUtils.isEmpty(viewIdentifyText)) {`
`89`		`- ViewUtils.getChildViews((ViewGroup) decorView, viewIdentifyText, viewList);`
`90`		`- if (viewList.size() > 0) {`
`91`		`- break;`
	`87`	`+ String[] viewIdentifyTexts = this.mViewIdentifyTexts;`
	`88`	`+ if (viewIdentifyTexts != null) {`
	`89`	`+ for (String viewIdentifyText: this.mViewIdentifyTexts) {`
	`90`	`+ if (!TextUtils.isEmpty(viewIdentifyText)) {`
	`91`	`+ ViewUtils.getChildViews((ViewGroup) decorView, viewIdentifyText, viewList);`
	`92`	`+ if (viewList.size() > 0) {`
	`93`	`+ break;`
	`94`	`+ }`
	`95`	`+ }`
`92`	`96`	`}`
`93`	`97`	`}`
`94`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "version": "4.7.1",`
	`2`	`+ "version": "4.7.3",`
`3`	`3`	`"versionCode": "23",`
`4`		`- "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.1-ci/riru-module-xfingerprint-pay-alipay-v4.7.1-release.zip",`
	`4`	`+ "zipUrl": "https://github.com/eritpchy/FingerprintPay/releases/download/4.7.3-ci/riru-module-xfingerprint-pay-alipay-v4.7.3-release.zip",`
`5`	`5`	`"changelog": "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/CHANGELOG.md"`
`6`	`6`	`}`