diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index 966cbdf4..f606ddfc 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -162,6 +162,7 @@ export async function getDoubleCeneterTable(param) { } for (let key in typeObj) { typeObj[key] = await upDateTable({ tableName: key }, param) + console.log('sqlsqlinsert',key, typeObj[key]) if (!typeObj[key]) { promptAction.showToast({ message: `未能查询到${key}表数据, 请先检查网络是否连接正常`, diff --git a/entry/src/main/ets/common/service/initable.ts b/entry/src/main/ets/common/service/initable.ts index b5039a12..7fabbb86 100644 --- a/entry/src/main/ets/common/service/initable.ts +++ b/entry/src/main/ets/common/service/initable.ts @@ -45,6 +45,7 @@ const map = { 'MA_MAP_ROAD': MA_MAP_ROAD, 'MA_MAP_ROAD_LANE': MA_MAP_ROAD_LANE, 'MAP_SUBITEM': MA_MAP_SUBITEM, + 'MA_MAP_SUBITEM': MA_MAP_SUBITEM, 'MA_SYSSET': MA_SYSSET, 'ES_CARINFO': ES_CARINFO, 'ES_EXAMPOINTDETAIL': ES_EXAMPOINTDETAIL, @@ -94,7 +95,7 @@ function sqlInsertCommonFn(tableName, resultArr, context?, delFlag = true) { if (result.length == 0) { console.log('sqlsqlinsert',resultArr.length) if(resultArr.length==0){ - resolve(false) + resolve(true) return } let INSERT_SQL = "INSERT INTO " + tableName @@ -188,7 +189,7 @@ export async function upDateTable(params, reqParam) { return new Promise((resolve, reject) => { const date = new Date() let paraKdid = reqParam?.paraKdid || '' - let examinationRoomId = reqParam?.examinationRoomId || '' + let examinationRoomId = reqParam?.kdid || '' if (!paraKdid || !examinationRoomId) { resolve(false) return @@ -197,12 +198,12 @@ export async function upDateTable(params, reqParam) { const str = { "head": { "time": dateFormat(date) }, "body": { "tableName": params.tableName, // 表名 - "paraKdid": paraKdid, //参数平台kdid - "examinationRoomId": examinationRoomId, //考试平台kdid + "paraKdid": reqParam.paraKdid, //参数平台kdid + "examinationRoomId":reqParam.kdid, //考试平台kdid "typeRsp": "0" // 赋默认值0,无需改变 } } - const url = globalThis.timeInfo.url + const url = reqParam.centerHost initCenterCache(str, url).then(async (res) => { if (!res || res == undefined || res == '') { @@ -233,7 +234,7 @@ export async function getMySystemSetTable(params, reqParam) { const str = { "head": { "time": dateFormat(date) }, "body": { "tableName": params.tableName, // 表名 - "paraKdid": reqParam?.kdid, //考试平台kdid + "paraKdid": reqParam?.paraKdid, //参数平台kdid "examinationRoomId": reqParam?.kdid, //考试平台kdid "typeRsp": "0" // 赋默认值0,无需改变 } diff --git a/entry/src/main/ets/mock/VideoData.ets b/entry/src/main/ets/mock/VideoData.ets index 48271ee9..71c51c9a 100644 --- a/entry/src/main/ets/mock/VideoData.ets +++ b/entry/src/main/ets/mock/VideoData.ets @@ -18,7 +18,7 @@ export const VideoConfigData: VideoConfig = { td3: '3', td4: '4', videoRecord1: false, - videoRecord2: true, + videoRecord2: false, videoRecord3: false, videoRecord4: false, text1: '', diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 23e1dbc0..a61f60c5 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -184,7 +184,7 @@ struct Index { Column() { Row() { Column() { - Text('V ' + globalThis.version) + Text('V 1.0') .fontColor('#CCAE7A') .fontSize(22 * globalThis.ratio) .width('30%') @@ -310,13 +310,15 @@ struct Index { // let mode=globalThis.timeInfo?.mode?globalThis.timeInfo?.mode:1 // console.log('mode',mode) + let workerInstance = new worker.ThreadWorker('entry/ets/workers/worker.ts'); const param = { carId: globalThis.carInfo?.carId, examinationRoomId: globalThis.carInfo?.examinationRoomId, judgeVersion: globalThis.judgeVersion, shellVersion: globalThis.version, - paraKdid: globalThis.timeInfo?.paraKdid, + paraKdid: globalThis.timeInfo?.paraKdid||globalThis.timeInfo?.kdid, + kdid:globalThis.timeInfo?.kdid||globalThis.timeInfo?.paraKdid, mode: globalThis.timeInfo?.mode, context: this.context, host: globalThis.host,