Skip to content

Commit 3726639

Browse files
committed
Update android env
1 parent bdcc13c commit 3726639

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

android/app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ android {
8484
targetSdkVersion rootProject.ext.targetSdkVersion
8585
versionCode 1
8686
versionName "1.0"
87+
manifestPlaceholders = [
88+
usesCleartextTraffic: "true"
89+
]
8790
}
8891
signingConfigs {
8992
debug {

android/app/src/main/java/com/iotdfu/MainApplication.kt

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,41 @@ import android.app.Application
44
import android.content.res.Configuration
55
import com.facebook.react.PackageList
66
import com.facebook.react.ReactApplication
7-
import com.facebook.react.ReactHost
8-
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
9-
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
7+
import com.facebook.react.ReactNativeHost
8+
import com.facebook.react.ReactPackage
9+
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
10+
import com.facebook.react.defaults.DefaultReactNativeHost
11+
import com.facebook.soloader.SoLoader
1012
import expo.modules.ApplicationLifecycleDispatcher
13+
import expo.modules.ReactNativeHostWrapper
1114

1215
class MainApplication : Application(), ReactApplication {
1316

14-
override val reactHost: ReactHost by lazy {
15-
getDefaultReactHost(
16-
context = applicationContext,
17-
packageList =
18-
PackageList(this).packages.apply {
19-
// Packages that cannot be autolinked yet can be added manually here, for example:
20-
// add(MyReactNativePackage())
21-
},
17+
override val reactNativeHost: ReactNativeHost =
18+
ReactNativeHostWrapper(
19+
this,
20+
object : DefaultReactNativeHost(this) {
21+
override fun getPackages(): List<ReactPackage> =
22+
PackageList(this).packages.apply {
23+
// Packages that cannot be autolinked yet can be added manually here
24+
}
25+
26+
override fun getJSMainModuleName(): String = "index"
27+
28+
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
29+
30+
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
31+
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
32+
}
2233
)
23-
}
2434

2535
override fun onCreate() {
2636
super.onCreate()
37+
SoLoader.init(this, false)
38+
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
39+
load()
40+
}
2741
ApplicationLifecycleDispatcher.onApplicationCreate(this)
28-
loadReactNative(this)
2942
}
3043

3144
override fun onConfigurationChanged(newConfig: Configuration) {

0 commit comments

Comments
 (0)