From 50e140e606872f531de1a85a31d4bbbfa62e29e4 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 2 May 2020 12:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=9F=90=E4=BA=9B=E8=AE=BE=E7=BD=AE=E6=9C=AA=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/views/Setting.vue | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index c90c8b04..f48c8bab 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -63,7 +63,7 @@ div.scroll(:class="$style.setting")
     dd(:title="$t('view.setting.play_mediaDevice_title')")
       h3 {{$t('view.setting.play_mediaDevice')}}
       div
-        material-selection(:list="mediaDevices" :class="$style.gapLeft" @change="handleMediaDeviceChange" v-model="current_setting.player.mediaDeviceId" item-key="deviceId" item-name="label")
+        material-selection(:list="mediaDevices" :class="$style.gapLeft" v-model="current_setting.player.mediaDeviceId" item-key="deviceId" item-name="label")
         material-btn(min :title="$t('view.setting.play_mediaDevice_refresh_btn_title')" :class="[$style.btnMediaDeviceRefresh, $style.gapLeft]" @click="getMediaDevice")
           svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 512 512' space='preserve')
             use(xlink:href='#icon-refresh')
@@ -353,15 +353,16 @@ export default {
           isAutoClearSearchInput: false,
           isAutoClearSearchList: false,
         },
+        tray: {
+          isShow: false,
+          isToTray: false,
+        },
         windowSizeId: 1,
         langId: 'cns',
         themeId: 0,
         sourceId: 0,
         randomAnimate: true,
-        tray: {
-          isShow: false,
-          isToTray: false,
-        },
+        isAgreePact: false,
         apiSource: 'temp',
       },
       languageList,
@@ -377,6 +378,9 @@ export default {
       },
       deep: true,
     },
+    'setting.isAgreePact'(n) {
+      this.current_setting.isAgreePact = n
+    },
     'current_setting.player.isShowTaskProgess'(n) {
       if (n) return
       this.$nextTick(() => {
@@ -602,6 +606,8 @@ export default {
         window.globalObj.proxy[key] = setting.network.proxy[key]
       }
       this.init()
+      this.handleLangChange(this.current_setting.langId)
+      this.handleToTrayChange()
     },
     handleLangChange(id) {
       this.$i18n.locale = id
@@ -612,11 +618,8 @@ export default {
       this.mediaDevices = audioDevices
       // console.log(this.mediaDevices)
     },
-    handleMediaDeviceChange(audioDevice) {
-      this.setMediaDeviceId(audioDevice.deviceId)
-    },
     handleToTrayChange(isToTray) {
-      this.current_setting.tray.isShow = isToTray
+      if (isToTray != null) this.current_setting.tray.isShow = isToTray
       rendererSend('changeTray', this.current_setting.tray)
     },
     handleShowPact() {