expo-gaode-map-navigation 2.0.8 → 2.0.9

package/android/src/main/java/expo/modules/gaodemap/navigation/ExpoGaodeMapNaviViewModule.kt

@@ -10,6 +10,18 @@ class ExpoGaodeMapNaviViewModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMapNaviView")
 
+    OnActivityEntersForeground {
+      ExpoGaodeMapNaviView.resumeActiveViews()
+    }
+
+    OnActivityEntersBackground {
+      ExpoGaodeMapNaviView.pauseActiveViews()
+    }
+
+    OnActivityDestroys {
+      ExpoGaodeMapNaviView.destroyActiveViews()
+    }
+
     View(ExpoGaodeMapNaviView::class) {
       Events(
         "onNavigationReady",
@@ -24,7 +36,10 @@ class ExpoGaodeMapNaviViewModule : Module() {
         "onWayPointArrived",
         "onGpsStatusChanged",
         "onNavigationInfoUpdate",
-        "onGpsSignalWeak"
+        "onGpsSignalWeak",
+        "onNavigationVisualStateUpdate",
+        "onLaneInfoUpdate",
+        "onTrafficStatusesUpdate"
       )
 
       OnViewDestroys { view: ExpoGaodeMapNaviView ->
@@ -39,6 +54,26 @@ class ExpoGaodeMapNaviViewModule : Module() {
       Prop<Boolean>("enableVoice") { view, enabled ->
         view.applyEnableVoice(enabled)
       }
+
+      Prop<String?>("carImage") { view, uri ->
+        view.applyCarImage(uri)
+      }
+
+      Prop<String?>("fourCornersImage") { view, uri ->
+        view.applyFourCornersImage(uri)
+      }
+
+      Prop<String?>("startPointImage") { view, uri ->
+        view.applyStartPointImage(uri)
+      }
+
+      Prop<String?>("wayPointImage") { view, uri ->
+        view.applyWayPointImage(uri)
+      }
+
+      Prop<String?>("endPointImage") { view, uri ->
+        view.applyEndPointImage(uri)
+      }
       
       Prop<Boolean>("autoLockCar") { view, enabled ->
         view.applyAutoLockCar(enabled)
@@ -79,6 +114,10 @@ class ExpoGaodeMapNaviViewModule : Module() {
       Prop<Boolean>("showCompassEnabled") {view, enabled ->
           view.applyShowCompassEnabled(enabled)
       }
+
+      Prop<Boolean>("naviStatusBarEnabled") { view, enabled ->
+        view.applyNaviStatusBarEnabled(enabled)
+      }
       
       Prop<Map<String, Boolean>?>("routeMarkerVisible") { view, config ->
         config?.let {
@@ -95,6 +134,26 @@ class ExpoGaodeMapNaviViewModule : Module() {
       Prop<Boolean>("naviArrowVisible") { view, visible ->
         view.applyNaviArrowVisible(visible)
       }
+
+      Prop<Boolean>("laneInfoVisible") { view, visible ->
+        view.applyLaneInfoVisible(visible)
+      }
+
+      Prop<Boolean>("modeCrossDisplay") { view, visible ->
+        view.applyModeCrossDisplay(visible)
+      }
+
+      Prop<Boolean>("eyrieCrossDisplay") { view, visible ->
+        view.applyEyrieCrossDisplay(visible)
+      }
+
+      Prop<Boolean>("secondActionVisible") { view, visible ->
+        view.applySecondActionVisible(visible)
+      }
+
+      Prop<Boolean>("backupOverlayVisible") { view, visible ->
+        view.applyBackupOverlayVisible(visible)
+      }
       
       // 是否显示拥堵气泡
       Prop<Boolean>("showDriveCongestion") { view, show ->
@@ -115,6 +174,28 @@ class ExpoGaodeMapNaviViewModule : Module() {
         view.applyAndroidStatusBarPaddingTop(topDp)
       }
 
+      Prop<Int>("lockZoom") { view, level ->
+        view.applyLockZoom(level)
+      }
+
+      Prop<Int>("lockTilt") { view, tilt ->
+        view.applyLockTilt(tilt)
+      }
+
+      Prop<Boolean>("eagleMapVisible") { view, visible ->
+        view.applyEagleMapVisible(visible)
+      }
+
+      Prop<Map<String, Double>?>("pointToCenter") { view, value ->
+        val x = value?.get("x") ?: 0.0
+        val y = value?.get("y") ?: 0.0
+        view.applyPointToCenter(x, y)
+      }
+
+      Prop<Boolean>("hideNativeTopInfoLayout") { view, hidden ->
+        view.applyHideNativeTopInfoLayout(hidden)
+      }
+
       Prop<Boolean>("showCamera") { view, enabled ->
           view.applyShowCamera(enabled)
       }
@@ -147,6 +228,10 @@ class ExpoGaodeMapNaviViewModule : Module() {
       AsyncFunction("startNavigation") { view: ExpoGaodeMapNaviView, startLat: Double, startLng: Double, endLat: Double, endLng: Double, promise: expo.modules.kotlin.Promise ->
         view.startNavigation(startLat, startLng, endLat, endLng, promise)
       }
+
+      AsyncFunction("startNavigationWithIndependentPath") { view: ExpoGaodeMapNaviView, token: Int, routeId: Int?, routeIndex: Int?, naviType: Int?, promise: expo.modules.kotlin.Promise ->
+        view.startNavigationWithIndependentPath(token, routeId, routeIndex, naviType, promise)
+      }
       
       AsyncFunction("stopNavigation") { view: ExpoGaodeMapNaviView, promise: expo.modules.kotlin.Promise ->
         view.stopNavigation(promise)

package/android/src/main/java/expo/modules/gaodemap/navigation/ExpoGaodeMapNavigationModule.kt

@@ -12,8 +12,7 @@ import expo.modules.gaodemap.map.modules.SDKInitializer
 import expo.modules.gaodemap.navigation.routes.drive.DriveTruckRouteCalculator
 import expo.modules.gaodemap.navigation.routes.walkride.WalkRideRouteCalculator
 import expo.modules.gaodemap.navigation.routes.ebike.EbikeRouteCalculator
-import expo.modules.gaodemap.navigation.listeners.IndependentRouteListener
-import expo.modules.gaodemap.navigation.utils.Converters
+
 import expo.modules.gaodemap.navigation.managers.IndependentRouteManager
 import expo.modules.gaodemap.navigation.services.IndependentRouteService
 import java.util.Locale
@@ -43,7 +42,7 @@ class ExpoGaodeMapNavigationModule : Module() {
   private var ebikeCalculator: EbikeRouteCalculator? = null
 
   // 独立路径规划：在原生侧暂存路线组，委托独立管理器，避免 Module 膨胀
-  private val independentRouteManager = IndependentRouteManager()
+  private val independentRouteManager = IndependentRouteManager.shared
   private var independentRouteService: IndependentRouteService? = null
 
   @SuppressLint("SuspiciousIndentation")
@@ -213,8 +212,8 @@ class ExpoGaodeMapNavigationModule : Module() {
         val routeId = (options["routeId"] as? Number)?.toInt()
         val routeIndex = (options["routeIndex"] as? Number)?.toInt()
         val naviType = (options["naviType"] as? Number)?.toInt() ?: 0
-        val ok = independentRouteManager.start(context, token, naviType, routeId, routeIndex)
-        if (!ok) throw Exception("startNaviWithPath failed")
+        val result = independentRouteManager.start(context, token, naviType, routeId, routeIndex)
+        if (!result.success) throw Exception(result.message)
         promise.resolve(true)
       } catch (e: Exception) {
         promise.reject("START_NAVI_ERROR", e.message, e)

package/android/src/main/java/expo/modules/gaodemap/navigation/listeners/IndependentRouteListener.kt

@@ -67,10 +67,11 @@ class IndependentRouteListener(
     for (i in 0 until count) {
       try {
         val path = group.getPath(i)
-        val converted = Converters.convertNaviPath(path)
+        val routeId = 12 + i
+        val converted = Converters.convertNaviPath(path, routeId)
         routes.add(converted)
         // 文档说明：第一条为12，第二条为13，第三条为14
-        routeIds.add(12 + i)
+        routeIds.add(routeId)
       } catch (_: Exception) {
         // 忽略单条路线转换失败，保持稳健性
       }
@@ -84,4 +85,4 @@ class IndependentRouteListener(
       "routes" to routes
     )
   }
-}
+}

package/android/src/main/java/expo/modules/gaodemap/navigation/listeners/RouteCalculateListener.kt

@@ -49,7 +49,7 @@ class RouteCalculateListener(
           Converters.convertDriveRouteResult(navi.naviPaths)
         } else {
           val path = navi.naviPath
-          if (path != null) Converters.convertNaviPath(path) else mapOf<String, Any?>()
+          if (path != null) Converters.convertNaviPath(path, 12) else mapOf<String, Any?>()
         }
       } else {
         Converters.convertDriveRouteResult(navi.naviPaths)
@@ -131,4 +131,4 @@ class RouteCalculateListener(
   @Deprecated("Deprecated in Java")
   override fun updateAimlessModeCongestionInfo(aimlessModeStatistics: AimLessModeCongestionInfo?) {}
   override fun onPlayRing(ring: Int) {}
-}
+}

package/android/src/main/java/expo/modules/gaodemap/navigation/managers/IndependentRouteManager.kt

@@ -2,6 +2,7 @@ package expo.modules.gaodemap.navigation.managers
 
 import android.content.Context
 import com.amap.api.navi.AMapNavi
+import com.amap.api.navi.enums.NaviType
 import com.amap.api.navi.model.AMapNaviPathGroup
 
 /**
@@ -11,6 +12,20 @@ import com.amap.api.navi.model.AMapNaviPathGroup
  * - 提供线程安全的 token 管理
  */
 class IndependentRouteManager {
+  data class StartResult(
+    val success: Boolean,
+    val message: String,
+    val requestedNaviType: Int,
+    val sdkNaviType: Int,
+    val resolvedRouteId: Int?,
+    val pathCount: Int,
+    val mainPathIndex: Int
+  )
+
+  companion object {
+    val shared: IndependentRouteManager by lazy { IndependentRouteManager() }
+  }
+
   private val groups = mutableMapOf<Int, AMapNaviPathGroup>()
   private var nextToken = 1
 
@@ -45,28 +60,95 @@ class IndependentRouteManager {
    * 启动导航（可在启动前进行选路）
    * - naviType: 0=GPS, 1=EMULATOR
    */
+  private fun resolveRouteId(group: AMapNaviPathGroup, routeId: Int?, routeIndex: Int?): Int? {
+    return when {
+      routeId != null -> routeId
+      routeIndex == null -> null
+      routeIndex < 0 || routeIndex >= group.pathCount -> Int.MIN_VALUE
+      else -> 12 + routeIndex
+    }
+  }
+
+  private fun resolveSdkNaviType(requestedNaviType: Int): Int {
+    return when (requestedNaviType) {
+      1, NaviType.EMULATOR -> NaviType.EMULATOR
+      else -> NaviType.GPS
+    }
+  }
+
   @Synchronized
-  fun start(context: Context, token: Int, naviType: Int, routeId: Int?, routeIndex: Int?): Boolean {
+  fun start(context: Context, token: Int, naviType: Int, routeId: Int?, routeIndex: Int?): StartResult {
     try {
       val group = get(token)
       val navi = AMapNavi.getInstance(context)
-      
-      // 选择路线
-      if (routeId != null) {
-        group.selectRouteWithIndex(routeId)
-      } else if (routeIndex != null) {
-        group.selectRouteWithIndex(12 + routeIndex)
+
+      val resolvedRouteId = resolveRouteId(group, routeId, routeIndex)
+      val sdkNaviType = resolveSdkNaviType(naviType)
+
+      if (resolvedRouteId == Int.MIN_VALUE) {
+        return StartResult(
+          success = false,
+          message = "独立路径导航启动失败：routeIndex 超出范围，当前仅有 ${group.pathCount} 条路线",
+          requestedNaviType = naviType,
+          sdkNaviType = sdkNaviType,
+          resolvedRouteId = null,
+          pathCount = group.pathCount,
+          mainPathIndex = group.mainPathIndex
+        )
       }
-      
-      // 启动导航
-      val result = navi.startNaviWithPath(naviType, group)
+
+      if (resolvedRouteId != null) {
+        val selected = group.selectRouteWithIndex(resolvedRouteId)
+        if (!selected) {
+          return StartResult(
+            success = false,
+            message = "独立路径导航启动失败：路线选择失败 routeId=$resolvedRouteId",
+            requestedNaviType = naviType,
+            sdkNaviType = sdkNaviType,
+            resolvedRouteId = resolvedRouteId,
+            pathCount = group.pathCount,
+            mainPathIndex = group.mainPathIndex
+          )
+        }
+      }
+
+      val result = navi.startNaviWithPath(sdkNaviType, group)
       if (!result) {
-        android.util.Log.e("IndependentRouteManager", "startNaviWithPath failed: naviType=$naviType")
+        android.util.Log.e(
+          "IndependentRouteManager",
+          "startNaviWithPath failed: token=$token requestedNaviType=$naviType sdkNaviType=$sdkNaviType routeId=$resolvedRouteId pathCount=${group.pathCount} mainPathIndex=${group.mainPathIndex}"
+        )
+        return StartResult(
+          success = false,
+          message = "独立路径导航启动失败：高德 SDK 未接受该路径组（requestedNaviType=$naviType, sdkNaviType=$sdkNaviType）",
+          requestedNaviType = naviType,
+          sdkNaviType = sdkNaviType,
+          resolvedRouteId = resolvedRouteId,
+          pathCount = group.pathCount,
+          mainPathIndex = group.mainPathIndex
+        )
       }
-      return result
+
+      return StartResult(
+        success = true,
+        message = "独立路径导航启动成功",
+        requestedNaviType = naviType,
+        sdkNaviType = sdkNaviType,
+        resolvedRouteId = resolvedRouteId,
+        pathCount = group.pathCount,
+        mainPathIndex = group.mainPathIndex
+      )
     } catch (e: Exception) {
       android.util.Log.e("IndependentRouteManager", "Start navigation failed", e)
-      return false
+      return StartResult(
+        success = false,
+        message = "独立路径导航启动失败：${e.message ?: "unknown"}",
+        requestedNaviType = naviType,
+        sdkNaviType = resolveSdkNaviType(naviType),
+        resolvedRouteId = routeId,
+        pathCount = 0,
+        mainPathIndex = 0
+      )
     }
   }
 
@@ -80,4 +162,4 @@ class IndependentRouteManager {
     groups.clear()
     nextToken = 1
   }
-}
+}

package/android/src/main/java/expo/modules/gaodemap/navigation/routes/drive/DriveTruckRouteCalculator.kt

@@ -1,5 +1,6 @@
 package expo.modules.gaodemap.navigation.routes.drive
 
+import android.annotation.SuppressLint
 import android.content.Context
 import com.amap.api.navi.AMapNavi
 import com.amap.api.navi.model.AMapCarInfo
@@ -64,6 +65,7 @@ class DriveTruckRouteCalculator(
   /**
    * 驾车路径规划
    */
+  @SuppressLint("SuspiciousIndentation")
   fun calculateDriveRoute(options: Map<String, Any?>, promise: Promise) {
     android.util.Log.d("DriveTruckRouteCalculator", "开始计算驾车路线，初始化状态: $isInitialized")
     

package/android/src/main/java/expo/modules/gaodemap/navigation/utils/Converters.kt

@@ -78,19 +78,22 @@ object Converters {
    */
   fun convertNaviPathInfo(path: AMapNaviPath): Map<String, Any?> {
     return mapOf(
+      "naviMode" to 0,
       "currentRoadName" to "",
       "nextRoadName" to "",
-      "currentStepRetainDistance" to 0,
-      "currentStepRetainTime" to 0,
+      "curStepRetainDistance" to 0,
+      "curStepRetainTime" to 0,
       "pathRetainDistance" to path.allLength,
       "pathRetainTime" to path.allTime,
       "currentSpeed" to 0,
-      "iconSpeed" to 0,
       "iconType" to 0,
-      "cameraDistance" to 0,
-      "cameraType" to 0,
-      "isInHighway" to false,
-      "isOffRoute" to false
+      "iconDirection" to 0,
+      "currentSegmentIndex" to 0,
+      "currentLinkIndex" to 0,
+      "currentPointIndex" to 0,
+      "routeRemainTrafficLightCount" to 0,
+      "driveDistance" to 0,
+      "driveTime" to 0
     )
   }
 
@@ -126,8 +129,8 @@ object Converters {
   /**
    * 转换路径结果（只使用确实存在的属性）
    */
-  fun convertNaviPath(path: AMapNaviPath): Map<String, Any?> {
-    return mapOf(
+  fun convertNaviPath(path: AMapNaviPath, routeId: Int? = null): Map<String, Any?> {
+    val payload = mutableMapOf<String, Any?>(
       "distance" to path.allLength,
       "duration" to path.allTime,
       "tollDistance" to 0,
@@ -136,13 +139,18 @@ object Converters {
       "steps" to convertSteps(path.steps),
       "polyline" to convertCoords(path.coordList)
     )
+    if (routeId != null) {
+      payload["id"] = routeId
+      payload["routeId"] = routeId
+    }
+    return payload
   }
 
   /**
    * 转换驾车路径结果
    */
   fun convertDriveRouteResult(paths: Map<Int, AMapNaviPath>?): Map<String, Any?> {
-    val routes = paths?.values?.map { convertNaviPath(it) } ?: emptyList()
+    val routes = paths?.entries?.map { (id, path) -> convertNaviPath(path, id) } ?: emptyList()
     
     return mapOf(
       "routes" to routes,
@@ -156,6 +164,7 @@ object Converters {
   fun convertMultiRouteInfo(paths: Map<Int, AMapNaviPath>?): List<Map<String, Any?>> {
     return paths?.entries?.map { (id, path) ->
       mapOf(
+        "id" to id,
         "routeId" to id,
         "distance" to path.allLength,
         "duration" to path.allTime,