fix: 🔧 修复自定义路径功能没有生效的问题

viarotel-org · Oct 26, 2023 · 894b581 · 894b581
1 parent 517eecd
commit 894b581
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 510 deletions.
diff --git a/electron/exposes/adbkit/index.js b/electron/exposes/adbkit/index.js
@@ -18,8 +18,8 @@ window.addEventListener('beforeunload', () => {
   }
 })
 
-appStore.onDidChange('scrcpy.common.adbPath', async (value, oldValue) => {
-  console.log('onDidChange.scrcpy.common.adbPath', value)
+appStore.onDidChange('common.adbPath', async (value, oldValue) => {
+  console.log('onDidChange.common.adbPath', value)
 
   if (value === oldValue) {
     return false
@@ -146,7 +146,7 @@ const watch = async (callback) => {
 }
 
 export default () => {
-  const binPath = appStore.get('scrcpy.common.adbPath') || adbPath
+  const binPath = appStore.get('common.adbPath') || adbPath
 
   client = Adb.createClient({
     bin: binPath,

diff --git a/electron/exposes/scrcpy/index.js b/electron/exposes/scrcpy/index.js
@@ -3,8 +3,8 @@ import appStore from '@electron/helpers/store.js'
 import { adbPath, scrcpyPath } from '@electron/configs/index.js'
 
 const shell = async (command, { stdout, stderr } = {}) => {
-  const spawnPath = appStore.get('scrcpy.common.scrcpyPath') || scrcpyPath
-  const ADB = appStore.get('scrcpy.common.adbPath') || adbPath
+  const spawnPath = appStore.get('common.scrcpyPath') || scrcpyPath
+  const ADB = appStore.get('common.adbPath') || adbPath
   const args = command.split(' ')
 
   const scrcpyProcess = spawn(`"${spawnPath}"`, args, {

diff --git a/src/store/index.js b/src/store/index.js
@@ -1,9 +1,8 @@
 import { createPinia } from 'pinia'
-import { useScrcpyStore } from './scrcpy/index.js'
 import { useDeviceStore } from './device/index.js'
 import { usePreferenceStore } from './preference/index.js'
 
-export { useScrcpyStore, useDeviceStore, usePreferenceStore }
+export { useDeviceStore, usePreferenceStore }
 
 export default {
   install(app) {
@@ -12,7 +11,6 @@ export default {
     app.use(store)
 
     app.config.globalProperties.$store = {
-      scrcpy: useScrcpyStore(),
       device: useDeviceStore(),
       preference: usePreferenceStore(),
     }

diff --git a/src/store/scrcpy/index.js b/src/store/scrcpy/index.js
diff --git a/src/store/scrcpy/model/audio/index.js b/src/store/scrcpy/model/audio/index.js
diff --git a/src/store/scrcpy/model/custom/index.js b/src/store/scrcpy/model/custom/index.js
diff --git a/src/store/scrcpy/model/device/index.js b/src/store/scrcpy/model/device/index.js
diff --git a/src/store/scrcpy/model/index.js b/src/store/scrcpy/model/index.js
diff --git a/src/store/scrcpy/model/record/index.js b/src/store/scrcpy/model/record/index.js