From c74f03dff6ed9eb2ffa7e928e2ee7825019fc679 Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Fri, 3 Nov 2023 14:41:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Linux=20build=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |   4 +-
 .../AudioCodecSelect/index.vue                |   0
 .../{ => components}/DisplaySelect/index.vue  |   0
 .../{ => components}/LanguageSelect/index.vue |   0
 .../{ => components}/PathInput/index.vue      |   0
 .../VideoCodecSelect/index.vue                |   0
 .../OTG => composables/otg}/index.js          |   0
 src/components/Preference/index.bak.vue       | 376 ------------------
 src/components/Preference/index.vue           |  12 +-
 9 files changed, 9 insertions(+), 383 deletions(-)
 rename src/components/Preference/{ => components}/AudioCodecSelect/index.vue (100%)
 rename src/components/Preference/{ => components}/DisplaySelect/index.vue (100%)
 rename src/components/Preference/{ => components}/LanguageSelect/index.vue (100%)
 rename src/components/Preference/{ => components}/PathInput/index.vue (100%)
 rename src/components/Preference/{ => components}/VideoCodecSelect/index.vue (100%)
 rename src/components/Preference/{__composables__/OTG => composables/otg}/index.js (100%)
 delete mode 100644 src/components/Preference/index.bak.vue

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 338d9be0..f105df49 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -54,6 +54,8 @@
     "\r\n      Supported by\r\n\r\n      ",
     "Viarotel",
     "\r\n\r\n      v{{ version }}\r\n    ",
-    "pair ${this.formData.host}:${this.formData.port} ${this.formData.pair}"
+    "pair ${this.formData.host}:${this.formData.port} ${this.formData.pair}",
+    "${item.decoder} & ${item.encoder}",
+    " & "
   ]
 }
