@ives_xxz/framework 1.1.5 → 1.1.7

package/FW.d.ts

@@ -214,7 +214,8 @@ declare namespace FW {
   };
 
   type SocketPromiseProxy = {
-    promise: Function;
+    promise: Promise<FW.Socket>;
+    resolve: Function;
     socket: FW.Socket;
   };
 

package/manager/FWHotUpdateManager.ts

@@ -84,7 +84,11 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     FWLog.debug('checkHotUpdate3', this.assetMgr.getLocalManifest());
     FWLog.debug('checkHotUpdate4', this.assetMgr.getLocalManifest().isLoaded());
     if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
-      return;
+      this.assetMgr.loadLocalManifest(this.localManifest.nativeUrl);
+      if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
+        FWLog.error('Failed to load local manifest');
+        return;
+      }
     }
     this.assetMgr.setEventCallback(this.checkEventHandle.bind(this));
     this.assetMgr.checkUpdate();
@@ -181,6 +185,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;

package/manager/FWSocketManager.ts

@@ -13,7 +13,7 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
   public initialize(): void {
     this.socketMap = new Map<string, FW.Socket>();
   }
-  public onDestroy(): void {}
+  public onDestroy(): void { }
 
   /**
    * 创建一个socket
@@ -39,7 +39,7 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
     });
     this.socketMap.set(tag, proxy.socket);
 
-    await proxy.promise();
+    await proxy.promise;
 
     return proxy.socket;
   }

package/package.json

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

package/service/socket/FWSocket.ts

@@ -101,12 +101,14 @@ export default class FWSocket implements FW.Socket {
 
     this.promiseProxy = {
       promise: undefined,
+      resolve: undefined,
       socket: this,
     };
 
-    new Promise<FWSocket>((resolve) => {
-      this.promiseProxy.promise = resolve;
+    this.promiseProxy.promise = new Promise<FW.Socket>((resolve) => {
+      this.promiseProxy.resolve = resolve;
     });
+
     return this.promiseProxy;
   }
   /**
@@ -206,7 +208,7 @@ export default class FWSocket implements FW.Socket {
     this.isReconnect = false;
     this.handle?.onOpen?.();
     this.heartHandle();
-    this.promiseProxy?.promise(this);
+    this.promiseProxy?.resolve(this);
   }
 
   private heartHandle() {