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

lv #22

Merged
wangzhongjie merged 5 commits from lv into main 2024-07-04 10:07:56 +08:00
Conversation 0 Commits 5 Files Changed 93 +73 -97
6 changed files with 73 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 22acd782b9 - Show all commits

7
entry/src/main/ets/common/service/initable.ts
View File

@ -62,6 +62,8 @@ const centerToMap={
'SystemParm':MA_SYSTEMPARM, 'SystemParm':MA_SYSTEMPARM,
'mapCollectList':MA_MAP_COLLECT, 'mapCollectList':MA_MAP_COLLECT,
'mapCollectshapeList':MA_MAP_COLLECT_SHAPE, 'mapCollectshapeList':MA_MAP_COLLECT_SHAPE,
'Map_Collect': MA_MAP_COLLECT,
'Map_Collect_Shape': MA_MAP_COLLECT_SHAPE,
'Map_ItemClass':MA_MAP_ITEMCLASS, 'Map_ItemClass':MA_MAP_ITEMCLASS,
'Map_Point':MA_MAP_POINT, 'Map_Point':MA_MAP_POINT,
'Map_Point_Item':MA_MAP_POINT_ITEM, 'Map_Point_Item':MA_MAP_POINT_ITEM,
@ -400,8 +402,8 @@ function setSyncCenterSqlData(key,res,param){
'ItemInfo':'MA_ITEMINFO', 'ItemInfo':'MA_ITEMINFO',
'MarkRule':'MA_MARKRULE', 'MarkRule':'MA_MARKRULE',
'SystemParm':'MA_SYSTEMPARM', 'SystemParm':'MA_SYSTEMPARM',
'MA_MAP_COLLECT':'MA_MAP_COLLECT', 'Map_Collect': 'MA_MAP_COLLECT',
'MA_MAP_COLLECT_SHAPE':'MA_MAP_COLLECT_SHAPE', 'Map_Collect_Shape': 'MA_MAP_COLLECT_SHAPE',
'Map_ItemClass':'MA_MAP_ITEMCLASS', 'Map_ItemClass':'MA_MAP_ITEMCLASS',
'Map_Point':'MA_MAP_POINT', 'Map_Point':'MA_MAP_POINT',
'Map_Point_Item':'MA_MAP_POINT_ITEM', 'Map_Point_Item':'MA_MAP_POINT_ITEM',
@ -418,7 +420,6 @@ function setSyncCenterSqlData(key,res,param){
} }
// const accountTable = new AccountTable(() => { // const accountTable = new AccountTable(() => {
// }, centerToMap[key],param.context); // }, centerToMap[key],param.context);
console.log('kkkkkkkkk',key)
let arrList let arrList
if(res.initializationRsp.body[key].record instanceof Array){ if(res.initializationRsp.body[key].record instanceof Array){
arrList =res.initializationRsp.body[key].record arrList =res.initializationRsp.body[key].record

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

@ -1,105 +1,60 @@
import TcpClient from './TcpClient'; import TcpClient from './TcpClient';
import { getSyncData } from '../service/initable' import { getSyncData} from '../service/initable'
import hilog from '@ohos.hilog'; import hilog from '@ohos.hilog';
export async function getTCP() {
export async function getTCP(flag?) { getSyncData('IpConfigTable').then(async (result:Array<any>)=>{
console.log('result222',JSON.stringify(result))
getSyncData('IpConfigTable').then(async (result: Array<any>) => { if(result.length){
console.log('result222', JSON.stringify(result)) if(globalThis.TcpClient&&globalThis.TcpClient.closeTcp){
if (result.length) { globalThis.TcpClient.closeTcp(async ()=>{
if (globalThis.TcpClient && globalThis.TcpClient.closeTcp) { // const tcpClient: TcpClient =new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort)
globalThis.TcpClient.closeTcp(async () => { // globalThis.TcpClient = tcpClient
if(!flag){ setTimeout(async ()=>{
return await globalThis.TcpClient.rebindTcp(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort)
}
setTimeout(async () => {
await globalThis.TcpClient.rebindTcp(result[0].tcplocalIp, result[0].tcplocalIpPort, result[0].tcpOppositeIp, result[0].tcpOppositePort)
await globalThis.TcpClient.connectTcp() await globalThis.TcpClient.connectTcp()
await globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo || '402') //1002 await globalThis.TcpClient.sendMsg('1002')//1002
await globalThis.TcpClient.onMessage((val) => { globalThis.TcpClient.onError()
hilog.info(0x0000, 'testTag', "valvalval1" + JSON.stringify(val)); await globalThis.TcpClient.onMessage((val)=>{
setTimeout(()=>{
// console.log('valvalval',val) globalThis.TcpClient.sendMsg('1002')//1002
setTimeout(() => { if(val&&!globalThis.closeUDPSocket){
globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo || '402') //1002
if (val && globalThis.udpClient && globalThis.udpClient.sendMsg) {
// const msg=val.substring(5,val.length-1) // const msg=val.substring(5,val.length-1)
console.log('socketTag[PLC.UdpClient]closeUDPSocket',globalThis.closeUDPSocket)
globalThis.udpClient?.sendMsg(val) globalThis.udpClient?.sendMsg(val)
} }
}, 1000) },1000)
}) })
globalThis.TcpClient.onError(async () => { },2000)
await globalThis.TcpClient.rebindTcp(result[0].tcplocalIp, result[0].tcplocalIpPort, result[0].tcpOppositeIp, result[0].tcpOppositePort)
await globalThis.TcpClient.connectTcp()
await globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo || '402') //1002
await globalThis.TcpClient.onMessage((val) => {
hilog.info(0x0000, 'testTag', "valvalval1" + JSON.stringify(val));
// console.log('valvalval',val)
setTimeout(() => {
globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo || '402') //1002
if (val && globalThis.udpClient && globalThis.udpClient.sendMsg) {
// const msg=val.substring(5,val.length-1)
globalThis.udpClient?.sendMsg(val)
}
}, 1000)
})
})
},1000)
}) })
} }else{
else { const tcpClient: TcpClient =new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort)
// prompt.showToast({
// message:'初始化localIp'+ result[0].localIp+ result[0].localIpPort+'oppositeIp'+result[0].oppositeIp+result[0].oppositeIpPort,
// duration: 1000
// });
const tcpClient: TcpClient = new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort, result[0].tcpOppositeIp, result[0].tcpOppositePort)
globalThis.TcpClient = tcpClient globalThis.TcpClient = tcpClient
await globalThis.TcpClient.bindTcp() await globalThis.TcpClient.bindTcp()
await globalThis.TcpClient.connectTcp() await globalThis.TcpClient.connectTcp()
await globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo || '402') //1002 await globalThis.TcpClient.sendMsg('1002')//1002
globalThis.TcpClient.onError()
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(globalThis.carInfo?.carNo || '402') //1002 globalThis.TcpClient.sendMsg('1002')//1002
if (val && globalThis.udpClient && globalThis.udpClient.sendMsg) { if(val&&!globalThis.closeUDPSocket){
// const msg=val.substring(5,val.length-1) // const msg=val.substring(5,val.length-1)
console.log('socketTag[PLC.UdpClient]closeUDPSocket',globalThis.closeUDPSocket)
globalThis.udpClient?.sendMsg(val) globalThis.udpClient?.sendMsg(val)
} }
}, 1000) },1000)
}) })
globalThis.TcpClient.onError(async () => {
const tcpClient: TcpClient = new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort, result[0].tcpOppositeIp, result[0].tcpOppositePort)
globalThis.TcpClient = tcpClient
await globalThis.TcpClient.bindTcp()
await globalThis.TcpClient.connectTcp()
await globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo || '402') //1002
await globalThis.TcpClient.onMessage((val) => {
hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val));
setTimeout(() => {
globalThis.TcpClient.sendMsg(globalThis.carInfo?.carNo || '402') //1002
if (val && globalThis.udpClient && globalThis.udpClient.sendMsg) {
// const msg=val.substring(5,val.length-1)
globalThis.udpClient?.sendMsg(val)
}
}, 1000)
})
})
} }
// globalThis.udpClient = new UdpClient(result[0].localIp, result[0].localIpPort,result[0].oppositeIp,result[0].oppositeIpPort) // globalThis.udpClient = new UdpClient(result[0].localIp, result[0].localIpPort,result[0].oppositeIp,result[0].oppositeIpPort)
} else { }else{
globalThis.TcpClient = {} globalThis.TcpClient={}
globalThis.TcpClient.onMessage = () => { globalThis.TcpClient.onMessage=()=>{}
}
} }
}) })
} }

