Przeglądaj źródła

Upgrade RN framework

wudebin 2 miesięcy temu
rodzic
commit
36c70ea07a

+ 3 - 8
Strides-SPAPP/android/app/src/main/java/com/strides/chargeco/MainActivity.kt

@@ -6,6 +6,7 @@ import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
 import com.facebook.react.defaults.DefaultReactActivityDelegate
+import com.swmansion.rnscreens.fragment.restoration.RNScreensFragmentFactory
 
 class MainActivity : ReactActivity() {
 
@@ -16,8 +17,8 @@ class MainActivity : ReactActivity() {
   override fun getMainComponentName(): String = "Strides"
 
   override fun onCreate(savedInstanceState: Bundle?) {
-    // 关键点:传入 null 而不是 savedInstanceState
-    super.onCreate(null)
+    supportFragmentManager.fragmentFactory = RNScreensFragmentFactory()
+    super.onCreate(savedInstanceState)
   }
 
   /**
@@ -27,10 +28,4 @@ class MainActivity : ReactActivity() {
   override fun createReactActivityDelegate(): ReactActivityDelegate =
       DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
 
-  override fun onSaveInstanceState(outState: Bundle) {
-      // 清空 Fragment 状态,防止 ScreenFragment crash
-      outState.putParcelable("android:support:fragments", null)
-      // 调用父类方法保存其他状态
-      super.onSaveInstanceState(outState)
-  }
 }

+ 2 - 2
Strides-SPAPP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Thu Apr 09 18:16:28 CST 2026
-VERSION_CODE=868
+#Fri Apr 10 15:01:26 CST 2026
+VERSION_CODE=870

+ 1 - 1
Strides-SPAPP/app/pages/Router.js

@@ -86,7 +86,7 @@ export var PageList = {
   },
   'home': {
     component: Home,
-    options: TransitionPresets.RevealFromBottomAndroid//.FadeFromBottomAndroid
+    options: TransitionPresets.ScaleFromCenterAndroid//.FadeFromBottomAndroid
   },
   'bridge': {
     component: BridgePage

+ 20 - 20
Strides-SPAPP/package.json

@@ -20,10 +20,11 @@
   },
   "dependencies": {
     "@allisonadam81/react-native-super-clusters": "^0.0.1",
-    "@react-native-async-storage/async-storage": "2.0.0",
-    "@react-native-camera-roll/camera-roll": "7.9.0",
+    "@react-native-async-storage/async-storage": "2.1.2",
+    "@react-native-camera-roll/camera-roll": "7.10.0",
     "@react-native-clipboard/clipboard": "1.16.3",
     "@react-native-community/checkbox": "0.5.20",
+    "@react-native-community/datetimepicker": "8.5.1",
     "@react-native-community/geolocation": "3.4.0",
     "@react-native-community/push-notification-ios": "1.11.0",
     "@react-native-firebase/app": "23.8.6",
@@ -46,10 +47,10 @@
     "@react-native-vector-icons/material-icons": "file:node_modules/@react-native-vector-icons/material-icons",
     "@react-native-vector-icons/octicons": "file:node_modules/@react-native-vector-icons/octicons",
     "@react-native-vector-icons/zocial": "file:node_modules/@react-native-vector-icons/zocial",
-    "@react-navigation/drawer": "7.1.1",
-    "@react-navigation/material-top-tabs": "7.1.0",
-    "@react-navigation/native": "7.1.14",
-    "@react-navigation/stack": "7.4.2",
+    "@react-navigation/drawer": "7.9.8",
+    "@react-navigation/material-top-tabs": "7.4.23",
+    "@react-navigation/native": "7.1.34",
+    "@react-navigation/stack": "7.8.9",
     "@shopify/react-native-skia": "2.0.7",
     "axios": "1.7.9",
     "react": "19.0.0",
@@ -60,25 +61,24 @@
     "react-native-image-crop-picker": "0.51.1",
     "react-native-linear-gradient": "2.8.3",
     "react-native-map-clustering": "3.4.2",
-    "react-native-map-link": "2.11.2",
-    "react-native-maps": "1.25.1",
+    "react-native-map-link": "3.9.0",
+    "react-native-maps": "https://gitee.com/vbes/react-native-maps-arch.git",
     "react-native-modal": "^13.0.2",
-    "react-native-modal-datetime-picker": "^18.0.0",
-    "react-native-pager-view": "6.5.1",
-    "react-native-permissions": "5.4.0",
+    "react-native-modal-datetime-picker": "18.0.0",
+    "react-native-pager-view": "8.0.0",
+    "react-native-permissions": "5.4.1",
     "react-native-progress": "5.0.1",
     "react-native-push-notification": "8.1.1",
     "react-native-reanimated": "3.18.0",
     "react-native-root-siblings": "5.0.1",
     "react-native-root-toast": "4.0.1",
-    "react-native-safe-area-context": "^5.4.1",
-    "react-native-screens": "4.13.1",
-    "react-native-svg": "15.11.1",
+    "react-native-safe-area-context": "5.4.1",
+    "react-native-screens": "4.18.0",
+    "react-native-svg": "15.12.0",
     "react-native-swiper": "1.6.0",
     "react-native-tab-view": "4.0.5",
     "react-native-view-shot": "4.0.0",
-    "react-native-vision-camera": "^4.7.3",
-    "react-native-web": "0.19.13",
+    "react-native-vision-camera": "4.7.3",
     "react-native-webview": "13.15.0",
     "vbe-cluster-map": "https://gitee.com/vbes/vbe-cluster-map2.git",
     "victory-native": "41.20.2"
@@ -87,9 +87,9 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
     "@babel/runtime": "^7.25.0",
-    "@react-native-community/cli": "15.0.1",
-    "@react-native-community/cli-platform-android": "15.0.1",
-    "@react-native-community/cli-platform-ios": "15.0.1",
+    "@react-native-community/cli": "18.0.0",
+    "@react-native-community/cli-platform-android": "18.0.0",
+    "@react-native-community/cli-platform-ios": "18.0.0",
     "@react-native/babel-preset": "0.78.3",
     "@react-native/eslint-config": "0.78.3",
     "@react-native/metro-config": "0.78.3",
@@ -107,7 +107,7 @@
     "typescript": "5.0.4"
   },
   "resolutions": {
-    "react-native-permissions": "5.4.0"
+    "react-native-permissions": "5.4.1"
   },
   "overrides": {},
   "engines": {