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

entry/src/main/ets/common/service/indexService.ts

@@ -435,15 +435,17 @@ const devPath = "/dev/ttyS3"
 function openChuankouFn(callback) {
   console.log('SerialOpen in indexservice, path=' + devPath)
 
-  //TODO 自动挡车不读取串口
-  testNapi.SerialOpenAsync(devPath, (fd) => {
-    globalThis.fd = fd;
-    globalThis.num = 0
-    let parity = 0x4e; // 'N'
-    let ret = testNapi.SerialSetAsync(globalThis.fd, 115200, 0, 8, 1, parity, (ret) => {
-      callback()
+  //自动挡车不读取串口
+  if(globalThis.carInfo && globalThis.carInfo.kscx == 'C1'){
+    testNapi.SerialOpenAsync(devPath, (fd) => {
+      globalThis.fd = fd;
+      globalThis.num = 0
+      let parity = 0x4e; // 'N'
+      let ret = testNapi.SerialSetAsync(globalThis.fd, 115200, 0, 8, 1, parity, (ret) => {
+        callback()
+      });
     });
-  });
+  }
 }
 
 function getChuankouFnMsg() {

entry/src/main/ets/entryability/EntryAbility.ts

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

entry/src/main/ets/pages/Index.ets

@@ -677,6 +677,11 @@ struct Index {
     }, 1000)
     this.createAlbum()
 
+    getSyncData('ES_CARINFO').then(result => {
+      const carInfo = result[0] || {};
+      globalThis.carInfo.kscx = carInfo.kscx
+    })
+
     //  clearInterval(globalThis.demo)
     // 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"}