diff --git a/.prettierignore b/.prettierignore index 50178f7..e10bcf0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,6 +1,5 @@ node_modules dist -assets pnpm-lock.yaml diff --git a/.vscode/settings.json b/.vscode/settings.json index 882cb77..b41c2d3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "typescript.tsdk": "node_modules/typescript/lib", + "i18n-ally.enabledFrameworks": ["vue"], "i18n-ally.localesPaths": ["app/renderer/src/i18n/locales"], "i18n-ally.keystyle": "nested", "i18n-ally.displayLanguage": "zh_CN", diff --git a/app/renderer/src/components/Device/EditAdbIOType.vue b/app/renderer/src/components/Device/EditAdbIOType.vue new file mode 100644 index 0000000..5ec080a --- /dev/null +++ b/app/renderer/src/components/Device/EditAdbIOType.vue @@ -0,0 +1,111 @@ + + + diff --git a/app/renderer/src/i18n/locales/en.json b/app/renderer/src/i18n/locales/en.json index ba4cede..0fc3751 100644 --- a/app/renderer/src/i18n/locales/en.json +++ b/app/renderer/src/i18n/locales/en.json @@ -4,12 +4,17 @@ "title": "information", "name": "name", "adb_path": "ADB path", - "target_address": "target address" + "target_address": "target address", + "touch": "", + "type": "", + "key": "", + "screencap": "" }, "connect": { "connect": "connect", "connected": "connected", - "title": "connect" + "title": "connect", + "disconnect": "disconnect" }, "hint": { "choose": "choose a device" @@ -18,6 +23,15 @@ "connected": "connected", "refresh": "refresh", "disconnected": "disconnected" + }, + "type": { + "fastest_way": "fastest way", + "raw_by_netcat": "raw image via netcat", + "raw_with_gzip": "gziped raw image via pipe", + "encode": "png image via pipe", + "encode_to_file": "png image via file", + "minicap_direct": "jpg image via pipe by instant minicap", + "minicap_stream": "jpg image via pipe by stream minicap" } }, "setting": { @@ -96,6 +110,6 @@ }, "global": { "confirm": "confirm", - "unset": "" + "unset": "unset" } } diff --git a/app/renderer/src/i18n/locales/zh_CN.json b/app/renderer/src/i18n/locales/zh_CN.json index dbc81ff..0a5e091 100644 --- a/app/renderer/src/i18n/locales/zh_CN.json +++ b/app/renderer/src/i18n/locales/zh_CN.json @@ -4,12 +4,17 @@ "title": "信息", "name": "名称", "adb_path": "ADB路径", - "target_address": "目标地址" + "target_address": "目标地址", + "touch": "点击", + "type": "配置", + "key": "按键", + "screencap": "截图" }, "connect": { "connect": "连接", "connected": "已连接", - "title": "连接" + "title": "连接", + "disconnect": "断开" }, "hint": { "choose": "选择一个设备" @@ -18,6 +23,15 @@ "refresh": "刷新", "connected": "已连接", "disconnected": "未连接" + }, + "type": { + "fastest_way": "最快", + "raw_by_netcat": "nc传输原始图像", + "raw_with_gzip": "管道传输gzip图像", + "encode": "管道传输png图像", + "encode_to_file": "文件传输png图像", + "minicap_direct": "单次minicap管道传输jpg图像", + "minicap_stream": "流式minicap管道传输jpg图像" } }, "setting": { diff --git a/app/renderer/src/views/Devices/DevicesMain.vue b/app/renderer/src/views/Devices/DevicesMain.vue index 380aff5..0bcbe67 100644 --- a/app/renderer/src/views/Devices/DevicesMain.vue +++ b/app/renderer/src/views/Devices/DevicesMain.vue @@ -2,6 +2,7 @@ import { NButton, NCard } from 'naive-ui' import { computed, ref } from 'vue' +import EditAdbIOType from '@/components/Device/EditAdbIOType.vue' import { useTr } from '@/i18n' import GridFormLayout from '@/layouts/GridFormLayout.vue' import { useController } from '@/stores/controller' @@ -16,7 +17,7 @@ const { t } = useTr() const statusMessage = ref([]) const { device } = useDevice -const { connect, find, handles } = useController +const { connect, disconnect, find, handles } = useController const info = computed(() => { if (curDevice.value !== null) { @@ -40,6 +41,17 @@ async function requestConnect() { } } +async function requestDisconnect() { + if (info.value) { + loading.value = true + const h = find(info.value.adb_serial) + if (h) { + await disconnect(h) + } + loading.value = false + } +} + function processControllerCallback(msg: string, detail: string) { statusMessage.value.push(translateCallback(msg, detail)) } @@ -55,14 +67,21 @@ function processControllerCallback(msg: string, detail: string) { {{ info.adb_path }} {{ t('device.info.target_address') }} {{ info.adb_serial }} + {{ t('device.info.type') }} +
- - {{ t('device.connect.connected') }} - {{ find(info.adb_serial) }} - + {{ t('device.connect.connect') }} diff --git a/pkgs/loader b/pkgs/loader index 72eb990..38be099 160000 --- a/pkgs/loader +++ b/pkgs/loader @@ -1 +1 @@ -Subproject commit 72eb9903a98eb973299004f4c3e192398126fe88 +Subproject commit 38be0995d0be5ba6b2abcb1d0f5a42ae6caba638