From 0f564b746a457ce021f9ba1895305e9c68df17d5 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Tue, 25 Mar 2025 09:25:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0ExaminationStuAbsentP?= =?UTF-8?q?arams=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BC=BA?= =?UTF-8?q?=E8=80=83=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/api/userInfo.ets | 20 +++++++++++++++++--- entry/src/main/ets/model/api.ets | 7 +++++++ entry/src/main/ets/pages/Index.ets | 4 ++-- entry/src/main/ets/pages/UserInfo.ets | 12 +++++++++--- entry/src/main/ets/pages/VideoConfig.ets | 4 ++-- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/entry/src/main/ets/api/userInfo.ets b/entry/src/main/ets/api/userInfo.ets index 058ba309..20dd89a3 100644 --- a/entry/src/main/ets/api/userInfo.ets +++ b/entry/src/main/ets/api/userInfo.ets @@ -1,6 +1,11 @@ import request from '../utils/Request' import http from '@ohos.net.http' -import { FaceCompareResp, GetExaminationItemRsp, GetExaminationStudentInfoResponse } from '../model' +import { + ExaminationStuAbsentParams, + FaceCompareResp, + GetExaminationItemRsp, + GetExaminationStudentInfoResponse +} from '../model' /** * 照片比对 @@ -49,10 +54,19 @@ export async function getExaminationStudentInfo(params: ESObject) { } //缺考 -export async function examinationStuAbsent(params: object) { +export async function examinationStuAbsent(params: ExaminationStuAbsentParams) { return request({ url: '/der2/services/exam/examinationStuAbsent.ws', - data: params, + data: ` + + + ${params.carId} + ${params.sfzmhm} + ${params.examinationRoomId} + ${params.username} + ${params.lsh} + + `, method: http.RequestMethod.POST, xml: true }) diff --git a/entry/src/main/ets/model/api.ets b/entry/src/main/ets/model/api.ets index dedb7fc7..106c8ca5 100644 --- a/entry/src/main/ets/model/api.ets +++ b/entry/src/main/ets/model/api.ets @@ -177,4 +177,11 @@ interface GetExaminationItemRspBody { ykxx: string; } +export interface ExaminationStuAbsentParams { + carId: string; + sfzmhm: string; + examinationRoomId: string; + username: string; + lsh: string; +} diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 731145dd..e433946d 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -12,7 +12,6 @@ import { setliushuiNum, takePhotoFn } from '../common/service/indexService'; import promptAction from '@ohos.promptAction'; import errorMsgDialog from './compontents/errorMsgDialog'; import GetDistance from '../common/utils/GetDistance'; -import { delPic } from '../service/videoService'; import imageBtn from './compontents/imageBtn'; import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; import { BaseInfoType } from '../model/Common'; @@ -21,6 +20,7 @@ import { InitializeTheCentralTableType, MASYSSETTableType, TimeInfo } from '../m import { GetCarInfo, GetDeviceInfo, SetCurrentTime, UseAuth } from './Index/utils'; import { GetSyncData, InitializeTheCentralTable } from '../utils/table/Operation'; import { BusinessError } from '@ohos.base'; +import { delPic } from '../utils/Video'; @Entry @@ -465,7 +465,7 @@ struct Index { // setVideoParam() console.log('diyidiy') this.context.resourceManager.getRawFileContent("welcome.wav") - .then(value => { + .then(() => { this.avPlayer.playAudio(['welcome.wav']) // this.vocObj.playAudio({ diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 8ac5f893..79f95760 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -2,7 +2,7 @@ import { examinationStuAbsent, getExaminationItem, getExaminationStudentInfo } f import router from '@ohos.router'; import TopLogo from './compontents/TopLogo'; import Md5 from '../common/utils/md5'; -import { dateFormat, getCurrentHourTime, getCurrentTime, string2Bytes } from '../common/utils/tools'; +import { dateFormat, getCurrentTime, string2Bytes } from '../common/utils/tools'; import FaceCompare from './compontents/FaceCompare'; import { writeObjectOut } from '../api/judge'; import testNapi from '@ohos.idcard'; @@ -25,6 +25,7 @@ import { BeginExamRequest, CarInfoType, DrvexamType, + ExaminationStuAbsentParams, ExaminerLoginInfo, GetExaminationItemRsp, IdCard, @@ -788,8 +789,13 @@ struct UserInfo { return } console.log('JsonJson', JSON.stringify(this.currentUser)) - const param = - `${this.carInfo.carId}${this.currentUser.sfzmhm}${this.carInfo.examinationRoomId}${this.examinerLoginInfo.username}${this.lsh}` + const param: ExaminationStuAbsentParams = { + carId: this.carInfo.carId, + sfzmhm: this.currentUser.sfzmhm, + examinationRoomId: this.carInfo.examinationRoomId, + username: this.examinerLoginInfo.username, + lsh: this.lsh + } console.log('carNo1111', param) examinationStuAbsent(param).then(res => { diff --git a/entry/src/main/ets/pages/VideoConfig.ets b/entry/src/main/ets/pages/VideoConfig.ets index 0dba008d..3d1f9914 100644 --- a/entry/src/main/ets/pages/VideoConfig.ets +++ b/entry/src/main/ets/pages/VideoConfig.ets @@ -2,10 +2,10 @@ import TopLogo from './compontents/topLogo'; import FileUtil from '../common/utils/File'; import common from '@ohos.app.ability.common'; import promptAction from '@ohos.promptAction'; -import { endRecordVideo, startRecordVideo, takePhoto } from '../service/videoService'; import { GlobalConfig } from '../config/index'; import { VideoConfigData } from '../mock'; import { CommonType, RecordHandleType, VideoConfig, VideoItemType } from '../model'; +import { endRecordVideo, startRecordVideo, takePhoto } from '../utils/Video'; @Entry @Component @@ -583,7 +583,7 @@ struct Index { } aboutToAppear() { - const radio=AppStorage.get('ratio') as number + const radio = AppStorage.get('ratio') as number this.ratio = radio this.openFlag = true const fileUtil = new FileUtil(this.context)