expo-gaode-map 1.0.1 → 1.0.3

package/ios/ExpoGaodeMapModule.swift

@@ -221,7 +221,7 @@ public class ExpoGaodeMapModule: Module {
         
         View(ExpoGaodeMapView.self) {
             // 事件 - 使用 Expo 的事件命名约定
-            Events("onMapPress", "onMapLongPress", "onLoad")
+            Events("onMapPress", "onMapLongPress", "onLoad", "onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd", "onCirclePress")
             
             // 地图类型
             Prop("mapType") { (view: ExpoGaodeMapView, type: Int) in
@@ -390,13 +390,41 @@ public class ExpoGaodeMapModule: Module {
                 view.setTitle(title)
             }
             
-            Prop("description") { (view: MarkerView, description: String) in
-                view.setDescription(description)
+            Prop("snippet") { (view: MarkerView, snippet: String) in
+                view.setDescription(snippet)
             }
             
             Prop("draggable") { (view: MarkerView, draggable: Bool) in
                 view.setDraggable(draggable)
             }
+            
+            Prop("icon") { (view: MarkerView, source: [String: Any]?) in
+                view.setIcon(source)
+            }
+            
+            Prop("iconWidth") { (view: MarkerView, width: Double) in
+                view.iconWidth = width
+            }
+            
+            Prop("iconHeight") { (view: MarkerView, height: Double) in
+                view.iconHeight = height
+            }
+            
+            Prop("centerOffset") { (view: MarkerView, offset: [String: Double]) in
+                view.setCenterOffset(offset)
+            }
+            
+            Prop("animatesDrop") { (view: MarkerView, animate: Bool) in
+                view.setAnimatesDrop(animate)
+            }
+            
+            Prop("pinColor") { (view: MarkerView, color: String) in
+                view.setPinColor(color)
+            }
+            
+            Prop("canShowCallout") { (view: MarkerView, show: Bool) in
+                view.setCanShowCallout(show)
+            }
         }
         
         // Circle - 圆形
@@ -411,16 +439,16 @@ public class ExpoGaodeMapModule: Module {
                 view.setRadius(radius)
             }
             
-            Prop("fillColor") { (view: CircleView, color: Int) in
+            Prop("fillColor") { (view: CircleView, color: String) in
                 view.setFillColor(color)
             }
             
-            Prop("strokeColor") { (view: CircleView, color: Int) in
+            Prop("strokeColor") { (view: CircleView, color: String) in
                 view.setStrokeColor(color)
             }
             
-            Prop("strokeWidth") { (view: CircleView, width: Float) in
-                view.setStrokeWidth(width)
+            Prop("strokeWidth") { (view: CircleView, width: Double) in
+                view.setStrokeWidth(Float(width))
             }
         }
         
@@ -432,11 +460,11 @@ public class ExpoGaodeMapModule: Module {
                 view.setPoints(points)
             }
             
-            Prop("strokeWidth") { (view: PolylineView, width: Float) in
-                view.setStrokeWidth(width)
+            Prop("strokeWidth") { (view: PolylineView, width: Double) in
+                view.setStrokeWidth(Float(width))
             }
             
-            Prop("strokeColor") { (view: PolylineView, color: Int) in
+            Prop("strokeColor") { (view: PolylineView, color: String) in
                 view.setStrokeColor(color)
             }
             
@@ -453,16 +481,16 @@ public class ExpoGaodeMapModule: Module {
                 view.setPoints(points)
             }
             
-            Prop("fillColor") { (view: PolygonView, color: Int) in
+            Prop("fillColor") { (view: PolygonView, color: String) in
                 view.setFillColor(color)
             }
             
-            Prop("strokeColor") { (view: PolygonView, color: Int) in
+            Prop("strokeColor") { (view: PolygonView, color: String) in
                 view.setStrokeColor(color)
             }
             
-            Prop("strokeWidth") { (view: PolygonView, width: Float) in
-                view.setStrokeWidth(width)
+            Prop("strokeWidth") { (view: PolygonView, width: Double) in
+                view.setStrokeWidth(Float(width))
             }
         }
         

package/ios/ExpoGaodeMapView.swift

@@ -59,6 +59,11 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
     let onMapPress = EventDispatcher()
     let onMapLongPress = EventDispatcher()
     let onLoad = EventDispatcher()
+    let onMarkerPress = EventDispatcher()
+    let onMarkerDragStart = EventDispatcher()
+    let onMarkerDrag = EventDispatcher()
+    let onMarkerDragEnd = EventDispatcher()
+    let onCirclePress = EventDispatcher()
     
     // MARK: - 私有属性
     
@@ -72,6 +77,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
     private var overlayManager: OverlayManager!
     /// 地图是否已加载完成
     private var isMapLoaded = false
+    /// 是否正在处理 annotation 选择事件
+    private var isHandlingAnnotationSelect = false
     
     // MARK: - 初始化
     
@@ -91,6 +98,11 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
         uiManager = UIManager(mapView: mapView)
         overlayManager = OverlayManager(mapView: mapView)
         
+        // 设置 Circle 点击回调
+        overlayManager.onCirclePress = { [weak self] event in
+            self?.onCirclePress(event)
+        }
+        
         setupDefaultConfig()
     }
     
@@ -106,13 +118,19 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate {
     override func addSubview(_ view: UIView) {
         super.addSubview(view)
         
+        print("🔧 添加子视图: \(type(of: view))")
+        
         if let markerView = view as? MarkerView {
+            print("✅ 识别为 MarkerView")
             markerView.setMap(mapView)
         } else if let circleView = view as? CircleView {
+            print("✅ 识别为 CircleView")
             circleView.setMap(mapView)
         } else if let polylineView = view as? PolylineView {
+            print("✅ 识别为 PolylineView")
             polylineView.setMap(mapView)
         } else if let polygonView = view as? PolygonView {
+            print("✅ 识别为 PolygonView")
             polygonView.setMap(mapView)
         } else if let heatMapView = view as? HeatMapView {
             heatMapView.setMap(mapView)
@@ -315,9 +333,64 @@ extension ExpoGaodeMapView {
      * 地图单击事件
      */
     public func mapView(_ mapView: MAMapView, didSingleTappedAt coordinate: CLLocationCoordinate2D) {
+        // 如果正在处理 annotation 选择，跳过地图点击事件
+        if isHandlingAnnotationSelect {
+            isHandlingAnnotationSelect = false
+            return
+        }
+        
+        // 检查是否点击了圆形 (声明式 CircleView)
+        if checkCirclePress(at: coordinate) {
+            return
+        }
+        
+        // 检查是否点击了圆形 (命令式 API)
+        if overlayManager.checkCirclePress(at: coordinate) {
+            return
+        }
+        
         onMapPress(["latitude": coordinate.latitude, "longitude": coordinate.longitude])
     }
     
+    /**
+     * 检查点击位置是否在圆形内
+     */
+    private func checkCirclePress(at coordinate: CLLocationCoordinate2D) -> Bool {
+        let circleViews = subviews.compactMap { $0 as? CircleView }
+        print("🔍 检查圆形点击 - 找到 \(circleViews.count) 个 CircleView")
+        
+        for circleView in circleViews {
+            guard let circle = circleView.circle else {
+                print("⚠️ CircleView 没有 circle 对象")
+                continue
+            }
+            
+            let circleCenter = circle.coordinate
+            let distance = calculateDistance(from: coordinate, to: circleCenter)
+            print("📍 圆心: (\(circleCenter.latitude), \(circleCenter.longitude)), 半径: \(circle.radius)m, 距离: \(distance)m")
+            
+            if distance <= circle.radius {
+                print("✅ 点击在圆形内，触发 onPress")
+                circleView.onPress([
+                    "latitude": coordinate.latitude,
+                    "longitude": coordinate.longitude
+                ])
+                return true
+            }
+        }
+        print("❌ 点击不在任何圆形内")
+        return false
+    }
+    
+    /**
+     * 计算两点间距离(米)
+     */
+    private func calculateDistance(from: CLLocationCoordinate2D, to: CLLocationCoordinate2D) -> Double {
+        let fromLocation = CLLocation(latitude: from.latitude, longitude: from.longitude)
+        let toLocation = CLLocation(latitude: to.latitude, longitude: to.longitude)
+        return fromLocation.distance(from: toLocation)
+    }
+    
     /**
      * 地图长按事件
      */
@@ -335,13 +408,63 @@ extension ExpoGaodeMapView {
         }
         
         if annotation.isKind(of: MAPointAnnotation.self) {
-            let identifier = "marker"
-            var view = mapView.dequeueReusableAnnotationView(withIdentifier: identifier)
-            if view == nil {
-                view = MAPinAnnotationView(annotation: annotation, reuseIdentifier: identifier)
+            guard let props = overlayManager.getMarkerProps(for: annotation) else {
+                return nil
+            }
+            
+            let iconUri = props["icon"] as? String
+            let iconWidth = props["iconWidth"] as? Double ?? 40
+            let iconHeight = props["iconHeight"] as? Double ?? 40
+            let pinColor = props["pinColor"] as? String ?? "red"
+            let draggable = props["draggable"] as? Bool ?? false
+            
+            // 如果有自定义图标，使用 MAAnnotationView
+            if let iconUri = iconUri, !iconUri.isEmpty {
+                var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: "custom_marker")
+                if annotationView == nil {
+                    annotationView = MAAnnotationView(annotation: annotation, reuseIdentifier: "custom_marker")
+                }
+                annotationView?.annotation = annotation
+                annotationView?.canShowCallout = true
+                annotationView?.isDraggable = draggable
+                
+                // 加载图标
+                loadMarkerIcon(iconUri: iconUri) { image in
+                    if let img = image {
+                        // 调整图标大小
+                        let size = CGSize(width: iconWidth, height: iconHeight)
+                        UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
+                        img.draw(in: CGRect(origin: .zero, size: size))
+                        let resizedImage = UIGraphicsGetImageFromCurrentImageContext()
+                        UIGraphicsEndImageContext()
+                        
+                        annotationView?.image = resizedImage
+                        // 设置中心点偏移，使标注底部中间点成为经纬度对应点
+                        annotationView?.centerOffset = CGPoint(x: 0, y: -iconHeight / 2)
+                    }
+                }
+                
+                return annotationView
+            }
+            
+            // 使用大头针样式
+            guard let pinView = MAPinAnnotationView(annotation: annotation, reuseIdentifier: "pin_marker") else {
+                return nil
             }
-            view?.canShowCallout = true
-            return view
+            pinView.canShowCallout = true
+            pinView.animatesDrop = true
+            pinView.isDraggable = draggable
+            
+            // 设置大头针颜色
+            if pinColor == "green" {
+                pinView.pinColor = .green
+            } else if pinColor == "purple" {
+                pinView.pinColor = .purple
+            } else {
+                pinView.pinColor = .red
+            }
+            
+            return pinView
         }
         return nil
     }
@@ -352,7 +475,7 @@ extension ExpoGaodeMapView {
      */
     public func mapView(_ mapView: MAMapView, rendererFor overlay: MAOverlay) -> MAOverlayRenderer {
         for subview in subviews {
-            if let circleView = subview as? CircleView, circleView.circle === overlay {
+            if let circleView = subview as? CircleView, let circle = circleView.circle, circle === overlay {
                 return circleView.getRenderer()
             } else if let polylineView = subview as? PolylineView, polylineView.polyline === overlay {
                 return polylineView.getRenderer()
@@ -363,4 +486,84 @@ extension ExpoGaodeMapView {
         
         return overlayManager.getRenderer(for: overlay) ?? MAOverlayRenderer(overlay: overlay)
     }
+    
+    /**
+     * 标注点击事件
+     */
+    public func mapView(_ mapView: MAMapView, didSelect view: MAAnnotationView) {
+        guard let annotation = view.annotation, !annotation.isKind(of: MAUserLocation.self) else {
+            return
+        }
+        
+        // 标记正在处理 annotation 选择，阻止地图点击事件
+        isHandlingAnnotationSelect = true
+        
+        // 查找对应的 markerId
+        if let markerId = overlayManager.getMarkerId(for: annotation) {
+            onMarkerPress([
+                "markerId": markerId,
+                "latitude": annotation.coordinate.latitude,
+                "longitude": annotation.coordinate.longitude
+            ])
+        }
+        
+        // 不要立即取消选中，让气泡有机会显示
+        // 用户点击地图其他地方时会自动取消选中
+    }
+    
+    /**
+     * 标注拖拽状态变化
+     */
+    public func mapView(_ mapView: MAMapView, annotationView view: MAAnnotationView, didChange newState: MAAnnotationViewDragState, fromOldState oldState: MAAnnotationViewDragState) {
+        guard let annotation = view.annotation else { return }
+        
+        if let markerId = overlayManager.getMarkerId(for: annotation) {
+            let coord = annotation.coordinate
+            let event: [String: Any] = [
+                "markerId": markerId,
+                "latitude": coord.latitude,
+                "longitude": coord.longitude
+            ]
+            
+            switch newState {
+            case .starting:
+                onMarkerDragStart(event)
+            case .dragging:
+                onMarkerDrag(event)
+            case .ending, .canceling:
+                onMarkerDragEnd(event)
+            default:
+                break
+            }
+        }
+    }
+    
+    /**
+     * 加载标记图标
+     * @param iconUri 图标 URI (支持 http/https/file/本地资源)
+     * @param completion 加载完成回调
+     */
+    private func loadMarkerIcon(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))
+        }
+    }
 }

package/ios/managers/OverlayManager.swift

@@ -18,6 +18,12 @@ class OverlayManager {
     private var overlayStyles: [String: [String: Any]] = [:]
     /// 标记点字典 (id -> annotation)
     private var annotations: [String: MAPointAnnotation] = [:]
+    /// 标记点属性字典 (id -> props)
+    private var markerProps: [String: [String: Any]] = [:]
+    /// Circle 点击回调
+    var onCirclePress: (([String: Any]) -> Void)?
+    /// Circle ID 映射 (overlay -> id)
+    private var circleIdMap: [MACircle: String] = [:]
     
     /**
      * 初始化覆盖物管理器
@@ -27,6 +33,28 @@ class OverlayManager {
         self.mapView = mapView
     }
     
+    /**
+     * 检查点击位置是否在圆形内
+     */
+    func checkCirclePress(at coordinate: CLLocationCoordinate2D) -> Bool {
+        for (circle, circleId) in circleIdMap {
+            let circleCenter = circle.coordinate
+            let fromLocation = CLLocation(latitude: coordinate.latitude, longitude: coordinate.longitude)
+            let toLocation = CLLocation(latitude: circleCenter.latitude, longitude: circleCenter.longitude)
+            let distance = fromLocation.distance(from: toLocation)
+            
+            if distance <= circle.radius {
+                onCirclePress?([
+                    "circleId": circleId,
+                    "latitude": coordinate.latitude,
+                    "longitude": coordinate.longitude
+                ])
+                return true
+            }
+        }
+        return false
+    }
+    
     // MARK: - Circle 圆形
     
     /**
@@ -43,8 +71,9 @@ class OverlayManager {
         
         let circle = MACircle(center: CLLocationCoordinate2D(latitude: latitude, longitude: longitude), radius: radius)
         overlayStyles[id] = props
-        mapView.add(circle!)
         overlays[id] = circle
+        circleIdMap[circle!] = id
+        mapView.add(circle!)
     }
     
     /**
@@ -52,10 +81,11 @@ class OverlayManager {
      * @param id 圆形唯一标识
      */
     func removeCircle(id: String) {
-        guard let mapView = mapView, let circle = overlays[id] else { return }
+        guard let mapView = mapView, let circle = overlays[id] as? MACircle else { return }
         mapView.remove(circle)
         overlays.removeValue(forKey: id)
         overlayStyles.removeValue(forKey: id)
+        circleIdMap.removeValue(forKey: circle)
     }
     
     /**
@@ -84,9 +114,24 @@ class OverlayManager {
         let annotation = MAPointAnnotation()
         annotation.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
         annotation.title = props["title"] as? String
-        annotation.subtitle = props["description"] as? String
-        mapView.addAnnotation(annotation)
+        annotation.subtitle = props["snippet"] as? String ?? props["description"] as? String
+        
+        // 先保存 props 和 annotation，再添加到地图
+        // 这样 viewFor annotation 回调时就能找到 props
         annotations[id] = annotation
+        markerProps[id] = props
+        
+        mapView.addAnnotation(annotation)
+    }
+    
+    /**
+     * 根据 annotation 获取 marker 属性
+     * @param annotation 标记点对象
+     * @return 对应的属性字典
+     */
+    func getMarkerProps(for annotation: MAAnnotation) -> [String: Any]? {
+        guard let id = getMarkerId(for: annotation) else { return nil }
+        return markerProps[id]
     }
     
     /**
@@ -97,6 +142,7 @@ class OverlayManager {
         guard let mapView = mapView, let annotation = annotations[id] else { return }
         mapView.removeAnnotation(annotation)
         annotations.removeValue(forKey: id)
+        markerProps.removeValue(forKey: id)
     }
     
     /**
@@ -109,6 +155,15 @@ class OverlayManager {
         addMarker(id: id, props: props)
     }
     
+    /**
+     * 根据 annotation 获取 markerId
+     * @param annotation 标记点对象
+     * @return 对应的 markerId，如果未找到返回 nil
+     */
+    func getMarkerId(for annotation: MAAnnotation) -> String? {
+        return annotations.first(where: { $0.value === annotation })?.key
+    }
+    
     // MARK: - Polyline 折线
     
     /**
@@ -178,8 +233,8 @@ class OverlayManager {
         guard !coordinates.isEmpty else { return }
         let polygon = MAPolygon(coordinates: &coordinates, count: UInt(coordinates.count))
         overlayStyles[id] = props
-        mapView.add(polygon!)
         overlays[id] = polygon
+        mapView.add(polygon!)
     }
     
     /**
@@ -219,15 +274,12 @@ class OverlayManager {
                 return nil
             }
             
-            // 设置填充颜色
             if let fillColor = style?["fillColor"] {
                 renderer.fillColor = ColorParser.parseColor(fillColor)
             }
-            // 设置边框颜色
             if let strokeColor = style?["strokeColor"] {
                 renderer.strokeColor = ColorParser.parseColor(strokeColor)
             }
-            // 设置边框宽度
             if let strokeWidth = style?["strokeWidth"] as? Double {
                 renderer.lineWidth = CGFloat(strokeWidth)
             }
@@ -236,13 +288,18 @@ class OverlayManager {
         } else if let polyline = overlay as? MAPolyline {
             let renderer = MAPolylineRenderer(polyline: polyline)!
             
+            print("🔷 OverlayManager.getRenderer(Polyline): style=\(String(describing: style))")
+            
             // 设置线宽
             if let width = style?["width"] as? Double {
                 renderer.lineWidth = CGFloat(width)
+                print("🔷 OverlayManager: width=\(width)")
             } else if let strokeWidth = style?["strokeWidth"] as? Double {
                 renderer.lineWidth = CGFloat(strokeWidth)
+                print("🔷 OverlayManager: strokeWidth=\(strokeWidth)")
             } else {
                 renderer.lineWidth = 8
+                print("🔷 OverlayManager: 使用默认 width=8")
             }
             
             // 设置线条样式
@@ -251,16 +308,20 @@ class OverlayManager {
             
             // 设置纹理或颜色
             if let textureUrl = style?["texture"] as? String, !textureUrl.isEmpty {
+                print("🔷 OverlayManager: 加载纹理 \(textureUrl)")
                 loadPolylineTexture(url: textureUrl, renderer: renderer)
             } else {
                 if let color = style?["color"] {
                     let parsedColor = ColorParser.parseColor(color)
                     renderer.strokeColor = parsedColor ?? .red
+                    print("🔷 OverlayManager: color=\(color) -> \(String(describing: parsedColor))")
                 } else if let strokeColor = style?["strokeColor"] {
                     let parsedColor = ColorParser.parseColor(strokeColor)
                     renderer.strokeColor = parsedColor ?? .red
+                    print("🔷 OverlayManager: strokeColor=\(strokeColor) -> \(String(describing: parsedColor))")
                 } else {
                     renderer.strokeColor = .red
+                    print("🔷 OverlayManager: 使用默认红色")
                 }
             }
             
@@ -270,17 +331,24 @@ class OverlayManager {
                 return nil
             }
             
+            print("🔶 OverlayManager.getRenderer(Polygon): style=\(String(describing: style))")
+            
             // 设置填充颜色
             if let fillColor = style?["fillColor"] {
-                renderer.fillColor = ColorParser.parseColor(fillColor)
+                let parsedColor = ColorParser.parseColor(fillColor)
+                renderer.fillColor = parsedColor
+                print("🔶 OverlayManager: fillColor=\(fillColor) -> \(String(describing: parsedColor))")
             }
             // 设置边框颜色
             if let strokeColor = style?["strokeColor"] {
-                renderer.strokeColor = ColorParser.parseColor(strokeColor)
+                let parsedColor = ColorParser.parseColor(strokeColor)
+                renderer.strokeColor = parsedColor
+                print("🔶 OverlayManager: strokeColor=\(strokeColor) -> \(String(describing: parsedColor))")
             }
             // 设置边框宽度
             if let strokeWidth = style?["strokeWidth"] as? Double {
                 renderer.lineWidth = CGFloat(strokeWidth)
+                print("🔶 OverlayManager: strokeWidth=\(strokeWidth)")
             }
             
             return renderer