From ba163c9367db4579dc8a39b177736e321357d360 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 21 Jan 2023 00:07:04 +0800 Subject: [PATCH] Modify change naming of "HookEntryClass" to "hook entry class" in InjectYukiHookWithXposed, YukiHookXposedProcessor, CodeSourceFileFactory --- .../yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt | 4 ++-- .../yukihookapi_ksp_xposed/factory/CodeSourceFileFactory.kt | 4 ++-- .../yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt index 0b086711..70bbb6ff 100644 --- a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt +++ b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt @@ -155,13 +155,13 @@ class YukiHookXposedProcessor : SymbolProcessorProvider { data.isEntryClassKindOfObject = when (it.classKind) { ClassKind.CLASS -> false ClassKind.OBJECT -> true - else -> problem(msg = "Invalid HookEntryClass \"${it.simpleName.asString()}\" kind \"${it.classKind}\"") + else -> problem(msg = "Invalid hook entry class \"${it.simpleName.asString()}\" kind \"${it.classKind}\"") } generateAssetsFile(codePath = (it.location as? FileLocation?)?.filePath ?: "", sourcePath = sourcePath, data) } it.superTypes.any { type -> type.element.toString() == "YukiHookXposedInitProxy" } -> problem(msg = "\"YukiHookXposedInitProxy\" was deprecated, please replace to \"IYukiHookXposedInit\"") - else -> problem(msg = "HookEntryClass \"${it.simpleName.asString()}\" must be implements \"IYukiHookXposedInit\"") + else -> problem(msg = "The hook entry class \"${it.simpleName.asString()}\" must be implements \"IYukiHookXposedInit\"") } else problem(msg = "\"@InjectYukiHookWithXposed\" only can be use in once times") /** 仅处理第一个标记的类 - 再次处理将拦截并报错 */ isInjectOnce = false diff --git a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/factory/CodeSourceFileFactory.kt b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/factory/CodeSourceFileFactory.kt index 26431eac..4007905a 100644 --- a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/factory/CodeSourceFileFactory.kt +++ b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/factory/CodeSourceFileFactory.kt @@ -78,7 +78,7 @@ private fun createCommentContent(entryClassName: String = "", currrentClassTag: " *\n" + " * Compiled from YukiHookXposedProcessor\n" + " *\n" + - (if (entryClassName.isNotBlank()) " * HookEntryClass: [$entryClassName]\n *\n" else "") + + (if (entryClassName.isNotBlank()) " * Hook entry class: [$entryClassName]\n *\n" else "") + " * Generate Date: ${SimpleDateFormat.getDateTimeInstance().format(Date())}\n" + " *\n" + " * Powered by YukiHookAPI (C) HighCapable 2019-2023\n" + @@ -237,7 +237,7 @@ fun GenerateData.sources() = mapOf( " }\n" + " hookEntry.onHook()\n" + " YukiXposedModuleCaller.callOnFinishLoadModule()\n" + - " }.onFailure { YukiXposedModuleCaller.internalLoggerE(\"YukiHookAPI try to load HookEntryClass failed\", it) }\n" + + " }.onFailure { YukiXposedModuleCaller.internalLoggerE(\"YukiHookAPI try to load hook entry class failed\", it) }\n" + " YukiXposedModuleCaller.callOnPackageLoaded(\n" + " type = when {\n" + " isZygoteLoaded -> HookEntryType.ZYGOTE\n" + diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt index 0d02949a..31f49067 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt @@ -55,7 +55,7 @@ import de.robv.android.xposed.IXposedHookInitPackageResources * For English version, see [InjectYukiHookWithXposed Annotation](https://fankes.github.io/YukiHookAPI/en/config/xposed-using#injectyukihookwithxposed-annotation) * @param sourcePath 你的项目 source 相对路径 - 默认为 ..src/main.. * @param modulePackageName 模块包名 - 不填默认自动生成 - * @param entryClassName 定义 [YukiHookAPI] 自动生成 Xposed 模块入口类的名称 - 不填默认使用 HookEntryClass_YukiHookXposedInit 进行生成 + * @param entryClassName 定义 [YukiHookAPI] 自动生成 Xposed 模块入口类的名称 - 不填默认使用 "入口类名_YukiHookXposedInit" 进行生成 * @param isUsingResourcesHook 是否启用 Resources Hook (资源钩子) - 启用后将自动注入 [IXposedHookInitPackageResources] - 默认是 */ @Target(AnnotationTarget.CLASS)