fix: 解决满分无法结束的问题

build-profile.json5

@@ -5,9 +5,9 @@
         "name": "default",
         "material": {
           "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.cer",
-          "storePassword": "0000001B3C172BE457130742FD9398569777C93BBF9F9BBC9FA403F3FD8E06D5893F3D14B1789DF6E0F242",
+          "storePassword": "0000001BC5B0497609513207A9433B5B0EF8028AB62F6127F2A98ED2502AD0EA5105DE90FBAACCF2A667D5",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001BEB9FF05D2B1A12791F121AFD8768580FD640018F6A394C3992EF05F73C2CEFAA130DE40703DFE8",
+          "keyPassword": "0000001B3FE45EBE64E6D2BB019005840285C3EF734D55048F500E5FC51002B110E2BBFE74F4A0B5072E4E",
           "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.p7b",
           "signAlg": "SHA256withECDSA",
           "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.p12"

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

@@ -168,6 +168,48 @@ 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))
+    dConsole.writeProcessData(ProcessDataEnumType.JudgeExamData, 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服务序列号
@@ -212,6 +254,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 () => {
@@ -262,47 +358,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
-    dConsole.writeProcessData(ProcessDataEnumType.JudgeExamData, JSON.stringify(plcData))
+      // this.judgeUI.isDwztRight = msg.gps.dwzt == 4;
-    //检测到有无锡所设备接入，需要发送特定的数据，供检测
+      AppStorage.setOrCreate('msgStr', '')
-    // if (this.usbService.isWXUSBDevice) {
+      if (msg.method === 'examJudgeArtificialItem') {
-    //   const str = await senorToWXDataStr(msg);
+        this.setJudgeItem(msg.itemno, msg.type)
-    //   this.usbService.sendUSB(str)
+      }
-    // }
+      if (msg.method === 'examJudgeArtificialMark') {
-    const param350: number = Reflect.get(this.judgeUI.judgeConfigObj, '350')
+        this.setJudgeItem(msg.itemno, msg.serial)
-    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) + ''
+      await examJudgeRealExam(msg)
-    //TODO 暂时关闭差分检测异常
+      // const bytes = await this.getMessageHeartbeat();
-    // await this.checkDwzt(plcData.gps.dwzt,plcData.gps.jdzt);
+      // bytes && globalThis.judgeUdp.send(bytes)
-    if (!this.isExamEnd) {
+
-      await examJudgeRealExam(plcData)
+    }, 200)
-    }
+    // TODO 定时器缺失
-    // let udpIndex = AppStorage.get<number>('udpIndex') || 0;
+    // globalThis.judgeTimer = judgeTimer;
-    // 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 isEndTip: boolean = false;
   //本地轨迹回放地址
@@ -322,32 +411,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');
@@ -451,6 +514,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;
@@ -564,95 +653,6 @@ export default class Judge {
       }
     }
   }
-  // 检测扣分、结束项目时该项目是否开始
-  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
-    }
-  }
-  // 处理轨迹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;
-  }
 
   constructor(judgeUI: JudgeUI) {
     this.serialIndex = 1;
@@ -1097,9 +1097,11 @@ export default class Judge {
 
     // 项目结束
       case 2: {
+        dConsole.log(JudgeTag, "项目结束判定1")
         const project: ProjectInfo = Reflect.get(projectsObj, xmdm)
         const projectIsEnd = project.isEnd;
         const isStart = await this.checkProjectIsStart(xmdm, 1);
+        dConsole.log(JudgeTag, "项目结束判定2")
         if (isStart) {
           //项目结束了就不再生成数据
           dConsole.info(JudgeTag + ' projectIsEnd =>', projectIsEnd)
@@ -1114,12 +1116,20 @@ export default class Judge {
             })
           }
         }
-        if (!this.judgeUI.isProjectIn) {
+        dConsole.log(JudgeTag, "项目结束判定3")
-          this.deductedPopShowTimer = setTimeout(() => {
+        try {
-            this.judgeUI.isDeductedPopShow = false
+          const param512: JudgeConfigObj = (Reflect.get(judgeConfigObj, '512') || '').split(',');
-          }, (Reflect.get(param512!, 5) || 0) * 1000)
+          if (!this.judgeUI.isProjectIn) {
+            this.deductedPopShowTimer = setTimeout(() => {
+              this.judgeUI.isDeductedPopShow = false
+            }, (Reflect.get(param512!, 5) || 0) * 1000)
+          }
+        } catch (e) {
+          dConsole.error(JudgeTag, "项目结束后弹窗定时器异常", e)
         }
+
         project.isEnd = true;
+        dConsole.log(JudgeTag, "项目结束判定4")
         // Reflect.set(this.judgeUI.projectsObj, xmdm, project)
         break;
       }
@@ -1176,6 +1186,7 @@ export default class Judge {
       //   })
       // }, 500)
       //统计必考项目完成数量
+      dConsole.log(JudgeTag, "项目结束判定统计项目")
       await this.setCountItems();
       await checkExamIsEnd()
     }