expo-gaode-map 2.2.41 → 2.2.42-next.0

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

@@ -224,7 +224,7 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
     private val mainHandler = Handler(Looper.getMainLooper())
     private var isRemoving = false  // 标记是否正在被移除
     private var pendingMarkerIconUpdate: Runnable? = null
-    private var pendingDetachRemovalTask: Runnable? = null
+    private var contentInvalidationGeneration: Long = 0
     private var lastAppliedCustomMarkerKey: String? = null
 
     // 缓存属性，在 marker 创建前保存
@@ -338,14 +338,9 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
 
       flushPendingShowIfNeeded()
       
-      // 🔑 修复：需要延迟更新图标，等待 children 完成布局
-      // 使用 post 延迟到下一帧，确保 children 完成测量和布局
+      // 等待 children 在同一渲染帧内稳定后再生成一次快照。
       if (isNotEmpty() && marker != null) {
-        mainHandler.post {
-          if (!isRemoving && marker != null && isNotEmpty()) {
-            updateMarkerIcon()
-          }
-        }
+        markCustomMarkerContentDirty()
       }
     }
 
@@ -484,9 +479,9 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         cacheKey = key
         if (isNotEmpty()) {
             // cacheKey 通常和 selected/zoom level 同帧变化。先淘汰当前 key 可能存在的旧截图，
-            // 再延后一帧重绘，避免切换选中态时命中 stale bitmap。
+            // 等待 children 完成当前帧的 props/layout 更新后再重绘。
             invalidateCurrentSnapshotCache()
-            markCustomMarkerContentDirty(32)
+            markCustomMarkerContentDirty()
         } else {
             pendingIconUri?.let { iconUri ->
                 marker?.let { loadAndSetIcon(iconUri, it) }
@@ -981,29 +976,54 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         marker?.let { showMarker(it) }
     }
 
-    private fun scheduleMarkerIconUpdate(delayMs: Long = 16L) {
+    private fun scheduleMarkerIconUpdateAfterContentSettles() {
         if (isRemoving || marker == null || isEmpty()) {
             return
         }
 
-        pendingMarkerIconUpdate?.let { mainHandler.removeCallbacks(it) }
-        val task = Runnable {
+        pendingMarkerIconUpdate?.let { removeCallbacks(it) }
+        val scheduledGeneration = contentInvalidationGeneration
+        val settleTask = Runnable {
             pendingMarkerIconUpdate = null
-            if (!isRemoving && marker != null && isNotEmpty()) {
-                updateMarkerIcon()
+            if (isRemoving || marker == null || isEmpty()) {
+                return@Runnable
+            }
+
+            if (scheduledGeneration != contentInvalidationGeneration) {
+                scheduleMarkerIconUpdateAfterContentSettles()
+                return@Runnable
             }
+
+            scheduleMarkerIconUpdateForStableGeneration(scheduledGeneration)
         }
-        pendingMarkerIconUpdate = task
+        pendingMarkerIconUpdate = settleTask
+        postOnAnimation(settleTask)
+    }
 
-        if (delayMs <= 0L) {
-            mainHandler.post(task)
-        } else {
-            mainHandler.postDelayed(task, delayMs)
+    private fun scheduleMarkerIconUpdateForStableGeneration(expectedGeneration: Long) {
+        if (isRemoving || marker == null || isEmpty()) {
+            return
+        }
+
+        val renderTask = Runnable {
+            pendingMarkerIconUpdate = null
+            if (isRemoving || marker == null || isEmpty()) {
+                return@Runnable
+            }
+
+            if (expectedGeneration != contentInvalidationGeneration) {
+                scheduleMarkerIconUpdateAfterContentSettles()
+                return@Runnable
+            }
+
+            updateMarkerIcon()
         }
+        pendingMarkerIconUpdate = renderTask
+        postOnAnimation(renderTask)
     }
 
     private fun cancelPendingMarkerIconUpdate() {
-        pendingMarkerIconUpdate?.let { mainHandler.removeCallbacks(it) }
+        pendingMarkerIconUpdate?.let { removeCallbacks(it) }
         pendingMarkerIconUpdate = null
     }
 
@@ -1022,17 +1042,19 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
         IconBitmapCache.remove(key)
     }
 
-    private fun markCustomMarkerContentDirty(delayMs: Long = 16L) {
+    private fun markCustomMarkerContentDirty() {
         if (isRemoving || isEmpty()) {
             return
         }
 
+        contentInvalidationGeneration += 1
+
         // children（尤其是 Image）异步加载完成后，需要强制淘汰当前 marker 已应用的位图缓存，
         // 否则同一个 cacheKey 会一直命中“占位态”的旧 bitmap，表现为灰块/蒙层不更新。
         // 这里仅清理当前 marker 已应用的 key，不会影响其它 marker。
         invalidateAppliedCustomMarkerCaches(clearGlobalCache = true)
         if (marker != null) {
-            scheduleMarkerIconUpdate(delayMs)
+            scheduleMarkerIconUpdateAfterContentSettles()
         }
     }
 
@@ -1043,8 +1065,8 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
             if (child != null && contains(child)) {
                 super.removeView(child)
                 // 不要在这里恢复默认图标
-                // 如果 MarkerView 整体要被移除，onDetachedFromWindow 会处理
-                // 如果只是移除 children 并保留 Marker，应该由外部重新设置 children
+                // 如果 MarkerView 整体被移除，父 MapView / OnViewDestroys 会清理原生 Marker。
+                // 如果只是替换 children，后续 add/layout invalidation 会生成新快照。
             }
         } catch (_: Exception) {
             // 忽略异常
@@ -1057,10 +1079,10 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
                 super.removeViewAt(index)
                 // 只在还有子视图时更新图标
                 if (!isRemoving && isNotEmpty() && marker != null) {
-                    markCustomMarkerContentDirty(50)
+                    markCustomMarkerContentDirty()
                 }
-                // 如果最后一个子视图被移除，什么都不做
-                // 让 onDetachedFromWindow 处理完整的清理
+                // 最后一个子视图被移除时保留 last-good 快照；新 child 加入后原子替换，
+                // MarkerView 真正销毁则由父 MapView / OnViewDestroys 负责清理。
             }
         } catch (_: Exception) {
             // 忽略异常
@@ -1344,8 +1366,8 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
      * 移除标记
      */
     fun removeMarker() {
-        cancelPendingDetachRemoval()
         cancelPendingMarkerIconUpdate()
+        contentInvalidationGeneration += 1
 
         // 停止平滑移动
         stopSmoothMove()
@@ -1361,44 +1383,18 @@ class MarkerView(context: Context, appContext: AppContext) : ExpoView(context, a
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        cancelPendingDetachRemoval()
         isRemoving = false
 
         if (isNotEmpty() && marker != null) {
-            scheduleMarkerIconUpdate(16)
+            markCustomMarkerContentDirty()
         }
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-
-        // 🔑 关键修复：使用 post 延迟检查
-        cancelPendingDetachRemoval()
-
-        // 延迟检查 parent 状态。React 更新 children 时可能会短暂 detach/attach，
-        // 过早删除会导致点击后其它 Marker 消失。
-        val task = Runnable {
-            pendingDetachRemovalTask = null
-            if (parent == null) {
-                // 标记正在移除
-                isRemoving = true
-                cancelPendingMarkerIconUpdate()
-
-                // 🔑 修复：不要清空全局缓存
-                // 理由：会影响其他 Marker 的性能
-                // 缓存应该由 LruCache 自动管理，或在合适的时机（如内存警告）统一清理
-
-                // 移除 marker
-                removeMarker()
-            }
-        }
-        pendingDetachRemovalTask = task
-        mainHandler.postDelayed(task, 500)
-    }
-
-    private fun cancelPendingDetachRemoval() {
-        pendingDetachRemovalTask?.let { mainHandler.removeCallbacks(it) }
-        pendingDetachRemovalTask = null
+        // Window detach 可能只是页面转场或 Fabric 重挂载，不代表 Marker 已销毁。
+        // 父 MapView 的 removeView/removeViewAt 与 OnViewDestroys 才负责真实清理。
+        cancelPendingMarkerIconUpdate()
     }
 
 }

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

@@ -12,6 +12,10 @@ class MarkerViewModule : Module() {
 
     View(MarkerView::class) {
       Events("onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd")
+
+      OnViewDestroys { view: MarkerView ->
+        view.removeMarker()
+      }
       
       // 纬度
       Prop<Double>("latitude") { view, lat ->

package/ios/ExpoGaodeMapView.swift

@@ -114,8 +114,6 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var overlayContainer: UIView!
     /// 显式跟踪所有覆盖物视图（新架构下 subviews 可能不可靠）
     private var overlayViews: [UIView] = []
-    /// MarkerView 短暂 detach 时延迟注销，避免 annotation 暂时找不到自定义 view 而回退默认样式
-    private var pendingMarkerOverlayUnregisterTasks: [ObjectIdentifier: DispatchWorkItem] = [:]
     
     // MARK: - 事件节流控制
     
@@ -253,7 +251,11 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     }
 
     private func registerOverlayView(_ view: UIView) {
-        cancelPendingMarkerOverlayUnregister(for: view)
+        if let markerView = view as? MarkerView {
+            markerView.onPermanentDetach = { [weak self] detachedMarkerView in
+                self?.unregisterOverlayView(detachedMarkerView)
+            }
+        }
 
         guard !overlayViews.contains(where: { $0 === view }) else {
             return
@@ -262,29 +264,8 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     }
 
     private func unregisterOverlayView(_ view: UIView) {
-        cancelPendingMarkerOverlayUnregister(for: view)
         overlayViews.removeAll { $0 === view }
-    }
-
-    private func scheduleMarkerOverlayUnregister(_ markerView: MarkerView) {
-        cancelPendingMarkerOverlayUnregister(for: markerView)
-
-        let identifier = ObjectIdentifier(markerView)
-        let task = DispatchWorkItem { [weak self, weak markerView] in
-            guard let self = self, let markerView = markerView else { return }
-            self.pendingMarkerOverlayUnregisterTasks[identifier] = nil
-            guard markerView.superview == nil else { return }
-            self.unregisterOverlayView(markerView)
-        }
-
-        pendingMarkerOverlayUnregisterTasks[identifier] = task
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.35, execute: task)
-    }
-
-    private func cancelPendingMarkerOverlayUnregister(for view: UIView) {
-        let identifier = ObjectIdentifier(view)
-        pendingMarkerOverlayUnregisterTasks[identifier]?.cancel()
-        pendingMarkerOverlayUnregisterTasks[identifier] = nil
+        (view as? MarkerView)?.onPermanentDetach = nil
     }
 
     private func prepareOverlayViewForHosting(_ view: UIView) {
@@ -362,8 +343,9 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         // 🔑 处理所有覆盖物 - 从跟踪数组中移除并确保 native 对象也从地图移除
         // 🔑 关键修复：先从数组移除，再调用 super，防止 super 触发的事件回调中引用已卸载的视图
         if let markerView = subview as? MarkerView {
-            scheduleMarkerOverlayUnregister(markerView)
-            // MarkerView 内部也会延迟确认 annotation 移除，避免 transient detach 闪烁。
+            // 立即解除强引用。短暂重挂载会在 didAddSubview 中重新注册，
+            // 真正卸载则允许 MarkerView deinit 及时清理 annotation。
+            unregisterOverlayView(markerView)
         } else if let circleView = subview as? CircleView {
             unregisterOverlayView(circleView)
             if let mapView, let circle = circleView.circle {
@@ -924,8 +906,6 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         appleMapView?.removeOverlays(appleMapView?.overlays ?? [])
         
         // 清空覆盖物数组
-        pendingMarkerOverlayUnregisterTasks.values.forEach { $0.cancel() }
-        pendingMarkerOverlayUnregisterTasks.removeAll()
         overlayViews.removeAll()
         
         // 移除所有子视图

package/ios/overlays/MarkerView.swift

@@ -1,5 +1,6 @@
 import ExpoModulesCore
 import MAMapKit
+import QuartzCore
 import UIKit
 
 /**
@@ -58,6 +59,8 @@ class MarkerView: ExpoView {
     var cacheKey: String?
     /// 标记是否正在被移除（防止重复移除）
     private var isRemoving: Bool = false
+    /// 旧架构物理移除完成后通知 Map 容器解除 overlay 强引用
+    var onPermanentDetach: ((MarkerView) -> Void)?
     
     // 平滑移动相关
     var smoothMovePath: [[String: Double]] = []
@@ -75,12 +78,8 @@ class MarkerView: ExpoView {
     private var pendingUpdateTask: DispatchWorkItem?
     /// 子视图变化后的延迟刷新任务
     private var pendingSubviewRefreshTask: DispatchWorkItem?
-    /// cacheKey 变化后的延迟刷新任务
-    private var pendingCacheKeyRefreshTask: DispatchWorkItem?
-    /// 视图 detach 后延迟确认移除 annotation，避免 React 更新时短暂 detach 导致闪烁
-    private var pendingAnnotationRemovalTask: DispatchWorkItem?
-    /// cacheKey 刷新代次，用于丢弃过期截图任务
-    private var cacheKeyRefreshGeneration: Int = 0
+    /// 下一次主队列确认物理 detach 是否仍然成立
+    private var pendingDetachCheckTask: DispatchWorkItem?
     /// 最近一次应用到 annotationView 的 children 结构签名
     private var lastRenderedChildrenSignature: String?
     /// 最近一次成功渲染的 children 图片，用于缓存未命中时避免闪烁
@@ -113,7 +112,19 @@ class MarkerView: ExpoView {
         // 始终返回 false，表示点击不在此视图内
         return false
     }
-    
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        guard !isRemoving,
+              !subviews.isEmpty,
+              currentChildrenAnnotationView() != nil else {
+            return
+        }
+
+        scheduleChildrenImageRefresh(invalidateChildrenCache: true)
+    }
+
     /**
      * 检查地图是否已连接
      */
@@ -165,7 +176,7 @@ class MarkerView: ExpoView {
         guard cacheKey != key else { return }
         self.cacheKey = key
         if !subviews.isEmpty {
-            scheduleCacheKeyChildrenImageRefresh()
+            scheduleChildrenImageRefresh(invalidateChildrenCache: true)
         } else {
             refreshAnnotationAppearance()
         }
@@ -365,7 +376,7 @@ class MarkerView: ExpoView {
             }
 
             // 图片内容可能尚未就绪，保留旧图并延迟重试，避免透明闪烁。
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self, weak annotationView] in
+            DispatchQueue.main.async { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
                 guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
                 // 再次检查缓存（避免重复渲染）
@@ -533,11 +544,9 @@ class MarkerView: ExpoView {
         // 强制子视图使用指定尺寸布局
         firstSubview.frame = CGRect(origin: .zero, size: size)
         
-        // 🔑 多次强制布局，确保 React Native Text 完全渲染
-        for _ in 0..<3 {
-            forceLayoutRecursively(view: firstSubview)
-            RunLoop.current.run(until: Date(timeIntervalSinceNow: 0.01))
-        }
+        // 在 React Native 完成当前挂载批次后执行一次确定性布局。
+        // 后续布局变化会再次合并触发快照，不需要阻塞主 RunLoop 猜测内容何时就绪。
+        forceLayoutRecursively(view: firstSubview)
 
         if containsPendingImageContent(in: firstSubview) {
             return nil
@@ -567,10 +576,16 @@ class MarkerView: ExpoView {
     }
 
     private func applyChildrenImage(_ image: UIImage, to annotationView: MAAnnotationView, signature: String? = nil) {
-        annotationView.image = image
-        applyCenterOffset(to: annotationView, defaultOffset: .zero)
-        annotationView.canShowCallout = false
-        annotationView.isDraggable = draggable
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        UIView.performWithoutAnimation {
+            annotationView.image = image
+            applyCenterOffset(to: annotationView, defaultOffset: .zero)
+            annotationView.canShowCallout = false
+            annotationView.isDraggable = draggable
+            annotationView.layoutIfNeeded()
+        }
+        CATransaction.commit()
         lastRenderedChildrenImage = image
         if let resolvedSignature = signature {
             lastRenderedChildrenSignature = resolvedSignature
@@ -645,8 +660,7 @@ class MarkerView: ExpoView {
 
     private func scheduleChildrenImageRefresh(
         invalidateChildrenCache: Bool = false,
-        cacheImage: Bool = true,
-        delay: TimeInterval = 0.02
+        cacheImage: Bool = true
     ) {
         pendingSubviewRefreshTask?.cancel()
 
@@ -655,35 +669,7 @@ class MarkerView: ExpoView {
         }
 
         pendingSubviewRefreshTask = task
-        DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: task)
-    }
-
-    private func scheduleCacheKeyChildrenImageRefresh() {
-        pendingSubviewRefreshTask?.cancel()
-        pendingSubviewRefreshTask = nil
-        pendingCacheKeyRefreshTask?.cancel()
-
-        cacheKeyRefreshGeneration += 1
-        let generation = cacheKeyRefreshGeneration
-
-        lastRenderedChildrenSignature = nil
-        invalidateCurrentChildrenCache()
-
-        let uncachedTask = DispatchWorkItem { [weak self] in
-            guard let self = self, !self.isRemoving, self.cacheKeyRefreshGeneration == generation else { return }
-            self.refreshChildrenImageInPlace(invalidateChildrenCache: true, cacheImage: false)
-
-            let cachedTask = DispatchWorkItem { [weak self] in
-                guard let self = self, !self.isRemoving, self.cacheKeyRefreshGeneration == generation else { return }
-                self.refreshChildrenImageInPlace(invalidateChildrenCache: true, cacheImage: true)
-            }
-
-            self.pendingCacheKeyRefreshTask = cachedTask
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.08, execute: cachedTask)
-        }
-
-        pendingCacheKeyRefreshTask = uncachedTask
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.02, execute: uncachedTask)
+        DispatchQueue.main.async(execute: task)
     }
 
     private func iconCacheKey(for iconUri: String) -> String {
@@ -849,18 +835,14 @@ class MarkerView: ExpoView {
             forceLayoutRecursively(view: subview)
         }
     }
-    
-    
-    /**
-     * 当视图即将从父视图移除时调用
-     */
+
     override func willMove(toSuperview newSuperview: UIView?) {
         super.willMove(toSuperview: newSuperview)
 
         if newSuperview == nil {
-            scheduleAnnotationRemovalFromMap()
+            scheduleDetachCheck()
         } else {
-            cancelPendingAnnotationRemoval()
+            cancelPendingDetachCheck()
         }
     }
 
@@ -868,47 +850,39 @@ class MarkerView: ExpoView {
         super.didMoveToSuperview()
 
         if superview != nil {
-            cancelPendingAnnotationRemoval()
+            cancelPendingDetachCheck()
         }
     }
 
-    private func scheduleAnnotationRemovalFromMap() {
-        cancelPendingAnnotationRemoval()
+    private func scheduleDetachCheck() {
+        cancelPendingDetachCheck()
 
         let task = DispatchWorkItem { [weak self] in
-            guard let self = self, self.superview == nil else { return }
-            self.pendingAnnotationRemovalTask = nil
+            guard let self = self else { return }
+            self.pendingDetachCheckTask = nil
+            guard self.superview == nil else { return }
             self.removeAnnotationFromMap()
         }
 
-        pendingAnnotationRemovalTask = task
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3, execute: task)
+        pendingDetachCheckTask = task
+        DispatchQueue.main.async(execute: task)
     }
 
-    private func cancelPendingAnnotationRemoval() {
-        pendingAnnotationRemovalTask?.cancel()
-        pendingAnnotationRemovalTask = nil
+    private func cancelPendingDetachCheck() {
+        pendingDetachCheckTask?.cancel()
+        pendingDetachCheckTask = nil
     }
-    
-    /**
-     * 从地图移除标记点
-     */
+
     private func removeAnnotationFromMap() {
         guard !isRemoving else { return }
         isRemoving = true
-        cancelPendingAnnotationRemoval()
+        cancelPendingDetachCheck()
         pendingAddTask?.cancel(); pendingAddTask = nil
         pendingUpdateTask?.cancel(); pendingUpdateTask = nil
         pendingSubviewRefreshTask?.cancel(); pendingSubviewRefreshTask = nil
-        pendingCacheKeyRefreshTask?.cancel(); pendingCacheKeyRefreshTask = nil
-
-        if Thread.isMainThread {
-            cleanupAnnotationFromMap()
-        } else {
-            DispatchQueue.main.sync {
-                cleanupAnnotationFromMap()
-            }
-        }
+        cleanupAnnotationFromMap()
+        onPermanentDetach?(self)
+        onPermanentDetach = nil
     }
 
     private func cleanupAnnotationFromMap() {
@@ -975,7 +949,7 @@ class MarkerView: ExpoView {
         }
 
         pendingSubviewRefreshTask = task
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.02, execute: task)
+        DispatchQueue.main.async(execute: task)
     }
 
     private func refreshAnnotationForSubviewChanges(allowFallbackToDefault: Bool) {
@@ -1438,16 +1412,15 @@ class MarkerView: ExpoView {
     }
     
     /**
-     * 析构函数 - 不执行任何清理
-     * 清理工作已在 willMove(toSuperview:) 中完成
+     * MarkerView 从 React Native 注册表释放时清理原生 annotation。
+     * Map 容器会在移除子视图时立即解除 overlayViews 的强引用。
      */
     deinit {
         // 取消待处理的任务
         pendingAddTask?.cancel()
         pendingUpdateTask?.cancel()
         pendingSubviewRefreshTask?.cancel()
-        pendingCacheKeyRefreshTask?.cancel()
-        pendingAnnotationRemovalTask?.cancel()
+        pendingDetachCheckTask?.cancel()
 
         if Thread.isMainThread {
             cleanupAnnotationFromMap()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.41",
+  "version": "2.2.42-next.0",
   "description": "Expo Modules AMap (Gaode Map) stack for Expo/React Native: Config Plugin, New Architecture support, maps, location, search, offline maps, and react-native-amap3d migration guidance.",
   "main": "build/index.js",
   "types": "build/index.d.ts",