expo-gaode-map 2.2.29 → 2.2.30-next.1

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapModule.kt

@@ -772,7 +772,7 @@ class ExpoGaodeMapModule : Module() {
       // 使用 WeakReference 避免内存泄露
       val contextRef = java.lang.ref.WeakReference(appContext.reactContext)
       val handler = android.os.Handler(android.os.Looper.getMainLooper())
-      val attempts = 0
+      var attempts = 0
       val maxAttempts = 50 // 增加到 5 秒 / 100ms，给用户足够时间操作
 
       val checkPermission = object : Runnable {
@@ -784,6 +784,7 @@ class ExpoGaodeMapModule : Module() {
           }
 
           val status = PermissionHelper.checkForegroundLocationPermission(context)
+          attempts += 1
 
           // 如果权限已授予或达到最大尝试次数,返回结果并清理 Handler
           if (status.granted || attempts >= maxAttempts) {
@@ -843,7 +844,7 @@ class ExpoGaodeMapModule : Module() {
       // 轮询检查权限状态
       val contextRef = java.lang.ref.WeakReference(appContext.reactContext)
       val handler = android.os.Handler(android.os.Looper.getMainLooper())
-      val attempts = 0
+      var attempts = 0
       val maxAttempts = 30
 
       val checkPermission = object : Runnable {
@@ -855,6 +856,7 @@ class ExpoGaodeMapModule : Module() {
           }
 
           val status = PermissionHelper.checkBackgroundLocationPermission(context)
+          attempts += 1
 
           if (status.granted || attempts >= maxAttempts) {
             handler.removeCallbacks(this)

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapView.kt

@@ -2,6 +2,7 @@ package expo.modules.gaodemap
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.SystemClock
 import android.view.View
 import android.view.ViewGroup
 import com.amap.api.maps.AMap
@@ -32,6 +33,10 @@ import androidx.core.graphics.withTranslation
 @SuppressLint("ViewConstructor")
 class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
 
+    init {
+        orientation = VERTICAL
+    }
+
     /**
      * 拦截 React Native 的 ViewManager 操作
      * 重写 requestLayout 防止在移除视图时触发布局异常
@@ -44,6 +49,63 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         }
     }
 
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val measuredWidth = View.MeasureSpec.getSize(widthMeasureSpec)
+        val measuredHeight = View.MeasureSpec.getSize(heightMeasureSpec)
+
+        setMeasuredDimension(measuredWidth, measuredHeight)
+
+        for (i in 0 until childCount) {
+            val child = getChildAt(i) ?: continue
+            if (child.visibility == View.GONE) {
+                continue
+            }
+
+            if (child === mapView) {
+                val childWidthSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, View.MeasureSpec.EXACTLY)
+                val childHeightSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight, View.MeasureSpec.EXACTLY)
+                child.measure(childWidthSpec, childHeightSpec)
+                continue
+            }
+
+            val lp = child.layoutParams
+            val childWidthSpec = when {
+                lp?.width != null && lp.width > 0 ->
+                    View.MeasureSpec.makeMeasureSpec(lp.width, View.MeasureSpec.EXACTLY)
+                else ->
+                    View.MeasureSpec.makeMeasureSpec(measuredWidth, View.MeasureSpec.AT_MOST)
+            }
+            val childHeightSpec = when {
+                lp?.height != null && lp.height > 0 ->
+                    View.MeasureSpec.makeMeasureSpec(lp.height, View.MeasureSpec.EXACTLY)
+                else ->
+                    View.MeasureSpec.makeMeasureSpec(measuredHeight, View.MeasureSpec.AT_MOST)
+            }
+            child.measure(childWidthSpec, childHeightSpec)
+        }
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        val width = right - left
+        val height = bottom - top
+
+        for (i in 0 until childCount) {
+            val child = getChildAt(i) ?: continue
+            if (child.visibility == View.GONE) {
+                continue
+            }
+
+            if (child === mapView) {
+                child.layout(0, 0, width, height)
+                continue
+            }
+
+            val childWidth = child.measuredWidth
+            val childHeight = child.measuredHeight
+            child.layout(0, 0, childWidth, childHeight)
+        }
+    }
+
     // Props 存储
     /** 地图类型 */
     internal var mapType: Int = 0
@@ -51,6 +113,12 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     internal var initialCameraPosition: Map<String, Any?>? = null
     /** 是否跟随用户位置 */
     internal var followUserLocation: Boolean = false
+    /** 是否显示底图文字标注 */
+    private var labelsEnabled: Boolean = true
+    /** 是否显示定位按钮 */
+    private var myLocationButtonEnabled: Boolean = false
+    /** 相机移动事件节流间隔 */
+    private var cameraEventThrottleMs: Long = 32L
     /** 自定义地图样式配置（缓存） */
     private var customMapStyleData: Map<String, Any>? = null
 
@@ -59,6 +127,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
     // 事件派发器
     private val onMapPress by EventDispatcher()
+    private val onPressPoi by EventDispatcher()
     private val onMapLongPress by EventDispatcher()
     private val onLoad by EventDispatcher()
     private val onLocation by EventDispatcher()
@@ -67,6 +136,8 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
     // 缓存的相机移动事件数据
     private var pendingCameraMoveData: Map<String, Any>? = null
+    private var pendingCameraMoveDispatch: Runnable? = null
+    private var lastCameraMoveDispatchAt: Long = 0L
 
     // 高德地图视图
     private lateinit var mapView: TextureMapView
@@ -130,6 +201,9 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
                     uiManager.setCustomMapStyle(styleData)
                 }
 
+                uiManager.setLabelsEnabled(labelsEnabled)
+                uiManager.setMyLocationButtonEnabled(myLocationButtonEnabled)
+
                 onLoad(mapOf("loaded" to true))
             }
         } catch (_: Exception) {
@@ -162,39 +236,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
                 // 相机移动中 - 应用节流优化
                 cameraPosition?.let {
-                    val visibleRegion = aMap.projection.visibleRegion
-                    val eventData = mapOf(
-                        "cameraPosition" to mapOf(
-                            "target" to mapOf(
-                                "latitude" to it.target.latitude,
-                                "longitude" to it.target.longitude
-                            ),
-                            "zoom" to it.zoom,
-                            "tilt" to it.tilt,
-                            "bearing" to it.bearing
-                        ),
-                        "latLngBounds" to mapOf(
-                            "northeast" to mapOf(
-                                "latitude" to visibleRegion.farRight.latitude,
-                                "longitude" to visibleRegion.farRight.longitude
-                            ),
-                            "southwest" to mapOf(
-                                "latitude" to visibleRegion.nearLeft.latitude,
-                                "longitude" to visibleRegion.nearLeft.longitude
-                            )
-                        )
-                    )
-                    
-                    // 使用 onCameraMove 自身的节流机制（如果在 Module 定义中配置了 Coalescing）
-                    // 或者在这里简单发送，让 JS 端处理节流，或者依赖 Expo 的事件批处理
-                    // 这里我们移除自定义的 Handler 实现，直接发送事件，简化代码逻辑
-                    // 注意：高德地图的 onCameraChange 调用频率非常高，
-                    // 建议在 Module 定义中使用 Events("onCameraMove") 时考虑是否需要原生侧节流
-                    // 目前 Expo Modules 默认没有自动节流，但为了代码简洁和避免 Handler 泄漏风险，
-                    // 我们可以依赖 JS 端的 debounce/throttle，或者如果性能是瓶颈，再加回轻量级的节流。
-                    // 鉴于之前的 Handler 实现比较复杂且容易出错，我们先简化。
-                    
-                     onCameraMove(eventData)
+                    dispatchCameraMoveEvent(buildCameraEventData(it))
                 }
             }
 
@@ -204,28 +246,8 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
                 // 相机移动完成
                 cameraPosition?.let {
-                    val visibleRegion = aMap.projection.visibleRegion
-                    onCameraIdle(mapOf(
-                        "cameraPosition" to mapOf(
-                            "target" to mapOf(
-                                "latitude" to it.target.latitude,
-                                "longitude" to it.target.longitude
-                            ),
-                            "zoom" to it.zoom,
-                            "tilt" to it.tilt,
-                            "bearing" to it.bearing
-                        ),
-                        "latLngBounds" to mapOf(
-                            "northeast" to mapOf(
-                                "latitude" to visibleRegion.farRight.latitude,
-                                "longitude" to visibleRegion.farRight.longitude
-                            ),
-                            "southwest" to mapOf(
-                                "latitude" to visibleRegion.nearLeft.latitude,
-                                "longitude" to visibleRegion.nearLeft.longitude
-                            )
-                        )
-                    ))
+                    flushPendingCameraMoveEvent()
+                    onCameraIdle(buildCameraEventData(it))
                 }
             }
         })
