From 2c2bc8614c8ea0ce386369eb4924da1e6aa052d1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 27 Sep 2023 09:35:57 +0800
Subject: [PATCH] 添加环境配置区分

---
 src/components/GMap.vue |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 575a8c8..8d32862 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -169,7 +169,8 @@
       </div>
     </div>
     <!-- 机场OSD -->
-    <div class="osd-panel fz12" v-if="osdVisible.visible && osdVisible.is_dock">
+    <!--  && osdVisible.is_dock -->
+    <div class="osd-panel fz12" v-if="osdVisible.visible">
       <div class="fz16 pl5 pr5 flex-align-center flex-row flex-justify-between"
         style="border-bottom: 1px solid #515151; height: 10%;">
         <span>{{ osdVisible.gateway_callsign }}</span>
@@ -373,7 +374,7 @@
       </div>
       <a-row class="p5" v-if="showMonitor" justify="center" align="middle">
         <!-- <a-spin :spinning="spinning"> -->
-          <Jessibuca v-if="airPortUrl" :videoUrl="airPortUrl" width="100%" height="300px" />
+          <Jessibuca v-if="airPortUrl" @timeout="airTimeout" :videoUrl="airPortUrl" width="100%" height="300px" />
         <!-- </a-spin> -->
       </a-row>
       <!--  飞机-->
@@ -399,10 +400,16 @@
           <a-row align="middle" justify="center">
             <a-col span="24"> <div v-if="deviceInfo.device?.mode_code == 14 || !deviceInfo.device" style="color:#494949;" class="flex-display flex-justify-center mt5 mb5">当前设备已关机，无法进行直播</div> </a-col>
           </a-row>
-          <a-row align="middle" justify="center">
-            <a-col span="24">
+          <a-row class="p5" align="middle" justify="space-between">
+            <a-col span="11">
               <a-button :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[showAircraft?'active-color':'unactive-color']" class="width-100" type="primary"  size="small" @click="openAircra">
                 飞行控制
+              </a-button>
+            </a-col>
+            <a-col span="11">
+              <a-button :class="[openDroneControl?'active-color':'unactive-color']" class="width-100" type="primary"  size="small"
+                @click="openDeviceSetting">
+                操作
               </a-button>
             </a-col>
           </a-row>
@@ -411,7 +418,7 @@
       <!-- 飞机直播 -->
       <a-row class="p5" v-if="showAircraft">
         <!-- <a-spin :spinning="spinning"> -->
-          <Jessibuca v-if="aircraftUrl" :videoUrl="aircraftUrl" width="100%" height="300px" />
+          <Jessibuca v-if="aircraftUrl" @timeout="flyTimeout" :videoUrl="aircraftUrl" width="100%" height="300px" />
         <!-- </a-spin> -->
       </a-row>
       <!-- 飞机图标信息 -->
@@ -807,12 +814,9 @@
     // 打开飞机监控
     const openAircra = () => {
       showAircraft.value = !showAircraft.value
-      setDockControlPanelVisible(false)
       if (showAircraft.value) {
-        openDroneControl.value = true
         loadDroneVideo()
       } else {
-        openDroneControl.value = false
         closeFly()
       }
     }
@@ -902,8 +906,24 @@
           message.error(error)
         })
     }
+    // 机场视频超时说明可能直播被关闭需要重新开启直播
+    const airTimeout = () => {
+      try {
+        onStart()
+      } catch (e) {
+        onClose()
+      }
+    }
+    const flyTimeout = () => {
+      try {
+        flyOnStart()
+      } catch (e) {
+        closeFly()
+      }
+    }
     // 设备开始播放
     const onStart = async () => {
+      airPortUrl.value = ''
       const videoId = droneList.value[droneIndex.value].value + '/' + cameraList.value[cameraIndex.value].value + '/' + videoList.value[videoIndex.value].value
       const streamId = droneList.value[droneIndex.value].value + '-' + cameraList.value[cameraIndex.value].value + '-' + videoList.value[videoIndex.value].value
       const liveURL = config.rtmpURL + streamId
@@ -977,6 +997,11 @@
       openDroneControl.value = false
       setDockControlPanelVisible(true)
     }
+    // 打开无人机操作
+    const openDeviceSetting = () => {
+      setDockControlPanelVisible(false)
+      openDroneControl.value = !openDroneControl.value
+    }
     watch(() => store.state.deviceStatusEvent,
       data => {
         if (Object.keys(data.deviceOnline).length !== 0) {
@@ -984,11 +1009,6 @@
           store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
         }
         if (Object.keys(data.deviceOffline).length !== 0) {
-          // deviceTsaUpdateHook.removeMarker(data.deviceOffline.sn)
-          if ((data.deviceOffline.sn === osdVisible.value.sn) || (osdVisible.value.is_dock && data.deviceOffline.sn === osdVisible.value.gateway_sn)) {
-            osdVisible.value.visible = false
-            store.commit('SET_OSD_VISIBLE_INFO', osdVisible)
-          }
           store.state.deviceStatusEvent.deviceOffline = {}
         }
       },
@@ -1306,7 +1326,10 @@
       closeOperate,
       closeOsdWindow,
       openDroneControl,
-      openFlySetting
+      openFlySetting,
+      openDeviceSetting,
+      airTimeout,
+      flyTimeout
     }
   }
 })

--
Gitblit v1.9.3