Merge pull request #38 from kkroid/showDeviceId

show device id instead of name
modstart-lib · Dec 30, 2024 · 40311ea · 40311ea
2 parents 9bf8dd6 + 62bacdf
commit 40311ea
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/components/Device/DeviceAdbShellDialog.vue b/src/components/Device/DeviceAdbShellDialog.vue
@@ -31,7 +31,7 @@ watch(() => visible.value, async (v) => {
         term.loadAddon(fitAddon);
         term.open(terminal.value as HTMLElement)
         term.clear()
-        term.writeln(t('进入设备 {name} 的命令行', {name: device.value?.name}))
+        term.writeln(t('进入设备 {id} 的命令行', {id: device.value?.id}))
         term.writeln('==========================================')
         nextTick(() => {
             fitAddon.fit()
@@ -83,7 +83,7 @@ defineExpose({
              :footer="false"
              title-align="start">
         <template #title>
-            {{ $t('设备 {name} 命令行', {name: device?.name}) }}
+            {{ $t('设备 {id} 命令行', {id: device?.id}) }}
         </template>
         <div style="margin:-0.8rem;border-radius:0.5rem;overflow:hidden;background:#000;">
             <div class="h-full p-2 overflow-hidden">

diff --git a/src/components/Device/DeviceSettingDialog.vue b/src/components/Device/DeviceSettingDialog.vue
@@ -67,7 +67,7 @@ defineExpose({
              title-align="start">
         <template #title>
             <icon-mobile/>
-            {{ $t('设备') }} {{ device?.name }}
+            {{ $t('设备') }} {{ device?.id }}
         </template>
         <template #footer>
             <a-button type="primary" @click="doSubmit">

diff --git a/src/lang/en-US.json b/src/lang/en-US.json
@@ -136,7 +136,7 @@
     "3eb6a611": "Default 8000000(8M), Support Unit K、M",
     "40e57868": "Detail",
     "4148da61": "Request error",
-    "42554fbd": "Shell of {name} started",
+    "42554fbd": "Shell of {id} started",
     "42c281d4": "Auto",
     "42ed4ed0": "Connect Device",
     "42fe6375": "Select Path",
@@ -164,7 +164,7 @@
     "67ae246d": "Device Edit Successful",
     "67bf9872": "Add as network device",
     "69f87f08": "Open Command Line",
-    "6a51c6b3": "Device {name} shell",
+    "6a51c6b3": "Device {id} shell",
     "6f369807": "Screenshot Editor",
     "6f506676": "Device not found",
     "73b90d88": "Already mirroring",

diff --git a/src/lang/source.json b/src/lang/source.json
@@ -172,7 +172,7 @@
     "视频比特率": "23886069",
     "记住我的选择": "160fdc0e",
     "设备": "00114509",
-    "设备 {name} 命令行": "6a51c6b3",
+    "设备 {id} 命令行": "6a51c6b3",
     "设备未连接": "24ba3978",
     "设备版本过低，不支持此功能": "3dad1885",
     "设备编辑成功": "67ae246d",
@@ -190,7 +190,7 @@
     "还没有设备，使用USB连接电脑开始使用～": "7b11c571",
     "进入OTG模式": "3a80871a",
     "进入OTG模式成功": "639109f5",
-    "进入设备 {name} 的命令行": "42554fbd",
+    "进入设备 {id} 的命令行": "42554fbd",
     "连接中": "02286f86",
     "连接成功": "42e83c56",
     "连接网络设备": "66ddc2bb",

diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
@@ -160,7 +160,7 @@
     "3eb6a611": "默认 8000000(8M)，支持支持单位 K、M",
     "40e57868": "设备设置",
     "4148da61": "请求错误",
-    "42554fbd": "进入设备 {name} 的命令行",
+    "42554fbd": "进入设备 {id} 的命令行",
     "42bad8e1": "退出软件",
     "42c281d4": "跟随系统",
     "42e83c56": "连接成功",
@@ -198,7 +198,7 @@
     "67ae246d": "设备编辑成功",
     "67bf9872": "正在添加为网络设备",
     "69f87f08": "打开命令行",
-    "6a51c6b3": "设备 {name} 命令行",
+    "6a51c6b3": "设备 {id} 命令行",
     "6bf53f2e": "打开摄像头成功",
     "6f369807": "截图编辑器",
     "6f506676": "找不到设备",

diff --git a/src/pages/Device.vue b/src/pages/Device.vue
@@ -165,7 +165,7 @@ const doHelp = () => {
                                 <div class="font-bold truncate cursor-pointer">
                                     <DeviceType :type="r.type"/>
                                     <span>
-                                        {{ r.name }}
+                                        {{ r.id }}
                                     </span>
                                 </div>
                             </div>