From b7eb1dd0d67dac779ca3dd1eaed41040b4124810 Mon Sep 17 00:00:00 2001 From: viarotel Date: Fri, 10 Nov 2023 10:15:52 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E2=9C=A8=20Support=20bulk=20connecting?= =?UTF-8?q?=20to=20historical=20devices?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-CN.md | 2 +- README.md | 2 +- .../Device/components/Wireless/index.vue | 35 +++++++++++++++++-- src/locales/languages/zh_CN.json | 2 +- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/README-CN.md b/README-CN.md index 507110f..160f79e 100644 --- a/README-CN.md +++ b/README-CN.md @@ -176,7 +176,7 @@ Windows 及 Linux 端内部集成了 Gnirehtet, 用于提供 PC 到安卓设 12. 添加新的相机镜像相关功能 ✅ 13. 更好的多屏协同 ✅ 14. 设备交互栏添加更多功能:文件推送、旋转屏幕、音频控制等功能 ✅ -15. 支持批量连接历史设备功能 🚧 +15. 支持批量连接历史设备功能 ✅ 16. 添加独立的剪切板同步功能 🚧 17. 支持通过界面从设备下载选中的文件 🚧 18. 支持对设备进行分组,以及按组进行批量操作 🚧 diff --git a/README.md b/README.md index 67f8d2b..5f284ff 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ Refer to [scrcpy/doc/shortcuts](https://github.com/Genymobile/scrcpy/blob/master 12. Add new camera mirror related features ✅ 13. Better multi -screen collaboration ✅ 14. Add more features to device interaction bar: file push, screen rotation, audio control etc ✅ -15. Support bulk connecting to historical devices 🚧 +15. Support bulk connecting to historical devices ✅ 16. Add standalone clipboard sync feature 🚧 17. Support GUI-based selective file downloads from devices 🚧 18. Support grouping devices and bulk operations by group 🚧 diff --git a/src/components/Device/components/Wireless/index.vue b/src/components/Device/components/Wireless/index.vue index c67a0b7..99da8bf 100644 --- a/src/components/Device/components/Wireless/index.vue +++ b/src/components/Device/components/Wireless/index.vue @@ -12,6 +12,22 @@ + +
: @@ -83,15 +99,26 @@ export default { ) } else { - results = this.wirelessList + results = [...this.wirelessList] } + results.push({ + batch: '连接所有历史设备', + }) + callback(results) }, onPairSuccess() { this.handleConnect() }, - async handleConnect(params = this.formData) { + async handleBatch() { + for (let index = 0; index < this.wirelessList.length; index++) { + const item = this.wirelessList[index] + await this.handleConnect(item, { successTips: false }) + } + this.$message.success(this.$t('device.wireless.connect.success')) + }, + async handleConnect(params = this.formData, { successTips = true } = {}) { if (!params.host) { this.$message.warning( this.$t('device.wireless.connect.error.no-address'), @@ -103,7 +130,9 @@ export default { try { await this.$adb.connect(params.host, params.port || 5555) - this.$message.success(this.$t('device.wireless.connect.success')) + if (successTips) { + this.$message.success(this.$t('device.wireless.connect.success')) + } this.handleSave(params) } diff --git a/src/locales/languages/zh_CN.json b/src/locales/languages/zh_CN.json index 37a173d..3f17faf 100644 --- a/src/locales/languages/zh_CN.json +++ b/src/locales/languages/zh_CN.json @@ -25,7 +25,7 @@ "device.remark": "备注", "device.permission.error": "设备可能未授权成功,请重新插拔设备并点击允许USB调试", - "device.wireless.name": "无线连接", + "device.wireless.name": "无线", "device.wireless.mode": "无线模式", "device.wireless.mode.error": "没有获取到局域网连接地址,请检查网络", "device.wireless.connect.name": "连接设备",