expo-gaode-map 1.1.4 → 1.1.6

package/ios/ExpoGaodeMapModule.swift

@@ -266,16 +266,12 @@ public class ExpoGaodeMapModule: Module {
             }
             
             self.permissionManager?.requestPermission { granted, status in
-                print("🔐 [PermissionManager] 权限回调: granted=\(granted), status=\(status)")
-                
                 // 无论结果如何,都延迟后再次检查最终状态
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                     let finalStatus = CLLocationManager.authorizationStatus()
                     let finalGranted = finalStatus == .authorizedAlways || finalStatus == .authorizedWhenInUse
                     let finalStatusString = self.getAuthorizationStatusString(finalStatus)
                     
-                    print("🔐 [PermissionManager] 最终状态: granted=\(finalGranted), status=\(finalStatusString)")
-                    
                     promise.resolve([
                         "granted": finalGranted,
                         "status": finalStatusString

package/ios/ExpoGaodeMapView.swift

@@ -82,6 +82,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
     private var isMapLoaded = false
     /// 是否正在处理 annotation 选择事件
     private var isHandlingAnnotationSelect = false
+    /// MarkerView 的隐藏容器（用于渲染 children）
+    private var markerContainer: UIView!
     
     // MARK: - 初始化
     
@@ -92,11 +94,23 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
         MAMapView.updatePrivacyAgree(.didAgree)
         MAMapView.updatePrivacyShow(.didShow, privacyInfo: .didContain)
         
+        // 创建 MAMapView
         mapView = MAMapView(frame: bounds)
+        
         mapView.delegate = self
         mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         
-        // 先不添加到视图,等设置完初始位置再添加
+        // 创建 MarkerView 隐藏容器
+        markerContainer = UIView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
+        markerContainer.isHidden = true
+        markerContainer.isUserInteractionEnabled = false
+        markerContainer.alpha = 0
+        
+        // 先添加隐藏容器（在最底层）
+        addSubview(markerContainer)
+        
+        // 再添加 mapView（在隐藏容器之上，确保地图可以接收触摸）
+        addSubview(mapView)
         
         cameraManager = CameraManager(mapView: mapView)
         uiManager = UIManager(mapView: mapView)
@@ -139,7 +153,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
      * 收集所有 MarkerView 子视图并设置地图
      */
     private func collectAndSetupMarkerViews() {
-        for subview in subviews {
+        // 从隐藏容器中收集 MarkerView
+        for subview in markerContainer.subviews {
             if let markerView = subview as? MarkerView {
                 markerView.setMap(mapView)
             }
@@ -152,11 +167,14 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
      */
     override func addSubview(_ view: UIView) {
         if let markerView = view as? MarkerView {
-            // 不添加到视图层级,只调用 setMap
+            // ✅ 关键修复：将 MarkerView 添加到隐藏容器中，而不是主视图
+            // 这样 MarkerView 完全不会影响地图的触摸事件
+            markerContainer.addSubview(markerView)
             markerView.setMap(mapView)
             return
         }
         
+        // 其他视图正常添加
         super.addSubview(view)
         
         if let circleView = view as? CircleView {
@@ -195,13 +213,9 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
     func applyProps() {
         uiManager.setMapType(mapType)
         
-        // 如果有初始位置且地图还未添加到视图,先设置位置再添加
-        if let position = initialCameraPosition, mapView.superview == nil {
+        // 如果有初始位置，设置相机位置
+        if let position = initialCameraPosition {
             cameraManager.setInitialCameraPosition(position)
-            addSubview(mapView)
-        } else if mapView.superview == nil {
-            // 没有初始位置,直接添加地图
-            addSubview(mapView)
         }
         
         uiManager.setShowsScale(showsScale)
@@ -350,8 +364,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
      * 析构函数 - 清理资源
      */
     deinit {
+        // 先设置 delegate 为 nil，停止接收回调
         mapView?.delegate = nil
-        overlayManager?.clear()
     }
 }
 
@@ -415,20 +429,14 @@ extension ExpoGaodeMapView {
      */
     private func checkCirclePress(at coordinate: CLLocationCoordinate2D) -> Bool {
         let circleViews = subviews.compactMap { $0 as? CircleView }
-        print("🔍 检查圆形点击 - 找到 \(circleViews.count) 个 CircleView")
         
         for circleView in circleViews {
-            guard let circle = circleView.circle else {
-                print("⚠️ CircleView 没有 circle 对象")
-                continue
-            }
+            guard let circle = circleView.circle else { continue }
             
             let circleCenter = circle.coordinate
             let distance = calculateDistance(from: coordinate, to: circleCenter)
-            print("📍 圆心: (\(circleCenter.latitude), \(circleCenter.longitude)), 半径: \(circle.radius)m, 距离: \(distance)m")
             
             if distance <= circle.radius {
-                print("✅ 点击在圆形内，触发 onPress")
                 circleView.onPress([
                     "latitude": coordinate.latitude,
                     "longitude": coordinate.longitude
@@ -436,7 +444,6 @@ extension ExpoGaodeMapView {
                 return true
             }
         }
-        print("❌ 点击不在任何圆形内")
         return false
     }
     
@@ -585,6 +592,15 @@ extension ExpoGaodeMapView {
         }
         
         if annotation.isKind(of: MAPointAnnotation.self) {
+            // 首先检查是否是声明式 MarkerView 的 annotation
+            // 从隐藏容器中查找 MarkerView
+            for subview in markerContainer.subviews {
+                if let markerView = subview as? MarkerView, markerView.annotation === annotation {
+                    return markerView.getAnnotationView(for: mapView, annotation: annotation)
+                }
+            }
+            
+            // 如果不是声明式的，检查是否是命令式 API 的 Marker
             guard let props = overlayManager.getMarkerProps(for: annotation) else {
                 return nil
             }

package/ios/managers/OverlayManager.swift

@@ -320,20 +320,16 @@ class OverlayManager {
             
             // 设置纹理或颜色
             if let textureUrl = style?["texture"] as? String, !textureUrl.isEmpty {
-                print("🔷 OverlayManager: 加载纹理 \(textureUrl)")
                 loadPolylineTexture(url: textureUrl, renderer: renderer)
             } else {
                 if let color = style?["color"] {
                     let parsedColor = ColorParser.parseColor(color)
                     renderer.strokeColor = parsedColor ?? .red
-                    print("🔷 OverlayManager: color=\(color) -> \(String(describing: parsedColor))")
                 } else if let strokeColor = style?["strokeColor"] {
                     let parsedColor = ColorParser.parseColor(strokeColor)
                     renderer.strokeColor = parsedColor ?? .red
-                    print("🔷 OverlayManager: strokeColor=\(strokeColor) -> \(String(describing: parsedColor))")
                 } else {
                     renderer.strokeColor = .red
-                    print("🔷 OverlayManager: 使用默认红色")
                 }
             }
             
@@ -343,8 +339,6 @@ class OverlayManager {
                 return nil
             }
             
-            print("🔶 OverlayManager.getRenderer(Polygon): style=\(String(describing: style))")
-            
             // 设置填充颜色
             if let fillColor = style?["fillColor"] {
                 let parsedColor = ColorParser.parseColor(fillColor)

package/ios/overlays/CircleView.swift

@@ -119,7 +119,6 @@ class CircleView: ExpoView {
      * @param color 颜色值
      */
     func setFillColor(_ color: Any?) {
-        print("🔵 CircleView.setFillColor: \(String(describing: color))")
         fillColor = color
         renderer = nil
         updateCircle()
@@ -130,7 +129,6 @@ class CircleView: ExpoView {
      * @param color 颜色值
      */
     func setStrokeColor(_ color: Any?) {
-        print("🔵 CircleView.setStrokeColor: \(String(describing: color))")
         strokeColor = color
         renderer = nil
         updateCircle()
@@ -141,7 +139,6 @@ class CircleView: ExpoView {
      * @param width 宽度值
      */
     func setStrokeWidth(_ width: Float) {
-        print("🔵 CircleView.setStrokeWidth: \(width)")
         strokeWidth = width
         renderer = nil
         updateCircle()

package/ios/overlays/ClusterViewModule.swift

@@ -5,8 +5,6 @@ public class ClusterViewModule: Module {
         Name("ClusterView")
         
         View(ClusterView.self) {
-            Events("onPress", "onClusterPress")
-            
             Prop("points") { (view: ClusterView, points: [[String: Any]]) in
                 view.setPoints(points)
             }

package/ios/overlays/MarkerView.swift

@@ -48,19 +48,43 @@ class MarkerView: ExpoView {
     var pinColor: String = "red"
     /// 是否显示气泡
     var canShowCallout: Bool = true
-    /// 地图视图弱引用
-    private var mapView: MAMapView?
+    /// 地图视图弱引用（避免循环引用）
+    private weak var mapView: MAMapView?
     /// 标记点对象
     var annotation: MAPointAnnotation?
+    /// 标记是否正在被移除（防止重复移除）
+    private var isRemoving: Bool = false
     /// 标记点视图
     private var annotationView: MAAnnotationView?
     /// 待处理的位置（在 setMap 之前设置）
     private var pendingPosition: [String: Double]?
+    /// 延迟添加任务
+    private var pendingAddTask: DispatchWorkItem?
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
-        // 不可交互,通过父视图定位到屏幕外
+        // 完全禁用交互，让触摸事件穿透
         isUserInteractionEnabled = false
+        // 关键：让所有子视图也不接收触摸事件
+        isMultipleTouchEnabled = false
+        isExclusiveTouch = false
+    }
+    
+    /**
+     * 重写 hitTest，让触摸事件完全穿透此视图
+     * 这是解决旧架构下 children 阻挡地图触摸的关键
+     */
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        // 始终返回 nil，让触摸事件穿透到地图
+        return nil
+    }
+    
+    /**
+     * 重写 point(inside:with:)，确保此视图不响应任何触摸
+     */
+    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        // 始终返回 false，表示点击不在此视图内
+        return false
     }
     
     /**
@@ -89,9 +113,14 @@ class MarkerView: ExpoView {
             return
         }
         
-        // 移除旧的标记
+        // 取消之前的延迟任务
+        pendingAddTask?.cancel()
+        
+        // 移除旧的标记（在主线程执行）
         if let oldAnnotation = annotation {
-            mapView.removeAnnotation(oldAnnotation)
+            DispatchQueue.main.async {
+                mapView.removeAnnotation(oldAnnotation)
+            }
         }
         
         // 创建新的标记
@@ -100,51 +129,59 @@ class MarkerView: ExpoView {
         annotation.title = title
         annotation.subtitle = markerDescription
         
-        mapView.addAnnotation(annotation)
         self.annotation = annotation
         
-        // 延迟处理子视图,等待 React Native 添加完成
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
-            guard let self = self else { return }
-            self.updateMarkerImage()
-        }
-        
-        // 再次延迟更新，确保内容完全渲染
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
-            guard let self = self else { return }
-            self.updateMarkerImage()
+        // 延迟添加到地图，等待 React Native 渲染 children
+        let task = DispatchWorkItem { [weak self] in
+            guard let self = self, !self.isRemoving else {
+                print("⚠️ [MarkerView] 延迟任务取消，isRemoving: \(self?.isRemoving ?? true)")
+                return
+            }
+            print("✅ [MarkerView] Annotation 延迟添加，当前 subviews: \(self.subviews.count)")
+            mapView.addAnnotation(annotation)
         }
+        pendingAddTask = task
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1, execute: task)
     }
     
     /**
-     * 更新 marker 图标
+     * 获取 annotation 视图（由 ExpoGaodeMapView 调用）
      */
-    private func updateMarkerImage() {
-        guard let mapView = mapView, let annotation = annotation else {
-            return
-        }
-        guard let view = mapView.view(for: annotation) else {
-            return
+    func getAnnotationView(for mapView: MAMapView, annotation: MAAnnotation) -> MAAnnotationView? {
+        print("🎨 [MarkerView] getAnnotationView 被调用")
+        print("🎨 [MarkerView] subviews.count: \(self.subviews.count)")
+        
+        let reuseId = "custom_marker_\(ObjectIdentifier(self).hashValue)"
+        var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId)
+        
+        if annotationView == nil {
+            annotationView = MAAnnotationView(annotation: annotation, reuseIdentifier: reuseId)
+            annotationView?.canShowCallout = canShowCallout
+            annotationView?.isDraggable = draggable
         }
         
-        self.annotationView = view
+        annotationView?.annotation = annotation
+        self.annotationView = annotationView
         
+        // 设置图标
         if self.subviews.count > 0 {
-            // 有自定义内容，显示自定义图片
+            print("🎨 [MarkerView] 尝试创建自定义图片...")
             if let image = self.createImageFromSubviews() {
-                view.image = image
-                // 设置 anchor 为底部中心
-                view.centerOffset = CGPoint(x: 0, y: -image.size.height / 2)
+                print("✅ [MarkerView] 自定义图片创建成功, size: \(image.size)")
+                annotationView?.image = image
+                annotationView?.centerOffset = CGPoint(x: 0, y: -image.size.height / 2)
             } else {
-                // 自定义图片创建失败，使用默认图标
-                view.image = self.createDefaultMarkerImage()
-                view.centerOffset = CGPoint(x: 0, y: -18)
+                print("❌ [MarkerView] 自定义图片创建失败，使用默认图标")
+                annotationView?.image = self.createDefaultMarkerImage()
+                annotationView?.centerOffset = CGPoint(x: 0, y: -18)
             }
         } else {
-            // 没有自定义内容，使用默认图标
-            view.image = self.createDefaultMarkerImage()
-            view.centerOffset = CGPoint(x: 0, y: -18)
+            print("📍 [MarkerView] 没有子视图，使用默认图标")
+            annotationView?.image = self.createDefaultMarkerImage()
+            annotationView?.centerOffset = CGPoint(x: 0, y: -18)
         }
+        
+        return annotationView
     }
     
     /**
@@ -270,22 +307,75 @@ class MarkerView: ExpoView {
         return UIGraphicsGetImageFromCurrentImageContext()
     }
     
+    /**
+     * 当视图即将从父视图移除时调用
+     */
+    override func willMove(toSuperview newSuperview: UIView?) {
+        super.willMove(toSuperview: newSuperview)
+        
+        // 如果 newSuperview 为 nil，说明视图正在被移除
+        if newSuperview == nil {
+            removeAnnotationFromMap()
+        }
+    }
+    
+    /**
+     * 从地图移除标记点
+     */
+    private func removeAnnotationFromMap() {
+        guard !isRemoving else { return }
+        isRemoving = true
+        
+        print("🗑️ [MarkerView] removeAnnotationFromMap 被调用")
+        
+        // 取消任何待处理的延迟任务
+        pendingAddTask?.cancel()
+        pendingAddTask = nil
+        
+        // 立即保存引用并清空属性，避免在异步块中访问 self
+        guard let mapView = mapView, let annotation = annotation else {
+            print("⚠️ [MarkerView] 没有 annotation 需要移除")
+            return
+        }
+        self.annotation = nil
+        self.annotationView = nil
+        
+        // 同步移除，避免对象在异步块执行时已被释放
+        if Thread.isMainThread {
+            mapView.removeAnnotation(annotation)
+            print("✅ [MarkerView] Annotation 已从地图移除（主线程）")
+        } else {
+            DispatchQueue.main.sync {
+                mapView.removeAnnotation(annotation)
+                print("✅ [MarkerView] Annotation 已从地图移除（同步到主线程）")
+            }
+        }
+    }
+    
     override func willRemoveSubview(_ subview: UIView) {
         super.willRemoveSubview(subview)
         
-        // 子视图即将被移除，延迟检查并更新图标
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) { [weak self] in
-            guard let self = self else { return }
-            
-            if self.subviews.isEmpty {
-                // 所有子视图已移除，恢复默认图标
-                if let annotationView = self.annotationView {
-                    annotationView.image = self.createDefaultMarkerImage()
-                    annotationView.centerOffset = CGPoint(x: 0, y: -18)
+        // 如果正在移除，不要执行任何操作
+        guard !isRemoving else {
+            print("⚠️ [MarkerView] willRemoveSubview 被调用但正在移除，忽略")
+            return
+        }
+        
+        print("🎨 [MarkerView] willRemoveSubview 被调用，剩余 subviews.count: \(self.subviews.count - 1)")
+        
+        // 子视图移除后，需要刷新 annotation 视图
+        if self.subviews.count <= 1 {
+            // 所有子视图已移除，刷新以恢复默认图标
+            if let mapView = mapView, let annotation = annotation {
+                DispatchQueue.main.async { [weak self] in
+                    guard let self = self, !self.isRemoving else {
+                        print("⚠️ [MarkerView] 异步刷新时已被移除，取消操作")
+                        return
+                    }
+                    mapView.removeAnnotation(annotation)
+                    mapView.addAnnotation(annotation)
+                    print("✅ [MarkerView] Annotation 已刷新为默认图标")
                 }
-            } else {
-                // 还有子视图，更新图标
-                self.updateMarkerImage()
             }
         }
     }
@@ -293,14 +383,26 @@ class MarkerView: ExpoView {
     override func didAddSubview(_ subview: UIView) {
         super.didAddSubview(subview)
         
-        // 当添加子视图时,延迟更新标记图标
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
-            self?.updateMarkerImage()
+        // 如果正在移除，不要执行任何操作
+        guard !isRemoving else {
+            print("⚠️ [MarkerView] didAddSubview 被调用但正在移除，忽略")
+            return
         }
         
-        // 再次延迟更新，确保内容完全渲染
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
-            self?.updateMarkerImage()
+        print("🎨 [MarkerView] didAddSubview 被调用，subviews.count: \(self.subviews.count)")
+        
+        // 子视图添加后，需要刷新 annotation 视图
+        // 通过移除并重新添加 annotation 来触发 getAnnotationView 调用
+        if let mapView = mapView, let annotation = annotation {
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self, !self.isRemoving else {
+                    print("⚠️ [MarkerView] 异步刷新时已被移除，取消操作")
+                    return
+                }
+                mapView.removeAnnotation(annotation)
+                mapView.addAnnotation(annotation)
+                print("✅ [MarkerView] Annotation 已刷新")
+            }
         }
     }
     
@@ -415,11 +517,11 @@ class MarkerView: ExpoView {
     }
     
     /**
-     * 析构时移除标记点
+     * 析构函数 - 不执行任何清理
+     * 清理工作已在 willMove(toSuperview:) 中完成
      */
     deinit {
-        if let mapView = mapView, let annotation = annotation {
-            mapView.removeAnnotation(annotation)
-        }
+        // 不执行任何操作，避免访问已释放的对象
+        // 所有清理都应该在 willMove(toSuperview:) 中完成
     }
 }

package/ios/overlays/MultiPointViewModule.swift

@@ -5,8 +5,6 @@ public class MultiPointViewModule: Module {
         Name("MultiPointView")
         
         View(MultiPointView.self) {
-            Events("onPress")
-            
             Prop("points") { (view: MultiPointView, points: [[String: Any]]) in
                 view.setPoints(points)
             }

package/ios/overlays/PolygonView.swift

@@ -45,29 +45,19 @@ class PolygonView: ExpoView {
      * 更新多边形覆盖物
      */
     private func updatePolygon() {
-        guard let mapView = mapView else {
-            print("❌ PolygonView.updatePolygon: mapView 为空")
-            return
-        }
+        guard let mapView = mapView else { return }
         if let old = polygon { mapView.remove(old) }
         
         var coords = points.compactMap { point -> CLLocationCoordinate2D? in
             guard let lat = point["latitude"], let lng = point["longitude"] else { return nil }
             return CLLocationCoordinate2D(latitude: lat, longitude: lng)
         }
-        guard !coords.isEmpty else {
-            print("❌ PolygonView.updatePolygon: 点数组为空")
-            return
-        }
-        
-        print("🔶 PolygonView.updatePolygon: points=\(coords.count)个点")
-        print("🔶 PolygonView.updatePolygon: fillColor=\(String(describing: fillColor)), strokeColor=\(String(describing: strokeColor)), strokeWidth=\(strokeWidth)")
+        guard !coords.isEmpty else { return }
         
         polygon = MAPolygon(coordinates: &coords, count: UInt(coords.count))
         mapView.add(polygon!)
         
         renderer = nil
-        print("🔶 PolygonView.updatePolygon: renderer 已清空")
     }
     
     /**

package/ios/overlays/PolylineView.swift

@@ -48,29 +48,19 @@ class PolylineView: ExpoView {
      * 更新折线覆盖物
      */
     private func updatePolyline() {
-        guard let mapView = mapView else {
-            print("❌ PolylineView.updatePolyline: mapView 为空")
-            return
-        }
+        guard let mapView = mapView else { return }
         if let old = polyline { mapView.remove(old) }
         
         var coords = points.compactMap { point -> CLLocationCoordinate2D? in
             guard let lat = point["latitude"], let lng = point["longitude"] else { return nil }
             return CLLocationCoordinate2D(latitude: lat, longitude: lng)
         }
-        guard !coords.isEmpty else {
-            print("❌ PolylineView.updatePolyline: 点数组为空")
-            return
-        }
-        
-        print("🔷 PolylineView.updatePolyline: points=\(coords.count)个点")
-        print("🔷 PolylineView.updatePolyline: strokeColor=\(String(describing: strokeColor)), strokeWidth=\(strokeWidth), texture=\(String(describing: textureUrl))")
+        guard !coords.isEmpty else { return }
         
         polyline = MAPolyline(coordinates: &coords, count: UInt(coords.count))
         mapView.add(polyline!)
         
         renderer = nil
-        print("🔷 PolylineView.updatePolyline: renderer 已清空")
     }
     
     /**

package/ios/utils/PermissionManager.swift

@@ -20,7 +20,6 @@ class PermissionManager: NSObject, CLLocationManagerDelegate {
      * @param callback 权限结果回调 (granted, status)
      */
     func requestPermission(callback: @escaping (Bool, String) -> Void) {
-        print("🔐 [PermissionManager] requestPermission 被调用")
         self.permissionCallback = callback
         
         // 确保在主线程操作

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "一个功能完整的高德地图 React Native 组件库，基于 Expo Modules 开发，提供地图显示、定位、覆盖物等功能。",
   "main": "build/index.js",
   "types": "build/index.d.ts",