expo-gaode-map-navigation 2.0.10 → 2.0.11

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

@@ -4,7 +4,11 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RectF
+import android.graphics.Typeface
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
@@ -17,11 +21,17 @@ import com.amap.api.navi.AMapNaviListener
 import com.amap.api.navi.AMapNaviView
 import com.amap.api.navi.AMapNaviViewListener
 import com.amap.api.navi.AMapNaviViewOptions
+import com.amap.api.maps.model.BitmapDescriptorFactory
+import com.amap.api.maps.model.LatLng
+import com.amap.api.maps.model.Marker
+import com.amap.api.maps.model.MarkerOptions
 import com.amap.api.navi.enums.MapStyle
 import com.amap.api.navi.enums.NaviType
 import com.amap.api.navi.model.*
 import expo.modules.gaodemap.map.modules.SDKInitializer
 import expo.modules.gaodemap.navigation.managers.IndependentRouteManager
+import expo.modules.gaodemap.navigation.services.NavigationForegroundService
+import expo.modules.gaodemap.navigation.services.NavigationNotificationSnapshot
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -32,6 +42,14 @@ import java.security.MessageDigest
 import java.util.Collections
 import java.util.WeakHashMap
 import java.net.URL
+import kotlin.math.roundToInt
+
+private data class NaviCustomWaypointMarkerModel(
+    val latitude: Double,
+    val longitude: Double,
+    val title: String,
+    val arrived: Boolean = false
+)
 
 @SuppressLint("ViewConstructor")
 @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
