fix(推流广告): 修复bug

screenIos/WXtrialInterface.html

@@ -208,8 +208,8 @@
           muted
           autoplay="autoplay"
           loop="loop"
-          webkit-playsinline
-          playsinline
+          webkit-playsinline="true"
+          playsinline="true"
           x5-video-player-type="h5-page"
         >
           您的浏览器不支持 video 标签。
@@ -350,7 +350,12 @@
       url = url.split('/');
       var baseUrl = url[0] + '//' + url[2];
       console.log(baseUrl);
-      // baseUrl = 'http://gntest.phone.androidscloud.com:1280';
+      // if (
+      //   /^192\.168\./.test(location.host) ||
+      //   /^localhost/.test(location.host)
+      // ) {
+      //   baseUrl = 'http://gntest.phone.androidscloud.com:1280';
+      // }
       var parameters = GetRequest();
       var form = {};
       form.token = parameters['token'];
@@ -969,10 +974,10 @@
       let adLastTime = 0; // 广告时间
       let intervalTime = 0; // 间隔时间
       // let adType = 0;
-      sourceType = isNaN(+parameters['sourceType'])
-        ? 0
-        : +parameters['sourceType'];
-
+      console.log(
+        '🚀 ~ file: WXtrialInterface.html ~ line 973 ~ sourceType',
+        sourceType,
+      );
       // 拉取广告数据
       function getAD() {
         return $.ajax({
@@ -1048,52 +1053,62 @@
        * 解决方案，初始化时预先请求广告数据，在用户对云手机touchmove事件中去播放广告并请求下一次广告数据。
        */
       function initAD() {
-        switch (sourceType) {
-          case 1: {
-            getSetmealList().then(function (res) {
-              intervalTime =
-                res.intervalSwitch === 1
-                  ? res.intervalAdvertDuration * 1000 * 60
-                  : 0;
-              if (res.pushFlowAdvert === 1) {
-                adType = 15;
-                adTime = 0;
-              } else if (intervalTime > 0) {
-                adType = 16;
-                adTime = date.now();
-              }
-            });
-
-            break;
-          }
-          case 2: {
-            getConfigByPhoneType().then(function (res) {
-              if (res.isDisconnectionTime === 1) {
-                let time = res.disconnectionTime * 60 * 1000;
-                setTimeout(() => {
-                  disconnectionFlag = true;
-                  $('.buy-phone-wrap').eq(0).show();
-                }, time);
-              }
+        sourceType = isNaN(parameters['sourceType'])
+          ? 0
+          : +parameters['sourceType'];
+        console.log(
+          '🚀 ~ file: WXtrialInterface.html ~ line 1052 ~ initAD ~ sourceType',
+          sourceType,
+        );
+        (function () {
+          switch (sourceType) {
+            case 1: {
+              return getSetmealList().then(function (res) {
+                intervalTime =
+                  res.intervalSwitch === 1
+                    ? res.intervalAdvertDuration * 1000 * 60
+                    : 0;
+                if (res.pushFlowAdvert === 1) {
+                  adType = 15;
+                  adTime = 0;
+                } else if (intervalTime > 0) {
+                  adType = 16;
+                  adTime = date.now();
+                }
+              });
+            }
+            case 2: {
+              return getConfigByPhoneType().then(function (res) {
+                if (res.isDisconnectionTime === 1) {
+                  let time = res.disconnectionTime * 60 * 1000;
+                  setTimeout(() => {
+                    disconnectionFlag = true;
+                    $('.buy-phone-wrap').eq(0).show();
+                  }, time);
+                }
 
-              intervalTime =
-                res.isIntervalPlayAd === 1
-                  ? res.intervalPlayAdTime * 1000 * 60
-                  : 0;
-              if (res.isShowAd === 1) {
-                adType = 15;
-                adTime = 0;
-              } else if (intervalTime > 0) {
-                adType = 16;
-                adTime = date.now();
-              }
-            });
-            break;
+                intervalTime =
+                  res.isIntervalPlayAd === 1
+                    ? res.intervalPlayAdTime * 1000 * 60
+                    : 0;
+                if (res.isShowAd === 1) {
+                  adType = 15;
+                  adTime = 0;
+                } else if (intervalTime > 0) {
+                  adType = 16;
+                  adTime = date.now();
+                }
+              });
+            }
+            default: {
+              return Promise.reject();
+            }
           }
-        }
-
-        this.$('#playCanvas').on('touchmove', playAD);
-        getAD();
+        })().then(function () {
+          console.log(adType);
+          this.$('#playCanvas').on('touchmove', playAD);
+          getAD();
+        });
       }
 
       //间隔广告上报