Merge branch 'dev' into lv_chengmai

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.projectsObj[no2*1].isUpload = true
-          // this.ddxkKsxmArr.push(txt2)
+          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 ddxkKsxmArr: string[] = []
-  @State ddxkKfArr: 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/UserInfo.ets

@@ -609,8 +609,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){