@@ -44,11 +62,11 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             synchronized(activeViews) { activeViews.toList() }
 
         fun resumeActiveViews() {
-            snapshotActiveViews().forEach { it.onResume() }
+            snapshotActiveViews().forEach { it.onHostActivityForeground() }
         }
 
         fun pauseActiveViews() {
-            snapshotActiveViews().forEach { it.onPause() }
+            snapshotActiveViews().forEach { it.onHostActivityBackground() }
         }
 
         fun destroyActiveViews() {
@@ -98,7 +116,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     internal var isEyrieCrossDisplayVisible: Boolean = true
     internal var isSecondActionVisible: Boolean = true
     internal var isBackupOverlayVisible: Boolean = true
-    internal var isAfterRouteAutoGray: Boolean = false
+    internal var isAfterRouteAutoGray: Boolean = true
     internal var isVectorLineShow: Boolean = true
     internal var isNaviTravelView : Boolean = false
     internal var isCompassEnabled: Boolean = true
@@ -109,12 +127,19 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     internal var pointToCenterX: Double = 0.0
     internal var pointToCenterY: Double = 0.0
     internal var hideNativeTopInfoLayout: Boolean = false
+    internal var androidBackgroundNavigationNotificationEnabled: Boolean = false
     internal var naviModeValue: Int = AMapNaviView.CAR_UP_MODE
+    internal var mapViewModeTypeValue: Int = 0
     internal var carImageUri: String? = null
+    internal var carImageWidthDp: Double? = null
+    internal var carImageHeightDp: Double? = null
     internal var fourCornersImageUri: String? = null
     internal var startPointImageUri: String? = null
     internal var wayPointImageUri: String? = null
     internal var endPointImageUri: String? = null
+    private var customWaypointMarkers: List<NaviCustomWaypointMarkerModel> = emptyList()
+    private val renderedCustomWaypointMarkers = mutableListOf<Marker>()
+    private var activeIndependentRouteId: Int? = null
     private val naviView: AMapNaviView by lazy(LazyThreadSafetyMode.NONE) {
         AMapNaviView(context)
     }
@@ -128,6 +153,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     private var isModeCrossVisible = false
     private var isLaneInfoCurrentlyVisible = false
     private var currentRouteTotalLength: Int? = null
+    private var sourceCarBitmap: Bitmap? = null
     private var customCarBitmap: Bitmap? = null
     private var customFourCornersBitmap: Bitmap? = null
     private var customStartPointBitmap: Bitmap? = null
@@ -141,6 +167,11 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     private var cachedTurnIconImageUri: String? = null
     private var cachedTurnIconContentHash: String? = null
     private var hasLoggedMissingTurnIconBitmapApi = false
+    private var hasLoggedMissingNaviStatusBarApi = false
+    private var hasLoggedMissingNaviModeApi = false
+    private var isHostActivityInBackground: Boolean = false
+    private var isNavigationRunning: Boolean = false
+    private var latestNavigationNotificationSnapshot: NavigationNotificationSnapshot? = null
 
     private fun registerActiveView() {
         synchronized(activeViews) {
@@ -154,6 +185,87 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
     }
 
+    private fun buildNavigationNotificationSnapshot(naviInfo: NaviInfo?): NavigationNotificationSnapshot {
+        if (naviInfo == null) {
+            return latestNavigationNotificationSnapshot ?: NavigationNotificationSnapshot(
+                pathRetainDistance = currentRouteTotalLength,
+                routeTotalDistance = currentRouteTotalLength,
+                turnIconImageUri = cachedTurnIconImageUri
+            )
+        }
+
+        return NavigationNotificationSnapshot(
+            currentRoadName = naviInfo.currentRoadName,
+            nextRoadName = naviInfo.nextRoadName,
+            pathRetainDistance = naviInfo.pathRetainDistance,
+            routeTotalDistance = currentRouteTotalLength,
+            pathRetainTime = naviInfo.pathRetainTime,
+            curStepRetainDistance = naviInfo.curStepRetainDistance,
+            iconType = naviInfo.iconType,
+            turnIconImageUri = cachedTurnIconImageUri
+        )
+    }
+
+    private fun shouldRunBackgroundNavigationNotification(): Boolean {
+        return androidBackgroundNavigationNotificationEnabled &&
+            isNavigationRunning &&
+            isHostActivityInBackground
+    }
+
+    private fun syncNavigationForegroundService(reason: String) {
+        val shouldRun = shouldRunBackgroundNavigationNotification()
+        Log.d(
+            "ExpoGaodeMapNaviView",
+            "syncNavigationForegroundService reason=$reason, shouldRun=$shouldRun, " +
+              "propEnabled=$androidBackgroundNavigationNotificationEnabled, " +
+              "isNavigationRunning=$isNavigationRunning, isHostActivityInBackground=$isHostActivityInBackground"
+        )
+        if (shouldRunBackgroundNavigationNotification()) {
+            val snapshot = latestNavigationNotificationSnapshot ?: buildNavigationNotificationSnapshot(null)
+            Log.d(
+                "ExpoGaodeMapNaviView",
+                "startOrUpdate notification snapshot: stepDistance=${snapshot.curStepRetainDistance}, " +
+                  "remainDistance=${snapshot.pathRetainDistance}, routeTotal=${snapshot.routeTotalDistance}, " +
+                  "remainTime=${snapshot.pathRetainTime}, " +
+                  "nextRoad=${snapshot.nextRoadName}, turnIconUri=${snapshot.turnIconImageUri}"
+            )
+            NavigationForegroundService.startOrUpdate(context, snapshot)
+            Log.d("ExpoGaodeMapNaviView", "Navigation foreground notification enabled: $reason")
+        } else {
+            NavigationForegroundService.stop(context)
+            Log.d("ExpoGaodeMapNaviView", "Navigation foreground notification disabled: $reason")
+        }
+    }
+
+    private fun updateNavigationNotification(naviInfo: NaviInfo) {
+        latestNavigationNotificationSnapshot = buildNavigationNotificationSnapshot(naviInfo)
+        Log.d(
+            "ExpoGaodeMapNaviView",
+            "updateNavigationNotification: stepDistance=${naviInfo.curStepRetainDistance}, " +
+              "remainDistance=${naviInfo.pathRetainDistance}, routeTotal=${latestNavigationNotificationSnapshot?.routeTotalDistance}, " +
+              "remainTime=${naviInfo.pathRetainTime}, " +
+              "currentRoad=${naviInfo.currentRoadName}, nextRoad=${naviInfo.nextRoadName}, " +
+              "turnIconUri=${latestNavigationNotificationSnapshot?.turnIconImageUri}"
+        )
+        if (shouldRunBackgroundNavigationNotification()) {
+            NavigationForegroundService.startOrUpdate(context, latestNavigationNotificationSnapshot)
+        }
+    }
+
+    fun onHostActivityForeground() {
+        Log.d("ExpoGaodeMapNaviView", "onHostActivityForeground")
+        isHostActivityInBackground = false
+        onResume()
+        syncNavigationForegroundService("host_foreground")
+    }
+
+    fun onHostActivityBackground() {
+        Log.d("ExpoGaodeMapNaviView", "onHostActivityBackground")
+        isHostActivityInBackground = true
+        onPause()
+        syncNavigationForegroundService("host_background")
+    }
+
     private fun applyNaviStatusBarEnabledCompat(
         options: AMapNaviViewOptions,
         enabled: Boolean
@@ -165,10 +277,13 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             )
             method.invoke(options, enabled)
         } catch (_: NoSuchMethodException) {
-            Log.w(
-                "ExpoGaodeMapNaviView",
-                "AMapNaviViewOptions#setNaviStatusBarEnabled is unavailable in the current AMap SDK; skip applying naviStatusBarEnabled"
-            )
+            if (!hasLoggedMissingNaviStatusBarApi) {
+                hasLoggedMissingNaviStatusBarApi = true
+                Log.w(
+                    "ExpoGaodeMapNaviView",
+                    "AMapNaviViewOptions#setNaviStatusBarEnabled is unavailable in the current AMap SDK; skip applying naviStatusBarEnabled"
+                )
+            }
         } catch (error: Throwable) {
             Log.w(
                 "ExpoGaodeMapNaviView",
@@ -188,20 +303,114 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
                 Integer.TYPE
             )
             method.invoke(options, mode)
+        } catch (_: NoSuchMethodException) {
+            if (!hasLoggedMissingNaviModeApi) {
+                hasLoggedMissingNaviModeApi = true
+                Log.w(
+                    "ExpoGaodeMapNaviView",
+                    "AMapNaviViewOptions#setNaviMode is unavailable in the current AMap SDK; skip applying naviMode on options"
+                )
+            }
+        } catch (error: Throwable) {
+            Log.w(
+                "ExpoGaodeMapNaviView",
+                "Failed to apply naviMode compatibly",
+                error
+            )
+        }
+    }
+
+    private fun applyAutoNaviViewNightModeCompat(
+        options: AMapNaviViewOptions,
+        enabled: Boolean
+    ) {
+        try {
+            val method = options.javaClass.getMethod(
+                "setAutoNaviViewNightMode",
+                java.lang.Boolean.TYPE
+            )
+            method.invoke(options, enabled)
         } catch (_: NoSuchMethodException) {
             Log.w(
                 "ExpoGaodeMapNaviView",
-                "AMapNaviViewOptions#setNaviMode is unavailable in the current AMap SDK; skip applying naviMode on options"
+                "AMapNaviViewOptions#setAutoNaviViewNightMode is unavailable in the current AMap SDK; skip applying auto night mode"
             )
         } catch (error: Throwable) {
             Log.w(
                 "ExpoGaodeMapNaviView",
-                "Failed to apply naviMode compatibly",
+                "Failed to apply auto navi night mode compatibly",
                 error
             )
         }
     }
 
