expo-gaode-map 1.1.5 → 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,41 +82,35 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
     private var isMapLoaded = false
     /// 是否正在处理 annotation 选择事件
     private var isHandlingAnnotationSelect = false
+    /// MarkerView 的隐藏容器（用于渲染 children）
+    private var markerContainer: UIView!
     
     // MARK: - 初始化
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
         
-        print("🗺️ [MapView Init] 开始初始化地图视图")
-        print("🗺️ [MapView Init] bounds: \(bounds)")
-        
         // 确保隐私合规已设置
         MAMapView.updatePrivacyAgree(.didAgree)
         MAMapView.updatePrivacyShow(.didShow, privacyInfo: .didContain)
-        print("🗺️ [MapView Init] 隐私合规设置完成")
         
-        // 创建 MAMapView（注意：如果 API Key 未设置，可能会在后续操作时报错）
+        // 创建 MAMapView
         mapView = MAMapView(frame: bounds)
         
-        // 检查是否创建成功
-        if mapView == nil {
-            print("❌ [MapView Init] MAMapView 创建失败！请检查：")
-            print("❌ [MapView Init] 1. iOS API Key 是否已正确配置")
-            print("❌ [MapView Init] 2. 是否调用了 initSDK({ iosKey: 'your_key' })")
-            print("❌ [MapView Init] 3. API Key 是否有效")
-        } else {
-            print("🗺️ [MapView Init] ✅ MAMapView 创建成功, frame: \(mapView.frame)")
-        }
-        
         mapView.delegate = self
         mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         
-        // 立即添加 mapView 到视图层级，确保地图可见
+        // 创建 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)
-        print("🗺️ [MapView Init] ✅ mapView 已添加到视图层级")
-        print("🗺️ [MapView Init] mapView.superview: \(mapView.superview != nil ? "存在" : "nil")")
-        print("🗺️ [MapView Init] subviews.count: \(subviews.count)")
         
         cameraManager = CameraManager(mapView: mapView)
         uiManager = UIManager(mapView: mapView)
@@ -145,17 +139,11 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
         }
         
         setupDefaultConfig()
-        print("🗺️ [MapView Init] 初始化完成")
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        print("🗺️ [MapView Layout] layoutSubviews 被调用")
-        print("🗺️ [MapView Layout] 旧 frame: \(mapView.frame), 新 bounds: \(bounds)")
         mapView.frame = bounds
-        print("🗺️ [MapView Layout] mapView frame 已更新: \(mapView.frame)")
-        print("🗺️ [MapView Layout] mapView.superview: \(mapView.superview != nil ? "存在" : "nil")")
-        print("🗺️ [MapView Layout] subviews.count: \(subviews.count)")
         
         // 收集并设置 MarkerView
         collectAndSetupMarkerViews()
@@ -165,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)
             }
