expo-gaode-map 2.2.10-next.0 → 2.2.10-next.1

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

@@ -1,9 +1,12 @@
 package expo.modules.gaodemap
 
+import com.amap.api.maps.AMapUtils
+import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.gaodemap.modules.SDKInitializer
 import expo.modules.gaodemap.modules.LocationManager
+import expo.modules.gaodemap.utils.GeometryUtils
 import expo.modules.gaodemap.utils.PermissionHelper
 
 /**
@@ -16,7 +19,7 @@ import expo.modules.gaodemap.utils.PermissionHelper
  */
 class ExpoGaodeMapModule : Module() {
 
-  
+
   /** 定位管理器实例 */
   private var locationManager: LocationManager? = null
 
@@ -27,21 +30,21 @@ class ExpoGaodeMapModule : Module() {
     try {
       val context = appContext.reactContext!!
       SDKInitializer.restorePrivacyState(context)
-      
+
       // 初始化预加载管理器（注册内存监听）
       MapPreloadManager.initialize(context)
-      
+
       // 尝试从 AndroidManifest.xml 读取并设置 API Key
       val apiKey = context.packageManager
           .getApplicationInfo(context.packageName, android.content.pm.PackageManager.GET_META_DATA)
           .metaData?.getString("com.amap.api.v2.apikey")
-        
+
       if (!apiKey.isNullOrEmpty()) {
           try {
             com.amap.api.maps.MapsInitializer.setApiKey(apiKey)
             com.amap.api.location.AMapLocationClient.setApiKey(apiKey)
             android.util.Log.d("ExpoGaodeMap", "✅ 从 AndroidManifest.xml 读取并设置 API Key 成功")
-            
+
             // 只有在 API Key 已设置的情况下才启动预加载
             android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
               android.util.Log.i("ExpoGaodeMap", "🚀 自动启动地图预加载")
@@ -106,10 +109,9 @@ class ExpoGaodeMapModule : Module() {
      * 开始连续定位
      */
     Function("start") {
-
       getLocationManager().start()
     }
-    
+
     /**
      * 停止定位
      */
@@ -309,18 +311,18 @@ class ExpoGaodeMapModule : Module() {
     }
 
     // ==================== 权限管理 ====================
-    
+
     /**
      * 检查位置权限状态（增强版，支持 Android 14+ 适配）
      * @return 权限状态对象，包含详细的权限信息
      */
     AsyncFunction("checkLocationPermission") { promise: expo.modules.kotlin.Promise ->
       val context = appContext.reactContext!!
-      
+
       // 使用增强的权限检查
       val foregroundStatus = PermissionHelper.checkForegroundLocationPermission(context)
       val backgroundStatus = PermissionHelper.checkBackgroundLocationPermission(context)
-      
+
       promise.resolve(mapOf(
         "granted" to foregroundStatus.granted,
         "fineLocation" to foregroundStatus.fineLocation,
@@ -331,7 +333,7 @@ class ExpoGaodeMapModule : Module() {
         "isAndroid14Plus" to PermissionHelper.isAndroid14Plus()
       ))
     }
-    
+
     /**
      * 请求前台位置权限（增强版，支持 Android 14+ 适配）
      * 注意: Android 权限请求是异步的,使用轮询方式检查权限状态
@@ -343,16 +345,16 @@ class ExpoGaodeMapModule : Module() {
         promise.reject("NO_ACTIVITY", "Activity not available", null)
         return@AsyncFunction
       }
-      
+
       // 使用增强的权限请求方法
       PermissionHelper.requestForegroundLocationPermission(activity, 1001)
-      
+
       // 使用 WeakReference 避免内存泄露
       val contextRef = java.lang.ref.WeakReference(appContext.reactContext)
       val handler = android.os.Handler(android.os.Looper.getMainLooper())
       var attempts = 0
       val maxAttempts = 50 // 增加到 5 秒 / 100ms，给用户足够时间操作
-      
+
       val checkPermission = object : Runnable {
         override fun run() {
           val context = contextRef.get()
@@ -360,9 +362,9 @@ class ExpoGaodeMapModule : Module() {
             promise.reject("CONTEXT_LOST", "Context was garbage collected", null)
             return
           }
-          
+
           val status = PermissionHelper.checkForegroundLocationPermission(context)
-          
+
           // 如果权限已授予或达到最大尝试次数,返回结果并清理 Handler
           if (status.granted || attempts >= maxAttempts) {
             handler.removeCallbacks(this)
@@ -379,11 +381,11 @@ class ExpoGaodeMapModule : Module() {
           }
         }
       }
-      
+
       // 延迟更长时间开始轮询，给权限对话框弹出的时间
       handler.postDelayed(checkPermission, 500)
     }
-    
+
     /**
      * 请求后台位置权限（Android 10+ 支持）
      * 注意: 必须在前台权限已授予后才能请求
@@ -395,7 +397,7 @@ class ExpoGaodeMapModule : Module() {
         promise.reject("NO_ACTIVITY", "Activity not available", null)
         return@AsyncFunction
       }
-      
+
       // 检查是否支持后台位置权限
       if (!PermissionHelper.isAndroid10Plus()) {
         promise.resolve(mapOf(
@@ -405,7 +407,7 @@ class ExpoGaodeMapModule : Module() {
         ))
         return@AsyncFunction
       }
-      
+
       // 尝试请求后台位置权限
       val canRequest = PermissionHelper.requestBackgroundLocationPermission(activity, 1002)
       if (!canRequest) {
@@ -416,13 +418,13 @@ class ExpoGaodeMapModule : Module() {
         )
         return@AsyncFunction
       }
-      
+
       // 轮询检查权限状态
       val contextRef = java.lang.ref.WeakReference(appContext.reactContext)
       val handler = android.os.Handler(android.os.Looper.getMainLooper())
       var attempts = 0
       val maxAttempts = 30
-      
+
       val checkPermission = object : Runnable {
         override fun run() {
           val context = contextRef.get()
@@ -430,9 +432,9 @@ class ExpoGaodeMapModule : Module() {
             promise.reject("CONTEXT_LOST", "Context was garbage collected", null)
             return
           }
-          
+
           val status = PermissionHelper.checkBackgroundLocationPermission(context)
-          
+
           if (status.granted || attempts >= maxAttempts) {
             handler.removeCallbacks(this)
             promise.resolve(mapOf(
@@ -447,10 +449,10 @@ class ExpoGaodeMapModule : Module() {
           }
         }
       }
-      
+
       handler.postDelayed(checkPermission, 100)
     }
-    
+
     /**
      * 打开应用设置页面（引导用户手动授予权限）
      */
@@ -459,8 +461,172 @@ class ExpoGaodeMapModule : Module() {
       PermissionHelper.openAppSettings(context)
     }
 
+    // ==================== 几何计算工具 ====================
+
+    /**
+     * 计算两个坐标点之间的距离
+     * @param coordinate1 第一个坐标点
+     * @param coordinate2 第二个坐标点
+     * @return 两点之间的距离（单位：米）
+     */
+    AsyncFunction("distanceBetweenCoordinates") { coordinate1: Map<String, Double>, coordinate2: Map<String, Double>, promise: expo.modules.kotlin.Promise ->
+      try {
+        val lat1 = coordinate1["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid coordinate1 latitude", null)
+        val lon1 = coordinate1["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid coordinate1 longitude", null)
+        val lat2 = coordinate2["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid coordinate2 latitude", null)
+        val lon2 = coordinate2["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid coordinate2 longitude", null)
+
+        val coord1 = LatLng(lat1, lon1)
+        val coord2 = LatLng(lat2, lon2)
+
+        val distance = AMapUtils.calculateLineDistance(coord1, coord2)
+        promise.resolve(distance)
+      } catch (e: Exception) {
+        promise.reject("ERROR", e.message, e)
+      }
+    }
+
+  
+
+    /**
+     * 判断点是否在圆内
+     * @param point 要判断的点
+     * @param center 圆心坐标
+     * @param radius 圆半径（单位：米）
+     * @return 是否在圆内
+     */
+    AsyncFunction("isPointInCircle") { point: Map<String, Double>, center: Map<String, Double>, radius: Double, promise: expo.modules.kotlin.Promise ->
+      try {
+        val pointLat = point["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid point latitude", null)
+        val pointLon = point["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid point longitude", null)
+        val centerLat = center["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid center latitude", null)
+        val centerLon = center["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid center longitude", null)
+
+        val isInside = GeometryUtils.isPointInCircle(
+          LatLng(pointLat, pointLon),
+          LatLng(centerLat, centerLon),
+          radius
+        )
+        promise.resolve(isInside)
+      } catch (e: Exception) {
+        promise.reject("ERROR", e.message, e)
+      }
+    }
+
+    /**
+     * 判断点是否在多边形内
+     * @param point 要判断的点
+     * @param polygon 多边形的顶点坐标数组
+     * @return 是否在多边形内
+     */
+    AsyncFunction("isPointInPolygon") { point: Map<String, Double>, polygon: List<Map<String, Double>>, promise: expo.modules.kotlin.Promise ->
+      try {
+        val pointLat = point["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid point latitude", null)
+        val pointLon = point["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid point longitude", null)
+
+        if (polygon.size < 3) {
+          return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Polygon must have at least 3 vertices", null)
+        }
+
+        val polygonPoints = polygon.mapNotNull { coord ->
+          val lat = coord["latitude"]
+          val lon = coord["longitude"]
+          if (lat != null && lon != null) {
+            LatLng(lat, lon)
+          } else {
+            null
+          }
+        }
+
+        if (polygonPoints.size < 3) {
+          return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid polygon coordinates", null)
+        }
+
+        val isInside = GeometryUtils.isPointInPolygon(
+          LatLng(pointLat, pointLon),
+          polygonPoints
+        )
+        promise.resolve(isInside)
+      } catch (e: Exception) {
+        promise.reject("ERROR", e.message, e)
+      }
+    }
+
+    /**
+     * 计算多边形面积
+     * @param polygon 多边形的顶点坐标数组
+     * @return 面积（单位：平方米）
+     */
+    AsyncFunction("calculatePolygonArea") { polygon: List<Map<String, Double>>, promise: expo.modules.kotlin.Promise ->
+      try {
+        android.util.Log.d("ExpoGaodeMap", "📐 calculatePolygonArea 被调用，参数: $polygon")
+        
+        if (polygon.size < 3) {
+          return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Polygon must have at least 3 vertices", null)
+        }
+
+        val polygonPoints = polygon.mapNotNull { coord ->
+          val lat = coord["latitude"]
+          val lon = coord["longitude"]
+          if (lat != null && lon != null) {
+           LatLng(lat, lon)
+          } else {
+            null
+          }
+        }
+
+        android.util.Log.d("ExpoGaodeMap", "📐 转换后的坐标数: ${polygonPoints.size}")
+        
+        if (polygonPoints.size < 3) {
+          return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid polygon coordinates", null)
+        }
+
+        // 使用高德官方 API 计算多边形面积
+        val area = AMapUtils.calculateArea(polygonPoints)
+        android.util.Log.d("ExpoGaodeMap", "📐 AMapUtils.calculateArea 结果: $area")
+        promise.resolve(area)
+      } catch (e: Exception) {
+        android.util.Log.e("ExpoGaodeMap", "📐 calculatePolygonArea 错误: ${e.message}", e)
+        promise.reject("ERROR", e.message, e)
+      }
+    }
+
+    /**
+     * 计算矩形面积
+     * @param southWest 西南角坐标
+     * @param northEast 东北角坐标
+     * @return 面积（单位：平方米）
+     */
+    AsyncFunction("calculateRectangleArea") { southWest: Map<String, Double>, northEast: Map<String, Double>, promise: expo.modules.kotlin.Promise ->
+      try {
+        android.util.Log.d("ExpoGaodeMap", "📐 calculateRectangleArea 被调用，参数: sw=$southWest, ne=$northEast")
+        
+        val swLat = southWest["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid southWest latitude", null)
+        val swLon = southWest["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid southWest longitude", null)
+        val neLat = northEast["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid northEast latitude", null)
+        val neLon = northEast["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid northEast longitude", null)
+
+        // 构造矩形多边形来计算面积
+        val rectangle = listOf(
+          LatLng(swLat, swLon),
+          LatLng(swLat, neLon),
+          LatLng(neLat, neLon),
+          LatLng(neLat, swLon)
+        )
+
+        val area = AMapUtils.calculateArea(rectangle)
+        android.util.Log.d("ExpoGaodeMap", "📐 calculateRectangleArea 结果: $area")
+        promise.resolve(area)
+      } catch (e: Exception) {
+        android.util.Log.e("ExpoGaodeMap", "📐 calculateRectangleArea 错误: ${e.message}", e)
+        promise.reject("ERROR", e.message, e)
+      }
+    }
+
+
+
     // ==================== 地图预加载 ====================
-    
+
     /**
      * 开始预加载地图实例
      * @param config 预加载配置对象,包含 poolSize
@@ -469,7 +635,7 @@ class ExpoGaodeMapModule : Module() {
       val poolSize = (config["poolSize"] as? Number)?.toInt() ?: 2
       MapPreloadManager.startPreload(appContext.reactContext!!, poolSize)
     }
-    
+
     /**
      * 获取预加载状态
      * @return 预加载状态信息
@@ -477,14 +643,14 @@ class ExpoGaodeMapModule : Module() {
     Function("getMapPreloadStatus") {
       MapPreloadManager.getStatus()
     }
-    
+
     /**
      * 清空预加载池
      */
     Function("clearMapPreloadPool") {
       MapPreloadManager.clearPool()
     }
-    
+
     /**
      * 检查是否有可用的预加载实例
      * @return 是否有可用实例
@@ -492,7 +658,7 @@ class ExpoGaodeMapModule : Module() {
     Function("hasPreloadedMapView") {
       MapPreloadManager.hasPreloadedMapView()
     }
-    
+
     /**
      * 获取预加载性能统计
      * @return 性能统计信息

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

@@ -13,7 +13,6 @@ import expo.modules.kotlin.views.ExpoView
 /**
  * 点聚合视图
  * 注意：高德 Android SDK 的点聚合功能需要额外依赖，这里提供基础实现
- * 实际使用时可能需要引入 com.amap.api:3dmap-cluster 库
  */
 class ClusterView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   

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

@@ -10,10 +10,13 @@ import android.os.Handler
 import android.os.Looper
 import android.view.View
 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.Marker
 import com.amap.api.maps.model.MarkerOptions
+import com.amap.api.maps.utils.SpatialRelationUtil
+import com.amap.api.maps.utils.overlay.SmoothMoveMarker
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -145,6 +148,11 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     private var pendingPinColor: String? = null
     private var cacheKey: String? = null
 
+    // 平滑移动相关
+    private var smoothMoveMarker: SmoothMoveMarker? = null
+    private var smoothMovePath: List<LatLng>? = null
+    private var smoothMoveDuration: Double = 10.0  // 默认 10 秒
+
     /**
      * 设置地图实例
      */
@@ -848,10 +856,215 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       }
     }
 
+    /**
+     * 设置平滑移动路径
+     */
+    fun setSmoothMovePath(path: List<Map<String, Double>>) {
+        try {
+            // 转换为 LatLng 列表
+            smoothMovePath = path.mapNotNull { point ->
+                val lat = point["latitude"]
+                val lng = point["longitude"]
+                if (lat != null && lng != null) {
+                    LatLng(lat, lng)
+                } else {
+                    null
+                }
+            }
+
+            // 当路径和时长都设置时，启动平滑移动
+            if (smoothMovePath?.isNotEmpty() == true && smoothMoveDuration > 0 && aMap != null) {
+                startSmoothMove()
+            }
+        } catch (e: Exception) {
+            android.util.Log.e("MarkerView", "setSmoothMovePath error", e)
+        }
+    }
+
+    /**
+     * 设置平滑移动时长（秒）
+     */
+    fun setSmoothMoveDuration(duration: Double) {
+        smoothMoveDuration = if (duration > 0) duration else 10.0
+
+        // 当路径和时长都设置时，启动平滑移动
+        if (smoothMovePath?.isNotEmpty() == true && aMap != null) {
+            startSmoothMove()
+        }
+    }
+
+    /**
+     * 启动平滑移动
+     */
+    private fun startSmoothMove() {
+        android.util.Log.d("MarkerView", "startSmoothMove called")
+        val path = smoothMovePath ?: run {
+            android.util.Log.e("MarkerView", "smoothMovePath is null")
+            return
+        }
+        val map = aMap ?: run {
+            android.util.Log.e("MarkerView", "aMap is null")
+            return
+        }
+        val duration = (smoothMoveDuration * 1000).toInt()  // 转换为毫秒
+
+        android.util.Log.d("MarkerView", "path size: ${path.size}, duration: $duration")
+
+        mainHandler.post {
+            try {
+                // 创建或获取 SmoothMoveMarker
+                if (smoothMoveMarker == null) {
+                    android.util.Log.d("MarkerView", "Creating SmoothMoveMarker")
+                    smoothMoveMarker = SmoothMoveMarker(map)
+                    
+                    // 设置图标 - 优先使用自定义 icon，其次使用 pinColor
+                    var iconSetSuccessfully = false
+                    try {
+                        // 优先：从原始 Marker 直接获取图标
+                        marker?.let { m ->
+                            android.util.Log.d("MarkerView", "Trying to get icon from existing marker")
+                            // 尝试通过 marker 对象获取图标信息
+                            // 由于高德 SDK 没有直接的 getIcon() 方法，我们尝试其他方式
+                            
+                            // 1. 尝试使用缓存的自定义 icon
+                            if (pendingIconUri != null) {
+                                android.util.Log.d("MarkerView", "Pending icon uri: $pendingIconUri")
+                                
+                                // 尝试不同的缓存 key 格式
+                                val possibleKeys = listOfNotNull(
+                                    cacheKey?.let { "$it|${iconWidth}x${iconHeight}" },
+                                    "icon|$pendingIconUri|${iconWidth}x${iconHeight}",
+                                    // 尝试不带尺寸的 key
+                                    cacheKey,
+                                    "icon|$pendingIconUri"
+                                )
+                                
+                                for (key in possibleKeys) {
+                                    if (iconSetSuccessfully) break
+                                    
+                                    android.util.Log.d("MarkerView", "Trying cache key: $key")
+                                    
+                                    // 先尝试 BitmapDescriptorCache
+                                    BitmapDescriptorCache.get(key)?.let { icon ->
+                                        smoothMoveMarker?.setDescriptor(icon)
+                                        android.util.Log.d("MarkerView", "Icon set from BitmapDescriptorCache with key: $key")
+                                        iconSetSuccessfully = true
+                                    }
+                                    
+                                    if (iconSetSuccessfully) break
+                                    
+                                    // 再尝试 IconBitmapCache
+                                    IconBitmapCache.get(key)?.let { bitmap ->
+                                        val descriptor = BitmapDescriptorFactory.fromBitmap(bitmap)
+                                        smoothMoveMarker?.setDescriptor(descriptor)
+                                        android.util.Log.d("MarkerView", "Icon set from IconBitmapCache with key: $key")
+                                        iconSetSuccessfully = true
+                                    }
+                                }
+                                
+                                if (!iconSetSuccessfully) {
+                                    android.util.Log.w("MarkerView", "Custom icon not found in any cache key")
+                                }
+                            } else {
+                                android.util.Log.d("MarkerView", "No pending icon uri, checking pin color")
+                            }
+                        }
+                        
+                        // 只有当自定义图标未设置成功时，才使用 pinColor
+                        if (!iconSetSuccessfully) {
+                            // 降级：根据 pinColor 选择对应颜色的默认图标
+                            val color = pendingPinColor ?: "red"
+                            android.util.Log.d("MarkerView", "Using pin color: $color")
+                            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
+                            }
+                            
+                            val icon = BitmapDescriptorFactory.defaultMarker(hue)
+                            smoothMoveMarker?.setDescriptor(icon)
+                            android.util.Log.d("MarkerView", "Icon set with hue: $hue")
+                        }
+                    } catch (e: Exception) {
+                        android.util.Log.e("MarkerView", "Failed to set icon for smooth move", e)
+                        // 降级：使用默认红色图标
+                        val defaultIcon = BitmapDescriptorFactory.defaultMarker()
+                        smoothMoveMarker?.setDescriptor(defaultIcon)
+                    }
+                }
+
+                // 停止之前的移动
+                smoothMoveMarker?.stopMove()
+
+                // 计算路径的起始点（如果提供了 position，使用它作为起点）
+                val startPoint = if (childCount > 0) {
+                    val currentLat = pendingLatitude ?: marker?.position?.latitude
+                    val currentLng = pendingLongitude ?: marker?.position?.longitude
+                    if (currentLat != null && currentLng != null) {
+                        LatLng(currentLat, currentLng)
+                    } else {
+                        path.first()
+                    }
+                } else {
+                    path.first()
+                }
+
+                android.util.Log.d("MarkerView", "startPoint: $startPoint")
+
+                // 使用 SpatialRelationUtil 计算路径中的最近点
+                val pair = SpatialRelationUtil.calShortestDistancePoint(path, startPoint)
+                val adjustedPath = path.subList(pair.first, path.size)
+
+                android.util.Log.d("MarkerView", "adjustedPath size: ${adjustedPath.size}")
+
+                // 🔑 关键修复：先设置 SmoothMoveMarker 的位置
+                smoothMoveMarker?.setPosition(adjustedPath.first())
+                android.util.Log.d("MarkerView", "SmoothMoveMarker position set to: ${adjustedPath.first()}")
+                
+                // 设置移动路径
+                smoothMoveMarker?.setPoints(adjustedPath)
+                android.util.Log.d("MarkerView", "Points set, count: ${adjustedPath.size}")
+                
+                // 设置总时长（高德 SDK 的 setTotalDuration 需要秒为单位，转为 Int）
+                smoothMoveMarker?.setTotalDuration(smoothMoveDuration.toInt())
+                android.util.Log.d("MarkerView", "Total duration set to: ${smoothMoveDuration.toInt()} seconds")
+                
+                // 开始平滑移动
+                smoothMoveMarker?.startSmoothMove()
+                android.util.Log.d("MarkerView", "startSmoothMove() called")
+
+                // 隐藏原始 Marker，避免重复显示
+                marker?.isVisible = false
+                android.util.Log.d("MarkerView", "Original marker hidden: false")
+            } catch (e: Exception) {
+                android.util.Log.e("MarkerView", "Start smooth move failed", e)
+            }
+        }
+    }
+
+    /**
+     * 停止平滑移动
+     */
+    private fun stopSmoothMove() {
+        smoothMoveMarker?.stopMove()
+        marker?.isVisible = true
+    }
+
     /**
      * 移除标记
      */
     fun removeMarker() {
+        // 停止平滑移动
+        stopSmoothMove()
+        
         marker?.let {
             unregisterMarker(it)
             it.remove()
@@ -941,4 +1154,3 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         return sb.toString().take(1024)
     }
 }
-