From 8139f15bea01089c147d73415c8b8ba80c070c83 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Tue, 8 Feb 2022 01:35:49 +0800
Subject: [PATCH] ...

---
 .../api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt  | 6 +++---
 .../com/highcapable/yukihookapi/hook/param/PackageParam.kt | 3 ++-
 .../PackageParamWrapper.kt}                                | 7 ++++---
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/{EnvironmentParam.kt => wrapper/PackageParamWrapper.kt} (90%)

diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt
index 4a7b1c64..3dbeda84 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt
@@ -36,7 +36,7 @@ import com.highcapable.yukihookapi.YukiHookAPI.encase
 import com.highcapable.yukihookapi.annotation.DoNotUseMethod
 import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker
 import com.highcapable.yukihookapi.hook.factory.processName
-import com.highcapable.yukihookapi.hook.param.EnvironmentParam
+import com.highcapable.yukihookapi.hook.param.wrapper.PackageParamWrapper
 import com.highcapable.yukihookapi.hook.param.PackageParam
 import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 import de.robv.android.xposed.callbacks.XC_LoadPackage
@@ -107,7 +107,7 @@ object YukiHookAPI {
     fun onXposedLoaded(lpparam: XC_LoadPackage.LoadPackageParam) =
         packageParamCallback?.invoke(
             PackageParam(
-                EnvironmentParam(
+                PackageParamWrapper(
                     packageName = lpparam.packageName,
                     processName = lpparam.processName,
                     appClassLoader = lpparam.classLoader,
@@ -220,5 +220,5 @@ object YukiHookAPI {
      * @return [PackageParam]
      */
     private val Context.packagePararm
-        get() = PackageParam(EnvironmentParam(packageName, processName, classLoader, applicationInfo))
+        get() = PackageParam(PackageParamWrapper(packageName, processName, classLoader, applicationInfo))
 }
\ No newline at end of file
diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt
index e9fe8f67..67a9150c 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt
@@ -33,12 +33,13 @@ import android.content.pm.ApplicationInfo
 import com.highcapable.yukihookapi.annotation.DoNotUseMethod
 import com.highcapable.yukihookapi.hook.core.YukiHookCreater
 import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker
+import com.highcapable.yukihookapi.hook.param.wrapper.PackageParamWrapper
 
 /**
  * 装载 Hook 的目标 APP 入口对象实现类
  * @param baseParam 对接环境装载类的实现 - 默认是空的
  */
-open class PackageParam(private var baseParam: EnvironmentParam? = null) {
+open class PackageParam(private var baseParam: PackageParamWrapper? = null) {
 
     /**
      * 获取当前 APP 的 [ClassLoader]
diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/EnvironmentParam.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt
similarity index 90%
rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/EnvironmentParam.kt
rename to yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt
index 05dd4e35..871d583c 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/EnvironmentParam.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt
@@ -27,18 +27,19 @@
  */
 @file:Suppress("unused", "MemberVisibilityCanBePrivate", "EXPERIMENTAL_API_USAGE")
 
-package com.highcapable.yukihookapi.hook.param
+package com.highcapable.yukihookapi.hook.param.wrapper
 
 import android.content.pm.ApplicationInfo
+import com.highcapable.yukihookapi.hook.param.PackageParam
 
 /**
- * Hook 环境装载实现类
+ * 用于包装 [PackageParam]
  * @param packageName 包名
  * @param processName 当前进程名
  * @param appClassLoader APP [ClassLoader]
  * @param appInfo APP [ApplicationInfo]
  */
-class EnvironmentParam(
+class PackageParamWrapper(
     var packageName: String,
     var processName: String,
     var appClassLoader: ClassLoader,