@ives_xxz/framework 1.1.8 → 1.2.0

package/FW.d.ts

@@ -843,7 +843,7 @@ declare namespace FW {
   };
 
   type HotUpdateManager = {
-    setListener(listener: HotUpdateListener): void;
+    setListener(listener: HotUpdateListener): HotUpdateManager;
     update(localManifest: cc.Asset): void;
   };
 
@@ -1470,7 +1470,7 @@ declare namespace FW {
     /**
      * 状态构造类
      */
-    stateConstructor: { new(): T };
+    stateConstructor: { new (): T };
   };
 
   type AudioManager = {
@@ -1795,12 +1795,12 @@ declare namespace FW {
      * 任务开始
      * @param generator
      */
-    start(generator: TaskFunction): Promise<Task>;
+    start(generator: TaskFunction): Task;
     /**
      * 添加任务
      * @param generator
      */
-    add(generator: TaskFunction): Promise<Task>;
+    add(generator: TaskFunction): Task;
     /**
      * 任务暂停
      */

package/item/FWVirtualListItem.ts

@@ -1,14 +1,6 @@
 import FWVirtualViewComponent from '../component/FWVirtualViewComponent';
 import FWObject from '../utils/FWObject';
 
-/******************************************
- * @author kL <klk0@qq.com>
- * @date 2019/6/6
- * @doc 列表Item组件.
- * 说明：
- *      1、此组件须配合List组件使用。（配套的配套的..）
- * @end
- ******************************************/
 const { ccclass, property, disallowMultiple, menu, executionOrder } = cc._decorator;
 
 enum SelectedType {

package/language/FWLanguageLabelLocalize.ts

@@ -9,7 +9,7 @@ const { ccclass, property, executeInEditMode, menu, requireComponent } = cc._dec
 @executeInEditMode
 export default class FWLanguageLabelLocalize extends FWLanguage {
   @property({
-    type: FWLodash.CCEnum(['请选择语言包']),
+    type: FWLodash.CCEnum(['请选择语言']),
     displayName: 'bundle',
     visible: true,
   })

package/manager/FWAudioManager.ts

@@ -76,8 +76,8 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
       );
       if (!data) return;
       const clip = data.clip;
-      const volume = data.volume === undefined ? this.soundVolume : arguments[1];
-      const loop = data.loop === undefined ? false : arguments[2];
+      const volume = data.volume === undefined ? this.soundVolume : data.volume;
+      const loop = data.loop === undefined ? false : data.loop;
       const id = cc.audioEngine.play(clip, loop, volume);
       cc.audioEngine.setFinishCallback(id, () => {
         data.cb?.(id);

package/manager/FWHotUpdateManager.ts

@@ -11,11 +11,12 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   private localManifest: cc.Asset;
   private isRetry: boolean;
   private currentVersion: string;
-  private newVersion: string
+  private newVersion: string;
 
-  setListener(listener: FW.HotUpdateListener): void {
+  setListener(listener: FW.HotUpdateListener): FW.HotUpdateManager {
     this.listener = listener;
     FWLog.debug('热更新监听设置');
+    return this;
   }
 
   public update(localManifest: cc.Asset) {
@@ -96,7 +97,6 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       }
     }
 
-
     this.assetMgr.setEventCallback(this.checkEventHandle.bind(this));
     this.assetMgr.checkUpdate();
     this.isUpdate = true;
@@ -148,7 +148,10 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     this.listener.checkHotUpdateHandle?.(code);
     this.assetMgr.setEventCallback(null!);
     this.isUpdate = false;
-    FWLog.debug('isFind New Version -> ', event.getEventCode() == jsb.EventAssetsManager.NEW_VERSION_FOUND);
+    FWLog.debug(
+      'isFind New Version -> ',
+      event.getEventCode() == jsb.EventAssetsManager.NEW_VERSION_FOUND,
+    );
     if (event.getEventCode() == jsb.EventAssetsManager.NEW_VERSION_FOUND) {
       this.hotUpdate();
     }
@@ -158,7 +161,10 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     FWLog.debug('start hotUpdate ->', this.assetMgr, this.isUpdate);
     if (this.assetMgr && !this.isUpdate) {
       this.assetMgr.setEventCallback(this.updateEventHandle.bind(this));
-      FWLog.debug('assetMgr state ->', this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED);
+      FWLog.debug(
+        'assetMgr state ->',
+        this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED,
+      );
       if (this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED) {
         this.assetMgr.loadLocalManifest(this.localManifest.nativeUrl);
       }
@@ -197,7 +203,17 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
           convertDownloadedBytes = this.convertBytes(downloadedBytes);
           convertTotalBytes = this.convertBytes(totalBytes);
           percent = event.getPercent();
-          FWLog.debug('正在更新中 -> ', '下载文件数量:', downloadedFiles, ',下载文件总数量:', totalFiles, ',已下载大小:', convertDownloadedBytes, ',下载总大小:', convertTotalBytes);
+          FWLog.debug(
+            '正在更新中 -> ',
+            '下载文件数量:',
+            downloadedFiles,
+            ',下载文件总数量:',
+            totalFiles,
+            ',已下载大小:',
+            convertDownloadedBytes,
+            ',下载总大小:',
+            convertTotalBytes,
+          );
         }
         break;
       case jsb.EventAssetsManager.ERROR_DOWNLOAD_MANIFEST:
@@ -220,7 +236,17 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
           convertDownloadedBytes = this.convertBytes(downloadedBytes);
           convertTotalBytes = this.convertBytes(totalBytes);
           percent = event.getPercent();
-          FWLog.debug('正在更新完成 -> ', '下载文件数量:', downloadedFiles, ',下载文件总数量:', totalFiles, ',已下载大小:', convertDownloadedBytes, ',下载总大小:', convertTotalBytes);
+          FWLog.debug(
+            '正在更新完成 -> ',
+            '下载文件数量:',
+            downloadedFiles,
+            ',下载文件总数量:',
+            totalFiles,
+            ',已下载大小:',
+            convertDownloadedBytes,
+            ',下载总大小:',
+            convertTotalBytes,
+          );
         }
         str = 'UPDATE_FINISHED';
         needRestart = true;
@@ -268,12 +294,10 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       this.isRetry = false;
       this.isUpdate = false;
 
-
       this.reloadLocalManifest();
 
       this.assetMgr.setEventCallback(null!);
       this.listener.completedHandle?.(this.newVersion);
-
     }
   }
 
@@ -288,6 +312,6 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     return `${size.toFixed(size < 10 ? 2 : 1)} ${units[unitIndex]}`;
   }
 
-  public initialize(): void { }
-  public onDestroy(): void { }
+  public initialize(): void {}
+  public onDestroy(): void {}
 }

