expo-gaode-map-navigation 2.0.12-next.0 → 2.0.13

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,36 @@ class ExpoGaodeMapNaviViewModule : Module() {
       Prop<Boolean>("enableVoice") { view, enabled ->
         view.applyEnableVoice(enabled)
       }
+
+      Prop<String?>("carImage") { view, uri ->
+        view.applyCarImage(uri)
+      }
+
+      Prop<Map<String, Double>?>("carImageSize") { view, value ->
+        val width = value?.get("width")
+        val height = value?.get("height")
+        view.applyCarImageSize(width, height)
+      }
+
+      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<List<Map<String, Any?>>?>("customWaypointMarkers") { view, markers ->
+        view.applyCustomWaypointMarkers(markers)
+      }
+
+      Prop<String?>("endPointImage") { view, uri ->
+        view.applyEndPointImage(uri)
+      }
       
       Prop<Boolean>("autoLockCar") { view, enabled ->
         view.applyAutoLockCar(enabled)
@@ -67,6 +112,10 @@ class ExpoGaodeMapNaviViewModule : Module() {
       Prop<Boolean>("isNightMode") { view, enabled ->
         view.applyNightMode(enabled)
       }
+
+      Prop<Int>("mapViewModeType") { view, mode ->
+        view.applyMapViewModeType(mode)
+      }
       
       Prop<Boolean>("carOverlayVisible") { view, visible ->
         view.applyCarOverlayVisible(visible)
@@ -79,6 +128,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 +148,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 +188,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)
       }
@@ -123,6 +218,14 @@ class ExpoGaodeMapNaviViewModule : Module() {
         view.applyShowUIElements(visible)
       }
 
+      Prop<Boolean>("androidBackgroundNavigationNotificationEnabled") { view, enabled ->
+        view.applyAndroidBackgroundNavigationNotificationEnabled(enabled)
+      }
+
+      // iOS-only prop, keep a no-op mapping on Android for cross-platform prop compatibility.
+      Prop<Boolean>("iosLiveActivityEnabled") { _: ExpoGaodeMapNaviView, _: Boolean ->
+      }
+
       Prop<Boolean>("showTrafficBar") { view, enabled ->
         view.applyAndroidTrafficBarEnabled(enabled)
       }
@@ -147,10 +250,27 @@ 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)
       }
+
+      AsyncFunction("playCustomTTS") { view: ExpoGaodeMapNaviView, text: String, forcePlay: Boolean, promise: expo.modules.kotlin.Promise ->
+        val success = view.playCustomTTS(text, forcePlay)
+        if (success) {
+          promise.resolve(
+            mapOf(
+              "success" to true
+            )
+          )
+        } else {
+          promise.reject("PLAY_TTS_FAILED", "当前场景暂不支持或正在播报其他导航语音", null)
+        }
+      }
     }
   }
 }

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

@@ -2,9 +2,9 @@ package expo.modules.gaodemap.navigation
 
 import android.annotation.SuppressLint
 import android.content.Context
-import com.amap.api.navi.AMapNavi
 import com.amap.api.navi.model.AMapCarInfo
 import com.amap.api.navi.model.AMapNaviPathGroup
