fix: 查找车道数据

entry/src/main/ets/mock/Judge.ets

@@ -1,4 +1,5 @@
 import { AmplifyItem, DefaultJudgeConfigObj, PerLane, PLCType } from '../model';
+import dayTs from '../utils/Date';
 
 export const AmplifyArr: AmplifyItem[] = [
   { name: '直线', projectCode: '3', projectCodeCenter: '40300' },
@@ -242,6 +243,7 @@ export const TestRealExam: PLCType = {
   },
   extend: {}
 }
+
 export const DefaultJudgeConfigData: DefaultJudgeConfigObj = {
   //结束考试方式 0-不合格继续 1-考试不合格报靠边停车 2-不合格不报靠边 3-训练不合格报靠边 4-自动退出 5-不合格自动退出
   param_302: '5',

entry/src/main/ets/pages/Judge.ets

@@ -148,16 +148,14 @@ struct JudgePage {
   @State isErrorMsgEnd: boolean = false
   @State disConnectErrorOpen: boolean = false
   @State @Watch("laneSignalChange") laneSignal: PerLane = InitialPerLane
-
+  laneSignalChange(){
-  laneSignalChange() {
+    dConsole.log("车道信号变化1",this.laneSignal)
-    dConsole.log("车道信号变化1", this.laneSignal)
   }
-
   public context = getContext(this) as common.UIAbilityContext;
   // 信号查看弹窗
   signalTrajectoryDialogController: CustomDialogController = new CustomDialogController({
     builder: SignalTrajectoryDialog({
-      laneSignal: this.laneSignal
+      laneSignal: $laneSignal
     }),
     customStyle: true,
     autoCancel: true

entry/src/main/ets/pages/Judge/SignalTrajectoryDialog.ets

@@ -6,8 +6,11 @@ import TabComponent from '../compontents/Tab'
 @CustomDialog
 export default struct SignalTrajectoryDialog {
   @State active: number = 0
-  @Link  laneSignal: PerLane
+  @Link @Watch("laneSignalChange") laneSignal: PerLane
 
+  laneSignalChange() {
+    dConsole.log("车道信号变化222", this.laneSignal)
+  }
 
   private controller?: CustomDialogController
 

entry/src/main/ets/pages/compontents/SignalDisplay.ets

@@ -28,10 +28,10 @@ export default struct SignalDisplayComponent {
   // 原始数据
   @State rawData: string = "$GPS,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"
   // 车道信息
-  @Link @Watch("laneSignalChange")  laneSignal: PerLane
+  @Link @Watch("laneSignalChange") laneSignal: PerLane
 
-  laneSignalChange(){
+  laneSignalChange() {
-    dConsole.log("车道信号变化3",this.laneSignal)
+    dConsole.log("车道信号变化333", this.laneSignal)
   }
 
   aboutToAppear(): void {
@@ -225,7 +225,9 @@ struct trajectoryComponent {
 
 @Component
 struct LaneComponent {
-  @Prop laneSignal: PerLane
+  @Link laneSignal: PerLane
+
+
   private RoadData: Array<RoadDataType> = [
     { name: '路段组号', key: 'MapRoad_Code_No' },
     { name: '路段编码', key: 'MapRoad_Name' },

entry/src/main/ets/pages/judgeSDK/judge.ets

@@ -87,7 +87,6 @@ type SendWriteObjectOut = (data: RegulatoryInterfaceParams, filePath: string) =>
 type GetKfStr = (code: string) => MarkRule
 type GetDqxmStr = (xmdm: number) => string
 
-
 export default class Judge {
   public plcStr: string = ""
   public judgeUI: JudgeUI
@@ -185,6 +184,47 @@ export default class Judge {
   private isExamEnd: boolean
   // 是否发送udp
   private isUdpEnd: boolean = false
+  // 处理udp plc信号
+  handleUdp = async (msg: string) => {
+    const stachArr = msg.split(',')
+    if (stachArr[0] != '#DN_GD' || this.isUdpEnd) {
+      return
+    }
+    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);
+    // 4.过程数据
+    await this.fileLog?.setExamJudgeData(JSON.stringify(plcData))
+    //检测到有无锡所设备接入，需要发送特定的数据，供检测
+    // if (this.usbService.isWXUSBDevice) {
+    //   const str = await senorToWXDataStr(msg);
+    //   this.usbService.sendUSB(str)
+    // }
+    const param350: number = Reflect.get(this.judgeUI.judgeConfigObj, '350')
+    this.judgeUI.sd = ((param350 == 0 ? plcData.gps.sd : plcData.sensor.cs) as number * 1.852).toFixed(0) + ''
+    this.judgeUI.dw = (Math.floor(plcData.sensor.dw as number) || 0) + ''
+    //TODO 暂时关闭差分检测异常
+    // await this.checkDwzt(plcData.gps.dwzt,plcData.gps.jdzt);
+    if (!this.isExamEnd) {
+      await examJudgeRealExam(plcData)
+    }
+    // let udpIndex = AppStorage.get<number>('udpIndex') || 0;
+    // if (udpIndex % 5 === 0 && !this.isUdpEnd) {
+    // TODO UPD缺失
+    // const judgeUdp = globalThis.judgeUdp
+    // const bytes = await this.getMessageHeartbeat(this.isExamEnd);
+    // judgeUdp.send(bytes)
+    // }
+    // AppStorage.setOrCreate('udpIndex', udpIndex++)
+  }
   //是否手动结束考试
   private isManual: boolean = false
   //UDP服务序列号
@@ -231,6 +271,60 @@ export default class Judge {
     dConsole.info(JudgeTag, '过程数据文件上传 end')
   }
   private judgeTask: JudgeTask
+  // 检测扣分、结束项目时该项目是否开始
+  checkProjectIsStart = async (xmdm: number, currentType: 1 | 2, kf?: MarkRule) => {
+    if (xmdm == 20) {
+      return true
+    }
+    const judgeUI = this.judgeUI;
+    const judgeTask = this.judgeTask;
+    const projectsObj: object = this.judgeUI.projectsObj
+    const currentProject: ProjectInfo = Reflect.get(projectsObj, xmdm)
+    const isUpload = currentProject.isUpload
+
+    //如果项目没有开始
+    dConsole.info(JudgeTag, 'surenjun isUpload=>', isUpload)
+    if (!isUpload) {
+      dConsole.info(JudgeTag, '项目补传开始')
+      //项目开始补传
+      judgeTask.addTask(async () => {
+        await this.beginProject(xmdm)
+      }, {
+        isDelay: true
+      })
+      judgeTask.addTask(async () => {
+        await this.uploadProgressPhoto(xmdm)
+      }, {
+        isDelay: true
+      })
+      currentProject.isUpload = true;
+      Reflect.set(this.judgeUI.projectsObj, xmdm, currentProject)
+      //扣分补传
+      if (currentType == 2) {
+        judgeTask.addTask(async () => {
+          await this.pointsDedute(xmdm, kf!)
+        }, {
+          isDelay: true
+        })
+      }
+      //扣分补传判断是否合格 不合格补传项目结束
+      if (currentType == 1 || (currentType == 2 && this.totalScore < judgeUI.passingScore)) {
+        judgeTask.addTask(async () => {
+          await this.endProject(xmdm)
+        }, {
+          isDelay: true
+        })
+        currentProject.isEnd = true;
+        Reflect.set(this.judgeUI.projectsObj, xmdm, currentProject)
+      }
+      judgeTask.addTask(async () => {
+        this.checkExamIsEnd()
+      })
+      return false;
+    } else {
+      return true
+    }
+  }
   private tempData?: PLCType
   //实时计算gps经纬度距离
   handDistance = async () => {
@@ -279,46 +373,40 @@ export default class Judge {
     AppStorage.setOrCreate('msgStr', plc)
     return tempData
   }
-  // 处理udp plc信号
+  // 处理轨迹plc信号
-  handleUdp = async (msg: string) => {
+  handleTrajectoryUdp = async (strArr: string[]) => {
-    const stachArr = msg.split(',')
+    let num = 2;
-    if (stachArr[0] != '#DN_GD' || this.isUdpEnd) {
+    const judgeTimer = setInterval(async () => {
-      return
+      const msgStr = strArr[num];
-    }
+      if (msgStr == '') {
-    const gpsPart = msg.split("#END$GPS,")[1];
+        dConsole.info(JudgeTag, '模拟数据考试结束')
-    const gpsStatus = gpsPart.split(",")[0];
+        clearInterval(judgeTimer)
-    if (gpsStatus === "4") {
+        this.checkExamIsEnd(true)
-      dConsole.log(JudgeTag, "差分状态正常", gpsStatus)
+        return
-      this.judgeUI.isDwztRight = true
+      }
-    } else {
+      const msg: PLCType = JSON.parse(strArr[num]);
-      dConsole.log(JudgeTag, "差分状态异常", gpsStatus)
+      num++
-      this.judgeUI.isDwztRight = false
+      // 4.过程数据
-    }
+      this.tempData = msg
-    this.judgeUI.isDwztRight
+      // this.judgeUI.isDwztRight = (msg?.gps?.dwzt == 4 && msg?.gps?.jdzt == 3);
-    const plcData = await this.getPlcData(msg);
+      this.judgeUI.sd = Math.floor(msg?.gps?.sd * 1.852) + '';
-    // 4.过程数据
+      this.judgeUI.dw = Math.floor(msg?.sensor?.dw) + ''
-    await this.fileLog?.setExamJudgeData(JSON.stringify(plcData))
+      this.plcData = msg
-    //检测到有无锡所设备接入，需要发送特定的数据，供检测
+      // this.judgeUI.isDwztRight = msg.gps.dwzt == 4;
-    // if (this.usbService.isWXUSBDevice) {
+      AppStorage.setOrCreate('msgStr', '')
-    //   const str = await senorToWXDataStr(msg);
+      if (msg.method === 'examJudgeArtificialItem') {
-    //   this.usbService.sendUSB(str)
+        this.setJudgeItem(msg.itemno, msg.type)
-    // }
+      }
-    const param350: number = Reflect.get(this.judgeUI.judgeConfigObj, '350')
+      if (msg.method === 'examJudgeArtificialMark') {
-    this.judgeUI.sd = ((param350 == 0 ? plcData.gps.sd : plcData.sensor.cs) as number * 1.852).toFixed(0) + ''
+        this.setJudgeItem(msg.itemno, msg.serial)
-    this.judgeUI.dw = (Math.floor(plcData.sensor.dw as number) || 0) + ''
+      }
-    //TODO 暂时关闭差分检测异常
+      await examJudgeRealExam(msg)
-    // await this.checkDwzt(plcData.gps.dwzt,plcData.gps.jdzt);
+      // const bytes = await this.getMessageHeartbeat();
-    if (!this.isExamEnd) {
+      // bytes && globalThis.judgeUdp.send(bytes)
-      await examJudgeRealExam(plcData)
+
-    }
+    }, 200)
-    // let udpIndex = AppStorage.get<number>('udpIndex') || 0;
+    // TODO 定时器缺失
-    // if (udpIndex % 5 === 0 && !this.isUdpEnd) {
+    // globalThis.judgeTimer = judgeTimer;
-    // TODO UPD缺失
-    // const judgeUdp = globalThis.judgeUdp
-    // const bytes = await this.getMessageHeartbeat(this.isExamEnd);
-    // judgeUdp.send(bytes)
-    // }
-    // AppStorage.setOrCreate('udpIndex', udpIndex++)
   }
   private isEndTip: boolean = false;
   //本地轨迹回放地址
@@ -339,32 +427,6 @@ export default class Judge {
       const code = await writeObjectOut(JSON.parse(examDataStr), "", this.context);
     }
   }
-  private artSubject3ProjectsCodesArr: number[] = [3, 9, 4, 10, 12, 11]
-  private lane: LANE = {
-    road: '', num: 0, count: 0
-  }
-  private disConnectNum: number = 0;
-  //调用监管接口
-  sendWriteObjectOut: SendWriteObjectOut = async (data, filePath) => {
-    const temp = await writeObjectOut(data, filePath, this.context);
-    dConsole.log(JudgeTag, "wzj", JSON.stringify(temp))
-    //断网&网络超时次数计算
-    if (temp.code == 2300007 || temp.code == 2300028) {
-      this.disConnectNum += 1;
-      if (this.disConnectNum < 5) {
-        return await this.sendWriteObjectOut(data, filePath)
-      }
-    }
-
-    if (this.disConnectNum >= 5) {
-      dConsole.info('surenjun', '123')
-      this.judgeUI.errorMsg = '当前的考试过程信息网络传输异常，程序点击确认将重启！';
-      this.judgeUI.disConnectErrorOpen = true
-    }
-
-    this.disConnectNum = 0
-    return temp
-  }
   // 项目开始接口同步
   beginProject = async (ksxm: number) => {
     const carInfo = AppStorage.get<CarInfoType>('carInfo');
@@ -468,6 +530,32 @@ export default class Judge {
     UploadRegulatoryCodeConversion('17C54', temp.code || 0)
     dConsole.info(JudgeTag, '上传照片 end')
   }
+  private artSubject3ProjectsCodesArr: number[] = [3, 9, 4, 10, 12, 11]
+  private lane: LANE = {
+    road: '', num: 0, count: 0
+  }
+  private disConnectNum: number = 0;
+  //调用监管接口
+  sendWriteObjectOut: SendWriteObjectOut = async (data, filePath) => {
+    const temp = await writeObjectOut(data, filePath, this.context);
+    dConsole.log(JudgeTag, "wzj", JSON.stringify(temp))
+    //断网&网络超时次数计算
+    if (temp.code == 2300007 || temp.code == 2300028) {
+      this.disConnectNum += 1;
+      if (this.disConnectNum < 5) {
+        return await this.sendWriteObjectOut(data, filePath)
+      }
+    }
+
+    if (this.disConnectNum >= 5) {
+      dConsole.info('surenjun', '123')
+      this.judgeUI.errorMsg = '当前的考试过程信息网络传输异常，程序点击确认将重启！';
+      this.judgeUI.disConnectErrorOpen = true
+    }
+
+    this.disConnectNum = 0
+    return temp
+  }
   private videoData?: RecordHandleType
   //当前科目二的考试项目
   private deductedPopShowTimer: number = 0;
@@ -586,95 +674,6 @@ export default class Judge {
       }
     }
   }
-  // 处理轨迹plc信号
-  handleTrajectoryUdp = async (strArr: string[]) => {
-    let num = 2;
-    const judgeTimer = setInterval(async () => {
-      const msgStr = strArr[num];
-      if (msgStr == '') {
-        dConsole.info(JudgeTag, '模拟数据考试结束')
-        clearInterval(judgeTimer)
-        this.checkExamIsEnd(true)
-        return
-      }
-      const msg: PLCType = JSON.parse(strArr[num]);
-      num++
-      // 4.过程数据
-      this.tempData = msg
-      // this.judgeUI.isDwztRight = (msg?.gps?.dwzt == 4 && msg?.gps?.jdzt == 3);
-      this.judgeUI.sd = Math.floor(msg?.gps?.sd * 1.852) + '';
-      this.judgeUI.dw = Math.floor(msg?.sensor?.dw) + ''
-      this.plcData = msg
-      // this.judgeUI.isDwztRight = msg.gps.dwzt == 4;
-      AppStorage.setOrCreate('msgStr', '')
-      if (msg.method === 'examJudgeArtificialItem') {
-        this.setJudgeItem(msg.itemno, msg.type)
-      }
-      if (msg.method === 'examJudgeArtificialMark') {
-        this.setJudgeItem(msg.itemno, msg.serial)
-      }
-      await examJudgeRealExam(msg)
-      // const bytes = await this.getMessageHeartbeat();
-      // bytes && globalThis.judgeUdp.send(bytes)
-
-    }, 200)
-    // TODO 定时器缺失
-    // globalThis.judgeTimer = judgeTimer;
-  }
-  // 检测扣分、结束项目时该项目是否开始
-  checkProjectIsStart = async (xmdm: number, currentType: 1 | 2, kf?: MarkRule) => {
-    if (xmdm == 20) {
-      return true
-    }
-    const judgeUI = this.judgeUI;
-    const judgeTask = this.judgeTask;
-    const projectsObj: object = this.judgeUI.projectsObj
-    const currentProject: ProjectInfo = Reflect.get(projectsObj, xmdm)
-    const isUpload = currentProject.isUpload
-
-    //如果项目没有开始
-    dConsole.info(JudgeTag, 'surenjun isUpload=>', isUpload)
-    if (!isUpload) {
-      dConsole.info(JudgeTag, '项目补传开始')
-      //项目开始补传
-      judgeTask.addTask(async () => {
-        await this.beginProject(xmdm)
-      }, {
-        isDelay: true
-      })
-      judgeTask.addTask(async () => {
-        await this.uploadProgressPhoto(xmdm)
-      }, {
-        isDelay: true
-      })
-      currentProject.isUpload = true;
-      Reflect.set(this.judgeUI.projectsObj, xmdm, currentProject)
-      //扣分补传
-      if (currentType == 2) {
-        judgeTask.addTask(async () => {
-          await this.pointsDedute(xmdm, kf!)
-        }, {
-          isDelay: true
-        })
-      }
-      //扣分补传判断是否合格 不合格补传项目结束
-      if (currentType == 1 || (currentType == 2 && this.totalScore < judgeUI.passingScore)) {
-        judgeTask.addTask(async () => {
-          await this.endProject(xmdm)
-        }, {
-          isDelay: true
-        })
-        currentProject.isEnd = true;
-        Reflect.set(this.judgeUI.projectsObj, xmdm, currentProject)
-      }
-      judgeTask.addTask(async () => {
-        this.checkExamIsEnd()
-      })
-      return false;
-    } else {
-      return true
-    }
-  }
 
   constructor(judgeUI: JudgeUI) {
     this.serialIndex = 1;
@@ -1915,7 +1914,10 @@ export default class Judge {
       this.judgeUI.jl = jl
       //TODO 待优化 跨组件传值不生效
       // globalThis.laneData = performInfo.lane;
-      dConsole.log(JudgeTag, "车道信息", performInfo.lane)
+      // let res = InitialPerLane
+      // res.MapRoad_Code_No = dayTs().format("YYYY-MM-DD HH:mm:ss")
+      // dConsole.log(JudgeTag, "车道信息", res)
+      // this.judgeUI.laneSignal = res
       this.judgeUI.laneSignal = performInfo.lane
     })