From 5d1001a1332328616d35b1ae9e38db6cd04a9f3d Mon Sep 17 00:00:00 2001
From: 宋庆平 <alrsong@puchigames.com>
Date: Fri, 28 Oct 2022 19:44:22 +0800
Subject: [PATCH] x

---
 wxsdk/WXSDK.ts                     |  5 ++---
 wxsdk/base/SDKConst.ts             |  2 +-
 wxsdk/base/SDKDefault.ts           |  2 ++
 wxsdk/http/SDKHttp.ts              |  6 +++---
 wxsdk/service/ShareVideoService.ts | 17 ++++++++++++-----
 wxsdk/share/SDKVideo.ts            |  4 ++--
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/wxsdk/WXSDK.ts b/wxsdk/WXSDK.ts
index f97c1b1..c7647b5 100644
--- a/wxsdk/WXSDK.ts
+++ b/wxsdk/WXSDK.ts
@@ -36,11 +36,10 @@ export default class WXSDK {
 
 
     public static async init() {
-        // await platf
         if (this.isWx) {
             WxInit.I.init();
-            //视频预加载  启动预加载视频会闪屏
-            if (cc.sys.platform === cc.sys.WECHAT_GAME) {
+            // 视频预加载  启动预加载视频会闪屏
+            if (cc.sys.platform === cc.sys.WECHAT_GAME && typeof qq == 'undefined') {
                 setTimeout(() => {
                     WxInterstitial.initInterstitialAd();//插屏预加载
                     ShareVideoService.I.preloadVideo();
diff --git a/wxsdk/base/SDKConst.ts b/wxsdk/base/SDKConst.ts
index bd82e29..475582d 100644
--- a/wxsdk/base/SDKConst.ts
+++ b/wxsdk/base/SDKConst.ts
@@ -35,7 +35,7 @@ export const GAMEDATA = {
 
 
 // sdk版本
-export const SDKVersion = 'v1.0.12';
+export const SDKVersion = 'v1.0.13';
 // 是否打印
 export const __LOG__ = false;
 // 是否mock
diff --git a/wxsdk/base/SDKDefault.ts b/wxsdk/base/SDKDefault.ts
index 6920d2d..59a7e90 100644
--- a/wxsdk/base/SDKDefault.ts
+++ b/wxsdk/base/SDKDefault.ts
@@ -7,6 +7,8 @@ interface IResult<T> {
     msg?: string;
     /** 返回数据 */
     data?: T;
+    /** 服务器时间 */
+    servertime?: number;
 }
 
 /** 微信api 返回用户信息 */
diff --git a/wxsdk/http/SDKHttp.ts b/wxsdk/http/SDKHttp.ts
index 1e4402c..2934c98 100644
--- a/wxsdk/http/SDKHttp.ts
+++ b/wxsdk/http/SDKHttp.ts
@@ -43,9 +43,9 @@ export default class SDKHttp {
                             responseText = JSON.parse(responseText);
                             // cc.log("responseText22", responseText)
                             if (url.indexOf('.json') > -1) {
-                                resolve({ code: 0, data: responseText, msg: responseText.msg });
+                                resolve({ code: 0, data: responseText, msg: responseText.msg , servertime: responseText.servertime});
                             } else {
-                                resolve({ code: +responseText.code, data: responseText.data, msg: responseText.msg });
+                                resolve({ code: +responseText.code, data: responseText.data, msg: responseText.msg , servertime: responseText.servertime});
                             }
                             return
                         } catch (ex) {
@@ -119,7 +119,7 @@ export default class SDKHttp {
 
         url = baseUrl + url;
         let res = await this.httpRequest(url, "POST", data, dataType);
-        if (this.onErrorResponse && !res.code) {
+        if (this.onErrorResponse && res.code) {
             //
             this.onErrorResponse(res);
         }
diff --git a/wxsdk/service/ShareVideoService.ts b/wxsdk/service/ShareVideoService.ts
index dc2a73a..95ed14a 100644
--- a/wxsdk/service/ShareVideoService.ts
+++ b/wxsdk/service/ShareVideoService.ts
@@ -27,19 +27,26 @@ export default class ShareVideoService {
         this.forward(this.forwardKey);
     }
 
-    async init() {
+    private cnt: number = 1
+    async initList() { //初始化List
         let data = await SDKApi.ShareList();
+        if (data.code) {
+            console.log('拉取ShareList失败！')
+            setTimeout(this.initList.bind(this), 200 * this.cnt)
+            this.cnt++;
+            return
+        }
         this.setShareVideoData(data);
-        // console.log(JSON.stringify(data))
+        if (this.forwardKey) this.forward(this.forwardKey);
+    }
+    async init() {
+        this.initList();
         SDKShare.I.updateShareMenu(true);//打开群分享
-
         if (cc.sys.platform === cc.sys.WECHAT_GAME) {
             if (GAMEDATA.shareMessageToFriend.scene > 0) {
                 wx.setMessageToFriendQuery({ shareMessageToFriendScene: GAMEDATA.shareMessageToFriend.scene })
             }
         }
-
-        if (this.forwardKey) this.forward(this.forwardKey);
     }
 
     preload = true;
diff --git a/wxsdk/share/SDKVideo.ts b/wxsdk/share/SDKVideo.ts
index da4bb97..00dcf0c 100644
--- a/wxsdk/share/SDKVideo.ts
+++ b/wxsdk/share/SDKVideo.ts
@@ -140,8 +140,8 @@ export default class SDKVideo {
             // __LOG__ && console.warn("handleLoaded2", that.videoAd, that.videoAd.isReady());
             LogService.I.adStat(this.videoKey, this.adUnitId, DOT_AD_TYPE.video, DOT_AD_STATUS.show)
 
-            if (cc.sys.platform === cc.sys.WECHAT_GAME) {
-                if (that.videoAd.isReady()) {//抖音没有 isReady
+            if (cc.sys.platform === cc.sys.WECHAT_GAME && typeof qq == 'undefined') {
+                if (that.videoAd.isReady()) {//抖音、qq 没有 isReady
                     that.show_time = Date.now();
                     await that.videoAd.show();
                 } else {
--
libgit2 0.21.0