Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev

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

@@ -199,6 +199,12 @@ struct Index {
           const {xmdm, kfdm} = kf
           const currentKf = this.markRuleListObj[`${xmdm}_${kfdm}`];
           const currentProject = this.projectsObj[xmdm]
+
+          // 过滤考前绕车一周上车准备的扣分
+          if(sczb == 1 && xmdm == '1'){
+            return
+          }
+
           this.kfArr.push({
             //扣分项目名称
             xmmcStr: currentProject.name,

entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets

@@ -34,7 +34,8 @@ export default struct  DeductedPopup {
   }
 
   @Prop defaultTabIndex:number = 0
-  @Prop @Watch('changeCurrentItems') currentItems:string[] = []
+  @Prop @Watch('changeCurrentItems') currentItems:string[] = [];
+  @State preCurrentItemsLength:number = 0
 
   aboutToAppear(){
     //@ts-ignore
@@ -43,18 +44,23 @@ export default struct  DeductedPopup {
     if(this.currentIndex == 1){
       this.universalMarkRules = this.markRules.filter(item => item.itemno == 20 )
     }
+    this.preCurrentItemsLength = this.currentItems.length
   }
 
   changeCurrentItems(){
-    if(this.currentItems){
+    if(this.currentItems?.length && (this.currentItems?.length >= this.preCurrentItemsLength)){
       //@ts-ignore
       this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes(item.itemno) || this.currentItems.includes(item.itemno + '')));
       this.currentIndex = this.defaultTabIndex
       if(this.currentIndex == 1){
         this.universalMarkRules = this.markRules.filter(item => item.itemno == 20 )
       }
+      this.preCurrentItemsLength = this.currentItems.length
+    }else{
+      this.preCurrentItemsLength = 0
     }
   }
+
   //上一页 下一页
   goPage(typeIndex){
     const currentIndex = this.currentIndex

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

@@ -202,7 +202,9 @@ export default class Judge {
       if (udpIndex % 5 === 0) {
         handDistance();
       }
-    })
+    });
+
+    // this.checkExamIsEnd()
 
     //监听远程结束考试
     globalThis.udpEvent.onEndExam(async ()=>{
@@ -597,9 +599,11 @@ export default class Judge {
             }, {isDelay: true})
           }
         }
+        if(!this.judgeUI.isProjectIn){
           this.deductedPopShowTimer = setTimeout(()=>{
             this.judgeUI.isDeductedPopShow = false
           },(param512[5] || 0) * 1000)
+        }
         judgeUI.projectsObj[xmdm].isEnd = true;
         break;
       }
@@ -892,6 +896,7 @@ export default class Judge {
             if(totalScore >= passingGrade && !isEndTip) {
               if (examSubject == 3 && (param342 == 0 || param342 == 2) && (param302 != 6 || param302 != 7 || param302 != 8)) {
                 if(param512[7] != 0){
+                  clearTimeout(this.deductedPopShowTimer)
                   avPlayer.playAudio(['voice/综合评判.mp3'])
                   this.judgeUI.isDeductedPopShow = true
                   this.judgeUI.defaultTabIndex = 1
@@ -948,6 +953,8 @@ export default class Judge {
 
             if (examSubject == 3 && (param342 == 0 || param342 == 2) && (param302 != 6 || param302 != 7 || param302 != 8)) {
               if(param512[7] != 0){
+                clearTimeout(this.deductedPopShowTimer)
+                this.judgeUI.isDeductedPopShow = false
                 avPlayer.playAudio(['voice/综合评判.mp3'])
                 this.judgeUI.isDeductedPopShow = true
                 this.judgeUI.defaultTabIndex = 1