expo-gaode-map 1.1.7 → 2.0.0-alpha.1

package/ios/ExpoGaodeMapViewModule.swift

@@ -9,7 +9,7 @@ public class ExpoGaodeMapViewModule: Module {
         Name("ExpoGaodeMapView")
         
         View(ExpoGaodeMapView.self) {
-            Events("onMapPress", "onMapLongPress", "onLoad", "onLocation", "onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd", "onCirclePress", "onPolygonPress", "onPolylinePress")
+            Events("onMapPress", "onMapLongPress", "onLoad", "onLocation")
             
             Prop("mapType") { (view: ExpoGaodeMapView, type: Int) in
                 view.mapType = type
@@ -102,54 +102,7 @@ public class ExpoGaodeMapViewModule: Module {
             AsyncFunction("getCameraPosition") { (view: ExpoGaodeMapView) -> [String: Any] in
                 return view.getCameraPosition()
             }
-            
-            AsyncFunction("addCircle") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.addCircle(id: id, props: props)
-            }
-            
-            AsyncFunction("removeCircle") { (view: ExpoGaodeMapView, id: String) in
-                view.removeCircle(id: id)
-            }
-            
-            AsyncFunction("updateCircle") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.updateCircle(id: id, props: props)
-            }
-            
-            AsyncFunction("addMarker") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.addMarker(id: id, props: props)
-            }
-            
-            AsyncFunction("removeMarker") { (view: ExpoGaodeMapView, id: String) in
-                view.removeMarker(id: id)
-            }
-            
-            AsyncFunction("updateMarker") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.updateMarker(id: id, props: props)
-            }
-            
-            AsyncFunction("addPolyline") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.addPolyline(id: id, props: props)
-            }
-            
-            AsyncFunction("removePolyline") { (view: ExpoGaodeMapView, id: String) in
-                view.removePolyline(id: id)
-            }
-            
-            AsyncFunction("updatePolyline") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.updatePolyline(id: id, props: props)
-            }
-            
-            AsyncFunction("addPolygon") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.addPolygon(id: id, props: props)
-            }
-            
-            AsyncFunction("removePolygon") { (view: ExpoGaodeMapView, id: String) in
-                view.removePolygon(id: id)
-            }
-            
-            AsyncFunction("updatePolygon") { (view: ExpoGaodeMapView, id: String, props: [String: Any]) in
-                view.updatePolygon(id: id, props: props)
-            }
+          
         }
     }
-}
+}

package/ios/managers/CameraManager.swift

