Merge remote-tracking branch 'origin/dev' into dev

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

@@ -368,9 +368,6 @@ export default class Judge {
         this.xmdm = xmdm;
         this.xmxh = xmxh;
         this.judgeUI.isProjectIn = true
-        if(param512[7] != 0){
-          this.judgeUI.isDeductedPopShow = true
-        }
         break;
 
     //项目结束
@@ -520,6 +517,7 @@ export default class Judge {
     //不报语音的项目列表
     const ignoreVoiceCodeArr = (judgeConfigObj['312'] || '').split(',')
     const param611 = judgeConfigObj['611'] || '';
+    const param512 = (judgeConfigObj['512'] || '').split(',');
     const [f,s] = param611.split('/')
     switch (event) {
     // 项目开始
@@ -534,6 +532,9 @@ export default class Judge {
             kmCode && avPlayer.playAudio([`voice/${kmCode}.mp3`],true)
           }
         }
+        if(param512[7] != 0){
+          this.judgeUI.isDeductedPopShow = true
+        }
       //项目已考不上传监管信息
         if (!isEnd) {
           judgeTask.addTask(async () => {
@@ -1084,7 +1085,7 @@ export default class Judge {
     let score = 0;
     //结束考试时候是否播报一遍所有扣分
     const param634 = judgeConfigObj['634'];
-    if (kfArr.length && param634 == 1) {
+    if (kfArr.length && ((examSubject == 2 && param634 == 1) || examSubject == 3)) {
       avPlayer.playAudio([`voice/kfdesc.mp3`], false, () => {
         try {
           kfArr.forEach((kf, index) => {
@@ -1154,7 +1155,8 @@ export default class Judge {
       performInfo,
       kfArr,
       getTranslateProject,
-      getSbxh
+      getSbxh,
+      fileLog,
     } = this;
     const singlePlay = globalThis.singlePlay
     const {lsh,startHourTime,totalScore,examTime,judgeConfigObj} = judgeUI;
@@ -1191,6 +1193,8 @@ export default class Judge {
       tempSd = 0
     }
 
+    fileLog.setFourAndOneLogData(`${translateJd},${translateWd}`);
+
     const arr = [
     //考生号
       asclshArr.map(lsh => string2Bytes(lsh, 8)[0]),
@@ -1337,7 +1341,6 @@ export default class Judge {
   }
   //人工操作项目
   public setJudgeItem = async (itemno, type: 1 | 2) => {
-    console.info('surenjun','2')
     const {fileLog} = this;
     await examJudgeArtificialItem(itemno * 1, type);
     await fileLog.setExamJudgeData({