fix: 修改框架获取方法[#161]

Auto-Accounting · Apr 10, 2023 · b6b5fef · b6b5fef
1 parent 2648f6e
commit b6b5fef
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,14 +12,14 @@ static def releaseTimeMin() {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     defaultConfig {
         resConfigs('zh-rCN')
         applicationId "cn.dreamn.qianji_auto"
         minSdkVersion 24
-        targetSdkVersion 31
-        versionCode 187
-        versionName "涅槃 3.3.2"
+        targetSdkVersion 33
+        versionCode 188
+        versionName "涅槃 3.3.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {

diff --git a/app/src/main/java/cn/dreamn/qianji_auto/core/hook/hooks/auto/QianjiAuto.java b/app/src/main/java/cn/dreamn/qianji_auto/core/hook/hooks/auto/QianjiAuto.java
@@ -19,9 +19,13 @@
 
 import android.content.Context;
 
+import java.lang.reflect.Field;
+import java.util.Objects;
+
 import cn.dreamn.qianji_auto.BuildConfig;
 import cn.dreamn.qianji_auto.core.hook.core.hookBase;
 import de.robv.android.xposed.XC_MethodReplacement;
+import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 
 public class QianjiAuto extends hookBase {
@@ -32,8 +36,25 @@ public static hookBase getInstance() {
         return self;
     }
 
+    public static String getFrameWork() {
+
+
+        try {
+            Class<?> cls =  XposedBridge.class;
+            android.util.Log.d("Appingo", String.valueOf(cls));
+            Field field = cls.getDeclaredField("TAG");
+            field.setAccessible(true);
+            return Objects.requireNonNull(field.get(null)).toString().replace( "Bridge","")
+                    .replace("-","")
+                    .trim();
+        } catch (IllegalAccessException | NoSuchFieldException  e) {
+            return "Unknown";
+        }
+    }
     @Override
     public void hookLoadPackage() {
+        XposedHelpers.findAndHookMethod("cn.dreamn.qianji_auto.setting.AppInfo", mAppClassLoader, "getFrameWork", XC_MethodReplacement.returnConstant(getFrameWork()));
+
         XposedHelpers.findAndHookMethod("cn.dreamn.qianji_auto.setting.AppStatus", mAppClassLoader, "xposedActive", Context.class, XC_MethodReplacement.returnConstant(true));
     }
 

diff --git a/app/src/main/java/cn/dreamn/qianji_auto/setting/AppInfo.java b/app/src/main/java/cn/dreamn/qianji_auto/setting/AppInfo.java
@@ -22,18 +22,11 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.util.HashSet;
 import java.util.Objects;
-import java.util.Set;
 
 import cn.dreamn.qianji_auto.BuildConfig;
-import cn.dreamn.qianji_auto.R;
 import cn.dreamn.qianji_auto.utils.runUtils.Log;
 import de.robv.android.xposed.XposedBridge;
 
@@ -113,16 +106,8 @@ public static boolean isAppInstalled(Context context, String packagename) {
     }
 
     public static String getFrameWork() {
-        Class<XposedBridge> cls = XposedBridge.class;
-        try {
-            Field field = cls.getDeclaredField("TAG");
-            field.setAccessible(true);
-            return Objects.requireNonNull(field.get(null)).toString().replace( "Bridge","")
-                    .replace("-","")
-                    .trim();
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            return "Unknown";
-        }
+
+        return "Unknown";
     }
     /**
      * 获取当前app version code

diff --git a/app/src/main/java/cn/dreamn/qianji_auto/setting/AppStatus.java b/app/src/main/java/cn/dreamn/qianji_auto/setting/AppStatus.java
@@ -92,6 +92,7 @@ public static boolean defaultActive(Context context) {
 
     public static boolean xposedActive(Context context) {
 
+
         String frame = AppInfo.getFrameWork();
         if (frame.toLowerCase(Locale.ROOT).equals(context.getString(R.string.frame_taichi)))
             return taichiActive(context);

diff --git a/app/src/main/java/cn/dreamn/qianji_auto/ui/fragment/web/WebViewFragment.java b/app/src/main/java/cn/dreamn/qianji_auto/ui/fragment/web/WebViewFragment.java
@@ -222,7 +222,7 @@ protected void initViews() {
         webSettings.setJavaScriptEnabled(true);//允许使用js
         webSettings.setDomStorageEnabled(true);// 打开本地缓存提供JS调用,至关重要
         webSettings.setAllowFileAccess(true);
-        webSettings.setAppCacheEnabled(true);
+
         webSettings.setMediaPlaybackRequiresUserGesture(false);
         if (AppStatus.isDebug()) {
             WebView.setWebContentsDebuggingEnabled(true);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -227,8 +227,7 @@
     <string name="list_app" translatable="false">App数据列表</string>
     <string name="list_app_tip" translatable="false">捕获App内部信息，用于从App中获取交易信息。</string>
     <string name="notice_clean_body" translatable="false">确定清空列表中所有内容吗？</string>
-    <string name="frame_taichi" translatable="false">太极</string>
-    <string name="frame_bug" translatable="false">应用转生</string>
+    <string name="frame_taichi" translatable="false">taichi</string>
     <string name="frame_edxposed" translatable="false">EdXposed</string>
     <string name="frame_lsposed" translatable="false">LSPosed</string>
     <string name="frame_lsposed_old" translatable="false">LSPosed旧版</string>
@@ -434,5 +433,6 @@
     <string name="list_helper">无障碍数据列表</string>
     <string name="list_helper_tip">无障碍捕获页面信息，提取交易内容。</string>
     <string name="helper_not_support">无障碍用户不支持该功能。</string>
+    <string name="frame_lspatch">lspatch</string>
 
 </resources>