@@ -177,16 +166,17 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
      * 将地图实例传递给覆盖物子视图
      */
     override func addSubview(_ view: UIView) {
-        super.addSubview(view)
-        
         if let markerView = view as? MarkerView {
-            // MarkerView 需要添加到视图层级以便其 children 可以渲染
-            // 但将其移到屏幕外，使其不可见
-            markerView.frame = CGRect(x: -10000, y: -10000, width: 1, height: 1)
+            // ✅ 关键修复：将 MarkerView 添加到隐藏容器中，而不是主视图
+            // 这样 MarkerView 完全不会影响地图的触摸事件
+            markerContainer.addSubview(markerView)
             markerView.setMap(mapView)
             return
         }
         
+        // 其他视图正常添加
+        super.addSubview(view)
+        
         if let circleView = view as? CircleView {
             circleView.setMap(mapView)
         } else if let polylineView = view as? PolylineView {
@@ -221,16 +211,10 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
      * 在 Props 更新时调用
      */
     func applyProps() {
-        print("🗺️ [MapView Props] applyProps 被调用")
-        print("🗺️ [MapView Props] mapView.superview: \(mapView.superview != nil ? "存在" : "nil")")
-        print("🗺️ [MapView Props] mapView.frame: \(mapView.frame)")
-        print("🗺️ [MapView Props] initialCameraPosition: \(initialCameraPosition != nil ? "存在" : "nil")")
-        
         uiManager.setMapType(mapType)
         
         // 如果有初始位置，设置相机位置
         if let position = initialCameraPosition {
-            print("🗺️ [MapView Props] 设置初始相机位置: \(position)")
             cameraManager.setInitialCameraPosition(position)
         }
         
@@ -247,10 +231,6 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
         
         // 收集并设置所有 MarkerView
         collectAndSetupMarkerViews()
-        
-        print("🗺️ [MapView Props] Props 应用完成")
-        print("🗺️ [MapView Props] 最终 mapView.superview: \(mapView.superview != nil ? "存在" : "nil")")
-        print("🗺️ [MapView Props] 最终 subviews.count: \(subviews.count)")
     }
     
     // MARK: - 缩放控制
@@ -384,16 +364,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
      * 析构函数 - 清理资源
      */
     deinit {
-        print("🗺️ [MapView] deinit 开始清理")
-        
         // 先设置 delegate 为 nil，停止接收回调
         mapView?.delegate = nil
-        
-        // 不调用 overlayManager.clear()
-        // 因为声明式的 Marker/Circle 等会在自己的 willMove(toSuperview:) 中清理
-        // 调用 clear() 可能导致重复移除和崩溃
-        
-        print("🗺️ [MapView] deinit 完成")
     }
 }
 
@@ -406,9 +378,6 @@ extension ExpoGaodeMapView {
     public func mapViewDidFinishLoadingMap(_ mapView: MAMapView) {
         guard !isMapLoaded else { return }
         isMapLoaded = true
-        print("🗺️ [MapView Delegate] ✅ 地图加载完成")
-        print("🗺️ [MapView Delegate] mapView.frame: \(mapView.frame)")
-        print("🗺️ [MapView Delegate] mapView.superview: \(mapView.superview != nil ? "存在" : "nil")")
         onLoad(["loaded": true])
     }
     
@@ -460,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
@@ -481,7 +444,6 @@ extension ExpoGaodeMapView {
                 return true
             }
         }
-        print("❌ 点击不在任何圆形内")
         return false
     }
     
@@ -631,16 +593,15 @@ extension ExpoGaodeMapView {
         
         if annotation.isKind(of: MAPointAnnotation.self) {
             // 首先检查是否是声明式 MarkerView 的 annotation
-            for subview in subviews {
+            // 从隐藏容器中查找 MarkerView
+            for subview in markerContainer.subviews {
                 if let markerView = subview as? MarkerView, markerView.annotation === annotation {
-                    print("🎯 [MapView Delegate] 找到声明式 MarkerView，调用其 getAnnotationView")
                     return markerView.getAnnotationView(for: mapView, annotation: annotation)
                 }
             }
             
             // 如果不是声明式的，检查是否是命令式 API 的 Marker
             guard let props = overlayManager.getMarkerProps(for: annotation) else {
-                print("⚠️ [MapView Delegate] 未找到对应的 Marker props")
                 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

@@ -63,8 +63,28 @@ class MarkerView: ExpoView {
     
     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
     }
     
     /**
@@ -90,12 +110,9 @@ class MarkerView: ExpoView {
         guard let mapView = mapView,
               let latitude = position["latitude"],
               let longitude = position["longitude"] else {
-            print("⚠️ [MarkerView] updateAnnotation: mapView 或坐标为 nil")
             return
         }
         
-        print("📍 [MarkerView] updateAnnotation: 位置 (\(latitude), \(longitude)), subviews: \(self.subviews.count)")
-        
         // 取消之前的延迟任务
         pendingAddTask?.cancel()
         

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.5",
+  "version": "1.1.6",
   "description": "一个功能完整的高德地图 React Native 组件库，基于 Expo Modules 开发，提供地图显示、定位、覆盖物等功能。",
   "main": "build/index.js",
   "types": "build/index.d.ts",