Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev

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

@@ -41,16 +41,16 @@ export async function getliushuiNum(context) {
     // return str
   }
 }
-export async function deleteAllFIleLog(){
+export async function deleteAllFIleLog(path){
   let options = {
     "recursion": false,
     "listNum": 0,
   };
-  let filenames = fs.listFileSync(GlobalConfig.comoonfileWriteAddress+'/PLC/', options);
+  let filenames = fs.listFileSync(path, options);
   console.info("listFile succeed",JSON.stringify(filenames));
   for (let i = 0; i < filenames.length; i++) {
     if(isSevenDaysAgo(filenames[i])){
-      fs.rmdir(GlobalConfig.comoonfileWriteAddress+'/PLC/'+filenames[i], (err) => {
+      fs.rmdir(path+filenames[i], (err) => {
         if (err) {
           console.error("rmdir failed with error message: " + err.message + ", error code: " + err.code);
         } else {
@@ -157,8 +157,9 @@ export async function getDoubleCeneterTable(param) {
 //单中心存表
 export async function getSingleCenterTable(param) {
   return new Promise((reslove, reject) => {
+    try{
       upDataZhongxinginitialization(param).then((result) => {
-      console.log('teststetfinsh01')
+        console.log('teststetfinsh01',result)
 
         if (result) {
           reslove(true)
@@ -194,7 +195,9 @@ export async function getSingleCenterTable(param) {
         reslove(false)
         console.log(error)
       })
-
+    }catch (e){
+      reslove(false)
+    }
   })
 
 }

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

@@ -360,6 +360,7 @@ export async function upDataZhongxinginitialization(param) {
       resolve(flag)
       return
     }
+    try{
       const str = {
         "carId": param.carId, // 表名
         "examinationRoomId": param.examinationRoomId, //考试平台kdid
@@ -372,7 +373,8 @@ export async function upDataZhongxinginitialization(param) {
 
       initialization(str).then(async (res) => {
         console.log('daihai3', JSON.stringify(res))
-      if (!res) {
+        if (!res||res.initializationRsp.head.resultCode==1) {
+          console.log('daihai34', JSON.stringify(res))
           resolve(false)
           return
         }
@@ -396,6 +398,9 @@ export async function upDataZhongxinginitialization(param) {
       }).catch((Error) => {
         resolve(false)
       })
+    }catch (error){
+      resolve(false)
+    }
   })
 }
 

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

@@ -103,12 +103,12 @@ export default class TcpClient {
         }, timeout: 6000
       });
       promise.then(() => {
-
+        console.log('testTagtestTag000',)
         this.tcp.setExtraOptions({
           keepAlive: true,
         }, err => {
           if (err) {
-            console.log('testTagtestTagerrrrr,success')
+            console.log('testTagtestTag000,error')
             if(this.num>3){
               return
             }
@@ -119,7 +119,7 @@ export default class TcpClient {
             return;
           }
         });
-        console.log('testTagtestTagconnect,success')
+        console.log('testTagtestTag000,success')
 
         globalThis.getCloseTcp = false
         resolve(true)
@@ -133,7 +133,7 @@ export default class TcpClient {
           getTCP()
           resolve(false)
         }, 2000)
-        console.log('testTagtestTagconnect,error')
+        console.log('testTagtestTag000,error')
 
       });
     })

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

@@ -78,19 +78,22 @@ export default async function request(req: any) {
                     message: decodeURIComponent(resultMessage),
                     duration: 3000
                 });
-                return
+                return false
             }
         }
         for( let i in res ) {
             resObj = res[i].head
         }
-        console.info('jiangsong:res in request' + url + JSON.stringify(res))
+        console.info('jiangsong:res in request' + url + JSON.stringify(resObj))
         if(resObj.resultCode === '0') {
             return res
         }else {
             globalThis.type='1'
+            if(!host){
                 AppStorage.SetOrCreate('errorMsg', 1);
                 globalThis.title=decodeURIComponent(resObj.resultMessage)
+            }
+
             prompt.showToast({
                 message: decodeURIComponent(resObj.resultMessage),
                 duration: 3000

entry/src/main/ets/entryability/EntryAbility.ts

@@ -30,8 +30,8 @@ export default class EntryAbility extends UIAbility {
         globalThis.hasAuth = false
         // globalThis.version = '2022.08.13.01'
         // globalThis.judgeVersion = '2022.12.05.1'
-        globalThis.version = '2024.11.22.14'
-        globalThis.judgeVersion = '2024.11.22.14'
+        globalThis.version = '2001.11.22.14'
+        globalThis.judgeVersion = '2001.11.22.14'
         globalThis.videoVersion= '1.0'
         // globalThis.version = '2023.12.13.01'
         // globalThis.judgeVersion = '2023.09.30.1'

entry/src/main/ets/pages/ExaminerLogin.ets

@@ -93,6 +93,7 @@ export default struct Index {
                   this.errorDialog.open()
                   this.limit=true
                   console.log('carInfo', JSON.stringify(globalThis.carInfo))
+                  try{
                     examinerLoginService(param).then(res => {
                       console.log('res?.examinerLoginRsp?.head?.resultCode',res?.examinerLoginRsp?.head?.resultCode,JSON.stringify(res))
                       this.errorDialog.close()
@@ -116,7 +117,15 @@ export default struct Index {
                       globalThis.username = this.inputTextArr[0]
                     }).catch(err=>{
                       console.log('jiangsong12',JSON.stringify(err))
+                      this.errorDialog.close()
+                      this.limit=false
                     })
+                  }catch(eroor){
+                    console.log('erroreee')
+                    this.errorDialog.close()
+                    this.limit=false
+                  }
+
                 })
               } else {
                 Image(item).width('18%').height('24%').onClick(() => {

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

@@ -17,6 +17,7 @@ import promptAction from '@ohos.promptAction'
 import { voiceService } from '../common/service/voiceService';
 import errorMsgDialog from './compontents/errorMsgDialog'
 import { getSyncData } from '../common/service/initable';
+import { GlobalConfig } from '../config/index'
 
 @Entry
 @Component
@@ -411,7 +412,7 @@ struct Index {
   }
 
   async initParams() {
-    deleteAllFIleLog()
+    deleteAllFIleLog(GlobalConfig.comoonfileWriteAddress+'/PLC/')
     //设置plc udp 同步requesthost
     await getUDP(this.context, false)
     this.loading = false

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

@@ -79,7 +79,6 @@ struct UserInfo {
   @State Param803Str: string = ''
   private title = ''
   private type = '2'
-
   // 过程照片拍照
   getPhoto = async (empty?: boolean) => {
     const singlePlay = globalThis.singlePlay
@@ -118,6 +117,7 @@ struct UserInfo {
     alignment: DialogAlignment.Center,
   },
   )
+
   async onPageShow() {
     this.updateTimeLimit = false
     this.ksksLimit = false
@@ -226,7 +226,7 @@ struct UserInfo {
           this.stopDeviceById()
           // globalThis.statue=4
           router.pushUrl({
-            url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge',
+            url: examSubject == 3 ? 'pages/c' : 'pages/Judge',
             params: {
               sczb: Number(this.isBoardPrePareSetPopupOpen),
               kfdm: this.sczbkf,
@@ -464,6 +464,7 @@ struct UserInfo {
     this.errorDialog.open()
     this.updateTimeLimit = true
     const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId + globalThis.carInfo.examinationRoomId + globalThis.username)}</checkCode></head><body><carId>${globalThis.carInfo.carId}</carId><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName></body></getExaminationStudentInfoReq>`
+    try {
       getExaminationStudentInfo(param).then(async (res) => {
         this.errorDialog.close()
         setTimeout(() => {
@@ -518,8 +519,14 @@ struct UserInfo {
         })
       }).catch((error) => {
         this.updateTimeLimit = false
+        this.errorDialog.close()
         console.log('error12error' + error)
       })
+    } catch (error) {
+      this.updateTimeLimit = false
+      this.errorDialog.close()
+      console.log('error14error' + error)
+    }
   }
 
   qkFn() {
@@ -1088,7 +1095,11 @@ struct LabelBlock {
     Row() {
       Text(this.label).fontSize(20 * this.ratio).fontColor('#99948A')
       Row() {
-        Text(decodeURIComponent(this.value)).fontColor('#fff').textAlign(TextAlign.Center).width('100%').fontSize(18 * this.ratio)
+        Text(decodeURIComponent(this.value))
+          .fontColor('#fff')
+          .textAlign(TextAlign.Center)
+          .width('100%')
+          .fontSize(18 * this.ratio)
       }
       .commLabelStyle()
     }.margin({ bottom: 10 * this.ratio })

entry/src/main/ets/workers/worker.ts

@@ -30,8 +30,9 @@ workerPort.onmessage = (e: MessageEvents): void => {
   console.log('baoyihu,onmessage',JSON.stringify(param))
   if(param.mode=='1'){
     //单中心
+    try{
       getSingleCenterTable(param).then((ret) => {
-      console.log('teststetfinsh1')
+        console.log('teststetfinsh1',ret)
         if (ret) {
           workerPort.postMessage({ isComplete: true });
         }else{
@@ -39,6 +40,10 @@ workerPort.onmessage = (e: MessageEvents): void => {
 
         }
       })
+    }catch(error){
+      workerPort.postMessage({ isComplete: false });
+    }
+
   }else if(param.mode=='3'){
     //双中心
     getDoubleCeneterTable(param).then((ret)=>{