expo-gaode-map 2.0.0-alpha.2 → 2.0.0-alpha.4

package/README.md

@@ -372,7 +372,7 @@ export default function LocationApp() {
     ExpoGaodeMapModule.setInterval(2000);               // 2秒更新一次
 
     // 监听位置更新
-    const subscription = ExpoGaodeMapModule.addListener('onLocationUpdate', (loc) => {
+    const subscription = ExpoGaodeMapModule.addLocationListener('onLocationUpdate', (loc) => {
       console.log('位置更新:', loc);
       setLocation(loc);
     });

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

@@ -2,7 +2,6 @@ package expo.modules.gaodemap
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.util.Log
 import android.view.View
 import com.amap.api.maps.AMap
 import com.amap.api.maps.MapView
@@ -34,15 +33,11 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     override fun requestLayout() {
         try {
             super.requestLayout()
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             // 忽略异常
         }
     }
 
-    companion object {
-        private const val TAG = "ExpoGaodeMapView"
-    }
-
     // Props 存储
     /** 地图类型 */
     internal var mapType: Int = 0
@@ -122,7 +117,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
                 onLoad(mapOf("loaded" to true))
             }
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             // 初始化失败，静默处理
         }
     }
@@ -438,7 +433,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
             return
         }
 
-        if (child is com.amap.api.maps.MapView) {
+        if (child is MapView) {
             super.addView(child, index)
             return
         }
@@ -469,7 +464,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
         try {
             super.removeView(child)
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             // 忽略异常
         }
     }
@@ -481,7 +476,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
         try {
             val child = super.getChildAt(index)
 
-            if (child is com.amap.api.maps.MapView) {
+            if (child is MapView) {
                 return
             }
 
@@ -491,7 +486,7 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
 
             super.removeViewAt(index)
 
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             // 忽略异常
         }
     }

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

@@ -14,7 +14,7 @@ class ExpoGaodeMapViewModule : Module() {
       Events("onMapPress", "onMapLongPress", "onLoad", "onLocation", "onCameraMove", "onCameraIdle")
       
       // ✅ 关键修复：拦截 React Native 的视图操作异常
-      OnViewDestroys { view: ExpoGaodeMapView ->
+      OnViewDestroys { _: ExpoGaodeMapView ->
       }
 
       Prop<Int>("mapType") { view, type ->

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

@@ -4,15 +4,14 @@ 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
 import com.amap.api.maps.model.MyLocationStyle
 import expo.modules.gaodemap.utils.ColorParser
-import java.io.File
 import java.net.URL
+import androidx.core.graphics.scale
 
 /**
  * UI 和手势管理器
@@ -22,7 +21,6 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
   
   var onLocationChanged: ((latitude: Double, longitude: Double, accuracy: Float) -> Unit)? = null
   
-  private var locationManager: AndroidLocationManager? = null
   private var locationChangedListener: LocationSource.OnLocationChangedListener? = null
   
   // ==================== 控件显示 ====================
@@ -134,61 +132,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
     }
   }
   
-  /**
-   * 启动真实的系统定位
-   */
-  private fun startRealLocation() {
-    try {
-      if (locationManager == null) {
-        locationManager = context.getSystemService(Context.LOCATION_SERVICE) as AndroidLocationManager
-      }
-      
-      val providers = locationManager?.getProviders(true) ?: emptyList()
-      
-      val provider = when {
-        providers.contains(AndroidLocationManager.GPS_PROVIDER) -> {
-          AndroidLocationManager.GPS_PROVIDER
-        }
-        providers.contains(AndroidLocationManager.NETWORK_PROVIDER) -> {
-          AndroidLocationManager.NETWORK_PROVIDER
-        }
-        else -> {
-          return
-        }
-      }
-      
-      // 请求位置更新
-      locationManager?.requestLocationUpdates(
-        provider,
-        2000L,  // 最小时间间隔 2秒
-        10f,    // 最小距离变化 10米
-        this
-      )
-      
-      // 立即获取最后已知位置
-      val lastLocation = locationManager?.getLastKnownLocation(provider)
-      if (lastLocation != null) {
-        onLocationChanged(lastLocation)
-      }
-      
-    } catch (e: SecurityException) {
-      // 忽略异常
-    } catch (e: Exception) {
-      // 忽略异常
-    }
-  }
-  
-  /**
-   * 停止系统定位
-   */
-  private fun stopRealLocation() {
-    try {
-      locationManager?.removeUpdates(this)
-    } catch (e: Exception) {
-      // 忽略异常
-    }
-  }
-  
+
   /**
    * 位置变化回调
    */
@@ -268,7 +212,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
             android.os.Handler(android.os.Looper.getMainLooper()).post {
               if (originalBitmap != null) {
                 val scaledBitmap = if (imageWidth != null && imageHeight != null) {
-                  android.graphics.Bitmap.createScaledBitmap(originalBitmap, imageWidth, imageHeight, true)
+                    originalBitmap.scale(imageWidth, imageHeight)
                 } else originalBitmap
                 
                 style.myLocationIcon(BitmapDescriptorFactory.fromBitmap(scaledBitmap))
@@ -282,7 +226,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
                 }
               }
             }
-          } catch (e: Exception) {
+          } catch (_: Exception) {
             // 忽略异常
           }
         }.start()
