diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index fa695e48..e67b72af 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -99,6 +99,7 @@ function isSevenDaysAgo(date,saveDays?) { } export async function setVideoParam() { + return const fileUtil = new FileUtil(context) console.log('configconfig',) try{ diff --git a/entry/src/main/ets/common/service/terminalService.ts b/entry/src/main/ets/common/service/terminalService.ts index 917bd235..291b26ad 100644 --- a/entry/src/main/ets/common/service/terminalService.ts +++ b/entry/src/main/ets/common/service/terminalService.ts @@ -9,8 +9,6 @@ import FileUtil from '../../common/utils/File' //获取设备信息 export async function getDeviceInfo(context) { - globalThis.deviceNo = 'MAC-53EB31E0' - return 'MAC-53EB31E0' return new Promise(async (resolve, reject) => { const fileUtil = new FileUtil(context) const data = await fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + '/config/deviceNo.txt'); diff --git a/entry/src/main/ets/config/global.ts b/entry/src/main/ets/config/global.ts index 7f8f7127..572f4cc8 100644 --- a/entry/src/main/ets/config/global.ts +++ b/entry/src/main/ets/config/global.ts @@ -32,6 +32,10 @@ export const GlobalConfig={ ly:{ km2:['2022.06.29.01','2022.12.18.1'], km3:['2022.08.13.01','2022.12.05.1'], - } + }, + sz:{ + km2:['2024.08.21.01','2024.08.24.1'], + km3:[], + }, } } diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts index cdd454b2..ef3db41a 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.deviceNo = ''; globalThis.hasAuth = false - globalThis.version = GlobalConfig.version.jn.km3[0]; - globalThis.judgeVersion = GlobalConfig.version.jn.km3[1]; + globalThis.version = GlobalConfig.version.sz.km2[0]; + globalThis.judgeVersion = GlobalConfig.version.sz.km2[1]; globalThis.videoVersion= '1.0' diff --git a/entry/src/main/ets/pages/ExaminerLogin.ets b/entry/src/main/ets/pages/ExaminerLogin.ets index 1ed06fe6..68ead193 100644 --- a/entry/src/main/ets/pages/ExaminerLogin.ets +++ b/entry/src/main/ets/pages/ExaminerLogin.ets @@ -114,6 +114,9 @@ export default struct Index { }, router.RouterMode.Single); console.log('res11', JSON.stringify(res)) + globalThis.ksyxm=res.examinerLoginRsp.body.ksyxm + globalThis.kgxm=res.examinerLoginRsp.body.name + globalThis.username = this.inputTextArr[0] }).catch(err=>{ console.log('jiangsong12',JSON.stringify(err)) diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 8221b714..a1de017e 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -419,7 +419,7 @@ struct Index { this.context.resourceManager.getRawFileContent("welcome.wav").then(value => { this.vocObj.playAudio({ type: 1, - name: '111.mp3' + name: 'welcome.wav' }) // let rawFile = value; }).catch(error => { diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index c5dd1482..ae6b6240 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -180,6 +180,8 @@ struct UserInfo { if (this.dataList.length) { setTimeout(()=>{ this.currentUser = this.dataList[0] + this.currentUser.ksy2= globalThis.ksyxm + globalThis.lsh=this.currentUser.lsh },200) } else { @@ -251,6 +253,8 @@ struct UserInfo { if (res.sfzmhm == id) { flag = true this.currentUser = res + this.currentUser.ksy2= globalThis.ksyxm + this.lsh = this.currentUser.lsh globalThis.lsh = this.currentUser.lsh globalThis.ksyh = this.currentUser.ksy1sfzmhm @@ -280,6 +284,8 @@ struct UserInfo { await upDateTableByArray('USER', []) setTimeout(()=>{ this.currentUser = this.list[0] + this.currentUser.ksy2= globalThis.ksyxm + globalThis.lsh = this.currentUser.lsh },200) @@ -364,6 +370,8 @@ struct UserInfo { this.pageIndex = 0 this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) this.currentUser = this.dataList[0] + this.currentUser.ksy2= globalThis.ksyxm + this.lsh = this.currentUser.lsh globalThis.ksyh = this.currentUser.ksy1sfzmhm globalThis.lsh = this.lsh @@ -608,6 +616,7 @@ struct UserInfo { if (this.dataList.length) { setTimeout(()=>{ this.currentUser = this.dataList[0] + this.currentUser.ksy2= globalThis.ksyxm globalThis.lsh=this.currentUser.lsh },200) // this.currentUser = this.dataList[0] @@ -1013,6 +1022,8 @@ struct UserInfo { globalThis.lsh = item.lsh; setTimeout(()=>{ this.currentUser = item + this.currentUser.ksy2= globalThis.ksyxm + },200) }) diff --git a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets b/entry/src/main/ets/pages/compontents/SignDisplayCom.ets index 98704ef4..f4135640 100644 --- a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets +++ b/entry/src/main/ets/pages/compontents/SignDisplayCom.ets @@ -411,11 +411,13 @@ export default struct SignDisplayCom { for (let i = 34; i <= 46; i++) { this.sjxhColum[i].value = this.signArr[i+2] } - let t = 0 - for (let i = 83; i <= 97; i++) { - this.GPSColum[t].value = ((Number((this.signArr[97]||0))*1.852).toFixed(2)).toString() - t++ - } + // let t = 0 + // for (let i = 83; i <= 97; i++) { + // if(t==14){ + // } + // t++ + // } + this.GPSColum[14].value = ((Number((this.signArr[97]||0))*1.852).toFixed(2)).toString() this.sjxhColum = JSON.parse(JSON.stringify((this.sjxhColum))) that.signArr = JSON.parse(JSON.stringify((this.signArr))) that.GPSColum = JSON.parse(JSON.stringify((this.GPSColum))) diff --git a/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ts b/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ts index 6f279aa7..1e66f7be 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ts +++ b/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ts @@ -78,17 +78,7 @@ export default class FileLog { // 过程评判日志调数据 public setExamJudgeLogData = async (str:string) => { const {fileUtil,folderPath} = this; - await fileUtil.editFile(`${folderPath}/judge_log_data.txt`,str); - - // 设置四合一画面数据 - public setFourAndOneLogData = async (str:string) => { - const {fileUtil,folderPath} = this; - await fileUtil.editFile(`${folderPath}/four_one_log_data.txt`,str); - } - - public setFourAndOneLogDataBytes = async (str:string) => { - const {fileUtil,folderPath} = this; - await fileUtil.editFile(`${folderPath}/four_one_log_byte_data.txt`,str); + await fileUtil.editFile(`${folderPath}/judge_log_data.txt`, str); } // 设置四合一画面数据