@ives_xxz/framework 1.2.19 → 1.2.21

package/FW.d.ts

@@ -636,7 +636,7 @@ declare namespace FW {
      */
     closeFromLayerName(name: string | string[]);
 
-    getLayerMap(): Map<string, LayerData>;
+    getLayerMap(): Map<new () => LayerController, LayerData>;
   };
 
   /**

package/manager/FWLayerManager.ts

@@ -34,7 +34,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 当前已经打开的layer缓存容器
    */
-  private layerMap: Map<string, FW.LayerData>;
+  private layerMap: Map<new () => FW.LayerController, FW.LayerData>;
 
   /**
    * 当前所有打开Layer注册表
@@ -47,7 +47,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
 
   public initialize(): void {
     this.layerQueue = new FWQueue<FW.LayerData>();
-    this.layerMap = new Map<string, FW.LayerData>();
+    this.layerMap = new Map<new () => FW.LayerController, FW.LayerData>();
     this.layerRegistry = new Set<new () => FW.LayerController>();
     this.layerStack = [];
   }
@@ -137,10 +137,11 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     layerData.controller = ctr;
     layerData.controllerName = ctrName;
 
-    this.layerMap.set(ctrName, layerData);
+    this.layerMap.set(data.type, layerData);
+    FWLog.debug('打开Layer -> ', layerData?.controllerName, this.layerMap.has(data.type));
 
     if (this.layerRegistry.has(data.type)) {
-      return this.layerMap.get(ctrName).controllerProxy as Ctr;
+      return this.layerMap.get(data.type).controllerProxy as Ctr;
     }
 
     this.layerRegistry.add(data.type);
@@ -228,10 +229,10 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     layerData.controller = ctr;
     layerData.controllerName = ctrName;
 
-    this.layerMap.set(ctrName, layerData);
+    this.layerMap.set(data.type, layerData);
 
     if (this.layerRegistry.has(data.type)) {
-      return this.layerMap.get(ctrName).controllerProxy as Ctr;
+      return this.layerMap.get(data.type).controllerProxy as Ctr;
     }
 
     this.layerRegistry.add(data.type);
@@ -300,7 +301,10 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    */
   displayLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
-    if (!this.layerMap.has(layerData.controllerName)) {
+
+    FWLog.debug('关闭Layer -> ', layerData?.controllerName);
+
+    if (!this.layerMap.has(ctr.layerData.controllerConstructor)) {
       FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -322,7 +326,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    */
   hideLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
-    if (!this.layerMap.has(layerData.controllerName)) {
+    if (!this.layerMap.has(ctr.layerData.controllerConstructor)) {
       FWLog.warn(`hide layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -364,7 +368,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     for (let i = 0; i < count; i++) {
       let layerData = this.layerStack.pop();
       let ctr = layerData.controller;
-      if (!this.layerMap.has(layerData.controllerName)) {
+      if (!this.layerMap.has(layerData.controllerConstructor)) {
         return;
       }
       if (cc.isValid(ctr.layer?.node)) {
@@ -374,7 +378,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         }
         this.notifyExternalRefUpdates(ctr.layerData);
       }
-      this.layerMap.delete(layerData.controllerName);
+      this.layerMap.delete(layerData.controllerConstructor);
     }
   }
 
@@ -399,7 +403,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       this.notifyExternalRefUpdates(ctr.layerData);
     }
 
-    this.layerMap.delete(layerData.controllerName);
+    FWLog.debug('closeLayer', layerData.controllerConstructor);
+
+    this.layerMap.delete(layerData.controllerConstructor);
     this.layerRegistry.delete(ctr.layerData.controllerConstructor);
 
     const index = this.layerStack.findIndex((v) => {
@@ -512,11 +518,12 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     };
   }
 
-  getLayerMap(): Map<string, FW.LayerData> {
+  getLayerMap(): Map<new () => FW.LayerController, FW.LayerData> {
     return this.layerMap;
   }
 
   public clear() {
+    FWLog.debug('调用clear');
     this.layerQueue = new FWQueue();
     this.layerStack = [];
     this.layerRegistry = new Set<new () => FW.LayerController>();
@@ -525,6 +532,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   }
 
   public onDestroy(): void {
+    FWLog.debug('调用onDestroy');
     this.layerMap.clear();
     this.layerMap = null;
     this.layerQueue = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": [