fix:修复音乐播放功能

Author: joey-zhou

src/main/java/com/xiaozhi/dialogue/llm/tool/function/PlayMusicFunction.java

@@ -32,7 +32,7 @@ public class PlayMusicFunction implements ToolsGlobalRegistry.GlobalFunction {
                         return "音乐播放失败";
                     }else{
                         musicService.playMusic(chatSession, songName, null);
-                        return "尝试播放歌曲"+songName;
+                        return "尝试播放歌曲《"+songName+"》";
                     }
                 }catch (Exception e){
                     logger.error("device 音乐播放异常，song name: {}", songName, e);

src/main/java/com/xiaozhi/dialogue/service/AudioService.java

@@ -87,6 +87,12 @@ public CompletableFuture<Void> sendStop(ChatSession session) {
         String sessionId = session.getSessionId();
 
         try {
+
+            // 如果在播放音乐，则不停止
+            if (sessionManager.isMusicPlaying(sessionId)) {
+                return CompletableFuture.completedFuture(null);
+            }
+
             // 标记播放结束
             AtomicBoolean playingState = isPlaying.computeIfAbsent(sessionId, k -> new AtomicBoolean());
             playingState.set(false);
@@ -308,7 +314,7 @@ public void sendOpusFrame(ChatSession session, byte[] opusFrame) throws IOExcept
     /**
      * 取消调度任务
      */
-    private void cancelScheduledTask(String sessionId) {
+    public void cancelScheduledTask(String sessionId) {
         ScheduledFuture<?> task = scheduledTasks.remove(sessionId);
         if (task != null && !task.isDone()) {
             task.cancel(false);

src/main/java/com/xiaozhi/dialogue/service/DialogueService.java

@@ -56,6 +56,9 @@ public class DialogueService {
     @Resource
     private MessageService messageService;
 
+    @Resource
+    private MusicService musicService;
+
     @Resource
     private VadService vadService;
 
@@ -896,6 +899,10 @@ public void abortDialogue(ChatSession session, String reason) {
                 sessionManager.closeAudioStream(sessionId);
                 sessionManager.setStreamingState(sessionId, false);
 
+                if (sessionManager.isMusicPlaying(sessionId)) {
+                    musicService.stopMusic(sessionId);
+                    return;
+                }
                 // 清空句子队列
                 CopyOnWriteArrayList<Sentence> queue = sentenceQueue.get(sessionId);
                 if (queue != null) {