@ives_xxz/framework 1.1.9 → 1.2.1

package/FW.d.ts

@@ -1092,7 +1092,7 @@ declare namespace FW {
      * tasksFrameCount?: number; 每帧最多执行的任务个数
      */
 
-    createTask(options: FW.TaskOptions): FW.Task;
+    createTask(options: Partial<FW.TaskOptions>): FW.Task;
     /**
      * 获取任务
      * @param taskId
@@ -1732,19 +1732,19 @@ declare namespace FW {
   }
 
   type TaskOptions = {
-    taskId?: number;
+    taskId: number;
     /**
      * 每帧最大执行时间(ms)，默认16ms (60fps) 帧预算
      */
-    frameBudget?: number;
+    frameBudget: number;
     /**
      * 每帧最多执行的任务个数
      */
-    tasksFrameCount?: number;
+    tasksFrameCount: number;
     /**
      * 是否打印日志
      */
-    log?: boolean;
+    log: boolean;
   };
 
   type TaskEvent = {
@@ -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/FWBundleManager.ts

@@ -70,9 +70,9 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
   /** 释放bundle */
   release(bundleName: string): void {
     if (!this.has(bundleName)) {
-      FWLog.warn('bundle未加载,无需释放!');
       return;
     }
+    cc.assetManager.removeBundle(this.bundleMap.get(bundleName));
   }
 
   /**

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/manager/FWTaskManager.ts

@@ -13,7 +13,7 @@ export default class FWTaskManager extends FWManager implements FW.TaskManager {
    */
   private taskId = 0;
 
-  createTask(options: FW.TaskOptions): FW.Task {
+  createTask(options?: Partial<FW.TaskOptions>): FW.Task {
     const task = new FWTask({
       tasksFrameCount: options?.tasksFrameCount,
       frameBudget: options?.frameBudget,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.1.9",
+  "version": "1.2.1",
   "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/service/socket/FWSocket.ts

@@ -226,6 +226,7 @@ export default class FWSocket implements FW.Socket {
 
         if (this.protocolContainer.size > 0) {
           this.protocolContainer?.forEach((msg) => {
+            FWLog.send('协议容器轮询消息 -> ', msg);
             this.sendMessage(msg);
           });
         }

package/utils/FWTask.ts

@@ -20,13 +20,13 @@ export default class FWTask implements FW.Task {
 
   readonly id: number;
 
-  constructor(options: FW.TaskOptions) {
-    this.id = options.taskId || Date.now();
+  constructor(options?: Partial<FW.TaskOptions>) {
+    this.id = options?.taskId || 0;
     this.taskCounter = 0;
     this.totalTaskDuration = 0;
-    this.log = options.log ?? true;
-    this.frameBudget = options.frameBudget ?? 16;
-    this.tasksFrameCount = options.tasksFrameCount ?? 3;
+    this.log = options?.log ?? true;
+    this.frameBudget = options?.frameBudget ?? 16;
+    this.tasksFrameCount = options?.tasksFrameCount ?? 3;
     this.performanceData = {
       frameTimes: [],
       detailedFrames: [],
@@ -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;
   }
@@ -138,11 +138,13 @@ export default class FWTask implements FW.Task {
         });
       }
 
-      frameTasks.push({
-        taskId: taskId,
-        result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
-        message: (result?.value as any)?.message,
-      });
+      if ((result?.value as any)?.message) {
+        frameTasks.push({
+          taskId: taskId,
+          result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
+          message: (result?.value as any)?.message,
+        });
+      }
 
       processed++;
     }