diff --git a/android/app/src/main/java/com/trust/ywx/BuzActivity.kt b/android/app/src/main/java/com/trust/ywx/BuzActivity.kt index 99ada18..b119a57 100644 --- a/android/app/src/main/java/com/trust/ywx/BuzActivity.kt +++ b/android/app/src/main/java/com/trust/ywx/BuzActivity.kt @@ -32,7 +32,14 @@ class BuzActivity : ReactActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) AppManager.addActivity(this) - Toast.makeText(this, "BuzActivity:" + NavigationHelper.routerName, Toast.LENGTH_SHORT).show() + Toast.makeText(this, "BuzActivity:" + NavigationHelper.routerName, Toast.LENGTH_SHORT) + .show() +// if (reactHost.lifecycleState != LifecycleState.RESUMED) { +// reactHost.onHostResume(this) +// } +// Handler(Looper.getMainLooper()).post { +// reactHost.reload("Requested by CodeUpdater") +// } } override fun onDestroy() { diff --git a/android/app/src/main/java/com/trust/ywx/MainApplication.kt b/android/app/src/main/java/com/trust/ywx/MainApplication.kt index 4a6be98..f35b2ad 100644 --- a/android/app/src/main/java/com/trust/ywx/MainApplication.kt +++ b/android/app/src/main/java/com/trust/ywx/MainApplication.kt @@ -23,20 +23,23 @@ class MainApplication : Application(), ReactApplication { add(NavigationPackage()) } + override fun getJSMainModuleName(): String = + if (getUseDeveloperSupport()) "index" else "commom" + + override fun getBundleAssetName(): String? = + if (getUseDeveloperSupport()) "index.android.bundle" else null + // -// override fun getJSMainModuleName(): String = -// if (getUseDeveloperSupport()) "index" else "commom" -// -// override fun getBundleAssetName(): String? = -// if (getUseDeveloperSupport()) "index.android.bundle" else null -// // override fun getJSBundleFile(): String? = if (getUseDeveloperSupport()) { // super.getJSBundleFile() // } else { // FileHelper.getFilePath("common.android.bundle", this@MainApplication, "bundles") // } - override fun getJSBundleFile(): String = + override fun getJSBundleFile(): String? = if (getUseDeveloperSupport()) { + null + } else { FileHelper.getFilePath("common.android.bundle", this@MainApplication, "bundles") + } override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG @@ -47,7 +50,7 @@ class MainApplication : Application(), ReactApplication { override val reactHost: ReactHost get() = getDefaultReactHost(applicationContext, reactNativeHost) - companion object{ + companion object { var isNew = true } diff --git a/android/app/src/main/java/com/trust/ywx/multiple/MultipleReactActivityDelegate.kt b/android/app/src/main/java/com/trust/ywx/multiple/MultipleReactActivityDelegate.kt index 2e63557..2f14e2f 100644 --- a/android/app/src/main/java/com/trust/ywx/multiple/MultipleReactActivityDelegate.kt +++ b/android/app/src/main/java/com/trust/ywx/multiple/MultipleReactActivityDelegate.kt @@ -58,7 +58,7 @@ class MultipleReactActivityDelegate( ), ) - this.loadApp("app") + this.loadApp(mainComponentName) } else { this.mReactDelegate = object : ReactDelegate(