expo-gaode-map 1.1.8 → 2.0.0-alpha.2

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

@@ -6,6 +6,7 @@ import com.amap.api.maps.AMap
 import com.amap.api.maps.model.Circle
 import com.amap.api.maps.model.CircleOptions
 import com.amap.api.maps.model.LatLng
+import expo.modules.gaodemap.utils.ColorParser
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -13,7 +14,7 @@ import expo.modules.kotlin.views.ExpoView
 class CircleView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
   @Suppress("unused")
-  private val onPress by EventDispatcher()
+  private val onCirclePress by EventDispatcher()
   
   private var circle: Circle? = null
   private var aMap: AMap? = null
@@ -22,6 +23,8 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
   private var fillColor: Int = Color.argb(50, 0, 0, 255)
   private var strokeColor: Int = Color.BLUE
   private var strokeWidth: Float = 10f
+
+  private var _zIndex: Float = 0f
   
   /**
    * 设置地图实例
@@ -40,6 +43,10 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
     val lat = centerMap["latitude"]
     val lng = centerMap["longitude"]
     if (lat != null && lng != null) {
+      // 坐标验证
+      if (lat < -90 || lat > 90 || lng < -180 || lng > 180) {
+        return
+      }
       center = LatLng(lat, lng)
       circle?.center = center
     }
@@ -49,24 +56,33 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
    * 设置半径
    */
   fun setRadius(radiusValue: Double) {
-    radius = radiusValue
-    circle?.radius = radius
+    // 半径验证（必须大于0）
+    val validRadius = if (radiusValue > 0) radiusValue else 1000.0
+    radius = validRadius
+    circle?.let {
+        it.radius = radius
+    } ?: createOrUpdateCircle()
   }
   
   /**
    * 设置填充颜色
    */
-  fun setFillColor(color: Int) {
-    fillColor = color
-    circle?.fillColor = color
+  fun setFillColor(color: Any) {
+    fillColor = ColorParser.parseColor(color)
+     circle?.let {
+         it.fillColor = fillColor
+     } ?: createOrUpdateCircle()
+
   }
   
   /**
    * 设置边框颜色
    */
-  fun setStrokeColor(color: Int) {
-    strokeColor = color
-    circle?.strokeColor = color
+  fun setStrokeColor(color: Any) {
+    strokeColor =  ColorParser.parseColor(color)
+    circle?.let {
+        it.strokeColor = strokeColor
+    } ?: createOrUpdateCircle()
   }
   
   /**
@@ -76,14 +92,19 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
   fun setStrokeWidth(width: Float) {
     val density = context.resources.displayMetrics.density
     strokeWidth = width * density
-    circle?.strokeWidth = strokeWidth
+    circle?.let {
+        it.strokeWidth = strokeWidth
+    } ?: createOrUpdateCircle()
   }
   
   /**
    * 设置 z-index
    */
   fun setZIndex(zIndex: Float) {
-    circle?.zIndex = zIndex
+    _zIndex = zIndex
+   circle?.let {
+        it.zIndex = _zIndex
+    } ?: createOrUpdateCircle()
   }
   
   /**
@@ -94,14 +115,15 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
     val centerPoint = center ?: return
     
     if (circle == null) {
-      val density = context.resources.displayMetrics.density
+
       circle = map.addCircle(
         CircleOptions()
           .center(centerPoint)
           .radius(radius)
           .fillColor(fillColor)
           .strokeColor(strokeColor)
-          .strokeWidth(strokeWidth * density)
+          .strokeWidth(strokeWidth)
+          .zIndex(_zIndex)
       )
     }
   }
@@ -112,7 +134,7 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
   fun checkPress(latLng: LatLng): Boolean {
     circle?.let { c ->
       if (c.contains(latLng)) {
-        onPress(mapOf(
+        onCirclePress(mapOf(
           "latitude" to latLng.latitude,
           "longitude" to latLng.longitude
         ))
@@ -133,5 +155,7 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     removeCircle()
+    aMap = null
   }
+
 }

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

@@ -11,7 +11,7 @@ class CircleViewModule : Module() {
     Name("CircleView")
 
     View(CircleView::class) {
-      Events("onPress")
+      Events("onCirclePress")
       
       Prop<Map<String, Double>>("center") { view, center ->
         view.setCenter(center)
@@ -21,11 +21,11 @@ class CircleViewModule : Module() {
         view.setRadius(radius)
       }
       
-      Prop<Int>("fillColor") { view, color ->
+      Prop<Any>("fillColor") { view, color ->
         view.setFillColor(color)
       }
       
-      Prop<Int>("strokeColor") { view, color ->
+      Prop<Any>("strokeColor") { view, color ->
         view.setStrokeColor(color)
       }
       

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

@@ -42,7 +42,12 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
    * 设置聚合点数据
    */
   fun setPoints(pointsList: List<Map<String, Any>>) {
-    points = pointsList
+    // 过滤无效坐标
+    points = pointsList.filter { point ->
+      val lat = (point["latitude"] as? Number)?.toDouble()
+      val lng = (point["longitude"] as? Number)?.toDouble()
+      lat != null && lng != null && lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180
+    }
     createOrUpdateCluster()
   }
   
@@ -118,10 +123,12 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
   fun removeCluster() {
     markers.forEach { it.remove() }
     markers.clear()
+    points = emptyList()
   }
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     removeCluster()
+    aMap = null
   }
 }

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

@@ -34,7 +34,8 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
     data.forEach { point ->
       val lat = (point["latitude"] as? Number)?.toDouble()
       val lng = (point["longitude"] as? Number)?.toDouble()
-      if (lat != null && lng != null) {
+      // 坐标验证
+      if (lat != null && lng != null && lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180) {
         dataList.add(LatLng(lat, lng))
       }
     }
@@ -88,10 +89,12 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
   fun removeHeatMap() {
     heatmapOverlay?.remove()
     heatmapOverlay = null
+    dataList.clear()
   }
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     removeHeatMap()
+    aMap = null
   }
 }