+import expo.modules.core.arguments.ReadableArguments
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
@@ -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")
@@ -136,7 +135,7 @@ class ExpoGaodeMapNavigationModule : Module() {
     // 使用 AMapNavi.independentCalculateRoute，不影响当前导航状态
     // 委托给 IndependentRouteService 处理，避免 Module 文件臃肿
     
-    AsyncFunction("independentDriveRoute") { options: Map<String, Any?>, promise: Promise ->
+    AsyncFunction("independentDriveRoute") { options: ReadableArguments, promise: Promise ->
       try {
         ensureIndependentService().independentDriveRoute(options, promise)
       } catch (e: Exception) {
@@ -144,7 +143,7 @@ class ExpoGaodeMapNavigationModule : Module() {
       }
     }
 
-    AsyncFunction("independentTruckRoute") { options: Map<String, Any?>, promise: Promise ->
+    AsyncFunction("independentTruckRoute") { options: ReadableArguments, promise: Promise ->
       try {
         ensureIndependentService().independentTruckRoute(options, promise)
       } catch (e: Exception) {
@@ -152,7 +151,7 @@ class ExpoGaodeMapNavigationModule : Module() {
       }
     }
 
-    AsyncFunction("independentWalkRoute") { options: Map<String, Any?>, promise: Promise ->
+    AsyncFunction("independentWalkRoute") { options: ReadableArguments, promise: Promise ->
       try {
         ensureIndependentService().independentWalkRoute(options, promise)
       } catch (e: Exception) {
@@ -160,7 +159,7 @@ class ExpoGaodeMapNavigationModule : Module() {
       }
     }
 
-    AsyncFunction("independentRideRoute") { options: Map<String, Any?>, promise: Promise ->
+    AsyncFunction("independentRideRoute") { options: ReadableArguments, promise: Promise ->
       try {
         ensureIndependentService().independentRideRoute(options, promise)
       } catch (e: Exception) {
@@ -169,7 +168,7 @@ class ExpoGaodeMapNavigationModule : Module() {
     }
 
     // 独立摩托车 路线规划（与驾车一致，依赖车辆信息 carType=11）
-    AsyncFunction("independentMotorcycleRoute") { options: Map<String, Any?>, promise: Promise ->
+    AsyncFunction("independentMotorcycleRoute") { options: ReadableArguments, promise: Promise ->
       try {
         ensureIndependentService().independentMotorcycleRoute(options, promise)
       } catch (e: Exception) {
@@ -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)
@@ -263,26 +262,13 @@ class ExpoGaodeMapNavigationModule : Module() {
     AsyncFunction("calculateMotorcycleRoute") { options: Map<String, Any?>, promise: Promise ->
       try {
         ensureNavigationPrivacyReady()
-        // 设置摩托车车辆信息（车牌可选、排量可选）
-        try {
-          val carNumber = options["carNumber"] as? String
-          val motorcycleCC = (options["motorcycleCC"] as? Number)?.toInt()
-          val carInfo = AMapCarInfo().apply {
-            if (carNumber != null) setCarNumber(carNumber)
-              carType = "11" // 11 = 摩托车
-            if (motorcycleCC != null) {
-              try {
-                  this.motorcycleCC = motorcycleCC
-              } catch (_: Exception) {}
-            }
-          }
-          AMapNavi.getInstance(context).setCarInfo(carInfo)
-        } catch (_: Exception) {
-          // ignore
+        val motorcycleOptions = options.toMutableMap()
+        if (motorcycleOptions["carType"] == null) {
+          motorcycleOptions["carType"] = "11"
         }
 
         // 复用驾车算路逻辑（含 strategyConvert / 途经点等）
-        ensureDriveTruck().calculateDriveRoute(options, promise)
+        ensureDriveTruck().calculateDriveRoute(motorcycleOptions, promise)
       } catch (e: Exception) {
         promise.reject("CALCULATE_ERROR", e.message, e)
       }

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

@@ -1,5 +1,6 @@
 package expo.modules.gaodemap.navigation.listeners
 
+import android.util.Log
 import com.amap.api.navi.AMapNaviIndependentRouteListener
 import com.amap.api.navi.model.AMapCalcRouteResult
 import com.amap.api.navi.model.AMapNaviPathGroup
@@ -17,6 +18,9 @@ class IndependentRouteListener(
   private val module: ExpoGaodeMapNavigationModule,
   private val promise: Promise
 ) : AMapNaviIndependentRouteListener {
+  companion object {
+    private const val TAG = "IndependentRouteListener"
+  }
 
   override fun onIndependentCalculateSuccess(group: AMapNaviPathGroup?) {
     try {
@@ -28,6 +32,7 @@ class IndependentRouteListener(
 
       // 将路径组存储在模块内，返回一个可供后续操作（选路/启动导航/清理）的 token
       val token = module.storeIndependentGroup(group)
+      logGroupSummary(group, token)
 
       val result = convertGroupToResult(group).toMutableMap().apply {
         put("token", token)
@@ -42,11 +47,30 @@ class IndependentRouteListener(
 
   override fun onIndependentCalculateFail(routeResult: AMapCalcRouteResult?) {
     val errorCode = routeResult?.errorCode ?: -1
+    Log.e(TAG, "independentCalculateRoute failed: errorCode=$errorCode result=$routeResult")
     val errorMsg = "Independent route calculation failed with code: $errorCode"
     promise.reject("INDEPENDENT_CALCULATE_ERROR", errorMsg, null)
     module.sendEvent("onCalculateRouteFailure", mapOf("errorCode" to errorCode))
   }
 
+  private fun logGroupSummary(group: AMapNaviPathGroup, token: Int) {
+    val count = try { group.pathCount } catch (_: Exception) { -1 }
+    val mainIndex = try { group.mainPathIndex } catch (_: Exception) { -1 }
+    Log.d(TAG, "independentCalculateRoute success: token=$token pathCount=$count mainPathIndex=$mainIndex")
+
+    for (index in 0 until maxOf(count, 0)) {
+      try {
+        val path = group.getPath(index)
+        Log.d(
+          TAG,
+          "path[$index]: routeId=${12 + index} length=${path.allLength} time=${path.allTime} toll=${path.tollCost} trafficLights=${path.trafficLightCount} coordCount=${path.coordList?.size ?: 0}"
+        )
+      } catch (error: Exception) {
+        Log.e(TAG, "failed to inspect path[$index]", error)
+      }
+    }
+  }
+
   /**
    * 将 AMapNaviPathGroup 转换为轻量结构：
    * {
@@ -67,10 +91,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 +109,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

@@ -1,7 +1,9 @@
 package expo.modules.gaodemap.navigation.managers
 
 import android.content.Context
+import android.util.Log
 import com.amap.api.navi.AMapNavi
+import com.amap.api.navi.enums.NaviType
 import com.amap.api.navi.model.AMapNaviPathGroup
 
 /**
@@ -11,6 +13,21 @@ import com.amap.api.navi.model.AMapNaviPathGroup
  * - 提供线程安全的 token 管理
  */
 class IndependentRouteManager {
+  companion object {
+    val shared: IndependentRouteManager by lazy { IndependentRouteManager() }
+    private const val TAG = "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
+  )
+
   private val groups = mutableMapOf<Int, AMapNaviPathGroup>()
   private var nextToken = 1
 
@@ -45,28 +62,110 @@ 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
+    }
+  }
+
+  private fun logGroupPathState(group: AMapNaviPathGroup, reason: String) {
+    val mainPath = group.mainPath
+    Log.d(
+      TAG,
+      "groupState[$reason]: pathCount=${group.pathCount} mainPathIndex=${group.mainPathIndex} mainLength=${mainPath?.allLength} mainTime=${mainPath?.allTime} labels=${mainPath?.labels} labelId=${mainPath?.labelId} waypointCount=${mainPath?.wayPoint?.size ?: 0} waypointIndexCount=${mainPath?.wayPointIndex?.size ?: 0}"
+    )
+  }
+
   @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)
+      logGroupPathState(group, "before-start")
+
+      val resolvedRouteId = resolveRouteId(group, routeId, routeIndex)
+      val sdkNaviType = resolveSdkNaviType(naviType)
+      Log.d(
+        TAG,
+        "startNaviWithPath request: token=$token requestedNaviType=$naviType sdkNaviType=$sdkNaviType routeId=$routeId routeIndex=$routeIndex resolvedRouteId=$resolvedRouteId pathCount=${group.pathCount} mainPathIndex=${group.mainPathIndex}"
+      )
+
+      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)
+        Log.d(TAG, "selectRouteWithIndex($resolvedRouteId) => $selected")
+        logGroupPathState(group, "after-select")
+        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")
+        Log.e(
+          TAG,
+          "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
+      Log.e(TAG, "Start navigation failed", e)
+      return StartResult(
+        success = false,
+        message = "独立路径导航启动失败：${e.message ?: "unknown"}",
+        requestedNaviType = naviType,
+        sdkNaviType = resolveSdkNaviType(naviType),
+        resolvedRouteId = routeId,
+        pathCount = 0,
+        mainPathIndex = 0
+      )
     }
   }
 
@@ -80,4 +179,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")
     
@@ -121,20 +123,28 @@ class DriveTruckRouteCalculator(
       }
     }
 
-    // 小客车可选设置：车牌/限行
+    val explicitCarType = when (val rawCarType = options["carType"]) {
+      is String -> rawCarType.trim().takeIf { it.isNotEmpty() }
+      is Number -> rawCarType.toInt().toString()
+      else -> null
+    }
     val carNumber = options["carNumber"] as? String
     val restriction = options["restriction"] as? Boolean
-    if (carNumber != null || restriction != null) {
-      try {
-        val carInfo = AMapCarInfo().apply {
-          if (carNumber != null) setCarNumber(carNumber)
-            carType = "0" // 0=小客车
-          if (restriction != null) isRestriction = restriction
+    val motorcycleCC = (options["motorcycleCC"] as? Number)?.toInt()
+    try {
+      val carInfo = AMapCarInfo().apply {
+        carType = explicitCarType ?: "0"
+        if (carNumber != null) setCarNumber(carNumber)
+        if (restriction != null) isRestriction = restriction
+        if (motorcycleCC != null) {
+          try {
+            this.motorcycleCC = motorcycleCC
+          } catch (_: Exception) {}
         }
-        aMapNavi?.setCarInfo(carInfo)
-      } catch (_: Exception) {
-        // ignore
       }
+      aMapNavi?.setCarInfo(carInfo)
+    } catch (_: Exception) {
+      // ignore
     }
 
     // 标注场景与多路线期望（默认 drive；若上层已指定 scene 则尊重）
@@ -175,36 +185,15 @@ class DriveTruckRouteCalculator(
    * 注意：该能力为收费接口；需要商务开通。未开通可能算路失败。
    */
   fun calculateTruckRoute(options: Map<String, Any?>, promise: Promise) {
-    // 先设置货车信息，再复用驾车算路流程
-    try {
-      val carNumber = options["carNumber"] as? String
-      val restriction = options["restriction"] as? Boolean
-
-      val carInfo = AMapCarInfo().apply {
-        if (carNumber != null) setCarNumber(carNumber)
-          carType = "1" // 1/3/5 视为货车，这里取 1
-        if (restriction != null) isRestriction = restriction
-
-        // 可按需扩展更详细的货车参数（示例）：
-        // setVehicleAxis("6")
-        // setVehicleHeight("3.5")
-        // setVehicleLength("7.3")
-        // setVehicleWidth("2.5")
-        // setVehicleSize("4")
-        // setVehicleLoad("25.99")
-        // setVehicleWeight("20")
-        // setVehicleLoadSwitch(true)
-      }
-      aMapNavi?.setCarInfo(carInfo)
-    } catch (_: Exception) {
-      // ignore
+    val truckOptions = options.toMutableMap()
+    if (truckOptions["carType"] == null) {
+      truckOptions["carType"] = "1"
     }
 
-    // 标注场景（truck），并期望多路线
     routeListener?.scene = "truck"
     routeListener?.multiple = true
 
-    calculateDriveRoute(options, promise)
+    calculateDriveRoute(truckOptions, promise)
   }
 
   fun destroy() {