expo-gaode-map-navigation 1.1.4 → 1.1.5-next.0

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

@@ -4,16 +4,20 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
+import android.view.View
+import android.view.ViewGroup
 import com.amap.api.navi.AMapNavi
 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.navi.enums.MapStyle
 import com.amap.api.navi.enums.NaviType
 import com.amap.api.navi.model.*
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
+import java.util.IdentityHashMap
 
 @SuppressLint("ViewConstructor")
 @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
@@ -38,11 +42,37 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     internal var showCamera: Boolean = true
     internal var naviType: Int = NaviType.GPS
     internal var enableVoice: Boolean = true
-    
+
+
+    internal var androidStatusBarPaddingTopDp: Double? = null
+
+    internal var showUIElements: Boolean = true
+    internal var androidTrafficBarEnabled: Boolean = true
+    internal var isRouteListButtonShow: Boolean = true
+    internal var isTrafficLayerEnabled: Boolean = true
+    internal var autoChangeZoom : Boolean = true
+    internal var autoLockCar: Boolean = true
+    internal var isTrafficLine: Boolean = true
+    internal var isRealCrossDisplayShow : Boolean = true
+    internal var isNaviArrowVisible : Boolean = true
+    internal var isAfterRouteAutoGray: Boolean = false
+    internal var isVectorLineShow: Boolean = true
+    internal var isNaviTravelView : Boolean = false
     private val naviView: AMapNaviView = AMapNaviView(context)
     private var aMapNavi: AMapNavi? = null
     private var startCoordinate: NaviLatLng? = null
     private var endCoordinate: NaviLatLng? = null
+
+    private var lastAppliedTopPaddingPx: Int? = null
+
+    private var topInsetPx: Int = 0
+    private var overlayHooked: Boolean = false
+    private val overlayStates = IdentityHashMap<View, OverlayState>()
+
+    private data class OverlayState(
+        val translationY: Float,
+        val paddingTop: Int
+    )
     
     // 导航监听器
     @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
