@ives_xxz/framework 2.1.34 → 2.1.36

package/manager/FWLayerManager.ts

@@ -1,9 +1,9 @@
-import { FWManager } from './FWManager';
-import { FWQueue } from '../utils/FWQueue';
-import { FrameworkBase } from '../FrameworkBase';
-import { PerformanceMonitor } from '../expand/FWDecorator';
+import { FWManager } from "./FWManager";
+import { FWQueue } from "../utils/FWQueue";
+import { FrameworkBase } from "../FrameworkBase";
+import { PerformanceMonitor } from "../expand/FWDecorator";
 
-const ADD_EXTERNAL_REFERENCE: string = 'addExternalReference';
+const ADD_EXTERNAL_REFERENCE: string = "addExternalReference";
 
 export class FWLayerManager extends FWManager implements FW.LayerManager {
   private resourceManager: FWLayerResourceManager;
@@ -22,7 +22,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     this.createManager = new FWLayerCreateManager();
     this.stackManager = new FWLayerStackManager();
     this.queueManager = new FWLayerQueueManager();
-    this.stateManager = new FWLayerStateManager(this.debug);
+    this.stateManager = new FWLayerStateManager();
     this.openManager = new FWLayerOpenManager(
       this.dataManager,
       this.resourceManager,
@@ -33,35 +33,49 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     );
   }
 
-  openDetailsLog() {
+  openDebug() {
     this.debug = true;
   }
+
+  isDebug() {
+    return this.debug;
+  }
   /**
    * 异步打开Layer
    */
-  @PerformanceMonitor('openAsync')
+  @PerformanceMonitor("openAsync")
   async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
     data: FW.LayerOpenArgs,
   ): Promise<Ctr> {
-    if (this.debug) FW.Log.error('异步打开Layer -> 查看调用堆栈');
+    if (this.debug) {
+      FW.Log.error(`异步打开Layer ->`, cc.js.getClassName(data.type));
+    }
     return this.openManager.openLayerAsync(data) as Promise<Ctr>;
   }
 
   /**
    * 同步打开
    */
-  openSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
-    if (this.debug) FW.Log.error('同步打开Layer -> 查看调用堆栈');
+  openSync<Ctr extends FW.LayerController = FW.LayerController>(
+    data: FW.LayerOpenArgs,
+  ): Ctr {
+    if (this.debug) {
+      FW.Log.error(`同步打开Layer ->`, cc.js.getClassName(data.type));
+    }
     return this.openManager.openLayerSync(data) as Ctr;
   }
 
   /**
    * 显示layer并恢复所有节点事件
    */
