From 86fe62c7444f5c88d6c1da1aaa963e788c9c9413 Mon Sep 17 00:00:00 2001 From: lixiao <932184220@qq.com> Date: Wed, 21 May 2025 15:23:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=A1=A5=E4=BC=A0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E5=A4=84=E7=90=86=202.=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=BB=A1=E5=88=86=E5=AD=A6=E4=B9=A0=E7=81=AF=E5=85=89=E6=A8=A1?= =?UTF-8?q?=E6=8B=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/cpp/bin/libJudgeSdk.so | Bin 4587112 -> 4587112 bytes entry/src/main/ets/api/judge.ts | 2 +- entry/src/main/ets/pages/Judge.ets | 4 ---- entry/src/main/ets/pages/judgeSDK/judge.ts | 12 +++++++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/entry/src/main/cpp/bin/libJudgeSdk.so b/entry/src/main/cpp/bin/libJudgeSdk.so index ddf843721b867c91261a80e2e7507021db81506d..51a58dd9001b654b1deac68abe262bf1e551b3e1 100644 GIT binary patch delta 4030 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 diff --git a/entry/src/main/ets/api/judge.ts b/entry/src/main/ets/api/judge.ts index 2605219d..2f95d1f3 100644 --- a/entry/src/main/ets/api/judge.ts +++ b/entry/src/main/ets/api/judge.ts @@ -20,7 +20,7 @@ export async function download() { interface WR { message?: string - code?: number + code?: number |string keystr?: string } diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index edd0fcd6..6e584f4c 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -416,10 +416,6 @@ struct Index { let data = decodeURI(systemParm.txt1)?.split("^") allItems = data[0]?.split(",").filter(item => item !== "") || [] } - // 满分学习单独做灯光判断 - if (this.mode === 5) { - this.mockLight = (allItems.length === 0) || allItems.includes(41 + '') - } }) console.log("lixiao mockLight", JSON.stringify(allItems), this.mockLight) systemParms.forEach((systemParm) => { diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 780952f9..c04b5e64 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -58,6 +58,14 @@ import promptAction from '@ohos.promptAction'; const judgeTag = 'SURENJUN_JUDGE' +function ifNeedRetry(code: number | string): boolean { + let arr = ["B210010", "B210023", "B210024", "B210031", "B210033", "B210034", "B210041"] + if (!arr.includes(code + "") && code != 1) { + return true + } + return false +} + export default class Judge { // 过程照片拍照 getPhoto = async (empty?: boolean) => { @@ -605,15 +613,13 @@ export default class Judge { const temp = await writeObjectOut(data, filePath); console.log("wzj", JSON.stringify(temp)) //断网&网络超时次数计算 - if (temp.code != 1) { + if (ifNeedRetry(temp.code)) { this.disConnectNum += 1; if (this.disConnectNum < 5) { return await this.sendWriteObjectOut(data, filePath) } } - if (this.disConnectNum >= 5) { - console.info('surenjun', '123') this.judgeUI.errorMsg = '当前的考试过程信息网络传输异常,程序点击确认将重启!'; this.judgeUI.disConnectErrorOpen = true }