diff --git a/src/components/Preference/AudioCodecSelect/index.vue b/src/components/Preference/components/AudioCodecSelect/index.vue
similarity index 100%
rename from src/components/Preference/AudioCodecSelect/index.vue
rename to src/components/Preference/components/AudioCodecSelect/index.vue
diff --git a/src/components/Preference/DisplaySelect/index.vue b/src/components/Preference/components/DisplaySelect/index.vue
similarity index 100%
rename from src/components/Preference/DisplaySelect/index.vue
rename to src/components/Preference/components/DisplaySelect/index.vue
diff --git a/src/components/Preference/LanguageSelect/index.vue b/src/components/Preference/components/LanguageSelect/index.vue
similarity index 100%
rename from src/components/Preference/LanguageSelect/index.vue
rename to src/components/Preference/components/LanguageSelect/index.vue
diff --git a/src/components/Preference/PathInput/index.vue b/src/components/Preference/components/PathInput/index.vue
similarity index 100%
rename from src/components/Preference/PathInput/index.vue
rename to src/components/Preference/components/PathInput/index.vue
diff --git a/src/components/Preference/VideoCodecSelect/index.vue b/src/components/Preference/components/VideoCodecSelect/index.vue
similarity index 100%
rename from src/components/Preference/VideoCodecSelect/index.vue
rename to src/components/Preference/components/VideoCodecSelect/index.vue
diff --git a/src/components/Preference/__composables__/OTG/index.js b/src/components/Preference/composables/otg/index.js
similarity index 100%
rename from src/components/Preference/__composables__/OTG/index.js
rename to src/components/Preference/composables/otg/index.js
diff --git a/src/components/Preference/index.bak.vue b/src/components/Preference/index.bak.vue
deleted file mode 100644
index bfee5ab7..00000000
--- a/src/components/Preference/index.bak.vue
+++ /dev/null
@@ -1,376 +0,0 @@
-<template>
-  <div class="">
-    <div class="pb-4 pr-2 flex items-center justify-between">
-      <div class="">
-        <el-select
-          v-model="deviceScope"
-          value-key=""
-          :placeholder="$t('preferences.scope.placeholder')"
-          filterable
-          :no-data-text="$t('preferences.scope.no-data')"
-          class="!w-90"
-          @change="onScopeChange"
-        >
-          <template #prefix>
-            <el-tooltip class="" effect="dark" placement="bottom-start">
-              <el-icon class="text-primary-300 hover:text-primary-500">
-                <QuestionFilled />
-              </el-icon>
-              <template #content>
-                <div class="space-y-1">
-                  <div class="pb-1">
-                    {{ $t("preferences.scope.details[0]") }}
-                  </div>
-                  <div class="">
-                    {{ $t("preferences.scope.details[1]") }}
-                  </div>
-                  <div class="">
-                    {{ $t("preferences.scope.details[2]") }}
-                  </div>
-                </div>
-              </template>
-            </el-tooltip>
-          </template>
-          <el-option
-            v-for="item in scopeList"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <div class="">
-        <el-button type="" icon="Upload" plain @click="handleImport">
-          {{ $t("preferences.config.import.name") }}
-        </el-button>
-        <el-button type="" icon="Download" plain @click="handleExport">
-          {{ $t("preferences.config.export.name") }}
-        </el-button>
-        <el-button type="" icon="Edit" plain @click="handleEdit">
-          {{ $t("preferences.config.edit.name") }}
-        </el-button>
-        <el-button type="" icon="RefreshRight" plain @click="handleResetAll">
-          {{ $t("preferences.config.reset.name") }}
-        </el-button>
-      </div>
-    </div>
-    <div class="grid gap-6 pr-2">
-      <el-card
-        v-for="(item, parentId) of preferenceModel"
-        :key="parentId"
-        shadow="hover"
-        class=""
-      >
-        <template #header>
-          <div class="flex items-center">
-            <div class="flex-1 w-0 truncate pl-2 text-base">
-              {{ $t(item.label) }}
-            </div>
-            <div class="flex-none pl-4">
-              <el-button type="primary" text @click="handleReset(parentId)">
-                {{ $t("preferences.reset") }}
-              </el-button>
-            </div>
-          </div>
-        </template>
-        <div class="">
-          <el-form
-            ref="elForm"
-            :model="preferenceData"
-            label-width="200px"
-            class="pr-8 pt-4"
-          >
-            <el-row :gutter="20">
-              <el-col
-                v-for="(item_1, index_1) of subModel(item)"
-                :key="index_1"
-                :span="item_1.span || 12"
-                :offset="item_1.offset || 0"
-              >
-                <el-form-item :label="$t(item_1.label)" :prop="item_1.field">
-                  <template #label>
-                    <div class="flex items-center">
-                      <el-tooltip
-                        v-if="item_1.tips"
-                        class=""
-                        effect="dark"
-                        :content="$t(item_1.tips)"
-                        placement="bottom"
-                      >
-                        <el-link
-                          class="mr-1 !text-base"
-                          icon="InfoFilled"
-                          type="warning"
-                          :underline="false"
-                        >
-                        </el-link>
-                      </el-tooltip>
-                      <span class="" :title="$t(item_1.placeholder)">{{
-                        $t(item_1.label)
-                      }}</span>
-                    </div>
-                  </template>
-
-                  <el-input
-                    v-if="item_1.type === 'Input'"
-                    v-bind="item_1.props || {}"
-                    v-model="preferenceData[item_1.field]"
-                    class="!w-full"
-                    :title="$t(item_1.placeholder)"
-                    :placeholder="$t(item_1.placeholder)"
-                    clearable
-                  >
-                    <template v-if="item_1.append" #append>
-                      {{ item_1.append }}
-                    </template>
-                  </el-input>
-
-                  <el-input
-                    v-else-if="item_1.type === 'Input.number'"
-                    v-bind="item_1.props || {}"
-                    v-model.number="preferenceData[item_1.field]"
-                    class="!w-full"
-                    :title="$t(item_1.placeholder)"
-                    :placeholder="$t(item_1.placeholder)"
-                    clearable
-                  >
-                    <template v-if="item_1.append" #append>
-                      {{ item_1.append }}
-                    </template>
-                  </el-input>
-
-                  <el-switch
-                    v-else-if="item_1.type === 'Switch'"
-                    v-bind="item_1.props || {}"
-                    v-model="preferenceData[item_1.field]"
-                    class="!w-full"
-                    :title="$t(item_1.placeholder)"
-                  ></el-switch>
-
-                  <el-select
-                    v-else-if="item_1.type === 'Select'"
-                    v-bind="item_1.props || {}"
-                    v-model="preferenceData[item_1.field]"
-                    class="!w-full"
-                    :title="$t(item_1.placeholder)"
-                    :placeholder="$t(item_1.placeholder)"
-                  >
-                    <el-option
-                      v-for="(item_2, index_2) in item_1.options"
-                      :key="index_2"
-                      :label="$t(item_2.label)"
-                      :value="item_2.value"
-                    >
-                    </el-option>
-                  </el-select>
-
-                  <component
-                    :is="item_1.type"
-                    v-else
-                    v-model="preferenceData[item_1.field]"
-                    :data="item_1"
-                    :device-scope="deviceScope"
-                    :preference-data="preferenceData"
-                  ></component>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </el-card>
-    </div>
-  </div>
-</template>
-
-<script>
-import { debounce } from 'lodash-es'
-import { ref } from 'vue'
-import { useOtg } from './__composables__/otg/index.js'
-import LanguageSelect from './LanguageSelect/index.vue'
-import PathInput from './PathInput/index.vue'
-import VideoCodecSelect from './VideoCodecSelect/index.vue'
-import AudioCodecSelect from './AudioCodecSelect/index.vue'
-import DisplaySelect from './DisplaySelect/index.vue'
-import LoadingIcon from '@/components/Device/ControlBar/LoadingIcon/index.vue'
-import { usePreferenceStore } from '@/store/index.js'
-
-export default {
-  components: {
-    LanguageSelect,
-    PathInput,
-    VideoCodecSelect,
-    AudioCodecSelect,
-    DisplaySelect,
-  },
-  setup() {
-    const preferenceStore = usePreferenceStore()
-
-    const preferenceData = ref(preferenceStore.data)
-    const deviceScope = ref(preferenceStore.deviceScope)
-
-    useOtg(preferenceData)
-
-    return {
-      preferenceData,
-      deviceScope,
-    }
-  },
-  computed: {
-    preferenceModel() {
-      return this.$store.preference.model || {}
-    },
-    scopeList() {
-      const value = this.$store.device.list.map(item => ({
-        ...item,
-        label: `${item.id}（${item.$name}${
-          item.$remark ? `，${item.$remark}` : ''
-        }）`,
-        value: item.id,
-      }))
-
-      value.unshift({
-        label: `Global（${this.$t('preferences.scope.global')}）`,
-        value: 'global',
-      })
-
-      return value
-    },
-  },
-  watch: {
-    'preferenceData': {
-      handler() {
-        this.handleSave()
-      },
-      deep: true,
-    },
-    'preferenceData.theme': {
-      handler(value) {
-        this.$store.theme.update(value)
-      },
-    },
-    // 列表设备发生变化后如果没有匹配到则默认选中 global
-    'scopeList': {
-      handler(value) {
-        const someValue = value.some(
-          item => this.$replaceIP(item.value) === this.deviceScope,
-        )
-
-        if (someValue) {
-          return
-        }
-
-        this.deviceScope = 'global'
-        this.$store.preference.setScope(this.deviceScope)
-        this.preferenceData = this.$store.preference.data
-      },
-      immediate: true,
-    },
-  },
-  created() {
-    this.handleSave = debounce(this.handleSave, 1000, {
-      leading: false,
-      trailing: true,
-    })
-  },
-  methods: {
-    subModel(item) {
-      const children = item?.children || {}
-      const value = {}
-      Object.entries(children).forEach(([key, data]) => {
-        if (!data.hidden) {
-          value[key] = data
-        }
-      })
-      return value
-    },
-    handleResetAll() {
-      this.$store.preference.reset(this.deviceScope)
-      this.preferenceData = this.$store.preference.data
-    },
-
-    onScopeChange(value) {
-      this.$store.preference.setScope(value)
-      this.preferenceData = this.$store.preference.data
-    },
-
-    async handleImport() {
-      try {
-        await this.$electron.ipcRenderer.invoke('show-open-dialog', {
-          preset: 'replaceFile',
-          filePath: this.$appStore.path,
-          filters: [
-            {
-              name: this.$t('preferences.config.import.placeholder'),
-              extensions: ['json'],
-            },
-          ],
-        })
-
-        this.$message.success(this.$t('preferences.config.import.success'))
-
-        this.preferenceData = this.$store.preference.init()
-      }
-      catch (error) {
-        if (error.message) {
-          const message = error.message?.match(/Error: (.*)/)?.[1]
-          this.$message.warning(message || error.message)
-        }
-      }
-    },
-
-    handleEdit() {
-      this.$appStore.openInEditor()
-    },
-
-    async handleExport() {
-      const messageEl = this.$message({
-        message: this.$t('preferences.config.export.message'),
-        icon: LoadingIcon,
-        duration: 0,
-      })
-
-      try {
-        await this.$electron.ipcRenderer.invoke('show-save-dialog', {
-          defaultPath: 'escrcpy-configs.json',
-          filePath: this.$appStore.path,
-          filters: [
-            {
-              name: this.$t('preferences.config.export.placeholder'),
-              extensions: ['json'],
-            },
-          ],
-        })
-        this.$message.success(this.$t('preferences.config.export.success'))
-      }
-      catch (error) {
-        if (error.message) {
-          const message = error.message?.match(/Error: (.*)/)?.[1]
-          this.$message.warning(message || error.message)
-        }
-      }
-
-      messageEl.close()
-    },
-
-    handleSave() {
-      this.$store.preference.setData(this.preferenceData)
-      this.$message.success(this.$t('preferences.config.save.placeholder'))
-    },
-
-    handleReset(type) {
-      this.preferenceData = {
-        ...this.preferenceData,
-        ...this.$store.preference.getDefaultData(type),
-      }
-      this.$store.preference.setData(this.preferenceData)
-    },
-  },
-}
-</script>
-
-<style scoped lang="postcss">
-:deep(.el-card) {
-  --el-card-padding: 8px;
-}
-</style>
diff --git a/src/components/Preference/index.vue b/src/components/Preference/index.vue
index f2eafeca..e71b9dd9 100644
--- a/src/components/Preference/index.vue
+++ b/src/components/Preference/index.vue
@@ -193,12 +193,12 @@
 <script>
 import { debounce } from 'lodash-es'
 import { ref } from 'vue'
-import { useOtg } from './__composables__/otg/index.js'
-import LanguageSelect from './LanguageSelect/index.vue'
-import PathInput from './PathInput/index.vue'
-import VideoCodecSelect from './VideoCodecSelect/index.vue'
-import AudioCodecSelect from './AudioCodecSelect/index.vue'
-import DisplaySelect from './DisplaySelect/index.vue'
+import { useOtg } from './composables/otg/index.js'
+import LanguageSelect from './components/LanguageSelect/index.vue'
+import PathInput from './components/PathInput/index.vue'
+import VideoCodecSelect from './components/VideoCodecSelect/index.vue'
+import AudioCodecSelect from './components/AudioCodecSelect/index.vue'
+import DisplaySelect from './components/DisplaySelect/index.vue'
 import LoadingIcon from '@/components/Device/ControlBar/LoadingIcon/index.vue'
 import { usePreferenceStore } from '@/store/index.js'