diff --git a/entry/src/main/cpp/bin/libJudgeSdk.so b/entry/src/main/cpp/bin/libJudgeSdk.so index ebff10c5..ec92b213 100644 Binary files a/entry/src/main/cpp/bin/libJudgeSdk.so and b/entry/src/main/cpp/bin/libJudgeSdk.so differ diff --git a/entry/src/main/ets/common/utils/TcpClient.ts b/entry/src/main/ets/common/utils/TcpClient.ts index 5dce6e1c..4ca7dc8f 100644 --- a/entry/src/main/ets/common/utils/TcpClient.ts +++ b/entry/src/main/ets/common/utils/TcpClient.ts @@ -1,7 +1,6 @@ import socket from '@ohos.net.socket'; import hilog from '@ohos.hilog'; import { getTCP } from './GlobalTcp'; -import prompt from '@ohos.prompt'; import FileUtil from './File'; import { dateFormat } from './tools'; @@ -186,11 +185,6 @@ export default class TcpClient { //程序断开 if (globalThis.tcpUdpError) { console.log(TAG,'tcp信号丢失') - // getTCP() - prompt.showToast({ - message: 'tcp信号丢失', - duration: 2000 - }); } this.writeLog({ time:dateFormat(new Date()), diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 580329b9..4e0f2b0b 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -295,9 +295,10 @@ struct Index { } } if (this.mode === 5 && no1 == 3 && no2 == Number(carNo) && no3 == 63) { - let data = decodeURI(systemParm.txt1)?.split("^").filter(item => item) - this.examMileage = data[0] || this.examMileage - this.mfxxn = data[1] !== "1" + let data = decodeURI(systemParm.txt1)?.split("^") + this.examMileage = data[1] || this.examMileage + // 满分学习扣分 + this.mfxxn = data[3] != "1" } //获取当前考车的考试项目 if (this.mode === 2 && no1 == 3 && no2 == Number(carNo) && no3 == 46) { @@ -305,7 +306,12 @@ struct Index { allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '') } else if (this.mode !== 2 && no1 == 3 && no2 == Number(carNo) && no3 == 10) { allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '') + } else if (this.mode == 5 && no1 == 3 && no2 == Number(carNo) && no3 == 63) { + // 满分学习项目 + let data = decodeURI(systemParm.txt1)?.split("^").filter(item => item) + allItems = data[2]?.split(",") || [] } + if (no1 == 6) { const name = decodeURI(systemParm.txt1) // 夜间行驶 @@ -313,7 +319,7 @@ struct Index { return } // 模拟夜间驾驶 - if (this.mode !== 3 && no2 == 41) { + if (this.mode !== 3 && this.mode !== 5 && no2 == 41) { return } let isRequired = allItems.includes(no2 + '') diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index c63da9d8..f527dbe4 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -458,6 +458,7 @@ struct UserInfo { nightTime = decodeURIComponent(item.txt1) || nightTime } }) + console.log("lixiao nightTime", nightTime) let now = new Date(await systemDateTime.getCurrentTime()) let hour = now.getHours() let minute = now.getMinutes() @@ -921,7 +922,7 @@ struct UserInfo { let kStringArr = decodeURIComponent(keystr || '').split(",").filter(item => item) console.log("lixiao kStringArr", JSON.stringify(kStringArr)) await this.getExamMode(kStringArr) - console.log("lixiao model", this.mode) + console.log("lixiao mode", this.mode) let score = Number(this.currentUser.jdxx?.split("^")[0]) let kfxm = this.currentUser.jdxx?.split("^")[1] let length = Number(this.currentUser.jdxx?.split("^")[2])