expo-gaode-map 2.0.0-alpha.3 → 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
+      }
+    }
   }
 }

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

@@ -19,11 +19,16 @@ import com.amap.api.maps.model.MarkerOptions
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
-import java.io.File
 import java.io.InputStream
 import java.net.HttpURLConnection
 import java.net.URL
 import kotlin.concurrent.thread
+import androidx.core.view.isNotEmpty
+import androidx.core.view.contains
+import androidx.core.graphics.createBitmap
+import androidx.core.view.isEmpty
+import androidx.core.graphics.toColorInt
+import androidx.core.graphics.scale
 
 class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
@@ -35,24 +40,24 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     orientation = HORIZONTAL
   }
   
-  override fun generateDefaultLayoutParams(): android.widget.LinearLayout.LayoutParams {
-    return android.widget.LinearLayout.LayoutParams(
-      android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
-      android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+  override fun generateDefaultLayoutParams(): LayoutParams {
+    return LayoutParams(
+      LayoutParams.WRAP_CONTENT,
+      LayoutParams.WRAP_CONTENT
     )
   }
   
-  override fun generateLayoutParams(attrs: android.util.AttributeSet?): android.widget.LinearLayout.LayoutParams {
-    return android.widget.LinearLayout.LayoutParams(context, attrs)
+  override fun generateLayoutParams(attrs: android.util.AttributeSet?): LayoutParams {
+    return LayoutParams(context, attrs)
   }
   
-  override fun generateLayoutParams(lp: android.view.ViewGroup.LayoutParams?): android.widget.LinearLayout.LayoutParams {
+  override fun generateLayoutParams(lp: android.view.ViewGroup.LayoutParams?): LayoutParams {
     return when (lp) {
-      is android.widget.LinearLayout.LayoutParams -> lp
-      is android.view.ViewGroup.MarginLayoutParams -> android.widget.LinearLayout.LayoutParams(lp)
-      else -> android.widget.LinearLayout.LayoutParams(
-        lp?.width ?: android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
-        lp?.height ?: android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+      is LayoutParams -> lp
+      is MarginLayoutParams -> android.widget.LinearLayout.LayoutParams(lp)
+      else -> LayoutParams(
+        lp?.width ?: LayoutParams.WRAP_CONTENT,
+        lp?.height ?: LayoutParams.WRAP_CONTENT
       )
     }
   }
@@ -61,15 +66,16 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     return p is android.widget.LinearLayout.LayoutParams
   }
   
+  @SuppressLint("DrawAllocation")
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     val selfParams = this.layoutParams
-    if (selfParams == null || selfParams !is android.widget.LinearLayout.LayoutParams) {
+    if (selfParams == null || selfParams !is LayoutParams) {
       val width = if (customViewWidth > 0) {
         customViewWidth
       } else if (selfParams != null && selfParams.width > 0) {
         selfParams.width
       } else {
-        android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+        LayoutParams.WRAP_CONTENT
       }
       
       val height = if (customViewHeight > 0) {
@@ -77,19 +83,19 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       } else if (selfParams != null && selfParams.height > 0) {
         selfParams.height
       } else {
-        android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+        LayoutParams.WRAP_CONTENT
       }
       
-      this.layoutParams = android.widget.LinearLayout.LayoutParams(width, height)
+      this.layoutParams = LayoutParams(width, height)
     }
     
     for (i in 0 until childCount) {
       val child = getChildAt(i)
       val params = child.layoutParams
-      if (params == null || params !is android.widget.LinearLayout.LayoutParams) {
-        child.layoutParams = android.widget.LinearLayout.LayoutParams(
-          params?.width ?: android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
-          params?.height ?: android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+      if (params == null || params !is LayoutParams) {
+        child.layoutParams = LayoutParams(
+          params?.width ?: LayoutParams.WRAP_CONTENT,
+          params?.height ?: LayoutParams.WRAP_CONTENT
         )
       }
     }
@@ -142,7 +148,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       pendingPosition = null
     }
     
-    if (childCount > 0 && marker != null) {
+    if (isNotEmpty() && marker != null) {
       mainHandler.postDelayed({
         updateMarkerIcon()
       }, 100)
@@ -166,7 +172,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       pendingLongitude?.let { lng ->
         updatePosition(lat, lng)
       }
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       // 忽略异常
     }
   }
@@ -184,7 +190,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       pendingLatitude?.let { lat ->
         updatePosition(lat, lng)
       }
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       // 忽略异常
     }
   }
@@ -211,33 +217,12 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
           pendingPosition = latLng
         }
       }
-    } catch (e: Exception) {
-      // 忽略异常
-    }
-  }
-  
-  /**
-   * 设置标记位置（兼容旧的 API）
-   */
-  fun setPosition(position: Map<String, Double>) {
-    try {
-      val lat = position["latitude"]
-      val lng = position["longitude"]
-      
-      if (lat == null || lng == null) {
-        return
-      }
-      
-      if (lat < -90 || lat > 90 || lng < -180 || lng > 180) {
-        return
-      }
-      
-      updatePosition(lat, lng)
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       // 忽略异常
     }
   }
   