@@ -270,7 +300,18 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         try {
             // 初始化导航视图
             naviView.onCreate(Bundle())
+            naviView.layoutParams = android.widget.FrameLayout.LayoutParams(
+                android.widget.FrameLayout.LayoutParams.MATCH_PARENT,
+                android.widget.FrameLayout.LayoutParams.MATCH_PARENT
+            )
             addView(naviView)
+
+            clipChildren = false
+            clipToPadding = false
+            naviView.clipChildren = false
+            naviView.clipToPadding = false
+            
+            ensureOverlayInsetHook()
             
             // 使用单例获取导航实例
             aMapNavi = AMapNavi.getInstance(context.applicationContext)
@@ -278,27 +319,28 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             
             // 使用内置语音播报功能（v5.6.0+）
             aMapNavi?.setUseInnerVoice(true, true) // 启用内置语音，并回调文字
-            
+           //设置是否为骑步行视图
+            aMapNavi?.isNaviTravelView = isNaviTravelView
             // 设置导航视图选项 - 根据 AMapNaviViewOptions API
             val options = AMapNaviViewOptions()
             
             // === 基础界面控制 ===
             // 注意：isLayoutVisible 控制整个导航UI布局的显示
             // 设置为 true 将显示导航信息面板（包括距离、时间等）
-            options.isLayoutVisible = true // ⭐ 显示导航界面布局（包括导航信息面板）
+            options.isLayoutVisible = showUIElements
             options.isSettingMenuEnabled = true // 显示设置菜单按钮
             options.isCompassEnabled = true // 显示指南针
-            options.isTrafficBarEnabled = true // 显示交通路况光柱条（顶部）
-            options.isRouteListButtonShow = true // 显示路线全览按钮
-            
+            options.isTrafficBarEnabled = androidTrafficBarEnabled // 显示路况条
+            options.isRouteListButtonShow = isRouteListButtonShow // 显示路线全览按钮
+
             Log.d("ExpoGaodeMapNaviView", "导航UI配置: isLayoutVisible=true, 所有UI元素已启用")
             
             // === 地图图层 ===
-            options.isTrafficLayerEnabled = true // 显示交通路况图层
-            options.isTrafficLine = true // 显示交通路况线
+            options.isTrafficLayerEnabled = isTrafficLayerEnabled // 显示交通路况图层
+            options.isTrafficLine = isTrafficLine // 显示交通路况线
             
             // === 路口放大图和车道信息 ===
-            options.isRealCrossDisplayShow = true // 显示实景路口放大图
+            options.isRealCrossDisplayShow = isRealCrossDisplayShow // 显示实景路口放大图
             options.setModeCrossDisplayShow(true) // 显示路口3D模型（使用方法而非属性）
             options.isLaneInfoShow = true // 显示车道信息
             options.isEyrieCrossDisplay = true // 显示鹰眼路口图
@@ -310,32 +352,36 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             
             // === 路线和导航箭头 ===
             options.isAutoDrawRoute = true // 自动绘制路线
-            options.isNaviArrowVisible = true // 显示导航箭头
+            options.isNaviArrowVisible = isNaviArrowVisible // 显示导航箭头
             options.isSecondActionVisible = true // 显示辅助操作（如下个路口提示）
             options.isDrawBackUpOverlay = true // 绘制备用路线覆盖物
+            if(isVectorLineShow)
+            options.isLeaderLineEnabled
             
             // === 地图锁车和视角控制 ===
-            options.isAutoLockCar = true // 自动锁车
+            options.isAutoLockCar = autoLockCar // 自动锁车
             options.lockMapDelayed = 5000L // 5秒后自动锁车（毫秒）
-            options.setAutoDisplayOverview(false) // 不自动显示全览
-            options.isAutoChangeZoom = true // 根据导航自动调整缩放级别
-            options.setZoom(18) // 锁车时的缩放级别 (14-18)
-            options.setTilt(35) // 锁车时的倾斜角度 (0-60)
+            options.isAutoDisplayOverview = false // 不自动显示全览
+            options.isAutoChangeZoom = autoChangeZoom // 根据导航自动调整缩放级别
+            options.zoom = 18 // 锁车时的缩放级别 (14-18)
+            options.tilt = 35 // 锁车时的倾斜角度 (0-60)
             
             // === 已走路线处理 ===
-            options.setAfterRouteAutoGray(true) // 走过的路线自动变灰
+            options.isAfterRouteAutoGray = isAfterRouteAutoGray // 走过的路线自动变灰
             
             // === 传感器和定位 ===
-            options.setSensorEnable(true) // 使用设备传感器
+            options.isSensorEnable = true // 使用设备传感器
             
             // === 夜间模式（已废弃但保留兼容） ===
             // 建议使用 setMapStyle 方法设置地图样式
-            options.setAutoNaviViewNightMode(false) // 不自动切换夜间模式
+            options.isAutoNaviViewNightMode = false // 不自动切换夜间模式
             
             // === 鹰眼地图 ===
-            options.setEagleMapVisible(false) // 不显示鹰眼地图（小地图）
+            options.isEagleMapVisible = false // 不显示鹰眼地图（小地图）
             
             naviView.viewOptions = options
+
+            naviView.post { updateTopInsetPadding() }
             
             // 设置导航视图监听器
             naviView.setAMapNaviViewListener(object : AMapNaviViewListener {
@@ -364,6 +410,323 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         }
     }
 
+    private fun getStatusBarHeightPx(): Int {
+        return try {
+            val resourceId = context.resources.getIdentifier("status_bar_height", "dimen", "android")
+            if (resourceId > 0) context.resources.getDimensionPixelSize(resourceId) else 0
+        } catch (_: Exception) {
+            0
+        }
+    }
+
+    private fun dpToPx(dp: Double): Int {
+        val density = context.resources.displayMetrics.density
+        return (dp * density + 0.5).toInt()
+    }
+
+    private fun updateTopInsetPadding() {
+        val shouldApplyPadding =  androidStatusBarPaddingTopDp != null
+        val paddingTopPx = if (shouldApplyPadding) {
+            androidStatusBarPaddingTopDp?.let { dpToPx(it) } ?: getStatusBarHeightPx()
+        } else {
+           //默认返回状态栏高度
+            getStatusBarHeightPx()
+        }
+
+        if (lastAppliedTopPaddingPx == paddingTopPx) {
+            return
+        }
+
+        lastAppliedTopPaddingPx = paddingTopPx
+
+        topInsetPx = paddingTopPx
+
+        naviView.setPadding(0, 0, 0, 0)
+
+        applyTopInsetToOverlays(paddingTopPx)
+    }
+
+    private fun ensureOverlayInsetHook() {
+        if (overlayHooked) {
+            return
+        }
+
+        overlayHooked = true
+        naviView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+            applyTopInsetToOverlays(topInsetPx)
+        }
+    }
+
+    private fun applyTopInsetToOverlays(paddingTopPx: Int) {
+        if (paddingTopPx <= 0) {
+            if (overlayStates.isNotEmpty()) {
+                val iterator = overlayStates.entries.iterator()
+                while (iterator.hasNext()) {
+                    val entry = iterator.next()
+                    val view = entry.key
+                    val state = entry.value
+                    view.translationY = state.translationY
+                    view.setPadding(view.paddingLeft, state.paddingTop, view.paddingRight, view.paddingBottom)
+                    iterator.remove()
+                }
+            }
+            return
+        }
+
+        val rawTargets = findTopOverlayTargets(naviView)
+        val targets = filterTopLevelTargets(naviView, rawTargets)
+        if (targets.isEmpty()) {
+            val applied = applyTopPaddingToNaviUiLayer(paddingTopPx)
+            if (!applied) {
+                naviView.post { applyTopPaddingToNaviUiLayer(paddingTopPx) }
+            }
+            return
+        }
+
+        val targetSet = targets.toHashSet()
+
+        val iterator = overlayStates.entries.iterator()
+        while (iterator.hasNext()) {
+            val entry = iterator.next()
+            val view = entry.key
+            if (!targetSet.contains(view)) {
+                val state = entry.value
+                view.translationY = state.translationY
+                view.setPadding(view.paddingLeft, state.paddingTop, view.paddingRight, view.paddingBottom)
+                iterator.remove()
+            }
+        }
+
+        for (target in targets) {
+            if (!overlayStates.containsKey(target)) {
+                overlayStates[target] = OverlayState(
+                    translationY = target.translationY,
+                    paddingTop = target.paddingTop
+                )
+            }
+            ensureNoClipChain(target)
+            target.translationY = paddingTopPx.toFloat()
+        }
+    }
+
+    private fun ensureNoClipChain(view: View) {
+        var currentParent = view.parent
+        while (currentParent is ViewGroup) {
+            currentParent.clipChildren = false
+            currentParent.clipToPadding = false
+            if (currentParent === naviView) {
+                break
+            }
+            currentParent = currentParent.parent
+        }
+    }
+
+    private fun filterTopLevelTargets(root: ViewGroup, targets: List<View>): List<View> {
+        if (targets.size <= 1) {
+            return targets
+        }
+
+        val set = targets.toHashSet()
+        val result = ArrayList<View>(targets.size)
+        for (view in targets) {
+            var parent = view.parent
+            var hasAncestorInTargets = false
+            while (parent is View) {
+                if (parent === root) {
+                    break
+                }
+                if (set.contains(parent)) {
+                    hasAncestorInTargets = true
+                    break
+                }
+                parent = parent.parent
+            }
+            if (!hasAncestorInTargets) {
+                result.add(view)
+            }
+        }
+
+        return result
+    }
+
+    private fun findTopOverlayTargets(root: ViewGroup): List<View> {
+        val result = ArrayList<View>()
+        val parentHeight = root.height
+        val parentWidth = root.width
+        if (parentHeight <= 0 || parentWidth <= 0) {
+            return result
+        }
+
+        val queue = ArrayDeque<View>()
+        for (i in 0 until root.childCount) {
+            queue.add(root.getChildAt(i))
+        }
+
+        while (queue.isNotEmpty()) {
+            val view = queue.removeFirst()
+            val group = view as? ViewGroup
+            if (group != null) {
+                for (i in 0 until group.childCount) {
+                    queue.add(group.getChildAt(i))
+                }
+            }
+
+            if (!view.isShown) {
+                continue
+            }
+
+            val name = view.javaClass.name
+            if (name.contains("MapView", ignoreCase = true) ||
+                name.contains("Texture", ignoreCase = true) ||
+                name.contains("Surface", ignoreCase = true) ||
+                name.contains("GLSurface", ignoreCase = true)
+            ) {
+                continue
+            }
+
+            if (view.height <= 0 || view.width <= 0) {
+                continue
+            }
+
+            if (view.top > 1) {
+                continue
+            }
+
+            if (view.height >= (parentHeight * 0.6f).toInt()) {
+                continue
+            }
+
+            val wideEnough = view.width >= (parentWidth * 0.5f).toInt()
+            val likelyUi = wideEnough && (view.isClickable || (view as? ViewGroup)?.childCount ?: 0 > 0)
+            if (!likelyUi) {
+                continue
+            }
+
+            result.add(view)
+        }
+
+        return result
+    }
+
+    private fun applyTopPaddingToNaviUiLayer(paddingTopPx: Int): Boolean {
+        val uiRoot = findNaviUiRoot(naviView) ?: return false
+
+        uiRoot.setPadding(uiRoot.paddingLeft, paddingTopPx, uiRoot.paddingRight, uiRoot.paddingBottom)
+        uiRoot.clipToPadding = false
+        return true
+    }
+
+    private fun findNaviUiRoot(root: ViewGroup): ViewGroup? {
+        var best: ViewGroup? = null
+        var bestScore = Int.MIN_VALUE
+
+        val queue = ArrayDeque<View>()
+        for (i in 0 until root.childCount) {
+            queue.add(root.getChildAt(i))
+        }
+
+        while (queue.isNotEmpty()) {
+            val view = queue.removeFirst()
+            val group = view as? ViewGroup
+            if (group != null) {
+                val score = scoreAsUiRootCandidate(group)
+                if (score > bestScore) {
+                    bestScore = score
+                    best = group
+                }
+                for (i in 0 until group.childCount) {
+                    queue.add(group.getChildAt(i))
+                }
+            }
+        }
+
+        return if (bestScore > 0) best else null
+    }
+
+    private fun scoreAsUiRootCandidate(group: ViewGroup): Int {
+        val name = group.javaClass.name
+        if (name.contains("MapView", ignoreCase = true) ||
+            name.contains("Texture", ignoreCase = true) ||
+            name.contains("Surface", ignoreCase = true) ||
+            name.contains("GLSurface", ignoreCase = true)
+        ) {
+            return Int.MIN_VALUE
+        }
+
+        var score = 0
+
+        val lp = group.layoutParams
+        if (lp != null) {
+            if (lp.width == ViewGroup.LayoutParams.MATCH_PARENT && lp.height == ViewGroup.LayoutParams.MATCH_PARENT) {
+                score += 4
+            } else if (lp.width == ViewGroup.LayoutParams.MATCH_PARENT) {
+                score += 2
+            }
+        }
+
+        if (group.childCount >= 3) {
+            score += 2
+        } else if (group.childCount >= 1) {
+            score += 1
+        }
+
+        if (name.contains("RelativeLayout", ignoreCase = true) || name.contains("FrameLayout", ignoreCase = true)) {
+            score += 1
+        }
+
+        return score
+    }
+
+
+
+    fun applyAndroidStatusBarPaddingTop(topDp: Double?) {
+        androidStatusBarPaddingTopDp = topDp
+        updateTopInsetPadding()
+    }
+
+    fun applyShowUIElements(visible: Boolean) {
+        showUIElements = visible
+        val options = naviView.viewOptions
+        options.isLayoutVisible = visible
+        naviView.viewOptions = options
+    }
+
+    fun applyAndroidTrafficBarEnabled(enabled: Boolean) {
+        androidTrafficBarEnabled = enabled
+        val options = naviView.viewOptions
+        options.isTrafficBarEnabled = enabled
+        naviView.viewOptions = options
+    }
+
+    fun applyShowTrafficButton(enabled: Boolean) {
+        isTrafficLayerEnabled = enabled
+        val options = naviView.viewOptions
+        options.isTrafficLayerEnabled = enabled
+        naviView.viewOptions = options
+    }
+
+    fun applyShowBrowseRouteButton(enabled: Boolean) {
+        isRouteListButtonShow = enabled
+        val options = naviView.viewOptions
+        options.isRouteListButtonShow = enabled
+        naviView.viewOptions = options
+    }
+
+    fun applyShowGreyAfterPass(enabled: Boolean){
+        isAfterRouteAutoGray = enabled
+        val options = naviView.viewOptions
+        options.isAfterRouteAutoGray = enabled
+        naviView.viewOptions = options
+    }
+
+    fun applyShowVectorline(enabled: Boolean){
+        isVectorLineShow = enabled
+        val options = naviView.viewOptions
+        if(enabled)
+        options.isLeaderLineEnabled
+        naviView.viewOptions = options
+    }
+
     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 {
@@ -454,24 +817,28 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
     }
     
     fun applyAutoLockCar(enabled: Boolean) {
+        autoLockCar = enabled
         val options = naviView.viewOptions
         options.isAutoLockCar = enabled
         naviView.viewOptions = options
     }
     
     fun applyAutoChangeZoom(enabled: Boolean) {
+        autoChangeZoom = enabled
         val options = naviView.viewOptions
         options.isAutoChangeZoom = enabled
         naviView.viewOptions = options
     }
     
     fun applyTrafficLayerEnabled(enabled: Boolean) {
+        isTrafficLine = enabled
         val options = naviView.viewOptions
-        options.isTrafficLayerEnabled = enabled
+        options.isTrafficLine = enabled
         naviView.viewOptions = options
     }
     
     fun applyRealCrossDisplay(enabled: Boolean) {
+        isRealCrossDisplayShow = enabled
         val options = naviView.viewOptions
         options.isRealCrossDisplayShow = enabled
         naviView.viewOptions = options
@@ -491,6 +858,11 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
         // 夜间模式设置 - isNightMode 属性可能不存在
         try {
             val options = naviView.viewOptions
+            if(enabled){
+                options.setMapStyle(MapStyle.NIGHT, null)
+            }else{
+                options.setMapStyle(MapStyle.DAY, null)
+            }
             // options.isNightMode = enabled // 该属性可能不存在
             // 可以通过其他方式设置夜间模式
             naviView.viewOptions = options
@@ -578,7 +950,12 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             Log.e("ExpoGaodeMapNaviView", "Failed to set traffic light view visibility", e)
         }
     }
