expo-gaode-map 2.2.30-next.0 → 2.2.30

package/android/src/main/java/expo/modules/gaodemap/overlays/MarkerView.kt

@@ -4,20 +4,16 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.Canvas
-import android.graphics.Color
 import android.graphics.Rect
-
 import android.os.Handler
 import android.os.Looper
 import android.view.View
+import android.view.ViewParent
 import com.amap.api.maps.AMap
-
 import com.amap.api.maps.model.BitmapDescriptorFactory
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Marker
 import com.amap.api.maps.model.MarkerOptions
-
 import com.amap.api.maps.utils.SpatialRelationUtil
 import com.amap.api.maps.utils.overlay.MovingPointOverlay
 import expo.modules.kotlin.AppContext
@@ -33,8 +29,6 @@ import androidx.core.view.contains
 import androidx.core.view.isEmpty
 import androidx.core.graphics.scale
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import com.amap.api.maps.model.animation.AlphaAnimation
 import com.amap.api.maps.model.animation.AnimationSet
 import com.amap.api.maps.model.animation.ScaleAnimation
@@ -42,13 +36,8 @@ import android.view.animation.DecelerateInterpolator
 import expo.modules.gaodemap.companion.BitmapDescriptorCache
 import expo.modules.gaodemap.companion.IconBitmapCache
 import expo.modules.gaodemap.utils.GeometryUtils
-import kotlin.text.StringBuilder
 import kotlin.math.max
 import kotlin.math.min
-
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-import androidx.core.graphics.createBitmap
 import expo.modules.gaodemap.utils.LatLngParser
 
 class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
@@ -164,7 +153,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             )
 
             child.measure(childWidthSpec, childHeightSpec)
-            val childBounds = computeContentBounds(child)
+            val childBounds = MarkerBitmapRenderer.computeContentBounds(child)
             measuredContentWidth = max(measuredContentWidth, childBounds?.width() ?: child.measuredWidth)
             measuredContentHeight = max(measuredContentHeight, childBounds?.height() ?: child.measuredHeight)
         }
@@ -486,6 +475,11 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      * JS 端传入稳定的缓存 key
      */
     fun setCacheKey(key: String?) {
+        if (cacheKey == key) {
+            return
+        }
+
+        invalidateAppliedCustomMarkerCaches()
         cacheKey = key
         updateMarkerIcon()
     }
@@ -715,7 +709,15 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      */
     fun setIconWidth(width: Int) {
         val density = context.resources.displayMetrics.density
-        iconWidth = (width * density).toInt()
+        val resolvedWidth = (width * density).toInt()
+        if (iconWidth == resolvedWidth) {
+            return
+        }
+
+        iconWidth = resolvedWidth
+        pendingIconUri?.let { iconUri ->
+            marker?.let { loadAndSetIcon(iconUri, it) }
+        }
     }
 
     /**
@@ -724,7 +726,15 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      */
     fun setIconHeight(height: Int) {
         val density = context.resources.displayMetrics.density
-        iconHeight = (height * density).toInt()
+        val resolvedHeight = (height * density).toInt()
+        if (iconHeight == resolvedHeight) {
+            return
+        }
+
+        iconHeight = resolvedHeight
+        pendingIconUri?.let { iconUri ->
+            marker?.let { loadAndSetIcon(iconUri, it) }
+        }
     }
 
     /**
@@ -733,7 +743,13 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      */
     fun setCustomViewWidth(width: Int) {
         val density = context.resources.displayMetrics.density
-        customViewWidth = (width * density).toInt()
+        val resolvedWidth = (width * density).toInt()
+        if (customViewWidth == resolvedWidth) {
+            return
+        }
+
+        customViewWidth = resolvedWidth
+        markCustomMarkerContentDirty()
     }
 
     /**
@@ -742,7 +758,13 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      */
     fun setCustomViewHeight(height: Int) {
         val density = context.resources.displayMetrics.density
-        customViewHeight = (height * density).toInt()
+        val resolvedHeight = (height * density).toInt()
+        if (customViewHeight == resolvedHeight) {
+            return
+        }
+
+        customViewHeight = resolvedHeight
+        markCustomMarkerContentDirty()
     }
 
     /**
@@ -769,7 +791,6 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
                 // 只有在没有自定义内容（children）且有 title 或 snippet 时才显示信息窗口
                 // 如果有自定义内容，说明用户已经自定义了显示内容，不需要默认信息窗口
                 return !(view.isEmpty() && (!marker.title.isNullOrEmpty() || !marker.snippet.isNullOrEmpty()))
-                // marker.showInfoWindow()
             }
             return false
         }
@@ -876,176 +897,17 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      *
      * 注意：render 会在 UI 线程执行；如果当前线程不是 UI 线程，会同步等待 UI 线程完成（有超时）。
      */