package/manager/FWLanguageManager.ts

@@ -1,4 +1,3 @@
-import FWLog from '../log/FWLog';
 import { FWEventDefine } from '../define/FWEventDefine';
 import { FWManager } from './FWManager';
 
@@ -103,7 +102,7 @@ export default class FWLanguageManager extends FWManager implements FW.LanguageM
    * 获取支持的所有语言
    */
   getSupportedLanguages(): string[] {
-    return [...this.supportedLanguages]; // 返回副本
+    return [...this.supportedLanguages];
   }
 
   /**

package/manager/FWLayerManager.ts

@@ -274,6 +274,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     node.resumeSystemEvents(true);
 
     FW.Entry.evtMgr.targetResume(ctr);
+    FW.Entry.timeMgr.pauseSchedule(ctr);
   }
 
   /**
@@ -295,6 +296,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     node.opacity = 0;
     node.pauseSystemEvents(true);
     FW.Entry.evtMgr.targetPause(ctr);
+    FW.Entry.timeMgr.resumeSchedule(ctr);
   }
 
   /**

package/package.json

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

package/service/http/FWHttp.ts

@@ -1,6 +1,6 @@
-import { FWSystemDefine } from "../../define/FWSystemDefine";
-import FWLog from "../../log/FWLog";
-import FWService from "../FWService";
+import { FWSystemDefine } from '../../define/FWSystemDefine';
+import FWLog from '../../log/FWLog';
+import FWService from '../FWService';
 
 export default class FWHttp extends FWService {
   public initialize(): void {}
@@ -9,62 +9,50 @@ export default class FWHttp extends FWService {
   protected async getMessage(
     url: string,
     params?: string,
-    cb?: (response: string) => void
+    cb?: (response: string) => void,
   ): Promise<string> {
-    return this.dataProcessing(
-      url,
-      params,
-      cb,
-      FWSystemDefine.FWHttpRequestType.GET
-    );
+    return this.dataProcessing(url, params, cb, FWSystemDefine.FWHttpRequestType.GET);
   }
 
   protected async postMessage(
     url: string,
     params?: string,
-    cb?: (response: string) => void
+    cb?: (response: string) => void,
   ): Promise<string> {
-    return this.dataProcessing(
-      url,
-      params,
-      cb,
-      FWSystemDefine.FWHttpRequestType.POST
-    );
+    return this.dataProcessing(url, params, cb, FWSystemDefine.FWHttpRequestType.POST);
   }
 
   private dataProcessing(
     url: string,
     params: string,
     cb: (response: any) => void,
-    type: FWSystemDefine.FWHttpRequestType
+    type: FWSystemDefine.FWHttpRequestType,
   ): Promise<string> {
-    return new Promise(
-      (resolve: (msg: string) => void, reject: (error: string) => void) => {
-        const xhr = new XMLHttpRequest();
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState == 4 && xhr.status === 200) {
-            cb?.(xhr.response);
-            resolve(xhr.response);
-          }
-        };
-
-        xhr.onerror = (err: any) => {
-          FWLog.error(err);
-          this.onError(err);
-          reject(`http request error:${err}`);
-        };
-
-        xhr.ontimeout = () => {
-          this.onTimeout();
-          reject(`http request timeout!`);
-        };
-
-        xhr.open(type, url, true);
-        xhr.send(params);
-      }
-    );
+    return new Promise((resolve: (msg: string) => void, reject: (error: string) => void) => {
+      const xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState == 4 && xhr.status === 200) {
+          cb?.(xhr.response);
+          resolve(xhr.response);
+        }
+      };
+
+      xhr.onerror = (err: any) => {
+        FWLog.error(err);
+        this.onError(err);
+        reject(`http request error:${err}`);
+      };
+
+      xhr.ontimeout = () => {
+        this.onTimeout();
+        reject(`http request timeout!`);
+      };
+
+      xhr.open(type, url, true);
+      xhr.send(params);
+    });
   }
 
-  onError(err: any) {}
-  onTimeout() {}
+  onError?(err: any);
+  onTimeout?();
 }

package/utils/FWTask.ts

@@ -34,7 +34,7 @@ export default class FWTask implements FW.Task {
     };
   }
 
-  async start(generator: FW.TaskFunction): Promise<FW.Task> {
+  start(generator: FW.TaskFunction): FW.Task {
     this.reset();
     const taskId = `TaskId:${this.id}->TaskCounter${this.taskCounter++}`;
     const gen = generator();
@@ -47,11 +47,11 @@ export default class FWTask implements FW.Task {
       taskId,
     });
     this.taskStartTime = FW.Entry.timeMgr.getTime();
-    await this.executeFrame();
+    this.executeFrame();
     return this;
   }
 
-  async add(generator: FW.TaskFunction): Promise<FW.Task> {
+  add(generator: FW.TaskFunction): FW.Task {
     const taskId = `TaskId:${this.id}->TaskCounter${this.taskCounter++}`;
     const gen = generator();
     (gen as any).taskId = taskId;
@@ -63,7 +63,7 @@ export default class FWTask implements FW.Task {
     });
     if (this.status !== FWSystemDefine.FWTaskStatus.RUNNING && !this.isPaused) {
       this.status = FWSystemDefine.FWTaskStatus.RUNNING;
-      await this.executeFrame();
+      this.executeFrame();
     }
     return this;
   }