@dcloudio/uni-mp-toutiao 3.0.0-alpha-3041320220527004 → 3.0.0-alpha-3041320220607001

package/dist/uni.api.esm.js

@@ -1,4 +1,5 @@
 import { isArray, hasOwn, isString, isPlainObject, isObject, capitalize, toRawType, makeMap, isFunction, isPromise, remove, extend } from '@vue/shared';
+import { normalizeLocale, LOCALE_EN } from '@dcloudio/uni-i18n';
 import { Emitter, onCreateVueApp, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
 
 const eventChannels = {};
@@ -774,7 +775,7 @@ const getLocale = () => {
     if (app && app.$vm) {
         return app.$vm.$locale;
     }
-    return tt.getSystemInfoSync().language || 'zh-Hans';
+    return normalizeLocale(tt.getSystemInfoSync().language) || LOCALE_EN;
 };
 const setLocale = (locale) => {
     const app = getApp();
@@ -887,8 +888,8 @@ function addSafeAreaInsets(fromRes, toRes) {
     }
 }
 function populateParameters(fromRes, toRes) {
-    const { brand = '', model = '', system = '', language = '', theme, version, hostName, platform, fontSizeSetting, SDKVersion, pixelRatio, deviceOrientation, environment, } = fromRes;
-    const isQuickApp = "mp-toutiao".indexOf('quickapp-webview') !== -1;
+    const { brand = '', model = '', system = '', language = '', theme, version, platform, fontSizeSetting, SDKVersion, pixelRatio, deviceOrientation, } = fromRes;
+    // const isQuickApp = "mp-toutiao".indexOf('quickapp-webview') !== -1
     // osName osVersion
     let osName = '';
     let osVersion = '';
@@ -900,24 +901,24 @@ function populateParameters(fromRes, toRes) {
     // deviceType
     let deviceType = getGetDeviceType(fromRes, model);
     // deviceModel
-    let deviceBrand = getDeviceBrand(brand, model, isQuickApp);
+    let deviceBrand = getDeviceBrand(brand);
     // hostName
-    let _hostName = hostName || "mp-toutiao".split('-')[1]; // mp-jd
-    {
-        _hostName = fromRes.appName;
-    }
+    let _hostName = getHostName(fromRes);
     // deviceOrientation
     let _deviceOrientation = deviceOrientation; // 仅 微信 百度 支持
     // devicePixelRatio
     let _devicePixelRatio = pixelRatio;
     // SDKVersion
     let _SDKVersion = SDKVersion;
+    // hostLanguage
+    const hostLanguage = language.replace(/_/g, '-');
     // wx.getAccountInfoSync
     const parameters = {
         appId: process.env.UNI_APP_ID,
         appName: process.env.UNI_APP_NAME,
         appVersion: process.env.UNI_APP_VERSION_NAME,
         appVersionCode: process.env.UNI_APP_VERSION_CODE,
+        appLanguage: getAppLanguage(hostLanguage),
         uniCompileVersion: process.env.UNI_COMPILER_VERSION,
         uniRuntimeVersion: process.env.UNI_COMPILER_VERSION,
         uniPlatform: process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM,
@@ -930,7 +931,7 @@ function populateParameters(fromRes, toRes) {
         osVersion,
         hostTheme: theme,
         hostVersion,
-        hostLanguage: language.replace('_', '-'),
+        hostLanguage,
         hostName: _hostName,
         hostSDKVersion: _SDKVersion,
         hostFontSizeSetting: fontSizeSetting,
@@ -942,7 +943,7 @@ function populateParameters(fromRes, toRes) {
         ua: undefined,
         hostPackageName: undefined,
         browserName: undefined,
-        browseVersion: undefined,
+        browserVersion: undefined,
     };
     extend(toRes, parameters);
 }
@@ -967,13 +968,24 @@ function getGetDeviceType(fromRes, model) {
     }
     return deviceType;
 }
-function getDeviceBrand(brand, model, isQuickApp = false) {
+function getDeviceBrand(brand) {
     // deviceModel
-    let deviceBrand = model.split(' ')[0].toLocaleLowerCase();
-    {
-        deviceBrand = brand.toLocaleLowerCase();
+    let deviceBrand = brand;
+    if (deviceBrand) {
+        deviceBrand = deviceBrand.toLocaleLowerCase();
     }
     return deviceBrand;
+}
+function getAppLanguage(defaultLanguage) {
+    return getLocale ? getLocale() : defaultLanguage;
+}
+function getHostName(fromRes) {
+    const _platform = "mp-toutiao".split('-')[1];
+    let _hostName = fromRes.hostName || _platform; // mp-jd
+    {
+        _hostName = fromRes.appName;
+    }
+    return _hostName;
 }
 
 const getSystemInfo = {

package/dist/uni.mp.esm.js

@@ -1,6 +1,7 @@
 import { SLOT_DEFAULT_NAME, EventChannel, invokeArrayFns, ON_LOAD, ON_SHOW, ON_HIDE, ON_UNLOAD, ON_RESIZE, ON_TAB_ITEM_TAP, ON_REACH_BOTTOM, ON_PULL_DOWN_REFRESH, ON_ADD_TO_FAVORITES, MINI_PROGRAM_PAGE_RUNTIME_HOOKS, ON_READY, once, ON_LAUNCH, ON_ERROR, ON_THEME_CHANGE, ON_PAGE_NOT_FOUND, ON_UNHANDLE_REJECTION, addLeadingSlash, stringifyQuery, customizeEvent } from '@dcloudio/uni-shared';
 import { isArray, hasOwn, isFunction, extend, isPlainObject, isObject } from '@vue/shared';
 import { ref, nextTick, findComponentPropsData, toRaw, updateProps, invalidateJob, getExposeProxy, pruneComponentPropsCache } from 'vue';
+import { normalizeLocale, LOCALE_EN } from '@dcloudio/uni-i18n';
 
 const eventChannels = {};
 const eventChannelStack = [];
@@ -281,7 +282,7 @@ function initAppLifecycle(appOptions, vm) {
     }
 }
 function initLocale(appVm) {
-    const locale = ref(tt.getSystemInfoSync().language || 'zh-Hans');
+    const locale = ref(normalizeLocale(tt.getSystemInfoSync().language) || LOCALE_EN);
     Object.defineProperty(appVm, '$locale', {
         get() {
             return locale.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "3.0.0-alpha-3041320220527004",
+  "version": "3.0.0-alpha-3041320220607001",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {
@@ -22,11 +22,11 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3041320220527004",
-    "@dcloudio/uni-mp-compiler": "3.0.0-alpha-3041320220527004",
-    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3041320220527004",
-    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3041320220527004",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3041320220527004",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3041320220607001",
+    "@dcloudio/uni-mp-compiler": "3.0.0-alpha-3041320220607001",
+    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3041320220607001",
+    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3041320220607001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3041320220607001",
     "@vue/shared": "3.2.33",
     "@vue/compiler-core": "3.2.33"
   }