expo-gaode-map 1.2.2 → 1.2.3

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

@@ -2,10 +2,11 @@ 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
-import com.amap.api.maps.MapView
+import com.amap.api.maps.TextureMapView
 import com.amap.api.maps.MapsInitializer
 import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.AppContext
@@ -13,6 +14,7 @@ import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 import expo.modules.gaodemap.managers.CameraManager
 import expo.modules.gaodemap.managers.UIManager
+import expo.modules.gaodemap.modules.SDKInitializer
 import expo.modules.gaodemap.overlays.*
 import androidx.core.graphics.createBitmap
 import androidx.core.view.isVisible
@@ -31,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 防止在移除视图时触发布局异常
@@ -43,13 +49,76 @@ 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
+    internal var mapType: Int = 1
     /** 初始相机位置 */
     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
 
@@ -58,29 +127,20 @@ 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()
     private val onCameraMove by EventDispatcher()
     private val onCameraIdle by EventDispatcher()
 
-    // 事件节流控制
-    /** 相机移动事件节流间隔(毫秒) */
-    private val CAMERA_MOVE_THROTTLE_MS = 100L
-    /** 上次触发相机移动事件的时间戳 */
-    private var lastCameraMoveTime = 0L
-    /** 缓存的相机移动事件数据 */
+    // 缓存的相机移动事件数据
     private var pendingCameraMoveData: Map<String, Any>? = null
-    /** 节流定时器 Runnable */
-    private val throttleRunnable = Runnable {
-        pendingCameraMoveData?.let { data ->
-            onCameraMove(data)
-            pendingCameraMoveData = null
-        }
-    }
+    private var pendingCameraMoveDispatch: Runnable? = null
+    private var lastCameraMoveDispatchAt: Long = 0L
 
     // 高德地图视图
-    private lateinit var mapView: MapView
+    private lateinit var mapView: TextureMapView
     private lateinit var aMap: AMap
 
     // 管理器
@@ -93,22 +153,11 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
     init {
         try {
-            // 确保隐私合规已设置
-            MapsInitializer.updatePrivacyShow(context, true, true)
-            MapsInitializer.updatePrivacyAgree(context, true)
+            SDKInitializer.applyPrivacyState(context)
 
-            // 尝试从预加载池获取 MapView
-            val preloadedMapView = MapPreloadManager.getPreloadedMapView()
-            
-            if (preloadedMapView != null) {
-                mapView = preloadedMapView
-                android.util.Log.i("ExpoGaodeMapView", "🚀 使用预加载的 MapView 实例")
-            } else {
-                // 创建地图视图
-                mapView = MapView(context)
-                mapView.onCreate(null)
-                android.util.Log.i("ExpoGaodeMapView", "⚠️ 创建新的 MapView 实例 (未命中预加载池)")
-            }
+            // 创建地图视图 - 使用 TextureMapView 以支持截图
+            mapView = TextureMapView(context)
+            mapView.onCreate(null)
             
             aMap = mapView.map
 
@@ -137,7 +186,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
                 isMapLoaded = true
 
                 // 应用缓存的 Props
-                if (mapType != 0) {
+                if (mapType != 1) {
                     setMapType(mapType)
                 }
 
@@ -152,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) {
@@ -184,47 +236,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
                 // 相机移动中 - 应用节流优化
                 cameraPosition?.let {
-                    val currentTime = System.currentTimeMillis()
-                    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
-                            )
-                        )
-                    )
-                    
-                    // 节流逻辑：100ms 内只触发一次
-                    if (currentTime - lastCameraMoveTime >= CAMERA_MOVE_THROTTLE_MS) {
-                        // 超过节流时间，立即触发事件
-                        lastCameraMoveTime = currentTime
-                        onCameraMove(eventData)
-                        // 清除待处理的事件和定时器
-                        mainHandler.removeCallbacks(throttleRunnable)
-                        pendingCameraMoveData = null
-                    } else {
-                        // 在节流时间内，缓存事件数据，使用定时器延迟触发
-                        pendingCameraMoveData = eventData
-                        mainHandler.removeCallbacks(throttleRunnable)
-                        mainHandler.postDelayed(
-                            throttleRunnable,
-                            CAMERA_MOVE_THROTTLE_MS - (currentTime - lastCameraMoveTime)
-                        )
-                    }
+                    dispatchCameraMoveEvent(buildCameraEventData(it))
                 }
             }
 