+    private fun applyNaviNightCompat(
+        options: AMapNaviViewOptions,
+        enabled: Boolean
+    ) {
+        try {
+            val method = options.javaClass.getMethod(
+                "setNaviNight",
+                java.lang.Boolean.TYPE
+            )
+            method.invoke(options, enabled)
+            return
+        } catch (_: NoSuchMethodException) {
+            Log.w(
+                "ExpoGaodeMapNaviView",
+                "AMapNaviViewOptions#setNaviNight is unavailable in the current AMap SDK; fallback to setMapStyle"
+            )
+        } catch (error: Throwable) {
+            Log.w(
+                "ExpoGaodeMapNaviView",
+                "Failed to apply navi night compatibly, fallback to setMapStyle",
+                error
+            )
+        }
+
+        if (enabled) {
+            options.setMapStyle(MapStyle.NIGHT, null)
+        } else {
+            options.setMapStyle(MapStyle.DAY, null)
+        }
+    }
+
+    private fun applyMapViewModeTypeCompat(
+        options: AMapNaviViewOptions,
+        mode: Int
+    ) {
+        when (mode) {
+            0 -> {
+                applyAutoNaviViewNightModeCompat(options, false)
+                applyNaviNightCompat(options, false)
+            }
+            1 -> {
+                applyAutoNaviViewNightModeCompat(options, false)
+                applyNaviNightCompat(options, true)
+            }
+            2 -> {
+                applyAutoNaviViewNightModeCompat(options, true)
+            }
+            3 -> {
+                // Android custom map style requires style path API that is not exposed yet.
+                applyAutoNaviViewNightModeCompat(options, false)
+                applyNaviNightCompat(options, false)
+                Log.w(
+                    "ExpoGaodeMapNaviView",
+                    "mapViewModeType=3 (custom) requires custom map style path support on Android; fallback to day mode"
+                )
+            }
+            else -> {
+                applyAutoNaviViewNightModeCompat(options, false)
+                applyNaviNightCompat(options, false)
+                Log.w(
+                    "ExpoGaodeMapNaviView",
+                    "Unknown mapViewModeType=$mode; fallback to day mode"
+                )
+            }
+        }
+    }
+
     private fun createInitialViewOptions(): AMapNaviViewOptions {
         return AMapNaviViewOptions().also { options ->
             applyAllViewOptions(options)
@@ -247,7 +456,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
 
         options.isAfterRouteAutoGray = isAfterRouteAutoGray
         options.isSensorEnable = true
-        options.isAutoNaviViewNightMode = false
+        applyMapViewModeTypeCompat(options, mapViewModeTypeValue)
         options.isEagleMapVisible = isEagleMapVisible
         applyCustomAnnotationBitmaps(options)
     }
@@ -318,6 +527,25 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
     }
 
