@react-native-ohos/react-native-amap3d 3.3.0-rc.3 → 3.3.0-rc.4

package/harmony/rn_amap3d/BuildProfile.ets

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '3.3.0-rc.3';
+export const HAR_VERSION = '3.3.0-rc.4';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/rn_amap3d/oh-package.json5

@@ -3,7 +3,7 @@
   "devDependencies": {
   },
   "name": "@react-native-ohos/react-native-amap3d",
-  "version": "3.3.0-rc.3",
+  "version": "3.3.0-rc.4",
   "description": "Please describe the basic information.",
   "main": "index.ets",
   "author": "",

package/harmony/rn_amap3d/src/main/ets/View/AMapCircle.ets

@@ -90,6 +90,11 @@ export struct AMapCircle {
       }
     )
   }
+
+  aboutToDisappear(): void {
+    this.unregisterDescriptorChangesListener?.();
+  }
+
   build() {
   }
 }

package/harmony/rn_amap3d/src/main/ets/View/AMapMarker.ets

@@ -77,6 +77,11 @@ export struct AMapMarker {
     )
   }
 
+  aboutToDisappear(): void {
+    // 取消订阅
+    this.unregisterDescriptorChangesListener?.();
+  }
+
   build() {
     ContentSlot(this.ctx.getContentForTag(this.tag))
   }

package/harmony/rn_amap3d/src/main/ets/View/MapView.ets

@@ -127,6 +127,16 @@ export struct AMapView {
         GlobalCache.circleCacheMap.remove(circleTag);
         GlobalCache.currentPageCircle.remove(circleTag);
       }
+      // 清理属于当前 MapView 的 Marker
+      let markerTagsToRemove: number[] = [];
+      GlobalCache.currentPageMarker.forEach((mapTag: number, markerTag: number) => {
+        if (mapTag === this.tag) {
+          markerTagsToRemove.push(markerTag);
+        }
+      });
+      for (let markerTag of markerTagsToRemove) {
+        GlobalCache.currentPageMarker.remove(markerTag);
+      }
   }
 
   //地图
@@ -457,11 +467,15 @@ export struct AMapView {
 
     // 收集当前所有 Circle 子组件的 tag
     let currentCircleTags: Set<number> = new Set();
+    // 收集当前所有 Marker 子组件的 tag
+    let currentMarkerTags: Set<number> = new Set();
     for (let i = 0; i < descriptor.childrenTags.length; i++) {
       let childTagName =
         this.ctx.rnInstance.getComponentNameFromDescriptorType(this.ctx.descriptorRegistry.getDescriptor(descriptor.childrenTags[i])?.type);
       if (childTagName === A_MAP_CIRCLE_VIEW_TYPE) {
         currentCircleTags.add(descriptor.childrenTags[i]);
+      } else if (childTagName === A_MAP_MARKER_TYPE) {
+        currentMarkerTags.add(descriptor.childrenTags[i]);
       }
     }
 
@@ -482,6 +496,50 @@ export struct AMapView {
       GlobalCache.currentPageCircle.remove(circleTag); // 从映射关系中删除
     }
 
+    // 删除不再需要的 Marker（只删除属于当前 MapView 的）
+    let markersToRemove: number[] = [];
+    GlobalCache.currentPageMarker.forEach((mapTag: number, markerTag: number) => {
+      // 只处理属于当前 MapView 的 Marker
+      if (mapTag === this.tag && !currentMarkerTags.has(markerTag)) {
+        markersToRemove.push(markerTag);
+      }
+    });
+    
+    // 删除 Marker
+    let markers = GlobalCache.mapMarker.get(this.tag) ?? [];
+    let markerTagAndDescriptorTagArray = GlobalCache.markerTagAndDescriptorTag.get(this.tag) ?? [];
+    
+    for (let markerTag of markersToRemove) {
+      // 从地图上移除 Marker
+      for (let index = 0; index < markerTagAndDescriptorTagArray.length; index++) {
+        markerTagAndDescriptorTagArray[index].forEach((markerID: string, tag: number) => {
+          if (tag === markerTag) {
+            // 找到对应的 Marker 并移除
+            for (let markerIndex = 0; markerIndex < markers.length; markerIndex++) {
+              if (markers[markerIndex].getId() === markerID) {
+                markers[markerIndex].remove(); // 从地图上移除 Marker
+                markers.splice(markerIndex, 1); // 从数组中删除
+                break;
+              }
+            }
+            markerTagAndDescriptorTagArray.splice(index, 1); // 从映射关系中删除
+          }
+        });
+      }
+      GlobalCache.currentPageMarker.remove(markerTag); // 从映射关系中删除
+      // 从 markerTag 数组中删除
+      let markerTagIndex = this.markerTag.indexOf(markerTag);
+      if (markerTagIndex !== -1) {
+        this.markerTag.splice(markerTagIndex, 1);
+      }
+    }
+    
+    // 更新缓存
+    GlobalCache.mapMarker.set(this.tag, markers);
+    GlobalCache.markerTagAndDescriptorTag.set(this.tag, markerTagAndDescriptorTagArray);
+    this.markers = markers;
+    this.markerTagAndDescriptorTagArray = markerTagAndDescriptorTagArray;
+
     for (let i = 0; i < descriptor.childrenTags.length; i++) {
       tagName =
         this.ctx.rnInstance.getComponentNameFromDescriptorType(this.ctx.descriptorRegistry.getDescriptor(descriptor.childrenTags[i])?.type);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-amap3d",
-  "version": "3.3.0-rc.3",
+  "version": "3.3.0-rc.4",
   "description": "react-native 高德地图组件，支持 harmonyOS",
   "license": "MIT",
   "keywords": [