From f746fb93ce345ca1894f8d6dedd56b771b8c0efb Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Fri, 28 Mar 2025 15:09:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=A0=87=E7=AD=BE=E5=B9=B6=E6=94=B9=E8=BF=9B=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oh-package-lock.json5 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/oh-package-lock.json5 b/oh-package-lock.json5 index bc40219d..1f023b33 100644 --- a/oh-package-lock.json5 +++ b/oh-package-lock.json5 @@ -1,13 +1,15 @@ { - "lockfileVersion": 1, + "lockfileVersion": 2, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" }, "packages": { "@ohos/hypium@1.0.6": { - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", - "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==" + "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", + "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==", + "registryType": "ohpm", + "shasum": "3f5fed65372633233264b3447705b0831dfe7ea1" } } } \ No newline at end of file From b186ffd3dbc508c18dad4780b2aa60536e839055 Mon Sep 17 00:00:00 2001 From: surenjun Date: Mon, 7 Apr 2025 16:18:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:showToast=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/utils/TcpClient.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/entry/src/main/ets/common/utils/TcpClient.ts b/entry/src/main/ets/common/utils/TcpClient.ts index 61889fa8..7fcb893c 100644 --- a/entry/src/main/ets/common/utils/TcpClient.ts +++ b/entry/src/main/ets/common/utils/TcpClient.ts @@ -1,10 +1,9 @@ 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'; - +import Prompt from '@system.prompt'; const TAG = 'socketTag[TcpDemo.TcpClient]' export default class TcpClient { @@ -187,7 +186,7 @@ export default class TcpClient { if (globalThis.tcpUdpError) { console.log(TAG,'tcp信号丢失') // getTCP() - prompt.showToast({ + Prompt.showToast({ message: 'tcp信号丢失', duration: 2000 }); From fe5c1e033196a04870a3045a9032a4de0ccb3f6c Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Mon, 7 Apr 2025 16:46:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E6=80=A7=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/build-profile.json5 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/entry/build-profile.json5 b/entry/build-profile.json5 index 2160ea13..6cfa095d 100644 --- a/entry/build-profile.json5 +++ b/entry/build-profile.json5 @@ -2,6 +2,11 @@ "apiType": 'stageMode', "buildOption": { "externalNativeOptions": { + "abiFilters": [ + "arm64-v8a", + "armeabi-v7a", + "x86_64" + ], "path": "./src/main/cpp/CMakeLists.txt", "arguments": "", "cppFlags": "", From 487f5fcc189b2f4f97e4ab2237a4153c7ebd3d2d Mon Sep 17 00:00:00 2001 From: surenjun Date: Mon, 7 Apr 2025 18:39:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/common/rearEndUnitsTool/tool/UdpByOne.ts | 12 +++++------- 1 file changed, 5 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 cbf815a5..2a7eeebb 100644 --- a/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts +++ b/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts @@ -82,6 +82,7 @@ export default class UdpByOne { address: this.OppositeIp, port: parseInt(this.PLCOppositeIpPort), } + }) } @@ -122,7 +123,7 @@ export default class UdpByOne { let GPGGAMsgArr = GPGGAMatch ? GPGGAMatch[0]?.split(",").slice(0, 15) : []; // 使用正则提取$GPRMC消息 let GPRMCMatch = this.GPSMsg.match(/\$GPRMC[^$]*/); - let GPRMCMsgArr = GPRMCMatch ? GPRMCMatch?.split(",").slice(0, 14) : []; + let GPRMCMsgArr = GPRMCMatch ? GPRMCMatch[0]?.split(",").slice(0, 14) : []; // 使用正则表达式提取$GPGST消息 let GPGSTMatch = this.GPSMsg.match(/\$GPGST[^$]*/); let GPGSTMsgArr = GPGSTMatch ? GPGSTMatch[0]?.split(",").slice(0, 9) : []; @@ -130,11 +131,6 @@ export default class UdpByOne { 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数据 // 状态83 newMessage[83] = GPGGAMsgArr[6]; @@ -277,7 +273,9 @@ export default class UdpByOne { // 已工作时长/设定的工作时长 61 // 改正数数据长度*数据长度-基准站RTCM改正数类型 62 } - return newMessage.join(",") + return newMessage.map(i=>{ + return i === undefined?'':i + }).join(",") } // PLC接收消息