错误修改
This commit is contained in:
parent
365199bf28
commit
c693ccd5f8
@ -10,7 +10,6 @@
|
|||||||
"packages": {
|
"packages": {
|
||||||
"libjudgesdk.so@src/cpp/libJudgeSdk": {
|
"libjudgesdk.so@src/cpp/libJudgeSdk": {
|
||||||
"name": "libjudgesdk.so",
|
"name": "libjudgesdk.so",
|
||||||
"version": "1.0.0",
|
|
||||||
"resolved": "src/cpp/libJudgeSdk",
|
"resolved": "src/cpp/libJudgeSdk",
|
||||||
"registryType": "local"
|
"registryType": "local"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -112,7 +112,7 @@ export interface CarInfoType {
|
|||||||
examinationRoomId?: string;
|
examinationRoomId?: string;
|
||||||
plateNo?: string;
|
plateNo?: string;
|
||||||
carNo?: string;
|
carNo?: string;
|
||||||
examSubject: string;
|
examSubject?: string;
|
||||||
isNeedCheck?: string;
|
isNeedCheck?: string;
|
||||||
udpAddress?: string
|
udpAddress?: string
|
||||||
messagePort?: string
|
messagePort?: string
|
||||||
|
|||||||
@ -120,7 +120,6 @@ struct Index {
|
|||||||
@State isDeductedPopShow: boolean = false
|
@State isDeductedPopShow: boolean = false
|
||||||
@State isAmplifyPopShow: boolean = false
|
@State isAmplifyPopShow: boolean = false
|
||||||
@State amplifiedImgIndex: number = 0
|
@State amplifiedImgIndex: number = 0
|
||||||
judge: Judge
|
|
||||||
//行驶距离
|
//行驶距离
|
||||||
@State jl: number = 0
|
@State jl: number = 0
|
||||||
//应考里程
|
//应考里程
|
||||||
@ -162,6 +161,7 @@ struct Index {
|
|||||||
@State isErrorMsgEnd: boolean = false
|
@State isErrorMsgEnd: boolean = false
|
||||||
@State disConnectErrorOpen: boolean = false
|
@State disConnectErrorOpen: boolean = false
|
||||||
public context = getContext(this) as common.UIAbilityContext;
|
public context = getContext(this) as common.UIAbilityContext;
|
||||||
|
private judge: Judge = new Judge(this)
|
||||||
|
|
||||||
async aboutToDisappear() {
|
async aboutToDisappear() {
|
||||||
clearInterval(this.mileageTimer)
|
clearInterval(this.mileageTimer)
|
||||||
@ -185,8 +185,7 @@ struct Index {
|
|||||||
//断点续考
|
//断点续考
|
||||||
await this.goDdxkItems()
|
await this.goDdxkItems()
|
||||||
//初始化评判
|
//初始化评判
|
||||||
const judge = await this.initJudge();
|
await this.initJudge();
|
||||||
this.judge = judge
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//初始化相关数据库表
|
//初始化相关数据库表
|
||||||
@ -522,16 +521,12 @@ struct Index {
|
|||||||
|
|
||||||
// 评判相关初始化
|
// 评判相关初始化
|
||||||
async initJudge() {
|
async initJudge() {
|
||||||
const JUDGEUI: JudgeUI = this;
|
;
|
||||||
const judge = new Judge(JUDGEUI);
|
await this.judge.onJudgeFn(async (judgeData: JudgeCallBacData) => {
|
||||||
// await judge.init<typeof Index>()
|
|
||||||
await judge.onJudgeFn(async (judgeData: JudgeCallBacData) => {
|
|
||||||
// const { xmmcStr, carztStr, kfArr } = judgeData;
|
|
||||||
this.xmmcStr = judgeData.xmmcStr || "";
|
this.xmmcStr = judgeData.xmmcStr || "";
|
||||||
this.carztStr = judgeData.carztStr || "";
|
this.carztStr = judgeData.carztStr || "";
|
||||||
this.kfArr = judgeData.kfArr || [];
|
this.kfArr = judgeData.kfArr || [];
|
||||||
});
|
});
|
||||||
return judge
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 断点续考判断
|
// 断点续考判断
|
||||||
|
|||||||
@ -339,7 +339,7 @@ export default struct DeductedPopup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mark.itemno == 1 && Number(mark.markserial) > 100 && Number(mark.markserial) < 200) {
|
if (mark.itemno == 1 && Number(mark.markserial) > 100 && Number(mark.markserial) < 200) {
|
||||||
this.markRuleListObj[`${mark.itemno}_${mark.markserial}`] = {
|
Reflect.set(this.markRuleListObj, `${mark.itemno}_${mark.markserial}`, {
|
||||||
itemno: tempObj.itemno,
|
itemno: tempObj.itemno,
|
||||||
markcatalog: tempObj.markcatalog,
|
markcatalog: tempObj.markcatalog,
|
||||||
markshow: tempObj.markshow,
|
markshow: tempObj.markshow,
|
||||||
@ -350,11 +350,9 @@ export default struct DeductedPopup {
|
|||||||
OnlyOneKind: tempObj.OnlyOneKind,
|
OnlyOneKind: tempObj.OnlyOneKind,
|
||||||
NoCancelId: tempObj.NoCancelId,
|
NoCancelId: tempObj.NoCancelId,
|
||||||
GPS_SID: tempObj.GPS_SID,
|
GPS_SID: tempObj.GPS_SID,
|
||||||
};
|
})
|
||||||
|
|
||||||
this.universalMarkRules.push(tempObj)
|
this.universalMarkRules.push(tempObj)
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -83,7 +83,7 @@ type GetDqxmStr = (xmdm: number) => string
|
|||||||
type TJudgeBeginObj = JudgeBeginObj
|
type TJudgeBeginObj = JudgeBeginObj
|
||||||
|
|
||||||
export default class Judge {
|
export default class Judge {
|
||||||
public plcStr!: string
|
public plcStr: string = ""
|
||||||
public judgeUI: JudgeUI
|
public judgeUI: JudgeUI
|
||||||
//获取科目三的评判初始化配置
|
//获取科目三的评判初始化配置
|
||||||
getKm3JudgeInitConfig: GetKm3JudgeInitConfig = async () => {
|
getKm3JudgeInitConfig: GetKm3JudgeInitConfig = async () => {
|
||||||
|
|||||||
@ -16,7 +16,7 @@ export function chunkArr<T>(arr: T[], size: number): T[][] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//对象深拷贝
|
//对象深拷贝
|
||||||
export function deepClone<T>(target: T): T {
|
export function deepClone<T extends Object>(target: T): T {
|
||||||
// 如果是对象,且不是原始值null
|
// 如果是对象,且不是原始值null
|
||||||
if (typeof target === 'object' && target !== null) {
|
if (typeof target === 'object' && target !== null) {
|
||||||
// 创建容器
|
// 创建容器
|
||||||
|
|||||||
@ -11,14 +11,12 @@
|
|||||||
"packages": {
|
"packages": {
|
||||||
"@ohos/crypto-js@2.0.3": {
|
"@ohos/crypto-js@2.0.3": {
|
||||||
"name": "@ohos/crypto-js",
|
"name": "@ohos/crypto-js",
|
||||||
"version": "2.0.3",
|
|
||||||
"integrity": "sha512-LuHaR1kD5PxnOXnuR1fWvPwGtbed9Q/QGzk6JOh8y5Wdzvi8brPesODZiaWf9scOVRHsbTPOtZw91vWB35p1vQ==",
|
"integrity": "sha512-LuHaR1kD5PxnOXnuR1fWvPwGtbed9Q/QGzk6JOh8y5Wdzvi8brPesODZiaWf9scOVRHsbTPOtZw91vWB35p1vQ==",
|
||||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/crypto-js/-/crypto-js-2.0.3.har",
|
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/crypto-js/-/crypto-js-2.0.3.har",
|
||||||
"registryType": "ohpm"
|
"registryType": "ohpm"
|
||||||
},
|
},
|
||||||
"@ohos/hypium@1.0.19": {
|
"@ohos/hypium@1.0.19": {
|
||||||
"name": "@ohos/hypium",
|
"name": "@ohos/hypium",
|
||||||
"version": "1.0.19",
|
|
||||||
"integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
|
"integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
|
||||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",
|
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",
|
||||||
"registryType": "ohpm"
|
"registryType": "ohpm"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user