Merge remote-tracking branch 'origin/dev' into dev

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

@@ -54,6 +54,7 @@ export const initJudgeUdp = async () => {
 }
 
 export const getMessageHeartbeat = async (msg) => {
+  console.info('surenjun','getMessageHeartbeat start')
   const carInfo = globalThis.carInfo;
   const { examSubject,plateNo } = carInfo;
   const ksyh='0000000000000'
@@ -62,7 +63,7 @@ export const getMessageHeartbeat = async (msg) => {
   const asclshArr = stringToASC(fillZero(
     globalThis.singlePlay
       ? (examSubject == 2 ? '0000000000000' : '0000000000000')
-      : globalThis.lsh,
+      : (globalThis.lsh ||  '0000000000000'),
     13));
   const ascksyhArr = stringToASC(fillZero(ksyh, 13))
   const ascsbxhArr = stringToASC('00000000')
@@ -141,7 +142,7 @@ export const getMessageHeartbeat = async (msg) => {
   arr.forEach(itemArr => {
     tempArr = tempArr.concat(itemArr)
   })
-
+  console.info('surenjun','getMessageHeartbeat end')
   globalThis.serialIndex = 0;
   return Array2Byte(tempArr)
 }

entry/src/main/ets/config/global.ts

@@ -16,7 +16,7 @@ export const GlobalConfig={
     //杭州
     hz:{
       km2:['2022.03.14.01','2022.03.17.1'],
-      km3:[],
+      km3:['2024.08.21.01','2024.08.24.1'],
     },
     //黑龙江
     hlg:{
@@ -37,5 +37,8 @@ export const GlobalConfig={
       km2:['2024.08.21.01','2024.08.24.1'],
       km3:[],
     },
+    wx:{
+      km2:['2024.08.21.01','2024.08.24.1'],
+    }
   }
 }

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

@@ -47,8 +47,8 @@ export default class EntryAbility extends UIAbility {
 
     // globalThis.judgeVersion ='2024.08.24.1'
     // globalThis.version ='2023.12.13.01';
-    globalThis.version = GlobalConfig.version.jn.km3[0];
-    globalThis.judgeVersion = GlobalConfig.version.jn.km3[1];
+    globalThis.version = GlobalConfig.version.wx.km2[0];
+    globalThis.judgeVersion = GlobalConfig.version.wx.km2[1];
     globalThis.tcpSendNum = 0
     globalThis.videoVersion = '1.0'
 

entry/src/main/ets/pages/UserInfo.ets

@@ -204,6 +204,7 @@ struct UserInfo {
     if (!globalThis.singlePlay) {
       // @ts-ignore
       if (routerParam.type != 1) {
+        console.info('surenjun','Judge返回到UserInfo界面')
         // @ts-ignore
         this.list = await getSyncData('USERLIST')
         // @ts-ignore
@@ -362,7 +363,6 @@ struct UserInfo {
       setTimeout(() => {
         this.currentUser = this.list[0]
         this.currentUser.ksy2 = globalThis.kgxm
-
         globalThis.lsh = this.currentUser.lsh
       }, 200)
 
@@ -755,6 +755,7 @@ struct UserInfo {
           // }
         } else {
           this.currentUser = EmptyCandidateObject
+          globalThis.lsh = '1111111111111'
         }
 
 

entry/src/main/ets/pages/judgeSDK/judge.ts

@@ -1256,14 +1256,11 @@ export default class Judge {
           const bytes = await this.getMessageHeartbeat(true);
           globalThis.judgeUdp.send(bytes)
         }
-        await endExam()
       } catch (e) {
         console.info(judgeTag, JSON.stringify(e))
-        // setTimeout(() => {
-        //   // avPlayer.avPlayerStop();
-        //   router.back();
-        // }, 3000)
       }
+      await endExam()
+
     });
 
   }

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

@@ -311,10 +311,11 @@ export const plcStrToJson = async (plc:string) =>{
       bklx:p[56], dwzt:p[83],
       //@ts-ignore 角度差分状态
       jdzt:p[92].split('-')[0]*1,
-      //gps数据
-      //TODO 一 精度纬度要取反
-      //gps时间 经度      纬度       航向角      俯仰角      海拔高       高度差     速度
-      sj:time, jd:p[95], wd:p[96], hxj:p[90], fyj:p[91], hbg:p[85], gdc:p[86], sd:p[97],
+      //一代机、三代机经纬度数据兼容
+      //gps时间 经度                                       纬度
+      sj:time, jd:Math.max(Number(p[95]),Number(p[96])), wd:Math.min(Number(p[95]),Number(p[96])),
+      //航向角      俯仰角      海拔高       高度差     速度
+      hxj:p[90], fyj:p[91], hbg:p[85], gdc:p[86], sd:p[97],
       //龄期      经度因子     纬度因子      定位搜星数
       age:p[87], jdyz:p[89], wdyz:p[88], dwsxs:p[84] || 0,
       //@ts-ignore 角度搜星数