From 7861dacb29781de169dcab4565643818a6791aa7 Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Tue, 1 Apr 2025 13:28:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?835=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/UserInfo.ets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index f90f414f..071cffff 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -89,6 +89,7 @@ struct UserInfo { 'Param830Str': '0', //同一学员连续第二次考试时不再验证身份 'Param364': '0', //考前上车准备 'Param398': '0', //考前上车准备 + 'Param835': '0', //考前上车准备 } @State startExam: boolean = false // 过程照片拍照 @@ -535,6 +536,10 @@ struct UserInfo { if (sys.v_no === '770') { that.systemParam.Param770Str = sys.v_value; } + // 车上没有缺考功能 + if (sys.v_no === '835') { + that.systemParam.Param835 = sys.v_value; + } // 开始考试前必须解开安全带或关车门 if (sys.v_no === '803') { that.systemParam.Param803Str = sys.v_value + ''; @@ -1428,4 +1433,5 @@ type systemParam = { 'Param830Str': string, //同一学员连续第二次考试时不再验证身份 'Param364': string, //考前上车准备 'Param398': string, //考前上车准备 + 'Param835': string, //考前上车准备 } \ No newline at end of file From 1499e65ecf7d2dde3e24912e6443c716744026fa Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Tue, 1 Apr 2025 14:33:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?835yycs=E6=8F=90=E7=A4=BA=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/UserInfo.ets | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 071cffff..d8194797 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -160,6 +160,7 @@ struct UserInfo { cancel: () => { }, confirm: () => { + this.prePareExam() } }), customStyle: true, @@ -536,7 +537,6 @@ struct UserInfo { if (sys.v_no === '770') { that.systemParam.Param770Str = sys.v_value; } - // 车上没有缺考功能 if (sys.v_no === '835') { that.systemParam.Param835 = sys.v_value; } @@ -1278,6 +1278,13 @@ struct UserInfo { if (this.systemParam.Param612Str == '1') { return } + if(Number(this.systemParam.Param835)<=Number(this.currentUser.yycs)){ + this.type='3' + this.title='当前考生预约考试次数为'+this.currentUser.yycs + this.errorDialog.open() + return + } + await this.prePareExam() }) } From 98eedc3d6e477665dbd2afbfed1d57890c064521 Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Wed, 2 Apr 2025 09:42:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=B7=AF=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/service/videoService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/common/service/videoService.ts b/entry/src/main/ets/common/service/videoService.ts index 6884c912..779b0ebb 100644 --- a/entry/src/main/ets/common/service/videoService.ts +++ b/entry/src/main/ets/common/service/videoService.ts @@ -50,7 +50,7 @@ export async function startRecordVideo(param, td, context, dir, path?, index?) { if (!path) { fileName = `${date}_movie_record${num}.mp4` } else { - fileName = `${date}_${path}_${index || num}.mp4` + fileName = `${date}_${path}_${index || num}_${num}.mp4` } // @ts-ignore From b5b4f5c6a9ba7838a7c6947d633a3d3f98aaef78 Mon Sep 17 00:00:00 2001 From: surenjun Date: Mon, 7 Apr 2025 12:56:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E4=BA=8C=E4=BB=A3=E6=9C=BAgps?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E5=8F=B7=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/rearEndUnitsTool/tool/UdpByOne.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts b/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts index 1385e0f8..cbf815a5 100644 --- a/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts +++ b/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts @@ -118,18 +118,21 @@ export default class UdpByOne { public handleMsg() { let newMessage = PLCGPSData; if (this.GPSMsg) { - // 使用正则表达式提取$GPGGA消息 - let GPGGAMsg = this.GPSMsg.match(/\$GPGGA[^$]*/)[0]; - let GPGGAMsgArr = GPGGAMsg ? GPGGAMsg?.split(",").slice(0, 15) : []; + let GPGGAMatch = this.GPSMsg.match(/\$GPGGA[^$]*/); + let GPGGAMsgArr = GPGGAMatch ? GPGGAMatch[0]?.split(",").slice(0, 15) : []; // 使用正则提取$GPRMC消息 - let GPRMCMsg = this.GPSMsg.match(/\$GPRMC[^$]*/)[0]; - let GPRMCMsgArr = GPRMCMsg ? GPRMCMsg?.split(",").slice(0, 14) : []; + let GPRMCMatch = this.GPSMsg.match(/\$GPRMC[^$]*/); + let GPRMCMsgArr = GPRMCMatch ? GPRMCMatch?.split(",").slice(0, 14) : []; // 使用正则表达式提取$GPGST消息 let GPGSTMatch = this.GPSMsg.match(/\$GPGST[^$]*/); let GPGSTMsgArr = GPGSTMatch ? GPGSTMatch[0]?.split(",").slice(0, 9) : []; // 使用正则提取$PTNL消息 - let PTNLMsg = this.GPSMsg.match(/\$PTNL[^$]*/)[0]; - let PTNLMsgArr = PTNLMsg.split(",")?.slice(0, 14); + let PTNLMatch = this.GPSMsg.match(/\$PTNL[^$]*/); + let PTNLMsgArr = PTNLMatch ? PTNLMatch[0].split(",")?.slice(0, 14) : []; + + if(GPGGAMsgArr.length == 0 || GPRMCMsgArr.length ==0 || GPGSTMsgArr.length ==0 || PTNLMsgArr.length ==0){ + return + } // 组合GPS数据