@ives_xxz/framework 1.1.2 → 1.1.4

package/FW.d.ts

@@ -850,7 +850,7 @@ declare namespace FW {
     versionCompareHandle: (currentVersion: string, newVersion: string) => void;
     checkHotUpdateHandle: (code: string) => void;
     hotUpdatingHandle: (code: string, param: HotUpdatingParam) => void;
-    completedHandle: () => void;
+    completedHandle: (version: string) => void;
     retryHandle: () => void;
   };
 
@@ -1469,7 +1469,7 @@ declare namespace FW {
     /**
      * 状态构造类
      */
-    stateConstructor: { new (): T };
+    stateConstructor: { new(): T };
   };
 
   type AudioManager = {

package/manager/FWHotUpdateManager.ts

@@ -10,6 +10,8 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   private isUpdate: boolean;
   private localManifest: cc.Asset;
   private isRetry: boolean;
+  private currentVersion: string;
+  private newVersion: string
 
   setListener(listener: FW.HotUpdateListener): void {
     this.listener = listener;
@@ -41,7 +43,9 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
 
   private versionCompareHandle(currentVersion: string, newVersion: string): number {
     FWLog.debug('版本比较', currentVersion, newVersion);
-    this.listener.versionCompareHandle(currentVersion, newVersion);
+    this.currentVersion = currentVersion;
+    this.newVersion = newVersion;
+    this.listener.versionCompareHandle(this.currentVersion, this.newVersion);
     var vA = currentVersion.split('.');
     var vB = newVersion.split('.');
     for (var i = 0; i < vA.length; ++i) {
@@ -196,6 +200,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     }
 
     FWLog.debug('热更新中->', str);
+    FWLog.debug('热更新msg ->', msg);
     this.listener.hotUpdatingHandle?.(code, {
       percent: percent,
       downloadedFiles: downloadedFiles,
@@ -205,22 +210,25 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       convertDownloadedBytes: convertDownloadedBytes,
       convertTotalBytes: convertTotalBytes,
     });
-    FWLog.debug('热更新中结果 failed -> ', failed);
     if (failed) {
+      FWLog.debug('热更新中结果 failed -> ', failed);
       FWLog.debug('下载失败');
       this.assetMgr.setEventCallback(null!);
       this.isUpdate = false;
       this.retry();
     }
-    FWLog.debug('热更新中结果 needRestart -> ', needRestart);
     if (needRestart) {
+      FWLog.debug('热更新中结果 needRestart -> ', needRestart);
       FWLog.debug('下载完成');
       this.assetMgr.setEventCallback(null!);
+      this.assetMgr = null;
+      this.isRetry = false;
+      this.isUpdate = false;
       var searchPaths = jsb.fileUtils.getSearchPaths();
       var newPaths = this.assetMgr.getLocalManifest().getSearchPaths();
       Array.prototype.unshift.apply(searchPaths, newPaths);
       jsb.fileUtils.setSearchPaths(searchPaths);
-      this.listener.completedHandle?.();
+      this.listener.completedHandle?.(this.newVersion);
     }
   }
 

package/package.json

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