expo-gaode-map 1.0.6 → 1.0.8

package/ios/overlays/MarkerView.swift

@@ -49,6 +49,8 @@ class MarkerView: ExpoView {
     
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
+        // 不可交互,通过父视图定位到屏幕外
+        isUserInteractionEnabled = false
     }
     
     /**
@@ -84,8 +86,54 @@ class MarkerView: ExpoView {
         mapView.addAnnotation(annotation)
         self.annotation = annotation
         
-        // 获取 annotationView
-        annotationView = mapView.view(for: annotation)
+        // 延迟处理子视图,等待 React Native 添加完成
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+            guard let self = self else { return }
+            if let view = mapView.view(for: annotation), self.subviews.count > 0 {
+                self.annotationView = view
+                if let image = self.createImageFromSubviews() {
+                    view.image = image
+                    view.centerOffset = CGPoint(x: 0, y: -image.size.height / 2)
+                }
+            }
+        }
+    }
+    
+    /**
+     * 将子视图转换为图片
+     */
+    private func createImageFromSubviews() -> UIImage? {
+        guard subviews.count > 0 else { return nil }
+        
+        // 强制布局
+        setNeedsLayout()
+        layoutIfNeeded()
+        
+        let size = bounds.size
+        guard size.width > 0 && size.height > 0 else { return nil }
+        
+        UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
+        defer { UIGraphicsEndImageContext() }
+        
+        guard let context = UIGraphicsGetCurrentContext() else { return nil }
+        layer.render(in: context)
+        
+        return UIGraphicsGetImageFromCurrentImageContext()
+    }
+    
+    override func didAddSubview(_ subview: UIView) {
+        super.didAddSubview(subview)
+        
+        // 当添加子视图时,更新标记图标
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            if self.subviews.count > 0, let view = self.annotationView {
+                if let image = self.createImageFromSubviews() {
+                    view.image = image
+                    view.centerOffset = CGPoint(x: 0, y: -image.size.height / 2)
+                }
+            }
+        }
     }
     
     /**

package/ios/overlays/MarkerViewModule.swift

@@ -0,0 +1,53 @@
+import ExpoModulesCore
+
+public class MarkerViewModule: Module {
+    public func definition() -> ModuleDefinition {
+        Name("MarkerView")
+        
+        View(MarkerView.self) {
+            Prop("position") { (view: MarkerView, position: [String: Double]) in
+                view.setPosition(position)
+            }
+            
+            Prop("title") { (view: MarkerView, title: String) in
+                view.setTitle(title)
+            }
+            
+            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)
+            }
+        }
+    }
+}

package/ios/overlays/MultiPointViewModule.swift

@@ -0,0 +1,15 @@
+import ExpoModulesCore
+
+public class MultiPointViewModule: Module {
+    public func definition() -> ModuleDefinition {
+        Name("MultiPointView")
+        
+        View(MultiPointView.self) {
+            Events("onPress")
+            
+            Prop("points") { (view: MultiPointView, points: [[String: Any]]) in
+                view.setPoints(points)
+            }
+        }
+    }
+}

package/ios/overlays/PolygonViewModule.swift

@@ -0,0 +1,27 @@
+import ExpoModulesCore
+
+public class PolygonViewModule: Module {
+    public func definition() -> ModuleDefinition {
+        Name("PolygonView")
+        
+        View(PolygonView.self) {
+            Events("onPress")
+            
+            Prop("points") { (view: PolygonView, points: [[String: Double]]) in
+                view.setPoints(points)
+            }
+            
+            Prop("fillColor") { (view: PolygonView, color: String) in
+                view.setFillColor(color)
+            }
+            
+            Prop("strokeColor") { (view: PolygonView, color: String) in
+                view.setStrokeColor(color)
+            }
+            
+            Prop("strokeWidth") { (view: PolygonView, width: Double) in
+                view.setStrokeWidth(Float(width))
+            }
+        }
+    }
+}

package/ios/overlays/PolylineViewModule.swift

@@ -0,0 +1,39 @@
+import ExpoModulesCore
+
+public class PolylineViewModule: Module {
+    public func definition() -> ModuleDefinition {
+        Name("PolylineView")
+        
+        View(PolylineView.self) {
+            Events("onPress")
+            
+            Prop("points") { (view: PolylineView, points: [[String: Double]]) in
+                view.setPoints(points)
+            }
+            
+            Prop("width") { (view: PolylineView, width: Double) in
+                view.setStrokeWidth(Float(width))
+            }
+            
+            Prop("strokeWidth") { (view: PolylineView, width: Double) in
+                view.setStrokeWidth(Float(width))
+            }
+            
+            Prop("color") { (view: PolylineView, color: String) in
+                view.setStrokeColor(color)
+            }
+            
+            Prop("strokeColor") { (view: PolylineView, color: String) in
+                view.setStrokeColor(color)
+            }
+            
+            Prop("texture") { (view: PolylineView, url: String?) in
+                view.setTexture(url)
+            }
+            
+            Prop("dotted") { (view: PolylineView, dotted: Bool) in
+                view.setDotted(dotted)
+            }
+        }
+    }
+}

package/package.json

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

package/src/ExpoGaodeMapView.tsx

@@ -16,7 +16,7 @@ import type {
 
 export type { MapViewRef } from './types';
 
-const NativeView: React.ComponentType<MapViewProps & { ref?: React.Ref<NativeMapViewRef> }> = requireNativeViewManager('ExpoGaodeMap');
+const NativeView: React.ComponentType<MapViewProps & { ref?: React.Ref<NativeMapViewRef> }> = requireNativeViewManager('ExpoGaodeMapView');
 
 export const MapContext = React.createContext<React.RefObject<MapViewRef | null> | null>(null);
 

package/src/components/overlays/Cluster.tsx

@@ -1,8 +1,9 @@
+
 import { requireNativeViewManager } from 'expo-modules-core';
 import * as React from 'react';
 import type { ClusterProps } from '../../types';
 
-const NativeCluster = requireNativeViewManager('ExpoGaodeMap_ClusterView');
+const NativeCluster = requireNativeViewManager('ClusterView');
 
 
 /**

package/src/components/overlays/HeatMap.tsx

@@ -1,8 +1,9 @@
+
 import { requireNativeViewManager } from 'expo-modules-core';
 import * as React from 'react';
 import type { HeatMapProps } from '../../types';
 
-const NativeHeatMap = requireNativeViewManager('ExpoGaodeMap_HeatMapView');
+const NativeHeatMap = requireNativeViewManager('HeatMapView');
 
 
 /**

package/src/components/overlays/Marker.tsx

@@ -1,12 +1,59 @@
 import * as React from 'react';
 import { Image } from 'react-native';
+import { requireNativeViewManager } from 'expo-modules-core';
 import { MapContext, MarkerEventContext } from '../../ExpoGaodeMapView';
 import type { MarkerProps } from '../../types';
 
+const NativeMarkerView = requireNativeViewManager('MarkerView');
+
 export default function Marker(props: MarkerProps) {
+  // 如果有 children，使用声明式 API
+  if (props.children) {
+    return <MarkerDeclarative {...props} />;
+  }
+  // 否则使用命令式 API
   return <MarkerImperative {...props} />;
 }
 
+function MarkerDeclarative(props: MarkerProps) {
+  const eventManager = React.useContext(MarkerEventContext);
+  const markerIdRef = React.useRef(`marker_${Date.now()}_${Math.random()}`);
+  
+  React.useEffect(() => {
+    if (eventManager) {
+      eventManager.register(markerIdRef.current, {
+        onPress: props.onPress,
+        onDragStart: props.onDragStart,
+        onDrag: props.onDrag,
+        onDragEnd: props.onDragEnd,
+      });
+    }
+    return () => {
+      if (eventManager) {
+        eventManager.unregister(markerIdRef.current);
+      }
+    };
+  }, [props.onPress, props.onDragStart, props.onDrag, props.onDragEnd]);
+  
+  return (
+    <NativeMarkerView
+      position={props.position}
+      title={props.title}
+      draggable={props.draggable}
+      opacity={props.opacity}
+      anchor={props.anchor}
+      flat={props.flat}
+      zIndex={props.zIndex}
+      onPress={props.onPress}
+      onDragStart={props.onDragStart}
+      onDrag={props.onDrag}
+      onDragEnd={props.onDragEnd}
+    >
+      {props.children}
+    </NativeMarkerView>
+  );
+}
+
 function MarkerImperative(props: MarkerProps) {
   const mapRef = React.useContext(MapContext);
   const eventManager = React.useContext(MarkerEventContext);

package/src/components/overlays/MultiPoint.tsx

@@ -1,8 +1,9 @@
+
 import { requireNativeViewManager } from 'expo-modules-core';
 import * as React from 'react';
 import type { MultiPointProps } from '../../types';
 
-const NativeMultiPoint = requireNativeViewManager('ExpoGaodeMap_MultiPointView');
+const NativeMultiPoint = requireNativeViewManager('MultiPointView');
 
 
 /**

package/src/types/map-view.types.ts

@@ -5,6 +5,7 @@
 
 import type { StyleProp, ViewStyle } from 'react-native';
 import type { CameraPosition, LatLng, LatLngBounds, MapPoi, MapType, Point } from './common.types';
+import type { Coordinates, ReGeocode } from './location.types';
 
 /**
  * 地图相机事件
@@ -197,7 +198,7 @@ export interface MapViewProps {
   /**
    * 地图定位更新事件
    */
-  onLocation?: (event: Location) => void;
+  onLocation?: (event: Coordinates | ReGeocode) => void;
 
   /**
    * Marker 点击事件