From 1af4ff8525812babe10fd059a431e05149830bdb Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 23 Sep 2023 20:23:25 +0800 Subject: [PATCH] feat: add TAG & merge API_VERSION_NAME, API_VERSION_CODE to VERSION --- .../highcapable/yukihookapi/YukiHookAPI.kt | 30 +++++++++++++++---- .../yukihookapi/hook/log/LoggerFactory.kt | 4 +-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt b/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt index c211f2da..78f2771a 100644 --- a/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt +++ b/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt @@ -74,11 +74,31 @@ object YukiHookAPI { /** 标识是否从自定义 Hook API 装载 */ internal var isLoadedFromBaseContext = false - /** 获取当前 [YukiHookAPI] 的版本 */ - const val API_VERSION_NAME = YukiHookAPIProperties.PROJECT_YUKIHOOKAPI_CORE_VERSION + /** 标签名称 */ + const val TAG = YukiHookAPIProperties.PROJECT_NAME - /** 获取当前 [YukiHookAPI] 的版本号 */ - const val API_VERSION_CODE = 44 + /** 当前版本 */ + const val VERSION = YukiHookAPIProperties.PROJECT_YUKIHOOKAPI_CORE_VERSION + + /** + * 版本名称 + * + * - ❗此方法已弃用 - 在之后的版本中将直接被删除 + * + * - ❗请现在迁移到 [VERSION] + */ + @Deprecated(message = "不再区分版本名称和版本号", ReplaceWith("VERSION")) + const val API_VERSION_NAME = VERSION + + /** + * 版本号 + * + * - ❗此方法已弃用 - 在之后的版本中将直接被删除 + * + * - ❗请现在迁移到 [VERSION] + */ + @Deprecated(message = "不再区分版本名称和版本号", ReplaceWith("VERSION")) + const val API_VERSION_CODE = -1 /** * 当前 [YukiHookAPI] 的状态 @@ -464,7 +484,7 @@ object YukiHookAPI { if (Configs.isDebug.not() || isShowSplashLogOnceTime.not()) return isShowSplashLogOnceTime = false yLoggerI( - msg = "Welcome to YukiHookAPI $API_VERSION_NAME($API_VERSION_CODE)! Using ${Status.Executor.name} API ${Status.Executor.apiLevel}", + msg = "Welcome to YukiHookAPI $VERSION! Using ${Status.Executor.name} API ${Status.Executor.apiLevel}", isImplicit = true ) } diff --git a/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt b/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt index 137f4ab8..21abd334 100644 --- a/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt +++ b/yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt @@ -287,11 +287,11 @@ object YukiHookLogger { /** * 这是一个调试日志的全局标识 * - * 默认文案为 YukiHookAPI + * 默认文案为 [YukiHookAPI.TAG] * * 你可以修改为你自己的文案 */ - var tag = "YukiHookAPI" + var tag = YukiHookAPI.TAG /** * 自定义调试日志对外显示的元素