ucservice 2.2.2 → 2.2.4

package/dist/ucservice.common.js

@@ -15124,16 +15124,16 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
   let CONST_CODE = {
     //打开失败错误码,面板显示,不做浮窗提示框显示
     VIDEO_CODE: {
-      2002: "打开失败，未找到该ID的视频源",
-      2003: "打开失败，请确认视频服务版本",
-      3001: "打开失败，未接收到引流包，请检查端口映射",
+      2002: "未找到该ID的视频源",
+      2003: "请确认视频服务版本",
+      3001: "未接收到引流包，请检查端口映射",
       3002: "",
-      3003: "打开失败，对方拒绝视频请求",
-      4001: "打开失败，视频流中断",
-      4002: "打开失败，终端挂机或超时未接听",
-      7000: "打开失败，无法连接视频设备",
-      7001: "打开失败，无法连接视频设备",
-      7002: "打开失败，无法连接视频设备"
+      3003: "对方拒绝视频请求",
+      4001: "视频流中断",
+      4002: "终端挂机或超时未接听",
+      7000: "无法连接视频设备",
+      7001: "无法连接视频设备",
+      7002: "无法连接视频设备"
     },
     OTHER_CODE: {
       453: "videoServer连接失败，错误码453",
@@ -15212,8 +15212,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
      */
 
   function showResult(videoObj, code, isShowReplayBtn, video) {
-    let videoDom = videoObj.tagBox.parent();
-    videoDom.addClass("result");
+    let videoDom = videoObj.tagBox.parent(); // videoDom.addClass("result");
+
     videoDom.find('.operate-btn .close-btn').show();
 
     if (CONST_CODE.FAILED_CODE[code] && code != "4002") {
@@ -15234,14 +15234,17 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
     let timer = null;
 
     if (second && mianVP) {
-      timer = setTimeout(() => {
+      timer = setInterval(() => {
         second--;
-        if (second > 0) videoDom.find('#replay-' + videoObj.index).text(second + '秒后自动尝试重连，点击立即重连');else if (second == 0) videoObj.videoListener.dispatch("openVideo", {
-          index: videoObj.index,
-          video: video,
-          id: videoObj.id,
-          opts: videoObj.opts
-        });
+        if (second > 0) videoDom.find('#replay-' + videoObj.index).text(second + '秒后自动尝试重连，点击立即重连');else if (second == 0) {
+          clearInterval(timer);
+          videoObj.videoListener.dispatch("openVideo", {
+            index: videoObj.index,
+            video: video,
+            id: videoObj.id,
+            opts: videoObj.opts
+          });
+        }
       }, 1000);
     }
 
@@ -15249,7 +15252,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       $("#replay-" + videoObj.index).unbind("click").click(function () {
         debugger;
         second = 0;
-        clearTimeout(timer);
+        clearInterval(timer);
         timer = null;
         videoObj.videoListener.dispatch("openVideo", {
           index: videoObj.index,
@@ -15347,6 +15350,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
             promptFailed("请先登陆");
           }
 
+          debugger;
           let video = self.video;
 
           if (msg.error_code) {
@@ -15373,7 +15377,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
             if (!CONST_CODE.STATUS_CODE_ARR.includes(result.error_code + '')) {
               //videoListener.dispatch('afterclose', self); 
               //播放失败 关闭视频
-              self.close('err');
+              if (result.error_code + '' != '4001') self.close('err');
 
               if (self.isLockVideo) {
                 setTimeout(function () {