From afa4983725f19745db430e9f1badb2d7d172e63c Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Fri, 11 Apr 2025 13:04:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9B=9E=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 4 ++-- .../src/main/ets/pages/judgeSDK/utils/judgeConfig.ts | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index c1c4a9d5..1c7c00ba 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,9 +5,9 @@ "name": "default", "material": { "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.cer", - "storePassword": "0000001B0A8E97F78561FFE1B2E5B57C296BFC3D297047253237158BC25CD7077892C41C1C83FAFFDE4A0A", + "storePassword": "0000001B0D8963A2149509CE4705E3453B788A74A9A4A6714814A79A4AA117A71A42C0D48243CE59D648EE", "keyAlias": "debugKey", - "keyPassword": "0000001B654E765B79C902CB9E3A6D97A40F5852412CEE5AC37E949F430C754DB02327838E925EDF861314", + "keyPassword": "0000001BABDF12118AF1E7E6AFF8D76FA6D89B08D9E1EC05B6A55CFDAABB51A25D3EA85D9B0E3570B4E666", "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p7b", "signAlg": "SHA256withECDSA", "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p12" diff --git a/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts b/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts index a8e1b4f1..6c43680f 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts +++ b/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts @@ -7,22 +7,22 @@ export const judgeConfig = { //扣分语音是否强制开启 kfVoiceOpen: false, //忽略的考试项目 - ignoreProjects:[], + ignoreProjects: [], // 是否忽略考试前熄火、车门检查 isCheckFireOpen: false, //轨迹回放是否开启Udp - udpOpen:true, + udpOpen: true, // 本地模型地址 modelPath: 'models/model_enc', // 济南科目三 - trajectoryPath: 'logs/2024_12_26/2024_12_26_14_12_51_2412505941910_370125200404041910_赵宇/judge_exam_data.txt', + trajectoryPath: 'logs/2024_10_12/2024_10_12_11_50_10_9999427676823_744299437502336256_隋统/judge_exam_data.txt', //四合一画面配置 - fourInOneScreen:{ + fourInOneScreen: { //gps位数 - gpsDigit:6 + gpsDigit: 6 }, // 杭州科目二 // trajectoryPath: 'logs/2024_07_19/0000000000001_342323199501470011_测试学员1_2024_07_19_06_49_12/judge_exam_data.txt', //TODO 济南临时特殊配置 - systemParamConfig:{} + systemParamConfig: {} } \ No newline at end of file From 264e76d05d38103f359ba2582ad570fd1c8b325a Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Thu, 16 Oct 2025 17:27:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E6=8B=8D=E7=85=A7?= =?UTF-8?q?=EF=BC=9AsecondImg=E4=B8=BA=E6=8B=8D=E7=85=A7=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/compontents/FaceCompare.ets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entry/src/main/ets/pages/compontents/FaceCompare.ets b/entry/src/main/ets/pages/compontents/FaceCompare.ets index 74835c59..69591dc2 100644 --- a/entry/src/main/ets/pages/compontents/FaceCompare.ets +++ b/entry/src/main/ets/pages/compontents/FaceCompare.ets @@ -187,8 +187,8 @@ export default struct FaceCompare { this.base64 = this.imageBase64 + data.base64 faceCompare({ sfzh: this.sfzh, - secondImage: this.firstImage.substr(22), - firstImage: data.base64, + secondImage:data.base64, + firstImage: this.firstImage.substr(22), type: 2, verifyType: 1 }) From d93f0adcaf18c28dc6f20e93964afd5e09ca9875 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Fri, 17 Oct 2025 09:10:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E6=8F=90=E4=BA=A4=E8=A7=86=E9=A2=91?= =?UTF-8?q?=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/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 779b0ebb..3d4dfe5c 100644 --- a/entry/src/main/ets/common/service/videoService.ts +++ b/entry/src/main/ets/common/service/videoService.ts @@ -218,7 +218,7 @@ export async function takePhoto(param, context, dir, flag = 1, callback?) { // @ts-ignore // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir); if (flag == 0) { - rtsp_server.detectVideoSnapshotSize(video_uri, fileName, (err, snapResult) => { + rtsp_server.detectVideoSnapshotSize(video_uri, fileName, false,(err, snapResult) => { console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize); callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode }) }); From a602655278bef0572e18a4d124d1a3164c036cb7 Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Fri, 17 Oct 2025 15:36:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E5=9E=83=E5=9C=BE=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/service/videoService.ts | 1 + entry/src/main/ets/common/utils/UdpClientByCenter.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/entry/src/main/ets/common/service/videoService.ts b/entry/src/main/ets/common/service/videoService.ts index 779b0ebb..c8bc02ef 100644 --- a/entry/src/main/ets/common/service/videoService.ts +++ b/entry/src/main/ets/common/service/videoService.ts @@ -218,6 +218,7 @@ export async function takePhoto(param, context, dir, flag = 1, callback?) { // @ts-ignore // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir); if (flag == 0) { + // @ts-ignore rtsp_server.detectVideoSnapshotSize(video_uri, fileName, (err, snapResult) => { console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize); callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode }) diff --git a/entry/src/main/ets/common/utils/UdpClientByCenter.ts b/entry/src/main/ets/common/utils/UdpClientByCenter.ts index d607ce8a..331c9164 100644 --- a/entry/src/main/ets/common/utils/UdpClientByCenter.ts +++ b/entry/src/main/ets/common/utils/UdpClientByCenter.ts @@ -380,7 +380,7 @@ export default class UdpClientByCenter { } // console.info('surenjun2','set message_1Fn=>' + newArr.toString()) callback && callback(newArr.toString()) - console.info('surenjun 左方向灯=>', newArr.toString()) + // console.info('surenjun 左方向灯=>', newArr.toString()) this.currentValue = newArr.toString(); } else { callback && callback('') From c796add419646ff9d9260052b1269b975e1daaef Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Fri, 17 Oct 2025 16:09:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=97=AA=E9=80=80=E6=8F=90=E4=BA=A4?= 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 c8bc02ef..b0bbd5f7 100644 --- a/entry/src/main/ets/common/service/videoService.ts +++ b/entry/src/main/ets/common/service/videoService.ts @@ -219,7 +219,7 @@ export async function takePhoto(param, context, dir, flag = 1, callback?) { // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir); if (flag == 0) { // @ts-ignore - rtsp_server.detectVideoSnapshotSize(video_uri, fileName, (err, snapResult) => { + rtsp_server.detectVideoSnapshotSize(video_uri, fileName, false,(err, snapResult) => { console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize); callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode }) });