expo-gaode-map-navigation 1.1.5-next.1 → 1.1.5-next.2

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

@@ -8,71 +8,94 @@ import expo.modules.kotlin.modules.ModuleDefinition
  */
 class MarkerViewModule : Module() {
   override fun definition() = ModuleDefinition {
-    Name("NaviMarkerView")
+    Name("MarkerView")
 
     View(MarkerView::class) {
       Events("onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd")
       
-      // 拆分 position 为两个独立属性以兼容 React Native 旧架构
+      // 纬度
       Prop<Double>("latitude") { view, lat ->
         view.setLatitude(lat)
       }
-      
+      // 经度
       Prop<Double>("longitude") { view, lng ->
         view.setLongitude(lng)
       }
-      
+      // 位置
+      Prop<Map<String, Any>?>("position") { view, position ->
+        view.setPosition(position)
+      }
+      // 标题
       Prop<String>("title") { view, title ->
         view.setTitle(title)
       }
-      
+      // 副标题
       Prop<String>("snippet") { view, snippet ->
         view.setDescription(snippet)
       }
-      
+      // 是否可拖拽
       Prop<Boolean>("draggable") { view, draggable ->
         view.setDraggable(draggable)
       }
-      
+      // 图标
       Prop<String>("icon") { view, icon ->
         view.setMarkerIcon(icon)
       }
-      
+      // 图标颜色
       Prop<String>("pinColor") { view, color ->
         view.setPinColor(color)
       }
-      
+      // 透明度
       Prop<Float>("opacity") { view, opacity ->
         view.setOpacity(opacity)
       }
-      
+      // 是否平铺
       Prop<Boolean>("flat") { view, flat ->
         view.setFlat(flat)
       }
-      
+      // 层级
       Prop<Float>("zIndex") { view, zIndex ->
         view.setZIndex(zIndex)
       }
-      
+      // 锚点
       Prop<Map<String, Float>>("anchor") { view, anchor ->
         view.setAnchor(anchor)
       }
-      
+      // 图标宽度
       Prop<Int>("iconWidth") { view, width ->
         view.setIconWidth(width)
       }
-      
+      // 图标高度
       Prop<Int>("iconHeight") { view, height ->
         view.setIconHeight(height)
       }
-      
+      // 自定义视图宽度
       Prop<Int>("customViewWidth") { view, width ->
         view.setCustomViewWidth(width)
       }
-      
+      // 自定义视图高度
       Prop<Int>("customViewHeight") { view, height ->
         view.setCustomViewHeight(height)
       }
+        // 缓存key
+      Prop<String>("cacheKey") { view, key ->
+            view.setCacheKey(key)
+      }
+
+      // 平滑移动路径
+      Prop<List<Any>?>("smoothMovePath") { view: MarkerView, path ->
+        view.setSmoothMovePath(path)
+      }
+
+      // 平滑移动时长（秒）
+      Prop<Double>("smoothMoveDuration") { view, duration ->
+        view.setSmoothMoveDuration(duration)
+      }
+
+      // 生长动画
+      Prop<Boolean>("growAnimation") { view, enable ->
+        view.setGrowAnimation(enable)
+      }
     }
   }
-}
+}

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

@@ -1,24 +1,48 @@
 package expo.modules.gaodemap.map.overlays
 
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.os.Handler
+import android.os.Looper
 
+import expo.modules.gaodemap.map.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
+import expo.modules.gaodemap.map.companion.BitmapDescriptorCache
+
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.viewevent.EventDispatcher
 
 import expo.modules.kotlin.views.ExpoView
+import java.io.InputStream
+import java.net.HttpURLConnection
+import java.net.URL
+import kotlin.concurrent.thread
+import androidx.core.graphics.scale
 
 class MultiPointView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
-
+  private val onMultiPointPress by EventDispatcher()
   private var multiPointOverlay: MultiPointOverlay? = null
   private var aMap: AMap? = null
   private var points: MutableList<MultiPointItem> = mutableListOf()
   
+  private var pendingIconUri: String? = null
+  private var currentIconDescriptor: BitmapDescriptor? = null
+  private val mainHandler = Handler(Looper.getMainLooper())
+  
+  private var anchorX: Float = 0.5f
+  private var anchorY: Float = 0.5f
+  
+  private var iconWidth: Int? = null
+  private var iconHeight: Int? = null
+  
   /**
    * 设置地图实例
    */
@@ -27,20 +51,22 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
     createOrUpdateMultiPoint()
   }
   
+
+
   /**
    * 设置海量点数据
    */
