expo-gaode-map 1.1.7 → 2.0.0-alpha.1

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

@@ -3,6 +3,7 @@ package expo.modules.gaodemap.overlays
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
@@ -18,6 +19,11 @@ import com.amap.api.maps.model.MarkerOptions
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
+import java.io.File
+import java.io.InputStream
+import java.net.HttpURLConnection
+import java.net.URL
+import kotlin.concurrent.thread
 
 class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
@@ -91,17 +97,16 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     try {
       super.onMeasure(widthMeasureSpec, heightMeasureSpec)
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "onMeasure 失败", e)
       throw e
     }
   }
   
-  private val onPress by EventDispatcher()
-  private val onDragStart by EventDispatcher()
-  private val onDrag by EventDispatcher()
-  private val onDragEnd by EventDispatcher()
+  private val onMarkerPress by EventDispatcher()
+  private val onMarkerDragStart by EventDispatcher()
+  private val onMarkerDrag by EventDispatcher()
+  private val onMarkerDragEnd by EventDispatcher()
   
-  private var marker: Marker? = null
+  internal var marker: Marker? = null
   private var aMap: AMap? = null
   private var pendingPosition: LatLng? = null
   private var pendingLatitude: Double? = null  // 临时存储纬度
@@ -111,6 +116,18 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   private var customViewWidth: Int = 0  // 用于自定义视图（children）的宽度
   private var customViewHeight: Int = 0  // 用于自定义视图（children）的高度
   private val mainHandler = Handler(Looper.getMainLooper())
+  private var isRemoving = false  // 标记是否正在被移除
+  
+  // 缓存属性，在 marker 创建前保存
+  private var pendingTitle: String? = null
+  private var pendingSnippet: String? = null
+  private var pendingDraggable: Boolean? = null
+  private var pendingOpacity: Float? = null
+  private var pendingFlat: Boolean? = null
+  private var pendingZIndex: Float? = null
+  private var pendingAnchor: Pair<Float, Float>? = null
+  private var pendingIconUri: String? = null
+  private var pendingPinColor: String? = null
   
   /**
    * 设置地图实例
@@ -142,7 +159,6 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   fun setLatitude(lat: Double) {
     try {
       if (lat < -90 || lat > 90) {
-        android.util.Log.e("MarkerView", "纬度超出有效范围: $lat")
         return
       }
       
@@ -151,7 +167,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         updatePosition(lat, lng)
       }
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "setLatitude 异常", e)
+      // 忽略异常
     }
   }
   
@@ -161,7 +177,6 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   fun setLongitude(lng: Double) {
     try {
       if (lng < -180 || lng > 180) {
-        android.util.Log.e("MarkerView", "经度超出有效范围: $lng")
         return
       }
       
@@ -170,7 +185,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         updatePosition(lat, lng)
       }
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "setLongitude 异常", e)
+      // 忽略异常
     }
   }
   
@@ -197,7 +212,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         }
       }
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "updatePosition 异常", e)
+      // 忽略异常
     }
   }
   
@@ -210,18 +225,16 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       val lng = position["longitude"]
       
       if (lat == null || lng == null) {
-        android.util.Log.e("MarkerView", "无效的位置数据")
         return
       }
       
       if (lat < -90 || lat > 90 || lng < -180 || lng > 180) {
-        android.util.Log.e("MarkerView", "坐标超出有效范围")
         return
       }
       
       updatePosition(lat, lng)
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "setPosition 异常", e)
+      // 忽略异常
     }
   }
   
@@ -229,20 +242,35 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
    * 设置标题
    */
   fun setTitle(title: String) {
-    marker?.let { it.title = title }
+    pendingTitle = title
+    marker?.let {
+      it.title = title
+      // 如果信息窗口正在显示，刷新它
+      if (it.isInfoWindowShown) {
+        it.showInfoWindow()
+      }
+    }
   }
   
   /**
    * 设置描述
    */
   fun setDescription(description: String) {
-    marker?.let { it.snippet = description }
+    pendingSnippet = description
+    marker?.let {
+      it.snippet = description
+      // 如果信息窗口正在显示，刷新它
+      if (it.isInfoWindowShown) {
+        it.showInfoWindow()
+      }
+    }
   }
   
   /**
    * 设置是否可拖拽
    */
   fun setDraggable(draggable: Boolean) {
+    pendingDraggable = draggable
     marker?.let { it.isDraggable = draggable }
   }
   
