fix: 重启
This commit is contained in:
wangzhongjie
parent
08e430f02f
commit
8d6e6e3b6b
@ -4,13 +4,13 @@
|
||||
{
|
||||
"name": "default",
|
||||
"material": {
|
||||
"certpath": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.cer",
|
||||
"storePassword": "0000001BE1869C350CC47385898E8BD73BD9A455D1886BA385CD349B7C5ADE3BCFB7A29422CB379DD38D60",
|
||||
"certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.cer",
|
||||
"storePassword": "0000001BDD909DD8404E8B92703D5184A866B60293C42962B835ADAE4424AB5244CA8CC5F5B6B9F28F51B1",
|
||||
"keyAlias": "debugKey",
|
||||
"keyPassword": "0000001B9F28F62DC3596874829120C11C241553B9134766FDA5315E81776F4AB7C392D24F996EDE2E3E5A",
|
||||
"profile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.p7b",
|
||||
"keyPassword": "0000001B385A41E5971B34BE4AE810C6CB23838F88571ADB42DEAE3687C1AD6F3FCE35E98545F32AA4D057",
|
||||
"profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p7b",
|
||||
"signAlg": "SHA256withECDSA",
|
||||
"storeFile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.p12"
|
||||
"storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p12"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
{
|
||||
"lockfileVersion": 1,
|
||||
"lockfileVersion": 2,
|
||||
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
||||
"specifiers": {
|
||||
"@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6"
|
||||
},
|
||||
"packages": {
|
||||
"@ohos/hypium@1.0.6": {
|
||||
"resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
|
||||
"integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
|
||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
|
||||
"integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==",
|
||||
"registryType": "ohpm",
|
||||
"shasum": "3f5fed65372633233264b3447705b0831dfe7ea1"
|
||||
}
|
||||
}
|
||||
}
|
||||
63
entry/src/main/ets/common/utils/PreferenceUtils.ets
Normal file
63
entry/src/main/ets/common/utils/PreferenceUtils.ets
Normal file
@ -0,0 +1,63 @@
|
||||
import dataPreferences from '@ohos.data.preferences';
|
||||
|
||||
let context = getContext(this);
|
||||
let preference: dataPreferences.Preferences;
|
||||
const SYSTEM_DB: string = 'system.db' //其他信息
|
||||
const USER_DB: string = 'user.db' //用户信息
|
||||
|
||||
class PreferenceUtils {
|
||||
// 写入其他缓存数据
|
||||
async writeOtherData(value: dataPreferences.ValueType, key: string) {
|
||||
// if (value === null) {
|
||||
// return;
|
||||
// }
|
||||
if (!preference) {
|
||||
await this.getPreferencesFromStorage(SYSTEM_DB);
|
||||
}
|
||||
try {
|
||||
await preference.put(key, value);
|
||||
} catch (err) {
|
||||
console.info(`Failed to put value, Cause: ${err}`);
|
||||
}
|
||||
await preference.flush();
|
||||
}
|
||||
|
||||
// 获取其他缓存数据
|
||||
async getOtherModel<T extends dataPreferences.ValueType>(key: string) {
|
||||
let value: dataPreferences.ValueType = 1;
|
||||
if (!preference) {
|
||||
await this.getPreferencesFromStorage(SYSTEM_DB);
|
||||
}
|
||||
|
||||
try {
|
||||
value = (await preference.get(key, ''));
|
||||
} catch (err) {
|
||||
console.info(`Failed to get value, Cause: ${err}`);
|
||||
}
|
||||
if (value === '') {
|
||||
return;
|
||||
}
|
||||
return value as T;
|
||||
}
|
||||
|
||||
// 删除登录数据
|
||||
async deletePreferences() {
|
||||
try {
|
||||
await dataPreferences.deletePreferences(context, USER_DB);
|
||||
} catch (err) {
|
||||
console.info(`Failed to delete preferences, Cause: ${err}`);
|
||||
}
|
||||
;
|
||||
}
|
||||
|
||||
// 创建登录数据preference
|
||||
async getPreferencesFromStorage(name: string) {
|
||||
try {
|
||||
preference = await dataPreferences.getPreferences(context, name);
|
||||
} catch (err) {
|
||||
console.info(`Failed to get preferences, Cause: ${err}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default new PreferenceUtils();
|
||||
@ -10,9 +10,15 @@ import { GlobalConfig } from '../config/global'
|
||||
import { tcpUtil } from '../common/utils/TcpRequest';
|
||||
import DB from '../common/database/DbSql';
|
||||
import { initTable } from '../common/service/initable';
|
||||
import appRecovery from '@ohos.app.ability.appRecovery';
|
||||
|
||||
export default class EntryAbility extends UIAbility {
|
||||
async onCreate(want, launchParam) {
|
||||
appRecovery.enableAppRecovery(
|
||||
appRecovery.RestartFlag.ALWAYS_RESTART,
|
||||
appRecovery.SaveOccasionFlag.SAVE_WHEN_ERROR,
|
||||
appRecovery.SaveModeFlag.SAVE_WITH_FILE
|
||||
);
|
||||
try {
|
||||
console.log("sql first")
|
||||
await DB.init(this.context)
|
||||
@ -23,6 +29,7 @@ export default class EntryAbility extends UIAbility {
|
||||
console.error('sql first error', e)
|
||||
}
|
||||
|
||||
|
||||
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate');
|
||||
}
|
||||
|
||||
|
||||
@ -21,6 +21,9 @@ import imageBtn from './compontents/imageBtn';
|
||||
import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements';
|
||||
import { updateModelAndCar } from '../common/autoUpdate/index'
|
||||
import { UsbUtils } from '../common/utils/UsbUtils'
|
||||
import appRecovery from '@ohos.app.ability.appRecovery';
|
||||
import PreferenceUtils from '../common/utils/PreferenceUtils';
|
||||
import CozyMsgDialog from './compontents/CozyDialog';
|
||||
|
||||
@Entry
|
||||
@Component
|
||||
@ -377,6 +380,16 @@ struct Index {
|
||||
}
|
||||
|
||||
async aboutToAppear() {
|
||||
const isRestart = await PreferenceUtils.getOtherModel("isRestart")
|
||||
if (isRestart === "1") {
|
||||
PreferenceUtils.writeOtherData("0","isRestart")
|
||||
router.pushUrl({
|
||||
url: 'pages/UserInfo',
|
||||
params: {
|
||||
type: 1
|
||||
}
|
||||
}, router.RouterMode.Single);
|
||||
}
|
||||
// setInterval(() => {
|
||||
// let date = new Date();
|
||||
// console.info('jiangsong1:timeSynchronization begin ');
|
||||
|
||||
@ -24,6 +24,9 @@ import errorMsgDialog from './compontents/errorMsgDialog';
|
||||
import imageBtn from './compontents/imageBtn';
|
||||
import FileUtil from '../common/utils/File';
|
||||
import DB, { ColumnType } from '../common/database/DbSql';
|
||||
import CozyMsgDialog from './compontents/CozyDialog';
|
||||
import PreferenceUtils from '../common/utils/PreferenceUtils';
|
||||
import appRecovery from '@ohos.app.ability.appRecovery';
|
||||
|
||||
@Entry
|
||||
@Component
|
||||
@ -78,6 +81,7 @@ struct UserInfo {
|
||||
@State faceFlag: string = '0';
|
||||
@State FaceOpenStatue: string = '0'; //是否开启人脸识别
|
||||
@State faceCatchImg: string = ''
|
||||
@State examCount: number = 0
|
||||
@State systemParam: systemParam = {
|
||||
'Param341': true, //是否按顺序考试
|
||||
'Param803Str': '0', //开始考试前必须解开安全带或关车门
|
||||
@ -185,6 +189,10 @@ struct UserInfo {
|
||||
{ label: '考试员名', key: 'ksy2' },
|
||||
]
|
||||
private fileUtil: FileUtil
|
||||
cozyDialog: CustomDialogController = new CustomDialogController({
|
||||
builder: CozyMsgDialog(),
|
||||
autoCancel: false
|
||||
})
|
||||
|
||||
aboutToAppear() {
|
||||
this.fileUtil = new FileUtil(this.context)
|
||||
@ -192,6 +200,15 @@ struct UserInfo {
|
||||
}
|
||||
|
||||
async onPageShow() {
|
||||
if (this.examCount > 2) {
|
||||
PreferenceUtils.writeOtherData("1", "isRestart")
|
||||
this.cozyDialog.open()
|
||||
// 延迟关闭
|
||||
setTimeout(() => {
|
||||
this.cozyDialog.close()
|
||||
appRecovery.restartApp()
|
||||
}, 3000)
|
||||
}
|
||||
this.isExamStart = false
|
||||
this.startExam = false
|
||||
this.updateTimeLimit = false
|
||||
@ -1338,7 +1355,8 @@ struct UserInfo {
|
||||
this.errorDialog.open()
|
||||
return
|
||||
}
|
||||
|
||||
this.examCount++
|
||||
console.log("已经考了", this.examCount + "个学员")
|
||||
await this.prePareExam()
|
||||
})
|
||||
}
|
||||
|
||||
18
entry/src/main/ets/pages/compontents/CozyDialog.ets
Normal file
18
entry/src/main/ets/pages/compontents/CozyDialog.ets
Normal file
@ -0,0 +1,18 @@
|
||||
@CustomDialog
|
||||
export default struct CozyMsgDialog {
|
||||
private controller?: CustomDialogController
|
||||
|
||||
build() {
|
||||
Column() {
|
||||
Column() {
|
||||
Text("温馨提示").fontSize(50)
|
||||
Row() {
|
||||
Text("设备已经进行过6次考试,马上进入内存以及数据优化过,请稍等片刻,请勿对机器进行操作,感谢配合!")
|
||||
.fontSize(30).lineHeight(40)
|
||||
}.width("100%").margin({
|
||||
top: 20
|
||||
}).padding(20)
|
||||
}
|
||||
}.width("100%").height(300).padding(20)
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
import libJudgeSdk from 'libJudgeSdk.so'
|
||||
// import libJudgeSdk from 'libJudgeSdk.so'
|
||||
//@ts-ignore
|
||||
// import libJudgeSdk from '@ohos.judgesdk'
|
||||
import libJudgeSdk from '@ohos.judgesdk'
|
||||
/**
|
||||
* 苏仁君
|
||||
* @date 2023/04/10
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
"type": "entry",
|
||||
"description": "$string:module_desc",
|
||||
"mainElement": "EntryAbility",
|
||||
"srcEntry": "./ets/entryability/EntryAbility.ts",
|
||||
"deviceTypes": [
|
||||
"default",
|
||||
"tablet",
|
||||
@ -15,13 +16,13 @@
|
||||
"abilities": [
|
||||
{
|
||||
"name": "EntryAbility",
|
||||
"srcEntrance": "./ets/entryability/EntryAbility.ts",
|
||||
"srcEntry": "./ets/entryability/EntryAbility.ts",
|
||||
"description": "$string:EntryAbility_desc",
|
||||
"icon": "$media:logo_app",
|
||||
"label": "$string:EntryAbility_label",
|
||||
"startWindowIcon": "$media:icon",
|
||||
"startWindowBackground": "$color:start_window_background",
|
||||
"visible": true,
|
||||
"exported": true,
|
||||
"skills": [
|
||||
{
|
||||
"entities": [
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
{
|
||||
"lockfileVersion": 1,
|
||||
"lockfileVersion": 2,
|
||||
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
||||
"specifiers": {
|
||||
"@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6"
|
||||
},
|
||||
"packages": {
|
||||
"@ohos/hypium@1.0.6": {
|
||||
"resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
|
||||
"integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
|
||||
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
|
||||
"integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==",
|
||||
"registryType": "ohpm",
|
||||
"shasum": "3f5fed65372633233264b3447705b0831dfe7ea1"
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user