Add WeChat 6.5.13-1081 Support

Author: eritpchy

app/src/main/java/com/yyxx/wechatfp/xposed/ObfuscationHelper.java

@@ -5,36 +5,39 @@
 
 public class ObfuscationHelper {
 
-    private static int sVersionIdx = 0;
-
     public static class MM_Classes {
-        public static Class<?> PayUI, FetchUI, Payview, WalletBaseUI, PreferenceAdapter;
+
+        public static Class<?> PayUI, FetchUI, PayView, WalletBaseUI, PreferenceAdapter;
 
         private static void init(int idx, LoadPackageParam lpparam) throws Throwable {
             PayUI = XposedHelpers.findClass("com.tencent.mm.plugin.wallet.pay.ui." + new String[]{
                     "WalletPayUI", //6.5.8
                     "WalletPayUI", //6.5.10-1080
+                    "WalletPayUI", //6.5.13-1081
                     "WalletPayUI", //6.5.13-1100
             }[idx], lpparam.classLoader);
-            Payview = XposedHelpers.findClass("com.tencent.mm.plugin.wallet_core.ui." + new String[]{
+            PayView = XposedHelpers.findClass("com.tencent.mm.plugin.wallet_core.ui." + new String[]{
                     "l",  //6.5.8
                     "l",  //6.5.10-1080
-                    "l",  //6.5.10-1061
+                    "l",  //6.5.13-1081
                     "l",  //6.5.13-1100
             }[idx], lpparam.classLoader);
             FetchUI = XposedHelpers.findClass("com.tencent.mm.plugin.wallet.balance.ui." + new String[]{
                     "WalletBalanceFetchPwdInputUI",  //6.5.8
                     "WalletBalanceFetchPwdInputUI",  //6.5.10-1080
+                    "WalletBalanceFetchPwdInputUI",  //6.5.13-1081
                     "WalletBalanceFetchPwdInputUI",  //6.5.13-1100
             }[idx], lpparam.classLoader);
             WalletBaseUI = XposedHelpers.findClass("com.tencent.mm.wallet_core.ui." + new String[]{
                     "WalletBaseUI",  //6.5.8
                     "WalletBaseUI",  //6.5.10-1080
+                    "WalletBaseUI",  //6.5.13-1081
                     "WalletBaseUI",  //6.5.13-1100
             }[idx], lpparam.classLoader);
             PreferenceAdapter = XposedHelpers.findClass("com.tencent.mm.ui.base.preference." + new String[]{
                     "h",  //6.5.8
                     "h",  //6.5.10-1080
+                    "h",  //6.5.13-1081
                     "h",  //6.5.13-1100
             }[idx], lpparam.classLoader);
         }
@@ -53,36 +56,43 @@ private static void init(int idx) throws Throwable {
             PaypwdView = new String[]{
                     "qVO",  //6.5.8
                     "ryk",  //6.5.10-1080
+                    "rNe",  //6.5.13-1081
                     "rLB",  //6.5.13-1100
             }[idx];
             PaypwdEditText = new String[]{
                     "vyO",  //6.5.8
                     "wjm",  //6.5.10-1080
+                    "wFP",  //6.5.13-1081
                     "wDJ",  //6.5.13-1100
             }[idx];
             PayInputView = new String[]{
                     "mOL",  //6.5.8
                     "nnG",  //6.5.10-1080
+                    "npM",  //6.5.13-1081
                     "nol",  //6.5.13-1100
             }[idx];
             PayTitle = new String[]{
                     "qVK",  //6.5.8
                     "ryg",  //6.5.10-1080
+                    "rMZ",  //6.5.13-1081
                     "rLw",  //6.5.13-1100
             }[idx];
             Passwd_Text = new String[]{
                     "qVK",  //6.5.8
                     "ryz",  //6.5.10-1080
+                    "rNt",  //6.5.13-1081
                     "rLQ",  //6.5.13-1100
             }[idx];
             PreferenceAdapter_vpQ = new String[]{
                     "uoo",  //6.5.8
                     "uYA",  //6.5.10-1080
+                    "vrF",  //6.5.13-1081
                     "vpQ",  //6.5.13-1100
             }[idx];
             PreferenceAdapter_vpP = new String[]{
                     "uon",  //6.5.8
                     "uYz",  //6.5.10-1080
+                    "vrE",  //6.5.13-1081
                     "vpP",  //6.5.13-1100
             }[idx];
         }
@@ -97,16 +107,19 @@ private static void init(int idx) throws Throwable {
             Finger_icon = new int[]{
                     2130838280,  //6.5.8
                     2130838289,  //6.5.10-1080
+                    2130838298,  //6.5.13-1081
                     2130838298,  //6.5.13-1100
             }[idx];
             Finger_title = new int[]{
                     2131236833,  //6.5.8
                     2131236918,  //6.5.10-1080
+                    2131236963,  //6.5.13-1081
                     2131236964,  //6.5.13-1100
             }[idx];
             Passwd_title = new int[]{
                     2131236838,  //6.5.8
                     2131236923,  //6.5.10-1080
+                    2131236968,  //6.5.13-1081
                     2131236969,  //6.5.13-1100
             }[idx];
         }
@@ -127,17 +140,17 @@ public static boolean init(int versioncode, String versionName, LoadPackageParam
 
     public static int isSupportedVersion(int versionCode, String versionName) {
         if (versionName.contains("6.5.8")) {
-            sVersionIdx = 0;
             return 0;
         }
         if (versionName.contains("6.5.10") && versionCode == 1080) {
-            sVersionIdx = 1;
             return 1;
         }
-        if (versionName.contains("6.5.13") && versionCode == 1100) {
-            sVersionIdx = 2;
+        if (versionName.contains("6.5.13") && versionCode == 1081) {//Play版微信
             return 2;
         }
+        if (versionName.contains("6.5.13") && versionCode == 1100) {
+            return 3;
+        }
         return -1;
     }
 }

app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedWeChatPlugin.java

@@ -108,10 +108,10 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 }
             });
 
-            XposedHelpers.findAndHookConstructor(ObfuscationHelper.MM_Classes.Payview, Context.class, new XC_MethodHook() {
+            XposedHelpers.findAndHookConstructor(ObfuscationHelper.MM_Classes.PayView, Context.class, new XC_MethodHook() {
                 @TargetApi(21)
                 protected void afterHookedMethod(MethodHookParam param) throws Throwable {
-                    L.d("Payview Constructor");
+                    L.d("PayView Constructor");
 
                     if (mNeedFingerprint && mWalletPayUIActivity != null) {
                         initFingerPrintLock();
@@ -154,10 +154,10 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 }
             });
 
-            XposedHelpers.findAndHookMethod(ObfuscationHelper.MM_Classes.Payview, "dismiss", new XC_MethodHook() {
+            XposedHelpers.findAndHookMethod(ObfuscationHelper.MM_Classes.PayView, "dismiss", new XC_MethodHook() {
                 @TargetApi(21)
                 protected void afterHookedMethod(MethodHookParam param) throws Throwable {
-                    L.d("Payview dismiss");
+                    L.d("PayView dismiss");
                     if (mWalletPayUIActivity != null) {
                         mFingerprintIdentify.cancelIdentify();
                         mWalletPayUIActivity = null;