From bfa6eb465ab46d5fa3e4271408312946a2292bf9 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Fri, 27 May 2022 14:22:12 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=8C=E5=96=84=20getDeviceInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-plus/service/api/device/system.js       | 17 ++++++++++-------
 .../h5/service/api/device/get-system-info.js    | 15 ++++++++-------
 .../mp-weixin/helpers/enhance-system-info.js    |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/platforms/app-plus/service/api/device/system.js b/src/platforms/app-plus/service/api/device/system.js
index ec4496a89..0941fb848 100644
--- a/src/platforms/app-plus/service/api/device/system.js
+++ b/src/platforms/app-plus/service/api/device/system.js
@@ -19,7 +19,7 @@ export function getDeviceInfo () {
   weexGetSystemInfoSync()
   const {
     deviceBrand, deviceModel, osName,
-    osVersion
+    osVersion, deviceOrientation, deviceType
   } = systemInfo
 
   const brand = deviceBrand.toLowerCase()
@@ -27,6 +27,10 @@ export function getDeviceInfo () {
   return {
     deviceBrand: brand,
     deviceModel,
+    devicePixelRatio: plus.screen.scale,
+    deviceId: deviceId(),
+    deviceOrientation,
+    deviceType,
     brand,
     model: deviceModel,
     system: `${osName === 'ios' ? 'iOS' : 'Android'} ${osVersion}`,
@@ -71,20 +75,19 @@ export function getSystemInfo () {
   _initSystemInfo = true
   weexGetSystemInfoSync()
   _initSystemInfo = false
+  const windowInfo = getWindowInfo()
   const deviceInfo = getDeviceInfo()
   const appBaseInfo = getAppBaseInfo()
   _initSystemInfo = true
 
-  const { osName, osLanguage, osVersion, pixelRatio } = systemInfo
+  const { osName, osLanguage, osVersion } = systemInfo
   const osLanguageSplit = osLanguage.split('-')
   const osLanguageSplitLast = osLanguageSplit[osLanguageSplit.length - 1]
-  let _osLanguage = `${osLanguageSplit[0]}${osLanguageSplitLast ? '-'+ osLanguageSplitLast : ''}`
+  const _osLanguage = `${osLanguageSplit[0]}${osLanguageSplitLast ? '-' + osLanguageSplitLast : ''}`
 
-  let extraData = {
+  const extraData = {
     errMsg: 'getSystemInfo:ok',
     fontSizeSetting: appBaseInfo.hostFontSizeSetting,
-    devicePixelRatio: pixelRatio,
-    deviceId: deviceId(),
     uniCompileVersion: __uniConfig.compilerVersion,
     uniRuntimeVersion: __uniConfig.compilerVersion,
     osLanguage: _osLanguage
@@ -98,7 +101,7 @@ export function getSystemInfo () {
   const _systemInfo = Object.assign(
     {},
     systemInfo,
-    getWindowInfo(),
+    windowInfo,
     deviceInfo,
     appBaseInfo,
     extraData
diff --git a/src/platforms/h5/service/api/device/get-system-info.js b/src/platforms/h5/service/api/device/get-system-info.js
index f2fa6b1c5..19e72127c 100644
--- a/src/platforms/h5/service/api/device/get-system-info.js
+++ b/src/platforms/h5/service/api/device/get-system-info.js
@@ -18,12 +18,18 @@ export function getDeviceInfo () {
     brand,
     model,
     platform,
-    system
+    system,
+    deviceOrientation,
+    deviceType
   } = browserInfo
 
   return {
     deviceBrand,
     deviceModel,
+    devicePixelRatio: window.devicePixelRatio,
+    deviceId: deviceId(),
+    deviceOrientation,
+    deviceType,
     brand,
     model,
     system,
@@ -73,8 +79,7 @@ export function getSystemInfoSync () {
   const appBaseInfo = getAppBaseInfo()
   _initBrowserInfo = true
 
-  const { ua, deviceType, browserName, browseVersion, osname, osversion, deviceOrientation } = browserInfo
-  const { pixelRatio } = windowInfo
+  const { ua, browserName, browseVersion, osname, osversion } = browserInfo
 
   const systemInfo = Object.assign(
     {},
@@ -83,12 +88,8 @@ export function getSystemInfoSync () {
     appBaseInfo,
     {
       ua,
-      deviceType,
       browserName,
       browseVersion,
-      deviceId: deviceId(),
-      devicePixelRatio: pixelRatio,
-      deviceOrientation,
       uniPlatform: 'web',
       uniCompileVersion: __uniConfig.compilerVersion,
       uniRuntimeVersion: __uniConfig.compilerVersion,
diff --git a/src/platforms/mp-weixin/helpers/enhance-system-info.js b/src/platforms/mp-weixin/helpers/enhance-system-info.js
index d85000eb5..7b7e43bae 100644
--- a/src/platforms/mp-weixin/helpers/enhance-system-info.js
+++ b/src/platforms/mp-weixin/helpers/enhance-system-info.js
@@ -130,7 +130,7 @@ export function populateParameters (result) {
     osVersion,
     hostTheme: theme,
     hostVersion,
-    hostLanguage: language.split('_', '-'),
+    hostLanguage: language.replace('_', '-'),
     hostName: _hostName,
     hostSDKVersion: _SDKVersion,
     hostFontSizeSetting: fontSizeSetting,
-- 
GitLab