ソースを参照

修复iOS地图崩溃

wudebin 2 年 前
コミット
d51e9549a5

+ 7 - 4
Strides-APP/index.js

@@ -4,7 +4,7 @@
  */
 import React, { Component } from 'react';
 import './app/i18n'
-import {AppRegistry, KeyboardAvoidingView} from 'react-native';
+import {AppRegistry, KeyboardAvoidingView, StyleSheet} from 'react-native';
 import 'react-native-gesture-handler';
 import './app/utils/themes'
 import './app/utils/constant';
@@ -40,11 +40,14 @@ class Index extends Component {
       <RootSiblingParent>
         <MyStatusBar/>
         { this.state.visible 
-          ? isIOS
-            ? <KeyboardAvoidingView style={ui.flex1} behavior="padding">
+          ? (isIOS
+            ? <KeyboardAvoidingView
+                style={ui.flex1}
+                contentContainerStyle={{top: 0, height: "100%"}}
+                behavior="position">
                 <Router/>
               </KeyboardAvoidingView>
-            : <Router/>
+            : <Router/>)
           : <></>
         }
         <ModalPortal />

+ 1 - 1
Strides-APP/ios/Podfile

@@ -65,7 +65,7 @@ target 'Strides' do
   flags = get_default_flags()
 
   # 谷歌地图服务
-  # pod 'Google-Maps-iOS-Utils', :git => 'https://github.com/Simon-TechForm/google-maps-ios-utils.git', :branch => 'feat/support-apple-silicon'
+  pod 'Google-Maps-iOS-Utils', :git => 'https://github.com/Simon-TechForm/google-maps-ios-utils.git', :branch => 'feat/support-apple-silicon'
   rn_maps_path = '../node_modules/react-native-maps'
   pod 'react-native-google-maps', :path => rn_maps_path
   # pod 'GoogleMaps', '3.5.0'

+ 8 - 8
Strides-APP/ios/Strides.xcodeproj/project.pbxproj

@@ -1812,9 +1812,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Strides/Strides.entitlements;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 220;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_INPUT_FILETYPE = automatic;
 				INFOPLIST_FILE = Strides/Info.plist;
@@ -1864,9 +1864,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Strides/Strides.entitlements;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 220;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_INPUT_FILETYPE = automatic;
 				INFOPLIST_FILE = Strides/Info.plist;
@@ -1939,10 +1939,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -2008,10 +2008,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

+ 1 - 1
Strides-APP/package.json

@@ -49,7 +49,7 @@
     "react-native-image-crop-picker": "^0.40.0",
     "react-native-map-clustering": "^3.4.2",
     "react-native-map-link": "^2.7.27",
-    "react-native-maps": "2.0.0-beta.8",
+    "react-native-maps": "2.0.0-beta.2",
     "react-native-modal": "^13.0.1",
     "react-native-modal-datetime-picker": "^17.1.0",
     "react-native-pager-view": "^6.2.0",