expo-gaode-map 1.0.2 → 1.0.3

package/src/components/overlays/Polygon.tsx

@@ -22,70 +22,54 @@ import { MapContext } from '../../ExpoGaodeMapView';
 export default function Polygon(props: PolygonProps) {
   const { points, fillColor, strokeColor, strokeWidth, zIndex } = props;
   const nativeRef = useContext(MapContext);
-  const polygonIdRef = useRef<string>(`polygon_${Date.now()}_${Math.random()}`);
-
+  const polygonIdRef = useRef<string | null>(null);
+  const propsRef = useRef(props);
+  
   useEffect(() => {
-    const polygonId = polygonIdRef.current;
+    propsRef.current = props;
+  }, [props]);
 
-    // 添加多边形
-    if (nativeRef?.current && points && points.length >= 3) {
-      try {
-        console.log('🟦 Polygon 组件调用 addPolygon:', polygonId, {
-          points,
-          fillColor: fillColor ?? 0x440000FF,
-          strokeColor: strokeColor ?? -16776961,
-          strokeWidth: strokeWidth ?? 10,
-          zIndex: zIndex ?? 0,
-        });
-        
+  useEffect(() => {
+    const checkAndAdd = () => {
+      if (!nativeRef?.current) {
+        setTimeout(checkAndAdd, 50);
+        return;
+      }
+      
+      const polygonId = `polygon_${Date.now()}_${Math.random()}`;
+      polygonIdRef.current = polygonId;
+      
+      const { points, fillColor, strokeColor, strokeWidth, zIndex } = propsRef.current;
+      
+      if (points && points.length >= 3) {
         nativeRef.current.addPolygon(polygonId, {
           points,
-          fillColor: fillColor ?? 0x440000FF,
-          strokeColor: strokeColor ?? -16776961,
+          fillColor: fillColor ?? '#880000FF',
+          strokeColor: strokeColor ?? '#FFFF0000',
           strokeWidth: strokeWidth ?? 10,
           zIndex: zIndex ?? 0,
         });
-        
-        console.log('✅ Polygon addPolygon 调用完成');
-      } catch (error) {
-        console.error('❌ 添加多边形失败:', error);
       }
-    } else {
-      console.warn('⚠️ Polygon 组件条件不满足:', {
-        hasNativeRef: !!nativeRef?.current,
-        hasPoints: !!points,
-        pointsLength: points?.length,
-      });
-    }
-
-    // 清理函数
+    };
+    
+    checkAndAdd();
+    
     return () => {
-      if (nativeRef?.current) {
-        try {
-          nativeRef.current.removePolygon(polygonId);
-        } catch (error) {
-          console.error('移除多边形失败:', error);
-        }
+      if (polygonIdRef.current && nativeRef?.current) {
+        nativeRef.current.removePolygon(polygonIdRef.current);
       }
     };
   }, []);
 
-  // 更新多边形属性
   useEffect(() => {
-    const polygonId = polygonIdRef.current;
-
-    if (nativeRef?.current) {
-      try {
-        nativeRef.current.updatePolygon(polygonId, {
-          points,
-          fillColor,
-          strokeColor,
-          strokeWidth,
-          zIndex,
-        });
-      } catch (error) {
-        console.error('更新多边形失败:', error);
-      }
+    if (polygonIdRef.current && nativeRef?.current) {
+      nativeRef.current.updatePolygon(polygonIdRef.current, {
+        points,
+        fillColor,
+        strokeColor,
+        strokeWidth,
+        zIndex,
+      });
     }
   }, [points, fillColor, strokeColor, strokeWidth, zIndex]);
 

package/src/components/overlays/Polyline.tsx

@@ -1,3 +1,4 @@
+
 import * as React from 'react';
 import { MapContext } from '../../ExpoGaodeMapView';
 import type { PolylineProps } from '../../types';
@@ -21,24 +22,38 @@ import type { PolylineProps } from '../../types';
 export default function Polyline(props: PolylineProps) {
   const mapRef = React.useContext(MapContext);
   const polylineIdRef = React.useRef<string | null>(null);
-
-  // 添加折线
+  const propsRef = React.useRef(props);
+  
   React.useEffect(() => {
-    const polylineId = `polyline_${Date.now()}_${Math.random()}`;
-    polylineIdRef.current = polylineId;
-    
-    // 只传递必要的属性
-    const polylineProps = {
-      points: props.points,
-      width: props.width,
-      color: props.color,
-      ...(props.texture && { texture: props.texture }),
+    propsRef.current = props;
+  }, [props]);
+  
+  React.useEffect(() => {
+    const checkAndAdd = () => {
+      if (!mapRef?.current) {
+        setTimeout(checkAndAdd, 50);
+        return;
+      }
+      
+      const polylineId = `polyline_${Date.now()}_${Math.random()}`;
+      polylineIdRef.current = polylineId;
+      
+      const polylineProps = {
+        points: propsRef.current.points,
+        width: propsRef.current.width,
+        color: propsRef.current.color,
+        ...(propsRef.current.texture && { texture: propsRef.current.texture }),
+      };
+      
+      mapRef.current.addPolyline(polylineId, polylineProps);
     };
     
-    mapRef?.current?.addPolyline?.(polylineId, polylineProps);
-
+    checkAndAdd();
+    
     return () => {
-      mapRef?.current?.removePolyline?.(polylineId);
+      if (polylineIdRef.current && mapRef?.current) {
+        mapRef.current.removePolyline(polylineIdRef.current);
+      }
     };
   }, []);
 

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

@@ -199,6 +199,31 @@ export interface MapViewProps {
    */
   onLocation?: (event: Location) => void;
 
+  /**
+   * Marker 点击事件
+   */
+  onMarkerPress?: (event: { markerId: string } & LatLng) => void;
+
+  /**
+   * Marker 拖拽开始事件
+   */
+  onMarkerDragStart?: (event: { markerId: string } & LatLng) => void;
+
+  /**
+   * Marker 拖拽中事件
+   */
+  onMarkerDrag?: (event: { markerId: string } & LatLng) => void;
+
+  /**
+   * Marker 拖拽结束事件
+   */
+  onMarkerDragEnd?: (event: { markerId: string } & LatLng) => void;
+
+  /**
+   * Circle 点击事件
+   */
+  onCirclePress?: (event: { circleId: string } & LatLng) => void;
+
   /**
    * 子组件
    */

package/src/types/overlays.types.ts

@@ -18,7 +18,17 @@ export interface MarkerProps {
   /**
    * 图标
    */
-  icon?: ImageSourcePropType;
+  icon?: string | ImageSourcePropType;
+
+  /**
+   * 图标宽度（像素）
+   */
+  iconWidth?: number;
+
+  /**
+   * 图标高度（像素）
+   */
+  iconHeight?: number;
 
   /**
    * 标题
@@ -33,6 +43,7 @@ export interface MarkerProps {
   /**
    * 透明度 [0, 1]
    * @platform android
+   * @note iOS 不支持
    */
   opacity?: number;
 
@@ -44,17 +55,21 @@ export interface MarkerProps {
   /**
    * 是否平贴地图
    * @platform android
+   * @note iOS 不支持
    */
   flat?: boolean;
 
   /**
    * 层级
+   * @platform android
+   * @note iOS 不支持 (使用 displayPriority)
    */
   zIndex?: number;
 
   /**
    * 覆盖物锚点比例
    * @platform android
+   * @note iOS 使用 centerOffset
    */
   anchor?: Point;
 
@@ -64,8 +79,21 @@ export interface MarkerProps {
    */
   centerOffset?: Point;
 
+  /**
+   * 是否显示动画
+   * @platform ios
+   */
+  animatesDrop?: boolean;
+
+  /**
+   * 大头针颜色
+   * @platform ios
+   */
+  pinColor?: 'red' | 'green' | 'purple';
+
   /**
    * 自定义视图
+   * @note 未实现
    */
   children?: React.ReactNode;
 
@@ -219,6 +247,7 @@ export interface CircleProps {
    * 点击事件
    */
   onPress?: () => void;
+
 }
 
 /**