@@ -234,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))
                 }
             }
         })
@@ -322,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,
@@ -425,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
+        }
+    }
     
     /**
      * 设置自定义地图样式
@@ -493,27 +514,34 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         
         aMap.getMapScreenShot(object : AMap.OnMapScreenShotListener {
             override fun onMapScreenShot(bitmap: android.graphics.Bitmap?) {
-                // 如果已经处理过，直接返回
+                // 这个回调通常在旧版 SDK 或部分机型触发
+                // 如果已经处理过（通过带 status 的回调），则忽略
                 if (isSettled.getAndSet(true)) return
                 
-                // 旧版本回调，为了兼容性也处理
-                bitmap?.let { handleSnapshot(it, promise) } ?: run {
-                     promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
+                if (bitmap == null) {
+                    promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
+                    return
                 }
+                handleSnapshot(bitmap, promise)
             }
 
             override fun onMapScreenShot(bitmap: android.graphics.Bitmap?, status: Int) {
                 // 如果已经处理过，直接返回
                 if (isSettled.getAndSet(true)) return
 
-                // status != 0 表示失败
-                if (status != 0) {
-                    promise.reject("SNAPSHOT_FAILED", "Failed to take snapshot, status code: $status", null)
+                if (bitmap == null) {
+                    promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
                     return
                 }
-                bitmap?.let { handleSnapshot(it, promise) } ?: run {
-                    promise.reject("SNAPSHOT_FAILED", "Bitmap is null", null)
+
+                // 根据高德文档：
+                // status != 0 地图渲染完成，截屏无网格
+                // status == 0 地图未渲染完成，截屏有网格
+                if (status == 0) {
+                    android.util.Log.w("ExpoGaodeMapView", "Warning: Map snapshot taken before rendering completed (grid may be visible)")
                 }
+
+                handleSnapshot(bitmap, promise)
             }
         })
     }
@@ -601,15 +629,14 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     @Suppress("unused")
     fun onDestroy() {
                try {
-                   // 清理节流定时器
-                   mainHandler.removeCallbacks(throttleRunnable)
-                   pendingCameraMoveData = null
-                   
                    // 清理 Handler 回调,防止内存泄露
                    mainHandler.removeCallbacksAndMessages(null)
+                   pendingCameraMoveData = null
+                   pendingCameraMoveDispatch = null
 
             // 清理所有地图监听器
             aMap.setOnMapClickListener(null)
+            aMap.setOnPOIClickListener(null)
             aMap.setOnMapLongClickListener(null)
             aMap.setOnMapLoadedListener(null)
             aMap.setOnCameraChangeListener(null)
@@ -629,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) {
@@ -644,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
@@ -654,7 +749,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
             return
         }
 
-        if (child is MapView) {
+        if (child is TextureMapView) {
             super.addView(child, index)
             return
         }
@@ -702,7 +797,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         try {
             val child = super.getChildAt(index)
 
-            if (child is MapView) {
+            if (child is TextureMapView) {
                 return
             }
 
@@ -756,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

@@ -11,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")
       
 
       
@@ -54,13 +54,16 @@ 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) }
       }
 
       OnViewDidUpdateProps { view: ExpoGaodeMapView ->
-        if (view.mapType != 0) {
+        if (view.mapType != 1) {
           view.setMapType(view.mapType)
         }
         

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,17 +343,24 @@ 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)
+  }
   
   /**
    * 设置地图类型
    */
   fun setMapType(type: Int) {
     aMap.mapType = when (type) {
-      1 -> AMap.MAP_TYPE_SATELLITE  // 卫星地图
-      2 -> AMap.MAP_TYPE_NIGHT      // 夜间地图
-      3 -> AMap.MAP_TYPE_NAVI       // 导航地图
-      4 -> AMap.MAP_TYPE_BUS        // 公交地图
-      else -> AMap.MAP_TYPE_NORMAL  // 标准地图
+      2 -> AMap.MAP_TYPE_SATELLITE  // 卫星地图
+      3 -> AMap.MAP_TYPE_NIGHT      // 夜间地图
+      4 -> AMap.MAP_TYPE_NAVI       // 导航地图
+      5 -> AMap.MAP_TYPE_BUS        // 公交地图
+      else -> AMap.MAP_TYPE_NORMAL  // 标准地图 (1, 以及兼容旧值 0)
     }
   }