提交 946378ec 编写于 作者: D DCloud_LXH

chore: shared IEVersion、getDeviceBrand

上级 158a9cf3
import getWindowOffset from 'uni-platform/helpers/get-window-offset' import getWindowOffset from 'uni-platform/helpers/get-window-offset'
import deviceId from 'uni-platform/helpers/uuid' import deviceId from 'uni-platform/helpers/uuid'
import safeAreaInsets from 'safe-area-insets' import safeAreaInsets from 'safe-area-insets'
import { IEVersion, getDeviceBrand } from 'uni-shared'
function IEVersion () {
const userAgent = navigator.userAgent
const isIE = userAgent.indexOf('compatible') > -1 && userAgent.indexOf('MSIE') > -1
const isEdge = userAgent.indexOf('Edge') > -1 && !isIE
const isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf('rv:11.0') > -1
if (isIE) {
const reIE = new RegExp('MSIE (\\d+\\.\\d+);')
reIE.test(userAgent)
const fIEVersion = parseFloat(RegExp.$1)
if (fIEVersion > 6) {
return fIEVersion
} else {
return 6
}
} else if (isEdge) {
return -1
} else if (isIE11) {
return 11
} else {
return -1
}
}
function getDeviceBrand (model) {
if (/iphone/gi.test(model) || /ipad/gi.test(model) || /mac/gi.test(model)) { return 'apple' }
if (/windows/gi.test(model)) { return 'microsoft' }
}
const ua = navigator.userAgent const ua = navigator.userAgent
/** /**
......
import { getDeviceBrand } from 'uni-shared' function getDeviceBrand (model) {
if (/iphone/gi.test(model) || /ipad/gi.test(model) || /mac/gi.test(model)) { return 'apple' }
if (/windows/gi.test(model)) { return 'microsoft' }
}
const UUID_KEY = '__DC_STAT_UUID' const UUID_KEY = '__DC_STAT_UUID'
let deviceId let deviceId
...@@ -28,7 +31,7 @@ export function addSafeAreaInsets (result) { ...@@ -28,7 +31,7 @@ export function addSafeAreaInsets (result) {
export function populateParameters (result) { export function populateParameters (result) {
const { brand, model, system, language, theme, version, hostName = '', platform } = result const { brand, model, system, language, theme, version, hostName = '', platform } = result
const isQuickApp = __PLATFORM__.indexOf('quickapp-webview') !== -1 const isQuickApp = __PLATFORM__.indexOf('quickapp-webview') !== -1
// osName osVersion // osName osVersion
let osName = '' let osName = ''
......
...@@ -8,7 +8,7 @@ export const protocols = { ...@@ -8,7 +8,7 @@ export const protocols = {
redirectTo, redirectTo,
previewImage, previewImage,
getSystemInfo, getSystemInfo,
getSystemInfoSync: getSystemInfo, getSystemInfoSync: getSystemInfo
} }
export const todos = [ export const todos = [
'preloadPage', 'preloadPage',
......
...@@ -195,31 +195,3 @@ export function deepClone (vnodes, createElement) { ...@@ -195,31 +195,3 @@ export function deepClone (vnodes, createElement) {
} }
export * from './uni-id-mixin' export * from './uni-id-mixin'
export function IEVersion () {
const userAgent = navigator.userAgent
const isIE = userAgent.indexOf('compatible') > -1 && userAgent.indexOf('MSIE') > -1
const isEdge = userAgent.indexOf('Edge') > -1 && !isIE
const isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf('rv:11.0') > -1
if (isIE) {
const reIE = new RegExp('MSIE (\\d+\\.\\d+);')
reIE.test(userAgent)
const fIEVersion = parseFloat(RegExp.$1)
if (fIEVersion > 6) {
return fIEVersion
} else {
return 6
}
} else if (isEdge) {
return -1
} else if (isIE11) {
return 11
} else {
return -1
}
}
export function getDeviceBrand (model) {
if (/iphone/gi.test(model) || /ipad/gi.test(model) || /mac/gi.test(model)) { return 'apple' }
if (/windows/gi.test(model)) { return 'microsoft' }
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册