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

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapView.kt

@@ -32,6 +32,10 @@ import androidx.core.graphics.withTranslation
 @SuppressLint("ViewConstructor")
 class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
 
+    init {
+        orientation = VERTICAL
+    }
+
     /**
      * 拦截 React Native 的 ViewManager 操作
      * 重写 requestLayout 防止在移除视图时触发布局异常
@@ -44,6 +48,63 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         }
     }
 
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val measuredWidth = View.MeasureSpec.getSize(widthMeasureSpec)
+        val measuredHeight = View.MeasureSpec.getSize(heightMeasureSpec)
+
+        setMeasuredDimension(measuredWidth, measuredHeight)
+
+        for (i in 0 until childCount) {
+            val child = getChildAt(i) ?: continue
+            if (child.visibility == View.GONE) {
+                continue
+            }
+
+            if (child === mapView) {
+                val childWidthSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, View.MeasureSpec.EXACTLY)
+                val childHeightSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight, View.MeasureSpec.EXACTLY)
+                child.measure(childWidthSpec, childHeightSpec)
+                continue
+            }
+
+            val lp = child.layoutParams
+            val childWidthSpec = when {
+                lp?.width != null && lp.width > 0 ->
+                    View.MeasureSpec.makeMeasureSpec(lp.width, View.MeasureSpec.EXACTLY)
+                else ->
+                    View.MeasureSpec.makeMeasureSpec(measuredWidth, View.MeasureSpec.AT_MOST)
+            }
+            val childHeightSpec = when {
+                lp?.height != null && lp.height > 0 ->
+                    View.MeasureSpec.makeMeasureSpec(lp.height, View.MeasureSpec.EXACTLY)
+                else ->
+                    View.MeasureSpec.makeMeasureSpec(measuredHeight, View.MeasureSpec.AT_MOST)
+            }
+            child.measure(childWidthSpec, childHeightSpec)
+        }
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        val width = right - left
+        val height = bottom - top
+
+        for (i in 0 until childCount) {
+            val child = getChildAt(i) ?: continue
+            if (child.visibility == View.GONE) {
+                continue
+            }
+
+            if (child === mapView) {
+                child.layout(0, 0, width, height)
+                continue
+            }
+
+            val childWidth = child.measuredWidth
+            val childHeight = child.measuredHeight
+            child.layout(0, 0, childWidth, childHeight)
+        }
+    }
+
     // Props 存储
     /** 地图类型 */
     internal var mapType: Int = 0
@@ -617,9 +678,10 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     override fun addView(child: View?, index: Int) {
         if (child is MarkerView) {
             child.setMap(aMap)
-            // MarkerView 也加入实际视图层级，但设置为 0x0 大小并移到屏幕外
-            // 不使用 View.GONE，避免在新架构下出现渲染问题
-            val params = LayoutParams(0, 0)
+            // MarkerView 需要保留可测量尺寸，否则 Android 无法正确处理
+            // Text / View 的 maxWidth 等布局约束，最终会被测成整行宽度。
+            // 这里保留 WRAP_CONTENT，并继续移到屏幕外，避免影响可见布局。
+            val params = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
             child.layoutParams = params
             child.translationX = -10000f  // 移到屏幕外
             child.translationY = -10000f
@@ -729,7 +791,4 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         return false
     }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-    }
 }

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

@@ -5,6 +5,8 @@ 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
@@ -41,6 +43,8 @@ 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
@@ -53,6 +57,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         // 不可交互,通过父视图定位到屏幕外
         isClickable = false
         isFocusable = false
+        isBaselineAligned = false
         // 设置为水平方向（默认），让子视图自然布局
         orientation = HORIZONTAL
     }
@@ -118,11 +123,98 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             }
         }
 
