expo-gaode-map 0.1.5 → 1.0.0

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

@@ -14,6 +14,15 @@ import expo.modules.gaodemap.managers.UIManager
 import expo.modules.gaodemap.managers.OverlayManager
 import expo.modules.gaodemap.overlays.*
 
+/**
+ * 高德地图视图组件
+ * 
+ * 负责:
+ * - 地图视图的创建和管理
+ * - 地图事件的派发
+ * - 相机控制和覆盖物管理
+ * - 生命周期管理
+ */
 @Suppress("ViewConstructor")
 class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
@@ -22,11 +31,14 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
   }
   
   // Props 存储
+  /** 地图类型 */
   internal var mapType: Int = 0
+  /** 初始相机位置 */
   internal var initialCameraPosition: Map<String, Any?>? = null
+  /** 是否跟随用户位置 */
   internal var followUserLocation: Boolean = false
   
-  // Handler for posting to main thread
+  /** 主线程 Handler */
   private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())
   
   // 事件派发器
@@ -48,56 +60,44 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
   private var isMapLoaded = false
   
   init {
-    Log.d(TAG, "ExpoGaodeMapView 初始化开始")
-    
     try {
       // 确保隐私合规已设置
       MapsInitializer.updatePrivacyShow(context, true, true)
       MapsInitializer.updatePrivacyAgree(context, true)
-      Log.d(TAG, "地图隐私合规已确认")
       
       // 创建地图视图
       mapView = MapView(context)
       mapView.onCreate(null)
       aMap = mapView.map
-      Log.d(TAG, "MapView 创建成功")
       
       // 初始化管理器
       cameraManager = CameraManager(aMap)
       uiManager = UIManager(aMap, context)
       overlayManager = OverlayManager(aMap)
-      Log.d(TAG, "管理器初始化完成")
       
       // 添加地图视图到布局
       addView(mapView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
-      Log.d(TAG, "MapView 已添加到布局")
       
       // 设置地图事件监听
       setupMapListeners()
-      Log.d(TAG, "地图事件监听已设置")
       
       // 地图加载完成回调
       aMap.setOnMapLoadedListener {
-        Log.d(TAG, "🎉 地图加载完成")
         isMapLoaded = true
         
         // 应用缓存的 Props
         if (mapType != 0) {
-          Log.d(TAG, "应用 mapType: $mapType")
           setMapType(mapType)
         }
         
         val positionToApply = initialCameraPosition ?: pendingCameraPosition
         positionToApply?.let { position ->
-          Log.d(TAG, "应用初始相机位置")
           applyInitialCameraPosition(position)
           pendingCameraPosition = null
         }
         
         onLoad(mapOf("loaded" to true))
       }
-      
-      Log.d(TAG, "ExpoGaodeMapView 初始化完成")
     } catch (e: Exception) {
       Log.e(TAG, "ExpoGaodeMapView 初始化失败", e)
     }
@@ -126,166 +126,217 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
   
   /**
    * 设置地图类型
+   * @param type 地图类型
    */
   fun setMapType(type: Int) {
-    Log.d(TAG, "🎯 setMapType: $type")
     mainHandler.post {
       uiManager.setMapType(type)
-      Log.d(TAG, "✅ setMapType 完成")
     }
   }
   
   /**
    * 设置初始相机位置
+   * @param position 相机位置配置
    */
   fun setInitialCameraPosition(position: Map<String, Any?>) {
-    Log.d(TAG, "🎯 setInitialCameraPosition")
-    mainHandler.post {
-      applyInitialCameraPosition(position)
+    initialCameraPosition = position
+    
+    // 如果地图已加载,立即应用;否则缓存等待地图加载完成
+    if (isMapLoaded) {
+      mainHandler.post {
+        applyInitialCameraPosition(position)
+      }
+    } else {
+      pendingCameraPosition = position
     }
   }
   
   /**
    * 实际应用相机位置
+   * @param position 相机位置配置
    */
   private fun applyInitialCameraPosition(position: Map<String, Any?>) {
     cameraManager.setInitialCameraPosition(position)
-    Log.d(TAG, "相机位置设置完成")
   }
   
   // ==================== UI 控件和手势 ====================
   
+  /** 设置是否显示缩放控件 */
   fun setShowsZoomControls(show: Boolean) = uiManager.setShowsZoomControls(show)
+  /** 设置是否显示指南针 */
   fun setShowsCompass(show: Boolean) = uiManager.setShowsCompass(show)
+  /** 设置是否显示比例尺 */
   fun setShowsScale(show: Boolean) = uiManager.setShowsScale(show)
   
+  /** 设置是否启用缩放手势 */
   fun setZoomEnabled(enabled: Boolean) = uiManager.setZoomEnabled(enabled)
+  /** 设置是否启用滚动手势 */
   fun setScrollEnabled(enabled: Boolean) = uiManager.setScrollEnabled(enabled)
+  /** 设置是否启用旋转手势 */
   fun setRotateEnabled(enabled: Boolean) = uiManager.setRotateEnabled(enabled)
+  /** 设置是否启用倾斜手势 */
   fun setTiltEnabled(enabled: Boolean) = uiManager.setTiltEnabled(enabled)
   
+  /** 设置最大缩放级别 */
   fun setMaxZoom(maxZoom: Float) = cameraManager.setMaxZoomLevel(maxZoom)
+  /** 设置最小缩放级别 */
   fun setMinZoom(minZoom: Float) = cameraManager.setMinZoomLevel(minZoom)
   
+  /** 设置是否显示用户位置 */
   fun setShowsUserLocation(show: Boolean) = uiManager.setShowsUserLocation(show, followUserLocation)
   
+  /**
+   * 设置是否跟随用户位置
+   * @param follow 是否跟随
+   */
   fun setFollowUserLocation(follow: Boolean) {
     followUserLocation = follow
     // 如果定位已开启，立即应用新设置
     uiManager.setShowsUserLocation(true, follow)
   }
   
+  /**
+   * 设置用户位置样式
+   * @param representation 样式配置
+   */
   fun setUserLocationRepresentation(representation: Map<String, Any>) {
     uiManager.setUserLocationRepresentation(representation)
   }
   
+  /** 设置是否显示交通路况 */
   fun setShowsTraffic(show: Boolean) = uiManager.setShowsTraffic(show)
+  /** 设置是否显示建筑物 */
   fun setShowsBuildings(show: Boolean) = uiManager.setShowsBuildings(show)
+  /** 设置是否显示室内地图 */
   fun setShowsIndoorMap(show: Boolean) = uiManager.setShowsIndoorMap(show)
   
   // ==================== 相机控制方法 ====================
   
+  /**
+   * 移动相机
+   * @param position 目标位置
+   * @param duration 动画时长(毫秒)
+   */
   fun moveCamera(position: Map<String, Any>, duration: Int) {
     cameraManager.moveCamera(position, duration)
   }
   
+  /**
+   * 获取屏幕坐标对应的地理坐标
+   * @param point 屏幕坐标
+   * @return 地理坐标
+   */
   fun getLatLng(point: Map<String, Double>): Map<String, Double> {
     return cameraManager.getLatLng(point)
   }
   
+  /**
+   * 设置地图中心点
+   * @param center 中心点坐标
+   * @param animated 是否动画
+   */
   fun setCenter(center: Map<String, Double>, animated: Boolean) {
     cameraManager.setCenter(center, animated)
   }
   
+  /**
+   * 设置地图缩放级别
+   * @param zoom 缩放级别
+   * @param animated 是否动画
+   */
   fun setZoomLevel(zoom: Float, animated: Boolean) {
     cameraManager.setZoomLevel(zoom, animated)
   }
   
+  /**
+   * 获取当前相机位置
+   * @return 相机位置信息
+   */
   fun getCameraPosition(): Map<String, Any> {
     return cameraManager.getCameraPosition()
   }
   
   // ==================== 覆盖物管理 ====================
   
+  /** 添加圆形覆盖物 */
   fun addCircle(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔵 addCircle: id=$id")
     mainHandler.post {
       overlayManager.addCircle(id, props)
     }
   }
   
+  /** 移除圆形覆盖物 */
   fun removeCircle(id: String) {
-    Log.d(TAG, "🔴 removeCircle: id=$id")
     mainHandler.post {
       overlayManager.removeCircle(id)
     }
   }
   
+  /** 更新圆形覆盖物 */
   fun updateCircle(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔄 updateCircle: id=$id")
     mainHandler.post {
       overlayManager.updateCircle(id, props)
     }
   }
   
+  /** 添加标记点 */
   fun addMarker(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "📍 addMarker: id=$id")
     mainHandler.post {
       overlayManager.addMarker(id, props)
     }
   }
   
+  /** 移除标记点 */
   fun removeMarker(id: String) {
-    Log.d(TAG, "🗑️ removeMarker: id=$id")
     mainHandler.post {
       overlayManager.removeMarker(id)
     }
   }
   
+  /** 更新标记点 */
   fun updateMarker(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔄 updateMarker: id=$id")
     mainHandler.post {
       overlayManager.updateMarker(id, props)
     }
   }
   
+  /** 添加折线 */
   fun addPolyline(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "📏 addPolyline: id=$id")
     mainHandler.post {
       overlayManager.addPolyline(id, props)
     }
   }
   
+  /** 移除折线 */
   fun removePolyline(id: String) {
-    Log.d(TAG, "🗑️ removePolyline: id=$id")
     mainHandler.post {
       overlayManager.removePolyline(id)
     }
   }
   
+  /** 更新折线 */
   fun updatePolyline(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔄 updatePolyline: id=$id")
     mainHandler.post {
       overlayManager.updatePolyline(id, props)
     }
   }
   
+  /** 添加多边形 */
   fun addPolygon(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔷 addPolygon: id=$id")
     mainHandler.post {
       overlayManager.addPolygon(id, props)
     }
   }
   
+  /** 移除多边形 */
   fun removePolygon(id: String) {
-    Log.d(TAG, "🗑️ removePolygon: id=$id")
     mainHandler.post {
       overlayManager.removePolygon(id)
     }
   }
   
+  /** 更新多边形 */
   fun updatePolygon(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔄 updatePolygon: id=$id")
     mainHandler.post {
       overlayManager.updatePolygon(id, props)
     }
@@ -293,22 +344,37 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
   
   // ==================== 生命周期方法 ====================
   
+  /** 恢复地图 */
   @Suppress("unused")
   fun onResume() {
     mapView.onResume()
   }
   
+  /** 暂停地图 */
   @Suppress("unused")
   fun onPause() {
     mapView.onPause()
   }
   
+  /** 销毁地图 */
   @Suppress("unused")
   fun onDestroy() {
+    // 清理 Handler 回调,防止内存泄露
+    mainHandler.removeCallbacksAndMessages(null)
+    
+    // 清理地图监听器
+    aMap.setOnMapClickListener(null)
+    aMap.setOnMapLongClickListener(null)
+    aMap.setOnMapLoadedListener(null)
+    
+    // 清理覆盖物
     overlayManager.clear()
+    
+    // 销毁地图
     mapView.onDestroy()
   }
   
+  /** 保存实例状态 */
   @Suppress("unused")
   fun onSaveInstanceState(outState: android.os.Bundle) {
     mapView.onSaveInstanceState(outState)
@@ -318,7 +384,6 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
    * 添加子视图时自动连接到地图
    */
   override fun addView(child: View?, index: Int) {
-    Log.d(TAG, "addView - child: ${child?.javaClass?.simpleName}")
     super.addView(child, index)
     
     // 自动将地图实例传递给覆盖物子视图
@@ -331,15 +396,11 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         is HeatMapView -> it.setMap(aMap)
         is MultiPointView -> it.setMap(aMap)
         is ClusterView -> it.setMap(aMap)
-        else -> Log.d(TAG, "未识别的子视图类型: ${it.javaClass.name}")
       }
     }
   }
   
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
-    if (changed) {
-      Log.d(TAG, "onLayout - bounds: ($left,$top,$right,$bottom)")
-    }
   }
 }

