From eac7d94b98810c4aa16a0f20baa53cee9287889b Mon Sep 17 00:00:00 2001 From: lvyuankang <1344032923@qq.com> Date: Wed, 21 Aug 2024 11:57:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E6=AE=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/ets/common/service/indexService.ts | 79 +++---- entry/src/main/ets/common/service/initable.ts | 61 +++--- entry/src/main/ets/common/utils/TcpClient.ts | 8 +- entry/src/main/ets/common/utils/request.ts | 11 +- .../src/main/ets/entryability/EntryAbility.ts | 4 +- entry/src/main/ets/pages/ExaminerLogin.ets | 51 +++-- entry/src/main/ets/pages/Index.ets | 3 +- entry/src/main/ets/pages/UserInfo.ets | 199 +++++++++--------- entry/src/main/ets/workers/worker.ts | 21 +- 9 files changed, 237 insertions(+), 200 deletions(-) diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index 7cf62104..0cf75139 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -41,16 +41,16 @@ export async function getliushuiNum(context) { // return str } } -export async function deleteAllFIleLog(){ +export async function deleteAllFIleLog(path){ let options = { "recursion": false, "listNum": 0, }; - let filenames = fs.listFileSync(GlobalConfig.comoonfileWriteAddress+'/PLC/', options); + let filenames = fs.listFileSync(path, options); console.info("listFile succeed",JSON.stringify(filenames)); for (let i = 0; i < filenames.length; i++) { if(isSevenDaysAgo(filenames[i])){ - fs.rmdir(GlobalConfig.comoonfileWriteAddress+'/PLC/'+filenames[i], (err) => { + fs.rmdir(path+filenames[i], (err) => { if (err) { console.error("rmdir failed with error message: " + err.message + ", error code: " + err.code); } else { @@ -157,44 +157,47 @@ export async function getDoubleCeneterTable(param) { //单中心存表 export async function getSingleCenterTable(param) { return new Promise((reslove, reject) => { - upDataZhongxinginitialization(param).then((result) => { - console.log('teststetfinsh01') + try{ + upDataZhongxinginitialization(param).then((result) => { + console.log('teststetfinsh01',result) - if (result) { - reslove(true) - } else { - // promptAction.showToast({ - // title: '提示', - // message: '联网更新失败，请检查网络后重新更新', - // buttons: [ - // { - // text: '确认', - // color: '#000000', - // }, - // { - // text: '取消', - // color: '#000000', - // } - // ], - // }) - // .then(data => { - // reslove(false) - // }) - // .catch(err => { - // reslove(false) - // }) - console.log('联网更新失败，请检查网络后重新更新') - // promptAction.showToast({ - // message: `联网更新表数据失败，请重新更新`, - // duration: 3000 - // }); + if (result) { + reslove(true) + } else { + // promptAction.showToast({ + // title: '提示', + // message: '联网更新失败，请检查网络后重新更新', + // buttons: [ + // { + // text: '确认', + // color: '#000000', + // }, + // { + // text: '取消', + // color: '#000000', + // } + // ], + // }) + // .then(data => { + // reslove(false) + // }) + // .catch(err => { + // reslove(false) + // }) + console.log('联网更新失败，请检查网络后重新更新') + // promptAction.showToast({ + // message: `联网更新表数据失败，请重新更新`, + // duration: 3000 + // }); + reslove(false) + } + }).catch((error) => { reslove(false) - } - }).catch((error) => { + console.log(error) + }) + }catch (e){ reslove(false) - console.log(error) - }) - + } }) } diff --git a/entry/src/main/ets/common/service/initable.ts b/entry/src/main/ets/common/service/initable.ts index 49d733d7..83742517 100644 --- a/entry/src/main/ets/common/service/initable.ts +++ b/entry/src/main/ets/common/service/initable.ts @@ -360,42 +360,47 @@ export async function upDataZhongxinginitialization(param) { resolve(flag) return } - const str = { - "carId": param.carId, // 表名 - "examinationRoomId": param.examinationRoomId, //考试平台kdid - videoVersion: '1.0', - judgeVersion: param.judgeVersion, - shellVersion: param.shellVersion, - host: param.host - } - console.log('daihai2', JSON.stringify(str)) - - initialization(str).then(async (res) => { - console.log('daihai3', JSON.stringify(res)) - if (!res) { - resolve(false) - return + try{ + const str = { + "carId": param.carId, // 表名 + "examinationRoomId": param.examinationRoomId, //考试平台kdid + videoVersion: '1.0', + judgeVersion: param.judgeVersion, + shellVersion: param.shellVersion, + host: param.host } - let flag - console.log('resposestart') + console.log('daihai2', JSON.stringify(str)) - for (let key in res.initializationRsp.body) { - if (!centerToMap[key]) { - continue - } - const data = await setSyncCenterSqlData(key, res, param) - if (!data) { + initialization(str).then(async (res) => { + console.log('daihai3', JSON.stringify(res)) + if (!res||res.initializationRsp.head.resultCode==1) { + console.log('daihai34', JSON.stringify(res)) resolve(false) + return } - } - resolve(true) + let flag + console.log('resposestart') + + for (let key in res.initializationRsp.body) { + if (!centerToMap[key]) { + continue + } + const data = await setSyncCenterSqlData(key, res, param) + if (!data) { + resolve(false) + } + } + resolve(true) - console.log('resposestart') + console.log('resposestart') - }).catch((Error) => { + }).catch((Error) => { + resolve(false) + }) + }catch (error){ resolve(false) - }) + } }) } diff --git a/entry/src/main/ets/common/utils/TcpClient.ts b/entry/src/main/ets/common/utils/TcpClient.ts index 679c9d76..5f378a36 100644 --- a/entry/src/main/ets/common/utils/TcpClient.ts +++ b/entry/src/main/ets/common/utils/TcpClient.ts @@ -103,12 +103,12 @@ export default class TcpClient { }, timeout: 6000 }); promise.then(() => { - + console.log('testTagtestTag000',) this.tcp.setExtraOptions({ keepAlive: true, }, err => { if (err) { - console.log('testTagtestTagerrrrr,success') + console.log('testTagtestTag000,error') if(this.num>3){ return } @@ -119,7 +119,7 @@ export default class TcpClient { return; } }); - console.log('testTagtestTagconnect,success') + console.log('testTagtestTag000,success') globalThis.getCloseTcp = false resolve(true) @@ -133,7 +133,7 @@ export default class TcpClient { getTCP() resolve(false) }, 2000) - console.log('testTagtestTagconnect,error') + console.log('testTagtestTag000,error') }); }) diff --git a/entry/src/main/ets/common/utils/request.ts b/entry/src/main/ets/common/utils/request.ts index 30dece37..4ebf0d1d 100644 --- a/entry/src/main/ets/common/utils/request.ts +++ b/entry/src/main/ets/common/utils/request.ts @@ -78,19 +78,22 @@ export default async function request(req: any) { message: decodeURIComponent(resultMessage), duration: 3000 }); - return + return false } } for( let i in res ) { resObj = res[i].head } - console.info('jiangsong:res in request' + url + JSON.stringify(res)) + console.info('jiangsong:res in request' + url + JSON.stringify(resObj)) if(resObj.resultCode === '0') { return res }else { globalThis.type='1' - AppStorage.SetOrCreate('errorMsg', 1); - globalThis.title=decodeURIComponent(resObj.resultMessage) + if(!host){ + AppStorage.SetOrCreate('errorMsg', 1); + globalThis.title=decodeURIComponent(resObj.resultMessage) + } + prompt.showToast({ message: decodeURIComponent(resObj.resultMessage), duration: 3000 diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts index 8e01ac4a..6959204f 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ts +++ b/entry/src/main/ets/entryability/EntryAbility.ts @@ -30,8 +30,8 @@ export default class EntryAbility extends UIAbility { globalThis.hasAuth = false // globalThis.version = '2022.08.13.01' // globalThis.judgeVersion = '2022.12.05.1' - globalThis.version = '2024.11.22.14' - globalThis.judgeVersion = '2024.11.22.14' + globalThis.version = '2001.11.22.14' + globalThis.judgeVersion = '2001.11.22.14' globalThis.videoVersion= '1.0' // globalThis.version = '2023.12.13.01' // globalThis.judgeVersion = '2023.09.30.1' diff --git a/entry/src/main/ets/pages/ExaminerLogin.ets b/entry/src/main/ets/pages/ExaminerLogin.ets index 41f4f67d..1ed06fe6 100644 --- a/entry/src/main/ets/pages/ExaminerLogin.ets +++ b/entry/src/main/ets/pages/ExaminerLogin.ets @@ -93,30 +93,39 @@ export default struct Index { this.errorDialog.open() this.limit=true console.log('carInfo', JSON.stringify(globalThis.carInfo)) - examinerLoginService(param).then(res => { - console.log('res?.examinerLoginRsp?.head?.resultCode',res?.examinerLoginRsp?.head?.resultCode,JSON.stringify(res)) - this.errorDialog.close() + try{ + examinerLoginService(param).then(res => { + console.log('res?.examinerLoginRsp?.head?.resultCode',res?.examinerLoginRsp?.head?.resultCode,JSON.stringify(res)) + this.errorDialog.close() - this.limit=false - if(res?.examinerLoginRsp?.head?.resultCode=='1'){ - // this.type='1' - // this.title=decodeURIComponent(res.examinerLoginRsp.head.resultMessage) - // console.log('this.titlt',this.title) - // this.errorDialog.open() - return - } - router.pushUrl({ - url: 'pages/UserInfo', - params:{ - type:1 + this.limit=false + if(res?.examinerLoginRsp?.head?.resultCode=='1'){ + // this.type='1' + // this.title=decodeURIComponent(res.examinerLoginRsp.head.resultMessage) + // console.log('this.titlt',this.title) + // this.errorDialog.open() + return } - }, router.RouterMode.Single); + router.pushUrl({ + url: 'pages/UserInfo', + params:{ + type:1 + } + }, router.RouterMode.Single); + + console.log('res11', JSON.stringify(res)) + globalThis.username = this.inputTextArr[0] + }).catch(err=>{ + console.log('jiangsong12',JSON.stringify(err)) + this.errorDialog.close() + this.limit=false + }) + }catch(eroor){ + console.log('erroreee') + this.errorDialog.close() + this.limit=false + } - console.log('res11', JSON.stringify(res)) - globalThis.username = this.inputTextArr[0] - }).catch(err=>{ - console.log('jiangsong12',JSON.stringify(err)) - }) }) } else { Image(item).width('18%').height('24%').onClick(() => { diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index e3a88425..cd5d24fd 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -17,6 +17,7 @@ import promptAction from '@ohos.promptAction' import { voiceService } from '../common/service/voiceService'; import errorMsgDialog from './compontents/errorMsgDialog' import { getSyncData } from '../common/service/initable'; +import { GlobalConfig } from '../config/index' @Entry @Component @@ -416,7 +417,7 @@ struct Index { } async initParams() { - deleteAllFIleLog() + deleteAllFIleLog(GlobalConfig.comoonfileWriteAddress+'/PLC/') //设置plc udp 同步requesthost await getUDP(this.context, false) this.loading = false diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 8f2933c9..6215a1f3 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -79,7 +79,6 @@ struct UserInfo { @State Param803Str: string = '' private title = '' private type = '2' - // 过程照片拍照 getPhoto = async (empty?: boolean) => { const singlePlay = globalThis.singlePlay @@ -118,9 +117,10 @@ struct UserInfo { alignment: DialogAlignment.Center, }, ) + async onPageShow() { - this.updateTimeLimit=false - this.ksksLimit=false + this.updateTimeLimit = false + this.ksksLimit = false console.log('响应头地址响应头地址') const mediaTest = new FilePhoto(this.context); this.filePhoto = new FilePhoto(this.context); @@ -130,42 +130,42 @@ struct UserInfo { this.initData() //身份证读卡器初始化 // this.openDeviceByIDCard() - const routerParam=router.getParams()||{type :0}; - console.log('routerParam',JSON.stringify(routerParam)) - if(!globalThis.singlePlay){ + const routerParam = router.getParams() || { type: 0 }; + console.log('routerParam', JSON.stringify(routerParam)) + if (!globalThis.singlePlay) { // @ts-ignore - if(routerParam.type!=1){ + if (routerParam.type != 1) { // @ts-ignore - this.list =await getSyncData('USERLIST') + this.list = await getSyncData('USERLIST') // @ts-ignore - const data=await getSyncData('USER') - const user=data[0] - if(user&&Number(user.kssycs)){ - this.list.forEach(res=>{ - if(res.sfzmhm==user.sfzmhm){ - res.kssycs=user.kssycs + const data = await getSyncData('USER') + const user = data[0] + if (user && Number(user.kssycs)) { + this.list.forEach(res => { + if (res.sfzmhm == user.sfzmhm) { + res.kssycs = user.kssycs this.getCurrentStudent(res.sfzmhm) } }) - }else if(user&&(user.kssycs=='0'||user.kssycs=='')){ + } else if (user && (user.kssycs == '0' || user.kssycs == '')) { console.log('datadatadatadata') - this.list=this.list.filter(res=>{ - return res.sfzmhm!=user.sfzmhm + this.list = this.list.filter(res => { + return res.sfzmhm != user.sfzmhm }) - this.pageIndex=0 + this.pageIndex = 0 this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) - if(this.dataList.length){ - this.currentUser=this.dataList[0] - }else{ - this.currentUser=EmptyCandidateObject + if (this.dataList.length) { + this.currentUser = this.dataList[0] + } else { + this.currentUser = EmptyCandidateObject } } - this.list.forEach((res,index)=>{ - res.id=index.toString() + this.list.forEach((res, index) => { + res.id = index.toString() }) - await upDateTableByArray('USERLIST', this.list||[]) - }else{ + await upDateTableByArray('USERLIST', this.list || []) + } else { this.getExaminationStudentInfoFn() } } @@ -226,7 +226,7 @@ struct UserInfo { this.stopDeviceById() // globalThis.statue=4 router.pushUrl({ - url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge', + url: examSubject == 3 ? 'pages/c' : 'pages/Judge', params: { sczb: Number(this.isBoardPrePareSetPopupOpen), kfdm: this.sczbkf, @@ -243,7 +243,7 @@ struct UserInfo { if (!flag) { globalThis.lsh = '0000000000000' await upDateTableByArray('USER', []) - this.currentUser=this.list[0] + this.currentUser = this.list[0] // promptAction.showToast({ // message: '未匹配到对应下载学员', // duration: 3000 @@ -401,7 +401,7 @@ struct UserInfo { that.openDeviceByIDCard() } } - if(that.list.length){ + if (that.list.length) { return } //0不自动更新 1自动更新（不限次数） 2没有考生更新2次 @@ -460,71 +460,78 @@ struct UserInfo { return } await upDateTableByArray('USER', []) - this.type='2' + this.type = '2' this.errorDialog.open() this.updateTimeLimit = true const param = `${Md5.Instance.get_md5(globalThis.carInfo.carId + globalThis.carInfo.examinationRoomId + globalThis.username)}${globalThis.carInfo.carId}${globalThis.carInfo.examinationRoomId}${globalThis.username}` - getExaminationStudentInfo(param).then(async (res) => { - this.errorDialog.close() - setTimeout(() => { - this.updateTimeLimit = false - }, 3000) - if (!res||res?.getExaminationStudentInfoRsp?.head?.resultCode=='1') { - return - } - let dataList = [] - this.list = [] + try { + getExaminationStudentInfo(param).then(async (res) => { + this.errorDialog.close() + setTimeout(() => { + this.updateTimeLimit = false + }, 3000) + if (!res || res?.getExaminationStudentInfoRsp?.head?.resultCode == '1') { + return + } + let dataList = [] + this.list = [] - for (let key in res.getExaminationStudentInfoRsp.body) { - const a = res.getExaminationStudentInfoRsp.body[key] - if (a instanceof Array) { - dataList = a + for (let key in res.getExaminationStudentInfoRsp.body) { + const a = res.getExaminationStudentInfoRsp.body[key] + if (a instanceof Array) { + dataList = a + } else { + dataList = [a] + } + } + if (dataList.length) { + this.numCount = 0 + } + + this.list = JSON.parse(JSON.stringify(dataList)) + this.list.forEach((listData, index) => { + listData.id = index.toString() + for (let i in listData) { + listData[i] = decodeURI(listData[i]) + } + listData.kszp = this.photo + listData.kszp + listData.ksmjzp = this.photo + listData.ksmjzp + }) + await upDateTableByArray('USERLIST', this.list || []) + dataList = this.list.length > 4 ? this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) : this.list; + + this.dataList = dataList + if (this.dataList.length) { + this.currentUser = this.dataList[0] } else { - dataList = [a] + this.currentUser = EmptyCandidateObject } - } - if (dataList.length) { - this.numCount = 0 - } - this.list = JSON.parse(JSON.stringify(dataList)) - this.list.forEach((listData,index) => { - listData.id=index.toString() - for (let i in listData) { - listData[i] = decodeURI(listData[i]) - } - listData.kszp = this.photo + listData.kszp - listData.ksmjzp = this.photo + listData.ksmjzp + this.lsh = this.currentUser.lsh + globalThis.lsh = this.lsh + globalThis.ksyh = this.currentUser.ksy1sfzmhm || this.currentUser.ksy2sfzmhm + console.log('this.currentUse3' + JSON.stringify(this.currentUser)) + this.pageIndex = 0 + getSyncData('USER').then(data => { + if (data?.[0]) { + this.getCurrentStudent(data[0].sfzmhm) + } + }) + }).catch((error) => { + this.updateTimeLimit = false + this.errorDialog.close() + console.log('error12error' + error) }) - await upDateTableByArray('USERLIST', this.list||[]) - dataList = this.list.length > 4 ? this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) : this.list; - - this.dataList = dataList - if (this.dataList.length) { - this.currentUser = this.dataList[0] - } else { - this.currentUser = EmptyCandidateObject - } - - this.lsh = this.currentUser.lsh - globalThis.lsh = this.lsh - globalThis.ksyh = this.currentUser.ksy1sfzmhm || this.currentUser.ksy2sfzmhm - console.log('this.currentUse3' + JSON.stringify(this.currentUser)) - this.pageIndex = 0 - getSyncData('USER').then(data => { - if (data?.[0]) { - this.getCurrentStudent(data[0].sfzmhm) - } - }) - }).catch((error) => { + } catch (error) { this.updateTimeLimit = false - console.log('error12error' + error) - }) + this.errorDialog.close() + console.log('error14error' + error) + } } qkFn() { this.faceCompareSucess = 0 - this.ksksLimit=false + this.ksksLimit = false if (globalThis.singlePlay) { this.qkFlag = false return @@ -612,7 +619,7 @@ struct UserInfo { }) return } - this.currentUser.id='0' + this.currentUser.id = '0' await upDateTableByArray('USER', [this.currentUser]) this.stepFlag = false this.isLoadingPopupVisible = false @@ -623,10 +630,10 @@ struct UserInfo { sczb: Number(this.isBoardPrePareSetPopupOpen), kfdm: this.sczbkf, //真实监管项目 - kString:keystr || '' + kString: keystr || '' } }, router.RouterMode.Single); - this.updateTimeLimit=false + this.updateTimeLimit = false this.stopDeviceById() this.stepFlag = false }) @@ -818,7 +825,7 @@ struct UserInfo { .backgroundImageSize({ width: '100%', height: '100%' }) .onClick(() => { globalThis.lsh = item.lsh; - if (this.isExamStart&&!globalThis.singlePlay) { + if (this.isExamStart && !globalThis.singlePlay) { return } this.currentUser = item @@ -893,10 +900,10 @@ struct UserInfo { Image($r('app.media.qk_btn')) .commStyle() .onClick(() => { - if(this.ksksLimit){ + if (this.ksksLimit) { return } - this.ksksLimit=true + this.ksksLimit = true this.qkFlag = true }) @@ -906,7 +913,7 @@ struct UserInfo { try { await this.checkSignal() this.isExamStart = true - this.currentUser.id='0' + this.currentUser.id = '0' await upDateTableByArray('USER', [this.currentUser]) globalThis.statue = 4 this.isBoardPrePareSetPopupShow = true; @@ -921,7 +928,7 @@ struct UserInfo { Image($r('app.media.ksks_btn')) .commStyle() .onClick(async () => { - if(this.ksksLimit){ + if (this.ksksLimit) { return } console.log('routerParamrouterParam') @@ -932,11 +939,11 @@ struct UserInfo { if (!this.currentUser.xm) { return } - this.ksksLimit=true + this.ksksLimit = true if (globalThis.singlePlay) { const {examSubject} = globalThis.carInfo; - this.currentUser.id='0' + this.currentUser.id = '0' await upDateTableByArray('USER', [this.currentUser]) router.pushUrl({ url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge', @@ -945,7 +952,7 @@ struct UserInfo { kfdm: this.sczbkf, } }, router.RouterMode.Single); - this.ksksLimit=false + this.ksksLimit = false this.stopDeviceById() return @@ -986,7 +993,7 @@ struct UserInfo { } .commStyle() .onClick(() => { - this.ksksLimit=false + this.ksksLimit = false this.qkFlag = false }) @@ -1088,7 +1095,11 @@ struct LabelBlock { Row() { Text(this.label).fontSize(20 * this.ratio).fontColor('#99948A') Row() { - Text(decodeURIComponent(this.value)).fontColor('#fff').textAlign(TextAlign.Center).width('100%').fontSize(18 * this.ratio) + Text(decodeURIComponent(this.value)) + .fontColor('#fff') + .textAlign(TextAlign.Center) + .width('100%') + .fontSize(18 * this.ratio) } .commLabelStyle() }.margin({ bottom: 10 * this.ratio }) diff --git a/entry/src/main/ets/workers/worker.ts b/entry/src/main/ets/workers/worker.ts index effd5dc2..0c8a918d 100644 --- a/entry/src/main/ets/workers/worker.ts +++ b/entry/src/main/ets/workers/worker.ts @@ -30,15 +30,20 @@ workerPort.onmessage = (e: MessageEvents): void => { console.log('baoyihu,onmessage',JSON.stringify(param)) if(param.mode=='1'){ //单中心 - getSingleCenterTable(param).then((ret) => { - console.log('teststetfinsh1') - if (ret) { - workerPort.postMessage({ isComplete: true }); - }else{ - workerPort.postMessage({ isComplete: false }); + try{ + getSingleCenterTable(param).then((ret) => { + console.log('teststetfinsh1',ret) + if (ret) { + workerPort.postMessage({ isComplete: true }); + }else{ + workerPort.postMessage({ isComplete: false }); + + } + }) + }catch(error){ + workerPort.postMessage({ isComplete: false }); + } - } - }) }else if(param.mode=='3'){ //双中心 getDoubleCeneterTable(param).then((ret)=>{