-        try {
+        if (childCount == 0) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        } catch (e: Exception) {
-            throw e
+            return
+        }
+
+        val parentWidthSize = MeasureSpec.getSize(widthMeasureSpec)
+        val parentHeightSize = MeasureSpec.getSize(heightMeasureSpec)
+        val fallbackWidthSize = resolveExplicitMeasureSize(parentWidthSize, true)
+        val fallbackHeightSize = resolveExplicitMeasureSize(parentHeightSize, false)
+
+        val contentWidthSpec = when {
+            customViewWidth > 0 -> MeasureSpec.makeMeasureSpec(customViewWidth, MeasureSpec.EXACTLY)
+            fallbackWidthSize > 0 -> MeasureSpec.makeMeasureSpec(fallbackWidthSize, MeasureSpec.AT_MOST)
+            else -> MeasureSpec.makeMeasureSpec(1, MeasureSpec.EXACTLY)
+        }
+        val contentHeightSpec = when {
+            customViewHeight > 0 -> MeasureSpec.makeMeasureSpec(customViewHeight, MeasureSpec.EXACTLY)
+            fallbackHeightSize > 0 -> MeasureSpec.makeMeasureSpec(fallbackHeightSize, MeasureSpec.AT_MOST)
+            else -> MeasureSpec.makeMeasureSpec(1, MeasureSpec.EXACTLY)
+        }
+
+        var measuredContentWidth = 0
+        var measuredContentHeight = 0
+
+        for (i in 0 until childCount) {
+            val child = getChildAt(i)
+            val lp = child.layoutParams as? LayoutParams
+                ?: LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
+
+            val childWidthSpec = getChildMeasureSpec(
+                contentWidthSpec,
+                paddingLeft + paddingRight,
+                lp.width
+            )
+            val childHeightSpec = getChildMeasureSpec(
+                contentHeightSpec,
+                paddingTop + paddingBottom,
+                lp.height
+            )
+
+            child.measure(childWidthSpec, childHeightSpec)
+            val childBounds = computeContentBounds(child)
+            measuredContentWidth = max(measuredContentWidth, childBounds?.width() ?: child.measuredWidth)
+            measuredContentHeight = max(measuredContentHeight, childBounds?.height() ?: child.measuredHeight)
+        }
+
+        val desiredWidth = if (customViewWidth > 0) {
+            customViewWidth
+        } else {
+            measuredContentWidth + paddingLeft + paddingRight
+        }
+        val desiredHeight = if (customViewHeight > 0) {
+            customViewHeight
+        } else {
+            measuredContentHeight + paddingTop + paddingBottom
+        }
+
+        val finalWidth = if (parentWidthSize > 0) min(desiredWidth, parentWidthSize) else desiredWidth
+        val finalHeight = if (parentHeightSize > 0) min(desiredHeight, parentHeightSize) else desiredHeight
+
+        setMeasuredDimension(
+            max(finalWidth, suggestedMinimumWidth),
+            max(finalHeight, suggestedMinimumHeight)
+        )
+    }
+
+    private fun resolveExplicitMeasureSize(parentSize: Int, isWidth: Boolean): Int {
+        if (parentSize > 0) {
+            return parentSize
+        }
+
+        val parentView = parent as? View
+        val parentMeasuredSize = if (isWidth) {
+            parentView?.measuredWidth ?: 0
+        } else {
+            parentView?.measuredHeight ?: 0
+        }
+        if (parentMeasuredSize > 0) {
+            return parentMeasuredSize
+        }
+
+        val parentLayoutSize = if (isWidth) {
+            parentView?.width ?: 0
+        } else {
+            parentView?.height ?: 0
+        }
+        if (parentLayoutSize > 0) {
+            return parentLayoutSize
         }
+
+        val displayMetrics = context.resources.displayMetrics
+        return if (isWidth) displayMetrics.widthPixels else displayMetrics.heightPixels
     }
 
     private val onMarkerPress by EventDispatcher()
@@ -141,6 +233,8 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     private var customViewHeight: Int = 0  // 用于自定义视图（children）的高度
     private val mainHandler = Handler(Looper.getMainLooper())
     private var isRemoving = false  // 标记是否正在被移除
+    private var pendingMarkerIconUpdate: Runnable? = null
+    private var lastAppliedCustomMarkerKey: String? = null
 
     // 缓存属性，在 marker 创建前保存
     private var pendingTitle: String? = null
@@ -789,8 +883,10 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         val keyPart = cacheKey ?: computeViewFingerprint(this)
 
         val measuredChild = if (isNotEmpty()) getChildAt(0) else null
-        val measuredWidth = measuredChild?.measuredWidth ?: 0
-        val measuredHeight = measuredChild?.measuredHeight ?: 0
+        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)
@@ -873,13 +969,85 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             childView.isDrawingCacheEnabled = false
             childView.destroyDrawingCache()
 
