dev #63

Merged
wangzhongjie merged 206 commits from dev into main 2024-12-16 10:31:20 +08:00
2 changed files with 7 additions and 1 deletions
Showing only changes of commit 002a1e84d8 - Show all commits

View File

@ -17,6 +17,9 @@ export async function getDeviceInfo(context) {
message: `请先进行设备注册`, message: `请先进行设备注册`,
duration: 3000 duration: 3000
}); });
globalThis.type='1'
globalThis.title=decodeURIComponent('请先进行设备注册')
globalThis.errorDialog.open()
resolve('') resolve('')
} else { } else {
const fileData=JSON.parse(data) const fileData=JSON.parse(data)

View File

@ -417,7 +417,10 @@ struct Index {
await getUDP(this.context, false) await getUDP(this.context, false)
this.loading = false this.loading = false
console.log('globalThis.deviceNo000') console.log('globalThis.deviceNo000')
await getDeviceInfo(this.context) const data= await getDeviceInfo(this.context)
if(data==''){
return
}
await getCarInfo() await getCarInfo()
await getUDP2(this.context, false) await getUDP2(this.context, false)
getTCP() getTCP()