fix: 润和

build-profile.json5

@@ -5,9 +5,9 @@
         "name": "default",
         "material": {
           "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.cer",
-          "storePassword": "0000001AC0C49320C84ECD6C7BA0119428C66297EAF08E5011B23EBA83794F0FA803077D0F4848203ADD",
+          "storePassword": "0000001A1173A56391B52980E84237B06A106777310E419AF46EBEB63A7D126BCA0F5657D119081FE3C9",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001A7A1DB8B37DA86FBA8DBDDE9B6E4DC5801A351175FB4980E662677BB08D6E02D623FAD2EB993B",
+          "keyPassword": "0000001A5FF060362EBE093828B7604C511B827EB8C93BAD85C9745AA07A084FBAEB8687CC941F8CC0B7",
           "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p7b",
           "signAlg": "SHA256withECDSA",
           "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p12"

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

@@ -285,6 +285,7 @@ export async function takePhotoFn(context) {
 
 let fd
 const devPath = "/dev/ttyS1"
+
 async function openChuankouFn() {
   fd = await testNapi.SerialOpen(devPath);
   globalThis.fd = fd
@@ -294,6 +295,7 @@ async function openChuankouFn() {
   let ret = await testNapi.SerialSet(fd, 115200, 0, 8, 1, 0)
   console.log('daihairet', ret)
 }
+
 async function getChuankouFnMsg() {
   let timeout = 5000; // 2秒超时
   let databuff = [0x61, 0xAA, 0x0A, 0X15, 0X00]; // send ABCDE
@@ -306,6 +308,7 @@ async function getChuankouFnMsg() {
   testNapi.SerialRecv(globalThis.fd, timeout, 12).then(revTestInfo => {
     console.log('daihai', revTestInfo?.recevedBuf?.toString())
     const message = revTestInfo?.recevedBuf?.toString()
+    console.log("chuankou xinxi",message)
     if (message == '') {
       return
     }
@@ -316,18 +319,22 @@ async function getChuankouFnMsg() {
     if (msg[0] != '98' || msg[1] != '85' || msg.length < 9) {
       return
     }
+    console.log("chuankou 档位", msg[9])
+    if(msg[9]==0||msg[9]==1||msg[9]==2||msg[9]==3||msg[9]==4||msg[9]==5){
       globalThis.chuankoMsg = msg[9]
+    }
   }).catch((err) => {
     console.log('daihaierror', JSON.stringify(err))
   })
 }
+
 export async function getChuankouFn() {
-  if(globalThis.fd){
+  if (!globalThis.fd) {
+    console.log("chuankou 没有fd")
+    openChuankouFn()
     return
   }
-  openChuankouFn()
+  console.log("chuankou 定时器")
-  setInterval(()=>{
   getChuankouFnMsg()
-  },1000)
 
 }

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

@@ -6,13 +6,13 @@ import fs from '@ohos.file.fs'
 import photoAccessHelper from '@ohos.file.photoAccessHelper'
 import dataSharePredicates from '@ohos.data.dataSharePredicates'
 import { dateFormat, getCurrentTime } from '../utils/tools'
-import rtsp_server from '@ohos.rtsprecord';
+import record from '@ohos.rtsprecord';
 // import record from '@ohos.rtsprecord';
 import { FileHelper } from './FileHelper';
 import FileUtil from '../utils/File';
 import { GlobalConfig } from '../../config';
 
-// const rtsp_server = record.createServer();
+const rtsp_server = record.createServer();
 //开始录屏
 const FILE_ASSET_FETCH_COLUMNS = [photoAccessHelper.PhotoKeys.URI,
   photoAccessHelper.PhotoKeys.PHOTO_TYPE,
@@ -30,6 +30,7 @@ const FILE_ASSET_FETCH_COLUMNS = [photoAccessHelper.PhotoKeys.URI,
   photoAccessHelper.PhotoKeys.POSITION,
   photoAccessHelper.PhotoKeys.DATE_TRASHED,
   photoAccessHelper.PhotoKeys.HIDDEN];
+
 // const rtsp_server = record.createServer();
 
 export async function saveStartRecordVideo(path) {
@@ -57,6 +58,7 @@ export async function saveStartRecordVideo(path) {
     reslove(record_handle)
   })
 }
+
 async function getfilehandleCode(td, param, dir, path, index) {
   return new Promise(async (reslove, reject) => {
     console.log('pathpath1', path)
@@ -67,6 +69,7 @@ async function getfilehandleCode(td, param, dir, path, index) {
   })
 
 }
+
 export async function startRecordVideo(param?, td?, context?, dir?, path?, index?) {
   return new Promise(async (reslove, reject) => {
 
@@ -113,6 +116,7 @@ export async function endRecordVideo(record_handleObj) {
     }
   }
 }
+
 /**
  *拍照
  * @param param
@@ -124,6 +128,7 @@ interface  takePhotoParam {
   base64?: string,
   fileSize?: number,
 }
+
 /**
  *
  * @param param
@@ -134,6 +139,7 @@ interface  takePhotoParam {
  * @returns
  */
 const fileHelper = new FileHelper();
+
 export async function takePhoto(param, context, dir, flag = 1, callback?) {
 
   var video_uri = `rtsp://${param.userName}:${param.pwd}@${param.ip}:${param.port}/h264/ch${param.pztd}/main/av_stream`;
@@ -161,11 +167,10 @@ export async function takePhoto(param, context,dir,flag=1,callback?) {
     //   callback({base64: snapResult.dataString,name:snapResult.fileName,fileSize:snapResult.fileSize })
     //   console.log('getmyLog01')
     // });
-  }
+  } else {
-  else{
     return new Promise<takePhotoParam>((resolve, reject) => {
       // @ts-ignore
-      rtsp_server.getVideoSnapshot(context, video_uri, fileName,dir,true,(snapResult,err)=>{
+      rtsp_server.getVideoSnapshot(context, video_uri, fileName, dir, true, (err, snapResult) => {
         console.log('getPhtot')
         resolve({ base64: snapResult.dataString, name: snapResult.fileName, fileSize: snapResult.fileSize })
       });
@@ -174,8 +179,6 @@ export async function takePhoto(param, context,dir,flag=1,callback?) {
 
   }
   console.log('getmyLog03')
-
-
 }
 
 export async function deleteAllFileByPiC(dirName) {

entry/src/main/ets/common/utils/UdpClient.ts

@@ -36,6 +36,7 @@ export default class UdpClient {
     this.oppositeIp = udpOppositeIp
     this.localIpPort = udplocalIpPort
     this.oppositeIpPort = udpOppositeIpPort
+    console.log("chuankou 初始化",)
     getChuankouFn()
     console.log(TAG,'newUdp')
     // this.stashFn=()=>{}

entry/src/main/ets/common/utils/tempRequest.ts

@@ -164,7 +164,7 @@ async function xmlToJson(result, url) {
         let res = deeml(xmlArr);
         console.log("xmlToJson end",JSON.stringify(res) );
         resolve(res)
-      }, 100)
+      }, 10000)
     } else {
       let res = deeml(xmlArr);
       console.log("xmlToJson end",JSON.stringify(res) );

entry/src/main/ets/pages/Judge.ets

@@ -33,6 +33,7 @@ import FileUtil from '../common/utils/File';
 import SignDisplayCom from './compontents/signDisplayCom';
 import promptAction from '@ohos.promptAction';
 import { voiceService } from '../common/service/voiceService';
+import { getChuankouFn } from '../common/service/indexService';
 
 @Entry
 @Component
@@ -42,6 +43,11 @@ struct Index {
   }
 
   async aboutToAppear() {
+    getChuankouFn()
+    setInterval(() => {
+      console.log("chuankou 定时器2")
+      getChuankouFn()
+    }, 1000)
     globalThis.windowClass.setWindowSystemBarEnable([])
     const time = await getCurrentTime()
 

entry/src/main/ets/pages/compontents/SignDisplayCom.ets

@@ -6,6 +6,8 @@ import { GPSData, SignalData } from '../../mock';
 import { SignalDataType } from '../../model';
 import FileUtil from '../../common/utils/File'
 import { GlobalConfig } from '../../config/index'
+import { getChuankouFn } from '../../common/service/indexService';
+
 @Component
 export default struct SignDisplayCom {
   @State showBack: boolean = false
@@ -322,10 +324,14 @@ export default struct SignDisplayCom {
   }
 
   aboutToDisappear() {
-    clearInterval(this.interval)
+    // clearInterval(this.interval)
   }
 
   async aboutToAppear() {
+    setInterval(() => {
+      console.log("chuankou 定时器2")
+      getChuankouFn()
+    }, 1000)
     // const fileUtil = new FileUtil(globalThis.context)
     // const data = await fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + '/config/ipConfig.txt')
     // this.udplocalIp=JSON.parse(data)?.udplocalIp||'192.168.7.170'
@@ -360,20 +366,20 @@ export default struct SignDisplayCom {
     const getSignal = this.getSignal;
     const that = this
     const showBack = this.showBack;
-    if (showBack) {
+    // if (showBack) {
-      globalThis.udpClient.onMessage_1&&globalThis.udpClient.onMessage_1((msg) => {
+    //   globalThis.udpClient.onMessage_1&&globalThis.udpClient.onMessage_1((msg) => {
-        console.log('getUDPonMessage_1bysignDisplay2', msg)
+    //     console.log('getUDPonMessage_1bysignDisplay2', msg)
-
+    //
-        getSignal(msg)
+    //     getSignal(msg)
-      })
+    //   })
-    } else {
+    // } else {
-      clearInterval(globalThis.signalTimer)
+    //   clearInterval(globalThis.signalTimer)
-      globalThis.signalTimer = setInterval(() => {
+    //   globalThis.signalTimer = setInterval(() => {
-        //TODO 临时方案
+    //     //TODO 临时方案
-        const msgStr = globalThis.msgStr
+    //     const msgStr = globalThis.msgStr
-        getSignal(msgStr)
+    //     getSignal(msgStr)
-      }, 200)
+    //   }, 200)
-    }
+    // }
 
   }
 

entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts

@@ -16,7 +16,7 @@ export const judgeConfig = {
   // 本地模型地址
   // modelPath: 'models/model_enc',
   // 济南科目三
-  trajectoryPath: 'logs/2025_04_23_09_50_55_2504755332926_320924199111132926_陈静/judge_exam_data.txt',
+  trajectoryPath: 'logs/2024_10_12_11_50_10_9999427676823_744299437502336256_隋统/judge_exam_data.txt',
   //四合一画面配置
   fourInOneScreen: {
     //gps位数