expo-gaode-map 1.2.2 → 1.2.3

package/ios/ExpoGaodeMapViewModule.swift

@@ -1,5 +1,6 @@
 import ExpoModulesCore
 import MAMapKit
+import CoreLocation
 
 /**
  * 高德地图视图 Module
@@ -9,7 +10,7 @@ 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: Int) in
                 view.mapType = type
@@ -58,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/GaodeMapPrivacyManager.swift

@@ -0,0 +1,155 @@
+import AMapFoundationKit
+import AMapLocationKit
+import MAMapKit
+import Foundation
+
+extension Notification.Name {
+    static let gaodeMapPrivacyStatusDidChange = Notification.Name("ExpoGaodeMapPrivacyStatusDidChange")
+}
+
+enum GaodeMapPrivacyManager {
+    private enum StorageKeys {
+        static let hasShow = "expo.gaodemap.privacy.hasShow"
+        static let hasContainsPrivacy = "expo.gaodemap.privacy.hasContainsPrivacy"
+        static let hasAgree = "expo.gaodemap.privacy.hasAgree"
+        static let privacyVersion = "expo.gaodemap.privacy.currentVersion"
+        static let agreedPrivacyVersion = "expo.gaodemap.privacy.agreedVersion"
+    }
+
+    private static let defaults = UserDefaults.standard
+
+    private(set) static var hasShow = false
+    private(set) static var hasContainsPrivacy = false
+    private(set) static var hasAgree = false
+    private(set) static var privacyVersion: String?
+    private(set) static var agreedPrivacyVersion: String?
+    private(set) static var restoredFromStorage = false
+
+    static var isReady: Bool {
+        hasShow && hasContainsPrivacy && hasAgree
+    }
+
+    static func restorePersistedState() {
+        hasShow = defaults.bool(forKey: StorageKeys.hasShow)
+        hasContainsPrivacy = defaults.bool(forKey: StorageKeys.hasContainsPrivacy)
+        hasAgree = defaults.bool(forKey: StorageKeys.hasAgree)
+        privacyVersion = defaults.string(forKey: StorageKeys.privacyVersion)
+        agreedPrivacyVersion = defaults.string(forKey: StorageKeys.agreedPrivacyVersion)
+        restoredFromStorage = true
+
+        if let version = privacyVersion,
+           let agreedVersion = agreedPrivacyVersion,
+           version != agreedVersion {
+            clearConsentPersistedState(keepCurrentVersion: true)
+        }
+
+        applyPrivacyState()
+    }
+
+    static func setPrivacyShow(_ show: Bool, hasContainsPrivacy: Bool) {
+        let previousStatus = status()
+        hasShow = show
+        self.hasContainsPrivacy = hasContainsPrivacy
+        persistState()
+        applyPrivacyState()
+        notifyIfNeeded(previousStatus: previousStatus)
+    }
+
+    static func setPrivacyAgree(_ agree: Bool) {
+        let previousStatus = status()
+        hasAgree = agree
+        agreedPrivacyVersion = agree ? privacyVersion : nil
+        persistState()
+        applyPrivacyState()
+        notifyIfNeeded(previousStatus: previousStatus)
+    }
+
+    static func setPrivacyVersion(_ version: String) {
+        let previousStatus = status()
+        privacyVersion = version.trimmingCharacters(in: .whitespacesAndNewlines)
+        if privacyVersion?.isEmpty == true {
+            privacyVersion = nil
+        }
+
+        if let currentVersion = privacyVersion,
+           let agreedVersion = agreedPrivacyVersion,
+           currentVersion != agreedVersion {
+            clearConsentPersistedState(keepCurrentVersion: true)
+        } else {
+            persistState()
+        }
+
+        applyPrivacyState()
+        notifyIfNeeded(previousStatus: previousStatus)
+    }
+
+    static func resetPrivacyConsent() {
+        let previousStatus = status()
+        clearConsentPersistedState(keepCurrentVersion: false)
+        applyPrivacyState()
+        notifyIfNeeded(previousStatus: previousStatus)
+    }
+
+    static func applyPrivacyState() {
+        let showStatus: AMapPrivacyShowStatus = hasShow ? .didShow : .notShow
+        let infoStatus: AMapPrivacyInfoStatus = hasContainsPrivacy ? .didContain : .notContain
+        let agreeStatus: AMapPrivacyAgreeStatus = hasAgree ? .didAgree : .notAgree
+
+        MAMapView.updatePrivacyShow(showStatus, privacyInfo: infoStatus)
+        MAMapView.updatePrivacyAgree(agreeStatus)
+        AMapLocationManager.updatePrivacyShow(showStatus, privacyInfo: infoStatus)
+        AMapLocationManager.updatePrivacyAgree(agreeStatus)
+    }
+
+    static func status() -> [String: Any] {
+        [
+            "hasShow": hasShow,
+            "hasContainsPrivacy": hasContainsPrivacy,
+            "hasAgree": hasAgree,
+            "isReady": isReady,
+            "privacyVersion": privacyVersion ?? NSNull(),
+            "agreedPrivacyVersion": agreedPrivacyVersion ?? NSNull(),
+            "restoredFromStorage": restoredFromStorage,
+        ]
+    }
+
+    private static func persistState() {
+        defaults.set(hasShow, forKey: StorageKeys.hasShow)
+        defaults.set(hasContainsPrivacy, forKey: StorageKeys.hasContainsPrivacy)
+        defaults.set(hasAgree, forKey: StorageKeys.hasAgree)
+        defaults.set(privacyVersion, forKey: StorageKeys.privacyVersion)
+        defaults.set(agreedPrivacyVersion, forKey: StorageKeys.agreedPrivacyVersion)
+    }
+
+    private static func clearConsentPersistedState(keepCurrentVersion: Bool) {
+        hasShow = false
+        hasContainsPrivacy = false
+        hasAgree = false
+        agreedPrivacyVersion = nil
+
+        defaults.set(false, forKey: StorageKeys.hasShow)
+        defaults.set(false, forKey: StorageKeys.hasContainsPrivacy)
+        defaults.set(false, forKey: StorageKeys.hasAgree)
+        defaults.removeObject(forKey: StorageKeys.agreedPrivacyVersion)
+
+        if keepCurrentVersion {
+            defaults.set(privacyVersion, forKey: StorageKeys.privacyVersion)
+        } else {
+            privacyVersion = nil
+            defaults.removeObject(forKey: StorageKeys.privacyVersion)
+        }
+    }
+
+    private static func notifyIfNeeded(previousStatus: [String: Any]) {
+        let currentStatus = status()
+        guard NSDictionary(dictionary: previousStatus).isEqual(to: currentStatus) == false else {
+            return
+        }
+
+        NotificationCenter.default.post(
+            name: .gaodeMapPrivacyStatusDidChange,
+            object: nil,
+            userInfo: currentStatus
+        )
+    }
+}

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,22 +25,25 @@ 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()
-        initLocationManager()
     }
 
     // MARK: - 连续定位控制
 
     func start() {
-        locationManager?.startUpdatingLocation()
+        lastLocationEventTimestampMillis = nil
+        ensureLocationManager()?.startUpdatingLocation()
         isLocationStarted = true
     }
 
     func stop() {
-        locationManager?.stopUpdatingLocation()
+        ensureLocationManager()?.stopUpdatingLocation()
         isLocationStarted = false
+        lastLocationEventTimestampMillis = nil
     }
 
     func isStarted() -> Bool {
@@ -50,19 +53,23 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
     // MARK: - 高德定位配置 API
 
     func setLocatingWithReGeocode(_ isReGeocode: Bool) {
-        locationManager?.locatingWithReGeocode = isReGeocode
+        ensureLocationManager()?.locatingWithReGeocode = isReGeocode
     }
 
     func setDistanceFilter(_ distance: Double) {
-        locationManager?.distanceFilter = distance
+        ensureLocationManager()?.distanceFilter = distance
+    }
+
+    func setInterval(_ interval: Int) {
+        locationIntervalMillis = max(interval, 0)
     }
 
     func setLocationTimeout(_ timeout: Int) {
-        locationManager?.locationTimeout = timeout
+        ensureLocationManager()?.locationTimeout = timeout
     }
 
     func setReGeocodeTimeout(_ timeout: Int) {
-        locationManager?.reGeocodeTimeout = timeout
+        ensureLocationManager()?.reGeocodeTimeout = timeout
     }
 
     func setDesiredAccuracy(_ accuracy: Int) {
@@ -76,11 +83,11 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         case 5: value = kCLLocationAccuracyThreeKilometers
         default: value = kCLLocationAccuracyBest
         }
-        locationManager?.desiredAccuracy = value
+        ensureLocationManager()?.desiredAccuracy = value
     }
 
     func setPausesLocationUpdatesAutomatically(_ pauses: Bool) {
-        locationManager?.pausesLocationUpdatesAutomatically = pauses
+        ensureLocationManager()?.pausesLocationUpdatesAutomatically = pauses
     }
 
     func setAllowsBackgroundLocationUpdates(_ allows: Bool) {
@@ -91,41 +98,75 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
                 return
             }
         }
-        locationManager?.allowsBackgroundLocationUpdates = allows
+        ensureLocationManager()?.allowsBackgroundLocationUpdates = allows
     }
 
-    func setGeoLanguage(_ language: Int) {
-        switch language {
-        case 0: locationManager?.reGeocodeLanguage = .default
-        case 1: locationManager?.reGeocodeLanguage = .chinse
-        case 2: locationManager?.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
         }
     }
 
     // MARK: - 方向
 
     func startUpdatingHeading() {
-        locationManager?.startUpdatingHeading()
+        ensureLocationManager()?.startUpdatingHeading()
     }
 
     func stopUpdatingHeading() {
-        locationManager?.stopUpdatingHeading()
+        ensureLocationManager()?.stopUpdatingHeading()
+    }
+
+    func requestSingleLocation(completion: @escaping (_ location: CLLocation?, _ reGeocode: AMapLocationReGeocode?, _ error: Error?) -> Void) {
+        guard let manager = ensureLocationManager() else {
+            let error = NSError(
+                domain: "ExpoGaodeMap",
+                code: -1,
+                userInfo: [NSLocalizedDescriptionKey: "定位管理器未初始化，请先完成隐私协议确认"]
+            )
+            completion(nil, nil, error)
+            return
+        }
+
+        manager.requestLocation(
+            withReGeocode: manager.locatingWithReGeocode,
+            completionBlock: completion
+        )
     }
 
     // MARK: - 初始化
 
-    private func initLocationManager() {
-        locationManager = AMapLocationManager()
-        locationManager?.delegate = self
+    @discardableResult
+    private func ensureLocationManager() -> AMapLocationManager? {
+        if let locationManager {
+            return locationManager
+        }
+
+        guard GaodeMapPrivacyManager.isReady else {
+            log.warn("⚠️ [ExpoGaodeMap] iOS 定位模块在隐私同意前不会初始化 AMapLocationManager")
+            return nil
+        }
+
+        GaodeMapPrivacyManager.applyPrivacyState()
+
+        let manager = AMapLocationManager()
+        manager.delegate = self
 
         // 默认配置
-        locationManager?.desiredAccuracy = kCLLocationAccuracyHundredMeters
-        locationManager?.distanceFilter = 10
-        locationManager?.locationTimeout = 10
-        locationManager?.reGeocodeTimeout = 5
-        locationManager?.locatingWithReGeocode = true
-        locationManager?.pausesLocationUpdatesAutomatically = false
+        manager.desiredAccuracy = kCLLocationAccuracyHundredMeters
+        manager.distanceFilter = 10
+        manager.locationTimeout = 10
+        manager.reGeocodeTimeout = 5
+        manager.locatingWithReGeocode = true
+        manager.pausesLocationUpdatesAutomatically = false
+
+        locationManager = manager
+        return manager
     }
 
     // MARK: - Delegate（连续定位回调）
@@ -141,6 +182,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
@@ -158,14 +200,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)
@@ -184,6 +237,11 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
      * @param promise Promise
      */
     func coordinateConvert(_ coordinate: [String: Double], type: Int, promise: Promise) {
+        guard GaodeMapPrivacyManager.isReady else {
+            promise.reject("PRIVACY_NOT_AGREED", "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree")
+            return
+        }
+
         guard let lat = coordinate["latitude"],
               let lon = coordinate["longitude"] else {
             promise.reject("INVALID_ARGUMENT", "Invalid coordinate")
@@ -218,5 +276,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 {
             }
         }
     }
-}
+}