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

dev #63

Merged
wangzhongjie merged 206 commits from dev into main 2024-12-16 10:31:20 +08:00
Conversation 0 Commits 206 Files Changed 1354 +11 -10
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f35cf5fd22 - Show all commits

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

@ -150,11 +150,12 @@ export default class TcpClient {
promise.then(() => { promise.then(() => {
reslove(true) reslove(true)
}).catch(err => { }).catch(err => {
globalThis.tcpSendNum++
if(!globalThis.getCloseTcp){ if(!globalThis.getCloseTcp&&globalThis.tcpSendNum>5){
setTimeout(async () => { setTimeout(async () => {
getTCP(true) getTCP(true)
}, 3000) }, 3000)
globalThis.tcpSendNum=0
return return
} }
globalThis.getCloseTcp=true globalThis.getCloseTcp=true

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

@ -34,7 +34,7 @@ export default class EntryAbility extends UIAbility {
// globalThis.version ='2023.12.13.01'; // globalThis.version ='2023.12.13.01';
globalThis.version = GlobalConfig.version.jn.km3[0]; globalThis.version = GlobalConfig.version.jn.km3[0];
globalThis.judgeVersion = GlobalConfig.version.jn.km3[1]; globalThis.judgeVersion = GlobalConfig.version.jn.km3[1];
globalThis.tcpSendNum=0
globalThis.videoVersion= '1.0' globalThis.videoVersion= '1.0'
//视频遮挡 //视频遮挡

14
entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets
View File

@ -46,15 +46,15 @@ export default struct DeductedPopup {
} }
changeCurrentItems(){ changeCurrentItems(){
console.info('popup',JSON.stringify(this.currentItems)); if(this.currentItems){
//@ts-ignore //@ts-ignore
this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes(item.itemno) || this.currentItems.includes(item.itemno + ''))); this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes(item.itemno) || this.currentItems.includes(item.itemno + '')));
this.currentIndex = this.defaultTabIndex this.currentIndex = this.defaultTabIndex
if(this.currentIndex == 1){ if(this.currentIndex == 1){
this.universalMarkRules = this.markRules.filter(item => item.itemno == 20 ) this.universalMarkRules = this.markRules.filter(item => item.itemno == 20 )
}
} }
} }
//上一页 下一页 //上一页 下一页
goPage(typeIndex){ goPage(typeIndex){
const currentIndex = this.currentIndex const currentIndex = this.currentIndex