optimize

GangJust · Jul 6, 2024 · 187cc3d · 187cc3d
1 parent 4b4dbf9
commit 187cc3d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/core/src/main/java/io/github/fplus/plugin/PluginResources.kt b/core/src/main/java/io/github/fplus/plugin/PluginResources.kt
@@ -37,9 +37,7 @@ class PluginResources(
  originResources
  } else {
  val assetManager = AssetManager::class.java.newInstance()
- assetManager.findMethodInvoke<Any>(KtXposedHelpers.modulePath) {
- parameterTypes(listOf(String::class.java))
- }
+ assetManager.findMethodInvoke<Any>(KtXposedHelpers.modulePath) { name("addAssetPath") }
  Resources(assetManager, originResources.displayMetrics, originResources.configuration)
  }
  }

diff --git a/core/src/main/java/io/github/fplus/plugin/base/BaseActivity.kt b/core/src/main/java/io/github/fplus/plugin/base/BaseActivity.kt
@@ -25,7 +25,7 @@ import androidx.savedstate.SavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 
 open class BaseActivity : Activity(),
- IXplerActivity,
+ IPluginActivity,
  ContextAware,
  LifecycleOwner,
  ViewModelStoreOwner,

diff --git a/core/src/main/java/io/github/fplus/plugin/base/BaseComponentActivity.kt b/core/src/main/java/io/github/fplus/plugin/base/BaseComponentActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 
 
-open class BaseComponentActivity : ComponentActivity(), IXplerActivity {
+open class BaseComponentActivity : ComponentActivity(), IPluginActivity {
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
  }

diff --git a/...ithub/fplus/plugin/base/IXplerActivity.kt → ...thub/fplus/plugin/base/IPluginActivity.kt b/...ithub/fplus/plugin/base/IXplerActivity.kt → ...thub/fplus/plugin/base/IPluginActivity.kt
@@ -1,5 +1,5 @@
 package io.github.fplus.plugin.base
 
-interface IXplerActivity {
+interface IPluginActivity {
 
 }
diff --git a/core/src/main/java/io/github/fplus/plugin/dialog/XplerDialog.kt b/core/src/main/java/io/github/fplus/plugin/dialog/XplerDialog.kt
@@ -22,7 +22,7 @@ abstract class XplerDialog(context: Context) : BaseXplerDialog(context) {
  setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
  requestFeature(Window.FEATURE_NO_TITLE)
  WindowCompat.setDecorFitsSystemWindows(this, false)
- WindowCompat.getInsetsController(this, decorView).hide(WindowInsetsCompat.Type.systemBars())
+ // WindowCompat.getInsetsController(this, decorView).hide(WindowInsetsCompat.Type.systemBars())
  }
  }
 

diff --git a/core/src/main/java/io/github/fplus/plugin/proxy/v1/PluginInstrumentation.kt b/core/src/main/java/io/github/fplus/plugin/proxy/v1/PluginInstrumentation.kt
@@ -13,7 +13,7 @@ import android.os.PersistableBundle
 import androidx.annotation.Keep
 import androidx.annotation.RequiresApi
 import com.freegang.extension.classLoader
-import io.github.fplus.plugin.base.IXplerActivity
+import io.github.fplus.plugin.base.IPluginActivity
 import io.github.xpler.loader.moduleClassloader
 import java.lang.reflect.Method
 
@@ -135,7 +135,7 @@ class PluginInstrumentation(
  if (intent?.component != null) {
  try {
  val pluginClazz = pluginClassloader?.loadClass(intent.component?.className)
- if (pluginClazz != null && IXplerActivity::class.java.isAssignableFrom(pluginClazz)) {
+ if (pluginClazz != null && IPluginActivity::class.java.isAssignableFrom(pluginClazz)) {
  newIntent = Intent().apply { setClassName(who!!, stubActivity) }
  intent.extras?.let { newIntent.putExtras(it) }
  newIntent.putExtra(PLUGIN_PROXY_ACTIVITY, pluginClazz.name)

diff --git a/core/src/main/java/io/github/fplus/plugin/proxy/v2/PluginBridgeV2.kt b/core/src/main/java/io/github/fplus/plugin/proxy/v2/PluginBridgeV2.kt
@@ -11,7 +11,7 @@ import android.os.Handler
 import android.os.Message
 import com.freegang.extension.classLoader
 import com.freegang.ktutils.log.KLogCat
-import io.github.fplus.plugin.base.IXplerActivity
+import io.github.fplus.plugin.base.IPluginActivity
 import io.github.xpler.loader.moduleClassloader
 import java.lang.reflect.InvocationHandler
 import java.lang.reflect.InvocationTargetException
@@ -430,7 +430,7 @@ object PluginBridgeV2 {
  // 是否模块Activity,
  return try {
  val pluginActivityClazz = classLoader.loadClass(pluginActivityClassName) ?: return false
- IXplerActivity::class.java.isAssignableFrom(pluginActivityClazz)
+ IPluginActivity::class.java.isAssignableFrom(pluginActivityClazz)
  } catch (e: ClassNotFoundException) {
  false
  }