From 8e8afd92db9edf3d50d7d80e02c8856ce6e8cef6 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Fri, 23 Feb 2024 10:03:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/mock/CandidateData.ts | 399 +++++++++++++---------- entry/src/main/ets/pages/UserInfo.ets | 157 +-------- entry/src/main/ets/pages/interfaces.ts | 23 ++ 3 files changed, 257 insertions(+), 322 deletions(-) diff --git a/entry/src/main/ets/mock/CandidateData.ts b/entry/src/main/ets/mock/CandidateData.ts index 63adf99..1691fc6 100644 --- a/entry/src/main/ets/mock/CandidateData.ts +++ b/entry/src/main/ets/mock/CandidateData.ts @@ -1,4 +1,5 @@ -export const CandidateData = [ + +export const CandidateData: Array = [ { sfzmhm: '342323199501470011', xm: '测试学员1', @@ -19,13 +20,225 @@ export const CandidateData = [ xb: '', xh: '', xldm: '', - yycs: '' - }, { - sfzmhm: '341182199308155624', - xm: '测试学员2', - lsh: '0000000000002', - ksy1: '考试员2', - id: '002', + yycs: '', + ksy2sfzmhm: "", + + }, + { + sfzmhm: '341182199308155624', + xm: '测试学员2', + lsh: '0000000000002', + ksy1: '考试员2', + id: '002', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "", + }, + { + sfzmhm: '3423231995014700003', + xm: '测试学员3', + lsh: '0000000000003', + ksy1: '考试员2', + id: '002', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "", + }, + { + sfzmhm: '3423231995014700004', + xm: '测试学员4', + lsh: '0000000000004', + ksy1: '考试员2', + id: '002', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "", + }, + { + sfzmhm: '3423231995014700005', + xm: '测试学员5', + lsh: '0000000000004', + ksy1: '考试员2', + id: '002', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "", + }, + { + sfzmhm: '342323199501470016', + xm: '测试学员6', + lsh: '0000000000005', + ksy1: '考试员1', + id: '001', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "", + }, + { + sfzmhm: '3423231995014700007', + xm: '测试学员7', + lsh: '0000000000007', + ksy1: '考试员2', + id: '002', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "", + }, + { + sfzmhm: '3423231995014700008', + xm: '测试学员8', + lsh: '0000000000008', + ksy1: '考试员2', + id: '002', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "" + }, + { + sfzmhm: '3423231995014700009', + xm: '测试学员9', + lsh: '0000000000009', + ksy1: '考试员2', + id: '002', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "" + }, + { + sfzmhm: '34232319950147000010', + xm: '测试学员10', + lsh: '002', + ksy1: '考试员2', + id: '0000000000010', + kszp: '', + ksmjzp: '', + bz1: '', + jxmc: '', + kchp: '', + kscx: '', + ksdd: '', + kssycs: '', + ksxl: '', + ksy1sfzmhm: '', + kszt: '', + xb: '', + xh: '', + xldm: '', + yycs: '', + ksy2sfzmhm: "", + }] + +export const EmptyCandidateObject = { + ksy2sfzmhm: "", + sfzmhm: '', + xm: '', + lsh: '', + ksy1: '', + id: '', kszp: '', ksmjzp: '', bz1: '', @@ -41,172 +254,4 @@ export const CandidateData = [ xh: '', xldm: '', yycs: '' -}, { - sfzmhm: '3423231995014700003', - xm: '测试学员3', - lsh: '0000000000003', - ksy1: '考试员2', - id: '002', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}, { - sfzmhm: '3423231995014700004', - xm: '测试学员4', - lsh: '0000000000004', - ksy1: '考试员2', - id: '002', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}, { - sfzmhm: '3423231995014700005', - xm: '测试学员5', - lsh: '0000000000004', - ksy1: '考试员2', - id: '002', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}, { - sfzmhm: '342323199501470016', - xm: '测试学员6', - lsh: '0000000000005', - ksy1: '考试员1', - id: '001', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}, { - sfzmhm: '3423231995014700007', - xm: '测试学员7', - lsh: '0000000000007', - ksy1: '考试员2', - id: '002', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}, { - sfzmhm: '3423231995014700008', - xm: '测试学员8', - lsh: '0000000000008', - ksy1: '考试员2', - id: '002', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}, { - sfzmhm: '3423231995014700009', - xm: '测试学员9', - lsh: '0000000000009', - ksy1: '考试员2', - id: '002', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}, { - sfzmhm: '34232319950147000010', - xm: '测试学员10', - lsh: '002', - ksy1: '考试员2', - id: '0000000000010', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' -}] \ No newline at end of file +} \ No newline at end of file diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 82391d6..bf325cb 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -11,38 +11,14 @@ import { initJudgeUdp } from '../common/utils/UdpJudge' import { writeObjectOut } from '../api/judge' import testNapi from "@ohos.idcard"; import common from '@ohos.app.ability.common'; -import { VideoConfig } from './interfaces' +import { VideoConfig, User } from './interfaces' import WebRTCVoice from './webRTC/' import promptAction from '@ohos.promptAction' -import { CandidateData } from "../mock/CandidateData" - -export interface User { - sfzmhm: string - xm: string - lsh: string - ksy1: string - id: string - kszp: string - ksmjzp: string - bz1: string - jxmc: string - kchp: string - kscx: string - ksdd: string - kssycs: string - ksxl: string - ksy1sfzmhm: string - kszt: string - xb: string - xh: string - xldm: string - yycs: string - ksy2sfzmhm: string -} +import { CandidateData, EmptyCandidateObject } from "../mock/CandidateData" @Entry @Component -struct Index { +struct UserInfo { @State pageIndex: number = 0 @State ratio: number = 850 / 960 @State index: number = 0 @@ -58,31 +34,9 @@ struct Index { @State url: string = '' @State lsh: string = '' @State qkFlag: boolean = false - @State currentUser: User = { - sfzmhm: '', - xm: '', - lsh: '', - ksy1: '', - id: '', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '', - ksy2sfzmhm: '' - } - @State dataList: Array = [] - @State list: Array = [] + @State currentUser: User = EmptyCandidateObject + @State dataList: Array = [] + @State list: Array = [] @State param: VideoConfig = { spls: '', faceFlag: false, @@ -135,29 +89,7 @@ struct Index { this.lsh = '0000000000000' this.callBackFlag = false globalThis.lsh = this.lsh - this.currentUser = { - ksy2sfzmhm: '', - sfzmhm: '', - xm: '', - lsh: '', - ksy1: '', - id: '', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' - } + this.currentUser = EmptyCandidateObject globalThis.statue = 2 this.numCount = 0 globalThis.udpClient2 && globalThis.udpClient2.onMessage((val) => { @@ -167,6 +99,7 @@ struct Index { this.getqkFn() this.signNum = val.body[1] } + } else if (val.id == '42') { console.log('qkfnqkfn', val.body[0]) this.qkFn() @@ -181,7 +114,7 @@ struct Index { } else { console.error("zzctest Failed to Open Device"); } - + // 如果是单机模式则模拟假数据 if (globalThis.singlePlay) { // TODO 模拟假数据 this.list = CandidateData @@ -432,29 +365,7 @@ struct Index { getExaminationStudentInfo(param).then(res => { if (!res) { this.dataList = [] - this.currentUser = { - ksy2sfzmhm: "", - sfzmhm: '', - xm: '', - lsh: '', - ksy1: '', - id: '', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' - } + this.currentUser = EmptyCandidateObject console.log('currentUser', JSON.stringify(this.currentUser)) this.errorMsg = decodeURI(res.getExaminationStudentInfoRsp.head.resultMessage) return @@ -486,29 +397,7 @@ struct Index { if (this.dataList.length) { this.currentUser = this.dataList[0] } else { - this.currentUser = { - ksy2sfzmhm: '', - sfzmhm: '', - xm: '', - lsh: '', - ksy1: '', - id: '', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' - } + this.currentUser = EmptyCandidateObject } this.lsh = this.currentUser.lsh @@ -590,29 +479,7 @@ struct Index { if (res.examinationStuAbsentRsp.head.resultCode == '0') { this.pageIndex = 0 this.qkFlag = false - this.currentUser = { - ksy2sfzmhm: '', - sfzmhm: '', - xm: '', - lsh: '', - ksy1: '', - id: '', - kszp: '', - ksmjzp: '', - bz1: '', - jxmc: '', - kchp: '', - kscx: '', - ksdd: '', - kssycs: '', - ksxl: '', - ksy1sfzmhm: '', - kszt: '', - xb: '', - xh: '', - xldm: '', - yycs: '' - } + this.currentUser = EmptyCandidateObject this.getExaminationStudentInfoFn() return } diff --git a/entry/src/main/ets/pages/interfaces.ts b/entry/src/main/ets/pages/interfaces.ts index def0446..16764a2 100644 --- a/entry/src/main/ets/pages/interfaces.ts +++ b/entry/src/main/ets/pages/interfaces.ts @@ -1,4 +1,27 @@ +export interface User { + sfzmhm: string + xm: string + lsh: string + ksy1: string + id: string + kszp: string + ksmjzp: string + bz1: string + jxmc: string + kchp: string + kscx: string + ksdd: string + kssycs: string + ksxl: string + ksy1sfzmhm: string + kszt: string + xb: string + xh: string + xldm: string + yycs: string + ksy2sfzmhm: string +} export interface VideoConfig{ videoNum?:string, spls:string