diff --git a/entry/src/main/ets/model/Judge.ets b/entry/src/main/ets/model/Judge.ets index 4b3b36f..e4ab1d5 100644 --- a/entry/src/main/ets/model/Judge.ets +++ b/entry/src/main/ets/model/Judge.ets @@ -498,7 +498,7 @@ export interface JudgeUI { dw: string endExamDialogController: CustomDialogController generateExamRecordsDialogController: CustomDialogController - laneSignal:PerLane, + laneSignal: PerLane, } @@ -1010,5 +1010,11 @@ export interface LANE { count: number } - +export interface DistanceParam { + jd1: number, + wd1: number, + jd2: number, + wd2: number, + h: number +} diff --git a/entry/src/main/ets/pages/Judge/JudgeUtils.ets b/entry/src/main/ets/pages/Judge/JudgeUtils.ets index 18b0646..9d6b6ea 100644 --- a/entry/src/main/ets/pages/Judge/JudgeUtils.ets +++ b/entry/src/main/ets/pages/Judge/JudgeUtils.ets @@ -1,5 +1,5 @@ import libJudgeSdk from '@ohos.judgesdk'; -import { JudgeBeginObj, JudgeInitObj, PLCType } from '../../model'; +import { DistanceParam, JudgeBeginObj, JudgeInitObj, PLCType } from '../../model'; import { dConsole } from '../../utils/LogWorker'; /** @@ -200,13 +200,7 @@ export async function examJudgeSoundEnd(param: SoundParam) { * @desc 实时距离计算 * * */ -interface DistanceParam { - jd1: number, - wd1: number, - jd2: number, - wd2: number, - h: number -} + export async function examCalcGpsDistance(param: DistanceParam): Promise { const temp: number = libJudgeSdk.examCalcGpsDistance(param.jd1, param.wd1, param.jd2, param.wd2, param.h); diff --git a/entry/src/main/ets/utils/business/JudgeUdpBusiness.ets b/entry/src/main/ets/utils/business/JudgeUdpBusiness.ets index 386e163..1268801 100644 --- a/entry/src/main/ets/utils/business/JudgeUdpBusiness.ets +++ b/entry/src/main/ets/utils/business/JudgeUdpBusiness.ets @@ -19,6 +19,8 @@ import systemTime from '@ohos.systemDateTime'; import { SerialNumberInstance } from '../SerialNumber'; import { GetDwStatusType, GetTranslateSignals } from '../../pages/Judge/utils'; +// import { examCalcGpsDistance } from '../../pages/Judge/JudgeUtils'; + class JudgeUdpBusiness { private static instance: JudgeUdpBusiness @@ -201,6 +203,7 @@ class JudgeUdpBusiness { // wd2: wd, // h: Number(msgArr[90]) || 1, // }) + } prevJd = jd; preWd = wd;