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

package/ios/map/managers/UIManager.swift

@@ -17,6 +17,9 @@ class UIManager: NSObject, MAMapViewDelegate {
     /// 定位变化回调
     var onLocationChanged: ((_ latitude: Double, _ longitude: Double, _ accuracy: Double) -> Void)?
     
+    /// 缓存的自定义样式配置
+    private var cachedCustomStyleOptions: MAMapCustomStyleOptions?
+    
     init(mapView: MAMapView) {
         self.mapView = mapView
         super.init()
@@ -36,6 +39,13 @@ class UIManager: NSObject, MAMapViewDelegate {
         case 3: mapView.mapType = .navi
         default: mapView.mapType = .standard
         }
+        
+        // 🔑 关键修复：切换地图类型后重新应用自定义样式
+        // 某些地图类型切换可能会重置样式设置
+        if let cachedOptions = cachedCustomStyleOptions {
+            mapView.setCustomMapStyleOptions(cachedOptions)
+            mapView.customMapStyleEnabled = true
+        }
     }
     
     // MARK: - 控件显示
@@ -109,7 +119,8 @@ class UIManager: NSObject, MAMapViewDelegate {
             }
             mapView.showsUserLocation = true
             if followUser {
-                mapView.userTrackingMode = .follow
+                // 🔑 使用 followWithHeading 模式以支持方向指示器
+                mapView.userTrackingMode = .followWithHeading
             } else {
                 mapView.userTrackingMode = .none
             }
@@ -146,6 +157,12 @@ class UIManager: NSObject, MAMapViewDelegate {
         guard let mapView = mapView else { return }
         let representation = MAUserLocationRepresentation()
         
+        // 是否显示定位蓝点 (showMyLocation) - 对应 Android 的 showMyLocation
+        // iOS 通过 mapView.showsUserLocation 控制，这里提供统一的 API
+        if let showMyLocation = config["showMyLocation"] as? Bool {
+            mapView.showsUserLocation = showMyLocation
+        }
+        
         // 精度圈是否显示
         if let showsAccuracyRing = config["showsAccuracyRing"] as? Bool {
             representation.showsAccuracyRing = showsAccuracyRing
@@ -265,4 +282,58 @@ class UIManager: NSObject, MAMapViewDelegate {
     func setShowsIndoorMap(_ show: Bool) {
         mapView?.isShowsIndoorMap = show
     }
+    
+    // MARK: - 自定义地图样式
+    
+    /**
+     * 设置自定义地图样式
+     * @param styleData 样式数据，支持以下格式：
+     *   - styleId: String - 在线样式ID（从高德开放平台获取）
+     *   - styleDataPath: String - 本地样式文件路径
+     *   - extraStyleDataPath: String - 额外样式文件路径（可选）
+     */
+    func setCustomMapStyle(_ styleData: [String: Any]) {
+        guard let mapView = mapView else { return }
+        
+        // 在线样式 ID
+        if let styleId = styleData["styleId"] as? String, !styleId.isEmpty {
+            let customStyle = MAMapCustomStyleOptions()
+            customStyle.styleId = styleId
+            
+            // 🔑 缓存样式配置
+            cachedCustomStyleOptions = customStyle
+            
+            mapView.setCustomMapStyleOptions(customStyle)
+            mapView.customMapStyleEnabled = true
+            return
+        }
+        
+        // 本地样式文件
+        if let styleDataPath = styleData["styleDataPath"] as? String, !styleDataPath.isEmpty {
+            // 读取样式文件数据
+            if let stylePath = Bundle.main.path(forResource: styleDataPath, ofType: nil),
+               let styleFileData = try? Data(contentsOf: URL(fileURLWithPath: stylePath)) {
+                let customStyle = MAMapCustomStyleOptions()
+                customStyle.styleData = styleFileData
+                
+                // 额外样式文件（可选）
+                if let extraPath = styleData["extraStyleDataPath"] as? String, !extraPath.isEmpty,
+                   let extraFilePath = Bundle.main.path(forResource: extraPath, ofType: nil),
+                   let extraFileData = try? Data(contentsOf: URL(fileURLWithPath: extraFilePath)) {
+                    customStyle.styleExtraData = extraFileData
+                }
+                
+                // 🔑 缓存样式配置
+                cachedCustomStyleOptions = customStyle
+                
+                mapView.setCustomMapStyleOptions(customStyle)
+                mapView.customMapStyleEnabled = true
+                return
+            }
+        }
+        
+        // 如果没有提供任何样式，禁用自定义样式并清除缓存
+        cachedCustomStyleOptions = nil
+        mapView.customMapStyleEnabled = false
+    }
 }

package/ios/map/modules/LocationManager.swift

@@ -1,5 +1,6 @@
 import Foundation
 import AMapLocationKit
+import AMapFoundationKit
 import CoreLocation
 import ExpoModulesCore
 
@@ -12,117 +13,76 @@ import ExpoModulesCore
  * - 方向传感器管理
  * - 定位结果回调
  */
+
 class LocationManager: NSObject, AMapLocationManagerDelegate {
-    /// 高德定位管理器实例
+
+    // 高德定位对象
     var locationManager: AMapLocationManager?
-    /// 定位是否已启动
+
+    // 连续定位是否已开启
     private var isLocationStarted = false
-    /// 定位更新回调
+
+    // 连续定位 event 回调（给 JS map listener 用）
     var onLocationUpdate: (([String: Any]) -> Void)?
-    /// 方向更新回调
     var onHeadingUpdate: (([String: Any]) -> Void)?
-    
+
     override init() {
         super.init()
         initLocationManager()
     }
-    
-    // MARK: - 定位控制
-    
-    /**
-     * 开始连续定位
-     */
+
+    // MARK: - 连续定位控制
+
     func start() {
         locationManager?.startUpdatingLocation()
         isLocationStarted = true
     }
-    
-    /**
-     * 停止定位
-     */
+
     func stop() {
         locationManager?.stopUpdatingLocation()
         isLocationStarted = false
     }
-    
-    /**
-     * 检查定位是否已启动
-     * @return 是否正在定位
-     */
+
     func isStarted() -> Bool {
         return isLocationStarted
     }
-    
-    // MARK: - 定位配置
-    
-    /**
-     * 设置是否返回逆地理信息
-     * @param isReGeocode 是否返回逆地理信息
-     */
+
+    // MARK: - 高德定位配置 API
+
     func setLocatingWithReGeocode(_ isReGeocode: Bool) {
         locationManager?.locatingWithReGeocode = isReGeocode
     }
-    
-    /**
-     * 设置定位距离过滤器(米)
-     * @param distance 最小距离变化才触发定位更新
-     */
+
     func setDistanceFilter(_ distance: Double) {
         locationManager?.distanceFilter = distance
     }
-    
-    /**
-     * 设置定位超时时间(秒)
-     * @param timeout 超时时间
-     */
+
     func setLocationTimeout(_ timeout: Int) {
         locationManager?.locationTimeout = timeout
     }
-    
-    /**
-     * 设置逆地理超时时间(秒)
-     * @param timeout 超时时间
-     */
+
     func setReGeocodeTimeout(_ timeout: Int) {
         locationManager?.reGeocodeTimeout = timeout
     }
-    
-    /**
-     * 设置定位精度
-     * @param accuracy 精度级别
-     *   - 0: 最适合导航
-     *   - 1: 最佳精度
-     *   - 2: 10米精度
-     *   - 3: 100米精度
-     *   - 4: 1公里精度
-     *   - 5: 3公里精度
-     */
+
     func setDesiredAccuracy(_ accuracy: Int) {
-        let accuracyValue: CLLocationAccuracy
+        let value: CLLocationAccuracy
         switch accuracy {
-        case 0: accuracyValue = kCLLocationAccuracyBestForNavigation
-        case 1: accuracyValue = kCLLocationAccuracyBest
-        case 2: accuracyValue = kCLLocationAccuracyNearestTenMeters
-        case 3: accuracyValue = kCLLocationAccuracyHundredMeters
-        case 4: accuracyValue = kCLLocationAccuracyKilometer
-        case 5: accuracyValue = kCLLocationAccuracyThreeKilometers
-        default: accuracyValue = kCLLocationAccuracyBest
+        case 0: value = kCLLocationAccuracyBestForNavigation
+        case 1: value = kCLLocationAccuracyBest
+        case 2: value = kCLLocationAccuracyNearestTenMeters
+        case 3: value = kCLLocationAccuracyHundredMeters
+        case 4: value = kCLLocationAccuracyKilometer
+        case 5: value = kCLLocationAccuracyThreeKilometers
+        default: value = kCLLocationAccuracyBest
         }
-        locationManager?.desiredAccuracy = accuracyValue
+        locationManager?.desiredAccuracy = value
     }
-    
-    /**
-     * 设置是否自动暂停定位更新
-     * @param pauses 是否自动暂停
-     */
+
     func setPausesLocationUpdatesAutomatically(_ pauses: Bool) {
         locationManager?.pausesLocationUpdatesAutomatically = pauses
     }
-    
-    /**
-     * 设置是否允许后台定位
-     * @param allows 是否允许后台定位
-     */
+
     func setAllowsBackgroundLocationUpdates(_ allows: Bool) {
         if allows {
             let backgroundModes = Bundle.main.object(forInfoDictionaryKey: "UIBackgroundModes") as? [String]
@@ -133,14 +93,7 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         }
         locationManager?.allowsBackgroundLocationUpdates = allows
     }
-    
-    /**
-     * 设置逆地理语言
-     * @param language 语言类型
-     *   - 0: 默认
-     *   - 1: 中文
-     *   - 2: 英文
-     */
+
     func setGeoLanguage(_ language: Int) {
         switch language {
         case 0: locationManager?.reGeocodeLanguage = .default
@@ -149,71 +102,41 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         default: break
         }
     }
-    
-    // MARK: - 方向传感器
-    
-    /**
-     * 开始更新设备方向
-     */
+
+    // MARK: - 方向
+
     func startUpdatingHeading() {
         locationManager?.startUpdatingHeading()
     }
-    
-    /**
-     * 停止更新设备方向
-     */
+
     func stopUpdatingHeading() {
         locationManager?.stopUpdatingHeading()
     }
-    
-    // MARK: - 生命周期
-    
-    /**
-     * 销毁定位管理器
-     */
-    func destroy() {
-        locationManager?.stopUpdatingLocation()
-        locationManager?.stopUpdatingHeading()
-        locationManager?.delegate = nil
-        locationManager = nil
-        onLocationUpdate = nil
-        onHeadingUpdate = nil
-    }
-    
-    /**
-     * 初始化定位管理器
-     */
+
+    // MARK: - 初始化
+
     private func initLocationManager() {
         locationManager = AMapLocationManager()
         locationManager?.delegate = self
-        // 推荐配置：百米精度，快速定位
+
+        // 默认配置
         locationManager?.desiredAccuracy = kCLLocationAccuracyHundredMeters
         locationManager?.distanceFilter = 10
-        // 增加超时时间，避免首次授权时超时(首次定位建议10秒以上)
-        locationManager?.locationTimeout = 10  // 10秒超时
-        locationManager?.reGeocodeTimeout = 5   // 5秒超时
+        locationManager?.locationTimeout = 10
+        locationManager?.reGeocodeTimeout = 5
         locationManager?.locatingWithReGeocode = true
-        
-        // iOS 9 之前:防止后台被系统挂起(默认关闭,用户可通过 setPausesLocationUpdatesAutomatically 配置)
         locationManager?.pausesLocationUpdatesAutomatically = false
     }
-    
-    // MARK: - AMapLocationManagerDelegate
-    
-    /**
-     * 定位更新回调
-     * @param manager 定位管理器
-     * @param location 位置信息
-     * @param reGeocode 逆地理信息
-     */
-    func amapLocationManager(_ manager: AMapLocationManager!, didUpdate location: CLLocation!, reGeocode: AMapLocationReGeocode!) {
-        // 🔑 坐标验证：防止无效坐标
-        guard location.coordinate.latitude >= -90 && location.coordinate.latitude <= 90,
-              location.coordinate.longitude >= -180 && location.coordinate.longitude <= 180 else {
-            return
-        }
-        
-        var locationData: [String: Any] = [
+
+    // MARK: - Delegate（连续定位回调）
+
+    func amapLocationManager(_ manager: AMapLocationManager!,
+                             didUpdate location: CLLocation!,
+                             reGeocode: AMapLocationReGeocode!) {
+
+        guard let location = location else { return }
+
+        var data: [String: Any] = [
             "latitude": location.coordinate.latitude,
             "longitude": location.coordinate.longitude,
             "accuracy": location.horizontalAccuracy,
@@ -222,28 +145,23 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
             "speed": location.speed,
             "timestamp": location.timestamp.timeIntervalSince1970 * 1000
         ]
-        
-        // 添加逆地理信息
-        if let reGeocode = reGeocode {
-            locationData["address"] = reGeocode.formattedAddress
-            locationData["province"] = reGeocode.province
-            locationData["city"] = reGeocode.city
-            locationData["district"] = reGeocode.district
-            locationData["street"] = reGeocode.street
-            locationData["streetNumber"] = reGeocode.number
-            locationData["country"] = reGeocode.country
-            locationData["cityCode"] = reGeocode.citycode
-            locationData["adCode"] = reGeocode.adcode
+
+        if let geo = reGeocode {
+            data["address"] = geo.formattedAddress
+            data["province"] = geo.province
+            data["city"] = geo.city
+            data["district"] = geo.district
+            data["street"] = geo.street
+            data["streetNumber"] = geo.number
+            data["country"] = geo.country
+            data["cityCode"] = geo.citycode
+            data["adCode"] = geo.adcode
         }
-        
-        onLocationUpdate?(locationData)
+
+        // 触发连续定位回调
+        onLocationUpdate?(data)
     }
-    
-    /**
-     * 方向更新回调
-     * @param manager 定位管理器
-     * @param heading 方向信息
-     */
+
     func amapLocationManager(_ manager: AMapLocationManager!, didUpdate heading: CLHeading!) {
         let headingData: [String: Any] = [
             "heading": heading.trueHeading,
@@ -252,22 +170,53 @@ class LocationManager: NSObject, AMapLocationManagerDelegate {
         ]
         onHeadingUpdate?(headingData)
     }
-    
-    /**
-     * 需要定位权限回调
-     * @param manager 定位管理器
-     * @param locationManager 系统定位管理器
-     */
-    func amapLocationManager(_ manager: AMapLocationManager!, doRequireLocationAuth locationManager: CLLocationManager!) {
-        locationManager.requestAlwaysAuthorization()
+
+    func amapLocationManager(_ manager: AMapLocationManager!, didFailWithError error: Error!) {
+        // 定位失败 - 静默处理（连续定位会自动重试）
     }
-    
+
+    // MARK: - 工具方法
+
     /**
-     * 定位失败回调
-     * @param manager 定位管理器
-     * @param error 错误信息
+     * 坐标转换
+     * @param coordinate 原始坐标
+     * @param type 坐标类型 (0: GPS/Google, 1: MapBar, 2: Baidu, 3: MapABC/SoSo)
+     * @param promise Promise
      */
-    func amapLocationManager(_ manager: AMapLocationManager!, didFailWithError error: Error!) {
-        // 定位失败 - 静默处理
+    func coordinateConvert(_ coordinate: [String: Double], type: Int, promise: Promise) {
+        guard let lat = coordinate["latitude"],
+              let lon = coordinate["longitude"] else {
+            promise.reject("INVALID_ARGUMENT", "Invalid coordinate")
+            return
+        }
+        
+        let coord = CLLocationCoordinate2D(latitude: lat, longitude: lon)
+        var amapType: AMapCoordinateType
+        
+        // 根据文档映射
+        switch type {
+        case 0: amapType = AMapCoordinateType.GPS
+        case 1: amapType = AMapCoordinateType.mapBar
+        case 2: amapType = AMapCoordinateType.baidu
+        case 3: amapType = AMapCoordinateType.mapABC
+        default: amapType = AMapCoordinateType.GPS
+        }
+        
+        let converted = AMapCoordinateConvert(coord, amapType)
+        
+        promise.resolve([
+            "latitude": converted.latitude,
+            "longitude": converted.longitude
+        ])
+    }
+
+    // MARK: - 销毁
+    func destroy() {
+        locationManager?.stopUpdatingLocation()
+        locationManager?.stopUpdatingHeading()
+        locationManager?.delegate = nil
+        locationManager = nil
+        onLocationUpdate = nil
+        onHeadingUpdate = nil
     }
 }

package/ios/map/overlays/CircleView.swift

@@ -1,5 +1,7 @@
 import ExpoModulesCore
 import AMapNaviKit
+import CoreLocation
+
 
 /**
  * 圆形覆盖物视图
@@ -9,18 +11,18 @@ import AMapNaviKit
  * - 管理圆形的样式(填充色、边框色、边框宽度)
  * - 响应属性变化并更新渲染
  */
-class NaviCircleView: ExpoView {
+class CircleView: ExpoView {
     /// 事件派发器 - 使用 onCirclePress 避免与 MarkerPress 冲突
     let onCirclePress = EventDispatcher()
     
     /// 圆心坐标
-    var circleCenter: [String: Double] = [:]
+    var circleCenter: [String: Double]?
     /// 半径(米)
     var radius: Double = 0
     /// 填充颜色
-    var fillColor: Any?
+    var fillColor: String?
     /// 边框颜色
-    var strokeColor: Any?
+    var strokeColor: String?
     /// 边框宽度
     var strokeWidth: Float = 0
     /// z-index 图层顺序
@@ -89,34 +91,17 @@ class NaviCircleView: ExpoView {
             return
         }
         
-        guard let latitude = circleCenter["latitude"],
-              let longitude = circleCenter["longitude"],
+        guard let center = LatLngParser.parseLatLng(circleCenter),
               radius > 0 else {
             return
         }
         
-        // 🔑 坐标验证：防止无效坐标导致崩溃
-        guard latitude >= -90 && latitude <= 90,
-              longitude >= -180 && longitude <= 180 else {
-            return
+        if let old = circle {
+            mapView.remove(old)
         }
         
-        // 🔑 半径验证：防止负数或过大的半径
-        let validRadius = max(0.1, min(radius, 1000000))
-        
-        if circle == nil {
-            let coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-            circle = MACircle(center: coordinate, radius: validRadius)
-            mapView.add(circle!)
-        } else {
-            // 先移除旧的
-            mapView.remove(circle!)
-            // 更新属性
-            circle?.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-            circle?.radius = validRadius
-            // 重新添加
-            mapView.add(circle!)
-        }
+        circle = MACircle(center: center, radius: radius)
+        mapView.add(circle!)
         
         renderer = nil
     }
@@ -142,11 +127,10 @@ class NaviCircleView: ExpoView {
     }
     
     /**
-     * 设置中心点
-     * @param center 中心点坐标 {latitude, longitude}
+     * 设置圆心
      */
-    func setCenter(_ center: [String: Double]) {
-        circleCenter = center
+    func setCenter(_ center: [String: Double]?) {
+        self.circleCenter = center
         updateCircle()
     }
     
@@ -163,7 +147,7 @@ class NaviCircleView: ExpoView {
      * 设置填充颜色
      * @param color 颜色值
      */
-    func setFillColor(_ color: Any?) {
+    func setFillColor(_ color: String?) {
         fillColor = color
         renderer = nil
         updateCircle()
@@ -173,7 +157,7 @@ class NaviCircleView: ExpoView {
      * 设置边框颜色
      * @param color 颜色值
      */
-    func setStrokeColor(_ color: Any?) {
+    func setStrokeColor(_ color: String?) {
         strokeColor = color
         renderer = nil
         updateCircle()

package/ios/map/overlays/CircleViewModule.swift

@@ -1,43 +1,43 @@
 import ExpoModulesCore
 
-public class NaviCircleViewModule: Module {
+public class CircleViewModule: Module {
     public func definition() -> ModuleDefinition {
-        Name("NaviCircleView")
+        Name("CircleView")
         
-        View(NaviCircleView.self) {
+        View(CircleView.self) {
             Events("onCirclePress")
             
-            Prop("center") { (view: NaviCircleView, center: [String: Double]) in
+            Prop("center") { (view: CircleView, center: [String: Double]?) in
                 view.setCenter(center)
             }
             
-            Prop("radius") { (view: NaviCircleView, radius: Double) in
+            Prop("radius") { (view: CircleView, radius: Double) in
                 view.setRadius(radius)
             }
             
-            Prop("fillColor") { (view: NaviCircleView, color: String) in
+            Prop("fillColor") { (view: CircleView, color: String?) in
                 view.setFillColor(color)
             }
             
-            Prop("strokeColor") { (view: NaviCircleView, color: String) in
+            Prop("strokeColor") { (view: CircleView, color: String?) in
                 view.setStrokeColor(color)
             }
             
-            Prop("strokeWidth") { (view: NaviCircleView, width: Double) in
+            Prop("strokeWidth") { (view: CircleView, width: Double) in
                 view.setStrokeWidth(Float(width))
             }
 
-            Prop("zIndex") { (view: NaviCircleView, zIndex: Double) in
+            Prop("zIndex") { (view: CircleView, zIndex: Double) in
                 view.setZIndex(zIndex)
             }
             
-            OnViewDidUpdateProps { (view: NaviCircleView) in
+            OnViewDidUpdateProps { (view: CircleView) in
                 // 属性更新完成后，如果还没连接地图，尝试连接
                 if !view.isMapConnected() {
-                    // 查找父视图 NaviMapView
+                    // 查找父视图 ExpoGaodeMapView
                     var parent = view.superview
                     while parent != nil {
-                        if let mapView = parent as? NaviMapView {
+                        if let mapView = parent as? ExpoGaodeMapView {
                             view.setMap(mapView.mapView)
                             return
                         }

package/ios/map/overlays/ClusterAnnotation.swift

@@ -0,0 +1,32 @@
+import Foundation
+import CoreLocation
+import AMapNaviKit
+
+class ClusterAnnotation: NSObject, MAAnnotation {
+    @objc dynamic var coordinate: CLLocationCoordinate2D
+    var count: Int
+    var pois: [[String: Any]]
+    
+    // MAAnnotation required properties
+    var title: String?
+    var subtitle: String?
+    
+    init(coordinate: CLLocationCoordinate2D, count: Int, pois: [[String: Any]]) {
+        self.coordinate = coordinate
+        self.count = count
+        self.pois = pois
+        self.title = "\(count)个点"
+        super.init()
+    }
+    
+    override func isEqual(_ object: Any?) -> Bool {
+        guard let other = object as? ClusterAnnotation else { return false }
+        return self.coordinate.latitude == other.coordinate.latitude &&
+               self.coordinate.longitude == other.coordinate.longitude &&
+               self.count == other.count
+    }
+    
+    override var hash: Int {
+        return "\(coordinate.latitude),\(coordinate.longitude),\(count)".hashValue
+    }
+}