expo-gaode-map-navigation 1.1.5-next.1 → 1.1.5-next.3

package/ios/map/overlays/HeatMapView.swift

@@ -9,21 +9,41 @@ import AMapNaviKit
  * - 管理热力图数据和样式
  * - 支持半径和透明度配置
  */
-class NaviHeatMapView: ExpoView {
+class HeatMapView: ExpoView {
     /// 热力图数据点数组
-    var data: [[String: Any]] = []
+    var dataPoints: [[String: Any]] = []
     /// 热力图半径
     var radius: Int = 50
     /// 透明度
     var opacity: Double = 0.6
+    /// 渐变配置
+    var gradient: [String: Any]?
+    /// 是否开启高清适配
+    var allowRetinaAdapting: Bool = false
+
+    private var visible: Bool = true
     
     /// 地图视图弱引用
     private var mapView: MAMapView?
     /// 热力图图层
-    private var heatmapOverlay: MAHeatMapTileOverlay?
+    var heatmapOverlay: MAHeatMapTileOverlay?
+    /// 渲染器
+    private var renderer: MATileOverlayRenderer?
+
+    private func reloadRenderer() {
+        guard let mapView = mapView, let overlay = heatmapOverlay else { return }
+        if let existing = mapView.renderer(for: overlay) as? MATileOverlayRenderer {
+            existing.reloadData()
+            mapView.setNeedsDisplay()
+            return
+        }
+        renderer?.reloadData()
+        mapView.setNeedsDisplay()
+    }
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
+        self.backgroundColor = UIColor.clear
     }
     
     /**
@@ -32,15 +52,31 @@ class NaviHeatMapView: ExpoView {
      */
     func setMap(_ map: MAMapView) {
         self.mapView = map
+      
         createOrUpdateHeatMap()
     }
     
+    /**
+     * 获取渲染器
+     */
+    func getRenderer() -> MAOverlayRenderer {
+        if let overlay = heatmapOverlay {
+            if renderer == nil || renderer?.overlay !== overlay {
+                renderer = MATileOverlayRenderer(tileOverlay: overlay)
+                renderer?.reloadData()
+            }
+            return renderer!
+        }
+        return MAOverlayRenderer()
+    }
+    
     /**
      * 设置热力图数据
-     * @param data 数据点数组，每个点包含 latitude、longitude
+     * @param data 数据点数组
      */
     func setData(_ data: [[String: Any]]) {
-        self.data = data
+        self.dataPoints = data
+        
         createOrUpdateHeatMap()
     }
     
@@ -50,6 +86,7 @@ class NaviHeatMapView: ExpoView {
      */
     func setRadius(_ radius: Int) {
         self.radius = radius
+     
         createOrUpdateHeatMap()
     }
     
@@ -59,6 +96,30 @@ class NaviHeatMapView: ExpoView {
      */
     func setOpacity(_ opacity: Double) {
         self.opacity = opacity
+       
+        createOrUpdateHeatMap()
+    }
+    
+    /**
+     * 设置渐变配置
+     */
+    func setGradient(_ gradient: [String: Any]?) {
+        self.gradient = gradient
+      
+        createOrUpdateHeatMap()
+    }
+    
+    /**
+     * 设置是否开启高清适配
+     */
+    func setAllowRetinaAdapting(_ allow: Bool) {
+        self.allowRetinaAdapting = allow
+      
+        createOrUpdateHeatMap()
+    }
+
+    func setVisible(_ visible: Bool) {
+        self.visible = visible
         createOrUpdateHeatMap()
     }
     
@@ -66,57 +127,99 @@ class NaviHeatMapView: ExpoView {
      * 创建或更新热力图
      */
     private func createOrUpdateHeatMap() {
+        if !Thread.isMainThread {
+            DispatchQueue.main.async { [weak self] in
+                self?.createOrUpdateHeatMap()
+            }
+            return
+        }
+
         guard let mapView = mapView else { return }
-        
-        // 移除旧的热力图
-        if let oldHeatmap = heatmapOverlay {
-            mapView.remove(oldHeatmap)
-            heatmapOverlay = nil
+
+        if !visible {
+            if let overlay = heatmapOverlay {
+                overlay.opacity = 0
+                reloadRenderer()
+            }
+            return
         }
         
-        // 验证数据有效性
-        guard !data.isEmpty else { return }
+        // 🔑 使用统一的坐标解析器
+        let coords = LatLngParser.parseLatLngList(dataPoints)
         
-        // 创建热力图数据
-        var heatmapData: [MAHeatMapNode] = []
-        for point in data {
-            guard let latitude = point["latitude"] as? Double,
-                  let longitude = point["longitude"] as? Double,
-                  latitude >= -90 && latitude <= 90,
-                  longitude >= -180 && longitude <= 180 else {
-                continue
+        guard !coords.isEmpty else {
+            if let old = heatmapOverlay {
+                mapView.remove(old)
+                heatmapOverlay = nil
+                renderer = nil
             }
-            
+            return
+        }
+        
+        // 转换为 MAHeatMapNode
+        let heatmapData = coords.map { coord -> MAHeatMapNode in
             let node = MAHeatMapNode()
-            node.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-            // 支持自定义强度，默认为 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)
+            node.coordinate = coord
+            node.intensity = 1.0 // 默认强度为 1.0
+            return node
+        }
+
+        // 移除旧的热力图
+        if let oldHeatmap = heatmapOverlay {
+            mapView.remove(oldHeatmap)
+            heatmapOverlay = nil
+            renderer = nil
         }
         
-        guard !heatmapData.isEmpty else { return }
+      
         
         // 创建热力图图层
         let heatmap = MAHeatMapTileOverlay()
         heatmap.data = heatmapData
-        heatmap.radius = max(1, radius) // 确保半径至少为 1
+        heatmap.radius = min(200, max(10, radius))
         heatmap.opacity = CGFloat(max(0, min(1, opacity))) // 限制透明度范围
+        heatmap.allowRetinaAdapting = allowRetinaAdapting
         
-        mapView.add(heatmap)
+        // 配置渐变
+        if let gradientConfig = gradient,
+           let colorsArray = gradientConfig["colors"] as? [Any],
+           let startPointsArray = gradientConfig["startPoints"] as? [NSNumber] {
+            
+            var colors: [UIColor] = []
+            for colorValue in colorsArray {
+                if let color = ColorParser.parseColor(colorValue) {
+                    colors.append(color)
+                }
+            }
+            
+            if !colors.isEmpty && colors.count == startPointsArray.count {
+                let gradient = MAHeatMapGradient(color: colors, andWithStartPoints: startPointsArray)
+                heatmap.gradient = gradient
+            }
+        }
+
         heatmapOverlay = heatmap
+        renderer = MATileOverlayRenderer(tileOverlay: heatmap)
+        renderer?.reloadData()
+
+        mapView.add(heatmap)
+        reloadRenderer()
     }
     
     /**
      * 移除热力图
      */
     func removeHeatMap() {
+        if !Thread.isMainThread {
+            DispatchQueue.main.async { [weak self] in
+                self?.removeHeatMap()
+            }
+            return
+        }
         guard let mapView = mapView, let heatmap = heatmapOverlay else { return }
         mapView.remove(heatmap)
         heatmapOverlay = nil
+        renderer = nil
     }
     
     /**

package/ios/map/overlays/HeatMapViewModule.swift

@@ -1,21 +1,33 @@
 import ExpoModulesCore
 
-public class NaviHeatMapViewModule: Module {
+public class HeatMapViewModule: Module {
     public func definition() -> ModuleDefinition {
-        Name("NaviHeatMapView")
+        Name("HeatMapView")
         
-        View(NaviHeatMapView.self) {
-            Prop("data") { (view: NaviHeatMapView, data: [[String: Any]]) in
-                view.setData(data)
+        View(HeatMapView.self) {
+            Prop("data") { (view: HeatMapView, data: [[String: Any]]) in
+            view.setData(data)
+        }
+
+            Prop("visible") { (view: HeatMapView, visible: Bool) in
+                view.setVisible(visible)
             }
             
-            Prop("radius") { (view: NaviHeatMapView, radius: Int) in
+            Prop("radius") { (view: HeatMapView, radius: Int) in
                 view.setRadius(radius)
             }
             
-            Prop("opacity") { (view: NaviHeatMapView, opacity: Double) in
+            Prop("opacity") { (view: HeatMapView, opacity: Double) in
                 view.setOpacity(opacity)
             }
+            
+            Prop("gradient") { (view: HeatMapView, gradient: [String: Any]?) in
+                view.setGradient(gradient)
+            }
+            
+            Prop("allowRetinaAdapting") { (view: HeatMapView, allow: Bool) in
+                view.setAllowRetinaAdapting(allow)
+            }
         }
     }
-}
+}