类型：开发

描述：

package-lock.json

@@ -25,7 +25,7 @@
         "vue-router": "^4.4.5",
         "vue3-seamless-scroll": "^2.0.1",
         "vuedraggable": "^4.1.0",
-        "whepts": "^1.1.11"
+        "whepts": "^1.1.12"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^5.2.1",
@@ -6188,9 +6188,9 @@
       "license": "MIT"
     },
     "node_modules/whepts": {
-      "version": "1.1.11",
+      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/whepts/-/whepts-1.1.11.tgz",
+      "resolved": "https://registry.npmjs.org/whepts/-/whepts-1.1.12.tgz",
-      "integrity": "sha512-NJ37rUXS4aeO36sxmSTxMZTGXdScedxdhAt7oKhFhzAeV/IjNCWdyu8d+fSGSEAPjJS4FnBzwSFLrENZjAqcRA==",
+      "integrity": "sha512-KllGslriMAhD6BDBbG6X653M8XgeYqxnjuEyaB7U/1nIZN6NoAGSWP3Av46g690r2UaaI69bNzfPn4efJBd+kA==",
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "^5.0.4",

package.json

@@ -26,7 +26,7 @@
     "vue-router": "^4.4.5",
     "vue3-seamless-scroll": "^2.0.1",
     "vuedraggable": "^4.1.0",
-    "whepts": "^1.1.11"
+    "whepts": "^1.1.12"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.1",

src/components/HlsPlayer/index.vue

@@ -176,6 +176,9 @@
               this.initializePlayer();
             }
           })
