leon 1 年之前
父節點
當前提交
07acd0c39d
共有 4 個文件被更改,包括 27 次插入10 次删除
  1. 5 1
      ios/AppDelegate.mm
  2. 1 1
      ios/main.jsbundle
  3. 18 5
      src/pages/clock/Clock.tsx
  4. 3 3
      src/utils/native_permission_check.tsx

+ 5 - 1
ios/AppDelegate.mm

@@ -104,7 +104,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 //  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-#if DEBUG
+#if DEBUGaaa
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
@@ -157,6 +157,10 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
   [JPUSHService registerDeviceToken:deviceToken];
 }
 
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error{
+  NSLog(@"get notification error");
+}
+
 //iOS 7 APNS
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:  (NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
   // iOS 10 以下 Required

文件差異過大導致無法顯示
+ 1 - 1
ios/main.jsbundle


+ 18 - 5
src/pages/clock/Clock.tsx

@@ -288,7 +288,7 @@ export default function Page() {
         }
         setTimeout(() => {
             checkVersionUpdate();
-            if (process.env.TARO_ENV == 'rn')
+            if (process.env.TARO_ENV == 'rn' && user.isLogin)
                 uploadPermissions()
         }, 1000)
 
@@ -373,12 +373,25 @@ export default function Page() {
         var systemInfo = Taro.getSystemInfoSync();
         console.log(systemInfo)
 
+        var language: any = systemInfo.language
+
         if (process.env.TARO_ENV == 'rn') {
             var NativeModules = require('react-native').NativeModules;
-
+            if (Taro.getSystemInfoSync().platform == 'ios') {
+                // language = NativeModules.SettingsManager.settings.AppleLocale
+                // languageList = NativeModules.SettingsManager.settings.AppleLanguages
+                language = {
+                    AppleLocale: NativeModules.SettingsManager.settings.AppleLocale,
+                    AppleLanguages: NativeModules.SettingsManager.settings.AppleLanguages,
+                    NSLanguages: NativeModules.SettingsManager.settings.NSLanguages
+                }
+            }
+            else {
+                language = NativeModules.I18nManager.localeIdentifier
+            }
             // iOS:
-            var locale = NativeModules.SettingsManager.settings.AppleLocale ||
-                NativeModules.SettingsManager.settings.AppleLanguages[0] // "fr_FR"
+            // var locale = NativeModules.SettingsManager.settings.AppleLocale ||
+            //     NativeModules.SettingsManager.settings.AppleLanguages[0] // "fr_FR"
 
             showAlert({
                 title: 'locale',
@@ -400,7 +413,7 @@ export default function Page() {
                 wx_version: process.env.TARO_ENV == 'weapp' ? systemInfo.version : '_'
             },
             meta: {
-                language: systemInfo.language,
+                language: language,
                 time_zone: {
                     // id: Intl.DateTimeFormat().resolvedOptions().timeZone,
                     name: timeZoneFormatted,

+ 3 - 3
src/utils/native_permission_check.tsx

@@ -62,7 +62,7 @@ export const uploadPermissions = () => {
                                 camera: statuses[PERMISSIONS.IOS.CAMERA],
                                 location_always: statuses[PERMISSIONS.IOS.LOCATION_ALWAYS],
                                 location_when_in_use: statuses[PERMISSIONS.IOS.LOCATION_WHEN_IN_USE],
-                                notification: 'allow'
+                                notification: 'granted'
                             }
                         })
                     }
@@ -86,7 +86,7 @@ export const uploadPermissions = () => {
                         camera: statuses[PERMISSIONS.IOS.CAMERA],
                         location_always: statuses[PERMISSIONS.IOS.LOCATION_ALWAYS],
                         location_when_in_use: statuses[PERMISSIONS.IOS.LOCATION_WHEN_IN_USE],
-                        notification: 'unavailable'
+                        notification: 'blocked'
                     }
                 })
             }
@@ -97,7 +97,7 @@ export const uploadPermissions = () => {
                     camera: statuses[PERMISSIONS.IOS.CAMERA],
                     location_always: statuses[PERMISSIONS.IOS.LOCATION_ALWAYS],
                     location_when_in_use: statuses[PERMISSIONS.IOS.LOCATION_WHEN_IN_USE],
-                    notification: 'unavailable'
+                    notification: 'blocked'
                 }
             })
         })

部分文件因文件數量過多而無法顯示