@ives_xxz/framework 2.1.32 → 2.1.34

package/define/FWSystemDefine.ts

@@ -44,10 +44,10 @@ export class FWLayerType {
 }
 
 export class FWTaskStatus {
-  IDLE = "IDLE";
-  RUNNING = "RUNNING";
-  PAUSED = "PAUSED";
-  COMPLETED = "COMPLETED";
+  IDLE = 'IDLE';
+  RUNNING = 'RUNNING';
+  PAUSED = 'PAUSED';
+  COMPLETED = 'COMPLETED';
 }
 
 export class FWPriorityOrder {
@@ -91,17 +91,17 @@ export class FWLogType {
  * HTTP请求类型
  */
 export class FWHttpRequestType {
-  GET = "GET";
-  POST = "POST";
+  GET = 'GET';
+  POST = 'POST';
 }
 
 /**
  * 动画机类型
  */
 export class FWAnimationMachineType {
-  TWEEN = "TWEEN";
-  SKELETON = "SKELETON";
-  ANIMATION = "ANIMATION";
+  TWEEN = 'TWEEN';
+  SKELETON = 'SKELETON';
+  ANIMATION = 'ANIMATION';
 }
 
 export class FWVirtualScrollViewDirection {
@@ -127,23 +127,25 @@ export class FWScrollViewSelectedType {
 }
 
 export class FWLanguageAssetType {
-  LABEL = "label";
-  SPRITE = "sprite";
-  SKELETON = "skeleton";
+  LABEL = 'label';
+  SPRITE = 'sprite';
+  SKELETON = 'skeleton';
 }
 
 export class FWPromiseStatus {
-  PENDING = "pending";
-  FULFILLED = "fulfilled";
-  REJECTED = "rejected";
-  CANCELLED = "cancelled";
+  PENDING = 'pending';
+  FULFILLED = 'fulfilled';
+  REJECTED = 'rejected';
+  CANCELLED = 'cancelled';
 }
 
 export class FWLayerState {
-  CLOSED = "closed";
-  OPENING = "opening";
-  OPENED = "opened";
-  CLOSING = "closing";
+  LOADING = 'loading';
+  LOADED = 'loaded';
+  OPENING = 'opening';
+  OPENED = 'opened';
+  CLOSED = 'closed';
+  CLOSING = 'closing';
 }
 
 export class FWAudioType {

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;
@@ -13,54 +13,55 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   private stateManager: FWLayerStateManager;
   private queueManager: FWLayerQueueManager;
   private openManager: FWLayerOpenManager;
+  private debug: boolean;
 
   public initialize(): void {
+    this.debug = false;
     this.resourceManager = new FWLayerResourceManager();
     this.dataManager = new FWLayerDataManager();
     this.createManager = new FWLayerCreateManager();
     this.stackManager = new FWLayerStackManager();
-    this.stateManager = new FWLayerStateManager();
     this.queueManager = new FWLayerQueueManager();
-
+    this.stateManager = new FWLayerStateManager(this.debug);
     this.openManager = new FWLayerOpenManager(
       this.dataManager,
       this.resourceManager,
       this.createManager,
       this.stackManager,
       this.queueManager,
+      this.stateManager,
     );
   }
 
+  openDetailsLog() {
+    this.debug = true;
+  }
   /**
    * 异步打开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 -> 查看调用堆栈');
     return this.openManager.openLayerAsync(data) as Promise<Ctr>;
   }
 
   /**
    * 同步打开
    */
-  openSync<Ctr extends FW.LayerController = FW.LayerController>(
-    data: FW.LayerOpenArgs,
-  ): Ctr {
+  openSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
+    if (this.debug) FW.Log.error('同步打开Layer -> 查看调用堆栈');
     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;
     }
@@ -80,13 +81,9 @@ 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;
     }
@@ -130,9 +127,7 @@ 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)) {
@@ -163,23 +158,33 @@ 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 (cc.isValid(ctr.layer?.node)) {
+        this.stateManager.setState(
+          ctr.layerData.controllerConstructor,
+          FW.SystemDefine.FWLayerState.CLOSING,
+        );
+
         await ctr.onClose?.();
+
+        this.stateManager.setState(
+          ctr.layerData.controllerConstructor,
+          FW.SystemDefine.FWLayerState.CLOSED,
+        );
+
         ctr.destroy?.();
+
         if (ctr.autoRelease) {
           FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
         }
         this.dataManager.notifyExternalRefUpdates(ctr.layerData);
       }
-
+      this.stateManager.removeState(layerData?.controllerConstructor);
       this.dataManager.removeFromMap(layerData?.controllerConstructor);
       this.dataManager.removeFromRegistry(ctr.layerData?.controllerConstructor);
 
@@ -256,8 +261,7 @@ 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
    */
@@ -385,7 +389,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();
@@ -410,8 +414,7 @@ class FWLayerDataManager {
 }
 
 class FWLayerCreateManager {
-  private lifecycleManager: FWLayerLifecycleManager =
-    new FWLayerLifecycleManager();
+  private lifecycleManager: FWLayerLifecycleManager = new FWLayerLifecycleManager();
 
   /**
    * 创建Layer节点
@@ -464,6 +467,7 @@ class FWLayerOpenManager {
     private createManager: FWLayerCreateManager,
     private stackManager: FWLayerStackManager,
     private queueManager: FWLayerQueueManager,
+    private stateManager: FWLayerStateManager,
   ) {}
 
   /**
@@ -492,12 +496,7 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (
-      this.queueManager.handlePopupQueue(
-        layerData,
-        this.dataManager.getLayerMap(),
-      )
-    ) {
+    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
       return undefined;
     }
 
@@ -506,9 +505,7 @@ 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;
     }
@@ -529,12 +526,7 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (
-      this.queueManager.handlePopupQueue(
-        layerData,
-        this.dataManager.getLayerMap(),
-      )
-    ) {
+    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
       return undefined;
     }
 
@@ -557,16 +549,34 @@ 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,
+        FW.SystemDefine.FWLayerState.LOADING,
+      );
       const res = await this.resourceManager.loadLayerAsync(layerData);
+
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.OPENING,
+      );
       const ctr = this.createLayer(layerData, res, data) as Ctr;
+
       this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.OPENED,
+      );
+
       return ctr;
     } catch (e) {
       FW.Log.error(`asyncGenerationLayer failed:`, e);
+      this.stateManager.removeState(layerData.controllerConstructor);
       this.dataManager.clearFailedLayer(layerData);
       throw e;
     }
@@ -575,16 +585,27 @@ 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,
+        FW.SystemDefine.FWLayerState.OPENING,
+      );
       const res = this.resourceManager.loadLayerSync(layerData);
       const ctr = this.createLayer(layerData, res, data) as Ctr;
-      this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.OPENED,
+      );
+
       return ctr;
     } catch (e) {
       FW.Log.error(`syncGenerationLayer failed:`, e);
+      this.dataManager.removeFromRegistry(layerData.controllerConstructor);
       this.dataManager.clearFailedLayer(layerData);
       return undefined;
     }
@@ -613,29 +634,22 @@ 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;
@@ -650,9 +664,7 @@ 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;
@@ -664,9 +676,7 @@ 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);
     }
   }
@@ -676,9 +686,7 @@ 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);
     }
@@ -694,21 +702,14 @@ class FWLayerStackManager {
 }
 
 class FWLayerStateManager {
-  private layerStates = new Map<
-    new () => FW.LayerController,
-    FW.SystemDefine.FWLayerState
-  >();
-
-  setState(
-    ctrType: new () => FW.LayerController,
-    state: FW.SystemDefine.FWLayerState,
-  ): void {
+  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}`);
     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;
   }
 
@@ -725,6 +726,7 @@ class FWLayerStateManager {
   }
 
   removeState(ctrType: new () => FW.LayerController): void {
+    if (this.debug) FW.Log.debug(`removeLayerState: ${cc.js.getClassName(ctrType)}`);
     this.layerStates.delete(ctrType);
   }
 
@@ -740,9 +742,7 @@ 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 +782,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,9 +830,7 @@ 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,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.1.32",
+  "version": "2.1.34",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],

package/service/socket/FWSocket.ts

@@ -165,6 +165,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
    */
   public close() {
     this.clear();
+    FW.Entry.timeMgr.unSchedule(this);
     FW.Entry.socketMgr.closeSocket(this);
   }
 

package/types/FW.d.ts

@@ -2644,6 +2644,8 @@ declare namespace FW {
      * 层状态
      */
     export class FWLayerState {
+      static LOADING = 'loading';
+      static LOADED = 'loaded';
       static CLOSED = 'closed';
       static OPENING = 'opening';
       static OPENED = 'opened';