@ives_xxz/framework 1.6.6 → 2.0.1

package/manager/FWHotUpdateManager.ts

@@ -1,4 +1,3 @@
-import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
 const TEMOTE_ASSET = 'remote-asset';
@@ -15,16 +14,16 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
 
   setListener(listener: FW.HotUpdateListener): FW.HotUpdateManager {
     this.listener = listener;
-    FWLog.debug('热更新监听设置');
+    FW.Log.debug('热更新监听设置');
     return this;
   }
 
   public update(localManifest: cc.Asset) {
     if (!localManifest) {
-      FWLog.error('没有找到本地Manifest文件!');
+      FW.Log.error('没有找到本地Manifest文件!');
       return;
     }
-    FWLog.debug('开始热更新流程');
+    FW.Log.debug('开始热更新流程');
     this.localManifest = localManifest;
     this.storePath = `${jsb.fileUtils ? jsb.fileUtils.getWritablePath() : '/'}${TEMOTE_ASSET}`;
     this.assetMgr = new jsb.AssetsManager('', this.storePath, this.versionCompareHandle.bind(this));
@@ -43,7 +42,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private versionCompareHandle(currentVersion: string, newVersion: string): number {
-    FWLog.debug('版本比较', currentVersion, newVersion);
+    FW.Log.debug('版本比较', currentVersion, newVersion);
     this.currentVersion = currentVersion;
     this.newVersion = newVersion;
     this.listener.versionCompareHandle(this.currentVersion, this.newVersion);
@@ -74,7 +73,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private checkHotUpdate() {
-    FWLog.debug('checkHotUpdate1', this.isUpdate);
+    FW.Log.debug('checkHotUpdate1', this.isUpdate);
     if (this.isUpdate) {
       return;
     }
@@ -82,17 +81,17 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       this.assetMgr.loadLocalManifest(this.localManifest.nativeUrl);
     }
 
-    FWLog.debug('checkHotUpdate3', this.assetMgr.getLocalManifest());
+    FW.Log.debug('checkHotUpdate3', this.assetMgr.getLocalManifest());
 
-    FWLog.debug('checkHotUpdate4', this.assetMgr.getLocalManifest().isLoaded());
+    FW.Log.debug('checkHotUpdate4', this.assetMgr.getLocalManifest().isLoaded());
 
     if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
-      FWLog.debug('本地manifest未加载，尝试重新加载');
+      FW.Log.debug('本地manifest未加载，尝试重新加载');
       this.reloadLocalManifest();
 
       // 如果仍然无法加载，则返回
       if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
-        FWLog.error('无法加载本地manifest文件');
+        FW.Log.error('无法加载本地manifest文件');
         return;
       }
     }
