From 1b1406a4d9c0603274ace3029ff5ecfe932ffcd0 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 21 Apr 2025 14:49:36 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/UserDevice.php                     | 21 ++++++++-----------
 .../assets/js/pages/manage/setting/device.vue |  4 ++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/Models/UserDevice.php b/app/Models/UserDevice.php
index a90679f52..6586503a3 100644
--- a/app/Models/UserDevice.php
+++ b/app/Models/UserDevice.php
@@ -97,6 +97,7 @@ class UserDevice extends AbstractModel
             'browser' => 'Unknown',
             'version' => '',
 
+            'app_name' => '',       // 客户端名称
             'app_type' => '',       // 客户端类型
             'app_version' => '',    // 客户端版本
         ];
@@ -129,34 +130,30 @@ class UserDevice extends AbstractModel
 
         if (preg_match("/android_kuaifan_eeui/i", $ua)) {
             // Android 客户端
+            $result['app_type'] = 'Android';
             if ($dd->getBrandName() && $dd->getModel()) {
                 // 厂商+型号
-                $result['app_type'] = $dd->getBrandName() . ' ' . $dd->getModel();
+                $result['app_name'] = $dd->getBrandName() . ' ' . $dd->getModel();
             } elseif ($dd->getBrandName()) {
                 // 仅厂商
-                $result['app_type'] = $dd->getBrandName();
+                $result['app_name'] = $dd->getBrandName();
             } elseif ($dd->isTablet()) {
                 // 平板
-                $result['app_type'] = 'Tablet';
+                $result['app_name'] = 'Tablet';
             } elseif ($dd->isPhablet()) {
                 // 平板
-                $result['app_type'] = 'Phablet';
-            } else {
-                // 未确定的 Android 设备
-                $result['app_type'] = 'Android';
+                $result['app_name'] = 'Phablet';
             }
             $result['app_version'] = self::getAfterVersion($ua, 'kuaifan_eeui/');
         } elseif (preg_match("/ios_kuaifan_eeui/i", $ua)) {
             // iOS 客户端
+            $result['app_type'] = 'iOS';
             if (preg_match("/(macintosh|ipad)/i", $ua)) {
                 // iPad
-                $result['app_type'] = 'iPad';
+                $result['app_name'] = 'iPad';
             } elseif (preg_match("/iphone/i", $ua)) {
                 // iPhone
-                $result['app_type'] = 'iPhone';
-            } else {
-                // 未确定的 iOS 设备
-                $result['app_type'] = 'iOS';
+                $result['app_name'] = 'iPhone';
             }
             $result['app_version'] = self::getAfterVersion($ua, 'kuaifan_eeui/');
         } elseif (preg_match("/dootask/i", $ua)) {
diff --git a/resources/assets/js/pages/manage/setting/device.vue b/resources/assets/js/pages/manage/setting/device.vue
index 84dc2d9d7..9aac0ab4d 100644
--- a/resources/assets/js/pages/manage/setting/device.vue
+++ b/resources/assets/js/pages/manage/setting/device.vue
@@ -83,11 +83,11 @@ export default {
             return 'web';
         },
 
-        getName({app_type, browser}) {
+        getName({app_type, app_name, browser}) {
             if (/web/i.test(app_type)) {
                 return browser + " " + this.$L("浏览器")
             }
-            return app_type + " " + this.$L("客户端")
+            return (app_name || app_type) + " " + this.$L("客户端")
         },
 
         onLogout(device) {