From 95a6ddec29cbb070d32e82932f6d4e03852c0371 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Thu, 24 Jul 2025 10:20:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=9C=AA=E8=83=BD=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA,?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=BD=93=E5=89=8D=E9=A1=B9=E7=9B=AE=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/Judge.ets | 8 ++++++-- entry/src/main/ets/pages/SignDisplay.ets | 4 +++- entry/src/main/ets/pages/judgeSDK/judge.ets | 18 ++++++++---------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index ab0a76c..a737b04 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -691,9 +691,13 @@ struct JudgePage { Column() { // 顶部 HeaderComponent({ - logoExpansionBuilder: this.logoExpansionBuilder, + logoExpansionBuilder: () => { + this.logoExpansionBuilder() + }, customizeReturnArea: true, - backAreaBuilder: this.backAreaBuilder + backAreaBuilder: () => { + this.backAreaBuilder() + } }) Row() { Row() { diff --git a/entry/src/main/ets/pages/SignDisplay.ets b/entry/src/main/ets/pages/SignDisplay.ets index 37c28a7..794d333 100644 --- a/entry/src/main/ets/pages/SignDisplay.ets +++ b/entry/src/main/ets/pages/SignDisplay.ets @@ -1,6 +1,7 @@ import SignalDisplayComponent from './compontents/SignalDisplay'; import router from '@ohos.router'; import TabComponent from './compontents/Tab'; +import { InitialPerLane } from '../mock'; @Entry @Component @@ -41,7 +42,8 @@ struct SignDisplayPage { }.width("100%").height(100) SignalDisplayComponent({ - active: this.active + active: this.active, + laneSignal: InitialPerLane }) } .width('100%') diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ets b/entry/src/main/ets/pages/judgeSDK/judge.ets index aa5b6ea..7883088 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ets +++ b/entry/src/main/ets/pages/judgeSDK/judge.ets @@ -285,14 +285,14 @@ export default class Judge { if (stachArr[0] != '#DN_GD' || this.isUdpEnd) { return } - if (msg[336]) { - if (msg[336] === "4") { - dConsole.log(JudgeTag, "差分状态正常") - this.judgeUI.isDwztRight = true - } else { - dConsole.log(JudgeTag, "差分状态异常") - this.judgeUI.isDwztRight = false - } + const gpsPart = msg.split("#END$GPS,")[1]; + const gpsStatus = gpsPart.split(",")[0]; + if (gpsStatus === "4") { + dConsole.log(JudgeTag, "差分状态正常", gpsStatus) + this.judgeUI.isDwztRight = true + } else { + dConsole.log(JudgeTag, "差分状态异常", gpsStatus) + this.judgeUI.isDwztRight = false } this.judgeUI.isDwztRight const plcData = await this.getPlcData(msg); @@ -1850,7 +1850,6 @@ export default class Judge { } } - //开始评判 private async judging(callBack: Function) { const judgeUI = this.judgeUI; @@ -1862,7 +1861,6 @@ export default class Judge { const manualMarkRules = judgeUI.manualMarkRules - const getJudgeBeginData = this.getJudgeBeginData; const handDistance = this.getJudgeBeginData; const handleTrajectoryUdp = this.handleTrajectoryUdp;