From 1c1eccb25092ffd735a7f2b0757360f9ebac697b Mon Sep 17 00:00:00 2001 From: surenjun Date: Mon, 13 Jan 2025 15:05:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:y=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 | 1 + entry/src/main/ets/pages/judgeSDK/judge.ts | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 31875fdb..7a02be38 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -1025,6 +1025,7 @@ struct Index { confirmFn:()=>{ this.errorMsg = '' this.isErrorMsgEnd = true; + router.back() }, }) } diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 3d4bdb03..c163dba3 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -1002,7 +1002,7 @@ export default class Judge { if (!singlePlay && isManual && !isAllProjectsEnd) { avPlayer.playAudio(['voice/empty.mp3'], true, () => { this.isUdpEnd = true; - setTimeout(()=>{ closeAllFiles();},1000) + closeAllFiles() router.back(); }) return @@ -1071,8 +1071,13 @@ export default class Judge { if(code != 1){ avPlayer.playAudio(['voice/监管失败.mp3']) this.judgeUI.errorMsg = decodeURIComponent(message) + + if(code == 2300028 || code == 2300027){ + this.judgeUI.errorMsg = '当前的考试过程信息监管审核未通过,程序将退出!' + } this.isUdpEnd = true; - setTimeout(()=>{ closeAllFiles();},1000) + closeAllFiles() + this.judgeUI.loadingPopupVisible = false; return } @@ -1156,7 +1161,7 @@ export default class Judge { if (kfArr.length - 1 === index) { avPlayer.playAudio([`voice/${kf.markcatalog}.mp3`, voiceURL], false, () => { this.isUdpEnd = true; - setTimeout(()=>{ closeAllFiles();},1000) + closeAllFiles() router.back(); }) throw new Error('End Loop') @@ -1165,7 +1170,7 @@ export default class Judge { } else { avPlayer.playAudio([`voice/${kf.markcatalog}.mp3`, voiceURL], false, () => { this.isUdpEnd = true; - setTimeout(()=>{ closeAllFiles();},1000) + closeAllFiles() router.back(); }) throw new Error('End Loop') @@ -1179,7 +1184,7 @@ export default class Judge { avPlayer.playAudio([voiceURL], true, () => { setTimeout(() => { this.isUdpEnd = true - setTimeout(()=>{ closeAllFiles();},1000) + closeAllFiles() router.back(); }, param302 == 8 ? 3000 : 0) }) @@ -1679,7 +1684,9 @@ export default class Judge { closeAllFiles = ()=>{ - this.fileLog.closeAllFiles() + setTimeout(()=>{ + this.fileLog.closeAllFiles() + },1000) } public plcStr: string