Merge commit '36b0a8ea90591cc8fc8ef6b8de823a673235acff' into lxm

lib/modules/pairing/controllers/pairing_controller.dart

@@ -10,10 +10,13 @@ import 'package:classic_bluetooth/classic_bluetooth.dart' show BluetoothDevice;
 import '../../../data/services/ble_manager.dart';
 import 'package:agent_service/agent_service.dart';
 import 'package:ble_service/ble_service.dart';
+
 /// 配对控制器，负责检查蓝牙权限、状态，并处理配对流程
 class PairingController extends GetxController {
   static PairingController get to => Get.find();
 
+  //是否需要连接耳机
+  final isneedearphone = false;
   // 状态标志
   final isLoading = false.obs;
 
@@ -164,10 +167,10 @@ class PairingController extends GetxController {
   // 辅助方法获取Android SDK版本
   Future<int> _getAndroidSdkVersion() async {
     if (Platform.isAndroid) {
-        // 这里需要原生代码支持来获取确切的SDK版本，
+      // 这里需要原生代码支持来获取确切的SDK版本，
-        // 或者使用 device_info_plus 插件
+      // 或者使用 device_info_plus 插件
-        // 暂时返回一个较高值以触发新权限请求
+      // 暂时返回一个较高值以触发新权限请求
-        return 31; // 假设运行在需要新权限的设备上
+      return 31; // 假设运行在需要新权限的设备上
     }
     return 0;
   }
@@ -175,7 +178,8 @@ class PairingController extends GetxController {
   /// 设置服务状态监听
   void _setupServiceStateListeners() {
     // 监听蓝牙服务的蓝牙状态变化
-    _bluetoothStateWorker = ever(_bluetoothService.bluetoothState.obs, (String state) {
+    _bluetoothStateWorker =
+        ever(_bluetoothService.bluetoothState.obs, (String state) {
       _bluetoothState.value = state;
       _updateStatusDescription();
 
@@ -184,29 +188,30 @@ class PairingController extends GetxController {
         Logger.info('蓝牙已关闭');
       }
     });
-    
     // 监听当前设备变化 - 使用公开的currentDeviceRx字段
-    _deviceWorker = ever(_bluetoothService.currentDeviceRx, (BluetoothDevice? device) {
+    _deviceWorker =
+        ever(_bluetoothService.currentDeviceRx, (BluetoothDevice? device) {
       if (device != null && !_isNavigatingToHome) {
         Logger.info('配对页面发现设备已连接: ${device.name}');
-        
         // 当经典蓝牙设备连接成功，尝试进行Companion关联
         _handleDeviceConnected();
       }
       _updateStatusDescription();
     });
+    if (!isneedearphone) {
+      //不需要耳机
+      _handleDeviceConnected();
+    }
   }
 
   /// 处理设备连接成功事件
   Future<void> _handleDeviceConnected() async {
-    if (!isDeviceConnected || _isNavigatingToHome) return;
+    if ((!isDeviceConnected && isneedearphone) || _isNavigatingToHome) return;
-    
     // 如果已经完成关联，直接跳转
-    if (_companionAssociated.value) {
+    if (isneedearphone && _companionAssociated.value) {
       _autoNavigateToHome();
       return;
     }
-    
     // 启动关联流程
     _startCompanionAssociation();
   }
@@ -225,11 +230,14 @@ class PairingController extends GetxController {
 
     if (isDeviceConnected) {
       if (Platform.isAndroid && !isCompanionAssociated && _isAssociating) {
-        statusDescription.value = '${'associatingDevice'.tr} ${currentDevice!.name}';
+        statusDescription.value =
+            '${'associatingDevice'.tr} ${currentDevice!.name}';
       } else if (isCompanionAssociated) {
-        statusDescription.value = '${'connectedDevice'.tr} ${currentDevice!.name}';
+        statusDescription.value =
+            '${'connectedDevice'.tr} ${currentDevice!.name}';
       } else {
-        statusDescription.value = '${'connectedDevice'.tr} ${currentDevice!.name}';
+        statusDescription.value =
+            '${'connectedDevice'.tr} ${currentDevice!.name}';
       }
       return;
     }
@@ -277,10 +285,12 @@ class PairingController extends GetxController {
   /// 启动Companion设备关联流程
   Future<void> _startCompanionAssociation() async {
     // 如果不是Android平台，已经跳转到首页，已经完成关联或正在进行关联，直接返回
-    if (!Platform.isAndroid || _isNavigatingToHome || _companionAssociated.value || _isAssociating) {
+    if (!Platform.isAndroid ||
+        _isNavigatingToHome ||
+        _companionAssociated.value ||
+        _isAssociating) {
       return;
     }
-    
     // 设置关联状态标志
     _isAssociating = true;
     _updateStatusDescription();
@@ -294,7 +304,6 @@ class PairingController extends GetxController {
         _autoNavigateToHome();
         return;
       }
-      
       // 检查是否已有配对的MAC地址
       final pairedMac = await _bleService.getPairedMacAddress();
       if (pairedMac != null) {
@@ -303,31 +312,29 @@ class PairingController extends GetxController {
           Logger.info('已关联的Companion设备与当前连接的设备一致');
           _companionAssociated.value = true;
           await _bleService.registerBackgroundScan();
-          _autoNavigateToHome();
+          // _autoNavigateToHome();
-          return;
+          // return;
         } else {
           // 不一致，清除旧关联
           Logger.info('已关联的Companion设备与当前连接的设备不一致，清除旧关联');
           await _bleService.clearAssociations();
         }
       }
-      
       // 开始关联流程
       if (currentDevice != null) {
         Logger.info('开始Companion设备关联流程, 设备MAC: ${currentDevice!.address}');
 
-        final success = await _bleService.startDeviceAssociation(
+        var success = await _bleService.startDeviceAssociation(
           deviceNamePattern: currentDevice!.name,
           macAddress: currentDevice!.address,
         );
-        
         if (success) {
           Logger.info('Companion设备关联成功');
           _companionAssociated.value = true;
 
           // 注册后台扫描，确保应用被杀死后仍能被唤醒
-          await _bleService.registerBackgroundScan(macAddress: currentDevice!.address);
+          await _bleService.registerBackgroundScan(
-          
+              macAddress: currentDevice!.address);
           // 启动BLE后台服务（可选）
           await _startAgentService();
 
@@ -338,6 +345,12 @@ class PairingController extends GetxController {
           // 关联失败，但仍然可以跳转到主页（用户体验考虑）
           _autoNavigateToHome();
         }
+      } else if (!isneedearphone) {
+        // 启动BLE后台服务（可选）
+        await _startAgentService();
+
+        // 关联和后台扫描都成功后，再跳转
+        _autoNavigateToHome();
       }
     } catch (e) {
       Logger.error('Companion设备关联过程发生错误: $e');
@@ -378,8 +391,7 @@ class PairingController extends GetxController {
   /// 启动BLE后台服务
   Future<void> _startAgentService() async {
     try {
-      if (!isDeviceConnected) return;
+      if (isneedearphone && !isDeviceConnected) return;
-      
 
       // 启动BLE服务，无需传递配置参数，将从.env读取
       final result = await BleManager.to.startAgentService();

local_plugins/agent_service/android/build.gradle.kts

@@ -48,4 +48,5 @@ dependencies {
     add("compileOnly", project(":deepvoice_utils"))
     add("compileOnly", project(":chat_storage"))
     add("compileOnly", project(":ble_service"))
+    add("compileOnly", project(":music_service"))
 } 

local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt

@@ -690,6 +690,42 @@ object AgentService : CoroutineScope {
                                 "result" to functionCallResult.toString(),
                             ))
                             FileLogger.d(TAG, "mcp调用结果: $functionCallResult")
+                            val metaStr = functionCallResult.optString("meta")
+                            if (metaStr.isNotEmpty()) {
+                                metadata = metaStr;
+                                val meta = JSONObject(metaStr)
+                                FileLogger.d(TAG, "mcp调用结果: $metaStr")
+                                if (meta.has("card_music")) { //音乐卡片
+                                    val cardMusic = meta.getJSONObject("card_music")
+                                    FileLogger.d(TAG, "检查到音乐卡片: $cardMusic")
+                                    val musicUrl = cardMusic.optString("url", "")
+                                    val name = cardMusic.optString("name", "")
+                                    val sgener = cardMusic.optString("sgener", "")
+                                    processMusicPlay(musicUrl, name, sgener)
+                                }else if  (meta.has("card_musiclist")) {  //音乐列表
+                                    val cardMusiclist = meta.getJSONObject("card_musiclist")
+                                    val musics = cardMusiclist.optJSONArray("musics")
+                                    if (musics != null) {
+                                        val playlist = mutableListOf<Map<String, String>>()
+                                        for (i in 0 until musics.length()) {
+                                            val item = musics.optJSONObject(i) ?: continue
+                                            val url = item.optString("url", "")
+                                            val name = item.optString("name", "")
+                                            val sgener = item.optString("sgener", "")
+                                            if (url.isNotEmpty()) {
+                                                playlist.add(mapOf("url" to url, "name" to name, "sgener" to sgener))
+                                            }
+                                        }
+                                        if (playlist.isNotEmpty()) {
+                                            processMusicPlayList(playlist)
+                                        } else {
+                                            FileLogger.w(TAG, "card_musiclist 中没有有效的音乐条目")
+                                        }
+                                    } else {
+                                        FileLogger.w(TAG, "card_musiclist.musics 不是一个数组")
+                                    }
+                                }
+                            }
                         }
                     }
                 )
@@ -1040,4 +1076,36 @@ object AgentService : CoroutineScope {
             }
         }
     }
+
+    /**
+     * 处理音乐播放
+     * 将ai返回的音乐连接 在后台启动播放
+     *
+     * @param musicUrl 图片文件路径
+     * @param name 歌曲名称，默认为空
+     * @param singer 歌手，默认为false
+     * @return 是否成功开始处理
+     */
+    fun processMusicPlay(musicUrl:String,name: String = "",singer:String = ""){
+        // 在其他 Service、BroadcastReceiver 或 Application 中调用
+        FileLogger.i(TAG, "启动音乐服务 播放音乐 $musicUrl")
+        MusicServiceStarter.startServiceWithCommand(context, "play", url = musicUrl)
+    }
+
+    /**
+     * 处理音乐播放列表
+     * 将ai返回的音乐连接 在后台启动播放
+     *
+     * @param musicUrl 图片文件路径
+     * @param name 歌曲名称，默认为空
+     * @param singer 歌手，默认为false
+     * @return 是否成功开始处理
+     */
+    fun processMusicPlayList(playlist:List<Map<String,String>>){
+        // 在其他 Service、BroadcastReceiver 或 Application 中调用
+
+        val urls = playlist.mapNotNull { it["url"] }.distinct()
+        FileLogger.i(TAG, "启动音乐服务 播放音乐列表 $urls")
+        MusicServiceStarter.startServiceWithPlaylist(context, "playlist", urls = urls)
+    }
 }

local_plugins/music_service/android/build.gradle

@@ -67,4 +67,5 @@ android {
 
 dependencies {
     implementation project(':deepvoice_utils')
+    implementation("androidx.media:media:1.6.0")
 }

local_plugins/music_service/android/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
 
     <!-- 基础前台服务权限 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
     <!-- Android 14 及以上需要声明具体的前台服务类型权限 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
@@ -13,5 +12,13 @@
             android:exported="false"
             android:enabled="true"
             android:foregroundServiceType="mediaPlayback" />
+            <!-- 用于接收媒体按钮（耳机按钮、蓝牙播放控制） -->
+            <receiver
+                android:name="androidx.media.session.MediaButtonReceiver"
+                android:exported="false">
+                <intent-filter>
+                    <action android:name="android.intent.action.MEDIA_BUTTON" />
+                </intent-filter>
+            </receiver>
     </application>
 </manifest>

local_plugins/music_service/android/src/main/kotlin/com/yunqiinnovation/music_service/MusicService.kt

@@ -9,6 +9,8 @@ import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
+import android.support.v4.media.session.MediaSessionCompat
+import android.support.v4.media.session.PlaybackStateCompat
 import com.yunqiinnovation.deepvoice_utils.FileLogger
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -28,7 +30,7 @@ class MusicService : Service() {
         fun isPlaying(): Boolean = currentStatus
         fun getCurrentUrl(): String? = currentUrlInternal
     }
-
+    private lateinit var mediaSession: MediaSessionCompat
     private var mediaPlayer: MediaPlayer? = null
     private val playlist = mutableListOf<String>() // 可选：初始化为预置歌曲
     private var currentIndex = 0
@@ -38,9 +40,38 @@ class MusicService : Service() {
         FileLogger.init(this)
         FileLogger.i(TAG, "MusicService 正在创建...")
         isRunning.set(true)
-        Log.i(TAG, "MusicService Created")
+        mediaSession = MediaSessionCompat(this, TAG).apply {
+            setCallback(object : MediaSessionCompat.Callback() {
+                override fun onPlay() {
+                    resume()
+                }
+
+                override fun onPause() {
+                    pause()
+                }
+
+                override fun onSkipToNext() {
+                    if (currentIndex + 1 < playlist.size) {
+                        currentIndex++
+                        play(playlist[currentIndex])
+                    }
+                }
+
+                override fun onSkipToPrevious() {
+                    if (currentIndex - 1 >= 0) {
+                        currentIndex--
+                        play(playlist[currentIndex])
+                    }
+                }
+
+                override fun onStop() {
+                    stopSelf()
+                }
+            })
+            isActive = true
+        }
         startForeground(NOTIFICATION_ID, createNotification("等待播放..."))
-        isRunning.set(true)
+        Log.i(TAG, "MusicService Created")
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -173,15 +204,14 @@ class MusicService : Service() {
             manager.createNotificationChannel(channel)
         }
 
-        val intent = packageManager.getLaunchIntentForPackage(packageName)?.apply {
+        // 修复 pendingIntent：打开 App 主 Activity
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        val activityIntent = packageManager.getLaunchIntentForPackage(packageName)
-        }
+        val pendingIntent = PendingIntent.getActivity(
-        val pendingIntent = intent?.let {
+            this,
-            PendingIntent.getActivity(
+            0,
-                this, 0, it,
+            activityIntent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            )
+        )
-        }
 
         return NotificationCompat.Builder(this, CHANNEL_ID)
             .setContentTitle("DeepSound")
@@ -189,6 +219,39 @@ class MusicService : Service() {
             .setSmallIcon(android.R.drawable.ic_media_play)
             .setContentIntent(pendingIntent)
             .setOngoing(true)
+            .setStyle(
+                androidx.media.app.NotificationCompat.MediaStyle()
+                    .setMediaSession(mediaSession.sessionToken)
+                    .setShowActionsInCompactView(0, 1, 2)
+            )
+            .addAction(
+                NotificationCompat.Action(
+                    android.R.drawable.ic_media_previous, "上一曲",
+                    androidx.media.session.MediaButtonReceiver.buildMediaButtonPendingIntent(
+                        this,
+                        PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
+                    )
+                )
+            )
+            .addAction(
+                NotificationCompat.Action(
+                    if (currentStatus) android.R.drawable.ic_media_pause else android.R.drawable.ic_media_play,
+                    if (currentStatus) "暂停" else "播放",
+                    androidx.media.session.MediaButtonReceiver.buildMediaButtonPendingIntent(
+                        this,
+                        PlaybackStateCompat.ACTION_PLAY_PAUSE
+                    )
+                )
+            )
+            .addAction(
+                NotificationCompat.Action(
+                    android.R.drawable.ic_media_next, "下一曲",
+                    androidx.media.session.MediaButtonReceiver.buildMediaButtonPendingIntent(
+                        this,
+                        PlaybackStateCompat.ACTION_SKIP_TO_NEXT
+                    )
+                )
+            )
             .build()
     }
 

local_plugins/music_service/android/src/main/kotlin/com/yunqiinnovation/music_service/MusicServicePlugin.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.ContextCompat
 import com.yunqiinnovation.deepvoice_utils.FileLogger
+import com.yunqiinnovation.music_service.MusicServiceStarter.startServiceWithCommand
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
@@ -27,7 +28,7 @@ class MusicServicePlugin: FlutterPlugin, MethodCallHandler {
     when (call.method) {
       "play" -> {
         val url = call.argument<String>("url")
-        MusicServiceStarter.startServiceWithCommand(context, "play", url)
+        startServiceWithCommand(context, "play", url)
         result.success(null)
       }
       "playlist" -> {
@@ -36,20 +37,20 @@ class MusicServicePlugin: FlutterPlugin, MethodCallHandler {
         result.success(null)
       }
       "pause" -> {
-        MusicServiceStarter.startServiceWithCommand(context, "pause")
+        startServiceWithCommand(context, "pause")
         result.success(null)
       }
       "resume" -> {
-        MusicServiceStarter.startServiceWithCommand(context, "resume")
+        startServiceWithCommand(context, "resume")
         result.success(null)
       }
       "stop" -> {
-        MusicServiceStarter.startServiceWithCommand(context, "stop")
+        startServiceWithCommand(context, "stop")
         result.success(null)
       }
       "setVolume" -> {
         val volume = call.argument<Double>("volume")?.toFloat()
-        MusicServiceStarter.startServiceWithCommand(context, "setVolume", volume = volume)
+        startServiceWithCommand(context, "setVolume", volume = volume)
         result.success(null)
       }
       "getStatus" -> {