github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

改进媒体设备改变暂停播放逻辑

pull/277/head
lyswhut 2020-05-13 23:17:51 +08:00
parent 10ee6bcc7f
commit 42f0a9df4b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/renderer/components/core/Player.vue
View File

@ -639,9 +639,7 @@ export default {
this.setMediaDeviceId('default') this.setMediaDeviceId('default')
}) })
}, },
handleDeviceChangeStopPlay(devices, device, mediaDeviceId) { handleDeviceChangeStopPlay(device, mediaDeviceId) {
if (!device) device = devices.find(device => device.deviceId === 'default')
if (!device) device = { label: null }
// console.log(device) // console.log(device)
// console.log(this.setting.player.isMediaDeviceRemovedStopPlay, this.isPlay, device.label, this.prevDeviceLabel) // console.log(this.setting.player.isMediaDeviceRemovedStopPlay, this.isPlay, device.label, this.prevDeviceLabel)
if ( if (
@ -654,10 +652,12 @@ export default {
let mediaDeviceId = this.setting.player.mediaDeviceId let mediaDeviceId = this.setting.player.mediaDeviceId
const devices = await navigator.mediaDevices.enumerateDevices() const devices = await navigator.mediaDevices.enumerateDevices()
let device = devices.find(device => device.deviceId === mediaDeviceId) let device = devices.find(device => device.deviceId === mediaDeviceId)
this.handleDeviceChangeStopPlay(devices, device, mediaDeviceId) if (!device) device = devices.find(device => device.deviceId === 'default')
if (device) return if (!device) device = { label: null, deviceId: null }
this.setMediaDeviceId('default') this.handleDeviceChangeStopPlay(device, mediaDeviceId)
this.setMediaDeviceId(device.deviceId)
}, },
handlePlayDetailAction({ type, data }) { handlePlayDetailAction({ type, data }) {
switch (type) { switch (type) {

2
src/renderer/utils/request.js
View File

@ -107,7 +107,7 @@ export const httpFetch = (url, options = { method: 'get' }) => {
* @param {*} index * @param {*} index
*/ */
export const cancelHttp = requestObj => { export const cancelHttp = requestObj => {
console.log(requestObj) // console.log(requestObj)
if (!requestObj) return if (!requestObj) return
console.log('cancel:', requestObj.href) console.log('cancel:', requestObj.href)
requestObj.abort() requestObj.abort()