+ 3.9.8 适配支付宝 10.1.87.7000

eritpchy · Feb 29, 2020 · 63f333e · 63f333e
1 parent a594a55
commit 63f333e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 26
         versionCode 20
-        versionName "3.9.7"
+        versionName "3.9.8"
         buildConfigField "String", "APP_PRODUCT_NAME", "\"WeChatFp\""
     }
 

diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedAlipayPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedAlipayPlugin.java
@@ -26,6 +26,7 @@
 import com.wei.android.lib.fingerprintidentify.FingerprintIdentify;
 import com.wei.android.lib.fingerprintidentify.base.BaseFingerprint;
 import com.yyxx.wechatfp.BuildConfig;
+import com.yyxx.wechatfp.Constant;
 import com.yyxx.wechatfp.Lang;
 import com.yyxx.wechatfp.R;
 import com.yyxx.wechatfp.util.Config;
@@ -62,10 +63,14 @@ public class XposedAlipayPlugin {
     private Activity mCurrentActivity;
 
     private boolean mIsViewTreeObserverFirst;
+    private int mAlipayVersionCode;
+
     @Keep
     public void main(final Context context, final XC_LoadPackage.LoadPackageParam lpparam) {
         L.d("Xposed plugin init version: " + BuildConfig.VERSION_NAME);
         try {
+            mAlipayVersionCode = getAlipayVersionCode(context);
+            L.d("mAlipayVersionCode", mAlipayVersionCode);
             Umeng.init(context);
             XposedLogNPEBugFixer.fix();
             final PackageInfo packageInfo = context.getPackageManager().getPackageInfo(lpparam.packageName, 0);
@@ -87,7 +92,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                         Task.onMain(100, () -> doSettingsMenuInject_10_1_38(activity));
                     } else if (activityClzName.contains(".UserSettingActivity")) {
                         Task.onMain(100, () -> doSettingsMenuInject(activity));
-                    } else if (activityClzName.contains(".MspContainerActivity")
+                    } else if (activityClzName.contains(mAlipayVersionCode >= 230 ? ".PayPwdDialogActivity" : ".MspContainerActivity")
                             || activityClzName.contains(".FlyBirdWindowActivity")) {
                         L.d("found");
                         final Config config = Config.from(activity);
@@ -286,6 +291,7 @@ public void showFingerPrintDialog(final Activity activity) {
                                 inputDigitPassword(activity, pwd);
                             } catch (NullPointerException e) {
                                 Toast.makeText(context, Lang.getString(R.id.toast_password_auto_enter_fail), Toast.LENGTH_LONG).show();
+                                L.d("inputDigitPassword NPE", e);
                             } catch (Exception e) {
                                 Toast.makeText(context, Lang.getString(R.id.toast_password_auto_enter_fail), Toast.LENGTH_LONG).show();
                                 L.e(e);
@@ -587,4 +593,15 @@ private View findConfirmPasswordBtn(Activity activity) {
         }
         return null;
     }
+
+    private static int getAlipayVersionCode(Context context) {
+        try {
+            PackageInfo packageInfo = context.getPackageManager().getPackageInfo(Constant.PACKAGE_NAME_ALIPAY, 0);
+            int versionCode = packageInfo.versionCode;
+            return versionCode;
+        } catch (Exception e) {
+            L.e(e);
+        }
+        return 0;
+    }
 }