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 78c6a21b82642b5013d5505dfdab3e6f569425a4..332538d3a59a5b3be389f140fdc4bb111738d8d5 100644 --- a/src/platforms/h5/service/api/device/get-system-info.js +++ b/src/platforms/h5/service/api/device/get-system-info.js @@ -1,7 +1,34 @@ import getWindowOffset from 'uni-platform/helpers/get-window-offset' import deviceId from 'uni-platform/helpers/uuid' 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 /** diff --git a/src/platforms/mp-weixin/helpers/enhance-system-info.js b/src/platforms/mp-weixin/helpers/enhance-system-info.js index 05317a3f200cc1fe641de549ed1a5af504691b68..1faaa9b33a127feb42d95e6ee5d159b18fe03f94 100644 --- a/src/platforms/mp-weixin/helpers/enhance-system-info.js +++ b/src/platforms/mp-weixin/helpers/enhance-system-info.js @@ -1,4 +1,7 @@ -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' let deviceId @@ -28,7 +31,7 @@ export function addSafeAreaInsets (result) { export function populateParameters (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 let osName = '' diff --git a/src/platforms/quickapp-webview/runtime/api/protocols.js b/src/platforms/quickapp-webview/runtime/api/protocols.js index c4fcebe846c8bf16f78c7f2983b0a82c36dd466b..a8c5377510e7eb8a41a07792c5d78567c528e9d6 100644 --- a/src/platforms/quickapp-webview/runtime/api/protocols.js +++ b/src/platforms/quickapp-webview/runtime/api/protocols.js @@ -8,7 +8,7 @@ export const protocols = { redirectTo, previewImage, getSystemInfo, - getSystemInfoSync: getSystemInfo, + getSystemInfoSync: getSystemInfo } export const todos = [ 'preloadPage', diff --git a/src/shared/util.js b/src/shared/util.js index 5ce89a60041016062554f22cbb28b2338a29c2dc..e62e68952c8a05eb156cd7dd8bdfb6601228d567 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -195,31 +195,3 @@ export function deepClone (vnodes, createElement) { } 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' } -}