expo-gaode-map 1.1.1 → 1.1.2

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

@@ -2,6 +2,10 @@ package expo.modules.gaodemap.managers
 
 import android.content.Context
 import android.graphics.BitmapFactory
+import android.location.Location
+import android.location.LocationListener
+import android.location.LocationManager as AndroidLocationManager
+import android.os.Bundle
 import com.amap.api.maps.AMap
 import com.amap.api.maps.LocationSource
 import com.amap.api.maps.model.BitmapDescriptorFactory
@@ -14,10 +18,13 @@ import java.net.URL
  * UI 和手势管理器
  * 负责地图控件显示、手势控制、图层显示等
  */
-class UIManager(private val aMap: AMap, private val context: Context) {
+class UIManager(private val aMap: AMap, private val context: Context) : LocationListener {
   
   var onLocationChanged: ((latitude: Double, longitude: Double, accuracy: Float) -> Unit)? = null
   
+  private var locationManager: AndroidLocationManager? = null
+  private var locationChangedListener: LocationSource.OnLocationChangedListener? = null
+  
   // ==================== 控件显示 ====================
   
   /**
@@ -79,27 +86,37 @@ class UIManager(private val aMap: AMap, private val context: Context) {
    * 设置是否显示用户位置
    */
   fun setShowsUserLocation(show: Boolean, followUserLocation: Boolean = false) {
+    android.util.Log.d("UIManager", "🔵 setShowsUserLocation: show=$show, follow=$followUserLocation")
+    
     if (show) {
+      // 创建默认的定位样式
       if (currentLocationStyle == null) {
-        currentLocationStyle = MyLocationStyle()
-      }
-      val locationType = if (followUserLocation) {
-        MyLocationStyle.LOCATION_TYPE_FOLLOW
+        currentLocationStyle = MyLocationStyle().apply {
+          // 根据是否跟随设置定位类型
+          val locationType = if (followUserLocation) {
+            MyLocationStyle.LOCATION_TYPE_FOLLOW  // 连续定位并跟随
+          } else {
+            MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE  // 连续定位，点会旋转
+          }
+          myLocationType(locationType)
+          interval(2000)  // 2秒定位一次
+          showMyLocation(true)
+        }
+        android.util.Log.d("UIManager", "✨ 创建默认 MyLocationStyle")
       } else {
-        MyLocationStyle.LOCATION_TYPE_SHOW
-      }
-      currentLocationStyle?.myLocationType(locationType)
-      aMap.myLocationStyle = currentLocationStyle
-      
-      // 设置定位监听
-      aMap.setLocationSource(object : LocationSource {
-        override fun activate(listener: LocationSource.OnLocationChangedListener?) {
-          // 高德地图会自动处理定位，我们只需要监听位置变化
+        // 更新定位类型
+        val locationType = if (followUserLocation) {
+          MyLocationStyle.LOCATION_TYPE_FOLLOW
+        } else {
+          MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE
+        }
+        currentLocationStyle?.apply {
+          myLocationType(locationType)
+          interval(2000)
         }
-        override fun deactivate() {}
-      })
+      }
       
-      // 监听定位变化
+      // 监听定位变化（用于通知 React Native）
       aMap.setOnMyLocationChangeListener { location ->
         onLocationChanged?.invoke(
           location.latitude,
@@ -108,112 +125,266 @@ class UIManager(private val aMap: AMap, private val context: Context) {
         )
       }
       
+      // 应用定位样式
+      aMap.myLocationStyle = currentLocationStyle
+      
+      // 启用定位（使用高德地图自己的定位）
       aMap.isMyLocationEnabled = true
+      android.util.Log.d("UIManager", "✅ 定位已启用")
+      
     } else {
       aMap.setOnMyLocationChangeListener(null)
       aMap.isMyLocationEnabled = false
+      android.util.Log.d("UIManager", "❌ 定位已禁用")
+    }
+  }
+  
+  /**
+   * 启动真实的系统定位
+   */
+  private fun startRealLocation() {
+    try {
+      if (locationManager == null) {
+        locationManager = context.getSystemService(Context.LOCATION_SERVICE) as AndroidLocationManager
+      }
+      
+      val providers = locationManager?.getProviders(true) ?: emptyList()
+      android.util.Log.d("UIManager", "📡 可用的定位提供者: $providers")
+      
+      // 优先使用 GPS，其次是网络定位
+      val provider = when {
+        providers.contains(AndroidLocationManager.GPS_PROVIDER) -> {
+          android.util.Log.d("UIManager", "✅ 使用 GPS 定位")
+          AndroidLocationManager.GPS_PROVIDER
+        }
+        providers.contains(AndroidLocationManager.NETWORK_PROVIDER) -> {
+          android.util.Log.d("UIManager", "✅ 使用网络定位")
+          AndroidLocationManager.NETWORK_PROVIDER
+        }
+        else -> {
+          android.util.Log.e("UIManager", "❌ 没有可用的定位提供者")
+          return
+        }
+      }
+      
+      // 请求位置更新
+      locationManager?.requestLocationUpdates(
+        provider,
+        2000L,  // 最小时间间隔 2秒
+        10f,    // 最小距离变化 10米
+        this
+      )
+      
+      // 立即获取最后已知位置
+      val lastLocation = locationManager?.getLastKnownLocation(provider)
+      if (lastLocation != null) {
+        android.util.Log.d("UIManager", "📍 获取到最后已知位置: ${lastLocation.latitude}, ${lastLocation.longitude}")
+        onLocationChanged(lastLocation)
+      } else {
+        android.util.Log.d("UIManager", "⏳ 等待首次定位...")
+      }
+      
+    } catch (e: SecurityException) {
+      android.util.Log.e("UIManager", "❌ 定位权限未授予: ${e.message}")
+    } catch (e: Exception) {
+      android.util.Log.e("UIManager", "❌ 启动定位失败: ${e.message}", e)
     }
   }
   
+  /**
+   * 停止系统定位
+   */
+  private fun stopRealLocation() {
+    try {
+      locationManager?.removeUpdates(this)
+      android.util.Log.d("UIManager", "🛑 已停止系统定位")
+    } catch (e: Exception) {
+      android.util.Log.e("UIManager", "停止定位失败: ${e.message}")
+    }
+  }
+  
+  /**
+   * 位置变化回调
+   */
+  override fun onLocationChanged(location: Location) {
+    android.util.Log.d("UIManager", "📍📍📍 系统定位回调: lat=${location.latitude}, lng=${location.longitude}, accuracy=${location.accuracy}m")
+    
+    // 通知高德地图
+    locationChangedListener?.onLocationChanged(location)
+    
+    // 通知 React Native
+    onLocationChanged?.invoke(
+      location.latitude,
+      location.longitude,
+      location.accuracy
+    )
+  }
+  
+  override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {
+    android.util.Log.d("UIManager", "定位状态变化: provider=$provider, status=$status")
+  }
+  
+  override fun onProviderEnabled(provider: String) {
+    android.util.Log.d("UIManager", "✅ 定位提供者已启用: $provider")
+  }
+  
+  override fun onProviderDisabled(provider: String) {
+    android.util.Log.d("UIManager", "❌ 定位提供者已禁用: $provider")
+  }
+  
   /**
    * 设置用户位置样式
    * 统一 iOS 和 Android 的 API
    */
   fun setUserLocationRepresentation(config: Map<String, Any>) {
+    android.util.Log.d("UIManager", "🎨 setUserLocationRepresentation 被调用，配置: $config")
+    
     if (currentLocationStyle == null) {
-      currentLocationStyle = MyLocationStyle()
+      currentLocationStyle = MyLocationStyle().apply {
+        myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE)
+        interval(2000)
+        showMyLocation(true)
+      }
+      android.util.Log.d("UIManager", "创建新的 MyLocationStyle")
     }
     
     val style = currentLocationStyle!!
     
-    // 精度圈边线颜色 (strokeColor)
-    config["strokeColor"]?.let {
-      style.strokeColor(ColorParser.parseColor(it))
-    }
-    
-    // 精度圈填充颜色 (fillColor)
-    config["fillColor"]?.let {
-      style.radiusFillColor(ColorParser.parseColor(it))
-    }
-    
-    // 精度圈边线宽度 (lineWidth)
-    (config["lineWidth"] as? Number)?.let {
-      style.strokeWidth(it.toFloat())
-    }
-    
-    // 是否显示精度圈 (showsAccuracyRing)
-    (config["showsAccuracyRing"] as? Boolean)?.let { showRing ->
-      if (!showRing) {
-        // 不显示精度圈，但要显示蓝点
-        style.radiusFillColor(android.graphics.Color.TRANSPARENT)
-        style.strokeColor(android.graphics.Color.TRANSPARENT)
+    // 是否显示精度圈 (showsAccuracyRing) - 先处理这个，设置默认值
+    val showsAccuracyRing = config["showsAccuracyRing"] as? Boolean ?: true
+    if (!showsAccuracyRing) {
+      // 不显示精度圈 - 设置透明色
+      style.radiusFillColor(android.graphics.Color.TRANSPARENT)
+      style.strokeColor(android.graphics.Color.TRANSPARENT)
+      style.strokeWidth(0f)
+    } else {
+      // 显示精度圈 - 使用自定义颜色或默认值
+      
+      // 精度圈填充颜色 (fillColor)
+      config["fillColor"]?.let {
+        style.radiusFillColor(ColorParser.parseColor(it))
+      }
+      
+      // 精度圈边线颜色 (strokeColor)
+      config["strokeColor"]?.let {
+        style.strokeColor(ColorParser.parseColor(it))
+      }
+      
+      // 精度圈边线宽度 (lineWidth)
+      (config["lineWidth"] as? Number)?.let {
+        style.strokeWidth(it.toFloat())
       }
     }
     
     // 自定义图标 (image)
-    (config["image"] as? String)?.let { imagePath ->
+    val imagePath = config["image"] as? String
+    if (imagePath != null && imagePath.isNotEmpty()) {
+      android.util.Log.d("UIManager", "开始加载自定义定位图标: $imagePath")
       
       // 将 dp 转换为 px (与 iOS points 对应)
       val density = context.resources.displayMetrics.density
       val imageWidth = (config["imageWidth"] as? Number)?.let { (it.toFloat() * density).toInt() }
       val imageHeight = (config["imageHeight"] as? Number)?.let { (it.toFloat() * density).toInt() }
       
+      android.util.Log.d("UIManager", "图标尺寸: width=$imageWidth, height=$imageHeight, density=$density")
+      
       // 网络图片需要在后台线程加载
       if (imagePath.startsWith("http://") || imagePath.startsWith("https://")) {
         Thread {
           try {
             val originalBitmap = BitmapFactory.decodeStream(URL(imagePath).openStream())
             android.os.Handler(android.os.Looper.getMainLooper()).post {
-              originalBitmap?.let { bitmap ->
+              if (originalBitmap != null) {
                 val scaledBitmap = if (imageWidth != null && imageHeight != null) {
-                  android.graphics.Bitmap.createScaledBitmap(bitmap, imageWidth, imageHeight, true)
-                } else bitmap
+                  android.graphics.Bitmap.createScaledBitmap(originalBitmap, imageWidth, imageHeight, true)
+                } else originalBitmap
                 
+                android.util.Log.d("UIManager", "✅ 网络图片加载成功 (${scaledBitmap.width}x${scaledBitmap.height})，应用到定位样式")
                 style.myLocationIcon(BitmapDescriptorFactory.fromBitmap(scaledBitmap))
+                
+                // 重新应用样式并确保定位开启
                 aMap.myLocationStyle = style
-              } ?: android.util.Log.e("UIManager", "网络图片加载失败")
+                
+                // 如果定位没开，重新开启
+                if (!aMap.isMyLocationEnabled) {
+                  android.util.Log.d("UIManager", "⚠️ 定位未启用，重新启用")
+                  aMap.isMyLocationEnabled = true
+                }
+                
+                android.util.Log.d("UIManager", "✅ 定位样式重新应用完成，定位状态: ${aMap.isMyLocationEnabled}")
+              } else {
+                android.util.Log.e("UIManager", "❌ 网络图片加载失败: bitmap is null")
+              }
             }
           } catch (e: Exception) {
-            android.util.Log.e("UIManager", "加载网络图片异常", e)
+            android.util.Log.e("UIManager", "❌ 加载网络图片异常: ${e.message}", e)
           }
         }.start()
+        return // 异步加载，提前返回
       } else {
-        // 本地图片也在后台线程加载,避免阻塞主线程
+        // 本地图片在后台线程加载
         Thread {
           try {
             val originalBitmap = when {
               imagePath.startsWith("file://") -> {
+                android.util.Log.d("UIManager", "加载文件路径图片: ${imagePath.substring(7)}")
                 BitmapFactory.decodeFile(imagePath.substring(7))
               }
               else -> {
+                // 尝试从资源加载
+                val fileName = imagePath.substringBeforeLast('.')
+                android.util.Log.d("UIManager", "尝试从资源加载: $fileName")
                 val resId = context.resources.getIdentifier(
-                  imagePath.substringBeforeLast('.'),
+                  fileName,
                   "drawable",
                   context.packageName
                 )
+                android.util.Log.d("UIManager", "资源 ID: $resId")
                 if (resId != 0) {
                   BitmapFactory.decodeResource(context.resources, resId)
-                } else null
+                } else {
+                  // 尝试直接作为文件路径
+                  android.util.Log.d("UIManager", "尝试作为文件路径加载: $imagePath")
+                  BitmapFactory.decodeFile(imagePath)
+                }
               }
             }
             
             android.os.Handler(android.os.Looper.getMainLooper()).post {
-              originalBitmap?.let { bitmap ->
+              if (originalBitmap != null) {
                 val scaledBitmap = if (imageWidth != null && imageHeight != null) {
-                  android.graphics.Bitmap.createScaledBitmap(bitmap, imageWidth, imageHeight, true)
-                } else bitmap
+                  android.graphics.Bitmap.createScaledBitmap(originalBitmap, imageWidth, imageHeight, true)
+                } else originalBitmap
                 
+                android.util.Log.d("UIManager", "✅ 本地图片加载成功 (${scaledBitmap.width}x${scaledBitmap.height})，应用到定位样式")
                 style.myLocationIcon(BitmapDescriptorFactory.fromBitmap(scaledBitmap))
+                
+                // 重新应用样式并确保定位开启
                 aMap.myLocationStyle = style
-              } ?: android.util.Log.e("UIManager", "本地图片加载失败")
+                
+                // 如果定位没开，重新开启
+                if (!aMap.isMyLocationEnabled) {
+                  android.util.Log.d("UIManager", "⚠️ 定位未启用，重新启用")
+                  aMap.isMyLocationEnabled = true
+                }
+                
+                android.util.Log.d("UIManager", "✅ 定位样式重新应用完成，定位状态: ${aMap.isMyLocationEnabled}")
+              } else {
+                android.util.Log.e("UIManager", "❌ 本地图片加载失败: bitmap is null, path=$imagePath")
+              }
             }
           } catch (e: Exception) {
-            android.util.Log.e("UIManager", "加载本地图片异常", e)
+            android.util.Log.e("UIManager", "❌ 加载本地图片异常: ${e.message}", e)
           }
         }.start()
+        return // 异步加载，提前返回
       }
+    } else {
+      // 没有自定义图标，使用默认蓝点
+      android.util.Log.d("UIManager", "使用默认定位图标（蓝点）")
     }
     
+    // 立即应用样式（针对没有自定义图标的情况）
     aMap.myLocationStyle = style
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "一个功能完整的高德地图 React Native 组件库，基于 Expo Modules 开发，提供地图显示、定位、覆盖物等功能。",
   "main": "build/index.js",
   "types": "build/index.d.ts",