Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show device id instead of name #38

Merged
merged 2 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Device/DeviceAdbShellDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Device/DeviceSettingDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions src/lang/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,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",
Expand Down Expand Up @@ -163,7 +163,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",
Expand Down
4 changes: 2 additions & 2 deletions src/lang/source.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
"视频比特率": "23886069",
"记住我的选择": "160fdc0e",
"设备": "00114509",
"设备 {name} 命令行": "6a51c6b3",
"设备 {id} 命令行": "6a51c6b3",
"设备未连接": "24ba3978",
"设备版本过低,不支持此功能": "3dad1885",
"设备编辑成功": "67ae246d",
Expand All @@ -189,7 +189,7 @@
"还没有设备,使用USB连接电脑开始使用~": "7b11c571",
"进入OTG模式": "3a80871a",
"进入OTG模式成功": "639109f5",
"进入设备 {name} 的命令行": "42554fbd",
"进入设备 {id} 的命令行": "42554fbd",
"连接中": "02286f86",
"连接成功": "42e83c56",
"连接网络设备": "66ddc2bb",
Expand Down
4 changes: 2 additions & 2 deletions src/lang/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"3eb6a611": "默认 8000000(8M),支持支持单位 K、M",
"40e57868": "设备设置",
"4148da61": "请求错误",
"42554fbd": "进入设备 {name} 的命令行",
"42554fbd": "进入设备 {id} 的命令行",
"42bad8e1": "退出软件",
"42c281d4": "跟随系统",
"42e83c56": "连接成功",
Expand Down Expand Up @@ -197,7 +197,7 @@
"67ae246d": "设备编辑成功",
"67bf9872": "正在添加为网络设备",
"69f87f08": "打开命令行",
"6a51c6b3": "设备 {name} 命令行",
"6a51c6b3": "设备 {id} 命令行",
"6bf53f2e": "打开摄像头成功",
"6f369807": "截图编辑器",
"6f506676": "找不到设备",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Device.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading