expo-gaode-map 2.2.30-next.0 → 2.2.30

package/ios/ExpoGaodeMapViewModule.swift

@@ -1,13 +1,6 @@
 import ExpoModulesCore
 import MAMapKit
-
-enum MapType: Int, Enumerable {
-    case standard = 0
-    case satellite = 1
-    case night = 2
-    case navi = 3
-    case bus = 4
-}
+import CoreLocation
 
 /**
  * 高德地图视图 Module
@@ -17,10 +10,10 @@ public class ExpoGaodeMapViewModule: Module {
         Name("ExpoGaodeMapView")
         
         View(ExpoGaodeMapView.self) {
-            Events("onMapPress", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
+            Events("onMapPress", "onPressPoi", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
             
-            Prop("mapType") { (view: ExpoGaodeMapView, type: MapType) in
-                view.mapType = type.rawValue
+            Prop("mapType") { (view: ExpoGaodeMapView, type: Int) in
+                view.mapType = type
             }
             
             Prop("initialCameraPosition") { (view: ExpoGaodeMapView, position: [String: Any]?) in
@@ -66,6 +59,18 @@ public class ExpoGaodeMapViewModule: Module {
             Prop("myLocationEnabled") { (view: ExpoGaodeMapView, show: Bool) in
                 view.setShowsUserLocation(show)
             }
+
+            Prop("distanceFilter") { (view: ExpoGaodeMapView, distance: Double?) in
+                view.distanceFilter = distance ?? kCLDistanceFilterNone
+            }
+
+            Prop("headingFilter") { (view: ExpoGaodeMapView, heading: Double?) in
+                view.headingFilter = heading ?? kCLHeadingFilterNone
+            }
+
+            Prop("cameraEventThrottleMs") { (view: ExpoGaodeMapView, throttleMs: Int?) in
+                view.cameraEventThrottleMs = max(throttleMs ?? 32, 0)
+            }
             
             Prop("followUserLocation") { (view: ExpoGaodeMapView, follow: Bool) in
                 view.setFollowUserLocation(follow)

package/ios/managers/UIManager.swift

@@ -29,14 +29,15 @@ class UIManager: NSObject, MAMapViewDelegate {
     
     /**
      * 设置地图类型
-     * @param type 0:标准 1:卫星 2:夜间 3:导航
+     * @param type 1:标准 2:卫星 3:夜间 4:导航 5:公交
      */
     func setMapType(_ type: Int) {
         guard let mapView = mapView else { return }
         switch type {
-        case 1: mapView.mapType = .satellite
-        case 2: mapView.mapType = .standardNight
-        case 3: mapView.mapType = .navi
+        case 2: mapView.mapType = .satellite
+        case 3: mapView.mapType = .standardNight
+        case 4: mapView.mapType = .navi
+        case 5: mapView.mapType = .bus
         default: mapView.mapType = .standard
         }
         

package/ios/modules/LocationManager.swift

@@ -25,6 +25,8 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
     // 连续定位 event 回调（给 JS map listener 用）
     var onLocationUpdate: (([String: Any]) -> Void)?
     var onHeadingUpdate: (([String: Any]) -> Void)?
+    private var locationIntervalMillis: Int = 2000
+    private var lastLocationEventTimestampMillis: Double?
 
     override init() {
         super.init()
@@ -33,6 +35,7 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
     // MARK: - 连续定位控制
 
     func start() {
+        lastLocationEventTimestampMillis = nil
         ensureLocationManager()?.startUpdatingLocation()
         isLocationStarted = true
     }
@@ -40,6 +43,7 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
     func stop() {
         ensureLocationManager()?.stopUpdatingLocation()
         isLocationStarted = false
+        lastLocationEventTimestampMillis = nil
     }
 
     func isStarted() -> Bool {
@@ -56,6 +60,10 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         ensureLocationManager()?.distanceFilter = distance
     }
 
+    func setInterval(_ interval: Int) {
+        locationIntervalMillis = max(interval, 0)
+    }
+
     func setLocationTimeout(_ timeout: Int) {
         ensureLocationManager()?.locationTimeout = timeout
     }
@@ -93,12 +101,14 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         ensureLocationManager()?.allowsBackgroundLocationUpdates = allows
     }
 
-    func setGeoLanguage(_ language: Int) {
-        switch language {
-        case 0: ensureLocationManager()?.reGeocodeLanguage = .default
-        case 1: ensureLocationManager()?.reGeocodeLanguage = .chinse
-        case 2: ensureLocationManager()?.reGeocodeLanguage = .english
-        default: break
+    func setGeoLanguage(_ language: String) {
+        switch language.uppercased() {
+        case "ZH":
+            ensureLocationManager()?.reGeocodeLanguage = .chinse
+        case "EN":
+            ensureLocationManager()?.reGeocodeLanguage = .english
+        default:
+            ensureLocationManager()?.reGeocodeLanguage = .default
         }
     }
 
@@ -155,6 +165,7 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
             "longitude": location.coordinate.longitude,
             "accuracy": location.horizontalAccuracy,
             "altitude": location.altitude,
+            "heading": location.course,
             "bearing": location.course,
             "speed": location.speed,
             "timestamp": location.timestamp.timeIntervalSince1970 * 1000
@@ -172,14 +183,25 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
             data["adCode"] = geo.adcode
         }
 
-        // 触发连续定位回调
+        let timestamp = location.timestamp.timeIntervalSince1970 * 1000
+        if let lastTimestamp = lastLocationEventTimestampMillis,
+           locationIntervalMillis > 0,
+           timestamp - lastTimestamp < Double(locationIntervalMillis) {
+            return
+        }
+
+        lastLocationEventTimestampMillis = timestamp
         onLocationUpdate?(data)
     }
 
     func amapLocationManager(_ manager: AMapLocationManager!, didUpdate heading: CLHeading!) {
         let headingData: [String: Any] = [
-            "heading": heading.trueHeading,
-            "accuracy": heading.headingAccuracy,
+            "magneticHeading": heading.magneticHeading,
+            "trueHeading": heading.trueHeading,
+            "headingAccuracy": heading.headingAccuracy,
+            "x": heading.x,
+            "y": heading.y,
+            "z": heading.z,
             "timestamp": heading.timestamp.timeIntervalSince1970 * 1000
         ]
         onHeadingUpdate?(headingData)
@@ -237,5 +259,6 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         locationManager = nil
         onLocationUpdate = nil
         onHeadingUpdate = nil
+        lastLocationEventTimestampMillis = nil
     }
 }

