Fix a bug and Merge code

2025-09-04 09:45:19 +08:00 · 2022-03-18 02:06:43 +08:00
parent 3875a7d73c
commit 07e45dae89
15 changed files with 31 additions and 28 deletions
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("MemberVisibilityCanBePrivate", "unused", "OPT_IN_USAGE")
+@file:Suppress("MemberVisibilityCanBePrivate", "unused", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi

@@ -57,6 +57,9 @@ object YukiHookAPI {
    /** Xposed Hook API 方法体回调 */
    private var packageParamCallback: (PackageParam.() -> Unit)? = null

+    /** 是否还未输出欢迎信息 */
+    private var isShowSplashLogOnceTime = true
+
    /** 获取当前 [YukiHookAPI] 的版本 */
    const val API_VERSION_NAME = "1.0.4"

@@ -144,7 +147,7 @@ object YukiHookAPI {
                    appClassLoader = lpparam.classLoader,
                    appInfo = lpparam.appInfo
                )
-            ).apply { printHelloMsg() }
+            ).apply { printSplashLog() }
        )

    /**
@@ -159,7 +162,7 @@ object YukiHookAPI {
        isLoadedFromBaseContext = false
        if (hasXposedBridge)
            packageParamCallback = initiate
-        else printNoXposedBridge()
+        else printNoXposedEnvLog()
    }

    /**
@@ -179,7 +182,7 @@ object YukiHookAPI {
                    hooker.forEach { it.assignInstance(packageParam = this) }
                else yLoggerE(msg = "Failed to passing \"encase\" method because your hooker param is empty")
            }
-        else printNoXposedBridge()
+        else printNoXposedEnvLog()
    }

    /**
@@ -197,9 +200,10 @@ object YukiHookAPI {
     */
    fun encase(baseContext: Context?, initiate: PackageParam.() -> Unit) {
        isLoadedFromBaseContext = true
-        if (hasXposedBridge)
-            (if (baseContext != null) initiate.invoke(baseContext.packagePararm.apply { printHelloMsg() }))
-        else printNoXposedBridge()
+        when {
+            hasXposedBridge && baseContext != null -> initiate.invoke(baseContext.packagePararm.apply { printSplashLog() })
+            else -> printNoXposedEnvLog()
+        }
    }

    /**
@@ -221,19 +225,20 @@ object YukiHookAPI {
        if (hasXposedBridge)
            (if (baseContext != null)
                if (hooker.isNotEmpty()) {
-                    printHelloMsg()
+                    printSplashLog()
                    hooker.forEach { it.assignInstance(packageParam = baseContext.packagePararm) }
                } else yLoggerE(msg = "Failed to passing \"encase\" method because your hooker param is empty"))
-        else printNoXposedBridge()
+        else printNoXposedEnvLog()
    }

    /** 输出找不到 [XposedBridge] 的错误日志 */
-    private fun printNoXposedBridge() = yLoggerE(msg = "Could not found XposedBridge in current space! Aborted")
+    private fun printNoXposedEnvLog() = yLoggerE(msg = "Could not found XposedBridge in current space! Aborted")

    /** 输出欢迎信息调试日志 */
-    private fun printHelloMsg() {
-        if (Configs.isDebug)
-            yLoggerI(msg = "Welcome to YukiHookAPI $API_VERSION_NAME($API_VERSION_CODE)! Using Xposed API $hookingXposedApiVersion")
+    private fun printSplashLog() {
+        if (!Configs.isDebug || !isShowSplashLogOnceTime) return
+        isShowSplashLogOnceTime = false
+        yLoggerI(msg = "Welcome to YukiHookAPI $API_VERSION_NAME($API_VERSION_CODE)! Using Xposed API $hookingXposedApiVersion")
    }

    /**
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/DoNotUseClass.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/DoNotUseClass.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("OPT_IN_IS_NOT_ENABLED")
+@file:Suppress("OPT_IN_IS_NOT_ENABLED", "EXPERIMENTAL_IS_NOT_ENABLED")

 package com.highcapable.yukihookapi.annotation

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/DoNotUseField.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/DoNotUseField.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("OPT_IN_IS_NOT_ENABLED")
+@file:Suppress("OPT_IN_IS_NOT_ENABLED", "EXPERIMENTAL_IS_NOT_ENABLED")

 package com.highcapable.yukihookapi.annotation

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/DoNotUseMethod.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/DoNotUseMethod.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("OPT_IN_IS_NOT_ENABLED")
+@file:Suppress("OPT_IN_IS_NOT_ENABLED", "EXPERIMENTAL_IS_NOT_ENABLED")

 package com.highcapable.yukihookapi.annotation

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt
@@ -25,8 +25,6 @@
 *
 * This file is Created by fankes on 2022/2/3.
 */
-@file:Suppress("unused")
-
 package com.highcapable.yukihookapi.annotation.xposed

 import com.highcapable.yukihookapi.YukiHookAPI
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiHookCreater.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiHookCreater.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("MemberVisibilityCanBePrivate", "unused", "OPT_IN_USAGE")
+@file:Suppress("MemberVisibilityCanBePrivate", "unused", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi.hook.core

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/ConstructorFinder.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/ConstructorFinder.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/4.
 */
-@file:Suppress("unused", "OPT_IN_USAGE", "MemberVisibilityCanBePrivate", "UNCHECKED_CAST")
+@file:Suppress("unused", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE", "MemberVisibilityCanBePrivate", "UNCHECKED_CAST")

 package com.highcapable.yukihookapi.hook.core.finder

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/FieldFinder.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/FieldFinder.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/4.
 */
-@file:Suppress("unused", "UNCHECKED_CAST", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE")
+@file:Suppress("unused", "UNCHECKED_CAST", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi.hook.core.finder

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/MethodFinder.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/MethodFinder.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/4.
 */
-@file:Suppress("unused", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE", "UNCHECKED_CAST")
+@file:Suppress("unused", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE", "UNCHECKED_CAST")

 package com.highcapable.yukihookapi.hook.core.finder

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/factory/ReflectionFactory.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/factory/ReflectionFactory.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("unused", "OPT_IN_USAGE")
+@file:Suppress("unused", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi.hook.factory

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("unused", "MemberVisibilityCanBePrivate", "UNCHECKED_CAST", "OPT_IN_USAGE")
+@file:Suppress("unused", "MemberVisibilityCanBePrivate", "UNCHECKED_CAST", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi.hook.param

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/2.
 */
-@file:Suppress("unused", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE")
+@file:Suppress("unused", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi.hook.param

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/7.
 */
-@file:Suppress("unused", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE")
+@file:Suppress("unused", "MemberVisibilityCanBePrivate", "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi.hook.param.wrapper

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt
@@ -25,7 +25,7 @@
 *
 * This file is Created by fankes on 2022/2/5.
 */
-@file:Suppress("OPT_IN_USAGE")
+@file:Suppress("OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE")

 package com.highcapable.yukihookapi.hook.utils

--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs.kt
@@ -26,7 +26,7 @@
 * This file is Created by fankes on 2022/2/8.
 */
@file:Suppress(
-    "OPT_IN_USAGE", "SetWorldReadable", "CommitPrefEdits",
+    "OPT_IN_USAGE", "EXPERIMENTAL_API_USAGE", "SetWorldReadable", "CommitPrefEdits",
    "DEPRECATION", "WorldReadableFiles", "unused"
 )