@@ -109,37 +108,37 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
         this.assetMgr.loadLocalManifest(updatedManifestPath);
 
         if (this.assetMgr.getLocalManifest() && this.assetMgr.getLocalManifest().isLoaded()) {
-          FWLog.debug('本地manifest重新加载成功');
+          FW.Log.debug('本地manifest重新加载成功');
           this.localManifest = this.assetMgr.getLocalManifest();
         } else {
-          FWLog.error('本地manifest重新加载失败');
+          FW.Log.error('本地manifest重新加载失败');
         }
       } else {
-        FWLog.error('更新后的manifest文件不存在:', updatedManifestPath);
+        FW.Log.error('更新后的manifest文件不存在:', updatedManifestPath);
       }
     } catch (error) {
-      FWLog.error('重新加载本地manifest时出错:', error);
+      FW.Log.error('重新加载本地manifest时出错:', error);
     }
   }
 
   private checkEventHandle(event: any) {
     const code = event.getEventCode();
-    FWLog.debug('checkEvent getEventCode -> ', code);
+    FW.Log.debug('checkEvent getEventCode -> ', code);
     switch (code) {
       case jsb.EventAssetsManager.ERROR_NO_LOCAL_MANIFEST:
-        FWLog.debug('checkEvent getEventCode -> ', 'ERROR_NO_LOCAL_MANIFEST');
+        FW.Log.debug('checkEvent getEventCode -> ', 'ERROR_NO_LOCAL_MANIFEST');
         break;
       case jsb.EventAssetsManager.ERROR_DOWNLOAD_MANIFEST:
-        FWLog.debug('checkEvent getEventCode -> ', 'ERROR_DOWNLOAD_MANIFEST');
+        FW.Log.debug('checkEvent getEventCode -> ', 'ERROR_DOWNLOAD_MANIFEST');
         break;
       case jsb.EventAssetsManager.ERROR_PARSE_MANIFEST:
-        FWLog.debug('checkEvent getEventCode -> ', 'ERROR_PARSE_MANIFEST');
+        FW.Log.debug('checkEvent getEventCode -> ', 'ERROR_PARSE_MANIFEST');
         break;
       case jsb.EventAssetsManager.ALREADY_UP_TO_DATE:
-        FWLog.debug('checkEvent getEventCode -> ', 'ALREADY_UP_TO_DATE');
+        FW.Log.debug('checkEvent getEventCode -> ', 'ALREADY_UP_TO_DATE');
         break;
       case jsb.EventAssetsManager.NEW_VERSION_FOUND:
-        FWLog.debug('checkEvent getEventCode -> ', 'NEW_VERSION_FOUND');
+        FW.Log.debug('checkEvent getEventCode -> ', 'NEW_VERSION_FOUND');
         break;
       default:
         return;
@@ -148,7 +147,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     this.listener.checkHotUpdateHandle?.(code);
     this.assetMgr.setEventCallback(null!);
     this.isUpdate = false;
-    FWLog.debug(
+    FW.Log.debug(
       'isFind New Version -> ',
       event.getEventCode() == jsb.EventAssetsManager.NEW_VERSION_FOUND,
     );
@@ -158,10 +157,10 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private hotUpdate() {
-    FWLog.debug('start hotUpdate ->', this.assetMgr, this.isUpdate);
+    FW.Log.debug('start hotUpdate ->', this.assetMgr, this.isUpdate);
     if (this.assetMgr && !this.isUpdate) {
       this.assetMgr.setEventCallback(this.updateEventHandle.bind(this));
-      FWLog.debug(
+      FW.Log.debug(
         'assetMgr state ->',
         this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED,
       );
@@ -185,7 +184,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     let convertTotalBytes: string = '';
     const code = event.getEventCode();
     const msg = event.getMessage();
-    FWLog.debug('updateEvent getEventCode -> ', code);
+    FW.Log.debug('updateEvent getEventCode -> ', code);
     let str = '';
     switch (code) {
       case jsb.EventAssetsManager.ERROR_NO_LOCAL_MANIFEST:
@@ -194,7 +193,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
         break;
       case jsb.EventAssetsManager.UPDATE_PROGRESSION:
         str = 'UPDATE_PROGRESSION';
-        FWLog.debug('updateEvent percent -> ', event.getPercent());
+        FW.Log.debug('updateEvent percent -> ', event.getPercent());
         if (event.getPercent() > 0) {
           downloadedFiles = event.getDownloadedFiles();
           totalFiles = event.getTotalFiles();
@@ -203,7 +202,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
           convertDownloadedBytes = this.convertBytes(downloadedBytes);
           convertTotalBytes = this.convertBytes(totalBytes);
           percent = event.getPercent();
-          FWLog.debug(
+          FW.Log.debug(
             '正在更新中 -> ',
             '下载文件数量:',
             downloadedFiles,
@@ -236,7 +235,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
           convertDownloadedBytes = this.convertBytes(downloadedBytes);
           convertTotalBytes = this.convertBytes(totalBytes);
           percent = event.getPercent();
-          FWLog.debug(
+          FW.Log.debug(
             '正在更新完成 -> ',
             '下载文件数量:',
             downloadedFiles,
@@ -266,8 +265,8 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
         break;
     }
 
-    FWLog.debug('热更新中->', str);
-    FWLog.debug('热更新msg ->', msg);
+    FW.Log.debug('热更新中->', str);
+    FW.Log.debug('热更新msg ->', msg);
     this.listener.hotUpdatingHandle?.(code, {
       percent: percent,
       downloadedFiles: downloadedFiles,
@@ -278,15 +277,15 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       convertTotalBytes: convertTotalBytes,
     });
     if (failed) {
-      FWLog.debug('热更新中结果 failed -> ', failed);
-      FWLog.debug('下载失败');
+      FW.Log.debug('热更新中结果 failed -> ', failed);
+      FW.Log.debug('下载失败');
       this.assetMgr.setEventCallback(null!);
       this.isUpdate = false;
       this.retry();
     }
     if (needRestart) {
-      FWLog.debug('热更新中结果 needRestart -> ', needRestart);
-      FWLog.debug('下载完成');
+      FW.Log.debug('热更新中结果 needRestart -> ', needRestart);
+      FW.Log.debug('下载完成');
       const searchPaths = jsb.fileUtils.getSearchPaths();
       const newPaths = this.assetMgr.getLocalManifest().getSearchPaths();
       Array.prototype.unshift.apply(searchPaths, newPaths);

package/manager/FWLanguageManager.ts

@@ -1,4 +1,3 @@
-import { FWEventDefine } from '../define/FWEventDefine';
 import { FWManager } from './FWManager';
 
 export default class FWLanguageManager extends FWManager implements FW.LanguageManager {
@@ -91,7 +90,7 @@ export default class FWLanguageManager extends FWManager implements FW.LanguageM
   async initializeLanguage(language: string) {
     if (this.language == language) return;
     this.language = language;
-    FW.Entry.evtMgr.dispatch(FWEventDefine.LanguageEvent.LANGUAGE_CHANGE);
+    FW.Entry.evtMgr.dispatch(FW.EventDefine.LanguageEvent.LANGUAGE_CHANGE);
   }
 
   getLanguageIndex() {