harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
surenjun 2024-09-06 13:36:43 +08:00
commit 86e101e091
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
entry/src/main/ets/common/utils/GlobalTcp.ts
View File

@ -27,7 +27,7 @@ export async function getTCP() {
}) })
await globalThis.TcpClient.onMessage((val) => { await globalThis.TcpClient.onMessage((val) => {
setTimeout(() => { setTimeout(() => {
globalThis.TcpClient.sendMsg('1002') //1002 globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo||'1002') //1002
if (val) { if (val) {
// const msg=val.substring(5,val.length-1) // const msg=val.substring(5,val.length-1)
console.log('socketTag[PLC.UdpClient] status:', globalThis.udpClient.getStatus()) console.log('socketTag[PLC.UdpClient] status:', globalThis.udpClient.getStatus())
@ -54,7 +54,7 @@ export async function getTCP() {
await globalThis.TcpClient.onMessage((val) => { await globalThis.TcpClient.onMessage((val) => {
hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val)); hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val));
setTimeout(() => { setTimeout(() => {
globalThis.TcpClient.sendMsg('1002') //1002 globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo||'1002') //1002
if (val && globalThis.udpClient?.sendMsg) { if (val && globalThis.udpClient?.sendMsg) {
globalThis.udpClient?.sendMsg(val) globalThis.udpClient?.sendMsg(val)
} }

10
entry/src/main/ets/entryability/EntryAbility.ts
View File

@ -28,8 +28,12 @@ export default class EntryAbility extends UIAbility {
globalThis.examinerInfo = {} globalThis.examinerInfo = {}
globalThis.deviceNo = ''; globalThis.deviceNo = '';
globalThis.hasAuth = false globalThis.hasAuth = false
globalThis.version = '2022.08.13.01'//洛阳 globalThis.version = '2024.03.19.01'//洛阳
globalThis.judgeVersion = '2022.12.05.1' globalThis.judgeVersion = '2024.01.05.1'
// globalThis.judgeVersion = '2022.12.05.1'
// globalThis.version = '2022.08.13.01'
// globalThis.version = '2022.08.13.01'//洛阳
// globalThis.judgeVersion = '2022.12.05.1'
// globalThis.judgeVersion = '2022.12.05.1' // globalThis.judgeVersion = '2022.12.05.1'
// globalThis.version = '2022.08.13.01' // globalThis.version = '2022.08.13.01'
// globalThis.version = '2024.11.22.14'//济南 // globalThis.version = '2024.11.22.14'//济南
@ -59,7 +63,7 @@ export default class EntryAbility extends UIAbility {
const windowClass = await windowStage.getMainWindow(); const windowClass = await windowStage.getMainWindow();
globalThis.windowClass = windowClass globalThis.windowClass = windowClass
await windowClass.setWindowLayoutFullScreen(true) // await windowClass.setWindowLayoutFullScreen(true)
// await windowClass.setWindowSystemBarEnable([]) //全屏 // await windowClass.setWindowSystemBarEnable([]) //全屏
// await windowClass.setWindowSystemBarEnable(['navigation']) // await windowClass.setWindowSystemBarEnable(['navigation'])

2
entry/src/main/ets/pages/Index.ets
View File

@ -184,7 +184,7 @@ struct Index {
Column() { Column() {
Row() { Row() {
Column() { Column() {
Text('V ' + globalThis.version) Text('V 1.0')
.fontColor('#CCAE7A') .fontColor('#CCAE7A')
.fontSize(22 * globalThis.ratio) .fontSize(22 * globalThis.ratio)
.width('30%') .width('30%')