harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

Merge pull request '表更新' (#18) from lv into main

Browse Source 
Reviewed-on: #18
This commit is contained in:
wangzhongjie 2024-07-01 16:13:29 +08:00
commit 102baf587e
6 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
entry/src/main/ets/common/constants/MA_MAP_SUBITEM.ts
View File

@ -18,14 +18,14 @@ CommonConstants {
/**
* Rdb database config.
*/
static readonly STORE_CONFIG = { name: 'MA_MAP_SUBITEM.db' };
static readonly STORE_CONFIG = { name: 'MAP_SUBITEM.db' };
/**
* Account table config.
*/
static readonly ACCOUNT_TABLE = {
tableName: 'MA_MAP_SUBITEM',
sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_SUBITEM(id INTEGER PRIMARY KEY AUTOINCREMENT,itemno TEXT,posx1 TEXT, posx2 TEXT, ' +
tableName: 'MAP_SUBITEM',
sqlCreate: 'CREATE TABLE IF NOT EXISTS MAP_SUBITEM(id INTEGER PRIMARY KEY AUTOINCREMENT,itemno TEXT,posx1 TEXT, posx2 TEXT, ' +
'posx3 TEXT, posx4 TEXT,posy1 TEXT,posy2 TEXT,posy3 TEXT,posy4 TEXT,sno TEXT,subname TEXT)',
columns: ['id','itemno', 'posx1', 'posx2', 'posx3', 'posx4', 'posy1', 'posy2', 'posy3', 'posy4', 'sno', 'subname']
};

8
entry/src/main/ets/common/database/Rdb.ts
View File

@ -83,7 +83,7 @@ export default class Rdb {
'MA_MAP_POINT_ITEM': MA_MAP_POINT_ITEM,
'MA_MAP_ROAD': MA_MAP_ROAD,
'MA_MAP_ROAD_LANE': MA_MAP_ROAD_LANE,
'MA_MAP_SUBITEM': MA_MAP_SUBITEM,
'MAP_SUBITEM': MA_MAP_SUBITEM,
'MA_SYSSET': MA_SYSSET,
'ES_CARINFO': ES_CARINFO,
'ES_EXAMPOINTDETAIL': ES_EXAMPOINTDETAIL,
@ -92,10 +92,10 @@ export default class Rdb {
'MA_ITEMINFO': MA_ITEMINFO,
'MA_T_CARPARMSET': MA_T_CARPARMSET,
'ES_CAR_VIDEO_PARAMETER': ES_CAR_VIDEO_PARAMETER,
'CommonConstants':CommonConstants,
'USER':USER,
'IpConfigTable':IpConfigTable,
'DeviceInfoTable':DeviceInfoTable
'DeviceInfoTable':DeviceInfoTable,
'CommonConstants':CommonConstants
}
@ -139,7 +139,7 @@ export default class Rdb {
'MA_MAP_POINT_ITEM': MA_MAP_POINT_ITEM,
'MA_MAP_ROAD': MA_MAP_ROAD,
'MA_MAP_ROAD_LANE': MA_MAP_ROAD_LANE,
'MA_MAP_SUBITEM': MA_MAP_SUBITEM,
'MAP_SUBITEM': MA_MAP_SUBITEM,
'MA_SYSSET': MA_SYSSET,
'ES_CARINFO': ES_CARINFO,
'ES_EXAMPOINTDETAIL': ES_EXAMPOINTDETAIL,

5
entry/src/main/ets/common/service/initable.ts
View File

@ -93,9 +93,9 @@ function sqlInsertCommonFn(tableName,resultArr,context?){
let str='('
map[tableName].ACCOUNT_TABLE.columns.map((res,index)=>{
if(map[tableName].ACCOUNT_TABLE.columns.length-1==index){
str+=`"${data[res]||'0'}"`
str+=data[res]?`"${data[res]}"`:'NULL'
}else{
str+=`"${data[res]||'0'}"`+','
str+=(data[res]?`"${data[res]}"`:'NULL')+','
}
})
if(i==resultArr.length-1){
@ -425,6 +425,7 @@ function setSyncCenterSqlData(key,res,param){
}else{
arrList=[res.initializationRsp.body[key].record]
}
console.log('mapName[key]',mapName[key],key)
sqlInsertCommonFn(mapName[key],arrList,param.context).then((result)=>{
console.log(key,'表建立成功')
if(result){

4
entry/src/main/ets/common/service/terminalService.ts
View File

@ -6,8 +6,8 @@ import { getSyncData } from '../../common/service/initable'
//获取设备信息
export async function getDeviceInfo() {
globalThis.deviceNo = '153216400880'; //科目三设备
// globalThis.deviceNo = '150667400235'; //科目三设备
// globalThis.deviceNo = '153216400880'; //科目三设备
globalThis.deviceNo = '150667400235'; //科目三设备
return new Promise((resolve, reject) => {
getSyncData('DeviceInfoTable').then((result: Array<any>) => {

23
entry/src/main/ets/pages/Index.ets
View File

@ -221,23 +221,11 @@ struct Index {
globalThis.ratio= 1700 / 960
this.angle = 0
this.loading = false
// let workerInstance = new worker.ThreadWorker('entry/ets/pages/worker.ts', {
// name: 'FriendsMoments Worker'
// });
// this.workerInstance.onmessage = function(e) {
// console.log("onerror")
// router.pushUrl({
// url: 'pages/ExaminerLogin',
// }, router.RouterMode.Single)
// this.loading=false
// }
}
async testXMLToJSONInWorker(){
let workerInstance = new worker.ThreadWorker('entry/ets/workers/worker.ts', {
name: 'FriendsMoments Worker'
});
var xmlStr='123'
console.log("baoyihu before postMessage :");
const param={
carId:globalThis.carInfo?.carId,
examinationRoomId:globalThis.carInfo?.examinationRoomId,
@ -249,11 +237,12 @@ struct Index {
}
workerInstance.postMessage(param);
workerInstance.onmessage = (e: MessageEvents): void => {
console.log("baoyihu after postMessage :",e.data);
console.log("onerror")
router.pushUrl({
url: 'pages/ExaminerLogin',
}, router.RouterMode.Single)
console.log("baoyihu after postMessage :",JSON.stringify(e.data));
if(e.data.isComplete){
router.pushUrl({
url: 'pages/ExaminerLogin',
}, router.RouterMode.Single)
}
this.loading=false
// let workData: WorkData = e.data;
// if (workData) {

4
entry/src/main/ets/pages/TerminalInfos.ets
View File

@ -9,7 +9,7 @@ import { getSyncData} from '../common/service/initable'
@Entry
@Component
struct Index {
@State textList1: string[] = ['差分服务器Ip','响应端口','中心服务器IP','响应端口', '子网掩码','默认网关','dns','后置机IP ', '响应端口','前置机IP','本地端口','平台服务器Ip','响应端口']
@State textList1: string[] = ['差分服务器Ip','响应端口','中心服务器IP','响应端口', '子网掩码','默认网关','dns','后置机IP ', '响应端口','前置机IP','本地端口']
// @State textList2: string[] = []
@State ratio: number = 1700 / 960
@State inputFontSize:number=12 //12
@ -19,7 +19,7 @@ struct Index {
// @State inputTextList2: string[] = ['192.168.7.124','20022']
@State inputTextList1: string[] = ['172.37.55.191','18782','172.37.55.191','8082','255.255.255.0','192.168.7.1','114.114.114.114','192.168.7.124','20022','192.168.7.170','20122','172.37.55.191','11050']
@State inputTextList1: string[] = ['172.37.55.191','18782','172.37.55.191','8082','255.255.255.0','192.168.7.1','114.114.114.114','192.168.7.124','20022','192.168.7.170','20122']
// @State inputTextList2: string[] = []
// 112.80.35.83 11052
// @State inputTextList1: string[] = ['192.168.36.2','8084','192.168.36.200','20122','255.255.255.0','192.168.36.1','','','114.114.114.114','192.168.36.139','8000']