Merge remote-tracking branch 'outer/代理服务方案' into 代理服务方案

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

@@ -50,7 +50,7 @@ export async function startRecordVideo(param, td, context, dir, path?, index?) {
       if (!path) {
         fileName = `${date}_movie_record${num}.mp4`
       } else {
-        fileName = `${date}_${path}_${index || num}.mp4`
+        fileName = `${date}_${path}_${index || num}_${num}.mp4`
       }
 
       // @ts-ignore

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

@@ -89,6 +89,7 @@ struct UserInfo {
     'Param830Str': '0', //同一学员连续第二次考试时不再验证身份
     'Param364': '0', //考前上车准备
     'Param398': '0', //考前上车准备
+    'Param835': '0', //考前上车准备
   }
   @State startExam: boolean = false
   // 过程照片拍照
@@ -159,6 +160,7 @@ struct UserInfo {
       cancel: () => {
       },
       confirm: () => {
+        this.prePareExam()
       }
     }),
     customStyle: true,
@@ -535,6 +537,10 @@ struct UserInfo {
         if (sys.v_no === '770') {
           that.systemParam.Param770Str = sys.v_value;
         }
+        //考试预约次数判断
+        if (sys.v_no === '835') {
+          that.systemParam.Param835 = sys.v_value;
+        }
         // 开始考试前必须解开安全带或关车门
         if (sys.v_no === '803') {
           that.systemParam.Param803Str = sys.v_value + '';
@@ -1273,6 +1279,14 @@ struct UserInfo {
                 if (this.systemParam.Param612Str == '1') {
                   return
                 }
+                //835参数值和预约考试次数对比
+                if(Number(this.systemParam.Param835)<=Number(this.currentUser.yycs)){
+                  this.type='3'
+                  this.title='当前考生预约考试次数为'+this.currentUser.yycs
+                  this.errorDialog.open()
+                  return
+                }
+
                 await this.prePareExam()
               })
           }
@@ -1428,4 +1442,5 @@ type systemParam = {
   'Param830Str': string, //同一学员连续第二次考试时不再验证身份
   'Param364': string, //考前上车准备
   'Param398': string, //考前上车准备
+  'Param835' :string
 }