+          this.hls.on('play:failed', (err) => {
+            this.initializePlayer();
+          })
         }else{
           this.hls = new Hls({
             // 内存优化配置

src/layout/components/CoreVideo/allList.vue

@@ -81,7 +81,8 @@ import {getVideoListApi, getColletListApi, getPreviewUrlApi} from '@/api/home'
     console.log(item, 'iscollect')
     let res = await getPreviewUrlApi({
       cameraIndexCode: item.cameraIndexCode,
-      type: 'hls'
+      type: 'hls',
+      subStream:0
     })
     src.value = res.data.url
     isCollect.value = item.isCollect
@@ -125,7 +126,8 @@ import {getVideoListApi, getColletListApi, getPreviewUrlApi} from '@/api/home'
 const createPlayer = (cameraIndexCode,videoElement) => {
   getPreviewUrlApi({
     type: 'hls',
-    cameraIndexCode: cameraIndexCode
+    cameraIndexCode: cameraIndexCode,
+    subStream:1
   }).then(res=>{
     const url = res.data.url;
     if(url.startsWith('http://192.168.77.200:8050/')){
@@ -140,6 +142,9 @@ const createPlayer = (cameraIndexCode,videoElement) => {
           createPlayer(cameraIndexCode,videoElement)
         }
       })
+      player.on('play:failed', (err) => {
+        createPlayer(cameraIndexCode,videoElement);
+      })
       webrtcRefs.push(player)
     }
     else{

src/layout/components/CoreVideo/index.vue

@@ -66,7 +66,8 @@ let isCollect = ref(0)
   const handleItem = async (item) => {
     let res = await getPreviewUrlApi({
       cameraIndexCode: item.cameraIndexCode,
-      type: 'hls'
+      type: 'hls',
+      subStream:0
     })
     src.value = res.data.url
     cameraIndexCode.value = item.cameraIndexCode
@@ -87,7 +88,8 @@ let isCollect = ref(0)
   const getPreviewUrl = async (code) => {
     let res = await getPreviewUrlApi({
       cameraIndexCode: code,
-      type: 'hls'
+      type: 'hls',
+      subStream:1
     })
     src.value = res.data.url
     videoShow.value = true
@@ -95,7 +97,8 @@ let isCollect = ref(0)
   const createPlayer = (cameraIndexCode,videoElement) => {
     getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode: cameraIndexCode
+      cameraIndexCode: cameraIndexCode,
+      subStream:0
     }).then(res=>{
       const url = res.data.url;
       if(url.startsWith('http://192.168.77.200:8050/')){
@@ -105,11 +108,13 @@ let isCollect = ref(0)
           iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
         })
         player.on('error', (error) => {
-          console.error('错误:', error.message, error.type)
           if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
             createPlayer(cameraIndexCode,videoElement);
           }
         })
+        player.on('play:failed', (err) => {
+          createPlayer(cameraIndexCode,videoElement);
+        })
         webrtcRefs.push(player)
       }
       else{

src/views/collect/components/video-box.vue

@@ -224,7 +224,8 @@
 	  show.value = true
 	  let res = await getPreviewUrlApi({
 	    type: 'hls',
-	    cameraIndexCode:itemCode
+	    cameraIndexCode:itemCode,
+      subStream:0
 	  })
 	  cameraIndexCode.value = itemCode;
 	  isCollect.value = resource.isCollect
@@ -283,7 +284,8 @@
   const createPlayer = (cameraIndexCode,videoElement) => {
     getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode: cameraIndexCode
+      cameraIndexCode: cameraIndexCode,
+      subStream:1
     }).then(res=>{
       const url = res.data.url;
       if(url.startsWith('http://192.168.77.200:8050/')){
@@ -298,6 +300,9 @@
             createPlayer(cameraIndexCode,videoElement);
           }
         })
+        player.on('play:failed', (err) => {
+          createPlayer(cameraIndexCode,videoElement);
+        })
         webrtcRefs.push(player)
       }else{
         const player = new Hls({

src/views/hotel/components/video-box.vue

@@ -304,7 +304,8 @@
 	  show.value = true
 	  let res = await getPreviewUrlApi({
 	    type: 'hls',
-	    cameraIndexCode:itemCode
+	    cameraIndexCode:itemCode,
+      subStream:0
 	  })
 	  cameraIndexCode.value = itemCode;
 	  isCollect.value = resource.isCollect
@@ -340,7 +341,8 @@
   const createPlayer = (cameraIndexCode,videoElement) => {
     getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode: cameraIndexCode
+      cameraIndexCode: cameraIndexCode,
+      subStream:1
     }).then(res=>{
       const url = res.data.url;
       if(url.startsWith('http://192.168.77.200:8050/')){
@@ -355,6 +357,9 @@
             createPlayer(cameraIndexCode,videoElement);
           }
         })
+        player.on('play:failed', (err) => {
+          createPlayer(cameraIndexCode,videoElement);
+        })
         webrtcRefs.push(player)
       }
       else{
@@ -424,7 +429,8 @@
 	const handleItemVideo = async (url, type, code, item) => {
     let res = await getPreviewUrlApi({
       cameraIndexCode: code,
-      type: 'hls'
+      type: 'hls',
+      subStream:0
     })
     url = res.data.url
     thisVideo.value = item
@@ -447,6 +453,9 @@
             handleItemVideo(url, type, code, item);
           }
         })
+        hlsRef.on('play:failed', (err) => {
+          handleItemVideo(url, type, code, item);
+        })
       } else {
         hlsRef = new Hls({
           maxBufferLength: 10, // 最大缓冲长度（秒）

src/views/monitor/components/box-1.vue

@@ -261,7 +261,8 @@
   window.addEventListener("message", async(e) => {
     let {code,data} = await getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode:e.data.cameraIndexCode
+      cameraIndexCode:e.data.cameraIndexCode,
+      subStream:0
     })
     if(code===200){
       src.value = data.url

src/views/monitor/components/box-2.vue

@@ -366,7 +366,8 @@ let thisVideo = ref(null)
 const handleItemVideo = async (url, type, code, item) => {
   let res = await getPreviewUrlApi({
     cameraIndexCode: code,
-    type: 'hls'
+    type: 'hls',
+    subStream:0
   })
   url = res.data.url
   thisVideo.value = item
@@ -438,7 +439,8 @@ const handleCamera = async (itemCode, resource) => {
   show.value = true
   let res = await getPreviewUrlApi({
     type: 'hls',
-    cameraIndexCode: itemCode
+    cameraIndexCode: itemCode,
+    subStream:0
   })
   cameraIndexCode.value = itemCode;
   isCollect.value = resource.isCollect
@@ -501,7 +503,8 @@ watch(
 const createPlayer = (cameraIndexCode,videoElement) => {
   getPreviewUrlApi({
     type: 'hls',
-    cameraIndexCode: cameraIndexCode
+    cameraIndexCode: cameraIndexCode,
+    subStream:1
   }).then(res=>{
     const url = res.data.url;
     if(url.startsWith('http://192.168.77.200:8050/')){

src/views/scenic/components/box-1.vue

@@ -174,7 +174,8 @@ import pubSub from 'pubsub-js'
   window.addEventListener("message", async(e) => {
     let {code,data} = await getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode:e.data.cameraIndexCode
+      cameraIndexCode:e.data.cameraIndexCode,
+      subStream:0
     })
     if(code===200){
       src.value = data.url

src/views/traffic/components/box-2.vue

@@ -191,7 +191,8 @@
   const getPreviewUrl = async (code) => {
     let res = await getPreviewUrlApi({
       cameraIndexCode: code,
-      type: 'hls'
+      type: 'hls',
+      subStream:0
     })
     src.value = res.data.url
     videoShow.value = true