expo-gaode-map 2.2.33 → 2.2.34

package/android/src/main/java/expo/modules/gaodemap/managers/UIManager.kt

@@ -87,36 +87,46 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
   // ==================== 图层显示 ====================
   
   private var currentLocationStyle: MyLocationStyle? = null
+  private var currentFollowUserLocation: Boolean = false
+  private var explicitLocationType: Int? = null
+
+  private fun parseLocationType(locationType: String): Int? {
+    return when (locationType) {
+      "SHOW" -> MyLocationStyle.LOCATION_TYPE_SHOW
+      "LOCATE" -> MyLocationStyle.LOCATION_TYPE_LOCATE
+      "FOLLOW" -> MyLocationStyle.LOCATION_TYPE_FOLLOW
+      "MAP_ROTATE" -> MyLocationStyle.LOCATION_TYPE_MAP_ROTATE
+      "LOCATION_ROTATE" -> MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE
+      "LOCATION_ROTATE_NO_CENTER" -> MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER
+      "FOLLOW_NO_CENTER" -> MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER
+      "MAP_ROTATE_NO_CENTER" -> MyLocationStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER
+      else -> null
+    }
+  }
+
+  private fun resolveLocationType(followUserLocation: Boolean): Int {
+    explicitLocationType?.let { return it }
+    return if (followUserLocation) {
+      MyLocationStyle.LOCATION_TYPE_FOLLOW
+    } else {
+      MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER
+    }
+  }
   
   /**
    * 设置是否显示用户位置
    */
   fun setShowsUserLocation(show: Boolean, followUserLocation: Boolean = false) {
+    currentFollowUserLocation = followUserLocation
     if (show) {
-      // 创建默认的定位样式
       if (currentLocationStyle == null) {
-        currentLocationStyle = MyLocationStyle().apply {
-          // 根据是否跟随设置定位类型
-          val locationType = if (followUserLocation) {
-            MyLocationStyle.LOCATION_TYPE_FOLLOW  // 连续定位并跟随
-          } else {
-            MyLocationStyle.LOCATION_TYPE_SHOW  // 只显示定位点，不跟随
-          }
-          myLocationType(locationType)
-          interval(2000)  // 2秒定位一次
-          showMyLocation(true)
-        }
-      } else {
-        // 更新定位类型
-        val locationType = if (followUserLocation) {
-          MyLocationStyle.LOCATION_TYPE_FOLLOW
-        } else {
-          MyLocationStyle.LOCATION_TYPE_SHOW
-        }
-        currentLocationStyle?.apply {
-          myLocationType(locationType)
-          interval(2000)
-        }
+        currentLocationStyle = MyLocationStyle()
+      }
+
+      currentLocationStyle?.apply {
+        myLocationType(resolveLocationType(followUserLocation))
+        interval(2000)  // 2秒定位一次
+        showMyLocation(true)
       }
       
       // 监听定位变化（用于通知 React Native）
@@ -171,9 +181,10 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
    */
   @SuppressLint("DiscouragedApi")
   fun setUserLocationRepresentation(config: Map<String, Any>) {
+    explicitLocationType = (config["locationType"] as? String)?.let(::parseLocationType)
+
     if (currentLocationStyle == null) {
       currentLocationStyle = MyLocationStyle().apply {
-        myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE)
         interval(2000)
         showMyLocation(true)
       }
@@ -182,21 +193,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
     val style = currentLocationStyle!!
     
     // 定位蓝点展现模式 (locationType) - Android 支持8种模式
-    val locationType = config["locationType"] as? String
-    if (locationType != null) {
-      val locationTypeValue = when (locationType) {
-        "SHOW" -> MyLocationStyle.LOCATION_TYPE_SHOW
-        "LOCATE" -> MyLocationStyle.LOCATION_TYPE_LOCATE
-        "FOLLOW" -> MyLocationStyle.LOCATION_TYPE_FOLLOW
-        "MAP_ROTATE" -> MyLocationStyle.LOCATION_TYPE_MAP_ROTATE
-        "LOCATION_ROTATE" -> MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE
-        "LOCATION_ROTATE_NO_CENTER" -> MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER
-        "FOLLOW_NO_CENTER" -> MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER
-        "MAP_ROTATE_NO_CENTER" -> MyLocationStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER
-        else -> MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE // 默认值
-      }
-      style.myLocationType(locationTypeValue)
-    }
+    style.myLocationType(resolveLocationType(currentFollowUserLocation))
     
     // 是否显示定位蓝点 (showMyLocation) - Android 5.1.0+ 支持
     // 注意：这个属性在 iOS 中没有对应项，是 Android 特有的
@@ -240,7 +237,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
     
     // 自定义图标 (image)
     val imagePath = config["image"] as? String
-    if (imagePath != null && imagePath.isNotEmpty()) {
+    if (!imagePath.isNullOrEmpty()) {
       val density = context.resources.displayMetrics.density
       val imageWidth = (config["imageWidth"] as? Number)?.let { (it.toFloat() * density).toInt() }
       val imageHeight = (config["imageHeight"] as? Number)?.let { (it.toFloat() * density).toInt() }
@@ -357,7 +354,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
   fun setMapType(type: Int) {
     aMap.mapType = when (type) {
       2 -> AMap.MAP_TYPE_SATELLITE  // 卫星地图
-      3 -> AMap.MAP_TYPE_NIGHT      // 夜间地图
+      3 -> AMap.MAP_TYPE_NIGHT      // 黑夜地图
       4 -> AMap.MAP_TYPE_NAVI       // 导航地图
       5 -> AMap.MAP_TYPE_BUS        // 公交地图
       else -> AMap.MAP_TYPE_NORMAL  // 标准地图 (1, 以及兼容旧值 0)

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

@@ -3,6 +3,7 @@ package expo.modules.gaodemap.modules
 import android.content.Context
 import com.amap.api.location.AMapLocationClient
 import com.amap.api.maps.MapsInitializer
+import androidx.core.content.edit
 
 /**
  * SDK 初始化管理器
@@ -14,7 +15,7 @@ import com.amap.api.maps.MapsInitializer
  * - 获取 SDK 版本信息
  */
 object SDKInitializer {
-    private const val PREFS_NAME = "expo_gaodemap_privacy"
+    private const val PREFS_NAME = "expo_demagogue_privacy"
     private const val KEY_PRIVACY_SHOWN = "privacy_shown"
     private const val KEY_PRIVACY_CONTAINS = "privacy_contains"
     private const val KEY_PRIVACY_AGREED = "privacy_agreed"
@@ -170,13 +171,13 @@ object SDKInitializer {
     }
 
     private fun persistState(context: Context) {
-        prefs(context).edit()
-            .putBoolean(KEY_PRIVACY_SHOWN, privacyShown)
-            .putBoolean(KEY_PRIVACY_CONTAINS, privacyContains)
-            .putBoolean(KEY_PRIVACY_AGREED, privacyAgreed)
-            .putString(KEY_PRIVACY_VERSION, privacyVersion)
-            .putString(KEY_AGREED_PRIVACY_VERSION, agreedPrivacyVersion)
-            .apply()
+        prefs(context).edit {
+            putBoolean(KEY_PRIVACY_SHOWN, privacyShown)
+                .putBoolean(KEY_PRIVACY_CONTAINS, privacyContains)
+                .putBoolean(KEY_PRIVACY_AGREED, privacyAgreed)
+                .putString(KEY_PRIVACY_VERSION, privacyVersion)
+                .putString(KEY_AGREED_PRIVACY_VERSION, agreedPrivacyVersion)
+        }
     }
 
     private fun clearConsentPersistedState(context: Context, keepCurrentVersion: Boolean) {
@@ -185,19 +186,19 @@ object SDKInitializer {
         privacyAgreed = false
         agreedPrivacyVersion = null
 
-        val editor = prefs(context).edit()
-            .putBoolean(KEY_PRIVACY_SHOWN, false)
+        prefs(context).edit {
+            putBoolean(KEY_PRIVACY_SHOWN, false)
             .putBoolean(KEY_PRIVACY_CONTAINS, false)
             .putBoolean(KEY_PRIVACY_AGREED, false)
             .remove(KEY_AGREED_PRIVACY_VERSION)
 
-        if (keepCurrentVersion) {
-            editor.putString(KEY_PRIVACY_VERSION, privacyVersion)
-        } else {
-            privacyVersion = null
-            editor.remove(KEY_PRIVACY_VERSION)
-        }
+            if (keepCurrentVersion) {
+                putString(KEY_PRIVACY_VERSION, privacyVersion)
+            } else {
+                privacyVersion = null
+                remove(KEY_PRIVACY_VERSION)
+            }
 
-        editor.apply()
+        }
     }
 }

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

@@ -1,5 +1,6 @@
 package expo.modules.gaodemap.overlays
 
+import android.annotation.SuppressLint
 import expo.modules.gaodemap.utils.LatLngParser
 import android.content.Context
 import android.graphics.Color
@@ -12,6 +13,7 @@ import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 
+@SuppressLint("ViewConstructor")
 class CircleView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
   @Suppress("unused")
@@ -155,7 +157,7 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
     // 如果是真正的移除，parent 会保持为 null
     // 如果只是 TabView 切换，parent 会在短时间内恢复
     post {
-      // 延迟后再次检查 parent，如果仍然为 null，说明是真正的移除
+      // 延迟后再次检查 parent，如果仍然为 null，说明是真正移除
       if (parent == null) {
         removeCircle()
         aMap = null

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

@@ -37,6 +37,7 @@ import java.util.concurrent.ConcurrentHashMap
  * 点聚合视图
  * 实现真正的点聚合逻辑，支持自定义样式和点击事件
  */
+@SuppressLint("ViewConstructor")
 class ClusterView(context: Context, appContext: AppContext) : ExpoView(context, appContext), AMap.OnCameraChangeListener {
   
 
@@ -139,7 +140,11 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
    * 设置最小聚合数量
    */
   fun setMinClusterSize(size: Int) {
-    minClusterSize = size
+    val nextSize = size.coerceAtLeast(1)
+    if (minClusterSize != nextSize) {
+      minClusterSize = nextSize
+      styleChanged = true
+    }
     updateClusters()
   }
   

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

@@ -1,21 +1,29 @@
 package expo.modules.gaodemap.overlays
 
+import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Color
 import android.os.Looper
 import android.util.Log
 import com.amap.api.maps.AMap
+import com.amap.api.maps.CameraUpdateFactory
+import com.amap.api.maps.model.Gradient
+import com.amap.api.maps.model.HeatmapTileProvider
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.TileOverlay
 import com.amap.api.maps.model.TileOverlayOptions
-import com.amap.api.maps.model.HeatmapTileProvider
-import com.amap.api.maps.CameraUpdateFactory
+import com.amap.api.maps.model.WeightedLatLng
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.views.ExpoView
+import expo.modules.gaodemap.utils.LatLngParser
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
-import expo.modules.gaodemap.utils.LatLngParser
 
+@SuppressLint("ViewConstructor")
 class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
+  private companion object {
+    const val TAG = "HeatMapView"
+  }
   
   private val executor: ExecutorService = Executors.newSingleThreadExecutor()
   private val applyUpdateRunnable = Runnable { applyUpdateOnMain() }
@@ -25,9 +33,10 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
 
   private var heatmapOverlay: TileOverlay? = null
   private var aMap: AMap? = null
-  private var dataList: MutableList<LatLng> = mutableListOf()
+  private var dataList: MutableList<WeightedLatLng> = mutableListOf()
   private var radius: Int = 50
   private var opacity: Double = 0.6
+  private var gradient: Gradient? = null
   
   /**
    * 设置地图实例
@@ -36,6 +45,7 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
   fun setMap(map: AMap) {
     aMap = map
     needsRebuild = true
+    Log.d(TAG, "setMap: map attached")
     scheduleUpdate()
   }
   
@@ -46,7 +56,8 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
    */
   fun setData(data: List<Any>?) {
     dataList.clear()
-    dataList.addAll(LatLngParser.parseLatLngList(data))
+    dataList.addAll(parseWeightedLatLngList(data))
+    Log.d(TAG, "setData: raw=${data?.size ?: 0}, parsed=${dataList.size}, ${formatPointStats(dataList)}")
     needsRebuild = true
     scheduleUpdate()
   }
@@ -56,6 +67,7 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
    */
   fun setRadius(radiusValue: Int) {
     radius = radiusValue
+    Log.d(TAG, "setRadius: $radiusValue")
     needsRebuild = true
     scheduleUpdate()
   }
@@ -65,10 +77,20 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
    */
   fun setOpacity(opacityValue: Double) {
     opacity = opacityValue
-    applyOverlayOpacity()
+    Log.d(TAG, "setOpacity: $opacityValue")
+    needsRebuild = true
+    scheduleUpdate()
+  }
+
+  fun setGradient(gradientValue: Map<String, Any>?) {
+    gradient = parseGradient(gradientValue)
+    Log.d(TAG, "setGradient: hasGradient=${gradient != null}, raw=${gradientValue != null}")
+    needsRebuild = true
+    scheduleUpdate()
   }
 
   fun setVisible(visibleValue: Boolean) {
+    Log.d(TAG, "setVisible: $visibleValue, points=${dataList.size}, hasOverlay=${heatmapOverlay != null}, needsRebuild=$needsRebuild")
     if (!visibleValue) {
       visible = false
       updateToken += 1
@@ -95,6 +117,7 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
   private fun scheduleUpdate() {
     updateToken += 1
     removeCallbacks(applyUpdateRunnable)
+    Log.d(TAG, "scheduleUpdate: token=$updateToken, mapAttached=${aMap != null}, visible=$visible, points=${dataList.size}")
     postDelayed(applyUpdateRunnable, 32)
   }
 
@@ -142,8 +165,11 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
     val map = aMap ?: return
     val token = updateToken
     val pointsSnapshot = ArrayList(dataList)
+    val latLngSnapshot = pointsSnapshot.map { it.latLng }
     val radiusValue = radius.coerceIn(10, 200)
     val opacityValue = opacity.coerceIn(0.0, 1.0)
+    val gradientValue = gradient
+    Log.d(TAG, "applyUpdate: token=$token, visible=$visible, points=${pointsSnapshot.size}, radius=$radiusValue, opacity=$opacityValue, gradient=${gradientValue != null}, ${formatPointStats(pointsSnapshot)}")
 
     if (!visible) {
       applyOverlayVisibility()
@@ -151,6 +177,7 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
     }
 
     if (pointsSnapshot.isEmpty()) {
+      Log.w(TAG, "applyUpdate: no valid heatmap points, removing overlay")
       heatmapOverlay?.remove()
       heatmapOverlay = null
       return
@@ -164,19 +191,25 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
 
     executor.execute {
       try {
-        val provider = HeatmapTileProvider.Builder()
-          .data(pointsSnapshot)
+        val builder = HeatmapTileProvider.Builder()
+          .data(latLngSnapshot)
           .radius(radiusValue)
-          .build()
+
+        gradientValue?.let { builder.gradient(it) }
+
+        val provider = builder.build()
 
         post {
           if (token != updateToken) {
+            Log.d(TAG, "addOverlay skipped: stale token=$token, current=$updateToken")
             return@post
           }
           if (aMap !== map) {
+            Log.d(TAG, "addOverlay skipped: map instance changed")
             return@post
           }
           if (!visible) {
+            Log.d(TAG, "addOverlay skipped: hidden")
             return@post
           }
 
@@ -200,9 +233,10 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
           applyOverlayVisibility()
           applyOverlayOpacity()
           forceRefresh()
+          Log.i(TAG, "addOverlay success: id=${runCatching { heatmapOverlay?.id }.getOrNull()}, points=${pointsSnapshot.size}, radius=$radiusValue, opacity=$opacityValue")
         }
       } catch (t: Throwable) {
-        Log.e("HeatMapView", "Failed to build heatmap", t)
+        Log.e(TAG, "Failed to build heatmap", t)
       }
     }
   }
@@ -217,11 +251,91 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
   fun removeHeatMap() {
     updateToken += 1
     removeCallbacks(applyUpdateRunnable)
+    Log.d(TAG, "removeHeatMap")
     heatmapOverlay?.remove()
     heatmapOverlay = null
     dataList.clear()
     needsRebuild = true
   }
+
+  private fun parseWeightedLatLngList(data: Any?): List<WeightedLatLng> {
+    if (data == null || data !is List<*>) return emptyList()
+
+    val result = mutableListOf<WeightedLatLng>()
+    for (item in data) {
+      val point = parseWeightedLatLng(item)
+      if (point != null) {
+        result.add(point)
+      } else if (item is List<*>) {
+        result.addAll(parseWeightedLatLngList(item))
+      }
+    }
+    return result
+  }
+
+  private fun parseWeightedLatLng(data: Any?): WeightedLatLng? {
+    val latLng = LatLngParser.parseLatLng(data) ?: return null
+    val intensity = when (data) {
+      is Map<*, *> -> listOf(data["intensity"], data["weight"], data["count"], data["value"])
+        .firstOrNull { it is Number }
+      is List<*> -> data.getOrNull(2)
+      else -> null
+    }
+    val weight = ((intensity as? Number)?.toDouble() ?: 1.0).takeIf { it.isFinite() && it > 0.0 } ?: 1.0
+    return WeightedLatLng(latLng, weight)
+  }
+
+  private fun parseGradient(gradientValue: Map<String, Any>?): Gradient? {
+    if (gradientValue == null) return null
+    val rawColors = gradientValue["colors"] as? List<*> ?: return null
+    val rawStartPoints = gradientValue["startPoints"] as? List<*> ?: return null
+    if (rawColors.size < 2 || rawColors.size != rawStartPoints.size) {
+      Log.w(TAG, "parseGradient ignored: colors=${rawColors.size}, startPoints=${rawStartPoints.size}")
+      return null
+    }
+
+    val colors = IntArray(rawColors.size)
+    val startPoints = FloatArray(rawStartPoints.size)
+    for (index in rawColors.indices) {
+      val color = parseColor(rawColors[index]) ?: run {
+        Log.w(TAG, "parseGradient ignored: invalid color at index=$index, value=${rawColors[index]}")
+        return null
+      }
+      val startPoint = (rawStartPoints[index] as? Number)?.toFloat() ?: run {
+        Log.w(TAG, "parseGradient ignored: invalid startPoint at index=$index, value=${rawStartPoints[index]}")
+        return null
+      }
+      colors[index] = color
+      startPoints[index] = startPoint.coerceIn(0f, 1f)
+    }
+    return Gradient(colors, startPoints)
+  }
+
+  private fun parseColor(value: Any?): Int? {
+    return when (value) {
+      is Number -> value.toInt()
+      is String -> runCatching { Color.parseColor(value) }.getOrNull()
+      else -> null
+    }
+  }
+
+  private fun formatPointStats(points: List<WeightedLatLng>): String {
+    if (points.isEmpty()) return "bounds=empty"
+    var minLat = Double.POSITIVE_INFINITY
+    var maxLat = Double.NEGATIVE_INFINITY
+    var minLng = Double.POSITIVE_INFINITY
+    var maxLng = Double.NEGATIVE_INFINITY
+    var totalIntensity = 0.0
+    points.forEach { point ->
+      val latLng: LatLng = point.latLng
+      minLat = minOf(minLat, latLng.latitude)
+      maxLat = maxOf(maxLat, latLng.latitude)
+      minLng = minOf(minLng, latLng.longitude)
+      maxLng = maxOf(maxLng, latLng.longitude)
+      totalIntensity += point.intensity
+    }
+    return "bounds=[$minLat,$minLng]-[$maxLat,$maxLng], totalIntensity=$totalIntensity"
+  }
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()

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

@@ -27,8 +27,8 @@ class HeatMapViewModule : Module() {
         view.setOpacity(opacity)
       }
 
-      Prop<Map<String, Any>?>("gradient") { _: HeatMapView, _ ->
-          // iOS only, ignore on Android
+      Prop<Map<String, Any>?>("gradient") { view: HeatMapView, gradient ->
+        view.setGradient(gradient)
       }
 
       Prop<Boolean>("allowRetinaAdapting") { _: HeatMapView, _ ->

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

@@ -15,6 +15,9 @@ import expo.modules.gaodemap.companion.IconBitmapCache
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.text.StringBuilder
+import androidx.core.view.isEmpty
+import androidx.core.graphics.get
+import androidx.core.view.isNotEmpty
 
 internal data class MarkerBitmapSnapshot(
     val keyPart: String,
@@ -55,7 +58,7 @@ internal object MarkerBitmapRenderer {
         contentHeight: Int,
         cacheKey: String?,
     ): MarkerBitmapSnapshot? {
-        if (container.childCount == 0) {
+        if (container.isEmpty()) {
             return null
         }
 
@@ -69,12 +72,10 @@ internal object MarkerBitmapRenderer {
             contentBounds?.width()
                 ?: contentView?.measuredWidth
                 ?: child.measuredWidth
-                ?: 0
         val measuredHeight =
             contentBounds?.height()
                 ?: contentView?.measuredHeight
                 ?: child.measuredHeight
-                ?: 0
 
         val finalWidth = if (measuredWidth > 0) measuredWidth else contentWidth
         val finalHeight = if (measuredHeight > 0) measuredHeight else contentHeight
@@ -146,7 +147,7 @@ internal object MarkerBitmapRenderer {
 
         var resolvedBounds: Rect? = null
 
-        if (view is ViewGroup && view.childCount > 0) {
+        if (view is ViewGroup && view.isNotEmpty()) {
             for (i in 0 until view.childCount) {
                 val child = view.getChildAt(i) ?: continue
                 val childBounds = computeContentBounds(child) ?: continue
@@ -308,7 +309,7 @@ internal object MarkerBitmapRenderer {
 
         for (y in 0 until bitmap.height) {
             for (x in 0 until bitmap.width) {
-                if (Color.alpha(bitmap.getPixel(x, y)) != 0) {
+                if (Color.alpha(bitmap[x, y]) != 0) {
                     if (x < minX) minX = x
                     if (y < minY) minY = y
                     if (x > maxX) maxX = x
@@ -337,10 +338,10 @@ internal object MarkerBitmapRenderer {
         var rightEdgeHasPixel = false
 
         for (x in 0 until bitmap.width) {
-            if (!topEdgeHasPixel && Color.alpha(bitmap.getPixel(x, 0)) != 0) {
+            if (!topEdgeHasPixel && Color.alpha(bitmap[x, 0]) != 0) {
                 topEdgeHasPixel = true
             }
-            if (!bottomEdgeHasPixel && Color.alpha(bitmap.getPixel(x, bitmap.height - 1)) != 0) {
+            if (!bottomEdgeHasPixel && Color.alpha(bitmap[x, bitmap.height - 1]) != 0) {
                 bottomEdgeHasPixel = true
             }
             if (topEdgeHasPixel && bottomEdgeHasPixel) {
@@ -349,10 +350,10 @@ internal object MarkerBitmapRenderer {
         }
 
         for (y in 0 until bitmap.height) {
-            if (!leftEdgeHasPixel && Color.alpha(bitmap.getPixel(0, y)) != 0) {
+            if (!leftEdgeHasPixel && Color.alpha(bitmap[0, y]) != 0) {
                 leftEdgeHasPixel = true
             }
-            if (!rightEdgeHasPixel && Color.alpha(bitmap.getPixel(bitmap.width - 1, y)) != 0) {
+            if (!rightEdgeHasPixel && Color.alpha(bitmap[bitmap.width - 1, y]) != 0) {
                 rightEdgeHasPixel = true
             }
             if (leftEdgeHasPixel && rightEdgeHasPixel) {

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

@@ -28,7 +28,7 @@ import androidx.core.view.contains
 
 import androidx.core.view.isEmpty
 import androidx.core.graphics.scale
-import android.view.ViewGroup
+
 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,6 +40,7 @@ import kotlin.math.max
 import kotlin.math.min
 import expo.modules.gaodemap.utils.LatLngParser
 
+@SuppressLint("ViewConstructor")
 class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
 
     init {
@@ -112,7 +113,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             }
         }
 
-        if (childCount == 0) {
+        if (isEmpty()) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec)
             return
         }
@@ -927,9 +928,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         }
 
         val snapshot = resolveMarkerBitmapSnapshot() ?: run {
-            if (marker?.isVisible != true) {
-                // 自定义 view 还没准备好时，继续等待下一次 layout/update。
-            }
+
             return
         }
         val fullCacheKey = snapshot.fullCacheKey
@@ -958,10 +957,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             // 🔑 关键修复：如果生成 Bitmap 失败（例如 View 还没准备好）
             // 不要急着切回默认 Marker，这会导致闪烁和位置跳变。
             // 只有在 Marker 从未显示过的情况下，才考虑兜底策略。
-            if (marker?.isVisible != true) {
-                 // 如果从未显示过，可以暂不显示，等待下一次尝试，或者显示默认（取决于需求）
-                 // 这里选择暂不显示，避免闪现蓝点
-            }
+
             return
         }
 
@@ -997,7 +993,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         }
     }
 
-    private fun invalidateAppliedCustomMarkerCaches(clearGlobalCache: Boolean = false) {
+    private fun invalidateAppliedCustomMarkerCaches(clearGlobalCache: Boolean) {
         val key = lastAppliedCustomMarkerKey ?: return
         if (clearGlobalCache) {
             BitmapDescriptorCache.remove(key)
@@ -1040,7 +1036,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             if (index in 0..<childCount) {
                 super.removeViewAt(index)
                 // 只在还有子视图时更新图标
-                if (!isRemoving && childCount > 0 && marker != null) {
+                if (!isRemoving && isNotEmpty() && marker != null) {
                     markCustomMarkerContentDirty(50)
                 }
                 // 如果最后一个子视图被移除，什么都不做

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

@@ -1,5 +1,6 @@
 package expo.modules.gaodemap.overlays
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -10,7 +11,7 @@ import expo.modules.gaodemap.utils.LatLngParser
 import com.amap.api.maps.AMap
 import com.amap.api.maps.model.BitmapDescriptor
 import com.amap.api.maps.model.BitmapDescriptorFactory
-import com.amap.api.maps.model.LatLng
+
 import com.amap.api.maps.model.MultiPointItem
 import com.amap.api.maps.model.MultiPointOverlay
 import com.amap.api.maps.model.MultiPointOverlayOptions
@@ -26,6 +27,7 @@ import java.net.URL
 import kotlin.concurrent.thread
 import androidx.core.graphics.scale
 
+@SuppressLint("ViewConstructor")
 class MultiPointView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
   private val onMultiPointPress by EventDispatcher()