-    
+
+    fun applyIsNaviTravelView(enabled: Boolean){
+        isNaviTravelView = enabled
+        aMapNavi?.isNaviTravelView = enabled
+    }
+
     /**
      * 设置路线转向箭头的可见性
      * @param visible true-显示 false-隐藏
@@ -586,8 +963,9 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
      */
     fun applyNaviArrowVisible(visible: Boolean) {
         try {
+            isNaviArrowVisible = visible
             val options = naviView.viewOptions
-            options.setNaviArrowVisible(visible)
+            options.isNaviArrowVisible = visible
             naviView.viewOptions = options
             Log.d("ExpoGaodeMapNaviView", "Navi arrow visibility set to: $visible")
         } catch (e: Exception) {
@@ -649,4 +1027,4 @@ class ExpoGaodeMapNaviView(context: Context, appContext: AppContext) : ExpoView(
             Log.e("ExpoGaodeMapNaviView", "Error destroying navi view", e)
         }
     }
-}
+}

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

@@ -72,7 +72,7 @@ class ExpoGaodeMapNaviViewModule : Module() {
         view.applyCarOverlayVisible(visible)
       }
       
-      Prop<Boolean>("trafficLightsVisible") { view, visible ->
+      Prop<Boolean>("showTrafficLights") { view, visible ->
         view.applyTrafficLightsVisible(visible)
       }
       
@@ -101,7 +101,44 @@ class ExpoGaodeMapNaviViewModule : Module() {
       Prop<Boolean>("showTrafficLightView") { view, show ->
         view.applyShowTrafficLightView(show)
       }
-      
+
+     //设置是否为骑步行视图
+        Prop<Boolean>("isNaviTravelView") { view, isRideStepView ->
+            view.applyIsNaviTravelView(isRideStepView)
+        }
+
+      Prop<Double?>("androidStatusBarPaddingTop") { view, topDp ->
+        view.applyAndroidStatusBarPaddingTop(topDp)
+      }
+
+      Prop<Boolean>("showCamera") { view, enabled ->
+          view.applyShowCamera(enabled)
+      }
+
+      Prop<Boolean>("showUIElements") { view, visible ->
+        view.applyShowUIElements(visible)
+      }
+
+      Prop<Boolean>("showTrafficBar") { view, enabled ->
+        view.applyAndroidTrafficBarEnabled(enabled)
+      }
+
+      Prop<Boolean>("showTrafficButton"){ view, enabled ->
+          view.applyShowTrafficButton(enabled)
+      }
+
+      Prop<Boolean>("showBrowseRouteButton") { view, enabled ->
+          view.applyShowBrowseRouteButton(enabled)
+      }
+
+        Prop<Boolean>("showVectorline"){ view, enabled ->
+            view.applyShowVectorline(enabled)
+        }
+
+        Prop<Boolean>("showGreyAfterPass") { view, enabled ->
+            view.applyShowGreyAfterPass(enabled)
+        }
+
       // 方法
       AsyncFunction("startNavigation") { view: ExpoGaodeMapNaviView, startLat: Double, startLng: Double, endLat: Double, endLng: Double, promise: expo.modules.kotlin.Promise ->
         view.startNavigation(startLat, startLng, endLat, endLng, promise)
@@ -112,4 +149,4 @@ class ExpoGaodeMapNaviViewModule : Module() {
       }
     }
   }
-}
+}

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

