expo-gaode-map-navigation 2.0.12-next.0 → 2.0.13

package/android/src/main/java/expo/modules/gaodemap/map/ExpoGaodeMapOfflineModule.kt

@@ -1,14 +1,19 @@
 package expo.modules.gaodemap.map
 
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.os.StatFs
 import android.os.Environment
 import android.util.Log
+import com.amap.api.maps.offlinemap.OfflineMapActivity
 import com.amap.api.maps.offlinemap.OfflineMapCity
 import com.amap.api.maps.offlinemap.OfflineMapManager
 import com.amap.api.maps.offlinemap.OfflineMapProvince
 import com.amap.api.maps.offlinemap.OfflineMapStatus
 import expo.modules.gaodemap.map.modules.SDKInitializer
+import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
@@ -92,12 +97,18 @@ class ExpoGaodeMapOfflineModule : Module() {
       offlineMapManager = null
       downloadingCities.clear()
     }
+
+    AsyncFunction("openOfflineMapUI") {
+      openOfflineMapUI()
+    }
     
     // ==================== 地图列表管理 ====================
     
     AsyncFunction("getAvailableCities") {
-      val cities = getOfflineMapManager()?.offlineMapCityList ?: emptyList()
-      cities.map { city -> convertCityToMap(city) }
+      val manager = getOfflineMapManager()
+      val cities = manager?.offlineMapCityList ?: emptyList()
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      cities.map { city -> convertCityToMap(city, downloadedCityKeys) }
     }
     
     AsyncFunction("getAvailableProvinces") {
@@ -106,15 +117,19 @@ class ExpoGaodeMapOfflineModule : Module() {
     }
     
     AsyncFunction("getCitiesByProvince") { provinceCode: String ->
-      val province = getOfflineMapManager()?.offlineMapProvinceList?.find {
-        it.provinceCode == provinceCode 
+      val manager = getOfflineMapManager()
+      val province = manager?.offlineMapProvinceList?.find {
+        it.provinceCode == provinceCode
       }
-      province?.cityList?.map { city -> convertCityToMap(city) } ?: emptyList()
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      province?.cityList?.map { city -> convertCityToMap(city, downloadedCityKeys) } ?: emptyList()
     }
     
     AsyncFunction("getDownloadedMaps") {
-      val cities = getOfflineMapManager()?.downloadOfflineMapCityList ?: emptyList()
-      cities.map { city -> convertCityToMap(city) }
+      val manager = getOfflineMapManager()
+      val cities = manager?.downloadOfflineMapCityList ?: emptyList()
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      cities.map { city -> convertCityToMap(city, downloadedCityKeys) }
     }
     
     // ==================== 下载管理 ====================
@@ -208,14 +223,17 @@ class ExpoGaodeMapOfflineModule : Module() {
     // ==================== 状态查询 ====================
     
     AsyncFunction("isMapDownloaded") { cityCode: String ->
-      val city = getOfflineMapManager()?.getItemByCityCode(cityCode)
-      city?.state == OfflineMapStatus.SUCCESS || 
-      city?.state == OfflineMapStatus.CHECKUPDATES
+      val manager = getOfflineMapManager()
+      val city = manager?.getItemByCityCode(cityCode)
+      city?.state == OfflineMapStatus.SUCCESS ||
+        city?.let { isDownloadedCity(it, getDownloadedCityKeys(manager)) } == true
     }
     
     AsyncFunction("getMapStatus") { cityCode: String ->
-      val city = getOfflineMapManager()?.getItemByCityCode(cityCode)
-      city?.let { convertCityToMap(it) } ?: Bundle()
+      val manager = getOfflineMapManager()
+      val city = manager?.getItemByCityCode(cityCode)
+      val downloadedCityKeys = getDownloadedCityKeys(manager)
+      city?.let { convertCityToMap(it, downloadedCityKeys) } ?: Bundle()
     }
     
     AsyncFunction("getTotalProgress") {
@@ -463,13 +481,37 @@ class ExpoGaodeMapOfflineModule : Module() {
   /**
    * 转换城市对象为 Map
    */
-  private fun convertCityToMap(city: OfflineMapCity): Bundle {
+  private fun getDownloadedCityKeys(manager: OfflineMapManager?): Set<String> {
+    return manager?.downloadOfflineMapCityList
+      ?.flatMap { getCityIdentityKeys(it) }
+      ?.toSet()
+      ?: emptySet()
+  }
+
+  private fun getCityIdentityKeys(city: OfflineMapCity): List<String> {
+    return listOfNotNull(
+      city.code?.trim()?.takeIf { it.isNotEmpty() }?.let { "code:$it" },
+      city.adcode?.trim()?.takeIf { it.isNotEmpty() }?.let { "adcode:$it" },
+      city.city?.trim()?.takeIf { it.isNotEmpty() }?.let { "name:$it" }
+    )
+  }
+
+  private fun isDownloadedCity(city: OfflineMapCity, downloadedCityKeys: Set<String>): Boolean {
+    return getCityIdentityKeys(city).any { downloadedCityKeys.contains(it) }
+  }
+
+  private fun convertCityToMap(
+    city: OfflineMapCity,
+    downloadedCityKeys: Set<String> = emptySet()
+  ): Bundle {
     val isPaused = synchronized(lock) { pausedCities.contains(city.code) }
     val isDownloading = synchronized(lock) { downloadingCities.contains(city.code) }
+    val isDownloaded = isDownloadedCity(city, downloadedCityKeys)
     
     val status = when {
       isPaused -> "paused"
       isDownloading -> "downloading"
+      isDownloaded -> "downloaded"
       else -> getStatusString(city.state)
     }
     
@@ -501,8 +543,9 @@ class ExpoGaodeMapOfflineModule : Module() {
   }
   
   /**
-   * 获取状态字符串
-   * 注意：只有 SUCCESS 状态才表示真正下载完成
+   * 获取状态字符串。
+   * CHECKUPDATES / NEW_VERSION 在 10.1.600 冷启动时可能出现在普通城市列表,
+   * 不能单独作为已下载依据；已下载状态以 downloadOfflineMapCityList 为准。
    */
   private fun getStatusString(state: Int): String {
     return when (state) {
@@ -558,4 +601,29 @@ class ExpoGaodeMapOfflineModule : Module() {
       null
     }
   }
+
+  private fun getActivityLaunchContext(): Context {
+    return appContext.currentActivity
+      ?: appContext.reactContext
+      ?: throw CodedException("NO_CONTEXT", "React context not available", null)
+  }
+
+  private fun openOfflineMapUI() {
+    val context = getActivityLaunchContext()
+    SDKInitializer.restorePersistedState(context.applicationContext)
+
+    if (!SDKInitializer.isPrivacyReady()) {
+      throw CodedException(
+        "PRIVACY_NOT_AGREED",
+        "隐私协议未完成确认，请先调用 setPrivacyConfig",
+        null
+      )
+    }
+
+    val intent = Intent(context, OfflineMapActivity::class.java)
+    if (context !is Activity) {
+      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+    context.startActivity(intent)
+  }
 }

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

@@ -150,6 +150,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     // 缓存初始相机位置，等待地图加载完成后设置
     private var pendingCameraPosition: Map<String, Any?>? = null
     private var isMapLoaded = false
+    private var hasAppliedInitialCameraPosition = false
 
     init {
         try {
@@ -192,7 +193,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
                 val positionToApply = initialCameraPosition ?: pendingCameraPosition
                 positionToApply?.let { position ->
-                    applyInitialCameraPosition(position)
+                    applyInitialCameraPositionIfNeeded(position)
                     pendingCameraPosition = null
                 }
 
@@ -351,10 +352,14 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     fun setInitialCameraPosition(position: Map<String, Any?>) {
         initialCameraPosition = position
 
+        if (hasAppliedInitialCameraPosition) {
+            return
+        }
+
         // 如果地图已加载,立即应用;否则缓存等待地图加载完成
         if (isMapLoaded) {
             mainHandler.post {
-                applyInitialCameraPosition(position)
+                applyInitialCameraPositionIfNeeded(position)
             }
         } else {
             pendingCameraPosition = position
@@ -365,8 +370,12 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
      * 实际应用相机位置
      * @param position 相机位置配置
      */
-    private fun applyInitialCameraPosition(position: Map<String, Any?>) {
+    private fun applyInitialCameraPositionIfNeeded(position: Map<String, Any?>) {
+        if (hasAppliedInitialCameraPosition) {
+            return
+        }
         cameraManager.setInitialCameraPosition(position)
+        hasAppliedInitialCameraPosition = true
     }
 
     // ==================== UI 控件和手势 ====================
@@ -643,6 +652,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
             // 销毁地图实例
             mapView.onDestroy()
+            hasAppliedInitialCameraPosition = false
         } catch (e: Exception) {
             // 静默处理异常,确保销毁流程不会中断
             android.util.Log.e("ExpoGaodeMapView", "Error destroying map", e)

package/android/src/main/java/expo/modules/gaodemap/map/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 特有的

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

@@ -56,22 +56,6 @@ object SDKInitializer {
         applyPrivacyState(appContext)
     }
 
-    fun setPrivacyShow(context: Context, hasShow: Boolean, hasContainsPrivacy: Boolean) {
-        privacyShown = hasShow
-        privacyContains = hasContainsPrivacy
-        val appContext = resolveContext(context)
-        persistState(appContext)
-        applyPrivacyState(appContext)
-    }
-
-    fun setPrivacyAgree(context: Context, hasAgree: Boolean) {
-        privacyAgreed = hasAgree
-        agreedPrivacyVersion = if (hasAgree) privacyVersion else null
-        val appContext = resolveContext(context)
-        persistState(appContext)
-        applyPrivacyState(appContext)
-    }
-
     fun setPrivacyVersion(context: Context, version: String) {
         val sanitizedVersion = version.trim().takeIf { it.isNotEmpty() }
         privacyVersion = sanitizedVersion
@@ -89,6 +73,28 @@ object SDKInitializer {
         applyPrivacyState(appContext)
     }
 
+    fun setPrivacyConfig(
+        context: Context,
+        hasShow: Boolean,
+        hasContainsPrivacy: Boolean,
+        hasAgree: Boolean,
+        version: String?,
+        shouldUpdateVersion: Boolean
+    ) {
+        val appContext = resolveContext(context)
+
+        if (shouldUpdateVersion) {
+            privacyVersion = version?.trim()?.takeIf { it.isNotEmpty() }
+        }
+        privacyShown = hasShow
+        privacyContains = hasContainsPrivacy
+        privacyAgreed = hasAgree
+        agreedPrivacyVersion = if (hasAgree) privacyVersion else null
+
+        persistState(appContext)
+        applyPrivacyState(appContext)
+    }
+
     fun resetPrivacyConsent(context: Context) {
         val appContext = resolveContext(context)
         clearConsentPersistedState(appContext, keepCurrentVersion = false)
@@ -138,7 +144,7 @@ object SDKInitializer {
         if (!isPrivacyReady()) {
             throw expo.modules.kotlin.exception.CodedException(
                 "PRIVACY_NOT_AGREED",
-                "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree",
+                "隐私协议未完成确认，请先调用 setPrivacyConfig",
                 null
             )
         }

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

@@ -141,8 +141,11 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
    * 设置最小聚合数量
    */
   fun setMinClusterSize(size: Int) {
-    Log.d("ClusterView", "setMinClusterSize: $size")
-    minClusterSize = size
+    val nextSize = size.coerceAtLeast(1)
+    if (minClusterSize != nextSize) {
+      minClusterSize = nextSize
+      styleChanged = true
+    }
     updateClusters()
   }
   

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

@@ -1,21 +1,27 @@
 package expo.modules.gaodemap.map.overlays
 
 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.map.utils.LatLngParser
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
-import expo.modules.gaodemap.map.utils.LatLngParser
 
 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 +31,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 +43,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 +54,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 +65,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 +75,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 +115,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 +163,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 +175,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 +189,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 +231,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 +249,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/map/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, _ ->