打包

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

@@ -555,12 +555,51 @@ struct Index {
       const {lsh,startExamTime:kskssj,jl:kslc} = this
       const { carId ,examinationRoomId} = globalThis.carInfo;
       await uploadExamMileage({
-        carId,examinationRoomId,
+        carId,
-        lsh,kskssj,kslc
+        examinationRoomId,
+        lsh,
+        kskssj,
+        kslc
       })
     }
   }
 
+  async endExam() {
+    if (this.isErrorMsgEnd) {
+      this.judge.closeAllFiles()
+      router.back()
+      return
+    }
+
+    //靠边停车进行中&且其它项目都已经完成 不能结束
+    if(!this.singlePlay && this.projectsObj['40600']?.type == '2' && this.isRequiredProjectsEnd){
+      Prompt.showToast({
+        message: '靠边停车项目进行中，不允许手动退出！',
+        duration: 4000
+      });
+      return
+    }
+
+    //考试未结束且有扣分,不允许退出
+    if (!this.singlePlay && this.judgeConfigObj['344'] == 1 && this.kfArr.length > 0 && !this.isAllProjectsEnd ) {
+      Prompt.showToast({
+        message: '考试未结束且有扣分，不允许手动退出！',
+        duration: 4000
+      });
+      return
+    }
+    this.endPopupVisible = false;
+    this.loadingPopupVisible = true
+    clearInterval(this.timer);
+    clearInterval(globalThis.judgeTimer)
+    try {
+      this.judge.checkExamIsEnd(true);
+    } catch (e) {
+      this.judge.closeAllFiles()
+      router.back()
+    }
+  }
+
   build() {
     Column() {
       Row() {
@@ -890,7 +929,11 @@ struct Index {
               //   name: 'button_media.wav'
               // })
               if (this.judgeConfigObj['353'] == '0') {
+                if (this.getNotEndProjects().length > 0) {
                   this.endPopupVisible = true
+                  return
+                }
+                this.endExam()
               } else {
                 Prompt.showToast({
                   message: '车上不允许手动结束考试！',
@@ -985,34 +1028,12 @@ struct Index {
       //结束考试弹窗
       if (this.endPopupVisible) {
         EndPoPup({
-          title: this.getNotEndProjects().length ? `当前考试存在未完成的项目:${this.getNotEndProjects().join('、')},确定结束考试吗?` :'确定结束考试吗？',
+          title: `当前考试存在未完成的项目:${this.getNotEndProjects().join('、')},确定结束考试吗?`,
           cancelFn: () => {
             this.endPopupVisible = false;
           },
           confirmFn: async () => {
-            if(this.isErrorMsgEnd){
+            this.endExam()
-              this.judge.closeAllFiles()
-              router.back()
-              return
-            }
-            if (this.judgeConfigObj['344'] == 1) {
-              Prompt.showToast({
-                message: '考试未结束，不允许手动退出！',
-                duration: 4000
-              });
-              return
-            }
-            this.endPopupVisible = false;
-            this.loadingPopupVisible = true
-            clearInterval(this.timer);
-            clearInterval(globalThis.judgeTimer)
-            try {
-              this.judge.checkExamIsEnd(true);
-            } catch (e) {
-              this.judge.closeAllFiles()
-              router.back()
-            }
-
           }
         })
       }
@@ -1216,7 +1237,6 @@ struct Index {
     }
     return true
   }
-
   // 判断项目是否在当前路段号
   getProjectIsInRoad = (projectCode: string,) => {
     const {
@@ -1276,7 +1296,6 @@ struct Index {
     return true
 
   }
-
   // 获取人工项目是否已做
   getIsEndManualProject = (index: number) => {
     const projectName = this.artSubject3Projects[index];
@@ -1287,7 +1306,6 @@ struct Index {
     }
     return (type == '3' || type == '4') ? `${projectName}_red` : `${projectName}_green`;
   }
-
   // 获取是否能进行人工评判
   getIsManualKf = () => {
     const {examSubject} = this;
@@ -1303,22 +1321,19 @@ struct Index {
       return false
     }
   }
-  // 获取必考项目里未完成的
+  // 获取考试项目里未完成的
   getNotEndProjects = () => {
     const projectsObj = this.projectsObj;
     const notEndProjectsNames = [];
     Reflect.ownKeys(projectsObj).forEach((projectKey: string) => {
-      const { type, isRequired ,name} = projectsObj[projectKey];
+      const {isEnd ,name} = projectsObj[projectKey];
-      if (isRequired) {
+      if (!isEnd) {
-        if (type == undefined || type == '1' || type == '2') {
         notEndProjectsNames.push(name)
       }
-      }
     })
     return notEndProjectsNames;
   }
 
-
   scroller: Scroller = new Scroller()
   //页面通用字体大小
   @State wayno: number = 0
@@ -1427,4 +1442,5 @@ struct Index {
   @State errorMsg: string = ''
   @State isErrorMsgEnd: boolean = false
   @State disConnectErrorOpen: boolean = false
+  @State isAllProjectsEnd:boolean = false;
 }

entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts

@@ -1,7 +1,7 @@
 //考试回放开关
 export const judgeConfig = {
   // 外壳版本号
-  version: "2025.05.26.01",
+  version: "2025.07.30.01",
   //本地目录开关
   isTrajectoryOpen: false,
   //是否开启拍照