From abe9a4badbb232c16aba017fac2ee11303a57d21 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 18 Sep 2025 10:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AF=BC=E8=88=AA=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/AndroidManifest.xml | 10 ++ lib/data/services/ble_manager.dart | 3 + .../agent/controllers/agent_controller.dart | 133 +++++++++++++++++- lib/modules/agent/views/message_bubble.dart | 4 + lib/modules/agent/views/navigation_card.dart | 9 +- .../agent_service/AgentService.kt | 26 ++-- .../agent_service/AgentServicePlugin.kt | 1 + .../agent_service/BleMediaService.kt | 5 +- 8 files changed, 171 insertions(+), 20 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 3d1ae458c..e1ca0f551 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -132,4 +132,14 @@ + + + + + + + + + + diff --git a/lib/data/services/ble_manager.dart b/lib/data/services/ble_manager.dart index e208e74bc..dbf18918d 100644 --- a/lib/data/services/ble_manager.dart +++ b/lib/data/services/ble_manager.dart @@ -657,6 +657,8 @@ class BleManager extends GetxService { AppConfig.env('OPENAI_AGENT_ID') ?? 'personal_assistant'; final systemPrompt = AppConfig.agentsystemPrompt(openaiagentid); final musicServiceType = AppConfig.env('APP_MUSICSERVICE_TYPE') ?? 'AUTO'; + final navigationMode = + AppConfig.env('APP_NAVIGATION_MODE') ?? 'external_auto'; // 从Flutter资源包中加载.mcp.json final jsonData = AppConfig.mcpConfig(); Logger.info('启动BLE服务，musicServiceType: ${musicServiceType}'); @@ -728,6 +730,7 @@ class BleManager extends GetxService { 'usertoken': jsonString, 'supportedLanguages': supportedLanguages, 'musicServiceType': musicServiceType, + "navigationMode": navigationMode }; // 记录日志（不记录敏感信息） diff --git a/lib/modules/agent/controllers/agent_controller.dart b/lib/modules/agent/controllers/agent_controller.dart index 78fa49473..3ad7a9657 100644 --- a/lib/modules/agent/controllers/agent_controller.dart +++ b/lib/modules/agent/controllers/agent_controller.dart @@ -4,7 +4,9 @@ import 'dart:ffi'; import 'dart:io'; import 'package:amap_service/amap_service.dart'; import 'package:http/http.dart' as http; +import 'package:package_info_plus/package_info_plus.dart'; import 'package:url_launcher/url_launcher.dart'; +import 'package:voitrans/data/models/appconfig.dart'; import 'package:voitrans/data/models/song_model.dart'; import 'package:voitrans/data/services/ble_manager.dart'; import 'package:voitrans/data/services/bluetooth_manager.dart'; @@ -172,7 +174,6 @@ class AgentController extends GetxController with WidgetsBindingObserver { _setupTextInputListener(); //设置文本输入监听器 startVoiceInput(); //开启语音输入 - // 监听应用生命周期：当应用切到后台/失焦时兜底结束按住说话，防止 onPointerUp 未触发 WidgetsBinding.instance.addObserver(this); @@ -812,13 +813,22 @@ class AgentController extends GetxController with WidgetsBindingObserver { if (card_navigation is Map) { //导航 final start = card_navigation["start"] as String; - final end = card_navigation["end"] as String; + final destination = + card_navigation["destination"] as String; + final end_longitude = + card_navigation["end_longitude"] as String; + final end_latitude = + card_navigation["end_latitude"] as String; + // End_longitude string `json:"end_longitude"` //目标点经度 + // End_latitude string `json:"end_latitude"` //目标点纬度 final items = card_navigation['items']; if (items != null) { Future.delayed(Duration(seconds: 2), () { // Logger.i(TAG, 'liwei-------- 打开导航页面: $start $end '); // 2秒后执行的代码 - openNavigation(start, end, ""); + + openNavigation(start, destination, end_latitude, + end_longitude, ""); }); } } @@ -1855,8 +1865,19 @@ class AgentController extends GetxController with WidgetsBindingObserver { } //去导航 - void openNavigation(String start, String end, String ntype) { - _navigationManager.open(start, end, ntype); + void openNavigation(String start, String destination, String endlatitude, + String endlongitude, String mode) { + final navigationMode = + AppConfig.env('APP_NAVIGATION_MODE') ?? 'external_auto'; + if (navigationMode == 'internal_gaode') { + _navigationManager.open(start, "$endlongitude,$endlatitude", mode); + } else if (navigationMode == 'external_baidu') { + openBaiduMap(destination, mode); + } else if (navigationMode == 'external_gaode') { + openGaodeMap(destination, endlatitude, destination, mode); + } else if (navigationMode == 'external_google') { + openGoogleMap(destination, mode); + } } // 打开图片查看器 @@ -2189,4 +2210,106 @@ class AgentController extends GetxController with WidgetsBindingObserver { Get.snackbar('错误', '打开地图时发生错误'); } } + + /// 打开高德地图进行导航 + Future openGaodeMap( + String destination, + String lat, + String lon, + String mode, + ) async { + try { + // 获取应用包名 + final packageInfo = await PackageInfo.fromPlatform(); + + // 构建src参数（带平台前缀） + final String src = Platform.isAndroid + ? "android.${packageInfo.packageName}" + : "ios.${packageInfo.packageName}"; + + // 构建高德地图导航链接 + final Uri uri = Uri( + scheme: 'androidamap', + host: 'navi', + queryParameters: { + 'poiname': destination, // 目的地地址 + 'lat': lat, + 'lon': lon, + 'mode': mode.isNotEmpty ? mode : 'driving', // 导航模式，默认驾车 + 'sourceApplication': src, // 来源标识 + 'callnative': '1', // 优先调用原生应用 + }, + ); + + print('高德导航链接: ${uri.toString()}'); + // final Uri testMapsUri = Uri.parse( + // 'androidamap://navi?sourceApplication=android.com.saitong.voitrans&lat=22.615274&lon=114.035576&poiname=深圳北站&dev=0&mode=driving'); + // // 尝试打开高德地图应用 + if (await canLaunchUrl(uri)) { + final bool launched = await launchUrl( + uri, + mode: LaunchMode.externalApplication, + ); + if (!launched) { + print('高德地图已安装，但启动失败'); + Get.snackbar('提示', '高德地图启动失败'); + } + } else { + print('高德地图未安装'); + Get.snackbar('提示', '请先安装高德地图应用'); + } + } catch (e) { + print('打开地图失败: $e'); + Get.snackbar('错误', '打开地图时发生错误'); + } + } + + /// 打开Baidu地图进行导航 + Future openBaiduMap( + String destination, + String mode, + ) async { + try { + // 地址和城市（已编码的字符串也可以直接使用） + // String destination = "深圳北站"; + // String city = "深圳"; + + // 构建正确的导航链接 + final Uri appUri = Uri( + scheme: 'baidumap', + host: 'map', + path: 'direction', // 使用direction端点而非navi + queryParameters: { + 'destination': destination, + // 'city': '深圳', + 'mode': mode, // 明确导航模式 + 'src': 'com.saitong.voitrans', // 带平台前缀的src参数 + }, + ); + + print('生成的链接: ${appUri.toString()}'); + + if (await canLaunchUrl(appUri)) { + await launchUrl(appUri, mode: LaunchMode.externalApplication); + } else { + print('无法打开百度地图，请检查是否已安装'); + } + + // final packageInfo = await PackageInfo.fromPlatform(); + // String packageName = packageInfo.packageName; + // // 方案1: 尝试使用Google Maps应用的URL scheme + // // final Uri googleMapsUri = Uri.parse(url); + // // 简化版链接（仅包含必要参数） + // final Uri testUri = Uri.parse( + // 'baidumap://map/navi?location=$end_latitude,$end_longitude&coord_type=bd09ll&src$packageName'); + // if (await canLaunchUrl(testUri)) { + // await launchUrl(testUri, mode: LaunchMode.externalApplication); + // } else { + // print('打开地图失败'); + // } + } catch (e) { + print('打开地图失败: $e'); + Get.snackbar('错误', '打开地图时发生错误'); + } + } } diff --git a/lib/modules/agent/views/message_bubble.dart b/lib/modules/agent/views/message_bubble.dart index d26670c65..63615d5e0 100644 --- a/lib/modules/agent/views/message_bubble.dart +++ b/lib/modules/agent/views/message_bubble.dart @@ -307,6 +307,8 @@ class MessageBubble extends GetView { maps_route_navigation["card_navigation"] as Map; final start = card_navigation['start'] as String? ?? ''; final end = card_navigation['end'] as String? ?? ''; + final end_longitude = card_navigation["end_longitude"] as String; + final end_latitude = card_navigation["end_latitude"] as String; final destination = card_navigation['destination'] as String? ?? ''; final rawList = card_navigation['items'] as List? ?? null; if (rawList != null) { @@ -320,6 +322,8 @@ class MessageBubble extends GetView { return navigationCard(context, start: start, end: end, + endlatitude: end_latitude, + endlongitude: end_longitude, destination: destination, modes: list, navigation: navigation); diff --git a/lib/modules/agent/views/navigation_card.dart b/lib/modules/agent/views/navigation_card.dart index b5d904fff..edb277bd9 100644 --- a/lib/modules/agent/views/navigation_card.dart +++ b/lib/modules/agent/views/navigation_card.dart @@ -45,6 +45,8 @@ Widget navigationCard( BuildContext context, { required String start, required String end, + required String endlatitude, + required String endlongitude, required String destination, required List> modes, Map? navigation, @@ -413,7 +415,12 @@ Widget navigationCard( child: InkWell( borderRadius: BorderRadius.circular(12.r), onTap: () { - controller.openNavigation(start, end, ""); + controller.openNavigation( + start, + destination, + endlatitude, + endlongitude, + modes[currentIndex]["ntype"] as String); }, child: Container( padding: EdgeInsets.symmetric( diff --git a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt index 5258483c9..0b0b2d8a1 100644 --- a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt +++ b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt @@ -138,7 +138,7 @@ object AgentService : CoroutineScope { private val INTERRUPT_DEBOUNCE_MS = 300L var audioSourceType = AzureAsrHelper.AudioSourceType.MICROPHONE - + var navigationMode = "" // 语气词过滤列表（中英文） private val FILLER_WORDS = setOf( // 中文语气词 @@ -238,7 +238,7 @@ object AgentService : CoroutineScope { // 初始化TTS服务 initializeTtsEngine(config) - + navigationMode = config["navigationMode"]?.toString() ?: "" // 初始化ChatAPI服务 chatApiService.initialize( config["openaiApiKey"]?.toString() ?: "", @@ -2058,16 +2058,18 @@ object AgentService : CoroutineScope { * @return 是否成功开始处理 */ fun processNavigation(start: String, end: String) { - // 如果 playlist 中有有效的歌曲，开始播放 - if (!start.isNullOrEmpty() && !end.isNullOrEmpty()) { - NavigationServiceHelper.startNavigation( - context, - "start", - startpos = start, - endpos = end - ) - } else { - Log.i(TAG, "启动导航服务失败") + if (navigationMode == "internal_gaode"){ + // 如果 playlist 中有有效的歌曲，开始播放 + if (!start.isNullOrEmpty() && !end.isNullOrEmpty()) { + NavigationServiceHelper.startNavigation( + context, + "start", + startpos = start, + endpos = end + ) + } else { + Log.i(TAG, "启动导航服务失败") + } } } diff --git a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentServicePlugin.kt b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentServicePlugin.kt index 776a926e7..e36f91294 100644 --- a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentServicePlugin.kt +++ b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentServicePlugin.kt @@ -76,6 +76,7 @@ class AgentServicePlugin : FlutterPlugin, MethodCallHandler, EventChannel.Stream config["serverurl"]?.toString()?.let { intent.putExtra("serverurl", it) } config["usertoken"]?.toString()?.let { intent.putExtra("usertoken", it) } config["musicServiceType"]?.toString()?.let { intent.putExtra("musicServiceType", it) } + config["navigationMode"]?.toString()?.let { intent.putExtra("navigationMode", it) } // 添加 supportedLanguages 参数处理 config["supportedLanguages"]?.let { languages -> diff --git a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleMediaService.kt b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleMediaService.kt index 24cdd92d6..97d2e9a1d 100644 --- a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleMediaService.kt +++ b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleMediaService.kt @@ -53,7 +53,7 @@ class BleMediaService : Service(), CoroutineScope { private const val KEY_USER_TOKEN = "usertoken" private const val KEY_SUPPORTED_LANGUAGES = "supportedLanguages" private const val KEY_MUSICSERVICE_TYPE = "musicServiceType" - + private const val APP_NAVIGATION_MODE = "navigationMode" // 用于跟踪服务是否正在运行 private val isRunning = AtomicBoolean(false) @@ -182,7 +182,7 @@ class BleMediaService : Service(), CoroutineScope { it.getStringExtra(KEY_SERVER_URL)?.let { value -> config[KEY_SERVER_URL] = value } it.getStringExtra(KEY_USER_TOKEN)?.let { value -> config[KEY_USER_TOKEN] = value } it.getStringExtra(KEY_MUSICSERVICE_TYPE)?.let { value -> config[KEY_MUSICSERVICE_TYPE] = value } - + it.getStringExtra(APP_NAVIGATION_MODE)?.let { value -> config[APP_NAVIGATION_MODE] = value } // 提取 supportedLanguages 参数 it.getStringArrayListExtra(KEY_SUPPORTED_LANGUAGES)?.let { languages -> if (languages.isNotEmpty()) { @@ -242,6 +242,7 @@ class BleMediaService : Service(), CoroutineScope { config[KEY_SERVER_URL] = getConfigString(prefs, KEY_SERVER_URL, "") config[KEY_USER_TOKEN] = getConfigString(prefs, KEY_USER_TOKEN, "") config[KEY_MUSICSERVICE_TYPE] = getConfigString(prefs, KEY_MUSICSERVICE_TYPE, "") + config[APP_NAVIGATION_MODE] = getConfigString(prefs, APP_NAVIGATION_MODE, "") // 添加 supportedLanguages 参数处理 val supportedLanguagesStr = getConfigString(prefs, KEY_SUPPORTED_LANGUAGES, "")