-  fun setPoints(pointsList: List<Map<String, Any>>) {
+  fun setPoints(pointsList: List<Any>) {
     points.clear()
-    pointsList.forEach { point ->
-      val lat = (point["latitude"] as? Number)?.toDouble()
-      val lng = (point["longitude"] as? Number)?.toDouble()
-      val id = point["id"] as? String ?: ""
-      
-      // 坐标验证
-      if (lat != null && lng != null && lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180) {
-        val multiPointItem = MultiPointItem(LatLng(lat, lng))
-        multiPointItem.customerId = id
+    pointsList.forEach { pointData ->
+      val latLng = LatLngParser.parseLatLng(pointData)
+      if (latLng != null) {
+        val multiPointItem = MultiPointItem(latLng)
+        // 如果是 Map，尝试获取 ID
+        if (pointData is Map<*, *>) {
+          val id = pointData["customerId"] as? String ?: pointData["id"] as? String ?: ""
+          multiPointItem.customerId = id
+        }
         points.add(multiPointItem)
       }
     }
@@ -51,18 +77,32 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
    * 设置图标
    */
   fun setIcon(iconUri: String?) {
+    pendingIconUri = iconUri
+    if (iconUri != null) {
+        loadAndSetIcon(iconUri)
+    } else {
+        currentIconDescriptor = null
+        createOrUpdateMultiPoint()
+    }
+  }
 
-    // 简化处理，实际需要实现图片加载
-    createOrUpdateMultiPoint()
+  fun setIconWidth(width: Int?) {
+    iconWidth = width
+    pendingIconUri?.let { loadAndSetIcon(it) }
+  }
+
+  fun setIconHeight(height: Int?) {
+    iconHeight = height
+    pendingIconUri?.let { loadAndSetIcon(it) }
   }
   
   /**
    * 设置锚点
    */
   fun setAnchor(anchor: Map<String, Float>) {
-    val x = anchor["x"] ?: 0.5f
-    val y = anchor["y"] ?: 0.5f
-    multiPointOverlay?.setAnchor(x, y)
+    anchorX = anchor["x"] ?: 0.5f
+    anchorY = anchor["y"] ?: 0.5f
+    multiPointOverlay?.setAnchor(anchorX, anchorY)
   }
   
   /**
@@ -76,18 +116,133 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
         
         // 创建海量点选项
         val overlayOptions = MultiPointOverlayOptions()
-        overlayOptions.icon(BitmapDescriptorFactory.defaultMarker())
-        overlayOptions.anchor(0.5f, 0.5f)
+        // 使用加载的图标或默认图标
+        val icon = currentIconDescriptor ?: BitmapDescriptorFactory.defaultMarker()
+        overlayOptions.icon(icon)
+        overlayOptions.anchor(anchorX, anchorY)
         
         // 创建海量点覆盖物
         multiPointOverlay = map.addMultiPointOverlay(overlayOptions)
-          multiPointOverlay?.items = points
-        
-        // 注意：MultiPointOverlay 在高德地图 Android SDK 中不直接支持点击事件
-        // 如果需要点击事件，需要使用 Marker 或其他方式实现
+        multiPointOverlay?.items = points
       }
     }
   }
+
+  fun handleMultiPointClick(item: MultiPointItem): Boolean {
+      val index = points.indexOfFirst { it.customerId == item.customerId }
+      if (index != -1) {
+          onMultiPointPress(mapOf(
+              "id" to item.customerId, // 兼容旧版
+              "customerId" to item.customerId,
+              "index" to index, // 添加 index 字段
+              "latitude" to item.latLng.latitude,
+              "longitude" to item.latLng.longitude
+          ))
+          return true
+      }
+      return false
+  }
+
+  private fun loadAndSetIcon(iconUri: String) {
+      val w = iconWidth ?: 0
+      val h = iconHeight ?: 0
+      val cacheKey = "multipoint|$iconUri|$w|$h"
+      
+      // 尝试从缓存获取
+      BitmapDescriptorCache.get(cacheKey)?.let {
+          currentIconDescriptor = it
+          createOrUpdateMultiPoint()
+          return
+      }
+
+      when {
+          iconUri.startsWith("http") -> {
+              loadImageFromUrl(iconUri) { bitmap ->
+                  processBitmap(bitmap, cacheKey)
+              }
+          }
+          iconUri.startsWith("file://") -> {
+              val path = iconUri.substring(7)
+              val bitmap = BitmapFactory.decodeFile(path)
+              processBitmap(bitmap, cacheKey)
+          }
+          else -> {
+               val resId = context.resources.getIdentifier(iconUri, "drawable", context.packageName)
+               if (resId != 0) {
+                   val bitmap = BitmapFactory.decodeResource(context.resources, resId)
+                   processBitmap(bitmap, cacheKey)
+               } else {
+                   currentIconDescriptor = null
+                   mainHandler.post { createOrUpdateMultiPoint() }
+               }
+          }
+      }
+  }
+
+  private fun processBitmap(bitmap: Bitmap?, cacheKey: String) {
+      if (bitmap != null) {
+          var finalBitmap = bitmap
+          if (iconWidth != null || iconHeight != null) {
+             var w = iconWidth?.let { dpToPx(it) } ?: 0
+             var h = iconHeight?.let { dpToPx(it) } ?: 0
+             
+             if (w > 0 && h == 0) {
+                 h = (bitmap.height * (w.toFloat() / bitmap.width)).toInt()
+             } else if (h > 0 && w == 0) {
+                 w = (bitmap.width * (h.toFloat() / bitmap.height)).toInt()
+             } else if (w == 0 && h == 0) {
+                 w = bitmap.width
+                 h = bitmap.height
+             }
+             
+             try {
+                 finalBitmap = bitmap.scale(w, h)
+             } catch (e: Exception) {
+                 e.printStackTrace()
+             }
+          }
+          
+          val descriptor = BitmapDescriptorFactory.fromBitmap(finalBitmap)
+          BitmapDescriptorCache.putDescriptor(cacheKey, descriptor)
+          currentIconDescriptor = descriptor
+      } else {
+          currentIconDescriptor = null
+      }
+      mainHandler.post { createOrUpdateMultiPoint() }
+  }
+
+  private fun dpToPx(dp: Int): Int {
+      val density = context.resources.displayMetrics.density
+      return (dp * density).toInt()
+  }
+
+  private fun loadImageFromUrl(url: String, callback: (Bitmap?) -> Unit) {
+      thread {
+          var connection: HttpURLConnection? = null
+          var inputStream: InputStream? = null
+          try {
+              val urlConnection = URL(url)
+              connection = urlConnection.openConnection() as HttpURLConnection
+              connection.connectTimeout = 10000
+              connection.readTimeout = 10000
+              connection.doInput = true
+              connection.connect()
+
+              if (connection.responseCode == HttpURLConnection.HTTP_OK) {
+                  inputStream = connection.inputStream
+                  val bitmap = BitmapFactory.decodeStream(inputStream)
+                  callback(bitmap)
+              } else {
+                  callback(null)
+              }
+          } catch (_: Exception) {
+              callback(null)
+          } finally {
+              inputStream?.close()
+              connection?.disconnect()
+          }
+      }
+  }
   
   /**
    * 移除海量点

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

@@ -8,12 +8,12 @@ import expo.modules.kotlin.modules.ModuleDefinition
  */
 class MultiPointViewModule : Module() {
   override fun definition() = ModuleDefinition {
-    Name("NaviMultiPointView")
+    Name("MultiPointView")
 
     View(MultiPointView::class) {
-      Events("onPress")
+      Events("onMultiPointPress")
       
-      Prop<List<Map<String, Any>>>("points") { view: MultiPointView, points ->
+      Prop<List<Any>>("points") { view: MultiPointView, points ->
         view.setPoints(points)
       }
 
@@ -21,6 +21,14 @@ class MultiPointViewModule : Module() {
         view.setIcon(icon)
       }
 
+      Prop<Int?>("iconWidth") { view: MultiPointView, width: Int? ->
+        view.setIconWidth(width)
+      }
+
+      Prop<Int?>("iconHeight") { view: MultiPointView, height: Int? ->
+        view.setIconHeight(height)
+      }
+
         Prop<Map<String, Float>>("anchor"){ view: MultiPointView, anchor ->
             view.setAnchor(anchor)
         }

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

@@ -5,8 +5,12 @@ import android.graphics.Color
 import com.amap.api.maps.AMap
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Polygon
+import com.amap.api.maps.model.PolygonHoleOptions
 import com.amap.api.maps.model.PolygonOptions
+import com.amap.api.maps.model.BaseHoleOptions
 import expo.modules.gaodemap.map.utils.ColorParser
+import expo.modules.gaodemap.map.utils.GeometryUtils
+import expo.modules.gaodemap.map.utils.LatLngParser
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -14,11 +18,14 @@ import expo.modules.kotlin.views.ExpoView
 class PolygonView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
   private val onPolygonPress by EventDispatcher()
+  private val onPolygonSimplified by EventDispatcher()
   
   private var polygon: Polygon? = null
   private var aMap: AMap? = null
   private var points: List<LatLng> = emptyList()
+  private var holes: List<List<LatLng>> = emptyList()
   private var strokeWidth: Float = 10f
+  private var simplificationTolerance: Double = 0.0
 
   private var fillColor: Int = Color.argb(50, 0, 0, 255)
 
@@ -39,24 +46,28 @@ class PolygonView(context: Context, appContext: AppContext) : ExpoView(context,
   /**
    * 设置多边形点集合
    */
-  fun setPoints(pointsList: List<Map<String, Double>>) {
-    points = pointsList.mapNotNull { point ->
-      val lat = point["latitude"]
-      val lng = point["longitude"]
-      // 坐标验证
-      if (lat != null && lng != null && lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180) {
-        LatLng(lat, lng)
-      } else null
+  fun setPoints(pointsList: List<Any>?) {
+    val nestedPoints = LatLngParser.parseLatLngListList(pointsList)
+    if (nestedPoints.isNotEmpty()) {
+      points = nestedPoints[0]
+      holes = if (nestedPoints.size > 1) nestedPoints.subList(1, nestedPoints.size) else emptyList()
+    } else {
+      points = emptyList()
+      holes = emptyList()
     }
+    
     polygon?.let {
       it.points = points
+      it.holeOptions = holes.map { holePoints ->
+        PolygonHoleOptions().addAll(holePoints)
+      }
     } ?: createOrUpdatePolygon()
   }
   
   /**
    * 设置填充颜色
    */
-  fun setFillColor(color: Any) {
+  fun setFillColor(color: String?) {
     fillColor = ColorParser.parseColor(color)
     polygon?.let {
       it.fillColor = fillColor
@@ -66,7 +77,7 @@ class PolygonView(context: Context, appContext: AppContext) : ExpoView(context,
   /**
    * 设置边框颜色
    */
-  fun setStrokeColor(color: Any) {
+  fun setStrokeColor(color: String?) {
    strokeColor = ColorParser.parseColor(color)
     polygon?.let {
       it.strokeColor = strokeColor
@@ -94,24 +105,56 @@ class PolygonView(context: Context, appContext: AppContext) : ExpoView(context,
       it.zIndex = _zIndex
     } ?: createOrUpdatePolygon()
   }
+
+  /**
+   * 设置简化容差
+   */
+  fun setSimplificationTolerance(tolerance: Double) {
+    simplificationTolerance = tolerance
+    if (points.isNotEmpty()) {
+      createOrUpdatePolygon()
+    }
+  }
   
   /**
    * 创建或更新多边形
    */
   private fun createOrUpdatePolygon() {
     aMap?.let { map ->
-      if (polygon == null && points.isNotEmpty()) {
+      // 移除旧的多边形
+      polygon?.remove()
+      polygon = null
+      
+      if (points.isNotEmpty()) {
+        val displayPoints = if (simplificationTolerance > 0) {
+          GeometryUtils.simplifyPolyline(points, simplificationTolerance)
+        } else {
+          points
+        }
+
+        // 至少3个点
+        if (displayPoints.size < 3) return
+
         val options = PolygonOptions()
-          .addAll(points)
+          .addAll(displayPoints)
           .fillColor(fillColor)
           .strokeColor(strokeColor)
           .strokeWidth(strokeWidth)
           .zIndex(_zIndex)
         
+        if (holes.isNotEmpty()) {
+          holes.forEach { holePoints ->
+            options.addHoles(PolygonHoleOptions().addAll(holePoints))
+          }
+        }
+        
         polygon = map.addPolygon(options)
         
-        // 注意：高德地图 Android SDK 不直接支持 Polygon 点击事件
-        // 如果需要点击事件，需要通过其他方式实现
+        // 派发简化事件
+        onPolygonSimplified(mapOf(
+          "originalCount" to points.size,
+          "simplifiedCount" to displayPoints.size
+        ))
       }
     }
   }

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

@@ -8,20 +8,20 @@ import expo.modules.kotlin.modules.ModuleDefinition
  */
 class PolygonViewModule : Module() {
   override fun definition() = ModuleDefinition {
-    Name("NaviPolygonView")
+    Name("PolygonView")
 
     View(PolygonView::class) {
-      Events("onPolygonPress")
+      Events("onPolygonPress", "onPolygonSimplified")
       
-      Prop<List<Map<String, Double>>>("points") { view: PolygonView, points ->
+      Prop<List<Any>?>("points") { view: PolygonView, points ->
         view.setPoints(points)
       }
       
-      Prop<Any>("fillColor") { view: PolygonView, color ->
+      Prop<String?>("fillColor") { view: PolygonView, color ->
         view.setFillColor(color)
       }
       
-      Prop<Any>("strokeColor") { view: PolygonView, color ->
+      Prop<String?>("strokeColor") { view: PolygonView, color ->
         view.setStrokeColor(color)
       }
       
@@ -32,6 +32,10 @@ class PolygonViewModule : Module() {
       Prop<Float>("zIndex") { view: PolygonView, zIndex ->
         view.setZIndex(zIndex)
       }
+
+      Prop<Double>("simplificationTolerance") { view: PolygonView, tolerance ->
+        view.setSimplificationTolerance(tolerance)
+      }
     }
   }
 }