build-profile.json5

@@ -4,13 +4,13 @@
       {
         "name": "default",
         "material": {
-          "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.cer",
+          "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.cer",
-          "storePassword": "0000001B6A24D25D8FE60B28F302A471AE62F85272A82295ABB715D5DAA874E56338B643E7ED6CCF706BEC",
+          "storePassword": "0000001B0A8E97F78561FFE1B2E5B57C296BFC3D297047253237158BC25CD7077892C41C1C83FAFFDE4A0A",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001B6C2C6D7BE6CBC29BC9D356DDBF0C5D88D3BA97E0994DD5C78409CAA52639698A9374E235B64DAA",
+          "keyPassword": "0000001B654E765B79C902CB9E3A6D97A40F5852412CEE5AC37E949F430C754DB02327838E925EDF861314",
-          "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p7b",
+          "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p7b",
           "signAlg": "SHA256withECDSA",
-          "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p12"
+          "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p12"
         }
       }
     ],

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 !== '1' && this.projectsObj[2].type !== undefined)
+      && this.projectsObj[2].type == '2'
       && !this.syssetParam386ET3
     ) {
       this.judge.rmndg = 2;

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 = ['1', '41', '17'];
+    const checkProjects = ['17', '41', '1'];
     //获取正在进行的项目
     const inProjects = Reflect.ownKeys(projectsObj).filter(projectKey => projectsObj[projectKey].type == 2);
 
@@ -1192,8 +1192,7 @@ 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: {
@@ -1203,7 +1202,7 @@ export default class Judge {
           ? (commonKsxm
             ? (projectsObj[commonKsxm].projectCodeCenter)
             : (examSubject == 3 ? 30000 : (xmmcEndCode == undefined ? 10000 : xmmcEndCode)))
-          : (projectsObj[commonKsxm]?.projectCodeCenter || project.projectCodeCenter),
+          : (commonKsxm || project.projectCodeCenter),
         kfxm: kf.markcatalog,
         kfxmmx: `${ksxm},${kf.markserial}`,
         sfzmhm: idCard,