expo-gaode-map-navigation 2.0.3 → 2.0.4

package/ios/map/GaodeMapPrivacyManager.swift

@@ -0,0 +1,155 @@
+import AMapFoundationKit
+import AMapLocationKit
+import AMapNaviKit
+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/map/modules/LocationManager.swift

@@ -28,18 +28,17 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
 
     override init() {
         super.init()
-        initLocationManager()
     }
 
     // MARK: - 连续定位控制
 
     func start() {
-        locationManager?.startUpdatingLocation()
+        ensureLocationManager()?.startUpdatingLocation()
         isLocationStarted = true
     }
 
     func stop() {
-        locationManager?.stopUpdatingLocation()
+        ensureLocationManager()?.stopUpdatingLocation()
         isLocationStarted = false
     }
 
@@ -50,19 +49,19 @@ 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 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 +75,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,14 +90,14 @@ 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
+        case 0: ensureLocationManager()?.reGeocodeLanguage = .default
+        case 1: ensureLocationManager()?.reGeocodeLanguage = .chinse
+        case 2: ensureLocationManager()?.reGeocodeLanguage = .english
         default: break
         }
     }
@@ -106,26 +105,41 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
     // MARK: - 方向
 
     func startUpdatingHeading() {
-        locationManager?.startUpdatingHeading()
+        ensureLocationManager()?.startUpdatingHeading()
     }
 
     func stopUpdatingHeading() {
-        locationManager?.stopUpdatingHeading()
+        ensureLocationManager()?.stopUpdatingHeading()
     }
 
     // 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（连续定位回调）
@@ -184,6 +198,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")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "高德地图导航功能模块 - 路径规划、导航引导，独立版本包含完整地图功能",
   "author": "<TomWq> (https://github.com/TomWq)",
   "repository": "https://github.com/TomWq/expo-gaode-map",