提交 0eee75ed 编写于 作者: D DCloud_LXH

fix(app): 兼容 osName

上级 347c3825
...@@ -23,6 +23,7 @@ export function getDeviceInfo () { ...@@ -23,6 +23,7 @@ export function getDeviceInfo () {
} = systemInfo } = systemInfo
const brand = deviceBrand.toLowerCase() const brand = deviceBrand.toLowerCase()
const _osName = osName.toLowerCase()
return { return {
deviceBrand: brand, deviceBrand: brand,
...@@ -33,8 +34,8 @@ export function getDeviceInfo () { ...@@ -33,8 +34,8 @@ export function getDeviceInfo () {
deviceType, deviceType,
brand, brand,
model: deviceModel, model: deviceModel,
system: `${osName === 'ios' ? 'iOS' : 'Android'} ${osVersion}`, system: `${_osName === 'ios' ? 'iOS' : 'Android'} ${osVersion}`,
platform: osName platform: _osName
} }
} }
...@@ -81,6 +82,7 @@ export function getSystemInfo () { ...@@ -81,6 +82,7 @@ export function getSystemInfo () {
_initSystemInfo = true _initSystemInfo = true
const { osName, osLanguage, osVersion } = systemInfo const { osName, osLanguage, osVersion } = systemInfo
const _osName = osName.toLowerCase()
const osLanguageSplit = osLanguage.split('-') const osLanguageSplit = osLanguage.split('-')
const osLanguageSplitLast = osLanguageSplit[osLanguageSplit.length - 1] const osLanguageSplitLast = osLanguageSplit[osLanguageSplit.length - 1]
const _osLanguage = `${osLanguageSplit[0]}${osLanguageSplitLast ? '-' + osLanguageSplitLast : ''}` const _osLanguage = `${osLanguageSplit[0]}${osLanguageSplitLast ? '-' + osLanguageSplitLast : ''}`
...@@ -90,11 +92,12 @@ export function getSystemInfo () { ...@@ -90,11 +92,12 @@ export function getSystemInfo () {
fontSizeSetting: appBaseInfo.hostFontSizeSetting, fontSizeSetting: appBaseInfo.hostFontSizeSetting,
uniCompileVersion: __uniConfig.compilerVersion, uniCompileVersion: __uniConfig.compilerVersion,
uniRuntimeVersion: __uniConfig.compilerVersion, uniRuntimeVersion: __uniConfig.compilerVersion,
osLanguage: _osLanguage osLanguage: _osLanguage,
osName: _osName
} }
if (osName === 'ios') { if (_osName === 'ios') {
extraData.romName = osName extraData.romName = _osName
extraData.romVersion = osVersion extraData.romVersion = osVersion
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册