@@ -263,6 +291,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
    * 设置透明度
    */
   fun setOpacity(opacity: Float) {
+    pendingOpacity = opacity
     marker?.let { it.alpha = opacity }
   }
   
@@ -280,13 +309,15 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   fun setAnchor(anchor: Map<String, Float>) {
     val x = anchor["x"] ?: 0.5f
     val y = anchor["y"] ?: 1.0f
-      marker?.setAnchor(x, y)
+    pendingAnchor = Pair(x, y)
+    marker?.setAnchor(x, y)
   }
   
   /**
    * 设置是否平贴地图
    */
   fun setFlat(flat: Boolean) {
+    pendingFlat = flat
     marker?.let { it.isFlat = flat }
   }
   
@@ -294,37 +325,183 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
    * 设置图标
    */
   fun setMarkerIcon(iconUri: String?) {
+    pendingIconUri = iconUri
     iconUri?.let {
-      // 这里需要根据 URI 加载图片
-      // 可以支持本地资源、网络图片等
+      marker?.let { m ->
+        loadAndSetIcon(it, m)
+      }
+    }
+  }
+  
+  /**
+   * 加载并设置图标
+   * 支持: http/https 网络图片, file:// 本地文件, 本地资源名
+   */
+  private fun loadAndSetIcon(iconUri: String, marker: Marker) {
+    try {
+      when {
+        // 网络图片
+        iconUri.startsWith("http://") || iconUri.startsWith("https://") -> {
+          loadImageFromUrl(iconUri) { bitmap ->
+            bitmap?.let {
+              val resized = resizeBitmap(it, iconWidth, iconHeight)
+              mainHandler.post {
+                marker.setIcon(BitmapDescriptorFactory.fromBitmap(resized))
+                marker.setAnchor(0.5f, 1.0f)
+              }
+            } ?: run {
+              mainHandler.post {
+                marker.setIcon(BitmapDescriptorFactory.defaultMarker())
+              }
+            }
+          }
+        }
+        // 本地文件
+        iconUri.startsWith("file://") -> {
+          val path = iconUri.substring(7) // 移除 "file://" 前缀
+          val bitmap = BitmapFactory.decodeFile(path)
+          if (bitmap != null) {
+            val resized = resizeBitmap(bitmap, iconWidth, iconHeight)
+            marker.setIcon(BitmapDescriptorFactory.fromBitmap(resized))
+            marker.setAnchor(0.5f, 1.0f)
+          } else {
+            marker.setIcon(BitmapDescriptorFactory.defaultMarker())
+          }
+        }
+        // 本地资源名
+        else -> {
+          val resourceId = context.resources.getIdentifier(
+            iconUri,
+            "drawable",
+            context.packageName
+          )
+          if (resourceId != 0) {
+            val bitmap = BitmapFactory.decodeResource(context.resources, resourceId)
+            val resized = resizeBitmap(bitmap, iconWidth, iconHeight)
+            marker.setIcon(BitmapDescriptorFactory.fromBitmap(resized))
+            marker.setAnchor(0.5f, 1.0f)
+          } else {
+            marker.setIcon(BitmapDescriptorFactory.defaultMarker())
+          }
+        }
+      }
+    } catch (e: Exception) {
+      marker.setIcon(BitmapDescriptorFactory.defaultMarker())
+    }
+  }
+  
+  /**
+   * 从网络加载图片
+   */
+  private fun loadImageFromUrl(url: String, callback: (Bitmap?) -> Unit) {
+    thread {
+      var connection: HttpURLConnection? = null
+      var inputStream: InputStream? = null
       try {
-        // 简化处理，实际需要实现图片加载逻辑
-        marker?.setIcon(BitmapDescriptorFactory.defaultMarker())
+        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 (e: Exception) {
-        e.printStackTrace()
+        callback(null)
+      } finally {
+        inputStream?.close()
+        connection?.disconnect()
       }
     }
   }
   
+  /**
+   * 调整图片尺寸
+   */
+  private fun resizeBitmap(bitmap: Bitmap, width: Int, height: Int): Bitmap {
+    // 如果没有指定尺寸，使用原图尺寸或默认值
+    val finalWidth = if (width > 0) width else bitmap.width
+    val finalHeight = if (height > 0) height else bitmap.height
+    
+    return if (bitmap.width == finalWidth && bitmap.height == finalHeight) {
+      bitmap
+    } else {
+      Bitmap.createScaledBitmap(bitmap, finalWidth, finalHeight, true)
+    }
+  }
+  
+  /**
+   * 设置大头针颜色
+   */
+  fun setPinColor(color: String?) {
+    pendingPinColor = color
+    // 颜色变化时需要重新创建 marker
+    aMap?.let { map ->
+      marker?.let { oldMarker ->
+        val position = oldMarker.position
+        oldMarker.remove()
+        marker = null
+        
+        createOrUpdateMarker()
+        marker?.position = position
+      }
+    }
+  }
+  
+  /**
+   * 应用大头针颜色
+   */
+  private fun applyPinColor(color: String, marker: Marker) {
+    try {
+      val hue = when (color.lowercase()) {
+        "red" -> BitmapDescriptorFactory.HUE_RED
+        "orange" -> BitmapDescriptorFactory.HUE_ORANGE
+        "yellow" -> BitmapDescriptorFactory.HUE_YELLOW
+        "green" -> BitmapDescriptorFactory.HUE_GREEN
+        "cyan" -> BitmapDescriptorFactory.HUE_CYAN
+        "blue" -> BitmapDescriptorFactory.HUE_BLUE
+        "violet" -> BitmapDescriptorFactory.HUE_VIOLET
+        "magenta" -> BitmapDescriptorFactory.HUE_MAGENTA
+        "rose" -> BitmapDescriptorFactory.HUE_ROSE
+        "purple" -> BitmapDescriptorFactory.HUE_VIOLET
+        else -> BitmapDescriptorFactory.HUE_RED
+      }
+      marker.setIcon(BitmapDescriptorFactory.defaultMarker(hue))
+    } catch (e: Exception) {
+      // 忽略异常
+    }
+  }
+  
   /**
    * 设置 z-index
    */
   fun setZIndex(zIndex: Float) {
+    pendingZIndex = zIndex
     marker?.let { it.zIndex = zIndex }
   }
   
   /**
    * 设置图标宽度（用于自定义图标 icon 属性）
+   * 注意：React Native 传入的是 DP 值，需要转换为 PX
    */
   fun setIconWidth(width: Int) {
-    iconWidth = width
+    val density = context.resources.displayMetrics.density
+    iconWidth = (width * density).toInt()
   }
   
   /**
    * 设置图标高度（用于自定义图标 icon 属性）
+   * 注意：React Native 传入的是 DP 值，需要转换为 PX
    */
   fun setIconHeight(height: Int) {
-    iconHeight = height
+    val density = context.resources.displayMetrics.density
+    iconHeight = (height * density).toInt()
   }
   
   /**
@@ -345,6 +522,64 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     customViewHeight = (height * density).toInt()
   }
   
+  /**
+   * 全局的 Marker 点击监听器
+   * 必须在 ExpoGaodeMapView 中设置，不能在每个 MarkerView 中重复设置
+   */
+  companion object {
+    private val markerViewMap = mutableMapOf<Marker, MarkerView>()
+    
+    fun registerMarker(marker: Marker, view: MarkerView) {
+      markerViewMap[marker] = view
+    }
+    
+    fun unregisterMarker(marker: Marker) {
+      markerViewMap.remove(marker)
+    }
+    
+    fun handleMarkerClick(marker: Marker): Boolean {
+      markerViewMap[marker]?.let { view ->
+        view.onMarkerPress(mapOf(
+          "latitude" to marker.position.latitude,
+          "longitude" to marker.position.longitude
+        ))
+        // 显示信息窗口（如果有 title 或 snippet）
+        if (!marker.title.isNullOrEmpty() || !marker.snippet.isNullOrEmpty()) {
+          marker.showInfoWindow()
+        }
+        return true
+      }
+      return false
+    }
+    
+    fun handleMarkerDragStart(marker: Marker) {
+      markerViewMap[marker]?.let { view ->
+        view.onMarkerDragStart(mapOf(
+          "latitude" to marker.position.latitude,
+          "longitude" to marker.position.longitude
+        ))
+      }
+    }
+    
+    fun handleMarkerDrag(marker: Marker) {
+      markerViewMap[marker]?.let { view ->
+        view.onMarkerDrag(mapOf(
+          "latitude" to marker.position.latitude,
+          "longitude" to marker.position.longitude
+        ))
+      }
+    }
+    
+    fun handleMarkerDragEnd(marker: Marker) {
+      markerViewMap[marker]?.let { view ->
+        view.onMarkerDragEnd(mapOf(
+          "latitude" to marker.position.latitude,
+          "longitude" to marker.position.longitude
+        ))
+      }
+    }
+  }
+  
   /**
    * 创建或更新标记
    */
@@ -354,52 +589,28 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         val options = MarkerOptions()
         marker = map.addMarker(options)
         
-        map.setOnMarkerClickListener { clickedMarker ->
-          if (clickedMarker == marker) {
-            onPress(mapOf(
-              "latitude" to clickedMarker.position.latitude,
-              "longitude" to clickedMarker.position.longitude
-            ))
-            true
-          } else {
-            false
-          }
-        }
-        
-        map.setOnMarkerDragListener(object : AMap.OnMarkerDragListener {
-          override fun onMarkerDragStart(draggedMarker: Marker?) {
-            if (draggedMarker == marker) {
-              draggedMarker?.let {
-                onDragStart(mapOf(
-                  "latitude" to it.position.latitude,
-                  "longitude" to it.position.longitude
-                ))
-              }
-            }
-          }
+        // 注册到全局 map
+        marker?.let { m ->
+          registerMarker(m, this)
           
-          override fun onMarkerDrag(draggedMarker: Marker?) {
-            if (draggedMarker == marker) {
-              draggedMarker?.let {
-                onDrag(mapOf(
-                  "latitude" to it.position.latitude,
-                  "longitude" to it.position.longitude
-                ))
-              }
-            }
-          }
+          // 应用缓存的属性
+          pendingTitle?.let { m.title = it }
+          pendingSnippet?.let { m.snippet = it }
+          pendingDraggable?.let { m.isDraggable = it }
+          pendingOpacity?.let { m.alpha = it }
+          pendingFlat?.let { m.isFlat = it }
+          pendingZIndex?.let { m.zIndex = it }
+          pendingAnchor?.let { m.setAnchor(it.first, it.second) }
           
-          override fun onMarkerDragEnd(draggedMarker: Marker?) {
-            if (draggedMarker == marker) {
-              draggedMarker?.let {
-                onDragEnd(mapOf(
-                  "latitude" to it.position.latitude,
-                  "longitude" to it.position.longitude
-                ))
-              }
+          // 优先级：children > icon > pinColor
+          if (childCount == 0) {
+            if (pendingIconUri != null) {
+              loadAndSetIcon(pendingIconUri!!, m)
+            } else if (pendingPinColor != null) {
+              applyPinColor(pendingPinColor!!, m)
             }
           }
-        })
+        }
       }
     }
   }
