From e36b0f018b9824c963963389280df0557bc6343e Mon Sep 17 00:00:00 2001
From: surenjun <tlsurenjun@163.com>
Date: Sat, 28 Jun 2025 09:52:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.499=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9;=202.=E7=A7=91=E7=9B=AE=E4=BA=8Csbbm=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=AF=BB=E5=8F=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/pages/judgeSDK/judge.ts | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts
index 0766fafe..47d458ad 100644
--- a/entry/src/main/ets/pages/judgeSDK/judge.ts
+++ b/entry/src/main/ets/pages/judgeSDK/judge.ts
@@ -538,14 +538,14 @@ export default class Judge {
   // 调代理接口是否断网了
   private isJudgeDisConnect: boolean;
   // 项目开始接口同步
-  beginProject = async (ksxm) => {
+  beginProject = async (ksxm,xmxh?:string) => {
     const carInfo = globalThis.carInfo;
     const { examSubject,plateNo } = carInfo;
-    const {judgeUI,fileLog,getSbbm,xmxh,filePath} = this;
+    const {judgeUI,fileLog,getSbbm,filePath} = this;
     const {lsh,idCard,serialNumber,projectsObj,ksdd,kslx,xldm} = judgeUI
     const time = await getCurrentTime();
     const project = projectsObj[ksxm]
-    const sbxh = getSbbm(ksxm, xmxh)
+    const sbxh = getSbbm(ksxm, xmxh || this.xmxh)
     const data = {
       //系统类别   接口序列号             接口标识
       xtlb: '17', jkxlh: serialNumber, jkid: '17C52',
@@ -572,15 +572,15 @@ export default class Judge {
     promptWxCode('17C52', code)
   }
   // 项目结束接口同步
-  endProject = async (ksxm) => {
+  endProject = async (ksxm,xmxh?:string) => {
     const carInfo = globalThis.carInfo;
     const deviceNo = globalThis.deviceNo;
     const { examSubject,plateNo,carNo } = carInfo;
-    const {judgeUI,fileLog,getSbxh,xmxh,getSbbm,filePath} = this;
+    const {judgeUI,fileLog,getSbxh,getSbbm,filePath} = this;
     const {lsh,idCard,serialNumber,projectsObj,cdsbInfoObj,ksdd,kslx,xldm,} = judgeUI
     const time = await getCurrentTime();
     const project = projectsObj[ksxm]
-    const sbxh = examSubject == 3 ? undefined : getSbbm(ksxm, xmxh)
+    const sbxh = examSubject == 3 ? undefined : getSbbm(ksxm, xmxh || this.xmxh)
 
     const data = {
       xtlb: '17', jkxlh: serialNumber, jkid: '17C55',
@@ -1066,7 +1066,7 @@ export default class Judge {
         if (!isEnd) {
           judgeTask.addTask(async () => {
             console.info(judgeTag, `项目开始-${xmdm}-${projectsObj[xmdm].name}`)
-            await beginProject(xmdm)
+            await beginProject(xmdm,xmxh)
           }, {
             isDelay: true
           })
@@ -1095,7 +1095,7 @@ export default class Judge {
           if (!projectIsEnd) {
             judgeTask.addTask(async () => {
               console.info(judgeTag, `项目结束-${xmdm}-${projectsObj[xmdm].name}`)
-              await endProject(xmdm);
+              await endProject(xmdm,xmxh)
               this.xmmcSingleCode = 0;
               this.xmmcEndCode = undefined;
             }, {
@@ -1714,7 +1714,7 @@ export default class Judge {
   // 检测差分状态
   checkDwzt = async (type) => {
     const {avPlayer} = this;
-    const judgeConfig = this.judgeUI.judgeConfig;
+    const config499 = this.judgeUI.judgeConfigObj['499'];
     switch (type) {
       case 0:
         this.judgeUI.isDwztRight = true;
@@ -1722,10 +1722,17 @@ export default class Judge {
 
       case 1:
         this.judgeUI.dwztErrorVisible = true;
+        clearInterval(this.judgeUI.timer);
+        clearInterval(globalThis.judgeTimer)
         avPlayer.playAudio([`voice/差分状态异常.mp3`], true)
         setTimeout(() => {
-          router.back()
-        }, 3000)
+          try {
+            this.checkExamIsEnd(true);
+          } catch (e) {
+            this.closeAllFiles()
+            router.back()
+          }
+        }, config499 * 1000)
         break;
 
       case 2: