diff --git a/README.md b/README.md
index 9be8394..cfb7d9c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
📱 Use Scrcpy with a graphical interface to display and control your Android device, driven by Electron
-
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
diff --git a/src/renderer/src/components/Devices/index.vue b/src/renderer/src/components/Devices/index.vue
index b01ba62..1136f55 100644
--- a/src/renderer/src/components/Devices/index.vue
+++ b/src/renderer/src/components/Devices/index.vue
@@ -41,12 +41,14 @@
@@ -97,16 +99,6 @@
{{ row.$recordLoading ? '录制中' : '开始录制' }}
-
- 点亮屏幕
-
-
+
+
+
+
+
+
+
+
+
+
@@ -142,10 +144,12 @@ import { isIPWithPort, sleep } from '@renderer/utils/index.js'
import storage from '@renderer/utils/storages'
import dayjs from 'dayjs'
import PairDialog from './PairDialog/index.vue'
+import ControlBar from './ControlBar/index.vue'
export default {
components: {
PairDialog,
+ ControlBar,
},
data() {
const adbCache = storage.get('adbCache') || {}
@@ -185,12 +189,13 @@ export default {
})
},
methods: {
+ toggleRowExpansion(...params) {
+ this.$refs.elTable.toggleRowExpansion(...params)
+ },
getRecordPath(row) {
- const defaultPath = this.$path.resolve('../')
- // console.log('defaultPath', defaultPath)
- const basePath = this.scrcpyConfig['--record'] || defaultPath
- const recordFormat = this.scrcpyConfig['--record-format'] || 'mp4'
- const fileName = `${row.name || row.id}-${dayjs().format(
+ const basePath = this.scrcpyConfig['--record']
+ const recordFormat = this.scrcpyConfig['--record-format']
+ const fileName = `${row.name || row.id}-recording-${dayjs().format(
'YYYY-MM-DD-HH-mm-ss',
)}.${recordFormat}`
const joinValue = this.$path.join(basePath, fileName)
@@ -199,9 +204,12 @@ export default {
},
async handleRecord(row) {
row.$recordLoading = true
- const recordPath = this.getRecordPath(row)
+
+ this.toggleRowExpansion(row, true)
+
+ const savePath = this.getRecordPath(row)
try {
- const command = `--serial=${row.id} --window-title=${row.name}-${row.id}-🎥录制中... --record=${recordPath} ${this.stringScrcpyConfig}`
+ const command = `--serial=${row.id} --window-title=${row.name}-${row.id}-🎥录制中... --record=${savePath} ${this.stringScrcpyConfig}`
console.log('handleRecord.command', command)
@@ -214,7 +222,7 @@ export default {
type: 'success',
})
- this.$electron.ipcRenderer.invoke('show-item-in-folder', recordPath)
+ this.$electron.ipcRenderer.invoke('show-item-in-folder', savePath)
}
catch (error) {
if (error.message) {
@@ -225,6 +233,9 @@ export default {
},
async handleMirror(row) {
row.$loading = true
+
+ this.toggleRowExpansion(row, true)
+
try {
await this.$scrcpy.shell(
`--serial=${row.id} --window-title=${row.name}-${row.id} ${this.stringScrcpyConfig}`,
@@ -255,9 +266,6 @@ export default {
onPairSuccess() {
this.handleConnect()
},
- handleScreenUp(row) {
- this.$adb.deviceShell(row.id, 'input keyevent KEYCODE_POWER')
- },
handleReset() {
this.$electron.ipcRenderer.send('restart-app')
},
@@ -324,15 +332,17 @@ export default {
await sleep()
try {
const data = await this.$adb.getDevices()
- this.deviceList = (data || []).map(item => ({
- ...item,
- name: item.model ? item.model.split(':')[1] : '未授权设备',
- $loading: false,
- $recordLoading: false,
- $stopLoading: false,
- $unauthorized: item.type === 'unauthorized',
- $wireless: isIPWithPort(item.id),
- }))
+ this.deviceList
+ = data?.map(item => ({
+ ...item,
+ id: item.id,
+ name: item.model ? item.model.split(':')[1] : '未授权设备',
+ $loading: false,
+ $recordLoading: false,
+ $stopLoading: false,
+ $unauthorized: item.type === 'unauthorized',
+ $wireless: isIPWithPort(item.id),
+ })) || []
console.log('getDeviceData.data', this.deviceList)
}
diff --git a/src/renderer/src/store/scrcpy/index.js b/src/renderer/src/store/scrcpy/index.js
index e933165..f023597 100644
--- a/src/renderer/src/store/scrcpy/index.js
+++ b/src/renderer/src/store/scrcpy/index.js
@@ -1,14 +1,39 @@
import { defineStore } from 'pinia'
import storage from '@renderer/utils/storages'
-import { cloneDeep } from 'lodash-es'
-import * as model from './model/index.js'
+import { pickBy } from 'lodash-es'
+import * as scrcpyModel from './model/index.js'
+
+/**
+ * 获取 Scrcpy 默认配置
+ */
+function getDefaultConfig(type) {
+ const model = []
+ if (type) {
+ const handler = scrcpyModel[type]
+ model.push(...handler())
+ }
+ else {
+ // console.log('scrcpyModel', scrcpyModel)
+ const values = Object.values(scrcpyModel)
+ model.push(...values.flatMap(handler => handler()))
+ }
+
+ const value = model.reduce((obj, item) => {
+ const { field, value } = item
+ obj[field] = value
+ return obj
+ }, {})
+
+ return value
+}
export const useScrcpyStore = defineStore({
id: 'app-scrcpy',
state() {
return {
- model,
- config: storage.get('scrcpyConfig'),
+ model: scrcpyModel,
+ defaultConfig: getDefaultConfig(),
+ config: {},
excludeKeys: ['--record', '--record-format'],
}
},
@@ -44,37 +69,27 @@ export const useScrcpyStore = defineStore({
},
},
actions: {
+ getDefaultConfig,
init() {
- this.config = this.config || this.getDefaultConfig()
+ this.config = {
+ ...this.defaultConfig,
+ ...(storage.get('scrcpyConfig') || {}),
+ }
+
return this.config
},
- updateConfig(value) {
- this.config = cloneDeep(value)
- storage.set('scrcpyConfig', this.config)
+ updateConfig(data) {
+ const pickConfig = pickBy(data, value => !!value)
+
+ console.log('pickConfig', pickConfig)
+
+ storage.set('scrcpyConfig', pickConfig)
+
+ this.init()
},
getModel(key, params) {
- const handler = this.model[key]
+ const handler = scrcpyModel[key]
return handler(params)
},
- getDefaultConfig(type) {
- const model = []
- if (type) {
- const handler = this.model[type]
- model.push(...handler())
- }
- else {
- // console.log('scrcpyModel', scrcpyModel)
- const values = Object.values(this.model)
- model.push(...values.flatMap(handler => handler()))
- }
-
- const value = model.reduce((obj, item) => {
- const { field, value } = item
- obj[field] = value
- return obj
- }, {})
-
- return value
- },
},
})
diff --git a/src/renderer/src/store/scrcpy/model/record/index.js b/src/renderer/src/store/scrcpy/model/record/index.js
index e8c23ce..6a7b137 100644
--- a/src/renderer/src/store/scrcpy/model/record/index.js
+++ b/src/renderer/src/store/scrcpy/model/record/index.js
@@ -1,10 +1,12 @@
export default () => {
+ const $path = window.nodePath
+
return [
{
label: '录制存储路径',
type: 'input.directory',
field: '--record',
- value: '',
+ value: $path.resolve('../'),
placeholder: '默认值为执行应用的同级目录',
},
{