@@ -468,7 +679,6 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       
       bitmap
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "创建 Bitmap 失败", e)
       null
     }
   }
@@ -519,15 +729,12 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     try {
       if (child != null && indexOfChild(child) >= 0) {
         super.removeView(child)
-        mainHandler.postDelayed({
-          if (childCount == 0 && marker != null) {
-            marker?.setIcon(BitmapDescriptorFactory.defaultMarker())
-            marker?.setAnchor(0.5f, 1.0f)
-          }
-        }, 50)
+        // 不要在这里恢复默认图标
+        // 如果 MarkerView 整体要被移除，onDetachedFromWindow 会处理
+        // 如果只是移除 children 并保留 Marker，应该由外部重新设置 children
       }
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "removeView 异常", e)
+      // 忽略异常
     }
   }
   
@@ -535,17 +742,19 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     try {
       if (index >= 0 && index < childCount) {
         super.removeViewAt(index)
-        mainHandler.postDelayed({
-          if (childCount == 0 && marker != null) {
-            marker?.setIcon(BitmapDescriptorFactory.defaultMarker())
-            marker?.setAnchor(0.5f, 1.0f)
-          } else if (childCount > 0 && marker != null) {
-            updateMarkerIcon()
-          }
-        }, 50)
+        // 只在还有子视图时更新图标
+        if (!isRemoving && childCount > 1 && marker != null) {
+          mainHandler.postDelayed({
+            if (!isRemoving && marker != null && childCount > 0) {
+              updateMarkerIcon()
+            }
+          }, 50)
+        }
+        // 如果最后一个子视图被移除，什么都不做
+        // 让 onDetachedFromWindow 处理完整的清理
       }
     } catch (e: Exception) {
-      android.util.Log.e("MarkerView", "removeViewAt 异常", e)
+      // 忽略异常
     }
   }
   /**
@@ -569,6 +778,9 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   
   
   override fun addView(child: View?, index: Int, params: android.view.ViewGroup.LayoutParams?) {
+    // 🔑 关键修复：记录添加前的子视图数量
+    val childCountBefore = childCount
+    
     val finalParams = android.widget.LinearLayout.LayoutParams(
       if (customViewWidth > 0) customViewWidth else android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
       if (customViewHeight > 0) customViewHeight else android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
@@ -587,20 +799,31 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       fixChildLayoutParams(it)
     }
     
-    mainHandler.postDelayed({
-      if (marker != null) updateMarkerIcon()
-    }, 50)
-    
-    mainHandler.postDelayed({
-      if (marker != null) updateMarkerIcon()
-    }, 150)
+    // 🔑 关键修复：只有在子视图数量真正变化且 marker 已存在时才更新图标
+    // 避免在其他覆盖物添加时触发不必要的刷新
+    if (!isRemoving && marker != null && childCount > childCountBefore) {
+      mainHandler.postDelayed({
+        if (!isRemoving && marker != null) {
+          updateMarkerIcon()
+        }
+      }, 50)
+      
+      mainHandler.postDelayed({
+        if (!isRemoving && marker != null) {
+          updateMarkerIcon()
+        }
+      }, 150)
+    }
   }
   
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
-    if (changed && childCount > 0) {
+    // 🔑 关键修复：只有在有子视图且 marker 存在时才更新，避免不必要的刷新
+    if (changed && !isRemoving && childCount > 0 && marker != null) {
       mainHandler.postDelayed({
-        if (marker != null) updateMarkerIcon()
+        if (!isRemoving && marker != null) {
+          updateMarkerIcon()
+        }
       }, 200)
     }
   }
@@ -609,13 +832,19 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
    * 移除标记
    */
   fun removeMarker() {
-    marker?.remove()
+    marker?.let {
+      unregisterMarker(it)
+      it.remove()
+    }
     marker = null
   }
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     
+    // 标记正在移除
+    isRemoving = true
+    
     // 清理所有延迟任务
     mainHandler.removeCallbacksAndMessages(null)
     

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

@@ -11,7 +11,7 @@ class MarkerViewModule : Module() {
     Name("MarkerView")
 
     View(MarkerView::class) {
-      Events("onPress", "onDragStart", "onDrag", "onDragEnd")
+      Events("onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd")
       
       // 拆分 position 为两个独立属性以兼容 React Native 旧架构
       Prop<Double>("latitude") { view, lat ->
@@ -26,14 +26,22 @@ class MarkerViewModule : Module() {
         view.setTitle(title)
       }
       
-      Prop<String>("description") { view, description ->
-        view.setDescription(description)
+      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)
       }

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

@@ -38,7 +38,8 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
       val lng = (point["longitude"] as? Number)?.toDouble()
       val id = point["id"] as? String ?: ""
       
-      if (lat != null && lng != null) {
+      // 坐标验证
+      if (lat != null && lng != null && lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180) {
         val multiPointItem = MultiPointItem(LatLng(lat, lng))
         multiPointItem.customerId = id
         points.add(multiPointItem)
@@ -94,10 +95,12 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
   fun removeMultiPoint() {
     multiPointOverlay?.remove()
     multiPointOverlay = null
+    points.clear()
   }
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     removeMultiPoint()
+    aMap = null
   }
 }