+    private fun resizeCarBitmapIfNeeded(source: Bitmap?): Bitmap? {
+        val rawBitmap = source ?: return null
+        val widthDp = carImageWidthDp?.takeIf { it > 0.0 }
+        val heightDp = carImageHeightDp?.takeIf { it > 0.0 }
+        if (widthDp == null || heightDp == null) {
+            return rawBitmap
+        }
+
+        val density = context.resources.displayMetrics.density
+        val widthPx = (widthDp * density).roundToInt().coerceAtLeast(1)
+        val heightPx = (heightDp * density).roundToInt().coerceAtLeast(1)
+
+        if (rawBitmap.width == widthPx && rawBitmap.height == heightPx) {
+            return rawBitmap
+        }
+
+        return Bitmap.createScaledBitmap(rawBitmap, widthPx, heightPx, true)
+    }
+
     private fun updateCustomAnnotationBitmap(
         uri: String?,
         getCurrentUri: () -> String?,
@@ -363,6 +591,43 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         refreshNaviUILayout("commitViewOptions")
     }
 
+    private fun logCurrentNaviPathState(reason: String) {
+        val naviPath = aMapNavi?.naviPath
+        val waypointCount = naviPath?.wayPoint?.size ?: 0
+        val waypointIndexCount = naviPath?.wayPointIndex?.size ?: 0
+        Log.d(
+            "ExpoGaodeMapNaviView",
+            "pathState[$reason]: routeType=${naviPath?.routeType} length=${naviPath?.allLength} time=${naviPath?.allTime} labels=${naviPath?.labels} labelId=${naviPath?.labelId} waypointCount=$waypointCount waypointIndexCount=$waypointIndexCount start=${naviPath?.startPoint} end=${naviPath?.endPoint}"
+        )
+    }
+
+    private fun stabilizeIndependentRouteRendering(reason: String) {
+        val routeId = activeIndependentRouteId ?: return
+        val delays = longArrayOf(0L, 180L, 420L)
+        delays.forEach { delayMillis ->
+            naviView.postDelayed({
+                if (isDestroyed) {
+                    return@postDelayed
+                }
+                try {
+                    val selected = aMapNavi?.selectRouteId(routeId)
+                    Log.d(
+                        "ExpoGaodeMapNaviView",
+                        "stabilizeIndependentRouteRendering[$reason/$delayMillis]: routeId=$routeId selected=$selected"
+                    )
+                    applyRouteMarkerVisibleFromState()
+                    logCurrentNaviPathState("stabilize-$reason-$delayMillis")
+                } catch (error: Exception) {
+                    Log.e(
+                        "ExpoGaodeMapNaviView",
+                        "Failed to stabilize independent route rendering: reason=$reason delay=$delayMillis routeId=$routeId",
+                        error
+                    )
+                }
+            }, delayMillis)
+        }
+    }
+
     private fun refreshNaviUILayout(reason: String) {
         if (isDestroyed) {
             return
@@ -374,14 +639,23 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             }
 
             updateTopInsetPadding()
-            naviView.requestLayout()
-            naviView.forceLayout()
-            naviView.invalidate()
-            naviView.postInvalidateOnAnimation()
-            requestLayout()
-            invalidate()
-            postInvalidateOnAnimation()
             updateNativeTopInfoLayoutVisibility()
+
+            val needsAggressiveRefresh =
+                hideNativeTopInfoLayout ||
+                !showUIElements ||
+                androidStatusBarPaddingTopDp != null
+
+            if (needsAggressiveRefresh) {
+                naviView.requestLayout()
+                naviView.forceLayout()
+                naviView.invalidate()
+                naviView.postInvalidateOnAnimation()
+                requestLayout()
+                invalidate()
+                postInvalidateOnAnimation()
+            }
+
             Log.d("ExpoGaodeMapNaviView", "refreshNaviUILayout: $reason")
         }
     }
