From 4c6f25ee3a1f8d484afcfe1a1bb96f541cb657bf Mon Sep 17 00:00:00 2001
From: Surenjun <tlsurejun@163.com>
Date: Mon, 18 Aug 2025 08:47:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A8=A1=E6=8B=9F=E7=81=AF=E5=85=89?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=89=B9=E6=80=A7=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/Judge.ets         | 2 +-
 entry/src/main/ets/pages/judgeSDK/judge.ts | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets
index 12062786..f9d02cdf 100644
--- a/entry/src/main/ets/pages/Judge.ets
+++ b/entry/src/main/ets/pages/Judge.ets
@@ -566,7 +566,7 @@ struct Index {
     //上车准备&起步都开始时
     if (this.syssetParam386 == '3'
       && (this.projectsObj[1].type == '2' || this.projectsObj[1].type == '3')
-      && this.projectsObj[2].type == '2'
+      && (this.projectsObj[2].type !== '1' && this.projectsObj[2].type !== undefined)
       && !this.syssetParam386ET3
     ) {
       this.judge.rmndg = 2;
diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts
index 1e9e48cd..2dd16e31 100644
--- a/entry/src/main/ets/pages/judgeSDK/judge.ts
+++ b/entry/src/main/ets/pages/judgeSDK/judge.ts
@@ -1182,7 +1182,7 @@ export default class Judge {
     const time = await getCurrentTime();
     const project = getProjectInfo(ksxm);
     //科目三夜间行驶.模拟灯光、上车准备出现非本项目的扣分，ksxm需转换为为当前进行的项目
-    const checkProjects = ['17', '41', '1'];
+    const checkProjects = ['1', '41', '17'];
     //获取正在进行的项目
     const inProjects = Reflect.ownKeys(projectsObj).filter(projectKey => projectsObj[projectKey].type == 2);
 
@@ -1192,7 +1192,8 @@ export default class Judge {
         commonKsxm = projectCode
       }
     })
-
+    console.info(judgeTag, 'commonKsxm=>' + commonKsxm)
+    console.info(judgeTag, 'project=>' + project)
     const data = {
       xtlb: '17', jkxlh: serialNumber, jkid: '17C53',
       drvexam: {
@@ -1202,7 +1203,7 @@ export default class Judge {
           ? (commonKsxm
             ? (projectsObj[commonKsxm].projectCodeCenter)
             : (examSubject == 3 ? 30000 : (xmmcEndCode == undefined ? 10000 : xmmcEndCode)))
-          : (commonKsxm || project.projectCodeCenter),
+          : (projectsObj[commonKsxm]?.projectCodeCenter || project.projectCodeCenter),
         kfxm: kf.markcatalog,
         kfxmmx: `${ksxm},${kf.markserial}`,
         sfzmhm: idCard,