fix: 修复评判设置位置

entry/src/main/ets/config/index.ets

@@ -1,3 +1,4 @@
 export * from "./LogEnum";
 
-export * from "./global"
+export * from "./global"
+export * from "./judge"

entry/src/main/ets/config/judge.ets

@@ -6,5 +6,34 @@
  * @Description: 评判配置
  * @Email: shutdown0630@163.com
  */
+import { JudgeConfigType } from '../model'
 
 
+//考试回放开关
+export const JudgeConfig:JudgeConfigType = {
+  //本地目录开关
+  isTrajectoryOpen: false,
+  //是否开启拍照
+  isPhotoOpen: true,
+  //扣分语音是否强制开启
+  kfVoiceOpen: false,
+  //忽略的考试项目
+  ignoreProjects: [],
+  // 是否忽略考试前熄火、车门检查
+  isCheckFireOpen: false,
+  //轨迹回放是否开启Udp
+  udpOpen: true,
+  // 本地模型地址
+  modelPath: 'models/model_enc',
+  // 济南科目三
+  trajectoryPath: 'logs/2024_12_26/2024_12_26_14_12_51_2412505941910_370125200404041910_赵宇/judge_exam_data.txt',
+  //四合一画面配置
+  fourInOneScreen: {
+    //gps位数
+    gpsDigit: 6
+  },
+  // 杭州科目二
+  // trajectoryPath: 'logs/2024_07_19/0000000000001_342323199501470011_测试学员1_2024_07_19_06_49_12/judge_exam_data.txt',
+  //TODO 济南临时特殊配置
+  // systemParamConfig: {}
+}

entry/src/main/ets/model/Common.ets

@@ -175,4 +175,23 @@ export interface centerCallBackMsgType {
   length: number;
   body: number[];
   sendId: number;
+}
+
+export interface JudgeConfigType{
+  isTrajectoryOpen:boolean;
+  isPhotoOpen:boolean;
+  kfVoiceOpen:boolean;
+  ignoreProjects?:string[];
+  isCheckFireOpen:boolean;
+  udpOpen:boolean;
+  modelPath:string;
+  trajectoryPath:string;
+  fourInOneScreen:FourInOneScreenType
+  systemParamConfig?:SystemParamConfigType
+}
+interface FourInOneScreenType{
+  gpsDigit:number
+}
+interface SystemParamConfigType{
+
 }

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

@@ -1,7 +1,7 @@
 import common from '@ohos.app.ability.common';
 import router from '@ohos.router';
 
-import { JudgeConfig } from './judgeSDK/utils/judgeConfig';
+import { JudgeConfig } from "../config";
 import promptAction from '@ohos.promptAction';
 import errorMsgDialog from './compontents/errorMsgDialog';
 import imageBtn from './compontents/imageBtn';

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