-    private fun createBitmapFromView(): Bitmap? {
+    private fun createBitmapFromView(snapshot: MarkerBitmapSnapshot? = resolveMarkerBitmapSnapshot()): Bitmap? {
         if (isEmpty()) return null
 
-        // 优先使用 JS 传入的 cacheKey，如果没有则 fallback 为 fingerprint
-        val keyPart = cacheKey ?: computeViewFingerprint(this)
-
-        val measuredChild = if (isNotEmpty()) getChildAt(0) else null
-        val contentView = resolveRenderableContentView(measuredChild)
-        val contentBounds = computeContentBounds(measuredChild)
-        val measuredWidth = contentBounds?.width() ?: contentView?.measuredWidth ?: measuredChild?.measuredWidth ?: 0
-        val measuredHeight = contentBounds?.height() ?: contentView?.measuredHeight ?: measuredChild?.measuredHeight ?: 0
-
-        val finalWidth = if (measuredWidth > 0) measuredWidth else (if (customViewWidth > 0) customViewWidth else 0)
-        val finalHeight = if (measuredHeight > 0) measuredHeight else (if (customViewHeight > 0) customViewHeight else 0)
-
-        // 🔑 修复：如果尺寸为 0，说明 View 还没准备好，不要生成 Bitmap，否则会导致动画位置偏移
-        if (finalWidth <= 0 || finalHeight <= 0) {
-            return null
-        }
-
-        val fullCacheKey = "$keyPart|${finalWidth}x${finalHeight}"
-
-        // 1) 尝试缓存命中
-        IconBitmapCache.get(fullCacheKey)?.let { return it }
-
-        // 2) 未命中，则生成 bitmap（同之前逻辑）
-        val bitmap: Bitmap? = if (Looper.myLooper() == Looper.getMainLooper()) {
-            renderViewToBitmapInternal(finalWidth, finalHeight)
-        } else {
-            val latch = CountDownLatch(1)
-            var result: Bitmap? = null
-            mainHandler.post {
-                try {
-                    result = renderViewToBitmapInternal(finalWidth, finalHeight)
-                } finally {
-                    latch.countDown()
-                }
-            }
-            try { latch.await(200, TimeUnit.MILLISECONDS) } catch (_: InterruptedException) {}
-            result
-        }
-
-        bitmap?.let { IconBitmapCache.put(fullCacheKey, it) }
-        return bitmap
-    }
-
-
-    /**
-     * 真正把 view measure/layout/draw 到 Bitmap 的内部方法（必须在主线程调用）
-     */
-    private fun renderViewToBitmapInternal(finalWidth: Int, finalHeight: Int): Bitmap? {
-        try {
-            val childView = if (isNotEmpty()) getChildAt(0) else return null
-
-
-            // 🔑 优化：如果 View 尺寸已经符合要求，直接复用现有布局，避免破坏 React Native 的排版
-            if (childView.width != finalWidth || childView.height != finalHeight) {
-                // 🔑 关键修复：如果子 View 还没完成布局（宽高为 0），不要强行 measure，这会导致布局错乱（如 0x0 -> 252x75）。
-                // 直接返回 null，等待下一次 layout（当子 View 准备好时会再次触发）。
-                if (childView.width == 0 || childView.height == 0) {
-                    return null
-                }
-
-                // 使用给定的尺寸强制测量布局
-                val widthSpec = MeasureSpec.makeMeasureSpec(finalWidth, MeasureSpec.EXACTLY)
-                val heightSpec = MeasureSpec.makeMeasureSpec(finalHeight, MeasureSpec.EXACTLY)
-
-                // measure + layout
-                childView.measure(widthSpec, heightSpec)
-                childView.layout(0, 0, finalWidth, finalHeight)
-            } else {
-                 // 如果复用布局，必须检查 left/top 是否为 0。如果不为 0，绘制到 bitmap 时会发生偏移。
-                 // 很多时候 RN 会给 view 设置 left/top。
-                 if (childView.left != 0 || childView.top != 0) {
-                     childView.layout(0, 0, finalWidth, finalHeight)
-                 }
-            }
-
-            // 🔑 修复：创建支持透明度的 bitmap 配置
-            val bitmap = createBitmap(finalWidth, finalHeight)
-            val canvas = Canvas(bitmap)
-
-            // 🔑 关键修复：强制启用 view 的绘制缓存，确保内容正确渲染
-            childView.isDrawingCacheEnabled = true
-            childView.buildDrawingCache(true)
-
-            // 绘制 view 到 canvas
-            childView.draw(canvas)
-
-            // 清理绘制缓存
-            childView.isDrawingCacheEnabled = false
-            childView.destroyDrawingCache()
-
-            val shouldTrimTransparentPadding = customViewWidth <= 0 && customViewHeight <= 0
-            return if (shouldTrimTransparentPadding) trimTransparentPadding(bitmap) else bitmap
-        } catch (_: Exception) {
-            // 遇到异常时返回 null，让上层使用默认图标
-            return null
-        }
-    }
-
-    private fun trimTransparentPadding(bitmap: Bitmap): Bitmap {
-        if (bitmap.width <= 1 || bitmap.height <= 1) {
-            return bitmap
-        }
-
-        if (hasOpaquePixelsOnAllBitmapEdges(bitmap)) {
-            return bitmap
-        }
-
-        var minX = bitmap.width
-        var minY = bitmap.height
-        var maxX = -1
-        var maxY = -1
-
-        for (y in 0 until bitmap.height) {
-            for (x in 0 until bitmap.width) {
-                if (Color.alpha(bitmap.getPixel(x, y)) != 0) {
-                    if (x < minX) minX = x
-                    if (y < minY) minY = y
-                    if (x > maxX) maxX = x
-                    if (y > maxY) maxY = y
-                }
-            }
-        }
-
-        if (maxX < minX || maxY < minY) {
-            return bitmap
-        }
-
-        val trimmedWidth = maxX - minX + 1
-        val trimmedHeight = maxY - minY + 1
-        if (trimmedWidth == bitmap.width && trimmedHeight == bitmap.height) {
-            return bitmap
-        }
-
-        return Bitmap.createBitmap(bitmap, minX, minY, trimmedWidth, trimmedHeight)
-    }
-
-    private fun hasOpaquePixelsOnAllBitmapEdges(bitmap: Bitmap): Boolean {
-        var topEdgeHasPixel = false
-        var bottomEdgeHasPixel = false
-        var leftEdgeHasPixel = false
-        var rightEdgeHasPixel = false
-
-        for (x in 0 until bitmap.width) {
-            if (!topEdgeHasPixel && Color.alpha(bitmap.getPixel(x, 0)) != 0) {
-                topEdgeHasPixel = true
-            }
-            if (!bottomEdgeHasPixel && Color.alpha(bitmap.getPixel(x, bitmap.height - 1)) != 0) {
-                bottomEdgeHasPixel = true
-            }
-            if (topEdgeHasPixel && bottomEdgeHasPixel) {
-                break
-            }
-        }
-
-        for (y in 0 until bitmap.height) {
-            if (!leftEdgeHasPixel && Color.alpha(bitmap.getPixel(0, y)) != 0) {
-                leftEdgeHasPixel = true
-            }
-            if (!rightEdgeHasPixel && Color.alpha(bitmap.getPixel(bitmap.width - 1, y)) != 0) {
-                rightEdgeHasPixel = true
-            }
-            if (leftEdgeHasPixel && rightEdgeHasPixel) {
-                break
-            }
-        }
-
-        return topEdgeHasPixel && bottomEdgeHasPixel && leftEdgeHasPixel && rightEdgeHasPixel
+        val resolvedSnapshot = snapshot ?: return null
+        return MarkerBitmapRenderer.createBitmap(
+            container = this,
+            snapshot = resolvedSnapshot,
+            customViewWidth = customViewWidth,
+            customViewHeight = customViewHeight,
+            mainHandler = mainHandler,
+        )
     }
 
     /**
@@ -1064,14 +926,13 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             return
         }
 
-        // 构建缓存 key（优先 JS 端 cacheKey）
-        val keyPart = cacheKey ?: computeViewFingerprint(this)
-        val child = getChildAt(0)
-        val contentView = resolveRenderableContentView(child)
-        val contentBounds = computeContentBounds(child)
-        val measuredWidth = contentBounds?.width() ?: contentView?.measuredWidth ?: child?.measuredWidth ?: customViewWidth
-        val measuredHeight = contentBounds?.height() ?: contentView?.measuredHeight ?: child?.measuredHeight ?: customViewHeight
-        val fullCacheKey = "$keyPart|${measuredWidth}x${measuredHeight}"
+        val snapshot = resolveMarkerBitmapSnapshot() ?: run {
+            if (marker?.isVisible != true) {
+                // 自定义 view 还没准备好时，继续等待下一次 layout/update。
+            }
+            return
+        }
+        val fullCacheKey = snapshot.fullCacheKey
 
         // 确定锚点：优先使用用户指定的 pendingAnchor，否则对于自定义 View 使用中心点 (0.5, 0.5)
         val anchorX = pendingAnchor?.first ?: 0.5f
@@ -1093,7 +954,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         }
 
         // 2) Bitmap 缓存命中则生成 Descriptor，或者重新生成
-        val bitmap = IconBitmapCache.get(fullCacheKey) ?: createBitmapFromView() ?: run {
+        val bitmap = IconBitmapCache.get(fullCacheKey) ?: createBitmapFromView(snapshot) ?: run {
             // 🔑 关键修复：如果生成 Bitmap 失败（例如 View 还没准备好）
             // 不要急着切回默认 Marker，这会导致闪烁和位置跳变。
             // 只有在 Marker 从未显示过的情况下，才考虑兜底策略。
@@ -1136,6 +997,24 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         }
     }
 
+    private fun invalidateAppliedCustomMarkerCaches() {
+        val key = lastAppliedCustomMarkerKey ?: return
+        BitmapDescriptorCache.remove(key)
+        IconBitmapCache.remove(key)
+        lastAppliedCustomMarkerKey = null
+    }
+
+    private fun markCustomMarkerContentDirty(delayMs: Long = 16L) {
+        if (isRemoving || isEmpty()) {
+            return
+        }
+
+        invalidateAppliedCustomMarkerCaches()
+        if (marker != null) {
+            scheduleMarkerIconUpdate(delayMs)
+        }
+    }
+
 
 
     override fun removeView(child: View?) {
@@ -1156,8 +1035,8 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             if (index in 0..<childCount) {
                 super.removeViewAt(index)
                 // 只在还有子视图时更新图标
-                if (!isRemoving && childCount > 1 && marker != null) {
-                    scheduleMarkerIconUpdate(50)
+                if (!isRemoving && childCount > 0 && marker != null) {
+                    markCustomMarkerContentDirty(50)
                 }
                 // 如果最后一个子视图被移除，什么都不做
                 // 让 onDetachedFromWindow 处理完整的清理
@@ -1166,59 +1045,13 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             // 忽略异常
         }
     }
-    private fun resolveRenderableContentView(view: View?): View? {
-        var current = view ?: return null
-
-        while (current is ViewGroup && current.childCount == 1) {
-            val next = current.getChildAt(0) ?: break
-            current = next
-        }
-
-        return current
-    }
-
-    private fun computeContentBounds(view: View?): Rect? {
-        view ?: return null
-        if (view.visibility != View.VISIBLE) return null
-
-        var resolvedBounds: Rect? = null
-
-        if (view is ViewGroup && view.childCount > 0) {
-          for (i in 0 until view.childCount) {
-            val child = view.getChildAt(i) ?: continue
-            val childBounds = computeContentBounds(child) ?: continue
-            val shiftedBounds = Rect(childBounds)
-            shiftedBounds.offset(child.left, child.top)
-            resolvedBounds = if (resolvedBounds == null) {
-              shiftedBounds
-            } else {
-              Rect(resolvedBounds).apply { union(shiftedBounds) }
-            }
-          }
-        }
-
-        val hasOwnVisualBounds =
-          view.background != null ||
-            view.paddingLeft != 0 ||
-            view.paddingTop != 0 ||
-            view.paddingRight != 0 ||
-            view.paddingBottom != 0 ||
-            view !is ViewGroup
-
-        val ownWidth = view.measuredWidth.takeIf { it > 0 } ?: view.width
-        val ownHeight = view.measuredHeight.takeIf { it > 0 } ?: view.height
-
-        if (hasOwnVisualBounds && ownWidth > 0 && ownHeight > 0) {
-          val ownBounds = Rect(0, 0, ownWidth, ownHeight)
-          resolvedBounds = if (resolvedBounds == null) {
-            ownBounds
-          } else {
-            Rect(resolvedBounds).apply { union(ownBounds) }
-          }
-        }
-
-        return resolvedBounds
-    }
+    private fun resolveMarkerBitmapSnapshot(): MarkerBitmapSnapshot? =
+        MarkerBitmapRenderer.resolveSnapshot(
+            container = this,
+            customViewWidth = customViewWidth,
+            customViewHeight = customViewHeight,
+            cacheKey = cacheKey,
+        )
 
 
     override fun addView(child: View?, index: Int, params: android.view.ViewGroup.LayoutParams?) {
@@ -1257,7 +1090,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       // 🔑 修复：需要延迟更新图标，等待 children 完成布局
       // 原因：立即更新会在 children 还未完成测量/布局时就渲染，导致内容为空
       if (!isRemoving && marker != null && childCount > childCountBefore) {
-        scheduleMarkerIconUpdate()
+        markCustomMarkerContentDirty()
       }
     }
 
@@ -1266,10 +1099,19 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       // 🔑 修复：布局完成后延迟更新图标
       // 即使 changed 为 false，只要有内容，也应该检查是否需要更新（例如子 View 尺寸变化但 MarkerView 没变）
       if (!isRemoving && isNotEmpty() && marker != null) {
-        scheduleMarkerIconUpdate()
+        markCustomMarkerContentDirty()
       }
     }
 
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
+    override fun invalidateChildInParent(location: IntArray?, dirty: Rect?): ViewParent? {
+        val parentRef = super.invalidateChildInParent(location, dirty)
+        if (!isRemoving && isNotEmpty() && marker != null) {
+            markCustomMarkerContentDirty()
+        }
+        return parentRef
+    }
+
   
 
     /**
@@ -1517,62 +1359,4 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         }
     }
 
-
-    /**
-     * 为 view 和其子树生成一个轻量“指纹”字符串，用作缓存 key。
-     * 注意：这是启发式的，不追求 100% 唯一性，但在大部分自定义 view 场景下能稳定复用。
-     */
-    fun computeViewFingerprint(view: View?): String {
-        if (view == null) return "null"
-
-        val sb = StringBuilder()
-        // 首先尝试使用开发者可能预设的 tag 或 contentDescription 作为优先标识（稳定且快速）
-        val tag = view.tag
-        if (tag != null) {
-            sb.append("tag=").append(tag.toString()).append(";")
-            return sb.toString()
-        }
-
-        val contentDesc = view.contentDescription
-        if (!contentDesc.isNullOrEmpty()) {
-            sb.append("cdesc=").append(contentDesc.toString()).append(";")
-            return sb.toString()
-        }
-
-        // 否则做一个递归采样：className + 对于 TextView 获取 text + 对于 ImageView 获取 resourceId 或 drawable hash
-        fun appendFor(v: View) {
-            sb.append(v.javaClass.simpleName)
-            when (v) {
-                is TextView -> {
-                    val t = v.text?.toString() ?: ""
-                    if (t.isNotEmpty()) {
-                        sb.append("[text=").append(t).append("]")
-                    }
-                }
-                is ImageView -> {
-                    // 尝试读取资源 id（若使用 setImageResource 时可取到），否则取 drawable 的 hashCode 作为近似
-                    val resId = v.tag // 开发者可将资源 id 放到 tag 以便稳定识别
-                    if (resId is Int && resId != 0) {
-                        sb.append("[imgRes=").append(resId).append("]")
-                    } else {
-                        val dr = v.drawable
-                        if (dr != null) {
-                            sb.append("[drawableHash=").append(dr.hashCode()).append("]")
-                        }
-                    }
-                }
-            }
-            sb.append(";")
-            if (v is ViewGroup) {
-                for (i in 0 until v.childCount) {
-                    val c = v.getChildAt(i)
-                    appendFor(c)
-                }
-            }
-        }
-
-        appendFor(view)
-        // 最终返回一个截断的 sha-like 形式（避免 key 过长）
-        return sb.toString().take(1024)
-    }
 }

