diff --git a/entry/src/main/ets/common/utils/GlobalTcp.ts b/entry/src/main/ets/common/utils/GlobalTcp.ts index 5cf440f1..6edbc1f0 100644 --- a/entry/src/main/ets/common/utils/GlobalTcp.ts +++ b/entry/src/main/ets/common/utils/GlobalTcp.ts @@ -27,7 +27,7 @@ export async function getTCP() { }) await globalThis.TcpClient.onMessage((val) => { setTimeout(() => { - globalThis.TcpClient.sendMsg('1002') //1002 + globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo||'1002') //1002 if (val) { // const msg=val.substring(5,val.length-1) console.log('socketTag[PLC.UdpClient] status:', globalThis.udpClient.getStatus()) @@ -54,7 +54,7 @@ export async function getTCP() { await globalThis.TcpClient.onMessage((val) => { hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val)); setTimeout(() => { - globalThis.TcpClient.sendMsg('1002') //1002 + globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo||'1002') //1002 if (val && globalThis.udpClient?.sendMsg) { globalThis.udpClient?.sendMsg(val) } diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts index b56ff7b0..fd24f49a 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ts +++ b/entry/src/main/ets/entryability/EntryAbility.ts @@ -28,8 +28,12 @@ export default class EntryAbility extends UIAbility { globalThis.examinerInfo = {} globalThis.deviceNo = ''; globalThis.hasAuth = false - globalThis.version = '2022.08.13.01'//洛阳 - globalThis.judgeVersion = '2022.12.05.1' + globalThis.version = '2024.03.19.01'//洛阳 + 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.version = '2022.08.13.01' // globalThis.version = '2024.11.22.14'//济南 @@ -59,7 +63,7 @@ export default class EntryAbility extends UIAbility { const windowClass = await windowStage.getMainWindow(); globalThis.windowClass = windowClass - await windowClass.setWindowLayoutFullScreen(true) + // await windowClass.setWindowLayoutFullScreen(true) // await windowClass.setWindowSystemBarEnable([]) //全屏 // await windowClass.setWindowSystemBarEnable(['navigation']) diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 23e1dbc0..00f330ac 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -184,7 +184,7 @@ struct Index { Column() { Row() { Column() { - Text('V ' + globalThis.version) + Text('V 1.0') .fontColor('#CCAE7A') .fontSize(22 * globalThis.ratio) .width('30%')