diff --git a/Makefile b/Makefile index 8962ab8..3fa94dc 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,2 @@ gitLog: - git log --since="2025-06-30 17:14" --until="2025-07-1 17:14" --pretty=format:"
%n %s%n [提交人]:%an
%n [提交时间]:%ad
%n [提交版本]:%h%n
%n" --date=format:"%Y-%m-%d %H:%M" > release_note.md \ No newline at end of file + git log --since="2025-06-30 17:14" --until="2025-07-2 17:35" --pretty=format:"
%n %s%n [提交人]:%an
%n [提交时间]:%ad
%n [提交版本]:%h%n
%n" --date=format:"%Y-%m-%d %H:%M" > release_note.md \ No newline at end of file diff --git a/entry/src/main/ets/config/LogEnum.ets b/entry/src/main/ets/config/LogEnum.ets index dc71c06..260f70a 100644 --- a/entry/src/main/ets/config/LogEnum.ets +++ b/entry/src/main/ets/config/LogEnum.ets @@ -64,4 +64,7 @@ export const ExaminerLoginTag = '[ExaminerLogin]'; export const UserInfoTag = '[UserInfo]'; //SignDisplay -export const SignDisplayTag = '[SignDisplay]'; \ No newline at end of file +export const SignDisplayTag = '[SignDisplay]'; + +//开始考试 +export const StartExamTag = '[StartExam]' \ No newline at end of file diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 5f3a8d8..5d39d94 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -218,7 +218,6 @@ struct JudgePage { //初始化相关数据库表 async initDb() { this.examSubject = this.carInfo.examSubject!; - // const { isTrajectoryOpen, trajectoryPath } = judgeConfig await this.initStudent(); await this.initCar(); @@ -308,8 +307,6 @@ struct JudgePage { }) } - // 考试项目是否全部完成 - // 获取sysset表信息 async initSysset(sysset?: SYSSET[]) { const syssetParams: SYSSET[] | MASYSSETTableType[] = sysset || await GetSyncData('MA_SYSSET') @@ -757,11 +754,11 @@ struct JudgePage { this.isDeductedPopShow = false; this.defaultTabIndex = 0; }, - confirmMark: async (itemno: string, serial: string) => { + confirmMark: async (item: string, serial: string) => { clearTimeout(this.popTimer) this.popTimer = setTimeout(async () => { const judge = this.judge - await judge.setJudgeMark(itemno, serial); + await judge.setJudgeMark(item, serial); this.isDeductedPopShow = false this.popTimer = null; }, 500) diff --git a/entry/src/main/ets/pages/Judge/JudgeUtils.ets b/entry/src/main/ets/pages/Judge/JudgeUtils.ets index 29a2f18..374bf2c 100644 --- a/entry/src/main/ets/pages/Judge/JudgeUtils.ets +++ b/entry/src/main/ets/pages/Judge/JudgeUtils.ets @@ -35,6 +35,7 @@ export async function examJudgeSetLogCallback(level: number, handleLog: Function * @desc评判初始化 */ export async function examJudgeInit(data: JudgeInitObj) { + const str = JSON.stringify(data); const temp: number = libJudgeSdk.examJudgeInit(str, str.length); return await handle(temp, 'examJudgeInit') diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index a82e0a6..004918d 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -41,7 +41,7 @@ import { GetCurrentTime, NumberToByteArray } from '../utils/Common'; import DB from '../utils/DbSql'; import { CenterUDPBusinessInstance } from '../utils/business/CenterUdpBusiness'; import { JudgeEmitterInstance } from '../utils/business/UdpEvent'; -import { JudgeConfig } from '../config'; +import { JudgeConfig, StartExamTag } from '../config'; import { dConsole } from '../utils/LogWorker'; import HeaderComponent from './compontents/Header'; import AvatarComponent from './UserInfo/Avatar'; @@ -997,10 +997,12 @@ struct UserInfoPage { // 开始考试 async beginExam(): Promise { + dConsole.log(StartExamTag, "开始考试") const startHourTime = dayTs().format("HHmmssSSS") AppStorage.setOrCreate('startHourTime', startHourTime) const photoBase64 = await this.getPhoto(); if (photoBase64 == '') { + dConsole.log(StartExamTag, "拍照失败") this.startExamDialogController.close() return { code: -200 } } @@ -1016,6 +1018,7 @@ struct UserInfoPage { kchp: decodeURI(this.carInfo.plateNo || ""), Ksy2sfzmhm: this.currentUser.ksy2sfzmhm || '' } + dConsole.log(StartExamTag, "开始考试参数", drvexam) const param: RegulatoryInterfaceParams = { drvexam, xtlb: '17', diff --git a/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets b/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets index 307c7c8..991625f 100644 --- a/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets +++ b/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets @@ -34,7 +34,7 @@ export default struct DeductedPopup { } aboutToAppear() { - this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes((item.itemno||0).toString()) || + this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes((item.itemno || 0).toString()) || this.currentItems.includes(item.itemno + ''))); this.currentIndex = this.defaultTabIndex if (this.currentIndex == 1) { @@ -45,7 +45,7 @@ export default struct DeductedPopup { changeCurrentItems() { if (this.currentItems?.length && (this.currentItems?.length >= this.preCurrentItemsLength)) { - this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes((item.itemno||0).toString()) || + this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes((item.itemno || 0).toString()) || this.currentItems.includes(item.itemno + ''))); this.currentIndex = this.defaultTabIndex if (this.currentIndex == 1) { @@ -84,7 +84,6 @@ export default struct DeductedPopup { //获取当前页的数据 getCurrentMarkRuleList() { - // const { currentIndex, currentUniversalPageIndex, currentPageIndex, markRules, universalMarkRules } = this; if (this.currentIndex) { //通用评判 return this.universalMarkRules.slice(this.currentUniversalPageIndex * 7, (this.currentUniversalPageIndex + 1) * 7) @@ -120,7 +119,7 @@ export default struct DeductedPopup { this.universalMarkRules = this.markRules.filter(item => item.itemno == 20) } else { this.universalMarkRules = - this.markRules.filter(item => (this.currentItems.includes((item.itemno||0).toString()) || + this.markRules.filter(item => (this.currentItems.includes((item.itemno || 0).toString()) || this.currentItems.includes(item.itemno + ''))) } }) @@ -249,6 +248,6 @@ export default struct DeductedPopup { private closePopup: Function = () => { } - private confirmMark: Function = (itemno: number, serial: string) => { + private confirmMark: Function = (item: number, serial: string) => { } } \ No newline at end of file diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ets b/entry/src/main/ets/pages/judgeSDK/judge.ets index b26a160..1c4ae6d 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ets +++ b/entry/src/main/ets/pages/judgeSDK/judge.ets @@ -1898,6 +1898,7 @@ export default class Judge { // await fileLog?.setExamJudgeData(JSON.stringify(initInfo)) //相关评判初始化只做一次 if (!isJudgeInitBool) { + dConsole.log(JudgeTag, "评判初始化参数", initInfo) const tempJudge = await examJudgeInit(initInfo); AppStorage.setOrCreate('isJudgeInitBool', true) dConsole.info(JudgeTag, '4.评判初始化完成') diff --git a/release_note.md b/release_note.md index cc252ab..d86fd2a 100644 --- a/release_note.md +++ b/release_note.md @@ -1,3 +1,31 @@ +
+ fix: 优化首页获取车辆后才可以进入联网以及单机逻辑 + [提交人]:wangzhongjie
+ [提交时间]:2025-07-02 17:34
+ [提交版本]:f03ace7 +
+ +
+ fix: 评判代码抽离优化 + [提交人]:wangzhongjie
+ [提交时间]:2025-07-02 15:53
+ [提交版本]:b0692d3 +
+ +
+ fix: 评判页面结构优化 + [提交人]:wangzhongjie
+ [提交时间]:2025-07-02 10:41
+ [提交版本]:98813fe +
+ +
+ fix: 结束考试问题修复 + [提交人]:wangzhongjie
+ [提交时间]:2025-07-01 17:51
+ [提交版本]:b2b7950 +
+
fix: 评判日志 [提交人]:wangzhongjie