@ives_xxz/framework 1.1.7 → 1.1.9

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 = {

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) {
@@ -77,24 +78,50 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     if (this.isUpdate) {
       return;
     }
-    FWLog.debug('checkHotUpdate2', this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED);
     if (this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED) {
       this.assetMgr.loadLocalManifest(this.localManifest.nativeUrl);
     }
+
     FWLog.debug('checkHotUpdate3', this.assetMgr.getLocalManifest());
+
     FWLog.debug('checkHotUpdate4', this.assetMgr.getLocalManifest().isLoaded());
+
     if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
-      this.assetMgr.loadLocalManifest(this.localManifest.nativeUrl);
+      FWLog.debug('本地manifest未加载，尝试重新加载');
+      this.reloadLocalManifest();
+
+      // 如果仍然无法加载，则返回
       if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
-        FWLog.error('Failed to load local manifest');
+        FWLog.error('无法加载本地manifest文件');
         return;
       }
     }
+
     this.assetMgr.setEventCallback(this.checkEventHandle.bind(this));
     this.assetMgr.checkUpdate();
     this.isUpdate = true;
   }
 
+  private reloadLocalManifest() {
+    try {
+      const updatedManifestPath = `${this.storePath}/project.manifest`;
+      if (jsb.fileUtils.isFileExist(updatedManifestPath)) {
+        this.assetMgr.loadLocalManifest(updatedManifestPath);
+
+        if (this.assetMgr.getLocalManifest() && this.assetMgr.getLocalManifest().isLoaded()) {
+          FWLog.debug('本地manifest重新加载成功');
+          this.localManifest = this.assetMgr.getLocalManifest();
+        } else {
+          FWLog.error('本地manifest重新加载失败');
+        }
+      } else {
+        FWLog.error('更新后的manifest文件不存在:', updatedManifestPath);
+      }
+    } catch (error) {
+      FWLog.error('重新加载本地manifest时出错:', error);
+    }
+  }
+
   private checkEventHandle(event: any) {
     const code = event.getEventCode();
     FWLog.debug('checkEvent getEventCode -> ', code);
@@ -121,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();
     }
@@ -131,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);
       }
@@ -170,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:
@@ -193,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;
@@ -234,16 +287,17 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     if (needRestart) {
       FWLog.debug('热更新中结果 needRestart -> ', needRestart);
       FWLog.debug('下载完成');
-      this.assetMgr.setEventCallback(null!);
-      var searchPaths = jsb.fileUtils.getSearchPaths();
-      var newPaths = this.assetMgr.getLocalManifest().getSearchPaths();
+      const searchPaths = jsb.fileUtils.getSearchPaths();
+      const newPaths = this.assetMgr.getLocalManifest().getSearchPaths();
       Array.prototype.unshift.apply(searchPaths, newPaths);
       jsb.fileUtils.setSearchPaths(searchPaths);
       this.isRetry = false;
       this.isUpdate = false;
-      this.assetMgr = null;
-      this.listener.completedHandle?.(this.newVersion);
 
+      this.reloadLocalManifest();
+
+      this.assetMgr.setEventCallback(null!);
+      this.listener.completedHandle?.(this.newVersion);
     }
   }
 
@@ -258,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/package.json

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