From a0858651d684cfa1ace1e3633d368b91e9b7baba Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Thu, 23 Nov 2023 21:21:40 +0800
Subject: [PATCH] update songrequest settings

---
 src/views/manage/SongRequestManage.vue |  6 ++----
 src/views/open_live/MusicRequest.vue   | 29 ++++++++++++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/manage/SongRequestManage.vue b/src/views/manage/SongRequestManage.vue
index 1781db9..57effe9 100644
--- a/src/views/manage/SongRequestManage.vue
+++ b/src/views/manage/SongRequestManage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useAccount } from '@/api/account'
 import DanmakuClient from '@/data/DanmakuClient'
-import { onMounted, onUnmounted } from 'vue'
+import { onActivated, onDeactivated, onMounted, onUnmounted } from 'vue'
 import MusicRequest from '../open_live/MusicRequest.vue'
 import { NAlert } from 'naive-ui'
 
@@ -9,9 +9,7 @@ const accountInfo = useAccount()
 let client = new DanmakuClient(null)
 
 onMounted(() => {
-  if(accountInfo.value?.eventFetcherOnline != true){
-    client.Start()
-  }
+  client.Start()
 })
 onUnmounted(() => {
   client.Stop()
diff --git a/src/views/open_live/MusicRequest.vue b/src/views/open_live/MusicRequest.vue
index 3270797..a8d6d7f 100644
--- a/src/views/open_live/MusicRequest.vue
+++ b/src/views/open_live/MusicRequest.vue
@@ -58,7 +58,7 @@ import {
   useMessage,
   useNotification,
 } from 'naive-ui'
-import { computed, h, onMounted, onUnmounted, ref } from 'vue'
+import { computed, h, onActivated, onDeactivated, onMounted, onUnmounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import SongRequestOBS from '../obs/SongRequestOBS.vue'
 import APlayer from 'vue3-aplayer'
@@ -211,7 +211,7 @@ async function addSong(danmaku: EventModel) {
       .then((data) => {
         if (data.code == 200) {
           message.success(`[${danmaku.name}] 添加曲目: ${data.data.songName}`)
-          originSongs.value.unshift(data.data)
+          if (data.message != 'EventFetcher') originSongs.value.unshift(data.data)
         } else {
           //message.error(`[${danmaku.name}] 添加曲目失败: ${data.message}`)
           const time = Date.now()
@@ -791,22 +791,33 @@ onMounted(() => {
   if (accountInfo.value) {
     settings.value = accountInfo.value.settings.songRequest
   }
-  if (accountInfo.value?.eventFetcherOnline != true) {
-    props.client.on('danmaku', onGetDanmaku)
-    props.client.on('sc', onGetSC)
-  }
+  init()
+})
+onActivated(() => {
+  init()
+})
+function init() {
+  dispose()
+  props.client.on('danmaku', onGetDanmaku)
+  props.client.on('sc', onGetSC)
   timer = setInterval(() => {
     updateKey.value++
   }, 1000)
   updateActiveTimer = setInterval(() => {
     updateActive()
-  }, 3000)
-})
-onUnmounted(() => {
+  }, 2000)
+}
+function dispose() {
   props.client.off('danmaku', onGetDanmaku)
   props.client.off('sc', onGetSC)
   clearInterval(timer)
   clearInterval(updateActiveTimer)
+}
+onDeactivated(() => {
+  dispose()
+})
+onUnmounted(() => {
+  dispose()
 })
 </script>