@@ -397,8 +671,12 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             return
         }
 
+        if (!hideNativeTopInfoLayout) {
+            return
+        }
+
         val queue = ArrayDeque<View>()
-        val targetVisibility = if (hideNativeTopInfoLayout) View.GONE else View.VISIBLE
+        val targetVisibility = View.GONE
         queue.add(naviView)
 
         while (queue.isNotEmpty()) {
@@ -684,6 +962,10 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
 
         override fun onStartNavi(type: Int) {
             Log.d("ExpoGaodeMapNaviView", "导航开始: type=$type")
+            isNavigationRunning = true
+            syncNavigationForegroundService("on_start_navi")
+            logCurrentNaviPathState("onStartNavi")
+            stabilizeIndependentRouteRendering("onStartNavi")
             onNavigationStarted(mapOf(
                 "type" to type,
                 "isEmulator" to (type == 1)
@@ -725,10 +1007,18 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
 
         override fun onEndEmulatorNavi() {
+            isNavigationRunning = false
+            syncNavigationForegroundService("on_end_emulator_navi")
+            resetCustomWaypointMarkerArrivalState()
+            activeIndependentRouteId = null
             onNavigationEnded(emptyMap())
         }
 
         override fun onArriveDestination() {
+            isNavigationRunning = false
+            syncNavigationForegroundService("on_arrive_destination")
+            resetCustomWaypointMarkerArrivalState()
+            activeIndependentRouteId = null
             onArriveDestination(emptyMap())
         }
 
@@ -749,6 +1039,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             Handler(Looper.getMainLooper()).post {
                 try {
                     applyRouteMarkerVisibleFromState()
+                    refreshCustomWaypointMarkers("calculate-route-success")
                 } catch (e: Exception) {
                     Log.e("ExpoGaodeMapNaviView", "Failed to reapply route marker visibility after route success", e)
                 }
@@ -772,6 +1063,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             Handler(Looper.getMainLooper()).post {
                 try {
                     applyRouteMarkerVisibleFromState()
+                    refreshCustomWaypointMarkers("calculate-route-success-result")
                 } catch (e: Exception) {
                     Log.e("ExpoGaodeMapNaviView", "Failed to reapply route marker visibility after route success", e)
                 }
@@ -779,6 +1071,8 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
 
         override fun onCalculateRouteFailure(errorCode: Int) {
+            isNavigationRunning = false
+            syncNavigationForegroundService("calculate_route_failure_code")
             onRouteCalculated(mapOf(
                 "success" to false,
                 "errorCode" to errorCode
@@ -786,6 +1080,8 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
 
         override fun onCalculateRouteFailure(result: AMapCalcRouteResult?) {
+            isNavigationRunning = false
+            syncNavigationForegroundService("calculate_route_failure_result")
             onRouteCalculated(mapOf(
                 "success" to false,
                 "errorInfo" to (result?.errorDescription ?: "Unknown error")
@@ -805,6 +1101,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
 
         override fun onArrivedWayPoint(wayPointIndex: Int) {
+            markCustomWaypointArrived(wayPointIndex)
             onWayPointArrived(mapOf(
                 "index" to wayPointIndex
             ))
@@ -818,11 +1115,17 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
 
         override fun onNaviInfoUpdate(naviInfo: NaviInfo?) {
             naviInfo?.let {
-                currentRouteTotalLength = try {
+                val allLength = try {
                     aMapNavi?.naviPath?.allLength
                 } catch (_: Throwable) {
                     null
-                } ?: currentRouteTotalLength
+                }
+                val safeRetainDistance = it.pathRetainDistance.coerceAtLeast(0)
+                currentRouteTotalLength = maxOf(
+                    currentRouteTotalLength ?: 0,
+                    allLength ?: 0,
+                    safeRetainDistance
+                ).takeIf { total -> total > 0 } ?: currentRouteTotalLength
                 val nextIconType = resolveNextTurnIconType(it.curStep)
                 val turnIconImage = updateCachedTurnIconImage(it)
                 val payload = mutableMapOf<String, Any>(
@@ -850,6 +1153,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
                     payload["turnIconImage"] = turnIconImage
                 }
                 onNavigationInfoUpdate(payload)
+                updateNavigationNotification(it)
                 emitTrafficStatusesUpdate(it.pathRetainDistance)
                 refreshNaviUILayout("onNaviInfoUpdate")
             }
@@ -1106,6 +1410,7 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     fun startNavigation(startLat: Double, startLng: Double, endLat: Double, endLng: Double, promise: expo.modules.kotlin.Promise) {
         Log.d("ExpoGaodeMapNaviView", "startNavigation: $startLat, $startLng, $endLat, $endLng, naviType: $naviType")
         try {
+            resetCustomWaypointMarkerArrivalState()
             startCoordinate = NaviLatLng(startLat, startLng)
             endCoordinate = NaviLatLng(endLat, endLng)
             
@@ -1150,9 +1455,11 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         promise: expo.modules.kotlin.Promise
     ) {
         try {
+            resetCustomWaypointMarkerArrivalState()
             val finalNaviType = requestedNaviType ?: naviType
             val result = independentRouteManager.start(context, token, finalNaviType, routeId, routeIndex)
             if (result.success) {
+                activeIndependentRouteId = result.resolvedRouteId
                 promise.resolve(
                     mapOf(
                         "success" to true,
@@ -1166,9 +1473,11 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
                     )
                 )
             } else {
+                activeIndependentRouteId = null
                 promise.reject("START_INDEPENDENT_NAVI_FAILED", result.message, null)
             }
         } catch (e: Exception) {
+            activeIndependentRouteId = null
             promise.reject("START_INDEPENDENT_NAVI_ERROR", e.message, e)
         }
     }
@@ -1176,6 +1485,9 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     fun stopNavigation(promise: expo.modules.kotlin.Promise) {
         try {
             aMapNavi?.stopNavi()
+            isNavigationRunning = false
+            syncNavigationForegroundService("stop_navigation")
+            resetCustomWaypointMarkerArrivalState()
             promise.resolve(mapOf(
                 "success" to true,
                 "message" to "导航已停止"
@@ -1193,6 +1505,12 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
     }
 
+    fun applyAndroidBackgroundNavigationNotificationEnabled(enabled: Boolean) {
+        androidBackgroundNavigationNotificationEnabled = enabled
+        Log.d("ExpoGaodeMapNaviView", "applyAndroidBackgroundNavigationNotificationEnabled=$enabled")
+        syncNavigationForegroundService("prop_update")
+    }
+
     fun applyNaviType(type: Int) {
         naviType = type
         // 导航类型会在 startNavigation 时使用
@@ -1352,19 +1670,26 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     }
     
     fun applyNightMode(enabled: Boolean) {
-        // 夜间模式设置 - isNightMode 属性可能不存在
+        mapViewModeTypeValue = if (enabled) 1 else 0
         try {
             commitViewOptions { options ->
-                if(enabled){
-                    options.setMapStyle(MapStyle.NIGHT, null)
-                }else{
-                    options.setMapStyle(MapStyle.DAY, null)
-                }
+                applyMapViewModeTypeCompat(options, mapViewModeTypeValue)
             }
         } catch (e: Exception) {
             Log.e("ExpoGaodeMapNaviView", "Failed to set night mode", e)
         }
     }
+
+    fun applyMapViewModeType(mode: Int) {
+        mapViewModeTypeValue = mode
+        try {
+            commitViewOptions { options ->
+                applyMapViewModeTypeCompat(options, mode)
+            }
+        } catch (e: Exception) {
+            Log.e("ExpoGaodeMapNaviView", "Failed to apply mapViewModeType=$mode", e)
+        }
+    }
     
     /**
      * 设置是否显示自车和罗盘
@@ -1385,11 +1710,21 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             uri = uri,
             getCurrentUri = { carImageUri },
             setCurrentUri = { carImageUri = it },
-            setBitmap = { customCarBitmap = it },
+            setBitmap = {
+                sourceCarBitmap = it
+                customCarBitmap = resizeCarBitmapIfNeeded(it)
+            },
             reason = "carBitmap"
         )
     }
 
+    fun applyCarImageSize(widthDp: Double?, heightDp: Double?) {
+        carImageWidthDp = widthDp
+        carImageHeightDp = heightDp
+        customCarBitmap = resizeCarBitmapIfNeeded(sourceCarBitmap)
+        refreshViewOptionsFromState("apply-carBitmap-size")
+    }
+
     fun applyFourCornersImage(uri: String?) {
         updateCustomAnnotationBitmap(
             uri = uri,
@@ -1430,6 +1765,140 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         )
     }
 
+    fun applyCustomWaypointMarkers(markers: List<Map<String, Any?>>?) {
+        customWaypointMarkers = markers?.mapNotNull { item ->
+            val latitude = (item["latitude"] as? Number)?.toDouble() ?: return@mapNotNull null
+            val longitude = (item["longitude"] as? Number)?.toDouble() ?: return@mapNotNull null
+            val rawTitle = (item["title"] as? String)?.trim()
+            NaviCustomWaypointMarkerModel(
+                latitude = latitude,
+                longitude = longitude,
+                title = rawTitle?.takeIf { it.isNotEmpty() } ?: "途经"
+            )
+        } ?: emptyList()
+        refreshCustomWaypointMarkers("apply-custom-waypoint-markers")
+    }
+
+    private fun clearRenderedCustomWaypointMarkers() {
+        renderedCustomWaypointMarkers.forEach { marker ->
+            try {
+                marker.remove()
+            } catch (_: Throwable) {
+            }
+        }
+        renderedCustomWaypointMarkers.clear()
+    }
+
+    private fun refreshCustomWaypointMarkers(reason: String) {
+        Handler(Looper.getMainLooper()).post {
+            clearRenderedCustomWaypointMarkers()
+            if (isDestroyed || customWaypointMarkers.isEmpty()) {
+                return@post
+            }
+
+            val map = try {
+                naviView.map
+            } catch (error: Throwable) {
+                Log.w("ExpoGaodeMapNaviView", "Failed to access AMap for custom waypoint markers: $reason", error)
+                null
+            } ?: return@post
+
+            customWaypointMarkers.forEach { marker ->
+                if (marker.arrived) {
+                    return@forEach
+                }
+
+                val bitmap = createCustomWaypointBubbleBitmap(marker.title)
+                val options = MarkerOptions()
+                    .position(LatLng(marker.latitude, marker.longitude))
+                    .anchor(0.5f, 1f)
+                    .zIndex(130f)
+                    .icon(BitmapDescriptorFactory.fromBitmap(bitmap))
+                val renderedMarker = map.addMarker(options)
+                if (renderedMarker != null) {
+                    renderedCustomWaypointMarkers.add(renderedMarker)
+                }
+            }
+        }
+    }
+
+    private fun resetCustomWaypointMarkerArrivalState() {
+        customWaypointMarkers = customWaypointMarkers.map { marker ->
+            marker.copy(arrived = false)
+        }
+        refreshCustomWaypointMarkers("reset-custom-waypoint-arrival-state")
+    }
+
+    private fun markCustomWaypointArrived(rawIndex: Int) {
+        if (customWaypointMarkers.isEmpty()) {
+            return
+        }
+
+        val resolvedIndex = when {
+            rawIndex in customWaypointMarkers.indices -> rawIndex
+            (rawIndex - 1) in customWaypointMarkers.indices -> rawIndex - 1
+            else -> null
+        } ?: return
+
+        customWaypointMarkers = customWaypointMarkers.mapIndexed { index, marker ->
+            if (index == resolvedIndex) marker.copy(arrived = true) else marker
+        }
+        refreshCustomWaypointMarkers("arrived-waypoint-$rawIndex")
+    }
+
+    private fun createCustomWaypointBubbleBitmap(title: String): Bitmap {
+        val density = context.resources.displayMetrics.density
+        val fontSize = 16f * density
+        val horizontalPadding = 14f * density
+        val bodyHeight = 34f * density
+        val strokeWidth = 2.5f * density
+
+        val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = Color.WHITE
+            textSize = fontSize
+            typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
+            textAlign = Paint.Align.CENTER
+        }
+        val bodyWidth = maxOf(
+            62f * density,
+            textPaint.measureText(title) + horizontalPadding * 2
+        )
+        val width = bodyWidth.roundToInt()
+        val height = (bodyHeight + 2f * density).roundToInt()
+        val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+
+        val fillPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = Color.parseColor("#2F67FF")
+            style = Paint.Style.FILL
+        }
+        val strokePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = Color.WHITE
+            style = Paint.Style.STROKE
+            this.strokeWidth = strokeWidth
+        }
+        val shadowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = Color.parseColor("#2D15357F")
+            style = Paint.Style.FILL
+            setShadowLayer(6f * density, 0f, 3f * density, Color.parseColor("#2D15357F"))
+        }
+
+        val bodyRect = RectF(
+            strokeWidth,
+            strokeWidth,
+            width - strokeWidth,
+            bodyHeight
+        )
+        val cornerRadius = 17f * density
+        canvas.drawRoundRect(bodyRect, cornerRadius, cornerRadius, shadowPaint)
+        canvas.drawRoundRect(bodyRect, cornerRadius, cornerRadius, fillPaint)
+        canvas.drawRoundRect(bodyRect, cornerRadius, cornerRadius, strokePaint)
+
+        val textY = bodyRect.centerY() - (textPaint.descent() + textPaint.ascent()) / 2f
+        canvas.drawText(title, bodyRect.centerX(), textY, textPaint)
+        return bitmap
+    }
+
 
     /**
      * 设置是否显示交通信号灯
@@ -1574,7 +2043,12 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             return
         }
         isDestroyed = true
+        isNavigationRunning = false
+        isHostActivityInBackground = false
+        latestNavigationNotificationSnapshot = null
+        NavigationForegroundService.stop(context)
         unregisterActiveView()
+        clearRenderedCustomWaypointMarkers()
         try {
             naviView.onPause()
             naviView.onDestroy()