+
   /**
    * 设置标题
    */
@@ -274,19 +259,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     marker?.let { it.isDraggable = draggable }
   }
   
-  /**
-   * 设置是否显示信息窗口
-   */
-  fun setShowsInfoWindow(show: Boolean) {
-    marker?.let {
-      if (show) {
-        it.showInfoWindow()
-      } else {
-        it.hideInfoWindow()
-      }
-    }
-  }
-  
+
   /**
    * 设置透明度
    */
@@ -294,14 +267,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     pendingOpacity = opacity
     marker?.let { it.alpha = opacity }
   }
-  
-  /**
-   * 设置旋转角度
-   */
-  fun setMarkerRotation(rotation: Float) {
-    marker?.let { it.rotateAngle = rotation }
-  }
-  
+
   /**
    * 设置锚点
    */
@@ -385,7 +351,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
           }
         }
       }
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       marker.setIcon(BitmapDescriptorFactory.defaultMarker())
     }
   }
@@ -412,7 +378,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         } else {
           callback(null)
         }
-      } catch (e: Exception) {
+      } catch (_: Exception) {
         callback(null)
       } finally {
         inputStream?.close()
@@ -432,7 +398,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     return if (bitmap.width == finalWidth && bitmap.height == finalHeight) {
       bitmap
     } else {
-      Bitmap.createScaledBitmap(bitmap, finalWidth, finalHeight, true)
+        bitmap.scale(finalWidth, finalHeight)
     }
   }
   
@@ -442,7 +408,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   fun setPinColor(color: String?) {
     pendingPinColor = color
     // 颜色变化时需要重新创建 marker
-    aMap?.let { map ->
+    aMap?.let { _ ->
       marker?.let { oldMarker ->
         val position = oldMarker.position
         oldMarker.remove()
@@ -473,7 +439,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         else -> BitmapDescriptorFactory.HUE_RED
       }
       marker.setIcon(BitmapDescriptorFactory.defaultMarker(hue))
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       // 忽略异常
     }
   }
@@ -543,8 +509,9 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
           "latitude" to marker.position.latitude,
           "longitude" to marker.position.longitude
         ))
