冲突提交

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

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

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"}