inl-ui 0.1.124 → 0.1.126-video

package/dist/components/index.cjs

@@ -211,20 +211,18 @@ function getIframeUrl(url) {
 async function checkIframeUrl(url) {
   const iframeUrl = getIframeUrl(url);
   let code = 200;
-  if (url.indexOf("noCheck") === -1) {
-    try {
-      const res = await fetch(`/api/common/v1/sysconfig/curlForResponseCode?requestMethod=get&url=${encodeURIComponent(iframeUrl)}`, {
-        headers: getCommonHeaders()
-      });
-      if (res.status !== 404) {
-        const json = await res.json();
-        code = json.data;
-        if (json.code === "M5001") {
-          code = 500;
-        }
+  try {
+    const res = await fetch(`/api/common/v1/sysconfig/curlForResponseCode?requestMethod=get&url=${encodeURIComponent(iframeUrl)}`, {
+      headers: getCommonHeaders()
+    });
+    if (res.status !== 404) {
+      const json = await res.json();
+      code = json.data;
+      if (json.code === "M5001") {
+        code = 500;
       }
-    } catch (e) {}
-  }
+    }
+  } catch (e) {}
   return code;
 }
 
@@ -6382,6 +6380,7 @@ const Endpoint = RTCEndpoint;
 class WebRtcMt$1 {
   constructor(opt) {
     this.opt = opt;
+    this.p_player = vue.ref();
     this.init(opt);
   }
   opt;
@@ -6421,7 +6420,7 @@ class WebRtcMt$1 {
     if (opt.h) this.config.h = opt.h;
     if (opt.w) this.config.w = opt.w;
     if (Object.prototype.toString.call(opt.plays) === "[object Object]") {
-      this.p_player = this.createVideo(opt.plays);
+      this.p_player.value = this.createVideo(opt.plays);
     } else {
       for (const i of opt.plays) {
         this.createVideo(i);
@@ -6442,19 +6441,15 @@ class WebRtcMt$1 {
         response.json().then(res => {
           if (res.code === 0) {
             this.startPlay(plays);
+            resolve(res);
           } else {
             console.log("\u62C9\u6D41\u63A5\u53E3\u8FD4\u56DE\u5931\u8D25");
-            setTimeout(() => {
-              this.rePlay();
-            }, 3 * 60 * 1e3);
+            reject("error");
           }
-          resolve(res);
         });
       }).catch(err => {
         console.log("\u62C9\u6D41\u63A5\u53E3\u5931\u8D25");
-        setTimeout(() => {
-          this.rePlay();
-        }, 3 * 60 * 1e3);
+        reject("error");
       });
     });
   }
@@ -6510,7 +6505,7 @@ class WebRtcMt$1 {
       this.rePlay(videoElm);
     });
     player.on(Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, state => {
-      this.log("warn", state);
+      console.log("webrtc:" + state);
       if (state === "disconnected" || state === "failed") {
         this.rePlay(videoElm);
       }
@@ -6521,13 +6516,12 @@ class WebRtcMt$1 {
     console.log("\u5E95\u90E8\u505C\u6B62\u64AD\u653E");
     this.stopPlay();
     setTimeout(() => {
-      console.log("\u5E95\u90E8\u91CD\u64AD");
-      this.init(this.opt);
-    }, 5 * 1e3);
+      this.p_player.value = "error";
+      console.log("\u5E95\u90E8\u91CD\u64AD", this.p_player.value);
+    }, 3 * 1e3);
   }
   // 播放
   play(videoElm) {
-    console.log("\u5F00\u59CB\u89C6\u9891\u521D\u59CB\u5316");
     const plays = this.mediaServerAddrMap.get(videoElm);
     const {
       sdpUrl
@@ -8732,24 +8726,20 @@ const getDetailContainer = () => vue.defineComponent({
       }
     };
     const addTab = ___default["default"].debounce(newRoute => {
-      dataId.value = newRoute.params.id || newRoute.query.id;
+      dataId.value = newRoute.params.id;
       const {
-        name,
-        newTab
+        name
       } = route.query;
-      if (newTab) {
-        dataId.value = newTab;
-      }
       const tab = {
         name,
         url: route.fullPath,
         key: props.name,
-        uniqueKey: dataId.value,
+        uniqueKey: newRoute.params.id,
         icon: props.icon,
         isExtraTab: true,
         params: ___default["default"].omit(route.query, "name")
       };
-      const detail = detailList.value.find(item => item.key + item.uniqueKey === tab.key + tab.uniqueKey);
+      const detail = detailList.value.find(item => item.uniqueKey === tab.uniqueKey);
       if (detail) {
         detail.url = newRoute.fullPath;
         if (Array.isArray(qiankunState.value.extraTabs)) {
@@ -8765,7 +8755,7 @@ const getDetailContainer = () => vue.defineComponent({
         detailList.value.push({
           ...tab,
           refreshKey: Date.now(),
-          id: dataId.value
+          id: newRoute.params.id
         });
         console.log("detailList.value", detailList.value);
         setTimeout(() => {
@@ -8944,7 +8934,7 @@ const VideoPlayerV2 = vue.defineComponent({
   props: props$8,
   emits: ["changeStream"],
   setup(_prop, _context) {
-    let play;
+    let play = vue.reactive({});
     const uuid = _prop.domId;
     const videoFull = id => {
       const elm = document.getElementById(`videoPlayer_${uuid}`);
@@ -8965,19 +8955,18 @@ const VideoPlayerV2 = vue.defineComponent({
     };
     const videoInfo2 = vue.ref({});
     const stopPlay = () => {
-      if (play) {
+      if ("stopPlay" in play) {
         play.stopPlay(`videoPlayer_${uuid}`);
       }
     };
     const init = () => {
-      play = null;
       let camera = videoInfo2.value;
       camera = {
         ...camera,
         ..._prop.cameraConfig
       };
       let url = camera.webrtcTemplateMerged;
-      play = new WebRtcMt$1({
+      play = vue.reactive(new WebRtcMt$1({
         plays: {
           videoElm: `videoPlayer_${uuid}`,
           mediaServerAddr: camera.mediaServerPo.url,
@@ -8989,8 +8978,22 @@ const VideoPlayerV2 = vue.defineComponent({
           cameraStream: camera.streamType,
           addRtspProxyUrl: url
         }
-      });
+      }));
+      const {
+        p_player
+      } = vue.toRefs(play);
+      playerRef.value = core.resolveRef(p_player);
     };
+    const playerRef = vue.ref();
+    vue.watchEffect(() => {
+      if (playerRef.value) {
+        if (playerRef.value.value === "error") {
+          console.log("p_player ===> add 500");
+          stopPlay();
+          getVideoDetail(_prop.camera);
+        }
+      }
+    });
     const releaseUrl = vue.ref("");
     const release = async () => {
       const res = await axios__default["default"].get(releaseUrl.value);

package/dist/components/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, createVNode, ref, watch, resolveComponent, isVNode, computed, onBeforeUnmount, inject, onActivated, onDeactivated, nextTick, watchEffect, Fragment, withDirectives, vShow, toRaw, reactive, provide, createTextVNode, onMounted, KeepAlive, shallowRef, onBeforeMount, mergeProps, onBeforeUpdate, Teleport } from 'vue';
+import { defineComponent, createVNode, ref, watch, resolveComponent, isVNode, computed, onBeforeUnmount, inject, onActivated, onDeactivated, nextTick, watchEffect, Fragment, withDirectives, vShow, toRaw, reactive, provide, createTextVNode, onMounted, KeepAlive, toRefs, shallowRef, onBeforeMount, mergeProps, onBeforeUpdate, Teleport } from 'vue';
 import { createFromIconfontCN, SearchOutlined, DownOutlined, PoweroffOutlined, MenuUnfoldOutlined, MenuFoldOutlined, SkinFilled, FullscreenOutlined, CaretUpOutlined, CaretRightOutlined, CaretDownOutlined, FileExcelTwoTone, InboxOutlined, MessageOutlined } from '@ant-design/icons-vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useMounted, resolveRef, useThrottleFn, useLocalStorage, useFullscreen, useMouseInElement, useVModel, useMagicKeys, whenever, watchArray, useEventListener, useSessionStorage, useElementBounding, useToggle, useMemory, useWindowSize, useClipboard, useBreakpoints, breakpointsAntDesign } from '@vueuse/core';
@@ -183,20 +183,18 @@ function getIframeUrl(url) {
 async function checkIframeUrl(url) {
   const iframeUrl = getIframeUrl(url);
   let code = 200;
-  if (url.indexOf("noCheck") === -1) {
-    try {
-      const res = await fetch(`/api/common/v1/sysconfig/curlForResponseCode?requestMethod=get&url=${encodeURIComponent(iframeUrl)}`, {
-        headers: getCommonHeaders()
-      });
-      if (res.status !== 404) {
-        const json = await res.json();
-        code = json.data;
-        if (json.code === "M5001") {
-          code = 500;
-        }
+  try {
+    const res = await fetch(`/api/common/v1/sysconfig/curlForResponseCode?requestMethod=get&url=${encodeURIComponent(iframeUrl)}`, {
+      headers: getCommonHeaders()
+    });
+    if (res.status !== 404) {
+      const json = await res.json();
+      code = json.data;
+      if (json.code === "M5001") {
+        code = 500;
       }
-    } catch (e) {}
-  }
+    }
+  } catch (e) {}
   return code;
 }
 
@@ -6354,6 +6352,7 @@ const Endpoint = RTCEndpoint;
 class WebRtcMt$1 {
   constructor(opt) {
     this.opt = opt;
+    this.p_player = ref();
     this.init(opt);
   }
   opt;
@@ -6393,7 +6392,7 @@ class WebRtcMt$1 {
     if (opt.h) this.config.h = opt.h;
     if (opt.w) this.config.w = opt.w;
     if (Object.prototype.toString.call(opt.plays) === "[object Object]") {
-      this.p_player = this.createVideo(opt.plays);
+      this.p_player.value = this.createVideo(opt.plays);
     } else {
       for (const i of opt.plays) {
         this.createVideo(i);
@@ -6414,19 +6413,15 @@ class WebRtcMt$1 {
         response.json().then(res => {
           if (res.code === 0) {
             this.startPlay(plays);
+            resolve(res);
           } else {
             console.log("\u62C9\u6D41\u63A5\u53E3\u8FD4\u56DE\u5931\u8D25");
-            setTimeout(() => {
-              this.rePlay();
-            }, 3 * 60 * 1e3);
+            reject("error");
           }
-          resolve(res);
         });
       }).catch(err => {
         console.log("\u62C9\u6D41\u63A5\u53E3\u5931\u8D25");
-        setTimeout(() => {
-          this.rePlay();
-        }, 3 * 60 * 1e3);
+        reject("error");
       });
     });
   }
@@ -6482,7 +6477,7 @@ class WebRtcMt$1 {
       this.rePlay(videoElm);
     });
     player.on(Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, state => {
-      this.log("warn", state);
+      console.log("webrtc:" + state);
       if (state === "disconnected" || state === "failed") {
         this.rePlay(videoElm);
       }
@@ -6493,13 +6488,12 @@ class WebRtcMt$1 {
     console.log("\u5E95\u90E8\u505C\u6B62\u64AD\u653E");
     this.stopPlay();
     setTimeout(() => {
-      console.log("\u5E95\u90E8\u91CD\u64AD");
-      this.init(this.opt);
-    }, 5 * 1e3);
+      this.p_player.value = "error";
+      console.log("\u5E95\u90E8\u91CD\u64AD", this.p_player.value);
+    }, 3 * 1e3);
   }
   // 播放
   play(videoElm) {
-    console.log("\u5F00\u59CB\u89C6\u9891\u521D\u59CB\u5316");
     const plays = this.mediaServerAddrMap.get(videoElm);
     const {
       sdpUrl
@@ -8704,24 +8698,20 @@ const getDetailContainer = () => defineComponent({
       }
     };
     const addTab = _.debounce(newRoute => {
-      dataId.value = newRoute.params.id || newRoute.query.id;
+      dataId.value = newRoute.params.id;
       const {
-        name,
-        newTab
+        name
       } = route.query;
-      if (newTab) {
-        dataId.value = newTab;
-      }
       const tab = {
         name,
         url: route.fullPath,
         key: props.name,
-        uniqueKey: dataId.value,
+        uniqueKey: newRoute.params.id,
         icon: props.icon,
         isExtraTab: true,
         params: _.omit(route.query, "name")
       };
-      const detail = detailList.value.find(item => item.key + item.uniqueKey === tab.key + tab.uniqueKey);
+      const detail = detailList.value.find(item => item.uniqueKey === tab.uniqueKey);
       if (detail) {
         detail.url = newRoute.fullPath;
         if (Array.isArray(qiankunState.value.extraTabs)) {
@@ -8737,7 +8727,7 @@ const getDetailContainer = () => defineComponent({
         detailList.value.push({
           ...tab,
           refreshKey: Date.now(),
-          id: dataId.value
+          id: newRoute.params.id
         });
         console.log("detailList.value", detailList.value);
         setTimeout(() => {
@@ -8916,7 +8906,7 @@ const VideoPlayerV2 = defineComponent({
   props: props$8,
   emits: ["changeStream"],
   setup(_prop, _context) {
-    let play;
+    let play = reactive({});
     const uuid = _prop.domId;
     const videoFull = id => {
       const elm = document.getElementById(`videoPlayer_${uuid}`);
@@ -8937,19 +8927,18 @@ const VideoPlayerV2 = defineComponent({
     };
     const videoInfo2 = ref({});
     const stopPlay = () => {
-      if (play) {
+      if ("stopPlay" in play) {
         play.stopPlay(`videoPlayer_${uuid}`);
       }
     };
     const init = () => {
-      play = null;
       let camera = videoInfo2.value;
       camera = {
         ...camera,
         ..._prop.cameraConfig
       };
       let url = camera.webrtcTemplateMerged;
-      play = new WebRtcMt$1({
+      play = reactive(new WebRtcMt$1({
         plays: {
           videoElm: `videoPlayer_${uuid}`,
           mediaServerAddr: camera.mediaServerPo.url,
@@ -8961,8 +8950,22 @@ const VideoPlayerV2 = defineComponent({
           cameraStream: camera.streamType,
           addRtspProxyUrl: url
         }
-      });
+      }));
+      const {
+        p_player
+      } = toRefs(play);
+      playerRef.value = resolveRef(p_player);
     };
+    const playerRef = ref();
+    watchEffect(() => {
+      if (playerRef.value) {
+        if (playerRef.value.value === "error") {
+          console.log("p_player ===> add 500");
+          stopPlay();
+          getVideoDetail(_prop.camera);
+        }
+      }
+    });
     const releaseUrl = ref("");
     const release = async () => {
       const res = await axios$2.get(releaseUrl.value);

package/dist/hooks/index.cjs

@@ -5989,6 +5989,7 @@ const playOneWebRtcMt = async (uuid, domId, dom, token) => {
 class WebRtcMt {
   constructor(opt) {
     this.opt = opt;
+    this.p_player = vue.ref();
     this.init(opt);
   }
   opt;
@@ -6028,7 +6029,7 @@ class WebRtcMt {
     if (opt.h) this.config.h = opt.h;
     if (opt.w) this.config.w = opt.w;
     if (Object.prototype.toString.call(opt.plays) === "[object Object]") {
-      this.p_player = this.createVideo(opt.plays);
+      this.p_player.value = this.createVideo(opt.plays);
     } else {
       for (const i of opt.plays) {
         this.createVideo(i);
@@ -6049,19 +6050,15 @@ class WebRtcMt {
         response.json().then(res => {
           if (res.code === 0) {
             this.startPlay(plays);
+            resolve(res);
           } else {
             console.log("\u62C9\u6D41\u63A5\u53E3\u8FD4\u56DE\u5931\u8D25");
-            setTimeout(() => {
-              this.rePlay();
-            }, 3 * 60 * 1e3);
+            reject("error");
           }
-          resolve(res);
         });
       }).catch(err => {
         console.log("\u62C9\u6D41\u63A5\u53E3\u5931\u8D25");
-        setTimeout(() => {
-          this.rePlay();
-        }, 3 * 60 * 1e3);
+        reject("error");
       });
     });
   }
@@ -6117,7 +6114,7 @@ class WebRtcMt {
       this.rePlay(videoElm);
     });
     player.on(Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, state => {
-      this.log("warn", state);
+      console.log("webrtc:" + state);
       if (state === "disconnected" || state === "failed") {
         this.rePlay(videoElm);
       }
@@ -6128,13 +6125,12 @@ class WebRtcMt {
     console.log("\u5E95\u90E8\u505C\u6B62\u64AD\u653E");
     this.stopPlay();
     setTimeout(() => {
-      console.log("\u5E95\u90E8\u91CD\u64AD");
-      this.init(this.opt);
-    }, 5 * 1e3);
+      this.p_player.value = "error";
+      console.log("\u5E95\u90E8\u91CD\u64AD", this.p_player.value);
+    }, 3 * 1e3);
   }
   // 播放
   play(videoElm) {
-    console.log("\u5F00\u59CB\u89C6\u9891\u521D\u59CB\u5316");
     const plays = this.mediaServerAddrMap.get(videoElm);
     const {
       sdpUrl

package/dist/hooks/index.js

@@ -5980,6 +5980,7 @@ const playOneWebRtcMt = async (uuid, domId, dom, token) => {
 class WebRtcMt {
   constructor(opt) {
     this.opt = opt;
+    this.p_player = ref();
     this.init(opt);
   }
   opt;
@@ -6019,7 +6020,7 @@ class WebRtcMt {
     if (opt.h) this.config.h = opt.h;
     if (opt.w) this.config.w = opt.w;
     if (Object.prototype.toString.call(opt.plays) === "[object Object]") {
-      this.p_player = this.createVideo(opt.plays);
+      this.p_player.value = this.createVideo(opt.plays);
     } else {
       for (const i of opt.plays) {
         this.createVideo(i);
@@ -6040,19 +6041,15 @@ class WebRtcMt {
         response.json().then(res => {
           if (res.code === 0) {
             this.startPlay(plays);
+            resolve(res);
           } else {
             console.log("\u62C9\u6D41\u63A5\u53E3\u8FD4\u56DE\u5931\u8D25");
-            setTimeout(() => {
-              this.rePlay();
-            }, 3 * 60 * 1e3);
+            reject("error");
           }
-          resolve(res);
         });
       }).catch(err => {
         console.log("\u62C9\u6D41\u63A5\u53E3\u5931\u8D25");
-        setTimeout(() => {
-          this.rePlay();
-        }, 3 * 60 * 1e3);
+        reject("error");
       });
     });
   }
@@ -6108,7 +6105,7 @@ class WebRtcMt {
       this.rePlay(videoElm);
     });
     player.on(Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, state => {
-      this.log("warn", state);
+      console.log("webrtc:" + state);
       if (state === "disconnected" || state === "failed") {
         this.rePlay(videoElm);
       }
@@ -6119,13 +6116,12 @@ class WebRtcMt {
     console.log("\u5E95\u90E8\u505C\u6B62\u64AD\u653E");
     this.stopPlay();
     setTimeout(() => {
-      console.log("\u5E95\u90E8\u91CD\u64AD");
-      this.init(this.opt);
-    }, 5 * 1e3);
+      this.p_player.value = "error";
+      console.log("\u5E95\u90E8\u91CD\u64AD", this.p_player.value);
+    }, 3 * 1e3);
   }
   // 播放
   play(videoElm) {
-    console.log("\u5F00\u59CB\u89C6\u9891\u521D\u59CB\u5316");
     const plays = this.mediaServerAddrMap.get(videoElm);
     const {
       sdpUrl