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;