expo-gaode-map 1.0.3 → 1.0.5

package/android/src/main/AndroidManifest.xml

@@ -21,6 +21,11 @@
   <!-- Android 10及以上需要后台定位权限 -->
   <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
   
+  <!-- 前台服务权限 (Android 9+) -->
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <!-- Android 14+ 需要指定前台服务类型 -->
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+  
   <!-- 写入扩展存储，用于缓存地图数据 -->
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -30,11 +35,18 @@
   
   <application>
     <!-- 高德地图 API Key（这里只是示例，实际会通过代码设置） -->
-    <!-- 
+    <!--
     <meta-data
       android:name="com.amap.api.v2.apikey"
       android:value="YOUR_API_KEY_HERE"/>
     -->
+    
+    <!-- 定位前台服务 -->
+    <service
+      android:name="expo.modules.gaodemap.services.LocationForegroundService"
+      android:enabled="true"
+      android:exported="false"
+      android:foregroundServiceType="location" />
   </application>
   
 </manifest>

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

@@ -1,6 +1,6 @@
 package expo.modules.gaodemap
 
-import android.util.Log
+
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.gaodemap.modules.SDKInitializer
@@ -17,9 +17,7 @@ import expo.modules.gaodemap.overlays.*
  * - 地图视图和覆盖物注册
  */
 class ExpoGaodeMapModule : Module() {
-  companion object {
-    private const val TAG = "ExpoGaodeMapModule"
-  }
+
   
   /** 定位管理器实例 */
   private var locationManager: LocationManager? = null
@@ -181,6 +179,63 @@ class ExpoGaodeMapModule : Module() {
       getLocationManager().setHttpTimeOut(httpTimeOut)
     }
 
+    /**
+     * 设置定位精度 (iOS 专用,Android 空实现)
+     * @param accuracy 精度级别
+     */
+    Function("setDesiredAccuracy") { _: Int ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置定位超时时间 (iOS 专用,Android 空实现)
+     * @param timeout 超时时间(秒)
+     */
+    Function("setLocationTimeout") { _: Int ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置逆地理超时时间 (iOS 专用,Android 空实现)
+     * @param timeout 超时时间(秒)
+     */
+    Function("setReGeocodeTimeout") { _: Int ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置距离过滤器 (iOS 专用,Android 空实现)
+     * @param distance 最小距离变化(米)
+     */
+    Function("setDistanceFilter") { _: Double ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置是否自动暂停定位更新 (iOS 专用,Android 空实现)
+     * @param pauses 是否自动暂停
+     */
+    Function("setPausesLocationUpdatesAutomatically") { _: Boolean ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置是否允许后台定位
+     * Android 通过前台服务实现,iOS 通过系统配置实现
+     * @param allows 是否允许后台定位
+     */
+    Function("setAllowsBackgroundLocationUpdates") { allows: Boolean ->
+      getLocationManager().setAllowsBackgroundLocationUpdates(allows)
+    }
+
+    /**
+     * 设置定位协议 (未实现)
+     * @param protocol 协议类型
+     */
+    Function("setLocationProtocol") { _: Int ->
+      // 未实现
+    }
+
     // ==================== 权限管理 ====================
     
     /**
@@ -271,7 +326,7 @@ class ExpoGaodeMapModule : Module() {
     View(ExpoGaodeMapView::class) {
       
       // 事件
-      Events("onMapPress", "onMapLongPress", "onLoad", "onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd", "onCirclePress")
+      Events("onMapPress", "onMapLongPress", "onLoad", "onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd", "onCirclePress", "onPolygonPress", "onPolylinePress")
 
       // 地图类型
       Prop<Int>("mapType") { view, type ->
@@ -457,6 +512,10 @@ class ExpoGaodeMapModule : Module() {
       Prop<Float>("strokeWidth") { view, width ->
         view.setStrokeWidth(width)
       }
+
+      Prop<Float>("zIndex") { view, zIndex ->
+        view.setZIndex(zIndex)
+      }
     }
     
     // Polyline - 折线
@@ -478,6 +537,18 @@ class ExpoGaodeMapModule : Module() {
       Prop<String?>("texture") { view: PolylineView, texture ->
         view.setTexture(texture)
       }
+      
+      Prop<Boolean>("dotted") { view: PolylineView, dotted ->
+        view.setDotted(dotted)
+      }
+      
+      Prop<Boolean>("geodesic") { view: PolylineView, geodesic ->
+        view.setGeodesic(geodesic)
+      }
+      
+      Prop<Float>("zIndex") { view: PolylineView, zIndex ->
+        view.setZIndex(zIndex)
+      }
     }
     
     // Polygon - 多边形

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

@@ -6,6 +6,7 @@ import android.view.View
 import com.amap.api.maps.AMap
 import com.amap.api.maps.MapView
 import com.amap.api.maps.MapsInitializer
+import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -50,6 +51,8 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
   private val onMarkerDrag by EventDispatcher()
   private val onMarkerDragEnd by EventDispatcher()
   private val onCirclePress by EventDispatcher()
+  private val onPolygonPress by EventDispatcher()
+  private val onPolylinePress by EventDispatcher()
   
   // 高德地图视图
   private lateinit var mapView: MapView
@@ -114,6 +117,20 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
             "longitude" to lng
           ))
         }
+        onPolygonPress = { id, lat, lng ->
+          this@ExpoGaodeMapView.onPolygonPress(mapOf(
+            "polygonId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+        onPolylinePress = { id, lat, lng ->
+          this@ExpoGaodeMapView.onPolylinePress(mapOf(
+            "polylineId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
       }
       
       // 添加地图视图到布局
@@ -149,16 +166,47 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
    */
   private fun setupMapListeners() {
     aMap.setOnMapClickListener { latLng ->
-      // 先检查是否点击了圆形
+      // 检查声明式 PolylineView
+      if (checkDeclarativePolylinePress(latLng)) {
+        return@setOnMapClickListener
+      }
+      
+      // 检查声明式 PolygonView
+      if (checkDeclarativePolygonPress(latLng)) {
+        return@setOnMapClickListener
+      }
+      
+      // 检查声明式 CircleView
+      if (checkDeclarativeCirclePress(latLng)) {
+        return@setOnMapClickListener
+      }
+      
+      // 检查命令式圆形
       val circleId = overlayManager.checkCirclePress(latLng)
       if (circleId != null) {
         overlayManager.onCirclePress?.invoke(circleId, latLng.latitude, latLng.longitude)
-      } else {
-        onMapPress(mapOf(
-          "latitude" to latLng.latitude,
-          "longitude" to latLng.longitude
-        ))
+        return@setOnMapClickListener
       }
+      
+      // 检查命令式多边形
+      val polygonId = overlayManager.checkPolygonPress(latLng)
+      if (polygonId != null) {
+        overlayManager.onPolygonPress?.invoke(polygonId, latLng.latitude, latLng.longitude)
+        return@setOnMapClickListener
+      }
+      
+      // 检查命令式折线
+      val polylineId = overlayManager.checkPolylinePress(latLng)
+      if (polylineId != null) {
+        overlayManager.onPolylinePress?.invoke(polylineId, latLng.latitude, latLng.longitude)
+        return@setOnMapClickListener
+      }
+      
+      // 如果都没点击,触发地图点击事件
+      onMapPress(mapOf(
+        "latitude" to latLng.latitude,
+        "longitude" to latLng.longitude
+      ))
     }
     
     aMap.setOnMapLongClickListener { latLng ->
@@ -447,6 +495,42 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     }
   }
   
+  private fun checkDeclarativePolylinePress(latLng: LatLng): Boolean {
+    for (i in 0 until childCount) {
+      val child = getChildAt(i)
+      if (child is PolylineView) {
+        if (child.checkPress(latLng)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+  
+  private fun checkDeclarativePolygonPress(latLng: LatLng): Boolean {
+    for (i in 0 until childCount) {
+      val child = getChildAt(i)
+      if (child is PolygonView) {
+        if (child.checkPress(latLng)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+  
+  private fun checkDeclarativeCirclePress(latLng: LatLng): Boolean {
+    for (i in 0 until childCount) {
+      val child = getChildAt(i)
+      if (child is CircleView) {
+        if (child.checkPress(latLng)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+  
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
   }

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

@@ -32,12 +32,20 @@ class OverlayManager(private val aMap: AMap, private val context: Context) {
   // Circle ID 映射
   private val circleIdMap = mutableMapOf<com.amap.api.maps.model.Circle, String>()
   
+  // Polygon ID 映射
+  private val polygonIdMap = mutableMapOf<com.amap.api.maps.model.Polygon, String>()
+  
+  // Polyline ID 映射
+  private val polylineIdMap = mutableMapOf<com.amap.api.maps.model.Polyline, String>()
+  
   // 事件回调
   var onMarkerPress: ((String, Double, Double) -> Unit)? = null
   var onMarkerDragStart: ((String, Double, Double) -> Unit)? = null
   var onMarkerDrag: ((String, Double, Double) -> Unit)? = null
   var onMarkerDragEnd: ((String, Double, Double) -> Unit)? = null
   var onCirclePress: ((String, Double, Double) -> Unit)? = null
+  var onPolygonPress: ((String, Double, Double) -> Unit)? = null
+  var onPolylinePress: ((String, Double, Double) -> Unit)? = null
   
   private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())
   
@@ -345,11 +353,13 @@ class OverlayManager(private val aMap: AMap, private val context: Context) {
       }
       
       polylines[id] = polyline
+      polylineIdMap[polyline] = id
     }
   }
   
   fun removePolyline(id: String) {
     polylines[id]?.let { polyline ->
+      polylineIdMap.remove(polyline)
       polyline.remove()
       polylines.remove(id)
     }
@@ -404,12 +414,14 @@ class OverlayManager(private val aMap: AMap, private val context: Context) {
       
       val polygon = aMap.addPolygon(options)
       polygons[id] = polygon
+      polygonIdMap[polygon] = id
       Log.d(TAG, "✅ 多边形创建成功")
     }
   }
   
   fun removePolygon(id: String) {
     polygons[id]?.let { polygon ->
+      polygonIdMap.remove(polygon)
       polygon.remove()
       polygons.remove(id)
     }
@@ -456,6 +468,78 @@ class OverlayManager(private val aMap: AMap, private val context: Context) {
     return null
   }
   
+  /**
+   * 检查点击位置是否在某个多边形内
+   */
+  fun checkPolygonPress(latLng: LatLng): String? {
+    for ((polygon, id) in polygonIdMap) {
+      if (polygon.contains(latLng)) {
+        return id
+      }
+    }
+    return null
+  }
+  
+  /**
+   * 检查点击位置是否在某条折线附近
+   */
+  fun checkPolylinePress(latLng: LatLng): String? {
+    val threshold = 20.0 // 20米容差
+    for ((polyline, id) in polylineIdMap) {
+      val points = polyline.points
+      if (points.size < 2) continue
+      
+      for (i in 0 until points.size - 1) {
+        val distance = distanceToSegment(latLng, points[i], points[i + 1])
+        if (distance <= threshold) {
+          return id
+        }
+      }
+    }
+    return null
+  }
+  
+  /**
+   * 计算点到线段的距离(米)
+   */
+  private fun distanceToSegment(point: LatLng, start: LatLng, end: LatLng): Double {
+    val p = android.location.Location("").apply {
+      latitude = point.latitude
+      longitude = point.longitude
+    }
+    val a = android.location.Location("").apply {
+      latitude = start.latitude
+      longitude = start.longitude
+    }
+    val b = android.location.Location("").apply {
+      latitude = end.latitude
+      longitude = end.longitude
+    }
+    
+    val ab = a.distanceTo(b).toDouble()
+    if (ab == 0.0) return a.distanceTo(p).toDouble()
+    
+    val ap = a.distanceTo(p).toDouble()
+    val bp = b.distanceTo(p).toDouble()
+    
+    val t = maxOf(0.0, minOf(1.0,
+      ((point.latitude - start.latitude) * (end.latitude - start.latitude) +
+       (point.longitude - start.longitude) * (end.longitude - start.longitude)) / (ab * ab)
+    ))
+    
+    val projection = LatLng(
+      start.latitude + t * (end.latitude - start.latitude),
+      start.longitude + t * (end.longitude - start.longitude)
+    )
+    
+    val proj = android.location.Location("").apply {
+      latitude = projection.latitude
+      longitude = projection.longitude
+    }
+    
+    return p.distanceTo(proj).toDouble()
+  }
+  
   fun clear() {
     circles.values.forEach { it.remove() }
     circles.clear()
@@ -469,6 +553,9 @@ class OverlayManager(private val aMap: AMap, private val context: Context) {
     
     polygons.values.forEach { it.remove() }
     polygons.clear()
+    polygonIdMap.clear()
+    
+    polylineIdMap.clear()
   }
   
   /**

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

@@ -7,6 +7,7 @@ import com.amap.api.location.AMapLocationClient
 import com.amap.api.location.AMapLocationClientOption
 import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.Promise
+import expo.modules.gaodemap.services.LocationForegroundService
 
 /**
  * 定位管理器
@@ -32,6 +33,8 @@ class LocationManager(context: Context) {
     private var isLocationStarted = false
     /** 定位更新回调 */
     private var onLocationUpdate: ((Map<String, Any?>) -> Unit)? = null
+    /** 是否启用后台定位 */
+    private var allowsBackgroundLocationUpdates = false
 
     init {
         initLocationClient()
@@ -52,6 +55,12 @@ class LocationManager(context: Context) {
         if (locationClient == null) {
             initLocationClient()
         }
+        
+        // 如果启用后台定位,启动前台服务
+        if (allowsBackgroundLocationUpdates) {
+            LocationForegroundService.start(appContext)
+        }
+        
         locationClient?.startLocation()
         isLocationStarted = true
     }
@@ -62,6 +71,11 @@ class LocationManager(context: Context) {
     fun stop() {
         locationClient?.stopLocation()
         isLocationStarted = false
+        
+        // 停止前台服务
+        if (allowsBackgroundLocationUpdates) {
+            LocationForegroundService.stop(appContext)
+        }
     }
 
     /**
@@ -205,6 +219,11 @@ class LocationManager(context: Context) {
         applyLocationOption()
     }
 
+    /** 设置是否允许后台定位 */
+    fun setAllowsBackgroundLocationUpdates(allows: Boolean) {
+        allowsBackgroundLocationUpdates = allows
+    }
+
     /**
      * 销毁资源
      */
@@ -214,6 +233,11 @@ class LocationManager(context: Context) {
         locationClient?.onDestroy()
         locationClient = null
         locationOption = null
+        
+        // 确保停止前台服务
+        if (allowsBackgroundLocationUpdates) {
+            LocationForegroundService.stop(appContext)
+        }
     }
 
     // ==================== 私有方法 ====================
@@ -229,6 +253,7 @@ class LocationManager(context: Context) {
                         onLocationUpdate?.invoke(formatLocation(location))
                     }
                 }
+                
             }
 
             locationOption = AMapLocationClientOption().apply {

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

@@ -103,6 +103,22 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
     }
   }
   
+  /**
+   * 检查点击位置是否在圆形内
+   */
+  fun checkPress(latLng: LatLng): Boolean {
+    circle?.let { c ->
+      if (c.contains(latLng)) {
+        onPress(mapOf(
+          "latitude" to latLng.latitude,
+          "longitude" to latLng.longitude
+        ))
+        return true
+      }
+    }
+    return false
+  }
+  
   /**
    * 移除圆形
    */

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

@@ -1,5 +1,6 @@
 package expo.modules.gaodemap.overlays
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -95,6 +96,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   /**
    * 设置锚点
    */
+  @SuppressLint("SuspiciousIndentation")
   fun setAnchor(anchor: Map<String, Float>) {
     val x = anchor["x"] ?: 0.5f
     val y = anchor["y"] ?: 1.0f

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

@@ -80,7 +80,7 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
         
         // 创建海量点覆盖物
         multiPointOverlay = map.addMultiPointOverlay(overlayOptions)
-        multiPointOverlay?.setItems(points)
+          multiPointOverlay?.items = points
         
         // 注意：MultiPointOverlay 在高德地图 Android SDK 中不直接支持点击事件
         // 如果需要点击事件，需要使用 Marker 或其他方式实现

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

@@ -17,6 +17,7 @@ class PolygonView(context: Context, appContext: AppContext) : ExpoView(context,
   private var polygon: Polygon? = null
   private var aMap: AMap? = null
   private var points: List<LatLng> = emptyList()
+  private var strokeWidth: Float = 10f
   
   /**
    * 设置地图实例
@@ -65,8 +66,11 @@ class PolygonView(context: Context, appContext: AppContext) : ExpoView(context,
    * 设置边框宽度
    */
   fun setStrokeWidth(width: Float) {
+    // Android 需要乘以屏幕密度以匹配 iOS 的视觉效果
+    val density = context.resources.displayMetrics.density
+    strokeWidth = width * density
     polygon?.let {
-      it.strokeWidth = width
+      it.strokeWidth = strokeWidth
     } ?: createOrUpdatePolygon()
   }
   
@@ -89,7 +93,7 @@ class PolygonView(context: Context, appContext: AppContext) : ExpoView(context,
           .addAll(points)
           .fillColor(Color.argb(50, 0, 0, 255))
           .strokeColor(Color.BLUE)
-          .strokeWidth(10f)
+          .strokeWidth(strokeWidth)
         
         polygon = map.addPolygon(options)
         
@@ -99,6 +103,22 @@ class PolygonView(context: Context, appContext: AppContext) : ExpoView(context,
     }
   }
   
+  /**
+   * 检查点击位置是否在多边形内
+   */
+  fun checkPress(latLng: LatLng): Boolean {
+    polygon?.let { poly ->
+      if (poly.contains(latLng)) {
+        onPress(mapOf(
+          "latitude" to latLng.latitude,
+          "longitude" to latLng.longitude
+        ))
+        return true
+      }
+    }
+    return false
+  }
+  
   /**
    * 移除多边形
    */