Merge branch 'main' into feat_surenjun
This commit is contained in:
commit
559d6cef2c
@ -338,16 +338,10 @@ export async function upDataZhongxinginitialization(param) {
|
||||
console.log('teststet0')
|
||||
const fileUtil = new FileUtil(param.context)
|
||||
const tableList = ['MA_SYSSET', 'MA_SYSTEMPARM', 'MA_MARKRULE', 'MA_MARKRULESET','ES_CARINFO','MA_MAP_ROAD','MA_MAP_ROAD_LANE','MAP_SUBITEM','MA_T_CARPARMSET','MA_MAP_ITEMCLASS','MA_MAP_POINT','MA_MAP_POINT_ITEM'];
|
||||
|
||||
for(let i=0;i<=tableList.length-1;i++){
|
||||
console.log('teststet1',tableList[i])
|
||||
const data = await fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + `/config/tableList/${tableList[i]}.txt`);
|
||||
console.log('teststet1',data)
|
||||
|
||||
await sqlInsertCommonFn(tableList[i], JSON.parse(data) || [], param.context)
|
||||
console.log('teststet2',data)
|
||||
}
|
||||
console.log('teststetfinsh')
|
||||
resolve(true)
|
||||
return
|
||||
}
|
||||
@ -422,6 +416,7 @@ function setSyncCenterSqlData(key, res, param) {
|
||||
const fileUtil = new FileUtil(param.context)
|
||||
const folderPath = await fileUtil.initFolder(`/config/tableList`);
|
||||
fileUtil.addFile(`${folderPath}/${mapName[key]}.txt`, JSON.stringify(arrList))
|
||||
|
||||
console.log('mapName[key]', mapName[key], key)
|
||||
sqlInsertCommonFn(mapName[key], arrList, param.context).then((result) => {
|
||||
console.log(key, '表建立成功')
|
||||
|
||||
@ -106,13 +106,6 @@ export default class TcpClient {
|
||||
|
||||
this.tcp.setExtraOptions({
|
||||
keepAlive: true,
|
||||
// OOBInline: true,
|
||||
// TCPNoDelay: true,
|
||||
// socketLinger: { on:true, linger:10 },
|
||||
// receiveBufferSize: 1000,
|
||||
// sendBufferSize: 1000,
|
||||
// reuseAddress: true,
|
||||
// socketTimeout: 3000,
|
||||
}, err => {
|
||||
if (err) {
|
||||
console.log('testTagtestTagerrrrr,success')
|
||||
@ -192,7 +185,6 @@ export default class TcpClient {
|
||||
globalThis.tcpUdpError = true;
|
||||
}, 2000)
|
||||
},3000)
|
||||
|
||||
// callback(value.message)
|
||||
});
|
||||
}
|
||||
@ -200,6 +192,7 @@ export default class TcpClient {
|
||||
offTcp(callback) {
|
||||
console.log(TAG, 'tcpofff')
|
||||
|
||||
|
||||
this.tcp.off('testTagofmessg', callback);
|
||||
}
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ export default async function request(req: any) {
|
||||
let baseUrl=host?host:globalThis.host
|
||||
// let baseUrl=host?config.csptHost:config.host'
|
||||
|
||||
console.log('响应头地址' + baseUrl)
|
||||
console.log('响应头地址' + baseUrl,url)
|
||||
// writeLog({
|
||||
// time:dateFormat(new Date()),
|
||||
// url,
|
||||
|
||||
@ -28,10 +28,10 @@ export default class EntryAbility extends UIAbility {
|
||||
globalThis.examinerInfo = {}
|
||||
globalThis.deviceNo = '';
|
||||
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 = '2022.08.13.01'
|
||||
// globalThis.judgeVersion = '2022.12.05.1'
|
||||
globalThis.version = '2024.11.22.14'
|
||||
globalThis.judgeVersion = '2024.11.22.14'
|
||||
globalThis.videoVersion= '1.0'
|
||||
// globalThis.version = '2023.12.13.01'
|
||||
// globalThis.judgeVersion = '2023.09.30.1'
|
||||
|
||||
@ -16,6 +16,8 @@ import worker, { MessageEvents } from '@ohos.worker';
|
||||
import promptAction from '@ohos.promptAction'
|
||||
import { voiceService } from '../common/service/voiceService';
|
||||
// import errorMsgDialog from './compontents/errorMsgDialog'
|
||||
import { getSyncData } from '../common/service/initable';
|
||||
|
||||
@Entry
|
||||
@Component
|
||||
struct Index {
|
||||
@ -73,28 +75,28 @@ struct Index {
|
||||
.onClick(() => {
|
||||
this.dialogVisiable=true
|
||||
return
|
||||
promptAction.showDialog({
|
||||
title: '提示',
|
||||
message: '确认是否退出应用',
|
||||
buttons: [
|
||||
{
|
||||
text: '确认',
|
||||
color: '#000000',
|
||||
},
|
||||
{
|
||||
text: '取消',
|
||||
color: '#000000',
|
||||
}
|
||||
],
|
||||
})
|
||||
.then(data => {
|
||||
if (data.index == 0) {
|
||||
router.back()
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
// reslove(false)
|
||||
})
|
||||
// promptAction.showDialog({
|
||||
// title: '提示',
|
||||
// message: '确认是否退出应用',
|
||||
// buttons: [
|
||||
// {
|
||||
// text: '确认',
|
||||
// color: '#000000',
|
||||
// },
|
||||
// {
|
||||
// text: '取消',
|
||||
// color: '#000000',
|
||||
// }
|
||||
// ],
|
||||
// })
|
||||
// .then(data => {
|
||||
// if (data.index == 0) {
|
||||
// router.back()
|
||||
// }
|
||||
// })
|
||||
// .catch(err => {
|
||||
// // reslove(false)
|
||||
// })
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -132,7 +134,19 @@ struct Index {
|
||||
if (this.loading) {
|
||||
return
|
||||
}
|
||||
//判断数据库是否有表数据，有则直接跳转，没有则读取本地数据
|
||||
getSyncData('MA_SYSSET').then(data => {
|
||||
console.log('datadata',JSON.stringify(data))
|
||||
if (data?.[0]) {
|
||||
router.pushUrl({
|
||||
url:'pages/UserInfo',
|
||||
}, router.RouterMode.Single)
|
||||
}else{
|
||||
this.loading=true
|
||||
this.testXMLToJSONInWorker()
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
;
|
||||
})
|
||||
|
||||
@ -102,6 +102,8 @@ struct UserInfo {
|
||||
]
|
||||
|
||||
async onPageShow() {
|
||||
this.updateTimeLimit=false
|
||||
console.log('响应头地址响应头地址')
|
||||
const mediaTest = new FilePhoto(this.context);
|
||||
this.filePhoto = new FilePhoto(this.context);
|
||||
//语音功能
|
||||
@ -115,6 +117,11 @@ struct UserInfo {
|
||||
this.initSysset()
|
||||
//心跳处理
|
||||
this.heartMsg()
|
||||
getSyncData('USER').then(data => {
|
||||
if (data?.[0]) {
|
||||
this.getExaminationStudentInfoFn()
|
||||
}
|
||||
})
|
||||
this.isExamStart = false
|
||||
this.sczbkf = [];
|
||||
this.avPlayer = new VoiceAnnounce();
|
||||
@ -139,9 +146,9 @@ struct UserInfo {
|
||||
}
|
||||
|
||||
// 通过身份证获取当前学员
|
||||
getCurrentStudent(id) {
|
||||
async getCurrentStudent(id) {
|
||||
let flag = false
|
||||
this.pageIndex
|
||||
// this.pageIndex
|
||||
this.list.map((res, index) => {
|
||||
if (res.sfzmhm == id) {
|
||||
flag = true
|
||||
@ -170,10 +177,12 @@ struct UserInfo {
|
||||
})
|
||||
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||
if (!flag) {
|
||||
promptAction.showToast({
|
||||
message: '未匹配到对应下载学员',
|
||||
duration: 3000
|
||||
});
|
||||
await upDateTableByArray('USER', [])
|
||||
this.currentUser=this.list[0]
|
||||
// promptAction.showToast({
|
||||
// message: '未匹配到对应下载学员',
|
||||
// duration: 3000
|
||||
// });
|
||||
}
|
||||
}
|
||||
|
||||
@ -255,7 +264,7 @@ struct UserInfo {
|
||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm || this.currentUser.ksy2sfzmhm
|
||||
globalThis.lsh = this.lsh
|
||||
} else {
|
||||
this.getExaminationStudentInfoFn()
|
||||
// this.getExaminationStudentInfoFn()
|
||||
}
|
||||
const syssetParams = await getSyncData('MA_SYSSET');
|
||||
//@ts-ignore
|
||||
@ -376,13 +385,6 @@ struct UserInfo {
|
||||
}
|
||||
this.pageIndex--;
|
||||
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||
this.dataList.forEach(listData => {
|
||||
for (let i in listData) {
|
||||
listData[i] = decodeURI(listData[i])
|
||||
}
|
||||
listData.kszp = this.photo + listData.kszp
|
||||
listData.ksmjzp = this.photo + listData.ksmjzp
|
||||
})
|
||||
}
|
||||
|
||||
//获取下载考生
|
||||
@ -741,7 +743,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) {
|
||||
if (this.isExamStart&&!globalThis.singlePlay) {
|
||||
return
|
||||
}
|
||||
this.currentUser = item
|
||||
@ -995,9 +997,9 @@ struct LabelBlock {
|
||||
|
||||
build() {
|
||||
Row() {
|
||||
Text(this.label).fontSize(16 * this.ratio).fontColor('#99948A')
|
||||
Text(this.label).fontSize(20 * this.ratio).fontColor('#99948A')
|
||||
Row() {
|
||||
Text(decodeURIComponent(this.value)).fontColor('#fff').textAlign(TextAlign.Center).width('100%')
|
||||
Text(decodeURIComponent(this.value)).fontColor('#fff').textAlign(TextAlign.Center).width('100%').fontSize(18 * this.ratio)
|
||||
}
|
||||
.commLabelStyle()
|
||||
}.margin({ bottom: 10 * this.ratio })
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user