夜考

build-profile.json5

@@ -5,9 +5,9 @@
         "name": "default",
         "material": {
           "certpath": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.cer",
-          "storePassword": "0000001B2A00299F2F964B3C04F19B0796024C495343D6FF2CE368715D6364C2B6AD2BD37913CAA61F8E45",
+          "storePassword": "0000001B70DEAAC59CE48370ACDCBC340EC0C7617A8B95FA534141A29AC8F9AFE528874A2A8ADAA079D26F",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001B8D03DE7F46ED71467CD089AB5A788EEDCDD4781FAF40D175CD76F1ED2508E09C2AEBD90F0E9729",
+          "keyPassword": "0000001B50E66320DF9600EA16E69B46A1A500D13C7F01A10918A4D81185C9DD620698CDC794F58C03546E",
           "profile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p7b",
           "signAlg": "SHA256withECDSA",
           "storeFile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p12"

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

@@ -292,17 +292,23 @@ struct Index {
       if (this.mode === 2) {
         if (carNo !== '' && no1 == 3 && no2 == Number(carNo) && no3 == 46) {
           allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '')
-          console.info('surenjun', JSON.stringify(allItems))
         }
       } else {
         if (carNo !== '' && no1 == 3 && no2 == Number(carNo) && no3 == 10) {
           allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '')
-          console.info('surenjun', JSON.stringify(allItems))
         }
       }
+      console.info('lixiao', JSON.stringify(allItems))
 
-      if (examSubject == 3 && no1 == 6) {
+      if (no1 == 6) {
         const name = decodeURI(systemParm.txt1)
+        let isRequired = allItems.includes(no2 + '')
+        if (no2 == 14) {
+          isRequired = false
+        }
+        if (no2 == 13 && this.mode === 1) {
+          isRequired = false
+        }
         const currentProject: Project = {
           name,
           abbreviation: decodeURI(systemParm.txt3),
@@ -310,13 +316,18 @@ struct Index {
           projectCodeCenter: txt2,
           // 是否是必考  加减档设置成非必考
           // 白考夜间行驶非必考
-          isRequired: (no2 == 14 || (this.mode === 1 && no2 == 17)) ? false : allItems.includes(no2 + ''),
+          isRequired,
           //是否考过了
-          isEnd: false,
+          isEnd: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'),
           //项目开始数据是否上传过
-          isUpload: false,
+          isUpload: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'),
         }
         this.projectsObj[no2*1] = currentProject
+        if (this.mode === 2) {
+          let type: '2' | '3' = (no2 == 13 && this.kssycs != '1') ? '2' : '3'
+          console.log('lixiao no2 type', no2, type)
+          this.projectsObj[no2*1].type = type
+        }
         this.projectsCenterObj[txt2] = currentProject
         this.projects.push(currentProject);
 

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

@@ -437,6 +437,8 @@ struct UserInfo {
   }
 
   async getExamMode(kStringArr: string[]) {
+    // this.mode = 2
+    // return
     // @ts-ignore
     // 满分学习
     if (this.currentUser.czlx === 1) {
@@ -945,15 +947,15 @@ struct UserInfo {
       console.log("lixiao kStringArr", JSON.stringify(kStringArr))
       await this.getExamMode(kStringArr)
       console.log("lixiao model", this.mode)
-      if (this.mode === 2 && !examItems?.getExaminationItemRsp?.body?.jdxx) {
-        promptAction.showToast({
-          message: "当前尚未进行白考，无法开始夜考!"
-        })
-        this.updateTimeLimit = false
-        this.stopDeviceById()
-        this.stepFlag = false
-        return
-      }
+      // if (this.mode === 2 && !examItems?.getExaminationItemRsp?.body?.jdxx) {
+      //   promptAction.showToast({
+      //     message: "当前尚未进行白考，无法开始夜考!"
+      //   })
+      //   this.updateTimeLimit = false
+      //   this.stopDeviceById()
+      //   this.stepFlag = false
+      //   return
+      // }
       router.pushUrl({
         url: 'pages/Judge',
         params: {

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

@@ -776,7 +776,8 @@ export default class Judge {
       ksyy: '',
       kscx: carType,
       kkcs: Number(kssycs) || 2,
-      sfyk: this.judgeUI.mode === 2 ? 1 : 0,
+      // sfyk: this.judgeUI.mode === 2 ? 1 : 0,
+      sfyk: 1,
       ykkkcs: 1,
       wayno: judgeUI.wayno * 1,
       czlx: 0,
@@ -805,7 +806,8 @@ export default class Judge {
       sczb: (sczb === undefined || sczb == 0) ? 0 : 1,
       sczbkf: kfdm,
       // 大车是否模拟灯光参数
-      dmndg: this.judgeUI.mode === 3,
+      // dmndg: this.judgeUI.mode === 3,
+      dmndg: false,
       // dmndg: this.judgeUI.mode === 3,
       // 是否满分学习
       mfxx: this.judgeUI.mode === 5,
@@ -820,6 +822,7 @@ export default class Judge {
   //处理评判过程回调
   handleRealExam = async (strData, callBack) => {
     let examData: EXAMDATA = JSON.parse(strData);
+    console.log("lixiao callback", strData)
     const {getDqxmStr,getKfStr,goJudgeVoice,setMndg,avPlayer,fileLog,judgeUI} = this;
     const {carzt,xmks,kf,event,xmjs,xmqx,ksjs,sound,mndg,lane,precast,nongps} = examData
     const param512 = (judgeUI.judgeConfigObj['512'] || '').split(',');