@@ -49,11 +49,18 @@ class CameraManager {
         if let target = position["target"] as? [String: Double],
            let latitude = target["latitude"],
            let longitude = target["longitude"] {
+            // 🔑 坐标验证
+            guard latitude >= -90 && latitude <= 90,
+                  longitude >= -180 && longitude <= 180 else {
+                return
+            }
             status.centerCoordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
         }
         
         if let zoom = position["zoom"] as? Double {
-            status.zoomLevel = CGFloat(zoom)
+            // 🔑 缩放级别范围限制 (3-20)
+            let validZoom = max(3, min(20, zoom))
+            status.zoomLevel = CGFloat(validZoom)
         }
         
         if let bearing = position["bearing"] as? Double {
@@ -82,6 +89,11 @@ class CameraManager {
         if let target = position["target"] as? [String: Double],
            let latitude = target["latitude"],
            let longitude = target["longitude"] {
+            // 🔑 坐标验证
+            guard latitude >= -90 && latitude <= 90,
+                  longitude >= -180 && longitude <= 180 else {
+                return
+            }
             status.centerCoordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
         } else {
             status.centerCoordinate = mapView.centerCoordinate
@@ -120,6 +132,13 @@ class CameraManager {
         guard let mapView = mapView,
               let latitude = center["latitude"],
               let longitude = center["longitude"] else { return }
+        
+        // 🔑 坐标验证
+        guard latitude >= -90 && latitude <= 90,
+              longitude >= -180 && longitude <= 180 else {
+            return
+        }
+        
         mapView.setCenter(CLLocationCoordinate2D(latitude: latitude, longitude: longitude), animated: animated)
     }
     
@@ -129,7 +148,9 @@ class CameraManager {
      * @param animated 是否使用动画
      */
     func setZoomLevel(zoom: CGFloat, animated: Bool) {
-        mapView?.setZoomLevel(zoom, animated: animated)
+        // 🔑 缩放级别范围限制 (3-20)
+        let validZoom = max(3, min(20, zoom))
+        mapView?.setZoomLevel(validZoom, animated: animated)
     }
     
     // MARK: - 相机信息获取

package/ios/managers/UIManager.swift

@@ -126,11 +126,16 @@ class UIManager: NSObject, MAMapViewDelegate {
      */
     public func mapView(_ mapView: MAMapView, didUpdate userLocation: MAUserLocation, updatingLocation: Bool) {
         guard updatingLocation, let location = userLocation.location else { return }
-        onLocationChanged?(
-            location.coordinate.latitude,
-            location.coordinate.longitude,
-            location.horizontalAccuracy
-        )
+        
+        // 🔑 坐标验证
+        let latitude = location.coordinate.latitude
+        let longitude = location.coordinate.longitude
+        guard latitude >= -90 && latitude <= 90,
+              longitude >= -180 && longitude <= 180 else {
+            return
+        }
+        
+        onLocationChanged?(latitude, longitude, location.horizontalAccuracy)
     }
     
     /**

package/ios/modules/LocationManager.swift

@@ -165,7 +165,11 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
      */
     func destroy() {
         locationManager?.stopUpdatingLocation()
+        locationManager?.stopUpdatingHeading()
+        locationManager?.delegate = nil
         locationManager = nil
+        onLocationUpdate = nil
+        onHeadingUpdate = nil
     }
     
     /**
@@ -194,6 +198,12 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
      * @param reGeocode 逆地理信息
      */
     func amapLocationManager(_ manager: AMapLocationManager!, didUpdate location: CLLocation!, reGeocode: AMapLocationReGeocode!) {
+        // 🔑 坐标验证：防止无效坐标
+        guard location.coordinate.latitude >= -90 && location.coordinate.latitude <= 90,
+              location.coordinate.longitude >= -180 && location.coordinate.longitude <= 180 else {
+            return
+        }
+        
         var locationData: [String: Any] = [
             "latitude": location.coordinate.latitude,
             "longitude": location.coordinate.longitude,

package/ios/overlays/CircleView.swift

@@ -10,8 +10,8 @@ import MAMapKit
  * - 响应属性变化并更新渲染
  */
 class CircleView: ExpoView {
-    /// 事件派发器
-    let onPress = EventDispatcher()
+    /// 事件派发器 - 使用 onCirclePress 避免与 MarkerPress 冲突
+    let onCirclePress = EventDispatcher()
     
     /// 圆心坐标
     var circleCenter: [String: Double] = [:]
@@ -23,16 +23,47 @@ class CircleView: ExpoView {
     var strokeColor: Any?
     /// 边框宽度
     var strokeWidth: Float = 0
+    /// z-index 图层顺序
+    var zIndex: Double = 0
     
-    /// 地图视图弱引用
+    /// 地图视图引用
     private var mapView: MAMapView?
     /// 圆形覆盖物对象
     var circle: MACircle?
     /// 圆形渲染器
     private var renderer: MACircleRenderer?
+    /// 上次设置的地图引用（防止重复调用）
+    private weak var lastSetMapView: MAMapView?
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
+        
+        // 🔑 关键修复：CircleView 不应该拦截触摸事件
+        self.isUserInteractionEnabled = false
+    }
+    
+    /**
+     * 重写 hitTest，让触摸事件完全穿透此视图
+     * 这是解决覆盖物视图阻挡地图触摸的关键
+     */
+    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
+    }
+    
+    /**
+     * 检查地图是否已连接
+     */
+    func isMapConnected() -> Bool {
+        return mapView != nil
     }
     
     /**
@@ -40,6 +71,12 @@ class CircleView: ExpoView {
      * @param map 地图视图
      */
     func setMap(_ map: MAMapView) {
+        // 🔑 关键优化：如果是同一个地图引用，跳过重复设置
+        if lastSetMapView === map {
+            return
+        }
+        
+        lastSetMapView = map
         self.mapView = map
         updateCircle()
     }
@@ -48,32 +85,40 @@ class CircleView: ExpoView {
      * 更新圆形覆盖物
      */
     private func updateCircle() {
-        guard let mapView = mapView,
-              let latitude = circleCenter["latitude"],
+        guard let mapView = mapView else {
+            return
+        }
+        
+        guard let latitude = circleCenter["latitude"],
               let longitude = circleCenter["longitude"],
               radius > 0 else {
-            print("❌ CircleView.updateCircle: 条件不满足")
             return
         }
         
-        print("🔵 CircleView.updateCircle: center=(\(latitude),\(longitude)), radius=\(radius)")
-        print("🔵 CircleView.updateCircle: fillColor=\(String(describing: fillColor)), strokeColor=\(String(describing: strokeColor)), strokeWidth=\(strokeWidth)")
+        // 🔑 坐标验证：防止无效坐标导致崩溃
+        guard latitude >= -90 && latitude <= 90,
+              longitude >= -180 && longitude <= 180 else {
+            return
+        }
+        
+        // 🔑 半径验证：防止负数或过大的半径
+        let validRadius = max(0.1, min(radius, 1000000))
         
         if circle == nil {
             let coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-            circle = MACircle(center: coordinate, radius: radius)
+            circle = MACircle(center: coordinate, radius: validRadius)
             mapView.add(circle!)
-            print("🔵 CircleView.updateCircle: 创建新圆形")
         } else {
-            circle?.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-            circle?.radius = radius
+            // 先移除旧的
             mapView.remove(circle!)
+            // 更新属性
+            circle?.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+            circle?.radius = validRadius
+            // 重新添加
             mapView.add(circle!)
-            print("🔵 CircleView.updateCircle: 更新现有圆形")
         }
         
         renderer = nil
-        print("🔵 CircleView.updateCircle: renderer 已清空")
     }
     
     /**
@@ -88,10 +133,10 @@ class CircleView: ExpoView {
             renderer?.fillColor = parsedFillColor ?? UIColor.clear
             renderer?.strokeColor = parsedStrokeColor ?? UIColor.clear
             renderer?.lineWidth = CGFloat(strokeWidth)
-            print("🔵 CircleView.getRenderer: 创建新 renderer")
-            print("🔵 CircleView.getRenderer: fillColor=\(String(describing: parsedFillColor)), strokeColor=\(String(describing: parsedStrokeColor)), lineWidth=\(strokeWidth)")
-        } else {
-            print("🔵 CircleView.getRenderer: 使用缓存的 renderer")
+        }
+        // 确保即使 renderer 存在，它也与当前的 circle 实例关联
+        if renderer?.circle !== circle {
+            renderer = MACircleRenderer(circle: circle)
         }
         return renderer!
     }
@@ -145,11 +190,45 @@ class CircleView: ExpoView {
     }
     
     /**
-     * 析构时移除圆形
+     * 设置 z-index
+     * @param zIndex z-index 值，数值越大越在上层
+     *
+     * 注意：iOS 高德地图的 MACircle 不直接支持 zIndex 属性
+     * overlay 的渲染顺序由添加顺序决定，后添加的在上层
+     * 这里通过重新添加来尝试改变顺序
+     */
+    func setZIndex(_ zIndex: Double) {
+        self.zIndex = zIndex
+        renderer = nil
+        updateCircle()
+    }
+    
+    /**
+     * 视图即将从父视图移除时调用
+     * 🔑 关键修复：旧架构下，React Native 移除视图时不一定立即调用 deinit
+     * 需要在 willMove(toSuperview:) 中立即清理地图覆盖物
+     */
+    override func willMove(toSuperview newSuperview: UIView?) {
+        super.willMove(toSuperview: newSuperview)
+        
+        // 当 newSuperview 为 nil 时，表示视图正在从父视图移除
+        if newSuperview == nil {
+            if let mapView = mapView, let circle = circle {
+                mapView.remove(circle)
+                self.circle = nil
+            }
+        }
+    }
+    
+    /**
+     * 析构时移除圆形（双重保险）
      */
     deinit {
         if let mapView = mapView, let circle = circle {
             mapView.remove(circle)
         }
+        mapView = nil
+        circle = nil
+        renderer = nil
     }
 }

package/ios/overlays/CircleViewModule.swift

@@ -5,6 +5,8 @@ public class CircleViewModule: Module {
         Name("CircleView")
         
         View(CircleView.self) {
+            Events("onCirclePress")
+            
             Prop("center") { (view: CircleView, center: [String: Double]) in
                 view.setCenter(center)
             }
@@ -24,6 +26,25 @@ public class CircleViewModule: Module {
             Prop("strokeWidth") { (view: CircleView, width: Double) in
                 view.setStrokeWidth(Float(width))
             }
+
+            Prop("zIndex") { (view: CircleView, zIndex: Double) in
+                view.setZIndex(zIndex)
+            }
+            
+            OnViewDidUpdateProps { (view: CircleView) in
+                // 属性更新完成后，如果还没连接地图，尝试连接
+                if !view.isMapConnected() {
+                    // 查找父视图 ExpoGaodeMapView
+                    var parent = view.superview
+                    while parent != nil {
+                        if let mapView = parent as? ExpoGaodeMapView {
+                            view.setMap(mapView.mapView)
+                            return
+                        }
+                        parent = parent?.superview
+                    }
+                }
+            }
         }
     }
 }

package/ios/overlays/ClusterView.swift

@@ -36,10 +36,11 @@ class ClusterView: ExpoView {
     private func updateCluster() {
         guard let mapView = mapView else { return }
         
-        for annotation in annotations {
-            mapView.removeAnnotation(annotation)
-        }
-        annotations.removeAll()
+        // 先移除旧的注释
+        removeAllAnnotations()
+        
+        // 验证数据有效性
+        guard !points.isEmpty else { return }
         
         for point in points {
             guard let latitude = point["latitude"] as? Double,
@@ -53,4 +54,32 @@ class ClusterView: ExpoView {
             annotations.append(annotation)
         }
     }
+    
+    /**
+     * 移除所有标注
+     */
+    private func removeAllAnnotations() {
+        guard let mapView = mapView else { return }
+        
+        for annotation in annotations {
+            mapView.removeAnnotation(annotation)
+        }
+        annotations.removeAll()
+    }
+    
+    /**
+     * 从父视图移除时清理标注
+     */
+    override func removeFromSuperview() {
+        super.removeFromSuperview()
+        removeAllAnnotations()
+    }
+    
+    /**
+     * 析构时移除标注
+     */
+    deinit {
+        removeAllAnnotations()
+        mapView = nil
+    }
 }

package/ios/overlays/HeatMapView.swift

@@ -71,19 +71,30 @@ class HeatMapView: ExpoView {
         // 移除旧的热力图
         if let oldHeatmap = heatmapOverlay {
             mapView.remove(oldHeatmap)
+            heatmapOverlay = nil
         }
         
+        // 验证数据有效性
+        guard !data.isEmpty else { return }
+        
         // 创建热力图数据
         var heatmapData: [MAHeatMapNode] = []
         for point in data {
             guard let latitude = point["latitude"] as? Double,
-                  let longitude = point["longitude"] as? Double else {
+                  let longitude = point["longitude"] as? Double,
+                  latitude >= -90 && latitude <= 90,
+                  longitude >= -180 && longitude <= 180 else {
                 continue
             }
             
             let node = MAHeatMapNode()
             node.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-            node.intensity = 1.0 // 默认强度
+            // 支持自定义强度，默认为 1.0
+            if let intensity = point["intensity"] as? Double {
+                node.intensity = Float(max(0, min(1, intensity)))
+            } else {
+                node.intensity = 1.0
+            }
             heatmapData.append(node)
         }
         
@@ -92,8 +103,8 @@ class HeatMapView: ExpoView {
         // 创建热力图图层
         let heatmap = MAHeatMapTileOverlay()
         heatmap.data = heatmapData
-        heatmap.radius = radius
-        heatmap.opacity = CGFloat(opacity)
+        heatmap.radius = max(1, radius) // 确保半径至少为 1
+        heatmap.opacity = CGFloat(max(0, min(1, opacity))) // 限制透明度范围
         
         mapView.add(heatmap)
         heatmapOverlay = heatmap
@@ -121,5 +132,6 @@ class HeatMapView: ExpoView {
      */
     deinit {
         removeHeatMap()
+        mapView = nil
     }
 }