From 11d43636ffb0283334621b0f0a8b32a0a4403036 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 20 May 2025 10:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 local_plugins/agent_service/android/build.gradle.kts          | 2 +-
 .../kotlin/com/yunqiinnovation/agent_service/AgentService.kt  | 3 ++-
 local_plugins/amap_service/android/build.gradle               | 3 ---
 .../com/yunqiinnovation/amap_service/NavigationService.kt     | 4 ++--
 local_plugins/amap_service/pubspec.yaml                       | 2 --
 pubspec.yaml                                                  | 3 ++-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/local_plugins/agent_service/android/build.gradle.kts b/local_plugins/agent_service/android/build.gradle.kts
index 79cb9fcde..2a67d0ba0 100644
--- a/local_plugins/agent_service/android/build.gradle.kts
+++ b/local_plugins/agent_service/android/build.gradle.kts
@@ -47,6 +47,6 @@ dependencies {
     add("compileOnly", project(":chat_storage"))
     add("compileOnly", project(":ble_service"))
     add("compileOnly", project(":music_service"))
-    // add("compileOnly", project(":amap_service"))
+    add("compileOnly", project(":amap_service"))
     add("compileOnly", project(":speech"))
 } 
\ No newline at end of file
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 3f104f02a..38f3ab2b3 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
@@ -7,6 +7,7 @@ import com.yunqiinnovation.azure_speech.AzureAsrHelper
 import com.yunqiinnovation.open_ai_service.OpenAIService
 import com.yunqiinnovation.chat_storage.ChatStorageHelper
 import com.yunqiinnovation.music_service.MusicServiceStarter
+import com.yunqiinnovation.amap_service.NavigationServiceStarter
 import android.util.Log
 import io.flutter.plugin.common.MethodChannel
 import kotlinx.coroutines.*
@@ -1189,7 +1190,7 @@ object AgentService : CoroutineScope {
         // 如果 playlist 中有有效的歌曲，开始播放
         if (!start.isNullOrEmpty() && !end.isNullOrEmpty()) {
             Log.i(TAG, "启动导航服务 ${start} ${end}")
-            // NavigationServiceStarter.startServiceWithCommand(context, command = "start", startpos = start, endpos = end)
+            NavigationServiceStarter.startServiceWithCommand(context, command = "start", startpos = start, endpos = end)
         } else {
             Log.i(TAG, "启动导航服务失败")
         }
diff --git a/local_plugins/amap_service/android/build.gradle b/local_plugins/amap_service/android/build.gradle
index d9568dd2d..4bd0a8a1d 100644
--- a/local_plugins/amap_service/android/build.gradle
+++ b/local_plugins/amap_service/android/build.gradle
@@ -65,6 +65,3 @@ android {
         }
     }
 }
-dependencies  {
-    implementation(project(":deepvoice_utils"))
-}
diff --git a/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationService.kt b/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationService.kt
index 093e14137..2fd8947f9 100644
--- a/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationService.kt
+++ b/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationService.kt
@@ -262,8 +262,8 @@ class NavigationService: Service() {
 
         override fun onCalculateRouteSuccess(ids: IntArray?) {
             Log.e(TAG, "onCalculateRouteSuccess! $ids")
-            AMapNavi.getInstance(this).startNavi(NaviType.GPS);
-            aMapNavi.startNavi(NaviType.EMULATOR)
+            // AMapNavi.getInstance(this).startNavi(1);
+            aMapNavi.startNavi(1)
         }
 
         override fun onCalculateRouteSuccess(p0: AMapCalcRouteResult?) {
diff --git a/local_plugins/amap_service/pubspec.yaml b/local_plugins/amap_service/pubspec.yaml
index f7999f100..66d9bcad4 100644
--- a/local_plugins/amap_service/pubspec.yaml
+++ b/local_plugins/amap_service/pubspec.yaml
@@ -18,8 +18,6 @@ dev_dependencies:
   flutter_lints: ^5.0.0
   amap_flutter_base: ^3.0.0
   amap_flutter_map: ^3.0.0
-  deepvoice_utils:
-    path: ../deepvoice_utils
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/pubspec.yaml b/pubspec.yaml
index 7a8bbb5c2..875844f39 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -85,7 +85,8 @@ dependencies:
     path: local_plugins/agent_service
   music_service:
     path: local_plugins/music_service
-
+  amap_service:
+    path: local_plugins/amap_service
 
 dev_dependencies:
   flutter_test: