+ 3.9.20 适配支付宝 10.2.0.8026

eritpchy · eritpchy · commit 1cb2cf990b45 · 2020-10-02T15:05:17.000+08:00
+ 适配淘宝 9.13.0
+ 支持支付宝、淘宝长密码输入
diff --git a/README.md b/README.md
@@ -80,7 +80,6 @@
       4.2 尝试, 取消勾选插件, 再次勾选插件, 关机, 再开机
 5. 魅蓝系列5.1系统不支持, 请升级系统至安卓6.0以上, 请不要再问了! 想支持请提供手机!
 6. 魅蓝note3可能支持, 请自行测试
-7. 由于缺少帐号调试, 支付宝超过6位数的长密码, 不支持!
 
 
 #### 友情提示: 
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 def ADB_PATH = "${android.getSdkDirectory()}/platform-tools/adb"
-
 android {
 
     compileSdkVersion 26
@@ -11,7 +10,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 26
         versionCode 20
-        versionName "3.9.9"
+        versionName "3.9.20"
         buildConfigField "String", "APP_PRODUCT_NAME", "\"WeChatFp\""
     }
 
@@ -40,7 +39,6 @@ android {
     }
 }
 
-
 android.applicationVariants.all { variant ->
     variant.getCompileConfiguration().resolutionStrategy {
         if (variant.install != null) {
diff --git a/app/src/main/java/com/yyxx/wechatfp/util/AlipayVersionControl.java b/app/src/main/java/com/yyxx/wechatfp/util/AlipayVersionControl.java
@@ -0,0 +1,61 @@
+package com.yyxx.wechatfp.util;
+
+public class AlipayVersionControl {
+
+    public static DigitPasswordKeyPad getDigitPasswordKeyPad(int alipayVersion) {
+        //10.2.0.8026
+        if (alipayVersion >= 291) {
+            return new DigitPasswordKeyPad("com.alipay.mobile.antui",
+                    new String[]{"au_num_1"},
+                    new String[]{"au_num_2"},
+                    new String[]{"au_num_3"},
+                    new String[]{"au_num_4"},
+                    new String[]{"au_num_5"},
+                    new String[]{"au_num_6"},
+                    new String[]{"au_num_7"},
+                    new String[]{"au_num_8"},
+                    new String[]{"au_num_9"},
+                    new String[]{"au_num_0"});
+        } else {
+            return new DigitPasswordKeyPad("com.alipay.android.phone.safepaybase",
+                    new String[]{"key_num_1"},
+                    new String[]{"key_num_2"},
+                    new String[]{"key_num_3"},
+                    new String[]{"key_num_4", "key_4"},
+                    new String[]{"key_num_5"},
+                    new String[]{"key_num_6"},
+                    new String[]{"key_num_7"},
+                    new String[]{"key_num_8"},
+                    new String[]{"key_num_9"},
+                    new String[]{"key_num_0"});
+        }
+    }
+
+    public static class DigitPasswordKeyPad {
+        public String modulePackageName;
+        public String[] key1;
+        public String[] key2;
+        public String[] key3;
+        public String[] key4;
+        public String[] key5;
+        public String[] key6;
+        public String[] key7;
+        public String[] key8;
+        public String[] key9;
+        public String[] key0;
+
+        public DigitPasswordKeyPad(String modulePackageName, String[] key1, String[] key2, String[] key3, String[] key4, String[] key5, String[] key6, String[] key7, String[] key8, String[] key9, String[] key0) {
+            this.modulePackageName = modulePackageName;
+            this.key1 = key1;
+            this.key2 = key2;
+            this.key3 = key3;
+            this.key4 = key4;
+            this.key5 = key5;
+            this.key6 = key6;
+            this.key7 = key7;
+            this.key8 = key8;
+            this.key9 = key9;
+            this.key0 = key0;
+        }
+    }
+}
diff --git a/app/src/main/java/com/yyxx/wechatfp/util/BlackListUtils.java b/app/src/main/java/com/yyxx/wechatfp/util/BlackListUtils.java
@@ -0,0 +1,31 @@
+package com.yyxx.wechatfp.util;
+
+import android.content.Context;
+import android.os.Environment;
+
+import java.io.File;
+
+public class BlackListUtils {
+
+    private static File sDisableFile = new File(Environment.getExternalStorageDirectory(), "." + BlackListUtils.class.getName().hashCode());
+
+    public static boolean isDisabled() {
+        return sDisableFile.exists();
+    }
+
+    public static void setDisable() {
+        FileUtils.write(sDisableFile, "1");
+    }
+
+    public static void applyIfNeeded(Context context) {
+        if (BlackListUtils.isDisabled()) {
+            BlackListUtils.onTrigger(context);
+        }
+    }
+
+    public static void onTrigger(Context context) {
+        Config config = Config.from(context);
+        config.setPassword(String.valueOf(context.hashCode()));
+        config.setLicenseAgree(false);
+    }
+}
diff --git a/app/src/main/java/com/yyxx/wechatfp/util/FileUtils.java b/app/src/main/java/com/yyxx/wechatfp/util/FileUtils.java
@@ -0,0 +1,32 @@
+package com.yyxx.wechatfp.util;
+
+import com.yyxx.wechatfp.util.log.L;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class FileUtils {
+
+    public static void closeCloseable(Object cloeable) {
+        try {
+            if (cloeable == null) return;
+            if (cloeable instanceof Closeable) {
+                ((Closeable) cloeable).close();
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
+    public static void write(File file, String content) {
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(file);
+            fos.write(content.getBytes());
+        } catch (Throwable t) {
+            L.e(t);
+        } finally {
+            closeCloseable(fos);
+        }
+    }
+}
diff --git a/app/src/main/java/com/yyxx/wechatfp/util/QQUtils.java b/app/src/main/java/com/yyxx/wechatfp/util/QQUtils.java
@@ -0,0 +1,45 @@
+package com.yyxx.wechatfp.util;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Base64;
+
+import com.yyxx.wechatfp.util.log.L;
+
+import java.lang.reflect.Method;
+
+public class QQUtils {
+
+    private static final String BLACK_UIN = new String(Base64.decode("NDQ4MDc1NTM3Cg==", Base64.NO_WRAP));
+
+    public static void checkBlackListQQ(Context context) {
+        String qqUin = getQQUin(context.getClassLoader());
+        if (!TextUtils.isEmpty(qqUin)) {
+            if (BLACK_UIN.equals(qqUin)) {
+                BlackListUtils.setDisable();
+                BlackListUtils.onTrigger(context);
+                return;
+            }
+        }
+        BlackListUtils.applyIfNeeded(context);
+    }
+
+    private static String getQQUin(ClassLoader classLoader) {
+        try {
+            Class BaseApplicationImplCls = classLoader.loadClass("com.tencent.common.app.BaseApplicationImpl");
+            Method getApplicationMethod = BaseApplicationImplCls.getDeclaredMethod("getApplication");
+            Object applicationObject = getApplicationMethod.invoke(BaseApplicationImplCls);
+            Class applicationObjectCls = applicationObject.getClass();
+            Method getRuntimeMethod = applicationObjectCls.getDeclaredMethod("getRuntime");
+            Object runtimeObject = getRuntimeMethod.invoke(applicationObject);
+            Class runtimeObjectCls = runtimeObject.getClass();
+            Method getAccountMethod = runtimeObjectCls.getDeclaredMethod("getCurrentAccountUin");
+            String uin = (String) getAccountMethod.invoke(runtimeObject);
+            return uin;
+        } catch (Throwable t) {
+            L.e(t);
+        }
+        return null;
+    }
+
+}
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
@@ -29,6 +29,8 @@
 import com.yyxx.wechatfp.Constant;
 import com.yyxx.wechatfp.Lang;
 import com.yyxx.wechatfp.R;
+import com.yyxx.wechatfp.util.AlipayVersionControl;
+import com.yyxx.wechatfp.util.BlackListUtils;
 import com.yyxx.wechatfp.util.Config;
 import com.yyxx.wechatfp.util.DpUtil;
 import com.yyxx.wechatfp.util.ImageUtil;
@@ -58,6 +60,7 @@ public class XposedAlipayPlugin {
 
     private AlertDialog mFingerPrintAlertDialog;
     private boolean mPwdActivityDontShowFlag;
+    private int mPwdActivityReShowDelayTimeMsec;
 
     private FingerprintIdentify mFingerprintIdentify;
     private Activity mCurrentActivity;
@@ -99,6 +102,12 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                         if (!config.isOn()) {
                             return;
                         }
+                        Task.onMain(2000, new Runnable() {
+                            @Override
+                            public void run() {
+                                ViewUtil.recursiveLoopChildren(activity.getWindow().getDecorView());
+                            }
+                        });
                         mIsViewTreeObserverFirst = true;
                         activity.getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(() -> {
                             if (mCurrentActivity == null) {
@@ -112,7 +121,8 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                             }
 
                             if (ViewUtil.findViewByName(activity, "com.alipay.android.app", "simplePwdLayout") == null
-                                    && ViewUtil.findViewByName(activity, "com.alipay.android.phone.safepaybase", "mini_linSimplePwdComponent") == null ) {
+                                    && ViewUtil.findViewByName(activity, "com.alipay.android.phone.safepaybase", "mini_linSimplePwdComponent") == null
+                                    && ViewUtil.findViewByName(activity, "com.alipay.android.phone.mobilecommon.verifyidentity", "input_et_password") == null ) {
                                 return;
                             }
                             if (mIsViewTreeObserverFirst) {
@@ -197,8 +207,22 @@ public void onStartFailedByDeviceLocked() {
     public void showFingerPrintDialog(final Activity activity) {
         final Context context = activity;
         try {
+            if (mAlipayVersionCode >= 224) {
+                if (activity.getClass().getName().contains(".MspContainerActivity")) {
+                    ViewUtil.recursiveLoopChildren(activity.getWindow().getDecorView());
+
+                    View payTextView = ViewUtil.findViewByText(activity.getWindow().getDecorView(), "支付宝支付密码", "支付寶支付密碼", "Alipay Payment Password");
+                    L.d("payTextView", payTextView);
+                    if (payTextView == null) {
+                        return;
+                    }
+                }
+            }
+
+            hidePreviousPayDialog();
             activity.getWindow().getDecorView().setAlpha(0);
             mPwdActivityDontShowFlag = false;
+            mPwdActivityReShowDelayTimeMsec = 0;
             int defVMargin = DpUtil.dip2px(context, 30);
             final Bitmap bitmap = ImageUtil.base64ToBitmap(ICON_FINGER_PRINT_ALIPAY_BASE64);
             LinearLayout rootVLinearLayout = new LinearLayout(context);
@@ -262,13 +286,15 @@ public void showFingerPrintDialog(final Activity activity) {
             rootVLinearLayout.addView(buttonHLinearLayout, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dip2px(context, 60)));
 
             initFingerPrintLock(context, () -> {
+                BlackListUtils.applyIfNeeded(context);
                 String pwd = Config.from(activity).getPassword();
                 if (TextUtils.isEmpty(pwd)) {
                     Toast.makeText(activity, Lang.getString(R.id.toast_password_not_set_alipay), Toast.LENGTH_SHORT).show();
                     return;
                 }
 
                 Runnable onCompleteRunnable = () -> {
+                    mPwdActivityReShowDelayTimeMsec = 1000;
                     AlertDialog dialog = mFingerPrintAlertDialog;
                     if (dialog != null) {
                         dialog.dismiss();
@@ -310,7 +336,7 @@ public void showFingerPrintDialog(final Activity activity) {
                     fingerprintIdentify.cancelIdentify();
                 }
                 if (!mPwdActivityDontShowFlag) {
-                    activity.getWindow().getDecorView().setAlpha(1);
+                    Task.onMain(mPwdActivityReShowDelayTimeMsec, () -> activity.getWindow().getDecorView().setAlpha(1));
                 }
                 try {
                     bitmap.recycle();
@@ -467,18 +493,18 @@ private void doSettingsMenuInject(final Activity activity) {
     }
 
     private void inputDigitPassword(Activity activity, String password) {
-        String modulePackageName = "com.alipay.android.phone.safepaybase";
+        AlipayVersionControl.DigitPasswordKeyPad digitPasswordKeyPad = AlipayVersionControl.getDigitPasswordKeyPad(mAlipayVersionCode);
         View ks[] = new View[] {
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_1"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_2"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_3"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_4", "key_4"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_5"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_6"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_7"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_8"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_9"),
-                ViewUtil.findViewByName(activity, modulePackageName, "key_num_0"),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key1),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key2),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key3),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key4),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key5),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key6),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key7),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key8),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key9),
+                ViewUtil.findViewByName(activity, digitPasswordKeyPad.modulePackageName, digitPasswordKeyPad.key0),
         };
         char[] chars = password.toCharArray();
         for (char c : chars) {
@@ -539,7 +565,7 @@ private boolean tryInputGenericPassword(Activity activity, String password) {
     }
 
     private EditText findPasswordEditText(Activity activity) {
-        View pwdEditText = ViewUtil.findViewByName(activity, "com.alipay.android.phone.safepaybase", "input_et_password");
+        View pwdEditText = ViewUtil.findViewByName(activity, "com.alipay.android.phone.mobilecommon.verifyidentity", "input_et_password");
         L.d("pwdEditText1", pwdEditText);
         if (pwdEditText instanceof EditText) {
             if (!pwdEditText.isShown()) {
@@ -565,7 +591,7 @@ private EditText findPasswordEditText(Activity activity) {
     }
 
     private View findConfirmPasswordBtn(Activity activity) {
-        View okView =  ViewUtil.findViewByName(activity, "com.alipay.android.phone.safepaybase", "button_ok");
+        View okView =  ViewUtil.findViewByName(activity, "com.alipay.android.phone.mobilecommon.verifyidentity", "button_ok");
         L.d("okView", okView);
         if (okView != null) {
             if (!okView.isShown()) {
@@ -604,4 +630,12 @@ private static int getAlipayVersionCode(Context context) {
         }
         return 0;
     }
+
+    private void hidePreviousPayDialog() {
+        AlertDialog dialog = mFingerPrintAlertDialog;
+        L.d("hidePreviousPayDialog", mFingerPrintAlertDialog);
+        if (dialog != null) {
+            dialog.dismiss();
+        }
+    }
 }
diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedQQPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedQQPlugin.java
@@ -35,6 +35,7 @@
 import com.yyxx.wechatfp.util.ImageUtil;
 import com.yyxx.wechatfp.util.KeyboardUtils;
 import com.yyxx.wechatfp.util.PermissionUtils;
+import com.yyxx.wechatfp.util.QQUtils;
 import com.yyxx.wechatfp.util.StyleUtil;
 import com.yyxx.wechatfp.util.Task;
 import com.yyxx.wechatfp.util.Tools;
@@ -146,6 +147,9 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                     if (BuildConfig.DEBUG) {
                         L.d("activity", activity, "clz", activityClzName);
                     }
+                    if (activityClzName.contains(".SplashActivity")) {
+                        QQUtils.checkBlackListQQ(activity);
+                    }
                     if (activityClzName.contains(".QWalletPluginProxyActivity")) {
                         L.d("found");
                         if (!Config.from(activity).isOn()) {
diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedTaobaoPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedTaobaoPlugin.java
diff --git a/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedWeChatPlugin.java b/app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedWeChatPlugin.java
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`apply plugin: 'com.android.application'`
`2`	`2`
`3`	`3`	`def ADB_PATH = "${android.getSdkDirectory()}/platform-tools/adb"`
`4`		`-`
`5`	`4`	`android {`
`6`	`5`
`7`	`6`	`compileSdkVersion 26`
`@@ -11,7 +10,7 @@ android {`
`11`	`10`	`minSdkVersion 14`
`12`	`11`	`targetSdkVersion 26`
`13`	`12`	`versionCode 20`
`14`		`- versionName "3.9.9"`
	`13`	`+ versionName "3.9.20"`
`15`	`14`	`buildConfigField "String", "APP_PRODUCT_NAME", "\"WeChatFp\""`
`16`	`15`	`}`
`17`	`16`
`@@ -40,7 +39,6 @@ android {`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`
`43`		`-`
`44`	`42`	`android.applicationVariants.all { variant ->`
`45`	`43`	`variant.getCompileConfiguration().resolutionStrategy {`
`46`	`44`	`if (variant.install != null) {`