core: 更新资源钩子 （有 Bug 就回退（））

Author: HChenX

gradle/libs.versions.toml

@@ -21,7 +21,7 @@ dexkit = "2.0.6"
 ezxhelper = "3.0.0"
 hiddenapibypass = "6.1"
 hyperfocusapi = "1.3"
-hooktool = "v.2.1.3"
+hooktool = "v.2.1.4"
 superLyricApi = "2.0"
 mmkv = "2.2.2"
 coreKtx = "1.16.0"

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/XposedInit.java

@@ -35,7 +35,6 @@
 import com.hchen.hooktool.HCInit;
 import com.sevtinge.hyperceiler.hook.module.app.VariousThirdApps;
 import com.sevtinge.hyperceiler.hook.module.base.BaseModule;
-import com.sevtinge.hyperceiler.hook.module.base.tool.ResourcesTool;
 import com.sevtinge.hyperceiler.hook.module.hook.systemframework.AllowManageAllNotifications;
 import com.sevtinge.hyperceiler.hook.module.hook.systemframework.AllowUninstall;
 import com.sevtinge.hyperceiler.hook.module.hook.systemframework.BackgroundBlurDrawable;
@@ -70,15 +69,11 @@
 public class XposedInit implements IXposedHookZygoteInit, IXposedHookLoadPackage {
     private static final String TAG = "HyperCeiler";
     public static String mModulePath = null;
-    public static ResourcesTool mResHook;
-
     // public static XmlTool mXmlTool;
     public final VariousThirdApps mVariousThirdApps = new VariousThirdApps();
 
     @Override
     public void initZygote(StartupParam startupParam) throws Throwable {
-        // load ResourcesTool
-        mResHook = new ResourcesTool(startupParam.modulePath);
         mModulePath = startupParam.modulePath;
         // mXmlTool = new XmlTool(startupParam);
         // load New XSPrefs

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/base/BaseHook.java

@@ -20,9 +20,7 @@
 
 import static com.sevtinge.hyperceiler.hook.utils.log.LogManager.logLevel;
 
-import com.sevtinge.hyperceiler.hook.XposedInit;
 import com.sevtinge.hyperceiler.hook.module.base.tool.HookTool;
-import com.sevtinge.hyperceiler.hook.module.base.tool.ResourcesTool;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -31,7 +29,6 @@
 
 public abstract class BaseHook extends HookTool {
     public String TAG = getClass().getSimpleName();
-    public static final ResourcesTool mResHook = XposedInit.mResHook;
     // public static final XmlTool mXmlTool = BaseXposedInit.mXmlTool;
     public static final String ACTION_PREFIX = "com.sevtinge.hyperceiler.module.action.";
 

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/base/BaseModule.java

@@ -20,12 +20,9 @@
 
 import com.hchen.hooktool.HCBase;
 import com.hchen.hooktool.HCInit;
-import com.sevtinge.hyperceiler.hook.XposedInit;
 import com.sevtinge.hyperceiler.hook.module.base.dexkit.DexKit;
 import com.sevtinge.hyperceiler.hook.module.base.tool.AppsTool;
 import com.sevtinge.hyperceiler.hook.safe.CrashData;
-import com.sevtinge.hyperceiler.hook.utils.ContextUtils;
-import com.sevtinge.hyperceiler.hook.utils.api.ProjectApi;
 import com.sevtinge.hyperceiler.hook.utils.log.XposedLogUtils;
 import com.sevtinge.hyperceiler.hook.utils.prefs.PrefsMap;
 import com.sevtinge.hyperceiler.hook.utils.prefs.PrefsUtils;
@@ -56,17 +53,18 @@ public void init(LoadPackageParam lpparam) {
         }
         HCInit.initLoadPackageParam(lpparam);
         // 把模块资源加载到目标应用
-        try {
-            if (!ProjectApi.mAppModulePkg.equals(lpparam.packageName)) {
-                ContextUtils.getWaitContext(context -> {
-                    if (context != null) {
-                        XposedInit.mResHook.loadModuleRes(context);
-                    }
-                }, "android".equals(lpparam.packageName));
-            }
-        } catch (Throwable e) {
-            XposedLogUtils.logE(TAG, "get context failed!" + e);
-        }
+        // 不需要了
+        // try {
+        //     if (!ProjectApi.mAppModulePkg.equals(lpparam.packageName)) {
+        //         ContextUtils.getWaitContext(context -> {
+        //             if (context != null) {
+        //                 XposedInit.mResHook.loadModuleRes(context);
+        //             }
+        //         }, "android".equals(lpparam.packageName));
+        //     }
+        // } catch (Throwable e) {
+        //     XposedLogUtils.logE(TAG, "get context failed!" + e);
+        // }
 
         mLoadPackageParam = lpparam;
         DexKit.ready(lpparam, TAG);

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/base/tool/OtherTool.java

@@ -36,6 +36,7 @@
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import com.hchen.hooktool.utils.ResInjectTool;
 import com.sevtinge.hyperceiler.hook.R;
 import com.sevtinge.hyperceiler.hook.utils.ContextUtils;
 import com.sevtinge.hyperceiler.hook.utils.blur.MiBlurUtils;
@@ -55,7 +56,7 @@ public class OtherTool {
 
     public static Resources getModuleRes(Context context)
             throws PackageManager.NameNotFoundException {
-        return ResourcesTool.loadModuleRes(context);
+        return ResInjectTool.injectModuleRes(context.getResources());
     }
 
     public static Context findContext(@ContextUtils.Duration int flag) {