外殼

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

@@ -49,6 +49,8 @@ export async function deleteAllFIleLog(path){
   let filenames = fs.listFileSync(path, options);
   console.info("listFile succeed",JSON.stringify(filenames));
   for (let i = 0; i < filenames.length; i++) {
+    console.info("listFile succeed",JSON.stringify(filenames[i]));
+
     if(isSevenDaysAgo(filenames[i])){
       fs.rmdir(path+filenames[i], (err) => {
         if (err) {
@@ -65,10 +67,11 @@ export async function deleteAllFIleLog(path){
 function isSevenDaysAgo(date) {
   const today = new Date(); // 当前日期
   const target = new Date(date); // 需要判断的日期
+  console.info("listFile succeed1",JSON.stringify(target));
 
   const diff = today.getTime() - target.getTime(); // 计算两个日期之间的毫秒数差异
   const diffDays = diff / (1000 * 60 * 60 * 24); // 将毫秒转换为天数
-
+  console.info("listFile succeed2",JSON.stringify(diffDays));
   // 如果差异天数正好是7，则原日期是当前日期的前七天
   return diffDays > 7;
 }

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

@@ -303,9 +303,9 @@ export default class UdpClientByCenter {
       if (strachArr[0] != '#DN_GD') {
         return
       }
-      console.log(`${TAG} udp222 on message array buffer:${str}`);
 
       strachArr[28] = globalThis.chuankoMsg || strachArr[28]
+      console.log(`${TAG} udp222 on message array buffer:${str}`);
 
       // this.stashFn(str)
       const newArr = JSON.parse(JSON.stringify(strachArr))
@@ -316,6 +316,7 @@ export default class UdpClientByCenter {
       if(strachArr[83]!='4'){
         this.chafenFlag++
         if(this.chafenFlag>=15&&!globalThis.dialogOpen){
+          getUDP(globalThis.context,true)
           globalThis.title='差分状态异常'
           globalThis.type='3'
           AppStorage.SetOrCreate('errorMsg', 1);

entry/src/main/ets/mock/CandidateData.ts

@@ -97,7 +97,7 @@ export const CandidateData: Array<User> = [
   {
     sfzmhm: '3423231995014700005',
     xm: '测试学员5',
-    lsh: '0000000000004',
+    lsh: '0000000000005',
     ksy1: '考试员2',
     id: '002',
     kszp: '',
@@ -120,7 +120,7 @@ export const CandidateData: Array<User> = [
   {
     sfzmhm: '342323199501470016',
     xm: '测试学员6',
-    lsh: '0000000000005',
+    lsh: '0000000000006',
     ksy1: '考试员1',
     id: '001',
     kszp: '',
@@ -212,7 +212,7 @@ export const CandidateData: Array<User> = [
   {
     sfzmhm: '34232319950147000010',
     xm: '测试学员10',
-    lsh: '002',
+    lsh: '0000000000009',
     ksy1: '考试员2',
     id: '0000000000010',
     kszp: '',

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

@@ -294,13 +294,17 @@ struct Index {
         this.projectsObj[no2*1] = currentProject
         this.projectsCenterObj[txt2] = currentProject
         this.projects.push(currentProject);
+        console.info('surenjun txt2=>',txt2)
+        //真实监管下发考试项目
         if(isInExam && !kStringArr.includes(txt2)){
           this.projectsObj[no2*1].type = '3'
-
-          // this.ddxkKsxmArr.push(txt2)
+          this.projectsObj[no2*1].isUpload = true
+          this.projectsObj[no2*1].isEnd = true
+          this.isDdxk = true
+          this.ddxkKsxmArr.push(txt2)
+        }
       }
 
-      }
       this.systemparmArr.push({
         'NO1': no1 * 1,
         'NO2': no2 * 1,
@@ -311,6 +315,8 @@ struct Index {
       })
     })
     const projects = this.projects;
+    console.info('surenjun',JSON.stringify(this.ddxkKsxmArr))
+
     if (!projects.length) {
       Prompt.showToast({
         message: '读取数据库信息失败，请重新联网更新！',
@@ -1163,8 +1169,8 @@ struct Index {
   //科目类型
   @State examSubject: 2 | 3 = 3;
   @State ddxkTime: number = 0;
-  @State ddxkKsxmArr: string[] = ['']
-  @State ddxkKfArr: string[] = ['']
+  @State ddxkKsxmArr: string[] = []
+  @State ddxkKfArr: string[] = []
   @State xmmcStr: string = ''
   @State carztStr: string = ''
   @State kfArr: {

entry/src/main/ets/pages/Roads.ets

@@ -98,8 +98,6 @@ export default struct Index {
         sczb,
         kfdm,
         wayno,
-        //TODO 真实监管项目
-        // kString:'40200,40300,40400,40500,40700,41000,41100,41200,41300,41400,40600,41500,41700,40400,40800,40900'
       }
     }, router.RouterMode.Single);
 

entry/src/main/ets/pages/TerminalInfos.ets

@@ -12,6 +12,7 @@ import { GlobalConfig } from '../config';
 @Entry
 @Component
 struct Index {
+
   @State textList1: string[] = ['差分服务器Ip','响应端口','中心服务器IP','响应端口', '子网掩码','默认网关','dns','后置机IP ', '响应端口','前置机IP','本地端口']
   // @State textList2: string[] = []
   @State ratio: number = 1700 / 960

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

@@ -132,6 +132,7 @@ struct UserInfo {
     // this.openDeviceByIDCard()
     const routerParam = router.getParams() || { type: 0 };
     console.log('routerParam', JSON.stringify(routerParam))
+
     if (!globalThis.singlePlay) {
       // @ts-ignore
       if (routerParam.type != 1) {
@@ -147,8 +148,8 @@ struct UserInfo {
               this.getCurrentStudent(res.sfzmhm)
             }
           })
-
-        } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
+        }
+        else if (user && (user.kssycs == '0' || user.kssycs == '')) {
           console.log('datadatadatadata')
           this.list = this.list.filter(res => {
             return res.sfzmhm != user.sfzmhm
@@ -226,7 +227,7 @@ struct UserInfo {
           this.stopDeviceById()
           // globalThis.statue=4
           router.pushUrl({
-            url: examSubject == 3 ? 'pages/c' : 'pages/Judge',
+            url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge',
             params: {
               sczb: Number(this.isBoardPrePareSetPopupOpen),
               kfdm: this.sczbkf,
@@ -460,6 +461,7 @@ struct UserInfo {
       return
     }
     await upDateTableByArray('USER', [])
+    await upDateTableByArray('USERLIST', [])
     this.type = '2'
     this.errorDialog.open()
     this.updateTimeLimit = true
@@ -609,8 +611,9 @@ struct UserInfo {
     const avPlayer = this.avPlayer;
     this.isLoadingPopupVisible = true
     avPlayer.playAudio([`voice/监管通信中.mp3`], false, async () => {
-      //TODO 模拟
+      console.info('surenjun','播放结束开始考试接口调用')
       const {code,keystr,message} = await this.beginExam();
+      console.info('surenjun','开始考试接口调用结束')
       //@ts-ignore TODO code转换
       if (code == '' && code == undefined) {
         promptAction.showToast({

entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts

@@ -10,6 +10,8 @@ export interface Project {
   //项目状态：未做 正在做 及格 不及格
   type?: '1' | '2' | '3' | '4'
   //
+  isEnd:boolean,
+  isUpload:boolean
 }
 
 export interface MarkRule {
@@ -207,5 +209,3 @@ export interface LANE {
 export interface ProjectObj {
   [k: string]: Project
 }
-
-

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

@@ -266,7 +266,8 @@ export default class Judge {
       //断点续考
       ddxk: isDdxk ? 1 : 0,
       ddkssj: ddxkTime || 0,
-      ykxm: isDdxk ? (ddxkKsxmArr?.map(projectCenterCode => (projectsCenterObj[projectCenterCode]?.projectCode) * 1)) : [],
+      ykxm: isDdxk
+        ? (ddxkKsxmArr?.map(projectCenterCode => (projectsCenterObj[projectCenterCode]?.projectCode) * 1)) : [],
       kfxm: isDdxk ? (ddxkKfArr?.map(kf => {
         const [xmdm, kfdm] = kf.split(',')
         return {

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

@@ -153,7 +153,7 @@ export function getKmProjectCancelVoice(projectCode){
 }
 // 上传监管数据code转换
 export function promptWxCode(
-    jkid:'17C52' | '17C54' |'17C55' | '17C53' | '17C56',
+  jkid:'17C51'|'17C52' | '17C54' |'17C55' | '17C53' | '17C56',
   code:number
 ){
   let toast = '';
@@ -163,6 +163,21 @@ export function promptWxCode(
     return
   }
   switch (jkid){
+  //考试开始
+    case '17C51':
+      switch (code){
+        case -1:toast = '无预约信息';break;
+        case -2:toast = '约考不是今天';break;
+        case -2:toast = '已满当天允许考试次数';break;
+        case -2:toast = '考生身份不合法';break;
+        case -2:toast = '科目考试系统不合法';break;
+        case -2:toast = '无考生分组信息';break;
+        case -2:toast = '分组考官和考生不四配';break;
+        case -8:toast = '考场信息合法';break;
+        case -9:toast = '考试员信息不合法';break;
+        case -10:toast = '科目考试系统时间不合法';break;
+        case -90:toast = '已进行了考试身份验证，无需重复验证!';break;
+      }
 
   //项目开始
     case '17C52':

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

@@ -101,6 +101,7 @@ class AVPlayer {
       })
       return new Promise(async (resolve)=>{
         audioPlayer.on('finish', () => {
+          console.info(TAG,'audioPlayer => 播放资源播放')
           //@ts-ignore
           this.voiceStatus = 'completed'
           if(callback){