@@ -63,10 +63,10 @@ export async function UseAuth(context: common.UIAbilityContext): Promise<boolean
     abilityAccessCtrl.createAtManager().requestPermissionsFromUser(context, permissions).then(res => {
       let grantStatus: Array<number> = res.authResults;
       let length: number = grantStatus.length;
+      resolve(true)
       for (let i = 0; i < length; i++) {
         if (grantStatus[i] === 0) {
           // 用户授权，可以继续访问目标操作
-          resolve(true)
         } else {
           reject(false)
           // 用户拒绝授权，提示用户必须授权才能访问当前页面的功能，并引导用户到系统设置中打开相应的权限

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

@@ -20,7 +20,7 @@ import {
   SYSTEMPARMARR
 } from './judgeSDK/api/judgeSDK.d';
 
-import { JudgeConfig } from './judgeSDK/utils/judgeConfig';
+import {JudgeConfig} from"../config"
 
 import SignDisplayCom from './compontents/SignDisplayCom';
 import {

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

@@ -13,7 +13,7 @@ import { CandidateData, EmptyCandidateObject } from '../mock/CandidateData';
 import BoardPrePareSetPopup from './compontents/judge/BoardPrePareSetPopup';
 import LoadingPopup from './compontents/judge/LoadingPopup';
 import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements';
-import { JudgeConfig } from './judgeSDK/utils/judgeConfig';
+
 // import { initJudgeUdp } from '../common/utils/UdpJudge';
 import imageBtn from './compontents/imageBtn';
 import { CryptoJS } from '@ohos/crypto-js';
@@ -45,6 +45,7 @@ import DB from '../utils/DbSql';
 import { CenterUDPBusinessInstance } from '../utils/business/CenterUdpBusiness';
 import { JudgeEmitterInstance } from '../utils/business/UdpEvent';
 import errorMsgDialog from './compontents/errorMsgDialog';
+import { JudgeConfig } from '../config';
 
 @Entry
 @Component

entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets

@@ -1,4 +1,4 @@
-import { JudgeConfig } from '../../judgeSDK/utils/judgeConfig';
+import { JudgeConfig } from "../../../config";
 
 import common from '@ohos.app.ability.common';
 import VoiceAnnounce from '../../judgeSDK/utils/voiceAnnouncements';

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

@@ -9,7 +9,7 @@ import FileModel from './utils/fileModel';
 import FilePhoto from './utils/filePhoto';
 import FileLog from './utils/fileLog';
 import JudgeTask from './utils/judgeTask';
-import { JudgeConfig } from './utils/judgeConfig';
+import { JudgeConfig } from "../../config";
 import { LANE } from '../judgeSDK/api/judgeSDK.d';
 import { GetSyncData, SqlInsertTable } from '../../utils/table/Operation';
 

entry/src/main/ets/pages/judgeSDK/utils/Common.ets

@@ -32,6 +32,9 @@ export function deepClone<T extends  Object>(target: T): T {
 }
 
 export function fillZero(str: string | number, len: number): string {
+  if (!str) {
+    return ""
+  }
   str = str.toString();
   if (str.length >= len || len <= 0) {
     return str;

entry/src/main/ets/pages/judgeSDK/utils/filePhoto.ets

@@ -1,6 +1,6 @@
 import { takePhoto } from '../../../utils/Video';
 import promptAction from '@ohos.promptAction';
-import { JudgeConfig } from './judgeConfig';
+import { JudgeConfig } from "../../../config";
 import FileUtils from '../../../utils/FileUtils';
 import { VideoConfig } from '../../../model/Common';
 import common from '@ohos.app.ability.common';

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

@@ -1,28 +0,0 @@
-//考试回放开关
-export const JudgeConfig = {
-  //本地目录开关
-  isTrajectoryOpen: false,
-  //是否开启拍照
-  isPhotoOpen: true,
-  //扣分语音是否强制开启
-  kfVoiceOpen: false,
-  //忽略的考试项目
-  ignoreProjects:[],
-  // 是否忽略考试前熄火、车门检查
-  isCheckFireOpen: false,
-  //轨迹回放是否开启Udp
-  udpOpen:true,
-  // 本地模型地址
-  modelPath: 'models/model_enc',
-  // 济南科目三
-  trajectoryPath: 'logs/2024_12_26/2024_12_26_14_12_51_2412505941910_370125200404041910_赵宇/judge_exam_data.txt',
-  //四合一画面配置
-  fourInOneScreen:{
-    //gps位数
-    gpsDigit:6
-  },
-  // 杭州科目二
-  // trajectoryPath: 'logs/2024_07_19/0000000000001_342323199501470011_测试学员1_2024_07_19_06_49_12/judge_exam_data.txt',
-  //TODO 济南临时特殊配置
-  systemParamConfig:{}
-}

entry/src/main/ets/utils/business/JudgeUdpBusiness.ets

@@ -1,7 +1,7 @@
 import { CarInfoType, EnvironmentConfigurationType, Gps, Sensor, UDPParamType } from '../../model'
 import { testKm2Items, testKm3Items } from '../../pages/judgeSDK/dataTest';
 import { fillZero, } from '../../pages/judgeSDK/utils/Common';
-import { JudgeConfig } from '../../pages/judgeSDK/utils/judgeConfig';
+import { JudgeConfig } from "../../config";
 import { FillZero, StringToASCII } from '../Common';
 import UdpClient from '../UdpUtils'
 import { CenterUDPBusinessInstance } from './CenterUdpBusiness';