From 5e0782725b2326b93cdabf79726464f40e119c48 Mon Sep 17 00:00:00 2001 From: Surenjun Date: Thu, 10 Oct 2024 09:10:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=89=AF=E6=9D=BF=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 10 ++--- .../main/ets/common/service/indexService.ts | 2 +- .../ets/common/utils/UdpClientByCenter.ts | 2 +- entry/src/main/ets/pages/CarCheck.ets | 37 ++++++++++--------- entry/src/main/ets/pages/UserInfo.ets | 2 +- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index ec24561c..98ce499d 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,13 +4,13 @@ { "name": "default", "material": { - "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer", - "storePassword": "0000001A411B16D84BA448A9AED56C5B7E351A55B8BA7BA0073A2313B214C24C5740A4B49E6E80AD05F0", + "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer", + "storePassword": "0000001BBBEEEB230EFEEF9482B9CDE082C143FEA0EC8E8DCA87DF84471BEB463FAB79CCC9312E2A1C883F", "keyAlias": "debugKey", - "keyPassword": "0000001AD6836BCC5536725F76279FB36A15D9F61E7CE88C2D043642297F81A9662DEB365314D756CB63", - "profile": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b", + "keyPassword": "0000001B994720ED634C0906F820EB6B2DBDE10AD110DF8123E58504AD50649E689A264D07736A5F5A872C", + "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b", "signAlg": "SHA256withECDSA", - "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12" + "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12" } } ], diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index 4a598430..48f43eda 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -361,7 +361,7 @@ function getChuankouFnMsg() { console.log('zzc 3 try receive msg') testNapi.SerialRecvAsync(globalThis.fd, timeout, (revTestInfo) => { console.log('zzc 4 received msg') - console.log('revTestInfo', revTestInfo.recevedBuf.length) + console.log('revTestInfo', JSON.stringify(revTestInfo)) // TODO: 读取串口数据 // if (revTestInfo.recevedLen > 0) { // const buffer = this.arrayToBuffer(revTestInfo.recevedBuf); diff --git a/entry/src/main/ets/common/utils/UdpClientByCenter.ts b/entry/src/main/ets/common/utils/UdpClientByCenter.ts index bca512e4..be3072d2 100644 --- a/entry/src/main/ets/common/utils/UdpClientByCenter.ts +++ b/entry/src/main/ets/common/utils/UdpClientByCenter.ts @@ -219,7 +219,7 @@ export default class UdpClientByCenter { } sendMsgExt(param, context?) { - console.log('sendMsgExt enterbitbit',JSON.string(param)); + console.log('sendMsgExt enterbitbit',JSON.stringify(param)); if (context) { this.context = context } diff --git a/entry/src/main/ets/pages/CarCheck.ets b/entry/src/main/ets/pages/CarCheck.ets index b4d50a22..45a129d7 100644 --- a/entry/src/main/ets/pages/CarCheck.ets +++ b/entry/src/main/ets/pages/CarCheck.ets @@ -76,25 +76,26 @@ export default struct Index { console.log('mmmm', ret) let revTestInfo = testNapi?.SerialRecv(this.fd, timeout); - console.log('revTestInfo', revTestInfo.recevedBuf.length) + if (revTestInfo.recevedBuf) { + const message = revTestInfo?.recevedBuf?.toString() + console.log('chuankou', this.index, message) + if (message == '') { + this.stopFlag = true + return + } + const msg = message?.split(',') + if (!msg?.length) { + return + } + if (msg[0] != '98' || msg[1] != '85' || msg.length < 9) { + return + } + globalThis.chuankoMsg = msg[9] + if (msg[9] == this.dwMap[this.index]) { + this.warnFlag[this.index] = '2' + } + } - const message = revTestInfo?.recevedBuf?.toString() - console.log('chuankou', this.index, message) - if (message == '') { - this.stopFlag = true - return - } - const msg = message?.split(',') - if (!msg?.length) { - return - } - if (msg[0] != '98' || msg[1] != '85' || msg.length < 9) { - return - } - globalThis.chuankoMsg = msg[9] - if (msg[9] == this.dwMap[this.index]) { - this.warnFlag[this.index] = '2' - } } diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 1565566b..84c6fc7a 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -77,7 +77,7 @@ struct UserInfo { @State FaceOpenStatue: string = '0'; //是否开启人脸识别 @State faceCatchImg: string = '' @State Param803Str: string = '' - @State Param341: boolean = '' + @State Param341: Boolean = false private title = '' private type = '2' // 过程照片拍照