-            return bitmap
+            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
+    }
+
     /**
      * 更新 marker 图标
      */
@@ -887,6 +1055,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         if (isEmpty()) {
             // 如果确实为空（没有子视图），恢复默认样式
             marker?.setIcon(BitmapDescriptorFactory.defaultMarker())
+            lastAppliedCustomMarkerKey = null
             // 恢复默认锚点（底部中心），除非用户指定了锚点
             val anchorX = pendingAnchor?.first ?: 0.5f
             val anchorY = pendingAnchor?.second ?: 1.0f
@@ -898,18 +1067,27 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         // 构建缓存 key（优先 JS 端 cacheKey）
         val keyPart = cacheKey ?: computeViewFingerprint(this)
         val child = getChildAt(0)
-        val measuredWidth = child?.measuredWidth ?: customViewWidth
-        val measuredHeight = child?.measuredHeight ?: customViewHeight
+        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}"
 
         // 确定锚点：优先使用用户指定的 pendingAnchor，否则对于自定义 View 使用中心点 (0.5, 0.5)
         val anchorX = pendingAnchor?.first ?: 0.5f
         val anchorY = pendingAnchor?.second ?: 0.5f
 
+        if (fullCacheKey == lastAppliedCustomMarkerKey) {
+            marker?.setAnchor(anchorX, anchorY)
+            marker?.let { showMarker(it) }
+            return
+        }
+
         // 1) 尝试 BitmapDescriptor 缓存
         BitmapDescriptorCache.get(fullCacheKey)?.let { it ->
             marker?.setIcon(it)
             marker?.setAnchor(anchorX, anchorY)
+            lastAppliedCustomMarkerKey = fullCacheKey
             marker?.let { showMarker(it) }
             return
         }
@@ -933,9 +1111,31 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         // 设置到 Marker
         marker?.setIcon(descriptor)
         marker?.setAnchor(anchorX, anchorY)
+        lastAppliedCustomMarkerKey = fullCacheKey
         marker?.let { showMarker(it) }
     }
 
+    private fun scheduleMarkerIconUpdate(delayMs: Long = 16L) {
+        if (isRemoving || marker == null || isEmpty()) {
+            return
+        }
+
+        pendingMarkerIconUpdate?.let { mainHandler.removeCallbacks(it) }
+        val task = Runnable {
+            pendingMarkerIconUpdate = null
+            if (!isRemoving && marker != null && isNotEmpty()) {
+                updateMarkerIcon()
+            }
+        }
+        pendingMarkerIconUpdate = task
+
+        if (delayMs <= 0L) {
+            mainHandler.post(task)
+        } else {
+            mainHandler.postDelayed(task, delayMs)
+        }
+    }
+
 
 
     override fun removeView(child: View?) {
@@ -957,11 +1157,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
                 super.removeViewAt(index)
                 // 只在还有子视图时更新图标
                 if (!isRemoving && childCount > 1 && marker != null) {
-                    mainHandler.postDelayed({
-                        if (!isRemoving && marker != null && isNotEmpty()) {
-                            updateMarkerIcon()
-                        }
-                    }, 50)
+                    scheduleMarkerIconUpdate(50)
                 }
                 // 如果最后一个子视图被移除，什么都不做
                 // 让 onDetachedFromWindow 处理完整的清理
@@ -970,35 +1166,82 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             // 忽略异常
         }
     }