-        // 显示信息窗口（如果有 title 或 snippet）
-        if (!marker.title.isNullOrEmpty() || !marker.snippet.isNullOrEmpty()) {
+        // 只有在没有自定义内容（children）且有 title 或 snippet 时才显示信息窗口
+        // 如果有自定义内容，说明用户已经自定义了显示内容，不需要默认信息窗口
+        if (view.isEmpty() && (!marker.title.isNullOrEmpty() || !marker.snippet.isNullOrEmpty())) {
           marker.showInfoWindow()
         }
         return true
@@ -553,30 +520,24 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     }
     
     fun handleMarkerDragStart(marker: Marker) {
-      markerViewMap[marker]?.let { view ->
-        view.onMarkerDragStart(mapOf(
-          "latitude" to marker.position.latitude,
-          "longitude" to marker.position.longitude
+        markerViewMap[marker]?.onMarkerDragStart(mapOf(
+            "latitude" to marker.position.latitude,
+            "longitude" to marker.position.longitude
         ))
-      }
     }
     
     fun handleMarkerDrag(marker: Marker) {
-      markerViewMap[marker]?.let { view ->
-        view.onMarkerDrag(mapOf(
-          "latitude" to marker.position.latitude,
-          "longitude" to marker.position.longitude
+        markerViewMap[marker]?.onMarkerDrag(mapOf(
+            "latitude" to marker.position.latitude,
+            "longitude" to marker.position.longitude
         ))
-      }
     }
     
     fun handleMarkerDragEnd(marker: Marker) {
-      markerViewMap[marker]?.let { view ->
-        view.onMarkerDragEnd(mapOf(
-          "latitude" to marker.position.latitude,
-          "longitude" to marker.position.longitude
+        markerViewMap[marker]?.onMarkerDragEnd(mapOf(
+            "latitude" to marker.position.latitude,
+            "longitude" to marker.position.longitude
         ))
-      }
     }
   }
   
@@ -603,7 +564,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
           pendingAnchor?.let { m.setAnchor(it.first, it.second) }
           
           // 优先级：children > icon > pinColor
-          if (childCount == 0) {
+          if (isEmpty()) {
             if (pendingIconUri != null) {
               loadAndSetIcon(pendingIconUri!!, m)
             } else if (pendingPinColor != null) {
@@ -621,11 +582,11 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   private fun createDefaultMarkerBitmap(): Bitmap {
     val width = 48
     val height = 72
-    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+    val bitmap = createBitmap(width, height)
     val canvas = Canvas(bitmap)
     
     val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-    paint.color = Color.parseColor("#FF5252")
+    paint.color = "#FF5252".toColorInt()
     paint.style = Paint.Style.FILL
     
     // 绘制圆形顶部
@@ -652,7 +613,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
    * 将视图转换为 Bitmap
    */
   private fun createBitmapFromView(): Bitmap? {
-    if (childCount == 0) return null
+    if (isEmpty()) return null
     
     return try {
       val childView = getChildAt(0)
@@ -661,10 +622,8 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       
       val finalWidth = if (measuredWidth > 0) measuredWidth else (if (customViewWidth > 0) customViewWidth else 240)
       val finalHeight = if (measuredHeight > 0) measuredHeight else (if (customViewHeight > 0) customViewHeight else 80)
-      
-      if (finalWidth <= 0 || finalHeight <= 0) return null
-      
-      if (measuredWidth != finalWidth || measuredHeight != finalHeight) {
+
+        if (measuredWidth != finalWidth || measuredHeight != finalHeight) {
         childView.measure(
           MeasureSpec.makeMeasureSpec(finalWidth, MeasureSpec.EXACTLY),
           MeasureSpec.makeMeasureSpec(finalHeight, MeasureSpec.EXACTLY)
@@ -672,13 +631,13 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         childView.layout(0, 0, finalWidth, finalHeight)
       }
       
-      val bitmap = Bitmap.createBitmap(finalWidth, finalHeight, Bitmap.Config.ARGB_8888)
+      val bitmap = createBitmap(finalWidth, finalHeight)
       val canvas = Canvas(bitmap)
-      canvas.drawColor(android.graphics.Color.TRANSPARENT)
+      canvas.drawColor(Color.TRANSPARENT)
       childView.draw(canvas)
       
       bitmap
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       null
     }
   }
@@ -710,7 +669,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
    * 更新 marker 图标
    */
   private fun updateMarkerIcon() {
-    if (childCount > 0) {
+    if (isNotEmpty()) {
       val customBitmap = createBitmapFromView()
       customBitmap?.let {
         marker?.setIcon(BitmapDescriptorFactory.fromBitmap(it))
@@ -727,25 +686,25 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   
   override fun removeView(child: View?) {
     try {
-      if (child != null && indexOfChild(child) >= 0) {
+      if (child != null && contains(child)) {
         super.removeView(child)
         // 不要在这里恢复默认图标
         // 如果 MarkerView 整体要被移除，onDetachedFromWindow 会处理
         // 如果只是移除 children 并保留 Marker，应该由外部重新设置 children
       }
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       // 忽略异常
     }
   }
   
   override fun removeViewAt(index: Int) {
     try {
-      if (index >= 0 && index < childCount) {
+      if (index in 0..<childCount) {
         super.removeViewAt(index)
         // 只在还有子视图时更新图标
         if (!isRemoving && childCount > 1 && marker != null) {
           mainHandler.postDelayed({
-            if (!isRemoving && marker != null && childCount > 0) {
+            if (!isRemoving && marker != null && isNotEmpty()) {
               updateMarkerIcon()
             }
           }, 50)
@@ -753,7 +712,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         // 如果最后一个子视图被移除，什么都不做
         // 让 onDetachedFromWindow 处理完整的清理
       }
-    } catch (e: Exception) {
+    } catch (_: Exception) {
       // 忽略异常
     }
   }
@@ -765,8 +724,8 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
       for (i in 0 until view.childCount) {
         val child = view.getChildAt(i)
         val currentParams = child.layoutParams
-        if (currentParams != null && currentParams !is android.widget.LinearLayout.LayoutParams) {
-          child.layoutParams = android.widget.LinearLayout.LayoutParams(
+        if (currentParams != null && currentParams !is LayoutParams) {
+          child.layoutParams = LayoutParams(
             currentParams.width,
             currentParams.height
           )
@@ -781,19 +740,19 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     // 🔑 关键修复：记录添加前的子视图数量
     val childCountBefore = childCount
     
-    val finalParams = android.widget.LinearLayout.LayoutParams(
-      if (customViewWidth > 0) customViewWidth else android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
-      if (customViewHeight > 0) customViewHeight else android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+    val finalParams = LayoutParams(
+      if (customViewWidth > 0) customViewWidth else LayoutParams.WRAP_CONTENT,
+      if (customViewHeight > 0) customViewHeight else LayoutParams.WRAP_CONTENT
     )
     
     super.addView(child, index, finalParams)
     
     child?.let {
       val childParams = it.layoutParams
-      if (childParams !is android.widget.LinearLayout.LayoutParams) {
-        it.layoutParams = android.widget.LinearLayout.LayoutParams(
-          childParams?.width ?: android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
-          childParams?.height ?: android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+      if (childParams !is LayoutParams) {
+        it.layoutParams = LayoutParams(
+          childParams?.width ?: LayoutParams.WRAP_CONTENT,
+          childParams?.height ?: LayoutParams.WRAP_CONTENT
         )
       }
       fixChildLayoutParams(it)
@@ -819,7 +778,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
     // 🔑 关键修复：只有在有子视图且 marker 存在时才更新，避免不必要的刷新
-    if (changed && !isRemoving && childCount > 0 && marker != null) {
+    if (changed && !isRemoving && isNotEmpty() && marker != null) {
       mainHandler.postDelayed({
         if (!isRemoving && marker != null) {
           updateMarkerIcon()
@@ -842,14 +801,19 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     
-    // 标记正在移除
-    isRemoving = true
-    
+    // 🔑 关键修复：使用 post 延迟检查
     // 清理所有延迟任务
     mainHandler.removeCallbacksAndMessages(null)
     
-    // 移除 marker
-    removeMarker()
+    // 延迟检查 parent 状态
+    mainHandler.post {
+      if (parent == null) {
+        // 标记正在移除
+        isRemoving = true
+        // 移除 marker
+        removeMarker()
+      }
+    }
   }
 }
 

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

@@ -9,13 +9,12 @@ import com.amap.api.maps.model.MultiPointItem
 import com.amap.api.maps.model.MultiPointOverlay
 import com.amap.api.maps.model.MultiPointOverlayOptions
 import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.viewevent.EventDispatcher
+
 import expo.modules.kotlin.views.ExpoView
 
 class MultiPointView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
   
-  private val onPress by EventDispatcher()
-  
+
   private var multiPointOverlay: MultiPointOverlay? = null
   private var aMap: AMap? = null
   private var points: MutableList<MultiPointItem> = mutableListOf()
@@ -52,6 +51,7 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
    * 设置图标
    */
   fun setIcon(iconUri: String?) {
+
     // 简化处理，实际需要实现图片加载
     createOrUpdateMultiPoint()
   }
@@ -100,7 +100,12 @@ class MultiPointView(context: Context, appContext: AppContext) : ExpoView(contex
   
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    removeMultiPoint()
-    aMap = null
+    // 🔑 关键修复：使用 post 延迟检查
+    post {
+      if (parent == null) {
+        removeMultiPoint()
+        aMap = null
+      }
+    }
   }
 }

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

@@ -16,6 +16,14 @@ class MultiPointViewModule : Module() {
       Prop<List<Map<String, Any>>>("points") { view: MultiPointView, points ->
         view.setPoints(points)
       }
+
+        Prop<String>("icon") { view: MultiPointView, icon ->
+        view.setIcon(icon)
+      }
+
+        Prop<Map<String, Float>>("anchor"){ view: MultiPointView, anchor ->
+            view.setAnchor(anchor)
+        }
     }
   }
 }

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

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

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

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

package/android/src/main/java/expo/modules/gaodemap/services/LocationForegroundService.kt

@@ -3,7 +3,6 @@ package expo.modules.gaodemap.services
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
@@ -60,7 +59,7 @@ class LocationForegroundService : Service() {
                 setShowBadge(false)
             }
             
-            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val manager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
             manager.createNotificationChannel(channel)
         }
     }

package/android/src/main/java/expo/modules/gaodemap/utils/ColorParser.kt

@@ -1,6 +1,7 @@
 package expo.modules.gaodemap.utils
 
 import android.graphics.Color
+import androidx.core.graphics.toColorInt
 
 object ColorParser {
     /**
@@ -22,12 +23,12 @@ object ColorParser {
     private fun parseColorString(color: String): Int {
         return try {
             when {
-                color.startsWith("#") -> Color.parseColor(color)
+                color.startsWith("#") -> color.toColorInt()
                 color.startsWith("rgba(") -> parseRgbaColor(color)
                 color.startsWith("rgb(") -> parseRgbColor(color)
                 else -> getNamedColor(color)
             }
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             Color.BLACK
         }
     }

package/docs/API.md

@@ -264,12 +264,12 @@ ExpoGaodeMapModule.setDesiredAccuracy(3);           // iOS 精度级别
 import { ExpoGaodeMapModule } from 'expo-gaode-map';
 
 // 监听位置更新
-const locationSubscription = ExpoGaodeMapModule.addListener('onLocationUpdate', (location) => {
+const locationSubscription = ExpoGaodeMapModule.addLocationListener('onLocationUpdate', (location) => {
   console.log('位置更新:', location);
 });
 
 // 监听方向更新（iOS）
-const headingSubscription = ExpoGaodeMapModule.addListener('onHeadingUpdate', (heading) => {
+const headingSubscription = ExpoGaodeMapModule.onHeadingUpdate('onHeadingUpdate', (heading) => {
   console.log('方向更新:', heading);
 });
 

package/docs/EXAMPLES.md

@@ -286,7 +286,7 @@ export default function LocationApp() {
       ExpoGaodeMapModule.setInterval(2000);
 
       // 监听位置更新
-      const subscription = ExpoGaodeMapModule.addListener('onLocationUpdate', (loc) => {
+      const subscription = ExpoGaodeMapModule.addLocationListener('onLocationUpdate', (loc) => {
         console.log('位置更新:', loc);
         setLocation(loc);
       });
@@ -914,7 +914,7 @@ ExpoGaodeMapModule.startUpdatingHeading();
 ExpoGaodeMapModule.stopUpdatingHeading();
 
 // 监听方向更新
-const subscription = ExpoGaodeMapModule.addListener('onHeadingUpdate', (heading) => {
+const subscription = ExpoGaodeMapModule.onHeadingUpdate('onHeadingUpdate', (heading) => {
   console.log('方向更新:', heading);
 });
 

package/docs/MIGRATION.md

@@ -159,7 +159,7 @@ subscription.remove();
 ```typescript
 import { ExpoGaodeMapModule } from 'expo-gaode-map';
 
-const subscription = ExpoGaodeMapModule.addListener('onLocationUpdate', (location) => {
+const subscription = ExpoGaodeMapModule.addLocationListener('onLocationUpdate', (location) => {
   console.log('位置更新:', location);
 });
 
@@ -304,7 +304,7 @@ export default function App() {
       ExpoGaodeMapModule.setInterval(2000);
       
       // 监听
-      const sub = ExpoGaodeMapModule.addListener('onLocationUpdate', (loc) => {
+      const sub = ExpoGaodeMapModule.addLocationListener('onLocationUpdate', (loc) => {
         setLocation(loc);
       });
       
@@ -340,7 +340,7 @@ export default function App() {
 | `checkLocationPermission()` | `ExpoGaodeMapModule.checkLocationPermission()` | 检查权限 |
 | `requestLocationPermission()` | `ExpoGaodeMapModule.requestLocationPermission()` | 请求权限 |
 | `configure(options)` | 使用单独的配置方法 | 见下方详细说明 |
-| `addLocationListener()` | `ExpoGaodeMapModule.addListener('onLocationUpdate', ...)` | 位置监听 |
+| `addLocationListener()` | `ExpoGaodeMapModule.addLocationListener('onLocationUpdate', ...)` | 位置监听 |
 | `coordinateConvert()` | `ExpoGaodeMapModule.coordinateConvert()` | 坐标转换 |
 | `startUpdatingHeading()` | `ExpoGaodeMapModule.startUpdatingHeading()` | 开始方向更新 |
 | `stopUpdatingHeading()` | `ExpoGaodeMapModule.stopUpdatingHeading()` | 停止方向更新 |

package/ios/overlays/MarkerView.swift

@@ -192,7 +192,8 @@ class MarkerView: ExpoView {
             }
             
             annotationView?.annotation = annotation
-            annotationView?.canShowCallout = canShowCallout
+            // 🔑 关键修复：有自定义内容时不显示默认 callout（信息窗口）
+            annotationView?.canShowCallout = false
             annotationView?.isDraggable = draggable
             self.annotationView = annotationView
             
@@ -231,6 +232,7 @@ class MarkerView: ExpoView {
             }
             
             annotationView?.annotation = annotation
+            // 只有在没有自定义内容时才使用 canShowCallout 设置
             annotationView?.canShowCallout = canShowCallout
             annotationView?.isDraggable = draggable
             self.annotationView = annotationView

package/package.json

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