From 297a9747aa40f5d3e478ad806962697a681468e9 Mon Sep 17 00:00:00 2001
From: qubiaobiao <3294694717@qq.com>
Date: Thu, 29 Aug 2024 17:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=BB=9C=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=98=BE=E7=A4=BA=E5=8F=8A=E6=98=9F=E5=BA=A7=E5=9B=BE?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/load-serialport.js                   |  3 +-
 src/main/window/localSoftware/MainWindow.ts   | 31 ++++++++++---------
 .../app/BDDataAnalysisPlatform/index.vue      | 11 +++++--
 src/render/stores/modules/network/index.ts    | 21 ++++++++++++-
 .../BasicInfoView/index.vue                   |  6 +---
 .../views/BDDataAnalysisPlatform/MapView.vue  |  6 +---
 .../PlanisphereView/index.vue                 |  6 +---
 .../BDDataAnalysisPlatform/SNRView/index.vue  |  6 +---
 .../index/QuickBurningModalView/index.vue     |  4 +--
 src/render/views/index/ToolbarView/index.vue  |  9 ++----
 10 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/src/main/load-serialport.js b/src/main/load-serialport.js
index da28dfe..096ab2e 100644
--- a/src/main/load-serialport.js
+++ b/src/main/load-serialport.js
@@ -62,8 +62,7 @@ await SerialPort.list().then((ports, err) => {
   if (ports.length == 0) {
     console.error('not connect')
     comreturn = false
-    return
-  }else{
+  }else {
     const { path, baudRate, dataBits, stopBits, parity } = getSerialPortConstructorArguments(ports)
     console.log(path, baudRate, dataBits, stopBits, parity)
     comports = ports
diff --git a/src/main/window/localSoftware/MainWindow.ts b/src/main/window/localSoftware/MainWindow.ts
index ed5ca51..5c0bb7c 100644
--- a/src/main/window/localSoftware/MainWindow.ts
+++ b/src/main/window/localSoftware/MainWindow.ts
@@ -250,21 +250,24 @@ export class MainWindow extends LocalSoftwareWindow {
     let resport: any
 
     await comon().then((res:any) => {
-      resport = res.comoptions.path
+      if(!res.comoptions) {
+        event.sender.send('BURN_PROGRAM_FEEDBACK', { err: new Error('请先连接核心处理模块') } )
+      }else {
+        resport = res.comoptions.path
+        execFile(ESP_TOOL_PATH,
+          ['--chip', 'esp32', '--port', resport, '--baud', '921600', '--before', 'default_reset', '--after', 'hard_reset', 'write_flash', '-z', '--flash_mode', 'dio', '--flash_freq', '80m', '--flash_size', 'detect',
+          '0xe000' , BOOT_APP0_BIN_PATH,
+          '0x1000' , BOOT_LOADER_BIN_PATH,
+          '0x10000', bin_file_path,
+          '0x8000' , PARTITIONS_BIN_PATH], (err:any, stdout:any) => {
+              if (err) {
+                event.sender.send('BURN_PROGRAM_FEEDBACK', { err } )
+              } else {
+                event.sender.send('BURN_PROGRAM_FEEDBACK', { stdout })
+              }
+          });
+      }
     })
-
-    execFile(ESP_TOOL_PATH,
-    ['--chip', 'esp32', '--port', resport, '--baud', '921600', '--before', 'default_reset', '--after', 'hard_reset', 'write_flash', '-z', '--flash_mode', 'dio', '--flash_freq', '80m', '--flash_size', 'detect',
-    '0xe000' , BOOT_APP0_BIN_PATH,
-    '0x1000' , BOOT_LOADER_BIN_PATH,
-    '0x10000', bin_file_path,
-    '0x8000' , PARTITIONS_BIN_PATH], (err:any, stdout:any) => {
-        if (err) {
-          event.sender.send('BURN_PROGRAM_FEEDBACK', { err } )
-        } else {
-          event.sender.send('BURN_PROGRAM_FEEDBACK', { stdout })
-        }
-    });
   }
 
   launchOnlineSoftware(_: IpcMainEvent, param: any) {
diff --git a/src/render/app/BDDataAnalysisPlatform/index.vue b/src/render/app/BDDataAnalysisPlatform/index.vue
index 458d0e4..46dddc6 100644
--- a/src/render/app/BDDataAnalysisPlatform/index.vue
+++ b/src/render/app/BDDataAnalysisPlatform/index.vue
@@ -17,7 +17,7 @@
           <SerialPortReceivingMessageView class="h-full" />
         </n-tab-pane>
         <n-tab-pane display-directive="show:lazy" tab="地图" name="map">
-          <MapView />
+          <component :is="MapComponent"></component>
         </n-tab-pane>
       </Tabs>
     </Layout>
@@ -27,7 +27,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch } from 'vue'
+import { ref, defineAsyncComponent, onMounted } from 'vue'
 import { NTabPane } from 'naive-ui'
 import { Application } from '@/components/Application'
 import { CustomTitleBar } from '@/components/CustomTitleBar'
@@ -38,7 +38,6 @@ import { SerialPortReceivingMessageView } from '@/components/SerialPort'
 import { BasicInfoView } from '@/views/BDDataAnalysisPlatform/BasicInfoView'
 import { PlanisphereView } from '@/views/BDDataAnalysisPlatform/PlanisphereView'
 import { SNRView } from '@/views/BDDataAnalysisPlatform/SNRView'
-import MapView from '@/views/BDDataAnalysisPlatform/MapView.vue'
 
 import { useNMEAStore, NMEADataSource } from '@/stores/nmea'
 import { LineBreakParser } from '@/utils/parser'
@@ -55,8 +54,14 @@ const onSerialPortData = (value: Uint8Array) => {
 }
 
 const softwareTitle = ref(null)
+const MapComponent = ref(null)
+const MapViewComponent = defineAsyncComponent(() => import('@/views/BDDataAnalysisPlatform/MapView.vue'))
+
 onMounted(() => {
   softwareTitle.value.title = '北斗数据分析平台'
+  setTimeout(async () => {
+    MapComponent.value = await MapViewComponent
+  }, 1000)
 })
 
 window.ipcRenderer.receive('COM_LISTENER', onSerialPortData)
diff --git a/src/render/stores/modules/network/index.ts b/src/render/stores/modules/network/index.ts
index d9c228b..4684316 100644
--- a/src/render/stores/modules/network/index.ts
+++ b/src/render/stores/modules/network/index.ts
@@ -1,28 +1,47 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
 import { useMessage } from 'naive-ui'
+import type { MessageReactive } from 'naive-ui'
 
 export const useNetworkStore = defineStore('network', () => {
   const message = useMessage()
   const isOnLine = ref(window.navigator.onLine)
   let checkLine
+  let messageReactive: MessageReactive | null = null
+  const createMessage = () => {
+    if (!messageReactive) {
+      messageReactive = message.loading('正在连接中', {
+        duration: 0
+      })
+    }
+  }
+  const removeMessage = () => {
+    if (messageReactive) {
+      messageReactive.destroy()
+      messageReactive = null
+    }
+  }
   const setCheck = () => {
+    createMessage()
     checkLine = setTimeout(() => {
+      removeMessage()
       if(isOnLine.value) {
         message.success('连接成功')
       } else {
         message.error('连接失败')
       }
-    }, 5000)
+    }, 20000)
   }
   window.addEventListener( 'online' , () => {
     isOnLine.value = true
     clearTimeout(checkLine)
+    removeMessage()
     message.success('连接成功')
   } )
   window.addEventListener( 'offline', () => {
     isOnLine.value = false
     clearTimeout(checkLine)
+    removeMessage()
     message.error('连接失败')
   } )
 
diff --git a/src/render/views/BDDataAnalysisPlatform/BasicInfoView/index.vue b/src/render/views/BDDataAnalysisPlatform/BasicInfoView/index.vue
index 77809d7..5573b5e 100644
--- a/src/render/views/BDDataAnalysisPlatform/BasicInfoView/index.vue
+++ b/src/render/views/BDDataAnalysisPlatform/BasicInfoView/index.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch } from 'vue'
 import { NDescriptions, NDescriptionsItem, NTime, useMessage } from 'naive-ui'
 import { useNMEAStore } from '@/stores/nmea'
 
@@ -38,10 +38,6 @@ const connectErrMsg = (value: Boolean) => {
 
 window.ipcRenderer.receive('CANNOT_CONNECT',connectErrMsg)
 
-onMounted(() => {
-  window.ipcRenderer.send('COM_READY')
-})
-
 watch(() => nmea.handled, (value) => {
   if (!value) return
 
diff --git a/src/render/views/BDDataAnalysisPlatform/MapView.vue b/src/render/views/BDDataAnalysisPlatform/MapView.vue
index 27dd598..ef6e16b 100644
--- a/src/render/views/BDDataAnalysisPlatform/MapView.vue
+++ b/src/render/views/BDDataAnalysisPlatform/MapView.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch } from 'vue'
 import { Map, MapMarker, lonlat2Position } from '@/components/Map'
 import { useNMEAStore } from '@/stores/nmea'
 
@@ -14,10 +14,6 @@ const position = ref()
 
 const mapRef = ref()
 
-onMounted(() => {
-  window.ipcRenderer.send('COM_READY')
-})
-
 watch(() => nmea.handled3, (value) => {
   if (!value || !nmea.longitude || !nmea.latitude) return
 
diff --git a/src/render/views/BDDataAnalysisPlatform/PlanisphereView/index.vue b/src/render/views/BDDataAnalysisPlatform/PlanisphereView/index.vue
index 1c97ed4..91659e1 100644
--- a/src/render/views/BDDataAnalysisPlatform/PlanisphereView/index.vue
+++ b/src/render/views/BDDataAnalysisPlatform/PlanisphereView/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import { watch, onMounted } from "vue"
+import { watch } from "vue"
 import { use } from "echarts/core"
 import { CanvasRenderer } from "echarts/renderers"
 import { ScatterChart } from "echarts/charts"
@@ -22,10 +22,6 @@ use([
   PolarComponent
 ])
 
-onMounted(() => {
-  window.ipcRenderer.send('COM_READY')
-})
-
 const nmea = useNMEAStore()
 watch(() => nmea.handled1, (value) => {
   if (!value) return
diff --git a/src/render/views/BDDataAnalysisPlatform/SNRView/index.vue b/src/render/views/BDDataAnalysisPlatform/SNRView/index.vue
index 87b63f1..0dc2744 100644
--- a/src/render/views/BDDataAnalysisPlatform/SNRView/index.vue
+++ b/src/render/views/BDDataAnalysisPlatform/SNRView/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import { watch, onMounted } from "vue"
+import { watch } from "vue"
 import { use } from "echarts/core"
 import { CanvasRenderer } from "echarts/renderers"
 import { BarChart } from "echarts/charts"
@@ -22,10 +22,6 @@ use([
   GridComponent
 ])
 
-onMounted(() => {
-  window.ipcRenderer.send('COM_READY')
-})
-
 const nmea = useNMEAStore()
 watch(() => nmea.handled2, (value) => {
   if (!value) return
diff --git a/src/render/views/index/QuickBurningModalView/index.vue b/src/render/views/index/QuickBurningModalView/index.vue
index 3bcda20..8200bc9 100644
--- a/src/render/views/index/QuickBurningModalView/index.vue
+++ b/src/render/views/index/QuickBurningModalView/index.vue
@@ -39,8 +39,8 @@ const onBurnProgramBtnClick = async (binFileName: string) => {
   
     dialog.info({
       title: '系统提示',
-      closable: false,
-      maskClosable: false,
+      closable: true,
+      maskClosable: true,
       class: 'text-center',
       content: () => h(
           NSpin,
diff --git a/src/render/views/index/ToolbarView/index.vue b/src/render/views/index/ToolbarView/index.vue
index 7933789..d0d6e82 100644
--- a/src/render/views/index/ToolbarView/index.vue
+++ b/src/render/views/index/ToolbarView/index.vue
@@ -1,18 +1,13 @@
 <template>
   <n-space class="toolbar">
   <div class="button-background">
-    <n-popover  :show="!network.isOnLine" placement="bottom">
-      <template #trigger>
-        <n-button size="large" circle type="info" @click="emit('systemSettings')">
+    <n-button size="large" circle type="info" @click="emit('systemSettings')">
           <template #icon>
             <n-icon>
               <Settings />
             </n-icon>
           </template>
         </n-button>
-      </template>
-      请连接网络
-    </n-popover >
 
     <n-button size="large" circle type="info" @click="emit('quickBurning')">
       <template #icon>
@@ -42,7 +37,7 @@
 </template>
 
 <script setup lang="ts">
-import { NSpace, NPopover , NButton, NIcon, useDialog } from 'naive-ui'
+import { NSpace, NButton, NIcon, useDialog } from 'naive-ui'
 import {
   PhoneFilled as Phone,
   SettingsFilled as Settings,