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

package/ios/map/overlays/MarkerViewModule.swift

@@ -1,70 +1,90 @@
 import ExpoModulesCore
 
-public class NaviMarkerViewModule: Module {
+public class MarkerViewModule: Module {
     public func definition() -> ModuleDefinition {
-        Name("NaviMarkerView")
+        Name("MarkerView")
         
-        View(NaviMarkerView.self) {
+        View(MarkerView.self) {
             // 🔑 声明专属事件（避免与其他组件冲突）
             Events("onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd")
             
             // 拆分 position 为两个独立属性以兼容 React Native 旧架构
-            Prop("latitude") { (view: NaviMarkerView, lat: Double) in
+            Prop("latitude") { (view: MarkerView, lat: Double) in
                 view.setLatitude(lat)
             }
             
-            Prop("longitude") { (view: NaviMarkerView, lng: Double) in
+            Prop("longitude") { (view: MarkerView, lng: Double) in
                 view.setLongitude(lng)
             }
             
-            Prop("title") { (view: NaviMarkerView, title: String) in
+            Prop("title") { (view: MarkerView, title: String) in
                 view.setTitle(title)
             }
             
-            Prop("snippet") { (view: NaviMarkerView, snippet: String) in
+            Prop("snippet") { (view: MarkerView, snippet: String) in
                 view.setDescription(snippet)
             }
             
-            Prop("draggable") { (view: NaviMarkerView, draggable: Bool) in
+            Prop("draggable") { (view: MarkerView, draggable: Bool) in
                 view.setDraggable(draggable)
             }
             
-            Prop("icon") { (view: NaviMarkerView, source: String?) in
+            Prop("icon") { (view: MarkerView, source: String?) in
                 view.setIconUri(source)
             }
             
-            Prop("iconWidth") { (view: NaviMarkerView, width: Double) in
+            Prop("iconWidth") { (view: MarkerView, width: Double) in
                 view.iconWidth = width
             }
             
-            Prop("iconHeight") { (view: NaviMarkerView, height: Double) in
+            Prop("iconHeight") { (view: MarkerView, height: Double) in
                 view.iconHeight = height
             }
             
-            Prop("customViewWidth") { (view: NaviMarkerView, width: Double) in
+            Prop("customViewWidth") { (view: MarkerView, width: Double) in
                 view.customViewWidth = width
             }
             
-            Prop("customViewHeight") { (view: NaviMarkerView, height: Double) in
+            Prop("customViewHeight") { (view: MarkerView, height: Double) in
                 view.customViewHeight = height
             }
             
-            Prop("centerOffset") { (view: NaviMarkerView, offset: [String: Double]) in
+            Prop("centerOffset") { (view: MarkerView, offset: [String: Double]) in
                 view.setCenterOffset(offset)
             }
             
-            Prop("animatesDrop") { (view: NaviMarkerView, animate: Bool) in
+            Prop("animatesDrop") { (view: MarkerView, animate: Bool) in
                 view.setAnimatesDrop(animate)
             }
             
-            Prop("pinColor") { (view: NaviMarkerView, color: String) in
+            Prop("pinColor") { (view: MarkerView, color: String) in
                 view.setPinColor(color)
             }
             
-            Prop("canShowCallout") { (view: NaviMarkerView, show: Bool) in
-                view.setCanShowCallout(show)
+            Prop("canShowCallout") { (view: MarkerView, canShow: Bool) in
+                view.canShowCallout = canShow
+            }
+
+            Prop("growAnimation") { (view: MarkerView, enabled: Bool) in
+                view.growAnimation = enabled
+            }
+             Prop("cacheKey") { (view: MarkerView, key: String) in
+                view.setCacheKey(key)
+            }
+            
+            Prop("position") { (view: MarkerView, position: [String: Double]?) in
+                view.setPosition(position)
+            }
+            
+            // 平滑移动路径
+            Prop("smoothMovePath") { (view: MarkerView, path: [[String: Double]]) in
+                view.setSmoothMovePath(path)
             }
             
+            // 平滑移动时长（秒）
+            Prop("smoothMoveDuration") { (view: MarkerView, duration: Double) in
+                view.setSmoothMoveDuration(duration)
+            }
         }
     }
 }

package/ios/map/overlays/MultiPointView.swift

@@ -1,11 +1,20 @@
 import ExpoModulesCore
 import AMapNaviKit
+import UIKit
 
-class NaviMultiPointView: ExpoView {
-    var points: [[String: Any]] = []
+class MultiPointView: ExpoView {
+    let onMultiPointPress = EventDispatcher()
+    
+    var pointsData: [[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)
@@ -17,10 +26,31 @@ class NaviMultiPointView: ExpoView {
     }
     
     func setPoints(_ points: [[String: Any]]) {
-        self.points = points
+        self.pointsData = points
         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,30 +58,158 @@ class NaviMultiPointView: ExpoView {
         if let oldOverlay = multiPointOverlay {
             mapView.remove(oldOverlay)
             multiPointOverlay = nil
+            renderer = nil
         }
         
         // 验证数据有效性
-        guard !points.isEmpty else { return }
+        guard !pointsData.isEmpty else { return }
         
         var items: [MAMultiPointItem] = []
-        for point in points {
-            guard let latitude = point["latitude"] as? Double,
-                  let longitude = point["longitude"] as? Double else {
+        for point in pointsData {
+            guard let coordinate = LatLngParser.parseLatLng(point) else {
                 continue
             }
             
             let item = MAMultiPointItem()
-            item.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+            item.coordinate = coordinate
+            
+            // 如果是 Map，尝试获取 ID
+            if let pointDict = point as? [String: Any] {
+                if let customerId = pointDict["customerId"] as? String {
+                    item.customID = customerId
+                } else if let id = pointDict["id"] as? String {
+                    item.customID = id
+                }
+            }
+            
             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 = pointsData.firstIndex { point in
+                return (point["customerId"] as? String) == customID || (point["id"] as? String) == customID
+            } ?? -1
+        }
+        
+        // 如果没找到，尝试通过坐标查找（不够精确，但作为备选）
+        if index == -1 {
+            index = pointsData.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 = pointsData[index]
+            onMultiPointPress([
+                "index": index,
+                "customerId": pointData?["customerId"] ?? pointData?["id"] ?? "",
+                "latitude": item.coordinate.latitude,
+                "longitude": item.coordinate.longitude
+            ])
+        }
+    }
+
     /**
      * 移除多点覆盖物
      */
@@ -76,4 +234,4 @@ class NaviMultiPointView: ExpoView {
         removeMultiPoint()
         mapView = nil
     }
-}
+}

package/ios/map/overlays/MultiPointViewModule.swift

@@ -1,12 +1,34 @@
 import ExpoModulesCore
 
-public class NaviMultiPointViewModule: Module {
+public class MultiPointViewModule: Module {
     public func definition() -> ModuleDefinition {
-        Name("NaviMultiPointView")
+        Name("MultiPointView")
         
-        View(NaviMultiPointView.self) {
-            Prop("points") { (view: NaviMultiPointView, points: [[String: Any]]) in
-                view.setPoints(points)
+        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/ios/map/overlays/PolygonView.swift

@@ -1,5 +1,6 @@
 import ExpoModulesCore
 import AMapNaviKit
+import CoreLocation
 
 /**
  * 多边形覆盖物视图
@@ -9,17 +10,22 @@ import AMapNaviKit
  * - 管理多边形样式(填充色、边框色、边框宽度)
  * - 响应属性变化并更新渲染
  */
-class NaviPolygonView: ExpoView {
+class PolygonView: ExpoView {
     let onPolygonPress = EventDispatcher()
     
     /// 多边形点数组
-    var points: [[String: Double]] = []
+    var points: [Any] = []
     /// 填充颜色
-    var fillColor: Any?
+    var fillColor: String?
     /// 边框颜色
-    var strokeColor: Any?
+    var strokeColor: String?
     /// 边框宽度
     var strokeWidth: Float = 0
+    /// 简化容差 (米)
+    var simplificationTolerance: Double = 0.0
+    
+    /// 简化完成事件派发器
+    let onPolygonSimplified = EventDispatcher()
     
     /// 地图视图引用
     private var mapView: MAMapView?
@@ -63,11 +69,7 @@ class NaviPolygonView: ExpoView {
      * @param map 地图视图
      */
     func setMap(_ map: MAMapView) {
-        let isNewMap = self.mapView == nil
         self.mapView = map
-        
-        // 无论是否是新地图，都调用 updatePolygon
-        // 这确保了即使在 setMap 之前设置了 props，覆盖物也能被正确创建
         updatePolygon()
     }
     
@@ -78,22 +80,51 @@ class NaviPolygonView: ExpoView {
         guard let mapView = mapView else { return }
         if let old = polygon { mapView.remove(old) }
         
-        // 🔑 坐标验证和过滤
-        var coords = points.compactMap { point -> CLLocationCoordinate2D? in
-            guard let lat = point["latitude"],
-                  let lng = point["longitude"],
-                  lat >= -90 && lat <= 90,
-                  lng >= -180 && lng <= 180 else {
-                return nil
-            }
-            return CLLocationCoordinate2D(latitude: lat, longitude: lng)
+        // 🔑 使用支持嵌套列表的坐标解析器
+        let nestedCoords = LatLngParser.parseLatLngListList(points)
+        guard !nestedCoords.isEmpty else { return }
+        
+        // 第一项是外轮廓
+        var outerCoords = nestedCoords[0]
+        
+        // 🔑 坐标简化 (如果设置了容差)
+        if simplificationTolerance > 0 {
+            let originalCount = outerCoords.count
+            outerCoords = GeometryUtils.simplifyPolyline(outerCoords, tolerance: simplificationTolerance)
+            
+            // 派发简化事件
+            onPolygonSimplified([
+                "originalCount": originalCount,
+                "simplifiedCount": outerCoords.count
+            ])
         }
         
         // 🔑 至少需要3个点才能绘制多边形
-        guard coords.count >= 3 else { return }
+        guard outerCoords.count >= 3 else { return }
         
-        polygon = MAPolygon(coordinates: &coords, count: UInt(coords.count))
-        mapView.add(polygon!)
+        // 处理内孔 (hollowShapes)
+        var hollowShapes: [MAOverlay] = []
+        if nestedCoords.count > 1 {
+            for i in 1..<nestedCoords.count {
+                var ring = nestedCoords[i]
+                if ring.count >= 3 {
+                    if let hole = MAPolygon(coordinates: &ring, count: UInt(ring.count)) {
+                        hollowShapes.append(hole)
+                    }
+                }
+            }
+        }
+        
+        // 创建主多边形
+        if let mainPolygon = MAPolygon(coordinates: &outerCoords, count: UInt(outerCoords.count)) {
+            // 如果有内孔，设置 hollowShapes 属性
+            if !hollowShapes.isEmpty {
+                mainPolygon.hollowShapes = hollowShapes
+            }
+            
+            self.polygon = mainPolygon
+            mapView.add(mainPolygon)
+        }
         
         renderer = nil
     }
@@ -118,7 +149,7 @@ class NaviPolygonView: ExpoView {
      * 设置多边形点数组
      * @param points 点数组
      */
-    func setPoints(_ points: [[String: Double]]) {
+    func setPoints(_ points: [Any]) {
         self.points = points
         updatePolygon()
     }
@@ -127,7 +158,7 @@ class NaviPolygonView: ExpoView {
      * 设置填充颜色
      * @param color 颜色值
      */
-    func setFillColor(_ color: Any?) {
+    func setFillColor(_ color: String?) {
         fillColor = color
         renderer = nil
         updatePolygon()
@@ -137,7 +168,7 @@ class NaviPolygonView: ExpoView {
      * 设置边框颜色
      * @param color 颜色值
      */
-    func setStrokeColor(_ color: Any?) {
+    func setStrokeColor(_ color: String?) {
         strokeColor = color
         renderer = nil
         updatePolygon()
@@ -152,6 +183,14 @@ class NaviPolygonView: ExpoView {
         renderer = nil
         updatePolygon()
     }
+
+    /**
+     * 设置简化容差
+     */
+    func setSimplificationTolerance(_ tolerance: Double) {
+        simplificationTolerance = tolerance
+        updatePolygon()
+    }
     
     /**
      * 视图即将从父视图移除时调用

package/ios/map/overlays/PolygonViewModule.swift

@@ -1,33 +1,39 @@
 import ExpoModulesCore
 
-public class NaviPolygonViewModule: Module {
+public class PolygonViewModule: Module {
     public func definition() -> ModuleDefinition {
-        Name("NaviPolygonView")
+        Name("PolygonView")
         
-        View(NaviPolygonView.self) {
-            Events("onPolygonPress")
+        View(PolygonView.self) {
+            Events("onPolygonPress", "onPolygonSimplified")
             
-            Prop("points") { (view: NaviPolygonView, points: [[String: Double]]) in
-                view.setPoints(points)
-            }
+            Prop("points") { (view: PolygonView, points: [Any]) in
+            view.setPoints(points)
+        }
             
-            Prop("fillColor") { (view: NaviPolygonView, color: String) in
+            Prop("fillColor") { (view: PolygonView, color: String?) in
                 view.setFillColor(color)
             }
             
-            Prop("strokeColor") { (view: NaviPolygonView, color: String) in
+            Prop("strokeColor") { (view: PolygonView, color: String?) in
                 view.setStrokeColor(color)
             }
             
-            Prop("strokeWidth") { (view: NaviPolygonView, width: Double) in
+            Prop("strokeWidth") { (view: PolygonView, width: Double) in
                 view.setStrokeWidth(Float(width))
             }
+
+            Prop("simplificationTolerance") { (view: PolygonView, tolerance: Double) in
+                view.setSimplificationTolerance(tolerance)
+            }
             
-            OnViewDidUpdateProps { (view: NaviPolygonView) in
+            OnViewDidUpdateProps { (view: PolygonView) in
+                // 属性更新完成后，如果还没连接地图，尝试连接
                 if !view.isMapConnected() {
+                    // 查找父视图 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/PolylineView.swift

@@ -1,5 +1,6 @@
 import ExpoModulesCore
 import AMapNaviKit
+import CoreLocation
 
 /**
  * 折线覆盖物视图
@@ -9,17 +10,19 @@ import AMapNaviKit
  * - 支持纹理贴图（仅 3D 地图支持）
  * - 管理折线样式(线宽、颜色)
  */
-class NaviPolylineView: ExpoView {
+class PolylineView: ExpoView {
     /// 折线点数组
     var points: [[String: Double]] = []
     /// 线宽
     var strokeWidth: Float = 0
     /// 线条颜色
-    var strokeColor: Any?
+    var strokeColor: String?
     /// 是否虚线
     var isDotted: Bool = false
     /// 纹理图片 URL
     var textureUrl: String?
+    /// 简化容差 (米)
+    var simplificationTolerance: Double = 0.0
     
     /// 点击事件派发器
     let onPolylinePress = EventDispatcher()
@@ -76,6 +79,14 @@ class NaviPolylineView: ExpoView {
         updatePolyline()
     }
     
+    /**
+     * 设置简化容差
+     */
+    func setSimplificationTolerance(_ tolerance: Double) {
+        simplificationTolerance = tolerance
+        updatePolyline()
+    }
+
     /**
      * 更新折线覆盖物
      */
@@ -83,15 +94,12 @@ class NaviPolylineView: ExpoView {
         guard let mapView = mapView else { return }
         if let old = polyline { mapView.remove(old) }
         
-        // 🔑 坐标验证和过滤
-        var coords = points.compactMap { point -> CLLocationCoordinate2D? in
-            guard let lat = point["latitude"],
-                  let lng = point["longitude"],
-                  lat >= -90 && lat <= 90,
-                  lng >= -180 && lng <= 180 else {
-                return nil
-            }
-            return CLLocationCoordinate2D(latitude: lat, longitude: lng)
+        // 🔑 使用统一的坐标解析器
+        var coords = LatLngParser.parseLatLngList(points)
+        
+        // 🔑 坐标简化 (如果设置了容差)
+        if simplificationTolerance > 0 && coords.count > 2 {
+            coords = GeometryUtils.simplifyPolyline(coords, tolerance: simplificationTolerance)
         }
         
         // 🔑 至少需要2个点才能绘制折线
@@ -133,7 +141,7 @@ class NaviPolylineView: ExpoView {
                 return
             }
             URLSession.shared.dataTask(with: imageUrl) { [weak self] data, _, error in
-                if let error = error {
+                if error != nil {
                     return
                 }
                 guard let data = data, let image = UIImage(data: data) else {
@@ -195,7 +203,7 @@ class NaviPolylineView: ExpoView {
      * 设置线条颜色
      * @param color 颜色值
      */
-    func setStrokeColor(_ color: Any?) {
+    func setStrokeColor(_ color: String?) {
         strokeColor = color
         renderer = nil
         forceRerender()