1.10

Signed-off-by: RC1844 <1844766234@qq.com>
RC1844 · May 28, 2021 · eab0cce · eab0cce
1 parent 23236f4
commit eab0cce
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 30 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,8 +17,8 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
+//            minifyEnabled true
+//            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -46,7 +46,7 @@ android {
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:15.0'
+    implementation 'org.jetbrains:annotations:21.0.1'
     compileOnly 'de.robv.android.xposed:api:82'
     compileOnly 'de.robv.android.xposed:api:82:sources'
 }
diff --git a/app/src/main/java/com/xposed/miuiime/MainHook.kt b/app/src/main/java/com/xposed/miuiime/MainHook.kt
@@ -5,6 +5,11 @@ import de.robv.android.xposed.*
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 class MainHook : IXposedHookLoadPackage {
+    private val miuiImeList: List<String> = listOf(
+        "com.iflytek.inputmethod.miui",
+        "com.sohu.inputmethod.sogou.xiaomi", "com.baidu.input_mi", "com.miui.catcherpatch"
+    )
+
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
         //检查是否支持全面屏优化
         if (PropertyUtils["ro.miui.support_miui_ime_bottom", "0"] != "1") return
@@ -21,7 +26,7 @@ class MainHook : IXposedHookLoadPackage {
                 //将导航栏颜色赋值给输入法优化的底图
                 findAndHookMethod("com.android.internal.policy.PhoneWindow",
                     lpparam.classLoader, "setNavigationBarColor",
-                    Int::class.javaPrimitiveType, object : XC_MethodHook() {
+                    Int::class, object : XC_MethodHook() {
                         override fun afterHookedMethod(param: MethodHookParam) {
                             val color = -0x1 - param.args[0] as Int
                             XposedHelpers.callStaticMethod(
@@ -78,16 +83,23 @@ class MainHook : IXposedHookLoadPackage {
      *
      * @param clazz 声明或继承字段的类
      */
-    private fun hookSIsImeSupport(clazz: Class<*>) {
-        XposedHelpers.setStaticIntField(clazz, "sIsImeSupport", 1)
+    fun hookSIsImeSupport(clazz: Class<*>) {
+        try {
+//            XposedBridge.log("Hook field sIsImeSupport")
+            XposedHelpers.setStaticIntField(clazz, "sIsImeSupport", 1)
+            XposedBridge.log("Hook field sIsImeSupport success")
+        } catch (e: Throwable) {
+            XposedBridge.log("Hook field sIsImeSupport failed")
+            XposedBridge.log(e)
+        }
     }
 
     /**
      * 小爱语音输入按钮失效修复
      *
      * @param clazz 声明或继承方法的类
      */
-    private fun hookIsXiaoAiEnable(clazz: Class<*>) {
+    fun hookIsXiaoAiEnable(clazz: Class<*>) {
         findAndHookMethod(
             clazz, "isXiaoAiEnable",
             XC_MethodReplacement.returnConstant(false)
@@ -98,14 +110,13 @@ class MainHook : IXposedHookLoadPackage {
         clazz: Class<*>,
         methodName: String,
         vararg parameterTypesAndCallback: Any?
-    ): XC_MethodHook.Unhook? {
-        return try {
-            XposedBridge.log("Hook method $methodName")
+    ) {
+        try {
             XposedHelpers.findAndHookMethod(clazz, methodName, *parameterTypesAndCallback)
-        } catch (e: IllegalArgumentException) {
+            XposedBridge.log("Hook method $methodName success")
+        } catch (e: Throwable) {
             XposedBridge.log("Hook method $methodName failed")
             XposedBridge.log(e)
-            null
         }
     }
 
@@ -114,35 +125,25 @@ class MainHook : IXposedHookLoadPackage {
         classLoader: ClassLoader,
         methodName: String,
         vararg parameterTypesAndCallback: Any?
-    ): XC_MethodHook.Unhook? {
-        return try {
-            XposedBridge.log("Hook method $methodName")
-            XposedHelpers.findAndHookMethod(
-                XposedHelpers.findClass(className, classLoader),
+    ) {
+        findClass(className, classLoader)?.let {
+            findAndHookMethod(
+                it,
                 methodName,
                 *parameterTypesAndCallback
             )
-        } catch (e: IllegalArgumentException) {
-            XposedBridge.log("Hook method $methodName failed")
-            XposedBridge.log(e)
-            null
         }
     }
 
     fun findClass(className: String, classLoader: ClassLoader): Class<*>? {
         return try {
-            XposedBridge.log("Find class $className")
-            XposedHelpers.findClass(className, classLoader)
-        } catch (e: ClassNotFoundException) {
+            val clazz= XposedHelpers.findClass(className, classLoader)
+            XposedBridge.log("Find class $className success")
+            clazz
+        } catch (e: Throwable) {
             XposedBridge.log("Find class $className failed")
             XposedBridge.log(e)
             null
         }
     }
-
-    private val miuiImeList: List<String> = listOf(
-        "com.iflytek.inputmethod.miui",
-        "com.sohu.inputmethod.sogou.xiaomi", "com.baidu.input_mi", "com.miui.catcherpatch"
-    )
-
 }