@ives_xxz/framework 1.1.6 → 1.1.8

package/manager/FWHotUpdateManager.ts

@@ -77,20 +77,51 @@ 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()) {
-      return;
+      FWLog.debug('本地manifest未加载，尝试重新加载');
+      this.reloadLocalManifest();
+
+      // 如果仍然无法加载，则返回
+      if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
+        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);
@@ -181,6 +212,16 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
         failed = true;
         break;
       case jsb.EventAssetsManager.UPDATE_FINISHED:
+        if (event.getPercent() > 0) {
+          downloadedFiles = event.getDownloadedFiles();
+          totalFiles = event.getTotalFiles();
+          downloadedBytes = event.getDownloadedBytes();
+          totalBytes = event.getTotalBytes();
+          convertDownloadedBytes = this.convertBytes(downloadedBytes);
+          convertTotalBytes = this.convertBytes(totalBytes);
+          percent = event.getPercent();
+          FWLog.debug('正在更新完成 -> ', '下载文件数量:', downloadedFiles, ',下载文件总数量:', totalFiles, ',已下载大小:', convertDownloadedBytes, ',下载总大小:', convertTotalBytes);
+        }
         str = 'UPDATE_FINISHED';
         needRestart = true;
         break;
@@ -220,14 +261,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.reloadLocalManifest();
+
+      this.assetMgr.setEventCallback(null!);
       this.listener.completedHandle?.(this.newVersion);
 
     }

package/package.json

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