package/ios/overlays/ClusterView.swift

@@ -1,3 +1,4 @@
+import Foundation
 import ExpoModulesCore
 import MAMapKit
 
@@ -28,6 +29,9 @@ class ClusterView: ExpoView {
     private var currentAnnotations: [MAAnnotation] = []
     private let quadTreeQueue = DispatchQueue(label: "com.expo.gaode.quadtree")
     private var isInvalidated = false
+    private let imageCache = NSCache<NSString, UIImage>()
+    private var baseIconImage: UIImage?
+    private var iconIdentifier: String?
     
     // 缓存坐标数据以加速 C++ 调用
     private var latitudes: [Double] = []
@@ -104,9 +108,23 @@ class ClusterView: ExpoView {
                 self.clusterSize.width = CGFloat(height)
             }
         }
-        
+
+        clearImageCache()
         updateClusters()
     }
+
+    func setIcon(_ icon: String?) {
+        iconIdentifier = icon
+        baseIconImage = nil
+        clearImageCache()
+
+        guard let icon, !icon.isEmpty else {
+            updateClusters()
+            return
+        }
+
+        loadIcon(from: icon)
+    }
     
     func setClusterTextStyle(_ style: [String: Any]) {
         if let color = ColorParser.parseColor(style["color"]) {
@@ -115,11 +133,13 @@ class ClusterView: ExpoView {
         if let fontSize = style["fontSize"] as? Double {
             self.clusterTextSize = CGFloat(fontSize)
         }
+        clearImageCache()
         updateClusters()
     }
 
     func setClusterBuckets(_ buckets: [[String: Any]]) {
         self.clusterBuckets = buckets
+        clearImageCache()
         updateClusters()
     }
 
@@ -278,10 +298,15 @@ class ClusterView: ExpoView {
     }
     
     private func image(for count: Int) -> UIImage? {
+        let cacheKey = clusterImageCacheKey(for: count)
+        if let cachedImage = imageCache.object(forKey: cacheKey as NSString) {
+            return cachedImage
+        }
+
         let size = self.clusterSize
         let renderer = UIGraphicsImageRenderer(size: size)
-        
-        return renderer.image { context in
+
+        let renderedImage = renderer.image { context in
             let rect = CGRect(origin: .zero, size: size)
             
             // 基础样式
@@ -316,15 +341,25 @@ class ClusterView: ExpoView {
                 }
             }
             
-            bgColor.setFill()
-            UIBezierPath(ovalIn: rect).fill()
-            
-            // 绘制边框
-            if borderWidth > 0 {
-                borderColor.setStroke()
-                let path = UIBezierPath(ovalIn: rect.insetBy(dx: borderWidth / 2, dy: borderWidth / 2))
-                path.lineWidth = borderWidth
-                path.stroke()
+            if let baseIconImage {
+                baseIconImage.draw(in: rect)
+                if borderWidth > 0 {
+                    borderColor.setStroke()
+                    let path = UIBezierPath(ovalIn: rect.insetBy(dx: borderWidth / 2, dy: borderWidth / 2))
+                    path.lineWidth = borderWidth
+                    path.stroke()
+                }
+            } else {
+                bgColor.setFill()
+                UIBezierPath(ovalIn: rect).fill()
+                
+                // 绘制边框
+                if borderWidth > 0 {
+                    borderColor.setStroke()
+                    let path = UIBezierPath(ovalIn: rect.insetBy(dx: borderWidth / 2, dy: borderWidth / 2))
+                    path.lineWidth = borderWidth
+                    path.stroke()
+                }
             }
             
             // 绘制文字
@@ -340,6 +375,72 @@ class ClusterView: ExpoView {
                                   height: textSize.height)
             text.draw(in: textRect, withAttributes: attributes)
         }
+
+        imageCache.setObject(renderedImage, forKey: cacheKey as NSString)
+        return renderedImage
+    }
+
+    private func clusterImageCacheKey(for count: Int) -> String {
+        let bucketKey: String
+        if let buckets = clusterBuckets {
+            let minPoints = buckets
+                .compactMap { $0["minPoints"] as? Int }
+                .filter { $0 <= count }
+                .max() ?? 0
+            bucketKey = "bucket:\(minPoints)"
+        } else {
+            bucketKey = "bucket:none"
+        }
+
+        return [
+            "count:\(count)",
+            bucketKey,
+            "size:\(Int(clusterSize.width.rounded()))x\(Int(clusterSize.height.rounded()))",
+            "bg:\(clusterBackgroundColor.description)",
+            "border:\(clusterBorderColor.description)",
+            "borderWidth:\(clusterBorderWidth)",
+            "textColor:\(clusterTextColor.description)",
+            "textSize:\(clusterTextSize)",
+            "icon:\(iconIdentifier ?? "none")"
+        ].joined(separator: "|")
+    }
+
+    private func clearImageCache() {
+        imageCache.removeAllObjects()
+    }
+
+    private func loadIcon(from icon: String) {
+        let requestedIcon = icon
+
+        DispatchQueue.global().async { [weak self] in
+            guard let self else { return }
+
+            let image: UIImage? = {
+                if requestedIcon.hasPrefix("http://") || requestedIcon.hasPrefix("https://") {
+                    guard let url = URL(string: requestedIcon),
+                          let data = try? Data(contentsOf: url) else {
+                        return nil
+                    }
+                    return UIImage(data: data)
+                }
+
+                if requestedIcon.hasPrefix("file://") {
+                    let path = String(requestedIcon.dropFirst(7))
+                    return UIImage(contentsOfFile: path)
+                }
+
+                return UIImage(named: requestedIcon) ?? UIImage(contentsOfFile: requestedIcon)
+            }()
+
+            guard let image else { return }
+
+            DispatchQueue.main.async { [weak self] in
+                guard let self, self.iconIdentifier == requestedIcon else { return }
+                self.baseIconImage = image
+                self.clearImageCache()
+                self.updateClusters()
+            }
+        }
     }
     
     // MARK: - Event Handling
@@ -365,6 +466,7 @@ class ClusterView: ExpoView {
     override func removeFromSuperview() {
         isInvalidated = true
         updateTimer?.invalidate() // 清理定时器
+        clearImageCache()
         super.removeFromSuperview()
         mapView?.removeAnnotations(currentAnnotations)
     }

package/ios/overlays/ClusterViewModule.swift

@@ -22,6 +22,10 @@ public class ClusterViewModule: Module {
             Prop("clusterStyle") { (view: ClusterView, style: [String: Any]) in
                 view.setClusterStyle(style)
             }
+
+            Prop("icon") { (view: ClusterView, icon: String?) in
+                view.setIcon(icon)
+            }
             
             Prop("clusterTextStyle") { (view: ClusterView, style: [String: Any]) in
                 view.setClusterTextStyle(style)
@@ -32,4 +36,4 @@ public class ClusterViewModule: Module {
             }
         }
     }
-}
+}