Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/packages/components/Uav/Uav/FlightControl/index.vue

@@ -483,6 +483,9 @@
       servicesTopic(querys);
       services_replyTopic();
     }
+    setTimeout(() => {
+      EventBus.emit('controlToDroneLive',airPortStoreVal.getGateway);
+    }, 10000)
   };
   // 一键返航
   const returnVoyage = () => {

src/packages/components/Zhigan/Zhigan/ZhiGan_DroneLive/index.vue

@@ -98,6 +98,18 @@
     EventBus.on(props.chartConfig.id + 'dataupdate', (data) => {
       isUAVLive.value = false;
     });
+    EventBus.on('controlToDroneLive', (gateway) => {
+      uavList.value.forEach(item => {
+        if(item.gateWay == gateway){
+          item.isUAVLive = true
+          if(showUav.value.gateWay == gateway){
+            player.src(live_info.url + showUav.value.sn + '.flv');
+            player.play();
+            showUav.value.isUAVLive = true
+          }
+        }
+      })
+    })
     if (!getClient() || !getClient().connected) {
       createConnection();
     }
@@ -142,6 +154,9 @@
             uavList.value.forEach(item => {
               if(rs.tid == item.startTid){
                 item.isUAVLive = true
+                if(showUav.value.gateWay == item.gateWay){
+                  showUav.value.isUAVLive = true
+                }
               }
             })
           } else if (rs.data.result == 513003) {
@@ -149,6 +164,9 @@
             uavList.value.forEach(item => {
               if(rs.tid == item.startTid){
                 item.isUAVLive = true
+                if(showUav.value.gateWay == item.gateWay){
+                  showUav.value.isUAVLive = true
+                }
               }
             })
           } else {