expo-gaode-map 2.2.15 → 2.2.16

package/ios/overlays/HeatMapView.swift

@@ -16,14 +16,34 @@ class HeatMapView: ExpoView {
     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 HeatMapView: ExpoView {
      */
     func setMap(_ map: MAMapView) {
         self.mapView = map
+        print("HeatMap: setMap")
         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
      */
     func setData(_ data: [[String: Any]]) {
         self.data = data
+        print("HeatMap: setData count=\(data.count)")
         createOrUpdateHeatMap()
     }
     
@@ -50,6 +86,7 @@ class HeatMapView: ExpoView {
      */
     func setRadius(_ radius: Int) {
         self.radius = radius
+        print("HeatMap: setRadius \(radius)")
         createOrUpdateHeatMap()
     }
     
@@ -59,6 +96,30 @@ class HeatMapView: ExpoView {
      */
     func setOpacity(_ opacity: Double) {
         self.opacity = opacity
+        print("HeatMap: setOpacity \(opacity)")
+        createOrUpdateHeatMap()
+    }
+    
+    /**
+     * 设置渐变配置
+     */
+    func setGradient(_ gradient: [String: Any]?) {
+        self.gradient = gradient
+        print("HeatMap: setGradient hasValue=\(gradient != nil)")
+        createOrUpdateHeatMap()
+    }
+    
+    /**
+     * 设置是否开启高清适配
+     */
+    func setAllowRetinaAdapting(_ allow: Bool) {
+        self.allowRetinaAdapting = allow
+        print("HeatMap: setAllowRetinaAdapting \(allow)")
+        createOrUpdateHeatMap()
+    }
+
+    func setVisible(_ visible: Bool) {
+        self.visible = visible
         createOrUpdateHeatMap()
     }
     
@@ -66,12 +127,28 @@ class HeatMapView: ExpoView {
      * 创建或更新热力图
      */
     private func createOrUpdateHeatMap() {
+        if !Thread.isMainThread {
+            DispatchQueue.main.async { [weak self] in
+                self?.createOrUpdateHeatMap()
+            }
+            return
+        }
+
         guard let mapView = mapView else { return }
+
+        if !visible {
+            if let overlay = heatmapOverlay {
+                overlay.opacity = 0
+                reloadRenderer()
+            }
+            return
+        }
         
         // 移除旧的热力图
         if let oldHeatmap = heatmapOverlay {
             mapView.remove(oldHeatmap)
             heatmapOverlay = nil
+            renderer = nil
         }
         
         // 验证数据有效性
@@ -90,7 +167,9 @@ class HeatMapView: ExpoView {
             let node = MAHeatMapNode()
             node.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
             // 支持自定义强度，默认为 1.0
-            if let intensity = point["intensity"] as? Double {
+            if let count = point["count"] as? Double {
+                node.intensity = Float(max(0, count))
+            } else if let intensity = point["intensity"] as? Double {
                 node.intensity = Float(max(0, min(1, intensity)))
             } else {
                 node.intensity = 1.0
@@ -98,25 +177,60 @@ class HeatMapView: ExpoView {
             heatmapData.append(node)
         }
         
-        guard !heatmapData.isEmpty else { return }
+        guard !heatmapData.isEmpty else {
+            print("HeatMap: No valid data points found")
+            return
+        }
+        
+        print("HeatMap: Creating overlay with \(heatmapData.count) points")
         
         // 创建热力图图层
         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/overlays/HeatMapViewModule.swift

@@ -8,6 +8,10 @@ public class HeatMapViewModule: Module {
             Prop("data") { (view: HeatMapView, data: [[String: Any]]) in
                 view.setData(data)
             }
+
+            Prop("visible") { (view: HeatMapView, visible: Bool) in
+                view.setVisible(visible)
+            }
             
             Prop("radius") { (view: HeatMapView, radius: Int) in
                 view.setRadius(radius)
@@ -16,6 +20,14 @@ public class HeatMapViewModule: Module {
             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)
+            }
         }
     }
-}
+}

package/ios/overlays/MultiPointView.swift

@@ -1,11 +1,20 @@
 import ExpoModulesCore
 import MAMapKit
+import UIKit
 
 class MultiPointView: ExpoView {
+    let onMultiPointPress = EventDispatcher()
+    
     var points: [[String: Any]] = []
+    var iconUri: String?
+    var iconWidth: Double?
+    var iconHeight: Double?
+    var anchorX: Double = 0.5
+    var anchorY: Double = 0.5
     
     private var mapView: MAMapView?
     private var multiPointOverlay: MAMultiPointOverlay?
+    private var renderer: MAMultiPointOverlayRenderer?
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
@@ -21,6 +30,27 @@ class MultiPointView: ExpoView {
         updateMultiPoint()
     }
     
+    func setIcon(_ iconUri: String?) {
+        self.iconUri = iconUri
+        updateIcon()
+    }
+    
+    func setIconWidth(_ width: Double?) {
+        self.iconWidth = width
+        updateIcon()
+    }
+    
+    func setIconHeight(_ height: Double?) {
+        self.iconHeight = height
+        updateIcon()
+    }
+    
+    func setAnchor(x: Double, y: Double) {
+        self.anchorX = x
+        self.anchorY = y
+        renderer?.anchor = CGPoint(x: x, y: y)
+    }
+    
     private func updateMultiPoint() {
         guard let mapView = mapView else { return }
         
@@ -28,13 +58,14 @@ class MultiPointView: ExpoView {
         if let oldOverlay = multiPointOverlay {
             mapView.remove(oldOverlay)
             multiPointOverlay = nil
+            renderer = nil
         }
         
         // 验证数据有效性
         guard !points.isEmpty else { return }
         
         var items: [MAMultiPointItem] = []
-        for point in points {
+        for (index, point) in points.enumerated() {
             guard let latitude = point["latitude"] as? Double,
                   let longitude = point["longitude"] as? Double else {
                 continue
@@ -42,16 +73,143 @@ class MultiPointView: ExpoView {
             
             let item = MAMultiPointItem()
             item.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+            // 存储 index 和 customerId 到 item 中，这里利用 customID 或者 title 属性
+            // MAMultiPointItem 有 customID 属性
+            if let customerId = point["customerId"] as? String {
+                item.customID = customerId
+            } else if let id = point["id"] as? String {
+                item.customID = id
+            }
+            
+            // 也可以存 title，这里为了方便查找 index，我们可以把 index 存到 title 或者 subtitle
+            // 但最好是通过 customID 查找
+            
             items.append(item)
         }
         
         guard !items.isEmpty else { return }
         
         let overlay = MAMultiPointOverlay(multiPointItems: items)
+        self.multiPointOverlay = overlay
         mapView.add(overlay)
-        multiPointOverlay = overlay
     }
     
+    func getRenderer() -> MAMultiPointOverlayRenderer? {
+        guard let overlay = multiPointOverlay else { return nil }
+        
+        if renderer == nil {
+            renderer = MAMultiPointOverlayRenderer(multiPointOverlay: overlay)
+            renderer?.anchor = CGPoint(x: anchorX, y: anchorY)
+            updateIcon()
+        }
+        return renderer
+    }
+    
+    private func updateIcon() {
+        guard let iconUri = iconUri else { return }
+        
+        // 构建缓存 key
+        let w = Int(iconWidth ?? 0)
+        let h = Int(iconHeight ?? 0)
+        let key = "multipoint|\(iconUri)|\(w)x\(h)"
+        
+        // 1. 尝试从缓存获取
+        if let cached = IconBitmapCache.shared.image(forKey: key) {
+            self.renderer?.icon = cached
+            refreshOverlay()
+            return
+        }
+        
+        loadIcon(iconUri: iconUri) { [weak self] image in
+            guard let self = self, let image = image else { return }
+            
+            var finalImage = image
+            if let w = self.iconWidth, let h = self.iconHeight {
+                finalImage = self.resizeImage(image: image, targetSize: CGSize(width: w, height: h))
+            } else if let w = self.iconWidth {
+                let h = image.size.height * (w / image.size.width)
+                finalImage = self.resizeImage(image: image, targetSize: CGSize(width: w, height: h))
+            } else if let h = self.iconHeight {
+                let w = image.size.width * (h / image.size.height)
+                finalImage = self.resizeImage(image: image, targetSize: CGSize(width: w, height: h))
+            }
+            
+            // 写入缓存
+            IconBitmapCache.shared.setImage(finalImage, forKey: key)
+            
+            self.renderer?.icon = finalImage
+            self.refreshOverlay()
+        }
+    }
+    
+    private func refreshOverlay() {
+        self.renderer?.setNeedsUpdate()
+        // 强制刷新：通过重新添加 overlay 触发更新
+        if let mapView = self.mapView, let overlay = self.multiPointOverlay {
+            mapView.remove(overlay)
+            mapView.add(overlay)
+        }
+    }
+    
+    private func resizeImage(image: UIImage, targetSize: CGSize) -> UIImage {
+        UIGraphicsBeginImageContextWithOptions(targetSize, false, 0.0)
+        image.draw(in: CGRect(origin: .zero, size: targetSize))
+        let resizedImage = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        return resizedImage ?? image
+    }
+    
+    private func loadIcon(iconUri: String, completion: @escaping (UIImage?) -> Void) {
+        if iconUri.hasPrefix("http://") || iconUri.hasPrefix("https://") {
+            guard let url = URL(string: iconUri) else {
+                completion(nil)
+                return
+            }
+            URLSession.shared.dataTask(with: url) { data, _, _ in
+                guard let data = data, let image = UIImage(data: data) else {
+                    DispatchQueue.main.async { completion(nil) }
+                    return
+                }
+                DispatchQueue.main.async { completion(image) }
+            }.resume()
+        } else if iconUri.hasPrefix("file://") {
+            let path = String(iconUri.dropFirst(7))
+            completion(UIImage(contentsOfFile: path))
+        } else {
+            completion(UIImage(named: iconUri))
+        }
+    }
+    
+    func handleMultiPointClick(item: MAMultiPointItem) {
+        // 查找对应的 point 数据
+        var index = -1
+        var pointData: [String: Any]?
+        
+        // 优先通过 customID 查找
+        if let customID = item.customID {
+            index = points.firstIndex { ($0["customerId"] as? String) == customID || ($0["id"] as? String) == customID } ?? -1
+        }
+        
+        // 如果没找到，尝试通过坐标查找（不够精确，但作为备选）
+        if index == -1 {
+            index = points.firstIndex { point in
+                guard let lat = point["latitude"] as? Double,
+                      let lng = point["longitude"] as? Double else { return false }
+                return abs(lat - item.coordinate.latitude) < 0.000001 && abs(lng - item.coordinate.longitude) < 0.000001
+            } ?? -1
+        }
+        
+        if index != -1 {
+            pointData = points[index]
+            onMultiPointPress([
+                "index": index,
+                "customerId": pointData?["customerId"] ?? pointData?["id"] ?? "",
+                "latitude": item.coordinate.latitude,
+                "longitude": item.coordinate.longitude
+            ])
+        }
+    }
+
     /**
      * 移除多点覆盖物
      */

package/ios/overlays/MultiPointViewModule.swift

@@ -5,9 +5,31 @@ public class MultiPointViewModule: Module {
         Name("MultiPointView")
         
         View(MultiPointView.self) {
+            Events("onMultiPointPress")
+
             Prop("points") { (view: MultiPointView, points: [[String: Any]]) in
                 view.setPoints(points)
             }
+            
+            Prop("icon") { (view: MultiPointView, icon: String?) in
+                view.setIcon(icon)
+            }
+
+            Prop("iconWidth") { (view: MultiPointView, width: Double?) in
+                view.setIconWidth(width)
+            }
+
+            Prop("iconHeight") { (view: MultiPointView, height: Double?) in
+                view.setIconHeight(height)
+            }
+            
+            Prop("anchor") { (view: MultiPointView, anchor: [String: Double]?) in
+                if let anchor = anchor {
+                    let x = anchor["x"] ?? 0.5
+                    let y = anchor["y"] ?? 0.5
+                    view.setAnchor(x: x, y: y)
+                }
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.15",
+  "version": "2.2.16",
   "description": "A full-featured AMap (Gaode Map) React Native component library built with Expo Modules, providing map display, location services, overlays, and more.",
   "main": "build/index.js",
   "types": "build/index.d.ts",