-    /**
-     * 递归修复子视图的 LayoutParams，确保所有子视图都使用正确的 LayoutParams 类型
-     */
-    private fun fixChildLayoutParams(view: View) {
-        if (view is ViewGroup) {
-            for (i in 0 until view.childCount) {
-                val child = view.getChildAt(i)
-                val currentParams = child.layoutParams
-                if (currentParams != null && currentParams !is LayoutParams) {
-                    child.layoutParams = LayoutParams(
-                        currentParams.width,
-                        currentParams.height
-                    )
-                }
-                fixChildLayoutParams(child)
+    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
     }
 
 
     override fun addView(child: View?, index: Int, params: android.view.ViewGroup.LayoutParams?) {
       // 🔑 关键修复：记录添加前的子视图数量
       val childCountBefore = childCount
+
+      val sourceWidth = when {
+        customViewWidth > 0 -> customViewWidth
+        params?.width != null && params.width > 0 -> params.width
+        else -> LayoutParams.WRAP_CONTENT
+      }
+
+      val sourceHeight = when {
+        customViewHeight > 0 -> customViewHeight
+        params?.height != null && params.height > 0 -> params.height
+        else -> LayoutParams.WRAP_CONTENT
+      }
       
       val finalParams = LayoutParams(
-        if (customViewWidth > 0) customViewWidth else LayoutParams.WRAP_CONTENT,
-        if (customViewHeight > 0) customViewHeight else LayoutParams.WRAP_CONTENT
+        sourceWidth,
+        sourceHeight
       )
-      
+
       super.addView(child, index, finalParams)
       
       child?.let {
@@ -1009,17 +1252,12 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             childParams?.height ?: LayoutParams.WRAP_CONTENT
           )
         }
-        fixChildLayoutParams(it)
       }
       
       // 🔑 修复：需要延迟更新图标，等待 children 完成布局
       // 原因：立即更新会在 children 还未完成测量/布局时就渲染，导致内容为空
       if (!isRemoving && marker != null && childCount > childCountBefore) {
-        mainHandler.post {
-          if (!isRemoving && marker != null && isNotEmpty()) {
-            updateMarkerIcon()
-          }
-        }
+        scheduleMarkerIconUpdate()
       }
     }
 
@@ -1028,11 +1266,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       // 🔑 修复：布局完成后延迟更新图标
       // 即使 changed 为 false，只要有内容，也应该检查是否需要更新（例如子 View 尺寸变化但 MarkerView 没变）
       if (!isRemoving && isNotEmpty() && marker != null) {
-        mainHandler.post {
-          if (!isRemoving && marker != null && isNotEmpty()) {
-            updateMarkerIcon()
-          }
-        }
+        scheduleMarkerIconUpdate()
       }
     }
 
@@ -1239,6 +1473,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     private fun stopSmoothMove() {
         smoothMoveMarker?.stopMove()
         smoothMoveMarker?.setVisible(false)
+        lastAppliedCustomMarkerKey = null
         marker?.let { showMarker(it) }
     }
 
@@ -1264,6 +1499,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         // 🔑 关键修复：使用 post 延迟检查
         // 清理所有延迟任务
         mainHandler.removeCallbacksAndMessages(null)
+        pendingMarkerIconUpdate = null
 
         // 延迟检查 parent 状态
         mainHandler.post {

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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"}

package/build/ExpoGaodeMapModule.js

@@ -741,16 +741,35 @@ const helperMethods = {
         try {
             const normalizedPoint = normalizeLatLng(point);
             let normalizedPolygons;
+            let ringToPolygonIndex = null;
             // 处理三维数组 (LatLngPoint[][][]) 和二维数组 (LatLngPoint[][])
             if (Array.isArray(polygons[0]) && Array.isArray(polygons[0][0])) {
                 // LatLngPoint[][][] -> 扁平化为 LatLngPoint[][] 用于 C++ 遍历
-                normalizedPolygons = polygons.reduce((acc, val) => acc.concat(val), []);
+                // 同时记录每个 Ring 对应的原始多边形索引
+                normalizedPolygons = [];
+                ringToPolygonIndex = [];
+                polygons.forEach((polygonRings, index) => {
+                    polygonRings.forEach((ring) => {
+                        normalizedPolygons.push(ring);
+                        ringToPolygonIndex.push(index);
+                    });
+                });
             }
             else {
                 normalizedPolygons = polygons;
             }
-            const processedPolygons = normalizedPolygons.map(p => normalizeLatLngList(p));
-            return nativeModule.findPointInPolygons(normalizedPoint, processedPolygons);
+            const processedPolygons = normalizedPolygons.map((p) => normalizeLatLngList(p));
+            const resultIndex = nativeModule.findPointInPolygons(normalizedPoint, processedPolygons);
+            // 如果未命中，返回 -1
+            if (resultIndex === -1) {
+                return -1;
+            }
+            // 如果存在映射关系（带孔多边形），将 Ring 索引映射回 Polygon 索引
+            if (ringToPolygonIndex) {
+                return ringToPolygonIndex[resultIndex];
+            }
+            // 简单多边形直接返回索引
+            return resultIndex;
         }
         catch (error) {
             ErrorLogger.warn('findPointInPolygons 失败', { point, error });