|
|
@@ -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,
|