expo-gaode-map 1.1.5 → 1.1.7

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

@@ -17,7 +17,7 @@ import expo.modules.gaodemap.overlays.*
 
 /**
  * 高德地图视图组件
- * 
+ *
  * 负责:
  * - 地图视图的创建和管理
  * - 地图事件的派发
@@ -26,643 +26,653 @@ import expo.modules.gaodemap.overlays.*
  */
 @Suppress("ViewConstructor")
 class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
-  
-  /**
-   * 拦截 React Native 的 ViewManager 操作
-   * 重写 requestLayout 防止在移除视图时触发布局异常
-   */
-  override fun requestLayout() {
-    try {
-      super.requestLayout()
-    } catch (e: Exception) {
-      Log.e(TAG, "requestLayout 异常被捕获", e)
-    }
-  }
-  
-  companion object {
-    private const val TAG = "ExpoGaodeMapView"
-  }
-  
-  // Props 存储
-  /** 地图类型 */
-  internal var mapType: Int = 0
-  /** 初始相机位置 */
-  internal var initialCameraPosition: Map<String, Any?>? = null
-  /** 是否跟随用户位置 */
-  internal var followUserLocation: Boolean = false
-  
-  /** 主线程 Handler */
-  private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())
-  
-  // 事件派发器
-  private val onMapPress by EventDispatcher()
-  private val onMapLongPress by EventDispatcher()
-  private val onLoad by EventDispatcher()
-  private val onLocation by EventDispatcher()
-  private val onMarkerPress by EventDispatcher()
-  private val onMarkerDragStart by EventDispatcher()
-  private val onMarkerDrag by EventDispatcher()
-  private val onMarkerDragEnd by EventDispatcher()
-  private val onCirclePress by EventDispatcher()
-  private val onPolygonPress by EventDispatcher()
-  private val onPolylinePress by EventDispatcher()
-  
-  // 高德地图视图
-  private lateinit var mapView: MapView
-  private lateinit var aMap: AMap
-  
-  // 管理器
-  private lateinit var cameraManager: CameraManager
-  private lateinit var uiManager: UIManager
-  private lateinit var overlayManager: OverlayManager
-  
-  // 缓存初始相机位置，等待地图加载完成后设置
-  private var pendingCameraPosition: Map<String, Any?>? = null
-  private var isMapLoaded = false
-  
-  init {
-    try {
-      // 确保隐私合规已设置
-      MapsInitializer.updatePrivacyShow(context, true, true)
-      MapsInitializer.updatePrivacyAgree(context, true)
-      
-      // 创建地图视图
-      mapView = MapView(context)
-      mapView.onCreate(null)
-      aMap = mapView.map
-      
-      // 初始化管理器
-      cameraManager = CameraManager(aMap)
-      uiManager = UIManager(aMap, context).apply {
-        // 设置定位变化回调
-        onLocationChanged = { latitude, longitude, accuracy ->
-          this@ExpoGaodeMapView.onLocation(mapOf(
-            "latitude" to latitude,
-            "longitude" to longitude,
-            "accuracy" to accuracy.toDouble(),
-            "timestamp" to System.currentTimeMillis()
-          ))
+
+    /**
+     * 拦截 React Native 的 ViewManager 操作
+     * 重写 requestLayout 防止在移除视图时触发布局异常
+     */
+    override fun requestLayout() {
+        try {
+            super.requestLayout()
+        } catch (e: Exception) {
+            Log.e(TAG, "requestLayout 异常被捕获", e)
+        }
+    }
+
+    companion object {
+        private const val TAG = "ExpoGaodeMapView"
+    }
+
+    // Props 存储
+    /** 地图类型 */
+    internal var mapType: Int = 0
+    /** 初始相机位置 */
+    internal var initialCameraPosition: Map<String, Any?>? = null
+    /** 是否跟随用户位置 */
+    internal var followUserLocation: Boolean = false
+
+    /** 主线程 Handler */
+    private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())
+
+    // 事件派发器
+    private val onMapPress by EventDispatcher()
+    private val onMapLongPress by EventDispatcher()
+    private val onLoad by EventDispatcher()
+    private val onLocation by EventDispatcher()
+    private val onMarkerPress by EventDispatcher()
+    private val onMarkerDragStart by EventDispatcher()
+    private val onMarkerDrag by EventDispatcher()
+    private val onMarkerDragEnd by EventDispatcher()
+    private val onCirclePress by EventDispatcher()
+    private val onPolygonPress by EventDispatcher()
+    private val onPolylinePress by EventDispatcher()
+
+    // 高德地图视图
+    private lateinit var mapView: MapView
+    private lateinit var aMap: AMap
+
+    // 管理器
+    private lateinit var cameraManager: CameraManager
+    private lateinit var uiManager: UIManager
+    private lateinit var overlayManager: OverlayManager
+
+    // 缓存初始相机位置，等待地图加载完成后设置
+    private var pendingCameraPosition: Map<String, Any?>? = null
+    private var isMapLoaded = false
+
+    init {
+        try {
+            // 确保隐私合规已设置
+            MapsInitializer.updatePrivacyShow(context, true, true)
+            MapsInitializer.updatePrivacyAgree(context, true)
+
+            // 创建地图视图
+            mapView = MapView(context)
+            mapView.onCreate(null)
+            aMap = mapView.map
+
+            // 初始化管理器
+            cameraManager = CameraManager(aMap)
+            uiManager = UIManager(aMap, context).apply {
+                // 设置定位变化回调
+                onLocationChanged = { latitude, longitude, accuracy ->
+                    this@ExpoGaodeMapView.onLocation(mapOf(
+                        "latitude" to latitude,
+                        "longitude" to longitude,
+                        "accuracy" to accuracy.toDouble(),
+                        "timestamp" to System.currentTimeMillis()
+                    ))
+                }
+            }
+            overlayManager = OverlayManager(aMap, context).apply {
+                onMarkerPress = { id, lat, lng ->
+                    this@ExpoGaodeMapView.onMarkerPress(mapOf(
+                        "markerId" to id,
+                        "latitude" to lat,
+                        "longitude" to lng
+                    ))
+                }
+                onMarkerDragStart = { id, lat, lng ->
+                    this@ExpoGaodeMapView.onMarkerDragStart(mapOf(
+                        "markerId" to id,
+                        "latitude" to lat,
+                        "longitude" to lng
+                    ))
+                }
+                onMarkerDrag = { id, lat, lng ->
+                    this@ExpoGaodeMapView.onMarkerDrag(mapOf(
+                        "markerId" to id,
+                        "latitude" to lat,
+                        "longitude" to lng
+                    ))
+                }
+                onMarkerDragEnd = { id, lat, lng ->
+                    this@ExpoGaodeMapView.onMarkerDragEnd(mapOf(
+                        "markerId" to id,
+                        "latitude" to lat,
+                        "longitude" to lng
+                    ))
+                }
+                onCirclePress = { id, lat, lng ->
+                    this@ExpoGaodeMapView.onCirclePress(mapOf(
+                        "circleId" to id,
+                        "latitude" to lat,
+                        "longitude" to lng
+                    ))
+                }
+                onPolygonPress = { id, lat, lng ->
+                    this@ExpoGaodeMapView.onPolygonPress(mapOf(
+                        "polygonId" to id,
+                        "latitude" to lat,
+                        "longitude" to lng
+                    ))
+                }
+                onPolylinePress = { id, lat, lng ->
+                    this@ExpoGaodeMapView.onPolylinePress(mapOf(
+                        "polylineId" to id,
+                        "latitude" to lat,
+                        "longitude" to lng
+                    ))
+                }
+            }
+
+            // 添加地图视图到布局
+            addView(mapView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
+
+            // 设置地图事件监听
+            setupMapListeners()
+
+            // 地图加载完成回调
+            aMap.setOnMapLoadedListener {
+                isMapLoaded = true
+
+                // 应用缓存的 Props
+                if (mapType != 0) {
+                    setMapType(mapType)
+                }
+
+                val positionToApply = initialCameraPosition ?: pendingCameraPosition
+                positionToApply?.let { position ->
+                    applyInitialCameraPosition(position)
+                    pendingCameraPosition = null
+                }
+
+                onLoad(mapOf("loaded" to true))
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "ExpoGaodeMapView 初始化失败", e)
+        }
+    }
+
+    /**
+     * 设置地图事件监听
+     */
+    private fun setupMapListeners() {
+        aMap.setOnMapClickListener { latLng ->
+            // 检查声明式 PolylineView
+            if (checkDeclarativePolylinePress(latLng)) {
+                return@setOnMapClickListener
+            }
+
+            // 检查声明式 PolygonView
+            if (checkDeclarativePolygonPress(latLng)) {
+                return@setOnMapClickListener
+            }
+
+            // 检查声明式 CircleView
+            if (checkDeclarativeCirclePress(latLng)) {
+                return@setOnMapClickListener
+            }
+
+            // 检查命令式圆形
+            val circleId = overlayManager.checkCirclePress(latLng)
+            if (circleId != null) {
+                overlayManager.onCirclePress?.invoke(circleId, latLng.latitude, latLng.longitude)
+                return@setOnMapClickListener
+            }
+
+            // 检查命令式多边形
+            val polygonId = overlayManager.checkPolygonPress(latLng)
+            if (polygonId != null) {
+                overlayManager.onPolygonPress?.invoke(polygonId, latLng.latitude, latLng.longitude)
+                return@setOnMapClickListener
+            }
+
+            // 检查命令式折线
+            val polylineId = overlayManager.checkPolylinePress(latLng)
+            if (polylineId != null) {
+                overlayManager.onPolylinePress?.invoke(polylineId, latLng.latitude, latLng.longitude)
+                return@setOnMapClickListener
+            }
+
+            // 如果都没点击,触发地图点击事件
+            onMapPress(mapOf(
+                "latitude" to latLng.latitude,
+                "longitude" to latLng.longitude
+            ))
+        }
+
+        aMap.setOnMapLongClickListener { latLng ->
+            onMapLongPress(mapOf(
+                "latitude" to latLng.latitude,
+                "longitude" to latLng.longitude
+            ))
+        }
+    }
+
+    // ==================== 地图类型和相机 ====================
+
+    /**
+     * 设置地图类型
+     * @param type 地图类型
+     */
+    fun setMapType(type: Int) {
+        mainHandler.post {
+            uiManager.setMapType(type)
+        }
+    }
+
+    /**
+     * 设置初始相机位置
+     * @param position 相机位置配置
+     */
+    fun setInitialCameraPosition(position: Map<String, Any?>) {
+        initialCameraPosition = position
+
+        // 如果地图已加载,立即应用;否则缓存等待地图加载完成
+        if (isMapLoaded) {
+            mainHandler.post {
+                applyInitialCameraPosition(position)
+            }
+        } else {
+            pendingCameraPosition = position
+        }
+    }
+
+    /**
+     * 实际应用相机位置
+     * @param position 相机位置配置
+     */
+    private fun applyInitialCameraPosition(position: Map<String, Any?>) {
+        cameraManager.setInitialCameraPosition(position)
+    }
+
+    // ==================== UI 控件和手势 ====================
+
+    /** 设置是否显示缩放控件 */
+    fun setShowsZoomControls(show: Boolean) = uiManager.setShowsZoomControls(show)
+    /** 设置是否显示指南针 */
+    fun setShowsCompass(show: Boolean) = uiManager.setShowsCompass(show)
+    /** 设置是否显示比例尺 */
+    fun setShowsScale(show: Boolean) = uiManager.setShowsScale(show)
+
+    /** 设置是否启用缩放手势 */
+    fun setZoomEnabled(enabled: Boolean) = uiManager.setZoomEnabled(enabled)
+    /** 设置是否启用滚动手势 */
+    fun setScrollEnabled(enabled: Boolean) = uiManager.setScrollEnabled(enabled)
+    /** 设置是否启用旋转手势 */
+    fun setRotateEnabled(enabled: Boolean) = uiManager.setRotateEnabled(enabled)
+    /** 设置是否启用倾斜手势 */
+    fun setTiltEnabled(enabled: Boolean) = uiManager.setTiltEnabled(enabled)
+
+    /** 设置最大缩放级别 */
+    fun setMaxZoom(maxZoom: Float) = cameraManager.setMaxZoomLevel(maxZoom)
+    /** 设置最小缩放级别 */
+    fun setMinZoom(minZoom: Float) = cameraManager.setMinZoomLevel(minZoom)
+
+    /** 设置是否显示用户位置 */
+    fun setShowsUserLocation(show: Boolean) {
+        mainHandler.post {
+            uiManager.setShowsUserLocation(show, followUserLocation)
+        }
+    }
+
+    /**
+     * 设置是否跟随用户位置
+     * @param follow 是否跟随
+     */
+    fun setFollowUserLocation(follow: Boolean) {
+        followUserLocation = follow
+        // 如果定位已开启，立即应用新设置
+        mainHandler.post {
+            if (aMap.isMyLocationEnabled) {
+                uiManager.setShowsUserLocation(true, follow)
+            }
+        }
+    }
+
+    /**
+     * 设置用户位置样式
+     * @param representation 样式配置
+     */
+    fun setUserLocationRepresentation(representation: Map<String, Any>) {
+        uiManager.setUserLocationRepresentation(representation)
+    }
+
+    /** 设置是否显示交通路况 */
+    fun setShowsTraffic(show: Boolean) = uiManager.setShowsTraffic(show)
+    /** 设置是否显示建筑物 */
+    fun setShowsBuildings(show: Boolean) = uiManager.setShowsBuildings(show)
+    /** 设置是否显示室内地图 */
+    fun setShowsIndoorMap(show: Boolean) = uiManager.setShowsIndoorMap(show)
+
+    // ==================== 相机控制方法 ====================
+
+    /**
+     * 移动相机
+     * @param position 目标位置
+     * @param duration 动画时长(毫秒)
+     */
+    fun moveCamera(position: Map<String, Any>, duration: Int) {
+        cameraManager.moveCamera(position, duration)
+    }
+
+    /**
+     * 获取屏幕坐标对应的地理坐标
+     * @param point 屏幕坐标
+     * @return 地理坐标
+     */
+    fun getLatLng(point: Map<String, Double>): Map<String, Double> {
+        return cameraManager.getLatLng(point)
+    }
+
+    /**
+     * 设置地图中心点
+     * @param center 中心点坐标
+     * @param animated 是否动画
+     */
+    fun setCenter(center: Map<String, Double>, animated: Boolean) {
+        cameraManager.setCenter(center, animated)
+    }
+
+    /**
+     * 设置地图缩放级别
+     * @param zoom 缩放级别
+     * @param animated 是否动画
+     */
+    fun setZoomLevel(zoom: Float, animated: Boolean) {
+        cameraManager.setZoomLevel(zoom, animated)
+    }
+
+    /**
+     * 获取当前相机位置
+     * @return 相机位置信息
+     */
+    fun getCameraPosition(): Map<String, Any> {
+        return cameraManager.getCameraPosition()
+    }
+
+    // ==================== 覆盖物管理 ====================
+
+    /** 添加圆形覆盖物 */
+    fun addCircle(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.addCircle(id, props)
+        }
+    }
+
+    /** 移除圆形覆盖物 */
+    fun removeCircle(id: String) {
+        mainHandler.post {
+            overlayManager.removeCircle(id)
+        }
+    }
+
+    /** 更新圆形覆盖物 */
+    fun updateCircle(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.updateCircle(id, props)
+        }
+    }
+
+    /** 添加标记点 */
+    fun addMarker(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.addMarker(id, props)
+        }
+    }
+
+    /** 移除标记点 */
+    fun removeMarker(id: String) {
+        mainHandler.post {
+            overlayManager.removeMarker(id)
         }
-      }
-      overlayManager = OverlayManager(aMap, context).apply {
-        onMarkerPress = { id, lat, lng ->
-          this@ExpoGaodeMapView.onMarkerPress(mapOf(
-            "markerId" to id,
-            "latitude" to lat,
-            "longitude" to lng
-          ))
+    }
+
+    /** 更新标记点 */
+    fun updateMarker(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.updateMarker(id, props)
         }
-        onMarkerDragStart = { id, lat, lng ->
-          this@ExpoGaodeMapView.onMarkerDragStart(mapOf(
-            "markerId" to id,
-            "latitude" to lat,
-            "longitude" to lng
-          ))
+    }
+
+    /** 添加折线 */
+    fun addPolyline(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.addPolyline(id, props)
+        }
+    }
+
+    /** 移除折线 */
+    fun removePolyline(id: String) {
+        mainHandler.post {
+            overlayManager.removePolyline(id)
+        }
+    }
+
+    /** 更新折线 */
+    fun updatePolyline(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.updatePolyline(id, props)
+        }
+    }
+
+    /** 添加多边形 */
+    fun addPolygon(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.addPolygon(id, props)
+        }
+    }
+
+    /** 移除多边形 */
+    fun removePolygon(id: String) {
+        mainHandler.post {
+            overlayManager.removePolygon(id)
+        }
+    }
+
+    /** 更新多边形 */
+    fun updatePolygon(id: String, props: Map<String, Any>) {
+        mainHandler.post {
+            overlayManager.updatePolygon(id, props)
+        }
+    }
+
+    // ==================== 生命周期方法 ====================
+
+    /** 恢复地图 */
+    @Suppress("unused")
+    fun onResume() {
+        mapView.onResume()
+    }
+
+    /** 暂停地图 */
+    @Suppress("unused")
+    fun onPause() {
+        mapView.onPause()
+    }
+
+    /** 销毁地图 */
+    @Suppress("unused")
+    fun onDestroy() {
+        // 清理 Handler 回调,防止内存泄露
+        mainHandler.removeCallbacksAndMessages(null)
+
+        // 清理地图监听器
+        aMap.setOnMapClickListener(null)
+        aMap.setOnMapLongClickListener(null)
+        aMap.setOnMapLoadedListener(null)
+
+        // 清理覆盖物
+        overlayManager.clear()
+
+        // 清理 MarkerView 列表
+        markerViews.clear()
+
+        // 销毁地图
+        mapView.onDestroy()
+    }
+
+    /** 保存实例状态 */
+    @Suppress("unused")
+    fun onSaveInstanceState(outState: android.os.Bundle) {
+        mapView.onSaveInstanceState(outState)
+    }
+
+    /**
+     * 存储 MarkerView 引用，因为它们不在视图层级中
+     */
+    private val markerViews = mutableListOf<MarkerView>()
+
+    /**
+     * 添加子视图时自动连接到地图
+     *
+     * 关键修复：MarkerView 不进入视图层级，但要确保 React Native 追踪正确
+     */
+    override fun addView(child: View?, index: Int) {
+        if (child is MarkerView) {
+            child.setMap(aMap)
+            markerViews.add(child)
+            return
         }
-        onMarkerDrag = { id, lat, lng ->
-          this@ExpoGaodeMapView.onMarkerDrag(mapOf(
-            "markerId" to id,
-            "latitude" to lat,
-            "longitude" to lng
-          ))
+
+        if (child is com.amap.api.maps.MapView) {
+            super.addView(child, index)
+            return
         }
-        onMarkerDragEnd = { id, lat, lng ->
-          this@ExpoGaodeMapView.onMarkerDragEnd(mapOf(
-            "markerId" to id,
-            "latitude" to lat,
-            "longitude" to lng
-          ))
+
+        super.addView(child, index)
+
+        child?.let {
+            when (it) {
+                is PolylineView -> it.setMap(aMap)
+                is PolygonView -> it.setMap(aMap)
+                is CircleView -> it.setMap(aMap)
+                is HeatMapView -> it.setMap(aMap)
+                is MultiPointView -> it.setMap(aMap)
+                is ClusterView -> it.setMap(aMap)
+            }
         }
-        onCirclePress = { id, lat, lng ->
-          this@ExpoGaodeMapView.onCirclePress(mapOf(
-            "circleId" to id,
-            "latitude" to lat,
-            "longitude" to lng
-          ))
+    }
+
+    /**
+     * 移除子视图
+     */
+    override fun removeView(child: View?) {
+        if (child is MarkerView) {
+            markerViews.remove(child)
+            child.removeMarker()
+            return
         }
-        onPolygonPress = { id, lat, lng ->
-          this@ExpoGaodeMapView.onPolygonPress(mapOf(
-            "polygonId" to id,
-            "latitude" to lat,
-            "longitude" to lng
-          ))
+
+        try {
+            super.removeView(child)
+        } catch (e: Exception) {
+            Log.e(TAG, "removeView 异常", e)
         }
-        onPolylinePress = { id, lat, lng ->
-          this@ExpoGaodeMapView.onPolylinePress(mapOf(
-            "polylineId" to id,
-            "latitude" to lat,
-            "longitude" to lng
-          ))
+    }
+
+    /**
+     * 按索引移除视图
+     *
+     * 终极修复：完全忽略所有无效的移除请求
+     */
+    override fun removeViewAt(index: Int) {
+        try {
+            val actualChildCount = super.getChildCount()
+
+            if (index >= actualChildCount) {
+                val markerIndex = index - actualChildCount
+                if (markerIndex >= 0 && markerIndex < markerViews.size) {
+                    val markerView = markerViews.removeAt(markerIndex)
+                    markerView.removeMarker()
+                    return
+                } else {
+                    return
+                }
+            }
+
+            if (actualChildCount == 0) {
+                return
+            }
+
+            val child = super.getChildAt(index)
+
+            if (child is com.amap.api.maps.MapView) {
+                Log.e(TAG, "阻止移除 MapView")
+                return
+            }
+
+            if (child is MarkerView) {
+                removeView(child)
+                return
+            }
+
+            super.removeViewAt(index)
+
+        } catch (e: IllegalArgumentException) {
+            // 忽略索引异常
+        } catch (e: IndexOutOfBoundsException) {
+            // 忽略越界异常
+        } catch (e: Exception) {
+            Log.e(TAG, "移除视图异常", e)
         }
-      }
-      
-      // 添加地图视图到布局
-      addView(mapView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
-      
-      // 设置地图事件监听
-      setupMapListeners()
-      
-      // 地图加载完成回调
-      aMap.setOnMapLoadedListener {
-        isMapLoaded = true
-        
-        // 应用缓存的 Props
-        if (mapType != 0) {
-          setMapType(mapType)
+    }
+
+    private fun checkDeclarativePolylinePress(latLng: LatLng): Boolean {
+        for (i in 0 until childCount) {
+            val child = getChildAt(i)
+            if (child is PolylineView) {
+                if (child.checkPress(latLng)) {
+                    return true
+                }
+            }
         }
-        
-        val positionToApply = initialCameraPosition ?: pendingCameraPosition
-        positionToApply?.let { position ->
-          applyInitialCameraPosition(position)
-          pendingCameraPosition = null
+        return false
+    }
+
+    private fun checkDeclarativePolygonPress(latLng: LatLng): Boolean {
+        for (i in 0 until childCount) {
+            val child = getChildAt(i)
+            if (child is PolygonView) {
+                if (child.checkPress(latLng)) {
+                    return true
+                }
+            }
         }
-        
-        onLoad(mapOf("loaded" to true))
-      }
-    } catch (e: Exception) {
-      Log.e(TAG, "ExpoGaodeMapView 初始化失败", e)
-    }
-  }
-  
-  /**
-   * 设置地图事件监听
-   */
-  private fun setupMapListeners() {
-    aMap.setOnMapClickListener { latLng ->
-      // 检查声明式 PolylineView
-      if (checkDeclarativePolylinePress(latLng)) {
-        return@setOnMapClickListener
-      }
-      
-      // 检查声明式 PolygonView
-      if (checkDeclarativePolygonPress(latLng)) {
-        return@setOnMapClickListener
-      }
-      
-      // 检查声明式 CircleView
-      if (checkDeclarativeCirclePress(latLng)) {
-        return@setOnMapClickListener
-      }
-      
-      // 检查命令式圆形
-      val circleId = overlayManager.checkCirclePress(latLng)
-      if (circleId != null) {
-        overlayManager.onCirclePress?.invoke(circleId, latLng.latitude, latLng.longitude)
-        return@setOnMapClickListener
-      }
-      
-      // 检查命令式多边形
-      val polygonId = overlayManager.checkPolygonPress(latLng)
-      if (polygonId != null) {
-        overlayManager.onPolygonPress?.invoke(polygonId, latLng.latitude, latLng.longitude)
-        return@setOnMapClickListener
-      }
-      
-      // 检查命令式折线
-      val polylineId = overlayManager.checkPolylinePress(latLng)
-      if (polylineId != null) {
-        overlayManager.onPolylinePress?.invoke(polylineId, latLng.latitude, latLng.longitude)
-        return@setOnMapClickListener
-      }
-      
-      // 如果都没点击,触发地图点击事件
-      onMapPress(mapOf(
-        "latitude" to latLng.latitude,
-        "longitude" to latLng.longitude
-      ))
-    }
-    
-    aMap.setOnMapLongClickListener { latLng ->
-      onMapLongPress(mapOf(
-        "latitude" to latLng.latitude,
-        "longitude" to latLng.longitude
-      ))
-    }
-  }
-  
-  // ==================== 地图类型和相机 ====================
-  
-  /**
-   * 设置地图类型
-   * @param type 地图类型
-   */
-  fun setMapType(type: Int) {
-    mainHandler.post {
-      uiManager.setMapType(type)
-    }
-  }
-  
-  /**
-   * 设置初始相机位置
-   * @param position 相机位置配置
-   */
-  fun setInitialCameraPosition(position: Map<String, Any?>) {
-    initialCameraPosition = position
-    
-    // 如果地图已加载,立即应用;否则缓存等待地图加载完成
-    if (isMapLoaded) {
-      mainHandler.post {
-        applyInitialCameraPosition(position)
-      }
-    } else {
-      pendingCameraPosition = position
-    }
-  }
-  
-  /**
-   * 实际应用相机位置
-   * @param position 相机位置配置
-   */
-  private fun applyInitialCameraPosition(position: Map<String, Any?>) {
-    cameraManager.setInitialCameraPosition(position)
-  }
-  
-  // ==================== UI 控件和手势 ====================
-  
-  /** 设置是否显示缩放控件 */
-  fun setShowsZoomControls(show: Boolean) = uiManager.setShowsZoomControls(show)
-  /** 设置是否显示指南针 */
-  fun setShowsCompass(show: Boolean) = uiManager.setShowsCompass(show)
-  /** 设置是否显示比例尺 */
-  fun setShowsScale(show: Boolean) = uiManager.setShowsScale(show)
-  
-  /** 设置是否启用缩放手势 */
-  fun setZoomEnabled(enabled: Boolean) = uiManager.setZoomEnabled(enabled)
-  /** 设置是否启用滚动手势 */
-  fun setScrollEnabled(enabled: Boolean) = uiManager.setScrollEnabled(enabled)
-  /** 设置是否启用旋转手势 */
-  fun setRotateEnabled(enabled: Boolean) = uiManager.setRotateEnabled(enabled)
-  /** 设置是否启用倾斜手势 */
-  fun setTiltEnabled(enabled: Boolean) = uiManager.setTiltEnabled(enabled)
-  
-  /** 设置最大缩放级别 */
-  fun setMaxZoom(maxZoom: Float) = cameraManager.setMaxZoomLevel(maxZoom)
-  /** 设置最小缩放级别 */
-  fun setMinZoom(minZoom: Float) = cameraManager.setMinZoomLevel(minZoom)
-  
-  /** 设置是否显示用户位置 */
-  fun setShowsUserLocation(show: Boolean) {
-    mainHandler.post {
-      uiManager.setShowsUserLocation(show, followUserLocation)
-    }
-  }
-  
-  /**
-   * 设置是否跟随用户位置
-   * @param follow 是否跟随
-   */
-  fun setFollowUserLocation(follow: Boolean) {
-    followUserLocation = follow
-    // 如果定位已开启，立即应用新设置
-    mainHandler.post {
-      if (aMap.isMyLocationEnabled) {
-        uiManager.setShowsUserLocation(true, follow)
-      }
-    }
-  }
-  
-  /**
-   * 设置用户位置样式
-   * @param representation 样式配置
-   */
-  fun setUserLocationRepresentation(representation: Map<String, Any>) {
-    uiManager.setUserLocationRepresentation(representation)
-  }
-  
-  /** 设置是否显示交通路况 */
-  fun setShowsTraffic(show: Boolean) = uiManager.setShowsTraffic(show)
-  /** 设置是否显示建筑物 */
-  fun setShowsBuildings(show: Boolean) = uiManager.setShowsBuildings(show)
-  /** 设置是否显示室内地图 */
-  fun setShowsIndoorMap(show: Boolean) = uiManager.setShowsIndoorMap(show)
-  
-  // ==================== 相机控制方法 ====================
-  
-  /**
-   * 移动相机
-   * @param position 目标位置
-   * @param duration 动画时长(毫秒)
-   */
-  fun moveCamera(position: Map<String, Any>, duration: Int) {
-    cameraManager.moveCamera(position, duration)
-  }
-  
-  /**
-   * 获取屏幕坐标对应的地理坐标
-   * @param point 屏幕坐标
-   * @return 地理坐标
-   */
-  fun getLatLng(point: Map<String, Double>): Map<String, Double> {
-    return cameraManager.getLatLng(point)
-  }
-  
-  /**
-   * 设置地图中心点
-   * @param center 中心点坐标
-   * @param animated 是否动画
-   */
-  fun setCenter(center: Map<String, Double>, animated: Boolean) {
-    cameraManager.setCenter(center, animated)
-  }
-  
-  /**
-   * 设置地图缩放级别
-   * @param zoom 缩放级别
-   * @param animated 是否动画
-   */
-  fun setZoomLevel(zoom: Float, animated: Boolean) {
-    cameraManager.setZoomLevel(zoom, animated)
-  }
-  
-  /**
-   * 获取当前相机位置
-   * @return 相机位置信息
-   */
-  fun getCameraPosition(): Map<String, Any> {
-    return cameraManager.getCameraPosition()
-  }
-  
-  // ==================== 覆盖物管理 ====================
-  
-  /** 添加圆形覆盖物 */
-  fun addCircle(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.addCircle(id, props)
-    }
-  }
-  
-  /** 移除圆形覆盖物 */
-  fun removeCircle(id: String) {
-    mainHandler.post {
-      overlayManager.removeCircle(id)
-    }
-  }
-  
-  /** 更新圆形覆盖物 */
-  fun updateCircle(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.updateCircle(id, props)
-    }
-  }
-  
-  /** 添加标记点 */
-  fun addMarker(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.addMarker(id, props)
-    }
-  }
-  
-  /** 移除标记点 */
-  fun removeMarker(id: String) {
-    mainHandler.post {
-      overlayManager.removeMarker(id)
-    }
-  }
-  
-  /** 更新标记点 */
-  fun updateMarker(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.updateMarker(id, props)
-    }
-  }
-  
-  /** 添加折线 */
-  fun addPolyline(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.addPolyline(id, props)
-    }
-  }
-  
-  /** 移除折线 */
-  fun removePolyline(id: String) {
-    mainHandler.post {
-      overlayManager.removePolyline(id)
-    }
-  }
-  
-  /** 更新折线 */
-  fun updatePolyline(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.updatePolyline(id, props)
-    }
-  }
-  
-  /** 添加多边形 */
-  fun addPolygon(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.addPolygon(id, props)
-    }
-  }
-  
-  /** 移除多边形 */
-  fun removePolygon(id: String) {
-    mainHandler.post {
-      overlayManager.removePolygon(id)
-    }
-  }
-  
-  /** 更新多边形 */
-  fun updatePolygon(id: String, props: Map<String, Any>) {
-    mainHandler.post {
-      overlayManager.updatePolygon(id, props)
-    }
-  }
-  
-  // ==================== 生命周期方法 ====================
-  
-  /** 恢复地图 */
-  @Suppress("unused")
-  fun onResume() {
-    mapView.onResume()
-  }
-  
-  /** 暂停地图 */
-  @Suppress("unused")
-  fun onPause() {
-    mapView.onPause()
-  }
-  
-  /** 销毁地图 */
-  @Suppress("unused")
-  fun onDestroy() {
-    // 清理 Handler 回调,防止内存泄露
-    mainHandler.removeCallbacksAndMessages(null)
-    
-    // 清理地图监听器
-    aMap.setOnMapClickListener(null)
-    aMap.setOnMapLongClickListener(null)
-    aMap.setOnMapLoadedListener(null)
-    
-    // 清理覆盖物
-    overlayManager.clear()
-    
-    // 清理 MarkerView 列表
-    markerViews.clear()
-    
-    // 销毁地图
-    mapView.onDestroy()
-  }
-  
-  /** 保存实例状态 */
-  @Suppress("unused")
-  fun onSaveInstanceState(outState: android.os.Bundle) {
-    mapView.onSaveInstanceState(outState)
-  }
-  
-  /**
-   * 存储 MarkerView 引用，因为它们不在视图层级中
-   */
-  private val markerViews = mutableListOf<MarkerView>()
-  
-  /**
-   * 添加子视图时自动连接到地图
-   *
-   * 关键修复：MarkerView 不进入视图层级，但要确保 React Native 追踪正确
-   */
-  override fun addView(child: View?, index: Int) {
-    if (child is MarkerView) {
-      // ✅ MarkerView 不加入视图层级
-      child.setMap(aMap)
-      markerViews.add(child)
-      Log.d(TAG, "✅ MarkerView 已添加到特殊列表（不在视图层级中），数量: ${markerViews.size}")
-      // ⚠️ 不调用 super.addView，所以 React Native 不会追踪它
-      return
-    }
-    
-    // ⚠️ 如果是 MapView 本身，必须添加
-    if (child is com.amap.api.maps.MapView) {
-      super.addView(child, index)
-      Log.d(TAG, "✅ MapView 已添加")
-      return
-    }
-    
-    super.addView(child, index)
-    
-    // 自动将地图实例传递给其他覆盖物子视图
-    child?.let {
-      when (it) {
-        is PolylineView -> it.setMap(aMap)
-        is PolygonView -> it.setMap(aMap)
-        is CircleView -> it.setMap(aMap)
-        is HeatMapView -> it.setMap(aMap)
-        is MultiPointView -> it.setMap(aMap)
-        is ClusterView -> it.setMap(aMap)
-      }
-    }
-  }
-  
-  /**
-   * 移除子视图
-   */
-  override fun removeView(child: View?) {
-    if (child is MarkerView) {
-      // 从 MarkerView 列表中移除并清理
-      markerViews.remove(child)
-      child.removeMarker()
-      Log.d(TAG, "✅ MarkerView 已清理，当前 markerViews 数量: ${markerViews.size}")
-      return
-    }
-    
-    try {
-      super.removeView(child)
-    } catch (e: Exception) {
-      Log.e(TAG, "removeView 异常", e)
-    }
-  }
-  
-  /**
-   * 按索引移除视图
-   *
-   * 终极修复：完全忽略所有无效的移除请求
-   */
-  override fun removeViewAt(index: Int) {
-    try {
-      val actualChildCount = super.getChildCount()
-      
-      Log.d(TAG, "removeViewAt 调用: index=$index, super.childCount=$actualChildCount")
-      
-      // ✅ 如果没有子视图，直接返回
-      if (actualChildCount == 0) {
-        Log.w(TAG, "⚠️ 无子视图，忽略: index=$index")
-        return
-      }
-      
-      // ✅ 索引越界，直接返回
-      if (index < 0 || index >= actualChildCount) {
-        Log.w(TAG, "⚠️ 索引越界，忽略: index=$index, childCount=$actualChildCount")
-        return
-      }
-      
-      // 检查要移除的视图类型
-      val child = super.getChildAt(index)
-      
-      // ❌ MapView 绝对不能移除
-      if (child is com.amap.api.maps.MapView) {
-        Log.e(TAG, "❌ 阻止移除 MapView！index=$index")
-        // 不移除，直接返回
-        return
-      }
-      
-      // MarkerView 特殊处理（虽然理论上不应该出现在这里）
-      if (child is MarkerView) {
-        Log.d(TAG, "⚠️ 发现 MarkerView 在视图层级中，使用 removeView")
-        removeView(child)
-        return
-      }
-      
-      // 正常移除其他视图
-      super.removeViewAt(index)
-      Log.d(TAG, "✅ 成功移除视图: index=$index")
-      
-    } catch (e: IllegalArgumentException) {
-      // 索引异常，静默忽略
-      Log.w(TAG, "⚠️ 索引异常，已忽略: ${e.message}")
-    } catch (e: IndexOutOfBoundsException) {
-      // 越界异常，静默忽略
-      Log.w(TAG, "⚠️ 越界异常，已忽略: ${e.message}")
-    } catch (e: Exception) {
-      // 其他所有异常，静默忽略
-      Log.e(TAG, "⚠️ 移除视图异常，已忽略", e)
-    }
-  }
-  
-  private fun checkDeclarativePolylinePress(latLng: LatLng): Boolean {
-    for (i in 0 until childCount) {
-      val child = getChildAt(i)
-      if (child is PolylineView) {
-        if (child.checkPress(latLng)) {
-          return true
+        return false
+    }
+
+    private fun checkDeclarativeCirclePress(latLng: LatLng): Boolean {
+        for (i in 0 until childCount) {
+            val child = getChildAt(i)
+            if (child is CircleView) {
+                if (child.checkPress(latLng)) {
+                    return true
+                }
+            }
         }
-      }
-    }
-    return false
-  }
-  
-  private fun checkDeclarativePolygonPress(latLng: LatLng): Boolean {
-    for (i in 0 until childCount) {
-      val child = getChildAt(i)
-      if (child is PolygonView) {
-        if (child.checkPress(latLng)) {
-          return true
+        return false
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+    }
+
+    /**
+     * 重写 getChildCount，返回 React Native 期望的子视图数量
+     * 包括实际视图层级中的子视图 + MarkerView 数量
+     */
+    override fun getChildCount(): Int {
+        return super.getChildCount() + markerViews.size
+    }
+
+    /**
+     * 重写 getChildAt，处理 MarkerView 的索引映射
+     * 当索引超出实际子视图数量时，返回对应的 MarkerView
+     */
+    override fun getChildAt(index: Int): View? {
+        val actualCount = super.getChildCount()
+
+        if (index < actualCount) {
+            return super.getChildAt(index)
         }
-      }
-    }
-    return false
-  }
-  
-  private fun checkDeclarativeCirclePress(latLng: LatLng): Boolean {
-    for (i in 0 until childCount) {
-      val child = getChildAt(i)
-      if (child is CircleView) {
-        if (child.checkPress(latLng)) {
-          return true
+
+        val markerIndex = index - actualCount
+        if (markerIndex >= 0 && markerIndex < markerViews.size) {
+            return markerViews[markerIndex]
         }
-      }
-    }
-    return false
-  }
-  
-  override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-    super.onLayout(changed, left, top, right, bottom)
-  }
+
+        return null
+    }
 }