@@ -1,5 +1,6 @@
 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
@@ -43,6 +44,7 @@ class ExpoGaodeMapNavigationModule : Module() {
   private val independentRouteManager = IndependentRouteManager()
   private var independentRouteService: IndependentRouteService? = null
 
+  @SuppressLint("SuspiciousIndentation")
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMapNavigation")
 

package/build/map/index.d.ts

@@ -1,9 +1,7 @@
 export * from './ExpoGaodeMap.types';
-export * from './types';
 export { default as ExpoGaodeMapModule, getWebKey, getSDKConfig } from './ExpoGaodeMapModule';
 export type { SDKConfig, PermissionStatus } from './ExpoGaodeMapModule';
 export { default as MapView } from './ExpoGaodeMapView';
-export type { MapViewRef } from './ExpoGaodeMapView';
 export { Marker, Polyline, Polygon, Circle, HeatMap, MultiPoint, Cluster, } from './components/overlays';
 export { requireModule, OptionalModules, getInstalledModules, printModuleInfo, createLazyLoader, } from './utils/ModuleLoader';
 export { default } from './ExpoGaodeMapModule';

package/build/map/index.js

@@ -20,7 +20,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.createLazyLoader = exports.printModuleInfo = exports.getInstalledModules = exports.OptionalModules = exports.requireModule = exports.Cluster = exports.MultiPoint = exports.HeatMap = exports.Circle = exports.Polygon = exports.Polyline = exports.Marker = exports.MapView = exports.getSDKConfig = exports.getWebKey = exports.ExpoGaodeMapModule = void 0;
 // 导出类型定义
 __exportStar(require("./ExpoGaodeMap.types"), exports);
-__exportStar(require("./types"), exports);
 // 导出原生模块 - 直接使用，无需封装
 var ExpoGaodeMapModule_1 = require("./ExpoGaodeMapModule");
 Object.defineProperty(exports, "ExpoGaodeMapModule", { enumerable: true, get: function () { return __importDefault(ExpoGaodeMapModule_1).default; } });

package/build/map/types/overlays.types.d.ts

@@ -336,5 +336,5 @@ export interface ClusterProps {
     /**
      * 聚合点点击事件
      */
-    onPress?: (event: NativeSyntheticEvent<ClusterParams>) => void;
+    onClusterPress?: (event: NativeSyntheticEvent<ClusterParams>) => void;
 }

package/build/types/naviview.types.d.ts

@@ -106,13 +106,6 @@ export interface NaviViewProps extends ViewProps {
      * @since 6.2.0
      */
     carOverlayVisible?: boolean;
-    /**
-     * 是否显示交通信号灯
-     * @platform android
-     * @default true
-     * @since 7.4.0
-     */
-    trafficLightsVisible?: boolean;
     /**
      * 路线标记点可见性配置
      * @platform android
@@ -152,26 +145,25 @@ export interface NaviViewProps extends ViewProps {
      */
     showTrafficLightView?: boolean;
     /**
-     * 是否显示路线
-     * @platform ios
-     * @default true
+     * 导航界面顶部与状态栏的间距（单位：dp）
+     * @platform android
+     * @default 状态栏高度（单位：dp）
      */
-    showRoute?: boolean;
+    androidStatusBarPaddingTop?: number;
     /**
-     * 是否显示转向箭头
+     * 是否显示路线
      * @platform ios
      * @default true
      */
-    showTurnArrow?: boolean;
+    showRoute?: boolean;
     /**
      * 是否显示路况光柱
-     * @platform ios
      * @default true
      */
     showTrafficBar?: boolean;
     /**
      * 是否显示全览按钮
-     * @platform ios
+     *
      * @default true
      */
     showBrowseRouteButton?: boolean;
@@ -183,31 +175,36 @@ export interface NaviViewProps extends ViewProps {
     showMoreButton?: boolean;
     /**
      * 是否显示实时交通按钮
-     * @platform ios
+     *
      * @default true
      */
     showTrafficButton?: boolean;
     /**
      * 是否显示界面元素（设为false可完全自定义界面）
-     * @platform ios
+     * 提示：ios 暂时无效，android 有效
      * @default true
      */
     showUIElements?: boolean;
     /**
      * 走过的路线是否置灰
-     * @platform ios
+     *
      * @default false
      */
     showGreyAfterPass?: boolean;
     /**
      * 是否显示牵引线（起点到终点的飞线）
-     * @platform ios
+     *
      * @default true
      */
     showVectorline?: boolean;
+    /**
+     * 设置是否为骑步行视图
+     * @platform android
+     * @default false
+     */
+    isNaviTravelView?: boolean;
     /**
      * 是否显示红绿灯图标
-     * @platform ios
      * @default true
      */
     showTrafficLights?: boolean;

package/ios/ExpoGaodeMapNaviView.swift

@@ -5,6 +5,7 @@
 //  
 //
 
+import Foundation
 import ExpoModulesCore
 import AMapNaviKit
 
@@ -84,6 +85,11 @@ public class ExpoGaodeMapNaviView: ExpoView {
   
   // MARK: - Properties
   private var driveView: AMapNaviDriveView?
+  private var driveViewLoaded: Bool = false
+  private var pendingShowUIElements: Bool?
+  private var pendingShowUIElementsWorkItem: DispatchWorkItem?
+  private var hasStartedNavi: Bool = false
+  private var hasReceivedFirstNaviData: Bool = false
   private var driveManager: AMapNaviDriveManager?
   
   // Props - 通用属性
@@ -136,7 +142,7 @@ public class ExpoGaodeMapNaviView: ExpoView {
     didSet { driveView?.showTrafficButton = showTrafficButton }
   }
   var showUIElements: Bool = true {
-    didSet { driveView?.showUIElements = showUIElements }
+    didSet { applyShowUIElementsToDriveViewIfReady() }
   }
   var showGreyAfterPass: Bool = false {
     didSet { driveView?.showGreyAfterPass = showGreyAfterPass }
@@ -153,6 +159,10 @@ public class ExpoGaodeMapNaviView: ExpoView {
   var lineWidth: CGFloat = 0 {
     didSet { driveView?.lineWidth = lineWidth }
   }
+
+  func applyShowUIElements(_ visible: Bool) {
+    showUIElements = visible
+  }
   
   // 坐标
   private var startCoordinate: AMapNaviPoint?
@@ -222,15 +232,68 @@ public class ExpoGaodeMapNaviView: ExpoView {
     driveView?.showBrowseRouteButton = showBrowseRouteButton
     driveView?.showMoreButton = showMoreButton
     driveView?.showTrafficButton = showTrafficButton
-    driveView?.showUIElements = showUIElements
     driveView?.showGreyAfterPass = showGreyAfterPass
     driveView?.showVectorline = showVectorline
     driveView?.showTrafficLights = showTrafficLights
     if lineWidth > 0 {
       driveView?.lineWidth = lineWidth
     }
+
+    applyShowUIElementsToDriveViewIfReady()
   }
-  
+
+  private func applyShowUIElementsToDriveViewIfReady() {
+    guard driveView != nil else {
+      pendingShowUIElements = showUIElements
+      return
+    }
+
+    guard driveViewLoaded else {
+      pendingShowUIElements = showUIElements
+      return
+    }
+
+    let value = pendingShowUIElements ?? showUIElements
+    pendingShowUIElements = nil
+
+    if value == false && (!hasStartedNavi || !hasReceivedFirstNaviData) {
+      pendingShowUIElements = false
+      pendingShowUIElementsWorkItem?.cancel()
+      let workItem = DispatchWorkItem { [weak self] in
+        guard let self else { return }
+        self.applyDriveViewShowUIElements(true, remainingAttempts: 20)
+      }
+      pendingShowUIElementsWorkItem = workItem
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.08, execute: workItem)
+      return
+    }
+
+    pendingShowUIElementsWorkItem?.cancel()
+    let workItem = DispatchWorkItem { [weak self] in
+      guard let self else { return }
+      self.applyDriveViewShowUIElements(value, remainingAttempts: 20)
+    }
+    pendingShowUIElementsWorkItem = workItem
+
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.08, execute: workItem)
+  }
+
+  private func applyDriveViewShowUIElements(_ value: Bool, remainingAttempts: Int) {
+    guard let driveView else { return }
+
+    if driveView.bounds.isEmpty {
+      if remainingAttempts <= 0 {
+        return
+      }
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) { [weak self] in
+        self?.applyDriveViewShowUIElements(value, remainingAttempts: remainingAttempts - 1)
+      }
+      return
+    }
+
+    driveView.showUIElements = value
+  }
+
   // MARK: - Prop Setters
   private func applyShowCamera(_ show: Bool) {
     driveView?.showCamera = show
@@ -366,6 +429,7 @@ public class ExpoGaodeMapNaviView: ExpoView {
 extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   
   public func driveManager(onCalculateRouteSuccess driveManager: AMapNaviDriveManager) {
+    hasStartedNavi = true
     onRouteCalculated([
       "success": true,
       "naviType": naviType
@@ -377,6 +441,8 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
     } else {
       driveManager.startGPSNavi()
     }
+
+    applyShowUIElementsToDriveViewIfReady()
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, onCalculateRouteFailure error: Error) {
@@ -387,10 +453,13 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, didStartNavi naviMode: AMapNaviMode) {
+    hasStartedNavi = true
     onNavigationStarted([
       "type": naviMode == .emulator ? 1 : 0,
       "isEmulator": naviMode == .emulator
     ])
+
+    applyShowUIElementsToDriveViewIfReady()
   }
   
   public func driveManagerNavi(_ driveManager: AMapNaviDriveManager, didArrive wayPoint: AMapNaviPoint) {
@@ -404,6 +473,10 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, didUpdate naviLocation: AMapNaviLocation) {
+    if !hasReceivedFirstNaviData {
+      hasReceivedFirstNaviData = true
+      applyShowUIElementsToDriveViewIfReady()
+    }
     onLocationUpdate([
       "latitude": naviLocation.coordinate.latitude,
       "longitude": naviLocation.coordinate.longitude,
@@ -413,6 +486,10 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, didUpdate naviInfo: AMapNaviInfo) {
+    if !hasReceivedFirstNaviData {
+      hasReceivedFirstNaviData = true
+      applyShowUIElementsToDriveViewIfReady()
+    }
     onNavigationInfoUpdate([
       "currentRoadName": naviInfo.currentRoadName ?? "",
       "nextRoadName": naviInfo.nextRoadName ?? "",
@@ -458,6 +535,13 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
 extension ExpoGaodeMapNaviView: AMapNaviDriveViewDelegate {
   
   public func driveViewDidLoad(_ driveView: AMapNaviDriveView) {
+    driveViewLoaded = true
+    applyViewOptions()
+    applyShowUIElementsToDriveViewIfReady()
     onNavigationReady([:])
   }
+
+  public func driveViewEdgePadding(_ driveView: AMapNaviDriveView) -> UIEdgeInsets {
+    return .zero
+  }
 }

package/ios/ExpoGaodeMapNaviViewModule.swift

@@ -76,7 +76,7 @@ public class ExpoGaodeMapNaviViewModule: Module {
         view.showRoute = value
       }
       
-      Prop("showTurnArrow") { (view: ExpoGaodeMapNaviView, value: Bool) in
+      Prop("naviArrowVisible") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.showTurnArrow = value
       }
       
@@ -97,7 +97,7 @@ public class ExpoGaodeMapNaviViewModule: Module {
       }
       
       Prop("showUIElements") { (view: ExpoGaodeMapNaviView, value: Bool) in
-        view.showUIElements = value
+        view.applyShowUIElements(value)
       }
       
       Prop("showGreyAfterPass") { (view: ExpoGaodeMapNaviView, value: Bool) in

package/package.json

@@ -1,17 +1,11 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "1.1.4",
+  "version": "1.1.5-next.0",
   "description": "高德地图导航功能模块 - 路径规划、导航引导，独立版本包含完整地图功能",
+  "author": "<TomWq> (https://github.com/TomWq)",
+  "repository": "https://github.com/TomWq/expo-gaode-map",
   "main": "build/index.js",
   "types": "build/index.d.ts",
-  "files": [
-    "build",
-    "android",
-    "ios",
-    "app.plugin.js",
-    "expo-module.config.json",
-    "plugin/build"
-  ],
   "scripts": {
     "build": "expo-module build && bun run build:plugin",
     "build:plugin": "tsc --project plugin/tsconfig.json",
@@ -22,6 +16,31 @@
     "prepublishOnly": "expo-module prepublishOnly",
     "expo-module": "expo-module"
   },
+  "devDependencies": {
+    "@expo/config-plugins": "~54.0.4",
+    "@types/react": "~19.1.0",
+    "expo": "^54.0.31",
+    "expo-module-scripts": "^5.0.8",
+    "react-native": "0.81.5",
+    "typescript": "^5.9.3"
+  },
+  "peerDependencies": {
+    "expo": "*",
+    "react": "*",
+    "react-native": "*"
+  },
+  "bugs": {
+    "url": "https://github.com/TomWq/expo-gaode-map/issues"
+  },
+  "files": [
+    "build",
+    "android",
+    "ios",
+    "app.plugin.js",
+    "expo-module.config.json",
+    "plugin/build"
+  ],
+  "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
   "keywords": [
     "react-native",
     "expo",
@@ -32,27 +51,5 @@
     "高德地图",
     "导航"
   ],
-  "repository": "https://github.com/TomWq/expo-gaode-map",
-  "bugs": {
-    "url": "https://github.com/TomWq/expo-gaode-map/issues"
-  },
-  "author": "<TomWq> (https://github.com/TomWq)",
-  "license": "MIT",
-  "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
-  "dependencies": {
-    "supercluster": "^8.0.1"
-  },
-  "devDependencies": {
-    "@expo/config-plugins": "^9.1.7",
-    "@types/react": "~19.1.0",
-    "expo": "^54.0.18",
-    "expo-module-scripts": "^5.0.7",
-    "react-native": "0.81.5",
-    "typescript": "^5.9.3"
-  },
-  "peerDependencies": {
-    "expo": "*",
-    "react": "*",
-    "react-native": "*"
-  }
+  "license": "MIT"
 }