expo-gaode-map 1.2.2 → 1.2.3

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

@@ -4,18 +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.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
@@ -31,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
@@ -40,11 +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 java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-import androidx.core.graphics.createBitmap
+import kotlin.math.max
+import kotlin.math.min
 import expo.modules.gaodemap.utils.LatLngParser
 
 class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
@@ -53,6 +46,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         // 不可交互,通过父视图定位到屏幕外
         isClickable = false
         isFocusable = false
+        isBaselineAligned = false
         // 设置为水平方向（默认），让子视图自然布局
         orientation = HORIZONTAL
     }
@@ -118,11 +112,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 = MarkerBitmapRenderer.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 +222,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
@@ -392,7 +475,13 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      * JS 端传入稳定的缓存 key
      */
     fun setCacheKey(key: String?) {
+        if (cacheKey == key) {
+            return
+        }
+
+        invalidateAppliedCustomMarkerCaches()
         cacheKey = key
+        updateMarkerIcon()
     }
 
     /**
@@ -620,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) }
+        }
     }
 
     /**
@@ -629,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) }
+        }
     }
 
     /**
@@ -638,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()
     }
 
     /**
@@ -647,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()
     }
 
     /**
@@ -674,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
         }
@@ -781,102 +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 measuredWidth = measuredChild?.measuredWidth ?: 0
-        val 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()
-
-            return bitmap
-        } catch (_: Exception) {
-            // 遇到异常时返回 null，让上层使用默认图标
-            return null
-        }
+        val resolvedSnapshot = snapshot ?: return null
+        return MarkerBitmapRenderer.createBitmap(
+            container = this,
+            snapshot = resolvedSnapshot,
+            customViewWidth = customViewWidth,
+            customViewHeight = customViewHeight,
+            mainHandler = mainHandler,
+        )
     }
 
     /**
@@ -886,6 +917,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
@@ -894,27 +926,35 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             return
         }
 
-        // 构建缓存 key（优先 JS 端 cacheKey）
-        val keyPart = cacheKey ?: computeViewFingerprint(this)
-        val child = getChildAt(0)
-        val measuredWidth = child?.measuredWidth ?: customViewWidth
-        val 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
         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
         }
 
         // 2) Bitmap 缓存命中则生成 Descriptor，或者重新生成
-        val bitmap = IconBitmapCache.get(fullCacheKey) ?: createBitmapFromView() ?: run {
+        val bitmap = IconBitmapCache.get(fullCacheKey) ?: createBitmapFromView(snapshot) ?: run {
             // 🔑 关键修复：如果生成 Bitmap 失败（例如 View 还没准备好）
             // 不要急着切回默认 Marker，这会导致闪烁和位置跳变。
             // 只有在 Marker 从未显示过的情况下，才考虑兜底策略。
@@ -932,9 +972,49 @@ 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)
+        }
+    }
+
+    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?) {
@@ -955,12 +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) {
-                    mainHandler.postDelayed({
-                        if (!isRemoving && marker != null && isNotEmpty()) {
-                            updateMarkerIcon()
-                        }
-                    }, 50)
+                if (!isRemoving && childCount > 0 && marker != null) {
+                    markCustomMarkerContentDirty(50)
                 }
                 // 如果最后一个子视图被移除，什么都不做
                 // 让 onDetachedFromWindow 处理完整的清理
@@ -969,35 +1045,36 @@ 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 resolveMarkerBitmapSnapshot(): MarkerBitmapSnapshot? =
+        MarkerBitmapRenderer.resolveSnapshot(
+            container = this,
+            customViewWidth = customViewWidth,
+            customViewHeight = customViewHeight,
+            cacheKey = cacheKey,
+        )
 
 
     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 {
@@ -1008,17 +1085,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()
-          }
-        }
+        markCustomMarkerContentDirty()
       }
     }
 
@@ -1027,14 +1099,19 @@ 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()
-          }
-        }
+        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
+    }
+
   
 
     /**
@@ -1238,6 +1315,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     private fun stopSmoothMove() {
         smoothMoveMarker?.stopMove()
         smoothMoveMarker?.setVisible(false)
+        lastAppliedCustomMarkerKey = null
         marker?.let { showMarker(it) }
     }
 
@@ -1263,6 +1341,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         // 🔑 关键修复：使用 post 延迟检查
         // 清理所有延迟任务
         mainHandler.removeCallbacksAndMessages(null)
+        pendingMarkerIconUpdate = null
 
         // 延迟检查 parent 状态
         mainHandler.post {
@@ -1280,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)
       }
 
       // 平滑移动路径