From 39bbc9850bde77aa21d9fdc4f58119541cde2b8f Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Tue, 5 Nov 2024 10:58:33 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E2=9A=A1=EF=B8=8F=20Optimize=20the=20s?=
 =?UTF-8?q?tability=20of=20options=20that=20need=20to=20dynamically=20obta?=
 =?UTF-8?q?in=20parameters=20in=20preference=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../Custom/components/DeployDialog/index.vue  |  1 +
 .../components/SelectAudioCodec/index.vue     | 24 +++++++++----------
 .../components/SelectDisplay/index.vue        | 24 +++++++++----------
 .../components/SelectVideoCodec/index.vue     | 24 +++++++++----------
 .../PreferenceForm/components/helper.js       | 16 +++++++++++++
 src/store/preference/model/video/index.js     |  2 --
 7 files changed, 51 insertions(+), 42 deletions(-)
 create mode 100644 src/components/Preference/components/PreferenceForm/components/helper.js

diff --git a/package.json b/package.json
index 7e77b95..13d9247 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "version": "1.25.4",
   "private": true,
-  "packageManager": "pnpm@9.4.0+sha1.9217c800d4ab947a7aee520242a7b70d64fc7638",
+  "packageManager": "pnpm@9.12.3",
   "description": "Scrcpy Powered by Electron",
   "author": "viarotel",
   "homepage": "https://github.com/viarotel-org/escrcpy",
diff --git a/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue b/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
index b55dd21..98092b7 100644
--- a/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
+++ b/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
@@ -15,6 +15,7 @@
         v-bind="{
           collapseProps: { accordion: true },
           excludes: ['common'],
+          deviceScope: device.id,
         }"
       />
     </div>
diff --git a/src/components/Preference/components/PreferenceForm/components/SelectAudioCodec/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectAudioCodec/index.vue
index 8f06cc1..481c570 100644
--- a/src/components/Preference/components/PreferenceForm/components/SelectAudioCodec/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectAudioCodec/index.vue
@@ -3,6 +3,7 @@
     v-bind="{ clearable: true, ...(data.props || {}) }"
     v-model="selectValue"
     class="!w-full"
+    @click="getDeviceOptions"
   >
     <el-option
       v-for="(item, index) in options"
@@ -15,6 +16,8 @@
 </template>
 
 <script>
+import { getDeviceId } from '../helper.js'
+
 export default {
   props: {
     modelValue: {
@@ -56,21 +59,16 @@ export default {
       },
     },
   },
-  watch: {
-    deviceScope: {
-      handler(value) {
-        if (value === 'global') {
-          this.deviceOptions = []
-          return
-        }
-
-        this.getDeviceOptions()
-      },
-    },
-  },
   methods: {
     async getDeviceOptions() {
-      const res = await this.$scrcpy.getEncoders(this.deviceScope)
+      const deviceId = getDeviceId(this.deviceScope)
+
+      if (!deviceId) {
+        this.deviceOptions = []
+        return false
+      }
+
+      const res = await this.$scrcpy.getEncoders(deviceId)
 
       this.deviceOptions = res?.audio?.map((item) => {
         const value = `${item.decoder} & ${item.encoder}`
diff --git a/src/components/Preference/components/PreferenceForm/components/SelectDisplay/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectDisplay/index.vue
index 695380f..65f4f5d 100644
--- a/src/components/Preference/components/PreferenceForm/components/SelectDisplay/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectDisplay/index.vue
@@ -6,6 +6,7 @@
     }"
     v-model="selectValue"
     class="!w-full"
+    @click="getDeviceOptions"
   >
     <el-option
       v-for="(item, index) in options"
@@ -18,6 +19,8 @@
 </template>
 
 <script>
+import { getDeviceId } from '../helper.js'
+
 export default {
   props: {
     modelValue: {
@@ -56,21 +59,16 @@ export default {
       },
     },
   },
-  watch: {
-    deviceScope: {
-      handler(value) {
-        if (value === 'global') {
-          this.deviceOptions = []
-          return
-        }
-
-        this.getDeviceOptions()
-      },
-    },
-  },
   methods: {
     async getDeviceOptions() {
-      const res = await this.$adb.display(this.deviceScope)
+      const deviceId = getDeviceId(this.deviceScope)
+
+      if (!deviceId) {
+        this.deviceOptions = []
+        return false
+      }
+
+      const res = await this.$adb.display(deviceId)
 
       this.deviceOptions
         = res?.map((item) => {
diff --git a/src/components/Preference/components/PreferenceForm/components/SelectVideoCodec/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectVideoCodec/index.vue
index ba9f090..75a24dd 100644
--- a/src/components/Preference/components/PreferenceForm/components/SelectVideoCodec/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectVideoCodec/index.vue
@@ -3,6 +3,7 @@
     v-bind="{ clearable: true, ...(data.props || {}) }"
     v-model="selectValue"
     class="!w-full"
+    @click="getDeviceOptions"
   >
     <el-option
       v-for="(item, index) in options"
@@ -15,6 +16,8 @@
 </template>
 
 <script>
+import { getDeviceId } from '../helper.js'
+
 export default {
   props: {
     modelValue: {
@@ -56,21 +59,16 @@ export default {
       },
     },
   },
-  watch: {
-    deviceScope: {
-      handler(value) {
-        if (value === 'global') {
-          this.deviceOptions = []
-          return
-        }
-
-        this.getDeviceOptions()
-      },
-    },
-  },
   methods: {
     async getDeviceOptions() {
-      const res = await this.$scrcpy.getEncoders(this.deviceScope)
+      const deviceId = getDeviceId(this.deviceScope)
+
+      if (!deviceId) {
+        this.deviceOptions = []
+        return false
+      }
+
+      const res = await this.$scrcpy.getEncoders(deviceId)
 
       this.deviceOptions = res?.video?.map((item) => {
         const value = `${item.decoder} & ${item.encoder}`
diff --git a/src/components/Preference/components/PreferenceForm/components/helper.js b/src/components/Preference/components/PreferenceForm/components/helper.js
new file mode 100644
index 0000000..6c71de5
--- /dev/null
+++ b/src/components/Preference/components/PreferenceForm/components/helper.js
@@ -0,0 +1,16 @@
+import { useDeviceStore } from '$/store/device/index.js'
+
+/**
+ * 获取设备ID
+ * @param {*} scope
+ * @returns
+ */
+export function getDeviceId(scope) {
+  let value = scope
+
+  if (value === 'global') {
+    value = useDeviceStore().list[0]?.id
+  }
+
+  return value
+}
diff --git a/src/store/preference/model/video/index.js b/src/store/preference/model/video/index.js
index c471c92..3f95eef 100644
--- a/src/store/preference/model/video/index.js
+++ b/src/store/preference/model/video/index.js
@@ -122,8 +122,6 @@ export default {
       placeholder: 'preferences.video.display.placeholder',
       options: [
         { label: '0', value: '0' },
-        { label: '1', value: '1' },
-        { label: '2', value: '2' },
       ],
       props: {
         filterable: true,