@@ -292,6 +314,17 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
             ))
         }
 
+        aMap.setOnPOIClickListener { poi ->
+            onPressPoi(mapOf(
+                "id" to poi.poiId,
+                "name" to poi.name,
+                "position" to mapOf(
+                    "latitude" to poi.coordinate.latitude,
+                    "longitude" to poi.coordinate.longitude
+                )
+            ))
+        }
+
         aMap.setOnMapLongClickListener { latLng ->
             onMapLongPress(mapOf(
                 "latitude" to latLng.latitude,
@@ -395,6 +428,24 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     fun setShowsBuildings(show: Boolean) = uiManager.setShowsBuildings(show)
     /** 设置是否显示室内地图 */
     fun setShowsIndoorMap(show: Boolean) = uiManager.setShowsIndoorMap(show)
+    /** 设置是否显示底图文字标注 */
+    fun setLabelsEnabled(enabled: Boolean) {
+        labelsEnabled = enabled
+        uiManager.setLabelsEnabled(enabled)
+    }
+    /** 设置是否显示定位按钮 */
+    fun setMyLocationButtonEnabled(enabled: Boolean) {
+        myLocationButtonEnabled = enabled
+        uiManager.setMyLocationButtonEnabled(enabled)
+    }
+    /** 设置相机移动事件节流间隔 */
+    fun setCameraEventThrottleMs(throttleMs: Int) {
+        cameraEventThrottleMs = throttleMs.toLong().coerceAtLeast(0L)
+        if (cameraEventThrottleMs == 0L) {
+            pendingCameraMoveDispatch?.let(mainHandler::removeCallbacks)
+            pendingCameraMoveDispatch = null
+        }
+    }
     
     /**
      * 设置自定义地图样式
@@ -580,9 +631,12 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
                try {
                    // 清理 Handler 回调,防止内存泄露
                    mainHandler.removeCallbacksAndMessages(null)
+                   pendingCameraMoveData = null
+                   pendingCameraMoveDispatch = null
 
             // 清理所有地图监听器
             aMap.setOnMapClickListener(null)
+            aMap.setOnPOIClickListener(null)
             aMap.setOnMapLongClickListener(null)
             aMap.setOnMapLoadedListener(null)
             aMap.setOnCameraChangeListener(null)
@@ -602,6 +656,73 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
     }
 
+    private fun buildCameraEventData(cameraPosition: com.amap.api.maps.model.CameraPosition): Map<String, Any> {
+        val visibleRegion = aMap.projection.visibleRegion
+        return mapOf(
+            "cameraPosition" to mapOf(
+                "target" to mapOf(
+                    "latitude" to cameraPosition.target.latitude,
+                    "longitude" to cameraPosition.target.longitude
+                ),
+                "zoom" to cameraPosition.zoom,
+                "tilt" to cameraPosition.tilt,
+                "bearing" to cameraPosition.bearing
+            ),
+            "latLngBounds" to mapOf(
+                "northeast" to mapOf(
+                    "latitude" to visibleRegion.farRight.latitude,
+                    "longitude" to visibleRegion.farRight.longitude
+                ),
+                "southwest" to mapOf(
+                    "latitude" to visibleRegion.nearLeft.latitude,
+                    "longitude" to visibleRegion.nearLeft.longitude
+                )
+            )
+        )
+    }
+
+    private fun dispatchCameraMoveEvent(eventData: Map<String, Any>) {
+        val throttleMs = cameraEventThrottleMs.coerceAtLeast(0L)
+        if (throttleMs == 0L) {
+            pendingCameraMoveData = null
+            pendingCameraMoveDispatch?.let(mainHandler::removeCallbacks)
+            pendingCameraMoveDispatch = null
+            lastCameraMoveDispatchAt = SystemClock.uptimeMillis()
+            onCameraMove(eventData)
+            return
+        }
+
+        pendingCameraMoveData = eventData
+
+        val now = SystemClock.uptimeMillis()
+        val elapsed = now - lastCameraMoveDispatchAt
+        if (elapsed >= throttleMs) {
+            pendingCameraMoveDispatch?.let(mainHandler::removeCallbacks)
+            pendingCameraMoveDispatch = null
+            flushPendingCameraMoveEvent(now)
+            return
+        }
+
+        if (pendingCameraMoveDispatch != null) {
+            return
+        }
+
+        val delay = (throttleMs - elapsed).coerceAtLeast(0L)
+        val runnable = Runnable {
+            pendingCameraMoveDispatch = null
+            flushPendingCameraMoveEvent()
+        }
+        pendingCameraMoveDispatch = runnable
+        mainHandler.postDelayed(runnable, delay)
+    }
+
+    private fun flushPendingCameraMoveEvent(timestamp: Long = SystemClock.uptimeMillis()) {
+        val eventData = pendingCameraMoveData ?: return
+        pendingCameraMoveData = null
+        lastCameraMoveDispatchAt = timestamp
+        onCameraMove(eventData)
+    }
+
     /** 保存实例状态 */
     @Suppress("unused")
     fun onSaveInstanceState(outState: android.os.Bundle) {
@@ -617,9 +738,10 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     override fun addView(child: View?, index: Int) {
         if (child is MarkerView) {
             child.setMap(aMap)
-            // MarkerView 也加入实际视图层级，但设置为 0x0 大小并移到屏幕外
-            // 不使用 View.GONE，避免在新架构下出现渲染问题
-            val params = LayoutParams(0, 0)
+            // MarkerView 需要保留可测量尺寸，否则 Android 无法正确处理
+            // Text / View 的 maxWidth 等布局约束，最终会被测成整行宽度。
+            // 这里保留 WRAP_CONTENT，并继续移到屏幕外，避免影响可见布局。
+            val params = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
             child.layoutParams = params
             child.translationX = -10000f  // 移到屏幕外
             child.translationY = -10000f
@@ -729,7 +851,4 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         return false
     }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-    }
 }

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapViewModule.kt

@@ -3,16 +3,6 @@ package expo.modules.gaodemap
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
-import expo.modules.kotlin.types.Enumerable
-
-enum class MapType(val value: Int) : Enumerable {
-  STANDARD(1),
-  SATELLITE(2),
-  NIGHT(3),
-  NAVI(4),
-  BUS(5)
-}
-
 /**
  * 高德地图视图 Module
  */
@@ -21,7 +11,7 @@ class ExpoGaodeMapViewModule : Module() {
     Name("ExpoGaodeMapView")
 
     View(ExpoGaodeMapView::class) {
-      Events("onMapPress", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
+      Events("onMapPress", "onPressPoi", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
       
 
       
@@ -34,9 +24,9 @@ class ExpoGaodeMapViewModule : Module() {
       }
 
 
-      Prop<MapType>("mapType") { view, type ->
-        view.mapType = type.value
-        view.setMapType(type.value)
+      Prop<Int>("mapType") { view, type ->
+        view.mapType = type
+        view.setMapType(type)
       }
 
       Prop<Map<String, Any?>?>("initialCameraPosition") { view, position ->
@@ -64,6 +54,9 @@ class ExpoGaodeMapViewModule : Module() {
       Prop<Boolean>("trafficEnabled") { view, show -> view.setShowsTraffic(show) }
       Prop<Boolean>("buildingsEnabled") { view, show -> view.setShowsBuildings(show) }
       Prop<Boolean>("indoorViewEnabled") { view, show -> view.setShowsIndoorMap(show) }
+      Prop<Boolean>("labelsEnabled") { view, enabled -> view.setLabelsEnabled(enabled) }
+      Prop<Boolean>("myLocationButtonEnabled") { view, enabled -> view.setMyLocationButtonEnabled(enabled) }
+      Prop<Int>("cameraEventThrottleMs") { view, throttleMs -> view.setCameraEventThrottleMs(throttleMs) }
       
       Prop<Map<String, Any>?>("customMapStyle") { view, styleData ->
         styleData?.let { view.setCustomMapStyle(it) }

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

@@ -46,6 +46,13 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
   fun setShowsScale(show: Boolean) {
     aMap.uiSettings.isScaleControlsEnabled = show
   }
+
+  /**
+   * 设置是否显示定位按钮
+   */
+  fun setMyLocationButtonEnabled(enabled: Boolean) {
+    aMap.uiSettings.isMyLocationButtonEnabled = enabled
+  }
   
   // ==================== 手势控制 ====================
   
@@ -322,7 +329,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
   fun setShowsTraffic(show: Boolean) {
     aMap.isTrafficEnabled = show
   }
-  
+
   /**
    * 设置是否显示建筑物
    */
@@ -336,6 +343,13 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
   fun setShowsIndoorMap(show: Boolean) {
     aMap.showIndoorMap(show)
   }
+
+  /**
+   * 设置是否显示底图文字标注
+   */
+  fun setLabelsEnabled(enabled: Boolean) {
+    aMap.showMapText(enabled)
+  }
   
   /**
    * 设置地图类型

package/android/src/main/java/expo/modules/gaodemap/overlays/ClusterView.kt

@@ -2,7 +2,6 @@ package expo.modules.gaodemap.overlays
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.util.Log
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Canvas
@@ -64,7 +63,6 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
 
   }
   
-  private var rawPoints: List<Map<String, Any>> = emptyList()
   private var clusterItems: List<ClusterItem> = emptyList()
   private var clusters: List<Cluster> = emptyList()
   
@@ -91,6 +89,7 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
   private var currentIconDescriptor: BitmapDescriptor? = null
   private var customIconBitmap: Bitmap? = null
   private var pendingIconUri: String? = null
+  private var pendingRetryUpdate: Runnable? = null
   
   // 标记样式是否发生变化，用于强制更新图标
   private var styleChanged = false
@@ -117,7 +116,6 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
    * 设置聚合点
    */
   fun setPoints(points: List<Map<String, Any>>) {
-    rawPoints = points
     clusterItems = points.mapNotNull { pointData ->
       LatLngParser.parseLatLng(pointData)?.let { latLng ->
         ClusterItem(latLng, pointData)
@@ -141,7 +139,6 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
    * 设置最小聚合数量
    */
   fun setMinClusterSize(size: Int) {
-    Log.d("ClusterView", "setMinClusterSize: $size")
     minClusterSize = size
     updateClusters()
   }
@@ -227,8 +224,8 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
                     updateClusters()
                 }
             }
-        } catch (e: Exception) {
-            e.printStackTrace()
+        } catch (_: Exception) {
+            // 忽略异常，保留当前默认图标
         }
     }
   }
@@ -265,6 +262,8 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
     }
     currentMarkers.clear()
     bitmapCache.clear()
+    pendingRetryUpdate?.let { mainHandler.removeCallbacks(it) }
+    pendingRetryUpdate = null
   }
   
   /**
@@ -283,7 +282,12 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
     }
 
     calculationJob = scope.launch(Dispatchers.Default) {
-      if (clusterItems.isEmpty()) return@launch
+      if (clusterItems.isEmpty()) {
+        withContext(Dispatchers.Main) {
+          renderClusters(emptyList())
+        }
+        return@launch
+      }
       
       // 获取当前比例尺 (米/像素)
       val scalePerPixel = withContext(Dispatchers.Main) {
@@ -296,11 +300,7 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
       }
 
       if (scalePerPixel <= 0) {
-          // 比例尺无效，稍后重试
-          withContext(Dispatchers.Main) {
-              Log.w("ClusterView", "Invalid scalePerPixel: $scalePerPixel, retrying...")
-              mainHandler.postDelayed({ updateClusters() }, 500)
-          }
+          scheduleRetryUpdate()
           return@launch
       }
       
@@ -319,6 +319,18 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
     }
   }
 
+  private fun scheduleRetryUpdate(delayMs: Long = 500L) {
+    pendingRetryUpdate?.let { mainHandler.removeCallbacks(it) }
+    val retryTask = Runnable {
+      pendingRetryUpdate = null
+      if (aMap != null) {
+        updateClusters()
+      }
+    }
+    pendingRetryUpdate = retryTask
+    mainHandler.postDelayed(retryTask, delayMs)
+  }
+
   private fun buildClustersFromNative(radiusMeters: Double): List<Cluster>? {
     return try {
       val latitudes = DoubleArray(clusterItems.size)
@@ -396,7 +408,6 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
    * 使用 Diff 算法优化渲染，避免全量刷新导致的闪烁
    */
   private fun renderClusters(newClusters: List<Cluster>) {
-    Log.d("ClusterView", "renderClusters: count=${newClusters.size}, minClusterSize=$minClusterSize")
     val map = aMap ?: return
     clusters = newClusters