diff --git a/entry/src/main/ets/common/service/initable.ts b/entry/src/main/ets/common/service/initable.ts index 7fabbb86..29f647db 100644 --- a/entry/src/main/ets/common/service/initable.ts +++ b/entry/src/main/ets/common/service/initable.ts @@ -86,8 +86,6 @@ const centerToMap = { function sqlInsertCommonFn(tableName, resultArr, context?, delFlag = true) { return new Promise((resolve, reject) => { const accountTable = new AccountTable(() => { - }, map[tableName], context); - accountTable.getRdbStore(() => { accountTable.query('0', async (result) => { console.log('teststet3',) @@ -137,7 +135,8 @@ function sqlInsertCommonFn(tableName, resultArr, context?, delFlag = true) { resolve(result) } }, true); - }, context); + }, map[tableName], context); + }) } @@ -276,11 +275,19 @@ export async function getSyncData(tableName, context?) { export async function delSyncTable(tableName, context?) { return new Promise((resolve, reject) => { const accountTable = new AccountTable(() => { + const SQL=`DELETE FROM ${tableName};` + console.log('map[tableName]',tableName) + accountTable.sqlOperate(SQL, tableName, (val) => { + console.log('teststet3','删除成功') + + resolve(val) + }) }, map[tableName], context); - accountTable.deleteTableData((ret) => { - console.log('删除成功') - resolve(true) - }, tableName, context) + + // accountTable.deleteTableData((ret) => { + // console.log('删除成功') + // resolve(true) + // }, tableName, context) }) } diff --git a/entry/src/main/ets/common/utils/UdpClientByCenter.ts b/entry/src/main/ets/common/utils/UdpClientByCenter.ts index a5003d7c..bca512e4 100644 --- a/entry/src/main/ets/common/utils/UdpClientByCenter.ts +++ b/entry/src/main/ets/common/utils/UdpClientByCenter.ts @@ -219,7 +219,7 @@ export default class UdpClientByCenter { } sendMsgExt(param, context?) { - console.log('sendMsgExt enter'); + console.log('sendMsgExt enterbitbit',JSON.string(param)); if (context) { this.context = context } @@ -262,7 +262,6 @@ export default class UdpClientByCenter { } let idNum = '0x' + fillZero(arr[1].toString(16), 2) + fillZero(arr[0].toString(16), 2); let id = Math.floor(+idNum / 1000) - hilog.info(0x0000, 'bitbit', JSON.stringify(arr)); let lengthNum = '0x' + fillZero(arr[7].toString(16), 2) + fillZero(arr[6].toString(16), 2); let length = +lengthNum; @@ -276,6 +275,10 @@ export default class UdpClientByCenter { callback({ id, length, body: list, sendId: this.sendId }) + hilog.info(0x0000, 'bitbitarrrbitbitarrr', JSON.stringify({ + id, length, body: list, sendId: this.sendId + })); + // this.interval=setInterval(()=>{ // diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 100e8e75..1565566b 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -77,7 +77,7 @@ struct UserInfo { @State FaceOpenStatue: string = '0'; //是否开启人脸识别 @State faceCatchImg: string = '' @State Param803Str: string = '' - @State Param341Str: string = '' + @State Param341: boolean = '' private title = '' private type = '2' // 过程照片拍照 @@ -260,6 +260,7 @@ struct UserInfo { await upDateTableByArray('USER', []) setTimeout(()=>{ this.currentUser = this.list[0] + globalThis.lsh = this.currentUser.lsh },200) // promptAction.showToast({ @@ -410,7 +411,7 @@ struct UserInfo { } //判断是否考生是否按顺序考试 if (sys.v_no === '341'&&decodeURIComponent(sys.v_value) == '1') { - this.Param341Str= true + this.Param341= true } }) @@ -940,7 +941,7 @@ struct UserInfo { .backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') : $r('app.media.userboxbg')) .backgroundImageSize({ width: '100%', height: '100%' }) .onClick(() => { - if (this.isExamStart && !globalThis.singlePlay&&this.Param341Str) { + if (this.isExamStart && !globalThis.singlePlay&&this.Param341) { return } this.currentUser=EmptyCandidateObject diff --git a/entry/src/main/ets/pages/compontents/FaceCompare.ets b/entry/src/main/ets/pages/compontents/FaceCompare.ets index fdf313f9..3a3c5367 100644 --- a/entry/src/main/ets/pages/compontents/FaceCompare.ets +++ b/entry/src/main/ets/pages/compontents/FaceCompare.ets @@ -225,6 +225,7 @@ export default struct FaceCompare { async heartMsg(context) { let tmpList = [] const str = this.lsh + console.log('this.lshbitbit',this.lsh,globalThis.carInfo.carNo,globalThis.carInfo.examinationRoomId) for (let i = 0; i < str.length; i++) { tmpList.push(string2Bytes(str.charCodeAt(i), 1 * 8)[0]) } @@ -251,6 +252,7 @@ export default struct FaceCompare { } }, 1000) globalThis.udpClient2.setMsgCallBack((val) => { + console.log('valvalval',globalThis.statue,JSON.stringify(val)) if(globalThis.statue!=3){ return }