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

Merge branch 'dev' into dev_remote

Browse Source
This commit is contained in:
lixiao 2025-07-21 09:53:15 +08:00
commit 50b63e471d
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ import { getSyncData } from '../service/initable';
import hilog from '@ohos.hilog'; import hilog from '@ohos.hilog';
import FileUtil from '../../common/utils/File' import FileUtil from '../../common/utils/File'
import { GlobalConfig } from '../../config/index' import { GlobalConfig } from '../../config/index'
const TAG = 'socketTag[TcpDemo.TcpClient]'
export async function getTCP(flag=false) { export async function getTCP(flag=false) {
globalThis.getCloseTcp=true globalThis.getCloseTcp=true
const fileUtil = new FileUtil(globalThis.context) const fileUtil = new FileUtil(globalThis.context)
@ -35,10 +35,16 @@ export async function getTCP(flag=false) {
console.log('ttttttt00') console.log('ttttttt00')
clearInterval(globalThis.intervalSendmsg) clearInterval(globalThis.intervalSendmsg)
globalThis.intervalSendmsg=setInterval(()=>{ globalThis.intervalSendmsg=setInterval(async()=>{
console.log('getCloseTcp',globalThis.carInfo.carNo) console.log('getCloseTcp',globalThis.carInfo.carNo)
if(!globalThis.getCloseTcp){ if(!globalThis.getCloseTcp){
globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002 await globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
globalThis.tcpStep+=1
if(globalThis.tcpStep>30){
console.log(TAG,'tcp重连开始')
globalThis.tcpStep=0
getTCP()
}
} }
},1000/3) },1000/3)
globalThis.TcpClient.onError((val) => { globalThis.TcpClient.onError((val) => {
@ -68,10 +74,16 @@ export async function getTCP(flag=false) {
console.log('ttttttt12') console.log('ttttttt12')
clearInterval(globalThis.intervalSendmsg) clearInterval(globalThis.intervalSendmsg)
globalThis.intervalSendmsg=setInterval(()=>{ globalThis.intervalSendmsg=setInterval(async()=>{
// console.log('getCloseTcp',globalThis.getCloseTcp) // console.log('getCloseTcp',globalThis.getCloseTcp)
if(!globalThis.getCloseTcp){ if(!globalThis.getCloseTcp){
globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002 await globalThis.TcpClient.sendMsg(globalThis.carInfo.carNo) //1002
globalThis.tcpStep+=1
if(globalThis.tcpStep>30){
console.log(TAG,'tcp重连开始')
globalThis.tcpStep=0
getTCP()
}
} }
},1000/3) },1000/3)
globalThis.TcpClient.onError((val) => { globalThis.TcpClient.onError((val) => {

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

@ -148,13 +148,12 @@ export default class TcpClient {
this.tcpSendNum=0 this.tcpSendNum=0
return return
} }
globalThis.getCloseTcp=true
console.log(`${TAG} TCPsend error ${JSON.stringify(err)}`) console.log(`${TAG} TCPsend error ${JSON.stringify(err)}`)
// this.writeLog({ // this.writeLog({
// time:dateFormat(new Date()), // time:dateFormat(new Date()),
// message: `${TAG} TCPsend error ${JSON.stringify(err)}`, // message: `${TAG} TCPsend error ${JSON.stringify(err)}`,
// }) // })
reslove(false) reject(false)
}); });
}) })
} }
@ -165,6 +164,7 @@ export default class TcpClient {
// time:dateFormat(new Date()), // time:dateFormat(new Date()),
// PLC:`${TAG} Tcponmessage`, // PLC:`${TAG} Tcponmessage`,
// }) // })
globalThis.tcpStep=0
globalThis.tcpUdpError = false globalThis.tcpUdpError = false
if (value) { if (value) {
callback && callback(value.message) callback && callback(value.message)

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

@ -38,6 +38,8 @@ export default class EntryAbility extends UIAbility {
async onWindowStageCreate(windowStage: window.WindowStage) { async onWindowStageCreate(windowStage: window.WindowStage) {
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate'); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
await tcpUtil.init()
globalThis.tcpStep=0
globalThis.carInfo = {} globalThis.carInfo = {}
globalThis.examinerInfo = {} globalThis.examinerInfo = {}
@ -63,11 +65,15 @@ export default class EntryAbility extends UIAbility {
globalThis.pathDir = this.context.filesDir; globalThis.pathDir = this.context.filesDir;
globalThis.context = this.context; globalThis.context = this.context;
globalThis.isJudgeInitBool = false globalThis.isJudgeInitBool = false
console.info('jiangsong globalThis.pathDir = ' + globalThis.pathDir);
// this.requestPermission(this.context)
// this.featureAbilityAuth()
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'])
windowStage.loadContent('pages/Index', (err, data) => { windowStage.loadContent('pages/Index', (err, data) => {
if (err.code) { if (err.code) {