expo-gaode-map 1.0.1 → 1.0.3

package/ios/overlays/CircleView.swift

@@ -10,6 +10,9 @@ import MAMapKit
  * - 响应属性变化并更新渲染
  */
 class CircleView: ExpoView {
+    /// 事件派发器
+    let onPress = EventDispatcher()
+    
     /// 圆心坐标
     var circleCenter: [String: Double] = [:]
     /// 半径(米)
@@ -30,7 +33,6 @@ class CircleView: ExpoView {
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
-        circle = MACircle()
     }
     
     /**
@@ -39,19 +41,39 @@ class CircleView: ExpoView {
      */
     func setMap(_ map: MAMapView) {
         self.mapView = map
-        if let circle = circle {
-            map.add(circle)
-        }
+        updateCircle()
     }
     
     /**
      * 更新圆形覆盖物
      */
     private func updateCircle() {
-        guard let latitude = circleCenter["latitude"],
-              let longitude = circleCenter["longitude"] else { return }
-        circle?.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-        circle?.radius = radius
+        guard let mapView = mapView,
+              let latitude = circleCenter["latitude"],
+              let longitude = circleCenter["longitude"],
+              radius > 0 else {
+            print("❌ CircleView.updateCircle: 条件不满足")
+            return
+        }
+        
+        print("🔵 CircleView.updateCircle: center=(\(latitude),\(longitude)), radius=\(radius)")
+        print("🔵 CircleView.updateCircle: fillColor=\(String(describing: fillColor)), strokeColor=\(String(describing: strokeColor)), strokeWidth=\(strokeWidth)")
+        
+        if circle == nil {
+            let coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+            circle = MACircle(center: coordinate, radius: radius)
+            mapView.add(circle!)
+            print("🔵 CircleView.updateCircle: 创建新圆形")
+        } else {
+            circle?.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+            circle?.radius = radius
+            mapView.remove(circle!)
+            mapView.add(circle!)
+            print("🔵 CircleView.updateCircle: 更新现有圆形")
+        }
+        
+        renderer = nil
+        print("🔵 CircleView.updateCircle: renderer 已清空")
     }
     
     /**
@@ -61,9 +83,15 @@ class CircleView: ExpoView {
     func getRenderer() -> MAOverlayRenderer {
         if renderer == nil, let circle = circle {
             renderer = MACircleRenderer(circle: circle)
-            renderer?.fillColor = ColorParser.parseColor(fillColor) ?? UIColor.clear
-            renderer?.strokeColor = ColorParser.parseColor(strokeColor) ?? UIColor.clear
+            let parsedFillColor = ColorParser.parseColor(fillColor)
+            let parsedStrokeColor = ColorParser.parseColor(strokeColor)
+            renderer?.fillColor = parsedFillColor ?? UIColor.clear
+            renderer?.strokeColor = parsedStrokeColor ?? UIColor.clear
             renderer?.lineWidth = CGFloat(strokeWidth)
+            print("🔵 CircleView.getRenderer: 创建新 renderer")
+            print("🔵 CircleView.getRenderer: fillColor=\(String(describing: parsedFillColor)), strokeColor=\(String(describing: parsedStrokeColor)), lineWidth=\(strokeWidth)")
+        } else {
+            print("🔵 CircleView.getRenderer: 使用缓存的 renderer")
         }
         return renderer!
     }
@@ -74,7 +102,6 @@ class CircleView: ExpoView {
      */
     func setCenter(_ center: [String: Double]) {
         circleCenter = center
-        renderer = nil
         updateCircle()
     }
     
@@ -84,7 +111,6 @@ class CircleView: ExpoView {
      */
     func setRadius(_ radius: Double) {
         self.radius = radius
-        renderer = nil
         updateCircle()
     }
     
@@ -93,6 +119,7 @@ class CircleView: ExpoView {
      * @param color 颜色值
      */
     func setFillColor(_ color: Any?) {
+        print("🔵 CircleView.setFillColor: \(String(describing: color))")
         fillColor = color
         renderer = nil
         updateCircle()
@@ -103,6 +130,7 @@ class CircleView: ExpoView {
      * @param color 颜色值
      */
     func setStrokeColor(_ color: Any?) {
+        print("🔵 CircleView.setStrokeColor: \(String(describing: color))")
         strokeColor = color
         renderer = nil
         updateCircle()
@@ -113,6 +141,7 @@ class CircleView: ExpoView {
      * @param width 宽度值
      */
     func setStrokeWidth(_ width: Float) {
+        print("🔵 CircleView.setStrokeWidth: \(width)")
         strokeWidth = width
         renderer = nil
         updateCircle()

package/ios/overlays/MarkerView.swift

@@ -3,13 +3,20 @@ import MAMapKit
 
 /**
  * 标记点视图
- * 
+ *
  * 负责:
  * - 在地图上显示标记点
  * - 管理标记点属性(位置、标题、描述)
  * - 支持拖拽功能
+ * - 支持自定义 children 视图
  */
 class MarkerView: ExpoView {
+    // MARK: - 事件派发器
+    let onPress = EventDispatcher()
+    let onDragStart = EventDispatcher()
+    let onDrag = EventDispatcher()
+    let onDragEnd = EventDispatcher()
+    
     /// 标记点位置
     var position: [String: Double] = [:]
     /// 标题
@@ -18,11 +25,27 @@ class MarkerView: ExpoView {
     var markerDescription: String = ""
     /// 是否可拖拽
     var draggable: Bool = false
+    /// 图标 URI
+    var iconUri: String?
+    /// 图标宽度
+    var iconWidth: Double = 40
+    /// 图标高度
+    var iconHeight: Double = 40
+    /// 中心偏移
+    var centerOffset: [String: Double]?
+    /// 是否显示动画
+    var animatesDrop: Bool = false
+    /// 大头针颜色
+    var pinColor: String = "red"
+    /// 是否显示气泡
+    var canShowCallout: Bool = true
     
     /// 地图视图弱引用
     private var mapView: MAMapView?
     /// 标记点对象
-    private var annotation: MAPointAnnotation?
+    var annotation: MAPointAnnotation?
+    /// 标记点视图
+    private var annotationView: MAAnnotationView?
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
@@ -60,6 +83,9 @@ class MarkerView: ExpoView {
         
         mapView.addAnnotation(annotation)
         self.annotation = annotation
+        
+        // 获取 annotationView
+        annotationView = mapView.view(for: annotation)
     }
     
     /**
@@ -95,7 +121,33 @@ class MarkerView: ExpoView {
      */
     func setDraggable(_ draggable: Bool) {
         self.draggable = draggable
-        // iOS 高德地图标记默认不可拖拽，需要自定义实现
+        updateAnnotation()
+    }
+    
+    func setIcon(_ source: [String: Any]?) {
+        if let dict = source {
+            // 处理 require() 返回的对象
+            if let uri = dict["uri"] as? String {
+                self.iconUri = uri
+            }
+        }
+        updateAnnotation()
+    }
+    
+    func setCenterOffset(_ offset: [String: Double]) {
+        self.centerOffset = offset
+    }
+    
+    func setAnimatesDrop(_ animate: Bool) {
+        self.animatesDrop = animate
+    }
+    
+    func setPinColor(_ color: String) {
+        self.pinColor = color
+    }
+    
+    func setCanShowCallout(_ show: Bool) {
+        self.canShowCallout = show
     }
     
     /**

package/ios/overlays/PolygonView.swift

@@ -43,17 +43,29 @@ class PolygonView: ExpoView {
      * 更新多边形覆盖物
      */
     private func updatePolygon() {
-        guard let mapView = mapView else { return }
+        guard let mapView = mapView else {
+            print("❌ PolygonView.updatePolygon: mapView 为空")
+            return
+        }
         if let old = polygon { mapView.remove(old) }
         
         var coords = points.compactMap { point -> CLLocationCoordinate2D? in
             guard let lat = point["latitude"], let lng = point["longitude"] else { return nil }
             return CLLocationCoordinate2D(latitude: lat, longitude: lng)
         }
-        guard !coords.isEmpty else { return }
+        guard !coords.isEmpty else {
+            print("❌ PolygonView.updatePolygon: 点数组为空")
+            return
+        }
+        
+        print("🔶 PolygonView.updatePolygon: points=\(coords.count)个点")
+        print("🔶 PolygonView.updatePolygon: fillColor=\(String(describing: fillColor)), strokeColor=\(String(describing: strokeColor)), strokeWidth=\(strokeWidth)")
         
         polygon = MAPolygon(coordinates: &coords, count: UInt(coords.count))
         mapView.add(polygon!)
+        
+        renderer = nil
+        print("🔶 PolygonView.updatePolygon: renderer 已清空")
     }
     
     /**
@@ -63,9 +75,15 @@ class PolygonView: ExpoView {
     func getRenderer() -> MAOverlayRenderer {
         if renderer == nil, let polygon = polygon {
             renderer = MAPolygonRenderer(polygon: polygon)
-            renderer?.fillColor = ColorParser.parseColor(fillColor) ?? UIColor.clear
-            renderer?.strokeColor = ColorParser.parseColor(strokeColor) ?? UIColor.clear
+            let parsedFillColor = ColorParser.parseColor(fillColor)
+            let parsedStrokeColor = ColorParser.parseColor(strokeColor)
+            renderer?.fillColor = parsedFillColor ?? UIColor.clear
+            renderer?.strokeColor = parsedStrokeColor ?? UIColor.clear
             renderer?.lineWidth = CGFloat(strokeWidth)
+            print("🔶 PolygonView.getRenderer: 创建新 renderer")
+            print("🔶 PolygonView.getRenderer: fillColor=\(String(describing: parsedFillColor)), strokeColor=\(String(describing: parsedStrokeColor)), lineWidth=\(strokeWidth)")
+        } else {
+            print("🔶 PolygonView.getRenderer: 使用缓存的 renderer")
         }
         return renderer!
     }
@@ -76,7 +94,6 @@ class PolygonView: ExpoView {
      */
     func setPoints(_ points: [[String: Double]]) {
         self.points = points
-        renderer = nil
         updatePolygon()
     }
     
@@ -85,6 +102,7 @@ class PolygonView: ExpoView {
      * @param color 颜色值
      */
     func setFillColor(_ color: Any?) {
+        print("🔶 PolygonView.setFillColor: \(String(describing: color))")
         fillColor = color
         renderer = nil
         updatePolygon()
@@ -95,6 +113,7 @@ class PolygonView: ExpoView {
      * @param color 颜色值
      */
     func setStrokeColor(_ color: Any?) {
+        print("🔶 PolygonView.setStrokeColor: \(String(describing: color))")
         strokeColor = color
         renderer = nil
         updatePolygon()
@@ -105,6 +124,7 @@ class PolygonView: ExpoView {
      * @param width 宽度值
      */
     func setStrokeWidth(_ width: Float) {
+        print("🔶 PolygonView.setStrokeWidth: \(width)")
         strokeWidth = width
         renderer = nil
         updatePolygon()

package/ios/overlays/PolylineView.swift

@@ -43,17 +43,29 @@ class PolylineView: ExpoView {
      * 更新折线覆盖物
      */
     private func updatePolyline() {
-        guard let mapView = mapView else { return }
+        guard let mapView = mapView else {
+            print("❌ PolylineView.updatePolyline: mapView 为空")
+            return
+        }
         if let old = polyline { mapView.remove(old) }
         
         var coords = points.compactMap { point -> CLLocationCoordinate2D? in
             guard let lat = point["latitude"], let lng = point["longitude"] else { return nil }
             return CLLocationCoordinate2D(latitude: lat, longitude: lng)
         }
-        guard !coords.isEmpty else { return }
+        guard !coords.isEmpty else {
+            print("❌ PolylineView.updatePolyline: 点数组为空")
+            return
+        }
+        
+        print("🔷 PolylineView.updatePolyline: points=\(coords.count)个点")
+        print("🔷 PolylineView.updatePolyline: strokeColor=\(String(describing: strokeColor)), strokeWidth=\(strokeWidth), texture=\(String(describing: textureUrl))")
         
         polyline = MAPolyline(coordinates: &coords, count: UInt(coords.count))
         mapView.add(polyline!)
+        
+        renderer = nil
+        print("🔷 PolylineView.updatePolyline: renderer 已清空")
     }
     
     /**
@@ -66,10 +78,15 @@ class PolylineView: ExpoView {
             renderer?.lineWidth = CGFloat(strokeWidth)
             
             if let url = textureUrl {
+                print("🔷 PolylineView.getRenderer: 加载纹理 \(url)")
                 loadTexture(url: url, renderer: renderer!)
             } else {
-                renderer?.strokeColor = ColorParser.parseColor(strokeColor) ?? UIColor.clear
+                let parsedColor = ColorParser.parseColor(strokeColor)
+                renderer?.strokeColor = parsedColor ?? UIColor.clear
+                print("🔷 PolylineView.getRenderer: 创建新 renderer, strokeColor=\(String(describing: parsedColor)), lineWidth=\(strokeWidth)")
             }
+        } else {
+            print("🔷 PolylineView.getRenderer: 使用缓存的 renderer")
         }
         return renderer!
     }
@@ -126,7 +143,6 @@ class PolylineView: ExpoView {
      */
     func setPoints(_ points: [[String: Double]]) {
         self.points = points
-        renderer = nil
         updatePolyline()
     }
     
@@ -135,6 +151,7 @@ class PolylineView: ExpoView {
      * @param width 线宽值
      */
     func setStrokeWidth(_ width: Float) {
+        print("🔷 PolylineView.setStrokeWidth: \(width)")
         strokeWidth = width
         renderer = nil
         updatePolyline()
@@ -145,6 +162,7 @@ class PolylineView: ExpoView {
      * @param color 颜色值
      */
     func setStrokeColor(_ color: Any?) {
+        print("🔷 PolylineView.setStrokeColor: \(String(describing: color))")
         strokeColor = color
         renderer = nil
         updatePolyline()
@@ -155,6 +173,7 @@ class PolylineView: ExpoView {
      * @param url 图片 URL
      */
     func setTexture(_ url: String?) {
+        print("🔷 PolylineView.setTexture: \(String(describing: url))")
         textureUrl = url
         renderer = nil
         updatePolyline()

package/ios/utils/ColorParser.swift

@@ -12,12 +12,10 @@ class ColorParser {
     static func parseColor(_ colorValue: Any?) -> UIColor? {
         guard let colorValue = colorValue else { return nil }
         
-        // 如果是数字类型
         if let number = colorValue as? Int {
             return UIColor(hex: number)
         }
         
-        // 如果是字符串类型
         if let string = colorValue as? String {
             return parseColorString(string)
         }
@@ -79,12 +77,10 @@ class ColorParser {
             var hexNumber: UInt64 = 0
             
             if scanner.scanHexInt64(&hexNumber) {
-                // 尝试 ARGB 格式（Android 风格）
                 let alphaARGB = CGFloat((hexNumber & 0xff000000) >> 24) / 255
                 let redARGB = CGFloat((hexNumber & 0x00ff0000) >> 16) / 255
                 let greenARGB = CGFloat((hexNumber & 0x0000ff00) >> 8) / 255
                 let blueARGB = CGFloat(hexNumber & 0x000000ff) / 255
-                
                 return UIColor(red: redARGB, green: greenARGB, blue: blueARGB, alpha: alphaARGB)
             }
         }
@@ -98,7 +94,6 @@ class ColorParser {
                 let red = CGFloat((hexNumber & 0xff0000) >> 16) / 255
                 let green = CGFloat((hexNumber & 0x00ff00) >> 8) / 255
                 let blue = CGFloat(hexNumber & 0x0000ff) / 255
-                
                 return UIColor(red: red, green: green, blue: blue, alpha: alpha)
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "一个功能完整的高德地图 React Native 组件库，基于 Expo Modules 开发，提供地图显示、定位、覆盖物等功能。",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ExpoGaodeMap.types.ts

@@ -1,13 +1,4 @@
-/*
- * @Author       : 尚博信_王强 wangqiang03@sunboxsoft.com
- * @Date         : 2025-11-13 14:03:56
- * @LastEditors  : 尚博信_王强 wangqiang03@sunboxsoft.com
- * @LastEditTime : 2025-11-13 14:30:00
- * @FilePath     : /expo-gaode-map/src/ExpoGaodeMap.types.ts
- * @Description  : 高德地图 Expo Module 主类型定义文件
- * 
- * Copyright (c) 2025 by 尚博信_王强, All Rights Reserved. 
- */
+
 
 // 导出所有类型定义
 export * from './types';

package/src/ExpoGaodeMapModule.ts

@@ -1,13 +1,4 @@
-/*
- * @Author       : 尚博信_王强 wangqiang03@sunboxsoft.com
- * @Date         : 2025-11-13 14:03:56
- * @LastEditors  : 尚博信_王强 wangqiang03@sunboxsoft.com
- * @LastEditTime : 2025-11-13 14:58:00
- * @FilePath     : /expo-gaode-map/src/ExpoGaodeMapModule.ts
- * @Description  : 
- * 
- * Copyright (c) 2025 by 尚博信_王强, All Rights Reserved. 
- */
+
 import { NativeModule, requireNativeModule } from 'expo';
 import type { ExpoGaodeMapModuleEvents } from './ExpoGaodeMap.types';