@chiyou/minigame-framework 1.2.63 → 1.2.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chiyou/minigame-framework",
-  "version": "1.2.63",
+  "version": "1.2.65",
   "description": "基于 Cocos Creator 3.x 的小游戏开发框架，支持多平台发布",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/Framework/Manager/AdMgr.ts

@@ -281,24 +281,24 @@ export class AdMgr extends BaseMgr {
             }
 
             if (res === RewardedVideoAd_Callback_Status.Status_Watching) {
-                if (this.audioMgr === null) {
-                    this.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
+                if (AdMgr.Instance.audioMgr === null) {
+                    AdMgr.Instance.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
                 }
 
-                if (this.audioMgr) {
-                    this.audioMgr.pauseMusic();
+                if (AdMgr.Instance.audioMgr) {
+                    AdMgr.Instance.audioMgr.pauseMusic();
                 }
 
                 AdMgr.Instance.hideAllPermanentAd();
             } else if (res === RewardedVideoAd_Callback_Status.Status_Complete ||
                 res === RewardedVideoAd_Callback_Status.Status_Giveup ||
                 res === RewardedVideoAd_Callback_Status.Status_Error) {
-                if (this.audioMgr === null) {
-                    this.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
+                if (AdMgr.Instance.audioMgr === null) {
+                    AdMgr.Instance.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
                 }
 
-                if (this.audioMgr) {
-                    this.audioMgr.resumeMusic();
+                if (AdMgr.Instance.audioMgr) {
+                    AdMgr.Instance.audioMgr.resumeMusic();
                 }
 
                 AdMgr.Instance.showAllPermanentAd();

package/src/Framework/Manager/BaseMgr.ts

@@ -27,14 +27,9 @@ export abstract class BaseMgr extends Component {
     private onInit(): void {
         BaseMgr.Instance = this;
 
-        let sysPlatform: any = sys.platform;
-        LogUtils.Instance.info(BaseMgr.TAG, "系统平台检测", {
-            operation: "onInit",
-            sysPlatform: sysPlatform
-        });
-
         BaseMgr.currentPlatformID = PlatformID.ID_UNKNOWN;
 
+        let sysPlatform: any = sys.platform;
         if (sysPlatform === sys.Platform.DESKTOP_BROWSER) {
             BaseMgr.currentPlatformID = PlatformID.ID_H5_DesktopBrowser;
         }
@@ -85,13 +80,23 @@ export abstract class BaseMgr extends Component {
 
         try {
             if (window["qg"]) {
-                if (sysPlatform === sys.Platform.XIAOMI_QUICK_GAME) {
+                let provider: string = "";
+                if (window["qg"].getProvider) {
+                    provider = window["qg"].getProvider().toLowerCase();
+                }
+
+                LogUtils.Instance.info(BaseMgr.TAG, "qg.getProvider", {
+                    provider: provider
+                });
+
+                if (provider === "xiaomi" || provider === "redmi" || provider === "blackshark" ||
+                    sysPlatform === sys.Platform.XIAOMI_QUICK_GAME) {
                     BaseMgr.currentPlatformID = PlatformID.ID_QuickGame_XiaoMi;
-                } else if (sysPlatform === sys.Platform.OPPO_MINI_GAME) {
+                } else if (provider === "oppo" || sysPlatform === sys.Platform.OPPO_MINI_GAME) {
                     BaseMgr.currentPlatformID = PlatformID.ID_QuickGame_Oppo;
-                } else if (sysPlatform === sys.Platform.HONOR_MINI_GAME) {
+                } else if (provider === "honor" || sysPlatform === sys.Platform.HONOR_MINI_GAME) {
                     BaseMgr.currentPlatformID = PlatformID.ID_QuickGame_Honor;
-                } else if (sysPlatform === sys.Platform.VIVO_MINI_GAME) {
+                } else if (provider === "vivo" || sysPlatform === sys.Platform.VIVO_MINI_GAME) {
                     BaseMgr.currentPlatformID = PlatformID.ID_QuickGame_Vivo;
                 } else if (sysPlatform === sys.Platform.HUAWEI_QUICK_GAME) {
                     BaseMgr.currentPlatformID = PlatformID.ID_QuickGame_HuaWei;
@@ -100,7 +105,10 @@ export abstract class BaseMgr extends Component {
         } catch (e) {
         }
 
-        LogUtils.Instance.info(BaseMgr.TAG, "初始化完成");
+        LogUtils.Instance.info(BaseMgr.TAG, "初始化完成", {
+            currentPlatform: PlatformID[BaseMgr.currentPlatformID],
+            currentPlatformID: BaseMgr.currentPlatformID
+        });
     }
 
     /**