package/android/src/main/java/expo/modules/gaodemap/managers/CameraManager.kt

@@ -1,6 +1,8 @@
 package expo.modules.gaodemap.managers
 
 import android.graphics.Point
+import android.os.Handler
+import android.os.Looper
 import com.amap.api.maps.AMap
 import com.amap.api.maps.CameraUpdateFactory
 import com.amap.api.maps.model.CameraPosition
@@ -12,6 +14,8 @@ import com.amap.api.maps.model.LatLng
  */
 class CameraManager(private val aMap: AMap) {
   
+  private val mainHandler = Handler(Looper.getMainLooper())
+  
   /**
    * 设置最大缩放级别
    */
@@ -56,28 +60,30 @@ class CameraManager(private val aMap: AMap) {
    * 移动相机
    */
   fun moveCamera(position: Map<String, Any>, duration: Int) {
-    @Suppress("UNCHECKED_CAST")
-    val target = position["target"] as? Map<String, Double>
-    val zoom = (position["zoom"] as? Number)?.toFloat()
-    val tilt = (position["tilt"] as? Number)?.toFloat()
-    val bearing = (position["bearing"] as? Number)?.toFloat()
-    
-    if (target != null) {
-      val lat = target["latitude"] ?: 0.0
-      val lng = target["longitude"] ?: 0.0
-      val latLng = LatLng(lat, lng)
-      
-      val builder = CameraPosition.Builder().target(latLng)
-      zoom?.let { builder.zoom(it) }
-      tilt?.let { builder.tilt(it) }
-      bearing?.let { builder.bearing(it) }
-      
-      val cameraUpdate = CameraUpdateFactory.newCameraPosition(builder.build())
+    mainHandler.post {
+      @Suppress("UNCHECKED_CAST")
+      val target = position["target"] as? Map<String, Double>
+      val zoom = (position["zoom"] as? Number)?.toFloat()
+      val tilt = (position["tilt"] as? Number)?.toFloat()
+      val bearing = (position["bearing"] as? Number)?.toFloat()
       
-      if (duration > 0) {
-        aMap.animateCamera(cameraUpdate, duration.toLong(), null)
-      } else {
-        aMap.moveCamera(cameraUpdate)
+      if (target != null) {
+        val lat = target["latitude"] ?: 0.0
+        val lng = target["longitude"] ?: 0.0
+        val latLng = LatLng(lat, lng)
+        
+        val builder = CameraPosition.Builder().target(latLng)
+        zoom?.let { builder.zoom(it) }
+        tilt?.let { builder.tilt(it) }
+        bearing?.let { builder.bearing(it) }
+        
+        val cameraUpdate = CameraUpdateFactory.newCameraPosition(builder.build())
+        
+        if (duration > 0) {
+          aMap.animateCamera(cameraUpdate, duration.toLong(), null)
+        } else {
+          aMap.moveCamera(cameraUpdate)
+        }
       }
     }
   }

package/android/src/main/java/expo/modules/gaodemap/managers/OverlayManager.kt

@@ -1,9 +1,12 @@
 package expo.modules.gaodemap.managers
 
 import android.util.Log
+import android.graphics.BitmapFactory
 import com.amap.api.maps.AMap
 import com.amap.api.maps.model.LatLng
+import com.amap.api.maps.model.BitmapDescriptorFactory
 import expo.modules.gaodemap.utils.ColorParser
+import java.net.URL
 
 /**
  * 覆盖物管理器
@@ -24,7 +27,6 @@ class OverlayManager(private val aMap: AMap) {
   // ==================== 圆形覆盖物 ====================
   
   fun addCircle(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔵 addCircle: id=$id")
     
     @Suppress("UNCHECKED_CAST")
     val center = props["center"] as? Map<String, Double>
@@ -47,7 +49,6 @@ class OverlayManager(private val aMap: AMap) {
       
       val circle = aMap.addCircle(options)
       circles[id] = circle
-      Log.d(TAG, "✅ 圆形创建成功")
     }
   }
   
@@ -55,7 +56,6 @@ class OverlayManager(private val aMap: AMap) {
     circles[id]?.let { circle ->
       circle.remove()
       circles.remove(id)
-      Log.d(TAG, "✅ 圆形已移除: $id")
     }
   }
   
@@ -78,15 +78,12 @@ class OverlayManager(private val aMap: AMap) {
       fillColor?.let { circle.fillColor = it }
       strokeColor?.let { circle.strokeColor = it }
       strokeWidth?.let { circle.strokeWidth = it }
-      
-      Log.d(TAG, "✅ 圆形已更新: $id")
     }
   }
   
   // ==================== 标记点 ====================
   
   fun addMarker(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "📍 addMarker: id=$id")
     
     @Suppress("UNCHECKED_CAST")
     val position = props["position"] as? Map<String, Double>
@@ -111,7 +108,6 @@ class OverlayManager(private val aMap: AMap) {
       }
       
       markers[id] = marker
-      Log.d(TAG, "✅ 标记点创建成功")
     }
   }
   
@@ -119,7 +115,6 @@ class OverlayManager(private val aMap: AMap) {
     markers[id]?.let { marker ->
       marker.remove()
       markers.remove(id)
-      Log.d(TAG, "✅ 标记点已移除: $id")
     }
   }
   
@@ -138,22 +133,24 @@ class OverlayManager(private val aMap: AMap) {
       
       title?.let { marker.title = it }
       draggable?.let { marker.isDraggable = it }
-      
-      Log.d(TAG, "✅ 标记点已更新: $id")
     }
   }
   
   // ==================== 折线 ====================
   
   fun addPolyline(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "📏 addPolyline: id=$id")
     
     @Suppress("UNCHECKED_CAST")
     val points = props["points"] as? List<Map<String, Double>>
-    val width = (props["width"] as? Number)?.toFloat() ?: 10f
-    val color = ColorParser.parseColor(props["color"])
+    val width = (props["strokeWidth"] as? Number)?.toFloat() ?: 10f
+    val texture = props["texture"] as? String
+    val color = if (!texture.isNullOrEmpty()) {
+      android.graphics.Color.TRANSPARENT
+    } else {
+      ColorParser.parseColor(props["strokeColor"])
+    }
     
-    if (points != null && points.isNotEmpty()) {
+    if (points != null && points.size >= 2) {
       val latLngs = points.map { point ->
         val lat = point["latitude"] ?: 0.0
         val lng = point["longitude"] ?: 0.0
@@ -166,8 +163,31 @@ class OverlayManager(private val aMap: AMap) {
         .color(color)
       
       val polyline = aMap.addPolyline(options)
+      
+      // 处理纹理
+      if (!texture.isNullOrEmpty()) {
+        Thread {
+          try {
+            val bitmap = if (texture.startsWith("http://") || texture.startsWith("https://")) {
+              BitmapFactory.decodeStream(URL(texture).openStream())
+            } else if (texture.startsWith("file://")) {
+              BitmapFactory.decodeFile(texture.substring(7))
+            } else {
+              null
+            }
+            
+            bitmap?.let {
+              val descriptor = BitmapDescriptorFactory.fromBitmap(it)
+              polyline.setCustomTexture(descriptor)
+              Log.d(TAG, "✅ 纹理设置成功")
+            }
+          } catch (e: Exception) {
+            Log.e(TAG, "纹理加载失败: ${e.message}")
+          }
+        }.start()
+      }
+      
       polylines[id] = polyline
-      Log.d(TAG, "✅ 折线创建成功")
     }
   }
   
@@ -175,7 +195,6 @@ class OverlayManager(private val aMap: AMap) {
     polylines[id]?.let { polyline ->
       polyline.remove()
       polylines.remove(id)
-      Log.d(TAG, "✅ 折线已移除: $id")
     }
   }
   
@@ -183,8 +202,8 @@ class OverlayManager(private val aMap: AMap) {
     polylines[id]?.let { polyline ->
       @Suppress("UNCHECKED_CAST")
       val points = props["points"] as? List<Map<String, Double>>
-      val width = (props["width"] as? Number)?.toFloat()
-      val color = props["color"]?.let { ColorParser.parseColor(it) }
+      val width = (props["strokeWidth"] as? Number)?.toFloat()
+      val color = props["strokeColor"]?.let { ColorParser.parseColor(it) }
       
       points?.let {
         val latLngs = it.map { point ->
@@ -197,15 +216,12 @@ class OverlayManager(private val aMap: AMap) {
       
       width?.let { polyline.width = it }
       color?.let { polyline.color = it }
-      
-      Log.d(TAG, "✅ 折线已更新: $id")
     }
   }
   
   // ==================== 多边形 ====================
   
   fun addPolygon(id: String, props: Map<String, Any>) {
-    Log.d(TAG, "🔷 addPolygon: id=$id")
     
     @Suppress("UNCHECKED_CAST")
     val points = props["points"] as? List<Map<String, Double>>
@@ -239,7 +255,6 @@ class OverlayManager(private val aMap: AMap) {
     polygons[id]?.let { polygon ->
       polygon.remove()
       polygons.remove(id)
-      Log.d(TAG, "✅ 多边形已移除: $id")
     }
   }
   
@@ -266,8 +281,6 @@ class OverlayManager(private val aMap: AMap) {
       strokeColor?.let { polygon.strokeColor = it }
       strokeWidth?.let { polygon.strokeWidth = it }
       zIndex?.let { polygon.zIndex = it }
-      
-      Log.d(TAG, "✅ 多边形已更新: $id")
     }
   }