From 0e5a2e7f4ccea5cb0a20b9c86d872f650d4c01d2 Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Tue, 18 Jul 2023 19:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E7=89=B9=E6=80=A7=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/banner.vue |  5 +++--
 src/lib/env.js            | 41 +++++++++++++++++++++++++++++++++------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/components/banner.vue b/src/components/banner.vue
index 7894761..9a4fc9b 100644
--- a/src/components/banner.vue
+++ b/src/components/banner.vue
@@ -3,7 +3,8 @@
     <div class="env">
       <section class="info">
         <label class="field">
-          <span>系统:</span><span>{{ $store.env.OS_NAME }}</span>
+          <span>系统:</span
+          ><span>{{ $store.env.OS_NAME }} {{ $store.env.OS_VERSION }}</span>
         </label>
         <label class="field">
           <span>浏览器:</span><span>{{ $store.env.BROWSER_NAME }}</span>
@@ -43,7 +44,7 @@
     .info {
       display: flex;
       flex-direction: column;
-      width: 192px;
+      width: 212px;
       padding: 8px 12px;
       background: var(--color-plain-1);
 
diff --git a/src/lib/env.js b/src/lib/env.js
index c8098a0..6ebc69e 100644
--- a/src/lib/env.js
+++ b/src/lib/env.js
@@ -5,20 +5,49 @@
  */
 
 const UA = navigator.userAgent.toLowerCase()
+const UNKNOW_MATCH = [null, 'unknow']
 
 const IS_CHROME = !!window.chrome
 const IS_FIREFOX = !!window.sidebar
 
 const IS_LINUX = UA.includes('linux')
+const IS_WIN = UA.includes('windows nt')
+const IS_ANDROID = UA.includes('android')
+const IS_IOS =
+  UA.includes('iphone') || UA.includes('ipad') || UA.includes('ipod')
+const IS_MOBILE = IS_ANDROID || IS_IOS || UA.includes('mobile')
+
+const OS_NAME = IS_ANDROID
+  ? 'Android'
+  : IS_IOS
+  ? 'IOS'
+  : IS_LINUX
+  ? 'Linux'
+  : IS_WIN
+  ? 'Windows'
+  : 'MacOS'
+const OS_VERSION = IS_ANDROID ? UA.match(/android ([\d\.]*?);/)[1] : ''
 
-const OS_NAME = IS_LINUX ? 'Linux' : 'MacOS'
 const SCREEN = `${screen.width} x ${screen.height}`
 
-const BROWSER_NAME = IS_CHROME ? 'Chrome' : IS_FIREFOX ? 'Firefox' : 'Unknow'
-const GENERAL_VERSION = UA.match(/version\/([\d\.]*?) /) || [null, 'unknow']
+const BROWSER_NAME = IS_IOS
+  ? 'Safari'
+  : IS_CHROME
+  ? 'Chrome'
+  : IS_FIREFOX
+  ? 'Firefox'
+  : 'Unknow'
 
-const BROWSER_VERSION = IS_CHROME
-  ? UA.match(/chrome\/([\d\.]*?) /)[1]
+const GENERAL_VERSION = UA.match(/version\/([\d\.]*?) /) || UNKNOW_MATCH
+const CHROME_VERSION =
+  IS_CHROME && (UA.match(/chrome\/([\d\.]*?) /) || UNKNOW_MATCH)
+const IPAD_WEBKIT_VERSION =
+  IS_IOS && (UA.match(/crios\/([\d\.]*?) /) || GENERAL_VERSION)
+
+const BROWSER_VERSION = IS_IOS
+  ? IPAD_WEBKIT_VERSION[1]
+  : IS_CHROME
+  ? CHROME_VERSION[1]
   : GENERAL_VERSION[1]
 
-export { OS_NAME, BROWSER_NAME, BROWSER_VERSION, SCREEN }
+export { OS_NAME, OS_VERSION, BROWSER_NAME, BROWSER_VERSION, SCREEN }