package/android/src/main/java/expo/modules/gaodemap/overlays/MarkerViewModule.kt

@@ -77,9 +77,9 @@ class MarkerViewModule : Module() {
       Prop<Int>("customViewHeight") { view, height ->
         view.setCustomViewHeight(height)
       }
-        // 缓存key
-      Prop<String>("cacheKey") { view, key ->
-            view.setCacheKey(key)
+      // 缓存key
+      Prop<String?>("cacheKey") { view, key ->
+        view.setCacheKey(key)
       }
 
       // 平滑移动路径

package/build/ExpoGaodeMapModule.d.ts

@@ -1,4 +1,4 @@
-import { LatLng, Coordinates, ReGeocode, LocationListener, LatLngPoint, CoordinateType } from './types';
+import { LatLng, Coordinates, ReGeocode, LocationListener, HeadingListener, LatLngPoint, CoordinateType, GeoLanguage } from './types';
 import type { ExpoGaodeMapModule as NativeExpoGaodeMapModule } from './types/native-module.types';
 import { PrivacyConfig, PrivacyStatus, SDKConfig, PermissionStatus } from './types/common.types';
 declare const helperMethods: {
@@ -42,6 +42,7 @@ declare const helperMethods: {
     isStarted(): Promise<boolean>;
     getCurrentLocation(): Promise<Coordinates | ReGeocode>;
     coordinateConvert(coordinate: LatLngPoint, type: CoordinateType): Promise<LatLng>;
+    setGeoLanguage(language: GeoLanguage | string): void;
     setLocatingWithReGeocode(isReGeocode: boolean): void;
     readonly isBackgroundLocationEnabled: boolean;
     /**
@@ -73,6 +74,13 @@ declare const helperMethods: {
     addLocationListener(listener: LocationListener): {
         remove: () => void;
     };
+    /**
+     * 添加方向监听器（iOS）
+     * 自动归一化 heading 事件字段，兼容旧版原生返回结构
+     */
+    addHeadingListener(listener: HeadingListener): {
+        remove: () => void;
+    };
     /**
      * 计算两个坐标点之间的距离
      * @param coordinate1 第一个坐标点
@@ -91,16 +99,16 @@ declare const helperMethods: {
     /**
      * 判断点是否在多边形内
      * @param point 要判断的点
-     * @param polygon 多边形的顶点坐标数组
+     * @param polygon 多边形的顶点坐标数组，支持嵌套数组（多边形空洞）
      * @returns 是否在多边形内
      */
-    isPointInPolygon(point: LatLngPoint, polygon: LatLngPoint[]): boolean;
+    isPointInPolygon(point: LatLngPoint, polygon: LatLngPoint[] | LatLngPoint[][]): boolean;
     /**
      * 计算多边形面积
-     * @param polygon 多边形的顶点坐标数组
+     * @param polygon 多边形的顶点坐标数组，支持嵌套数组（多边形空洞）
      * @returns 面积（单位：平方米）
      */
-    calculatePolygonArea(polygon: LatLngPoint[]): number;
+    calculatePolygonArea(polygon: LatLngPoint[] | LatLngPoint[][]): number;
     /**
      * 计算矩形面积
      * @param southWest 西南角坐标

package/build/ExpoGaodeMapModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoGaodeMapModule.d.ts","sourceRoot":"","sources":["../src/ExpoGaodeMapModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ExpoGaodeMapModule.d.ts","sourceRoot":"","sources":["../src/ExpoGaodeMapModule.ts"],"names":[],"mappings":"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"}