-  displayLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
+  displayLayer<Ctr extends FW.LayerController = FW.LayerController>(
+    ctr: Ctr,
+  ): Ctr {
     const layerData = ctr.layerData;
 
-    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
+    if (
+      !this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)
+    ) {
       FW.Log.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -81,9 +95,13 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 隐藏layer并隐藏所有节点事件
    */
-  hideLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
+  hideLayer<Ctr extends FW.LayerController = FW.LayerController>(
+    ctr: Ctr,
+  ): Ctr {
     const layerData = ctr.layerData;
-    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
+    if (
+      !this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)
+    ) {
       FW.Log.warn(`hide layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -127,7 +145,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     for (let i = 0; i < count; i++) {
       let layerData = this.stackManager.pop();
       let ctr = layerData.controller;
-      if (!this.dataManager.getLayerMap().has(layerData.controllerConstructor)) {
+      if (
+        !this.dataManager.getLayerMap().has(layerData.controllerConstructor)
+      ) {
         return;
       }
       if (cc.isValid(ctr.layer?.node)) {
@@ -158,12 +178,20 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 关闭layer
    */
-  async close<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Promise<Ctr> {
+  async close<Ctr extends FW.LayerController = FW.LayerController>(
+    ctr: Ctr,
+  ): Promise<Ctr> {
     if (!ctr) return;
 
     return FW.Entry.promiseMgr.execute(async (resolve, reject) => {
       let layerData = ctr.layerData;
 
+      if (this.debug) {
+        FW.Log.error(
+          `${cc.js.getClassName(layerData?.controllerConstructor)} 关闭Layer}`,
+        );
+      }
+
       if (cc.isValid(ctr.layer?.node)) {
         this.stateManager.setState(
           ctr.layerData.controllerConstructor,
@@ -261,7 +289,8 @@ export class FWLayerData<T extends FW.LayerController = FW.LayerController>
 class FWLayerDataManager {
   private layerMap: Map<new () => FW.LayerController, FWLayerData> = new Map();
   private layerRegistry: Set<new () => FW.LayerController> = new Set();
-  private layerControllerFactory: FWLayerControllerFactory = new FWLayerControllerFactory();
+  private layerControllerFactory: FWLayerControllerFactory =
+    new FWLayerControllerFactory();
   /**
    * 获取已存在的Layer
    */
@@ -389,7 +418,7 @@ class FWLayerDataManager {
       try {
         cb?.(null);
       } catch (e) {
-        FW.Log.error('External ref update callback error:', e);
+        FW.Log.error("External ref update callback error:", e);
       }
     });
     layerData.externalReference.clear();
@@ -414,7 +443,8 @@ class FWLayerDataManager {
 }
 
 class FWLayerCreateManager {
-  private lifecycleManager: FWLayerLifecycleManager = new FWLayerLifecycleManager();
+  private lifecycleManager: FWLayerLifecycleManager =
+    new FWLayerLifecycleManager();
 
   /**
    * 创建Layer节点
@@ -496,7 +526,12 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
+    if (
+      this.queueManager.handlePopupQueue(
+        layerData,
+        this.dataManager.getLayerMap(),
+      )
+    ) {
       return undefined;
     }
 
@@ -505,7 +540,9 @@ class FWLayerOpenManager {
     return this.asyncGenerationLayer(layerData, data);
   }
 
-  openLayerSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
+  openLayerSync<Ctr extends FW.LayerController = FW.LayerController>(
+    data: FW.LayerOpenArgs,
+  ): Ctr {
     if (!this.validateOpenData(data)) {
       return undefined;
     }
@@ -526,7 +563,12 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
+    if (
+      this.queueManager.handlePopupQueue(
+        layerData,
+        this.dataManager.getLayerMap(),
+      )
+    ) {
       return undefined;
     }
 
@@ -549,10 +591,9 @@ class FWLayerOpenManager {
   /**
    * 异步生成Layer
    */
-  private async asyncGenerationLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    layerData: FWLayerData,
-    data: FW.LayerOpenArgs,
-  ): Promise<Ctr> {
+  private async asyncGenerationLayer<
+    Ctr extends FW.LayerController = FW.LayerController,
+  >(layerData: FWLayerData, data: FW.LayerOpenArgs): Promise<Ctr> {
     try {
       this.stateManager.setState(
         layerData.controllerConstructor,
@@ -585,10 +626,9 @@ class FWLayerOpenManager {
   /**
    * 同步创建Layer
    */
-  private syncGenerationLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    layerData: FWLayerData,
-    data: FW.LayerOpenArgs,
-  ): Ctr {
+  private syncGenerationLayer<
+    Ctr extends FW.LayerController = FW.LayerController,
+  >(layerData: FWLayerData, data: FW.LayerOpenArgs): Ctr {
     try {
       this.stateManager.setState(
         layerData.controllerConstructor,
@@ -634,22 +674,29 @@ class FWLayerOpenManager {
 
     this.createManager.setupLayerLifecycle(layer, layerData.controller);
 
-    if (layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT) {
+    if (
+      layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT
+    ) {
       this.stackManager.push(layerData);
     }
 
     this.dataManager.removeFromRegistry(layerData.controllerConstructor);
 
-    layerData.controllerProxy = this.dataManager.createControllerProxy(layerData);
+    layerData.controllerProxy =
+      this.dataManager.createControllerProxy(layerData);
 
     return layerData.controllerProxy as Ctr;
   }
 }
 
 class FWLayerResourceManager {
-  async loadLayerAsync(layerData: FWLayerData): Promise<{ asset: cc.Prefab; uuid: string }> {
+  async loadLayerAsync(
+    layerData: FWLayerData,
+  ): Promise<{ asset: cc.Prefab; uuid: string }> {
     try {
-      const res = await FW.Entry.resMgr.loadAssetData<cc.Prefab>(layerData.layerAssetProperty);
+      const res = await FW.Entry.resMgr.loadAssetData<cc.Prefab>(
+        layerData.layerAssetProperty,
+      );
       if (!res) return undefined;
       res.user = layerData.layerName;
       res.autoRelease = layerData.controller.autoRelease;
@@ -664,7 +711,9 @@ class FWLayerResourceManager {
   loadLayerSync(layerData: FWLayerData): { asset: cc.Prefab; uuid: string } {
     layerData.layerAssetProperty.bundle =
       layerData.layerAssetProperty.bundle || FW.Entry.bundleName;
-    const res = FW.Entry.resMgr.getAssetData<cc.Prefab>(layerData.layerAssetProperty);
+    const res = FW.Entry.resMgr.getAssetData<cc.Prefab>(
+      layerData.layerAssetProperty,
+    );
     res.user = layerData.layerName;
     res.autoRelease = layerData.controller.autoRelease;
     res.dependentBundle = layerData.controller.layerAssetProperty.bundle;
@@ -676,7 +725,9 @@ class FWLayerStackManager {
   private layerStack: FWLayerData[] = [];
 
   push(layerData: FWLayerData): void {
-    if (layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT) {
+    if (
+      layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT
+    ) {
       this.layerStack.push(layerData);
     }
   }
@@ -686,7 +737,9 @@ class FWLayerStackManager {
   }
 
   remove(layerData: FWLayerData): void {
-    const index = this.layerStack.findIndex((v) => v.controller === layerData.controller);
+    const index = this.layerStack.findIndex(
+      (v) => v.controller === layerData.controller,
+    );
     if (index > -1) {
       this.layerStack.splice(index, 1);
     }
@@ -702,14 +755,24 @@ class FWLayerStackManager {
 }
 
 class FWLayerStateManager {
-  private layerStates = new Map<new () => FW.LayerController, FW.SystemDefine.FWLayerState>();
-  constructor(private readonly debug: boolean) {}
-  setState(ctrType: new () => FW.LayerController, state: FW.SystemDefine.FWLayerState): void {
-    if (this.debug) FW.Log.debug(`setLayerState: ${cc.js.getClassName(ctrType)} ${state}`);
+  private layerStates = new Map<
+    new () => FW.LayerController,
+    FW.SystemDefine.FWLayerState
+  >();
+  constructor() {}
+  setState(
+    ctrType: new () => FW.LayerController,
+    state: FW.SystemDefine.FWLayerState,
+  ): void {
+    if (FW.Entry.layerMgr.isDebug()) {
+      FW.Log.debug(`${cc.js.getClassName(ctrType)}->更新状态${state}`);
+    }
     this.layerStates.set(ctrType, state);
   }
 
-  getState(ctrType: new () => FW.LayerController): FW.SystemDefine.FWLayerState {
+  getState(
+    ctrType: new () => FW.LayerController,
+  ): FW.SystemDefine.FWLayerState {
     return this.layerStates.get(ctrType) || FW.SystemDefine.FWLayerState.CLOSED;
   }
 
@@ -726,7 +789,9 @@ class FWLayerStateManager {
   }
 
   removeState(ctrType: new () => FW.LayerController): void {
-    if (this.debug) FW.Log.debug(`removeLayerState: ${cc.js.getClassName(ctrType)}`);
+    if (FW.Entry.layerMgr.isDebug()) {
+      FW.Log.debug(`${cc.js.getClassName(ctrType)}-> 移除状态`);
+    }
     this.layerStates.delete(ctrType);
   }
 
@@ -742,7 +807,9 @@ class FWLayerQueueManager {
     layerData: FWLayerData,
     layerMap: Map<new () => FW.LayerController, FWLayerData>,
   ): boolean {
-    if (layerData.controller.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE) {
+    if (
+      layerData.controller.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE
+    ) {
       const hasNonPermanentLayers = Array.from(layerMap.values()).some(
         (value) => value.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE,
       );
@@ -782,44 +849,44 @@ class FWLayerQueueManager {
 
 class FWLayerLifecycleManager {
   setupLifecycleHooks(layer: FW.Layer, ctr: FW.LayerController): void {
-    const originalOnLoad = layer['onLoad'];
-    layer['onLoad'] = function () {
+    const originalOnLoad = layer["onLoad"];
+    layer["onLoad"] = function () {
       originalOnLoad?.call(this);
       ctr.onLoad?.();
     };
 
-    const originalStart = layer['start'];
-    layer['start'] = function () {
+    const originalStart = layer["start"];
+    layer["start"] = function () {
       originalStart?.call(this);
       ctr.onStart?.();
     };
 
-    const originalOnEnable = layer['onEnable'];
-    layer['onEnable'] = function () {
+    const originalOnEnable = layer["onEnable"];
+    layer["onEnable"] = function () {
       originalOnEnable?.call(this);
       ctr.onEnable?.();
     };
 
-    const originalOnDisable = layer['onDisable'];
-    layer['onDisable'] = function () {
+    const originalOnDisable = layer["onDisable"];
+    layer["onDisable"] = function () {
       originalOnDisable?.call(this);
       ctr.onDisable?.();
     };
 
-    const originalOnDestroy = layer['onDestroy'];
-    layer['onDestroy'] = function () {
+    const originalOnDestroy = layer["onDestroy"];
+    layer["onDestroy"] = function () {
       originalOnDestroy?.call(this);
       ctr.onDestroy?.();
     };
 
-    const originalUpdate = layer['update'];
-    layer['update'] = function (dt: number) {
+    const originalUpdate = layer["update"];
+    layer["update"] = function (dt: number) {
       originalUpdate?.call(this, dt);
       ctr.onUpdate?.(dt);
     };
 
-    const originalLateUpdate = layer['lateUpdate'];
-    layer['lateUpdate'] = function () {
+    const originalLateUpdate = layer["lateUpdate"];
+    layer["lateUpdate"] = function () {
       originalLateUpdate?.call(this);
       ctr.onLateUpdate?.();
     };
@@ -830,7 +897,9 @@ class FWLayerControllerFactory {
   /**
    * 创建并初始化 LayerController
    */
-  createController<Ctr extends FW.LayerController = FW.LayerController>(type: new () => Ctr): Ctr {
+  createController<Ctr extends FW.LayerController = FW.LayerController>(
+    type: new () => Ctr,
+  ): Ctr {
     const ctr = new type();
 
     ctr.initializeDependencies?.();

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.1.34",
+  "version": "2.1.36",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": ["123456"],
+  "keywords": [
+    "123456"
+  ],
   "author": "ives",
   "license": "ISC"
 }

package/types/FW.d.ts

@@ -899,6 +899,10 @@ declare namespace FW {
 
     /** 清理方法 */
     clear(): void;
+    /** 开启调试 */
+    openDebug():void;
+    /** 是否开启调试 */
+    isDebug():boolean;
 
     /**
      * 异步打开layer