14
entry/src/main/ets/common/utils/UdpClient.ts
View File

@ -170,12 +170,12 @@ export default class UdpClient {
if (globalThis.plcUdpError) { if (globalThis.plcUdpError) {
num++ num++
console.log(TAG,'plc udp信号丢失') console.log(TAG,'plc udp信号丢失')
// if(num==2){ if(num==3){
// await this.bindUdp() await this.bindUdp()
// await this.sendMsg('111') await this.sendMsg('111')
// await this.onMessage(callback) await this.onMessage(callback)
// num=0 num=0
// } }
prompt.showToast({ prompt.showToast({
message: 'plc udp信号丢失', message: 'plc udp信号丢失',
duration: 2000 duration: 2000
@ -187,7 +187,7 @@ export default class UdpClient {
} }
closeUdp(callback) { closeUdp(callback) {
globalThis.closeUDPSocket=true
this.udp.close(err => { this.udp.close(err => {
hilog.info(0x0000,TAG, 'udpCLient', 'close'); hilog.info(0x0000,TAG, 'udpCLient', 'close');

10
entry/src/main/ets/common/utils/UdpClientByCenter.ts
View File

@ -151,6 +151,15 @@ export default class UdpClientByCenter {
console.log(`${TAG} udpLine send fail:${JSON.stringify(err)}`); console.log(`${TAG} udpLine send fail:${JSON.stringify(err)}`);
}); });
} }
onError(callback?){
this.udp.on('error',async err => {
callback&&callback()
// callback&&callback()
// this.closeUdp(()=>{
// this.bindUdp()
// })
});
}
setMsgCallBack(callback){ setMsgCallBack(callback){
this.stashFn=callback?callback:()=>{} this.stashFn=callback?callback:()=>{}
} }
@ -205,6 +214,7 @@ export default class UdpClientByCenter {
} }
closeUdp(callback) { closeUdp(callback) {
globalThis.closeHeartSocket=true
this.udp.close(err=>{ this.udp.close(err=>{
if(err){ if(err){

6
entry/src/main/ets/common/utils/request.ts
View File

@ -86,7 +86,11 @@ export default async function request(req: any) {
}); });
} }
} catch (e) { } catch (e) {
const code = e.code; if(!e||!(e?.message)){
return false
}
const code = e?.code;
prompt.showToast({ prompt.showToast({
message: e?.message, message: e?.message,
duration: 5000 duration: 5000

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

@ -14,6 +14,7 @@ import { getTCP } from '../common/utils/GlobalTcp';
import { getliushuiNum, setliushuiNum } from '../common/service/indexService'; import { getliushuiNum, setliushuiNum } from '../common/service/indexService';
import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl'; import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
import worker, { MessageEvents } from '@ohos.worker'; import worker, { MessageEvents } from '@ohos.worker';
import promptAction from '@ohos.promptAction'
@Entry @Entry
@Component @Component
@ -28,7 +29,7 @@ struct Index {
@State ratio: number = 1700 / 960 @State ratio: number = 1700 / 960
@State loading: boolean = true @State loading: boolean = true
@State fd: number = -1; @State fd: number = -1;
@State param: VideoConfig = VideoConfigData @State num: number = 0;
fileHelper = null; fileHelper = null;
private fileUtil: FileUtil private fileUtil: FileUtil
private interval = null; private interval = null;
@ -67,7 +68,7 @@ struct Index {
], ],
}) })
.then(data => { .then(data => {
if(data.index==0){ if (data.index == 0) {
router.back() router.back()
} }
}) })
@ -93,7 +94,7 @@ struct Index {
this.angle = 360 this.angle = 360
}, 1000) }, 1000)
this.angle = 0 this.angle = 0
if(!globalThis.timeInfo){ if (!globalThis.timeInfo) {
promptAction.showToast({ promptAction.showToast({
message: `网络连接失败`, message: `网络连接失败`,
duration: 3000 duration: 3000
@ -235,7 +236,7 @@ struct Index {
url: 'pages/ExaminerLogin', url: 'pages/ExaminerLogin',
}, router.RouterMode.Single) }, router.RouterMode.Single)
} }
this.loading=false this.loading = false
} }
} }
@ -257,7 +258,7 @@ struct Index {
placeId: globalThis.carInfo.examinationRoomId placeId: globalThis.carInfo.examinationRoomId
} }
// globalThis.udpClient2.initHeartSendMsg(param,this.context) // globalThis.udpClient2.initHeartSendMsg(param,this.context)
if(!globalThis.closeHeartSocket){ if (!globalThis.closeHeartSocket) {
globalThis.udpClient2.sendMsg(param, this.context) globalThis.udpClient2.sendMsg(param, this.context)
} }
} }
@ -268,11 +269,15 @@ struct Index {
this.userAuth(); this.userAuth();
getUDP() getUDP()
getUDP2() getUDP2()
this.num=0
clearInterval(this.interval) clearInterval(this.interval)
this.interval = setInterval(() => { this.interval = setInterval(() => {
this.num++
setliushuiNum(this.context) setliushuiNum(this.context)
getliushuiNum(this.context) getliushuiNum(this.context)
this.heartMsg() if(this.num>=3){
this.heartMsg()
}
}, 1000) }, 1000)
// takePhotoFn(this.context) // takePhotoFn(this.context)
@ -295,8 +300,9 @@ struct Index {
this.fileHelper.createAlbum('pz'); this.fileHelper.createAlbum('pz');
} }
userAuth() { userAuth() {
const permissions: Array<Permissions> = ["ohos.permission.SET_TIME","ohos.permission.READ_IMAGEVIDEO", "ohos.permission.DISTRIBUTED_DATASYNC" ,'ohos.permission.CONNECTIVITY_INTERNAL','ohos.permission.CAMERA','ohos.permission.READ_MEDIA','ohos.permission.WRITE_MEDIA','ohos.permission.FILE_ACCESS_MANAGER']; const permissions: Array<Permissions> = ["ohos.permission.SET_TIME", "ohos.permission.READ_IMAGEVIDEO", "ohos.permission.DISTRIBUTED_DATASYNC", 'ohos.permission.CONNECTIVITY_INTERNAL', 'ohos.permission.CAMERA', 'ohos.permission.READ_MEDIA', 'ohos.permission.WRITE_MEDIA', 'ohos.permission.FILE_ACCESS_MANAGER'];
let context = this.context; let context = this.context;
let atManager = abilityAccessCtrl.createAtManager(); let atManager = abilityAccessCtrl.createAtManager();
// requestPermissionsFromUser会判断权限的授权状态来决定是否唤起弹窗 // requestPermissionsFromUser会判断权限的授权状态来决定是否唤起弹窗