From eb4c4cfb01fd1625938cff53fd4365078b601192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E5=BF=97=E8=B6=85?= <yezhichao@hwasmart.com>
Date: Fri, 26 Nov 2021 17:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2getGSAGSV=E6=96=B9=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90getGSV=EF=BC=8C=E5=8E=BB=E6=8E=89GSA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/render/api/util.js              | 18 +++++++-----------
 src/render/page/InfoMonitorPage.vue |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/render/api/util.js b/src/render/api/util.js
index c2f9300..f96c6d6 100644
--- a/src/render/api/util.js
+++ b/src/render/api/util.js
@@ -41,27 +41,23 @@ export function getNMEAObj(nmeaStr) {
   return JSON.parse(nmeaStr)
 }
 
-export function getGSAGSV (nmeaStr) {
+export function getGSV (nmeaStr) {
   const nmeaObj = getNMEAObj(nmeaStr)
   console.log(nmeaObj, '================')
-  if (!nmeaObj || !nmeaObj.GSV || !nmeaObj.GSA) return null
+  if (!nmeaObj || !nmeaObj.GSV) return null
 
-  const { GSV, GSA } = nmeaObj
+  const { GSV } = nmeaObj
   const bd = {
-    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'BD'),
-    GSAArr: GSA.filter((gsa) => gsa.talker_id === 'BD')
+    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'BD')
   }
   const gp = {
-    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GP'),
-    GSAArr: GSA.filter((gsa) => gsa.talker_id === 'GP')
+    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GP')
   }
   const gl = {
-    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GL'),
-    GSAArr: GSA.filter((gsa) => gsa.talker_id === 'GL')
+    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GL')
   }
   const ga = {
-    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GA'),
-    GSAArr: GSA.filter((gsa) => gsa.talker_id === 'GA')
+    GSVArr: GSV.filter((gsv) => gsv.talker_id === 'GA')
   }
 
   return { bd, gp, gl, ga }
diff --git a/src/render/page/InfoMonitorPage.vue b/src/render/page/InfoMonitorPage.vue
index e18f327..a789504 100644
--- a/src/render/page/InfoMonitorPage.vue
+++ b/src/render/page/InfoMonitorPage.vue
@@ -36,11 +36,11 @@ import CenterCmp from '../components/CenterCmp.vue'
 import ScrollBoardTable from '../components/ScrollBoardTable.vue'
 
 import { ref, onMounted } from 'vue'
-import { getGSAGSV } from '../api/util'
+import { getGSV } from '../api/util'
 
 const BDScrollBoardTable = ref(null)
 const update               = (nmeaStr: string) => {
-  const data: any = getGSAGSV(nmeaStr)
+  const data: any = getGSV(nmeaStr)
   if (!data) return
 
   const { bd, gp, gl, ga } = data