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

Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev

Browse Source
This commit is contained in:
wangzhongjie 2025-06-23 14:19:26 +08:00
commit 2d085b42bf
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,7 +435,8 @@ const devPath = "/dev/ttyS3"
function openChuankouFn(callback) { function openChuankouFn(callback) {
console.log('SerialOpen in indexservice, path=' + devPath) console.log('SerialOpen in indexservice, path=' + devPath)
//TODO 自动挡车不读取串口 //自动挡车不读取串口
if(globalThis.carInfo && globalThis.carInfo.kscx == 'C1'){
testNapi.SerialOpenAsync(devPath, (fd) => { testNapi.SerialOpenAsync(devPath, (fd) => {
globalThis.fd = fd; globalThis.fd = fd;
globalThis.num = 0 globalThis.num = 0
@ -445,6 +446,7 @@ function openChuankouFn(callback) {
}); });
}); });
} }
}
function getChuankouFnMsg() { function getChuankouFnMsg() {
let timeout = 50000; // 2秒超时 let timeout = 50000; // 2秒超时

10
entry/src/main/ets/entryability/EntryAbility.ts
View File

@ -37,8 +37,6 @@ export default class EntryAbility extends UIAbility {
// this.context // this.context
// Main window is created, set main page for this ability // Main window is created, set main page for this ability
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate'); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
await tcpUtil.init()
globalThis.carInfo = {} globalThis.carInfo = {}
globalThis.examinerInfo = {} globalThis.examinerInfo = {}
@ -66,15 +64,11 @@ export default class EntryAbility extends UIAbility {
globalThis.pathDir = this.context.filesDir; globalThis.pathDir = this.context.filesDir;
globalThis.context = this.context; globalThis.context = this.context;
globalThis.isJudgeInitBool = false globalThis.isJudgeInitBool = false
console.info('jiangsong globalThis.pathDir = ' + globalThis.pathDir);
// this.requestPermission(this.context)
// this.featureAbilityAuth()
const windowClass = await windowStage.getMainWindow(); const windowClass = await windowStage.getMainWindow();
globalThis.windowClass = windowClass globalThis.windowClass = windowClass
// await windowClass.setWindowLayoutFullScreen(true) await windowClass.setWindowLayoutFullScreen(true)
// await windowClass.setWindowSystemBarEnable([]) //全屏 await windowClass.setWindowSystemBarEnable([])
await windowClass.setWindowSystemBarEnable(['navigation'])
windowStage.loadContent('pages/Index', (err, data) => { windowStage.loadContent('pages/Index', (err, data) => {
if (err.code) { if (err.code) {

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

@ -677,6 +677,11 @@ struct Index {
}, 1000) }, 1000)
this.createAlbum() this.createAlbum()
getSyncData('ES_CARINFO').then(result => {
const carInfo = result[0] || {};
globalThis.carInfo.kscx = carInfo.kscx
})
// clearInterval(globalThis.demo) // clearInterval(globalThis.demo)
// globalThis.demo= setInterval(()=>{ // globalThis.demo= setInterval(()=>{
// const str= {"carId":"1062","examinationRoomId":"2","videoVersion":"1.0","judgeVersion":"2023.09.30.1","shellVersion":"2023.12.13.01","host":"http://172.37.55.191:8082"} // const str= {"carId":"1062","examinationRoomId":"2","videoVersion":"1.0","judgeVersion":"2023.09.30.1","shellVersion":"2023.12.13.01","host":"http://172.37.55.191:8082"}