From 6f7e52d23cb108df3358b90c1ece0a818a5871b8 Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Thu, 3 Apr 2025 09:06:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?dialog=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/pages/compontents/errorMsgDialog.ets | 60 +++++++++++++------ 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/entry/src/main/ets/pages/compontents/errorMsgDialog.ets b/entry/src/main/ets/pages/compontents/errorMsgDialog.ets index f02c445f..e06c1319 100644 --- a/entry/src/main/ets/pages/compontents/errorMsgDialog.ets +++ b/entry/src/main/ets/pages/compontents/errorMsgDialog.ets @@ -2,21 +2,20 @@ import router from '@ohos.router'; @CustomDialog export default struct errorMsgDialog { - dialogRatio: number = 0.8 - title?: string - type: string //1 tip 2loading 3Dialog - @State angle: number = 0 - @State ratio: number = 1700 / 960 private controller?: CustomDialogController cancel: () => void = () => { } confirm: () => void = () => { } + dialogRatio: number = 0.8 + title?: string + type: string //1 tip 2loading 3Dialog + @State angle: number = 0 @Styles commStyle(){ - .width(220 * this.ratio * this.dialogRatio * 0.6) - .height(69 * this.ratio * this.dialogRatio * 0.6) + .width(220 * globalThis.ratio * this.dialogRatio * 0.6) + .height(69 * globalThis.ratio * this.dialogRatio * 0.6) .backgroundImage($r('app.media.button_nor')) .backgroundImageSize({ width: '100%', height: '100%' }) // .margin({ bottom: 12 * this.ratio }) @@ -47,14 +46,14 @@ export default struct errorMsgDialog { Row() { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Text(' 取 消 ') - .fontSize(24 * this.ratio * this.dialogRatio * 0.6) + .fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6) .fontColor('#fff') - .width(60 * this.ratio * this.dialogRatio) + .width(60 * globalThis.ratio * this.dialogRatio) } .commStyle() .onClick(() => { if (this.controller != undefined) { - const errorCode: number = AppStorage.get('errorMsg'); + const errorCode = AppStorage.Get('errorMsg'); // const errorCodeFlage=AppStorage.Get('errorCodeFlage'); // console.log('errorCode',errorCode,errorCodeFlage) if (errorCode == 0) { @@ -67,18 +66,18 @@ export default struct errorMsgDialog { this.cancel() this.controller.close() } - }).margin({ right: 10 * this.ratio * this.dialogRatio }) + }).margin({ right: 10 * globalThis.ratio * this.dialogRatio }) Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Text(' 确 定 ') - .fontSize(24 * this.ratio * this.dialogRatio * 0.6) + .fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6) .fontColor('#fff') - .width(60 * this.ratio * this.dialogRatio) + .width(60 * globalThis.ratio * this.dialogRatio) } .commStyle() .onClick(() => { - const errorCode: number = AppStorage.get('errorCode'); - const errorCodeFlage: string = AppStorage.get('errorCodeFlage'); + const errorCode = AppStorage.Get('errorCode'); + const errorCodeFlage = AppStorage.Get('errorCodeFlage'); console.log('errorCode', errorCode, errorCodeFlage) if (errorCode == 0 && errorCodeFlage) { router.replaceUrl({ @@ -100,15 +99,42 @@ export default struct errorMsgDialog { .padding({ bottom: 20 }) } + if (this.type == '4') { + Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { + Text(' 确 定 ') + .fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6) + .fontColor('#fff') + .width(60 * globalThis.ratio * this.dialogRatio) + } + .commStyle() + .onClick(() => { + const errorCode = AppStorage.Get('errorCode'); + const errorCodeFlage = AppStorage.Get('errorCodeFlage'); + console.log('errorCode', errorCode, errorCodeFlage) + if (errorCode == 0 && errorCodeFlage) { + router.replaceUrl({ + url: 'pages/Index', + }, router.RouterMode.Single); + router.clear(); + + } + console.log('errorCode', errorCode, errorCodeFlage) + + if (this.controller != undefined) { + this.confirm() + this.controller.close() + } + } + ) + } } .backgroundColor('#E6E3DF') - .borderRadius(19 * this.ratio) + .borderRadius(19 * globalThis.ratio) .constraintSize({ minWidth: 520 }) } aboutToAppear() { AppStorage.SetOrCreate('errorMsg', 0); - setTimeout(() => { console.log('this.type', this.type, this.angle) if (this.type == '2') { From ade3486e8e805b2a717d7f97c4441a7c8e90efde Mon Sep 17 00:00:00 2001 From: lv <1344032923@qq.com> Date: Tue, 8 Apr 2025 14:52:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?udp=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/pages/compontents/SignDisplayCom.ets | 21 +++++++++---------- oh-package-lock.json5 | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets b/entry/src/main/ets/pages/compontents/SignDisplayCom.ets index fd8ff38c..9e1ccb22 100644 --- a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets +++ b/entry/src/main/ets/pages/compontents/SignDisplayCom.ets @@ -2,6 +2,7 @@ import router from '@ohos.router'; import RealTime from '../compontents/judge/RealTime'; import { GPSData, SignalData } from '../../mock'; import { SignalDataType } from '../../model'; +import { ObtainSignalData } from '../../utils/business/ObtainSignalData'; @Component export default struct SignDisplayCom { @@ -332,12 +333,12 @@ export default struct SignDisplayCom { if (showBack) { this.ratio = 1.4 - globalThis.udpClient.onMessage_1 && globalThis.udpClient.onMessage_1((msg) => { - console.log('getUDPonMessage_1bysignDisplay0', msg) - if (msg) { - getSignal(msg) - } + ObtainSignalData.getData((msg)=>{ + if (msg) { + getSignal(msg) + } }) + } else { clearInterval(this.signalTimer) this.signalTimer = setInterval(() => { @@ -351,16 +352,14 @@ export default struct SignDisplayCom { } onPageShow() { - console.info('SURENJUN', 123) - const getSignal = this.getSignal; const that = this const showBack = this.showBack; if (showBack) { - globalThis.udpClient.onMessage_1 && globalThis.udpClient.onMessage_1((msg) => { - console.log('getUDPonMessage_1bysignDisplay2', msg) - - getSignal(msg) + ObtainSignalData.getData((msg)=>{ + if (msg) { + getSignal(msg) + } }) } else { clearInterval(this.signalTimer) diff --git a/oh-package-lock.json5 b/oh-package-lock.json5 index 8a446ad6..ba7c9fe5 100644 --- a/oh-package-lock.json5 +++ b/oh-package-lock.json5 @@ -2,7 +2,7 @@ "meta": { "stableOrder": true }, - "lockfileVersion": 3, + "lockfileVersion": 1, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { "@ohos/crypto-js@2.0.3": "@ohos/crypto-js@2.0.3",