@@ -313,7 +257,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
             android.os.Handler(android.os.Looper.getMainLooper()).post {
               if (originalBitmap != null) {
                 val scaledBitmap = if (imageWidth != null && imageHeight != null) {
-                  android.graphics.Bitmap.createScaledBitmap(originalBitmap, imageWidth, imageHeight, true)
+                    originalBitmap.scale(imageWidth, imageHeight)
                 } else originalBitmap
                 
                 style.myLocationIcon(BitmapDescriptorFactory.fromBitmap(scaledBitmap))
@@ -327,7 +271,7 @@ class UIManager(private val aMap: AMap, private val context: Context) : Location
                 }
               }
             }
-          } catch (e: Exception) {
+          } catch (_: Exception) {
             // 忽略异常
           }
         }.start()

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

@@ -18,9 +18,7 @@ import expo.modules.gaodemap.services.LocationForegroundService
  * - 定位结果回调
  */
 class LocationManager(context: Context) {
-    companion object {
-        private const val TAG = "LocationManager"
-    }
+
 
     /** 应用上下文(避免 Activity 泄露) */
     private val appContext: Context = context.applicationContext

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

@@ -1,7 +1,6 @@
 package expo.modules.gaodemap.modules
 
 import android.content.Context
-import android.util.Log
 import com.amap.api.location.AMapLocationClient
 import com.amap.api.maps.MapsInitializer
 
@@ -15,7 +14,7 @@ import com.amap.api.maps.MapsInitializer
  * - 获取 SDK 版本信息
  */
 object SDKInitializer {
-    private const val TAG = "SDKInitializer"
+
 
     /**
      * 初始化高德地图和定位 SDK

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

@@ -154,8 +154,16 @@ class CircleView(context: Context, appContext: AppContext) : ExpoView(context, a
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    removeCircle()
-    aMap = null
+    // 🔑 关键修复：使用 post 延迟检查，避免 TabView 切换时误删
+    // 如果是真正的移除，parent 会保持为 null
+    // 如果只是 TabView 切换，parent 会在短时间内恢复
+    post {
+      // 延迟后再次检查 parent，如果仍然为 null，说明是真正的移除
+      if (parent == null) {
+        removeCircle()
+        aMap = null
+      }
+    }
   }
 
 }

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

@@ -128,7 +128,12 @@ class ClusterView(context: Context, appContext: AppContext) : ExpoView(context,
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    removeCluster()
-    aMap = null
+    // 🔑 关键修复：使用 post 延迟检查
+    post {
+      if (parent == null) {
+        removeCluster()
+        aMap = null
+      }
+    }
   }
 }

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

@@ -94,7 +94,12 @@ class HeatMapView(context: Context, appContext: AppContext) : ExpoView(context,
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    removeHeatMap()
-    aMap = null
+    // 🔑 关键修复：使用 post 延迟检查
+    post {
+      if (parent == null) {
+        removeHeatMap()
+        aMap = null
+      }
+    }
   }
 }