From bfb96c7772c1ecd4528c05d54a196db5b360722b Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 31 May 2019 14:01:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20H5=20=E5=9C=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9B=BD=E4=BA=A7=E5=AE=89=E5=8D=93=E5=86=85?=
 =?UTF-8?q?=E7=BD=AE=E6=B5=8F=E8=A7=88=E5=99=A8=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/h5/service/api/device/get-system-info.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 eb8df9f78..1556603f3 100644
--- a/src/platforms/h5/service/api/device/get-system-info.js
+++ b/src/platforms/h5/service/api/device/get-system-info.js
@@ -37,12 +37,15 @@ export function getSystemInfoSync () {
     }
   } else if (isAndroid) {
     osname = 'Android'
-    let osversionFind = ua.match(/Android\s([\w.]+);/)
+    // eslint-disable-next-line no-useless-escape
+    let osversionFind = ua.match(/Android[\s/]([\w\.]+)[;\s]/)
     if (osversionFind) {
       osversion = osversionFind[1]
     }
-    let infos = ua.match(/\((.+?)\)/)[1].split(';')
-    const otherInfo = [/^\s?Android/i, /^\s?Linux/i, /^\s?U/i, /^\s?[a-z][a-z]$/i, /^\s?[a-z][a-z]-[a-z][a-z]$/i, /^\s?wv/i]
+    let infoFind = ua.match(/\((.+?)\)/)
+    let infos = infoFind ? infoFind[1].split(';') : ua.split(' ')
+    // eslint-disable-next-line no-useless-escape
+    const otherInfo = [/\bAndroid\b/i, /\bLinux\b/i, /\bU\b/i, /^\s?[a-z][a-z]$/i, /^\s?[a-z][a-z]-[a-z][a-z]$/i, /\bwv\b/i, /\/[\d\.,]+$/, /^\s?[\d\.,]+$/, /\bBrowser\b/i, /\bMobile\b/i]
     for (let i = 0; i < infos.length; i++) {
       const info = infos[i]
       if (info.indexOf('Build') > 0) {
-- 
GitLab