ucservice 2.3.2 → 2.3.4

package/dist/ucservice.common.js

@@ -13483,6 +13483,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         if (video == videoData[i].video) {
           me.close(i);
 
+          if (videoData[i].closeType = 'error') {
+            videoData[i].timer && clearInterval(videoData[i].timer);
+            videoData[i].timer = '0';
+            clearResult(videoData[i].tagBox.parent(), videoData[i]);
+          }
+
           if (!isSave) {
             videoData[i].closeType = 'close';
             me.dispatch('afterclose', videoData[i]);
@@ -15221,7 +15227,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
      */
 
   function showResult(videoObj, code, isShowReplayBtn, video) {
-    if (self.closeType == 'close' && !self.playing) return;
+    if (self.timer === '0') {
+      delete self.timer;
+      clearResult(videoObj.tagBox.parent(), videoObj);
+    }
+
     let videoDom = videoObj.tagBox.parent(); // videoDom.addClass("result");
 
     videoDom.find('.operate-btn .close-btn').show();
@@ -15241,13 +15251,14 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
     resultHtml += "</div>";
     videoDom.append(resultHtml);
-    let timer = null;
+    self.timer = null;
 
     if (second && mianVP) {
-      timer = setInterval(() => {
+      self.timer = setInterval(() => {
         second--;
         if (second > 0) videoDom.find('#replay-' + videoObj.index).text(second + '秒后自动尝试重连，点击立即重连');else if (second == 0) {
-          clearInterval(timer);
+          clearInterval(self.timer);
+          self.timer = null;
           videoObj.videoListener.dispatch("openVideo", {
             index: videoObj.index,
             video: video,
@@ -15261,8 +15272,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
     if (isShowReplayBtn && code != "4002") {
       $("#replay-" + videoObj.index).unbind("click").click(function () {
         second = 0;
-        clearInterval(timer);
-        timer = null;
+        clearInterval(self.timer);
+        self.timer = null;
         videoObj.videoListener.dispatch("openVideo", {
           index: videoObj.index,
           video: video,
@@ -15274,7 +15285,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
     if (code == "4002") {
       setTimeout(function () {
-        clearResult(videoDom);
+        clearResult(videoDom, videoObj);
       }, 2000);
     }
   }