fix: 提交重启应用代码

build-profile.json5

@@ -4,13 +4,13 @@
       {
         "name": "default",
         "material": {
-          "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.cer",
-          "storePassword": "0000001B6A24D25D8FE60B28F302A471AE62F85272A82295ABB715D5DAA874E56338B643E7ED6CCF706BEC",
+          "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.cer",
+          "storePassword": "0000001BAC2A2242CBD30042192466419A8087398301FC1759A9BBCFD659DD68D4D6AC1F21A3C57322816D",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001B6C2C6D7BE6CBC29BC9D356DDBF0C5D88D3BA97E0994DD5C78409CAA52639698A9374E235B64DAA",
-          "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p7b",
+          "keyPassword": "0000001B6BC513F0EF12E88D402A699731288AA9D23B4A26CCDD08F4A6CBC6FDDBBCCEFBB2C5AFE4D3E3E8",
+          "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p7b",
           "signAlg": "SHA256withECDSA",
-          "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p12"
+          "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p12"
         }
       }
     ],

entry/oh-package-lock.json5

@@ -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"
     }
   }
 }

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

@@ -309,6 +309,7 @@ export async function getDoubleCeneterTable(param) {
         return
       }
     }
+    getChuankouFn()
     reslove(true)
     router.pushUrl({
       url: 'pages/ExaminerLogin',
@@ -323,6 +324,7 @@ export async function getSingleCenterTable(param) {
     console.log('teststet0')
     upDataZhongxinginitialization(param).then((result) => {
       if (result === true) {
+        getChuankouFn()
         resolve(true)
       } else {
         console.log('联网更新失败，请检查网络后重新更新')
@@ -444,6 +446,7 @@ function openChuankouFn(callback) {
     if(carInfo.kscx == 'C1'){
       testNapi.SerialOpenAsync(devPath, (fd) => {
         globalThis.fd = fd;
+        globalThis.ChounkouInit = true;
         globalThis.num = 0
         let parity = 0x4e; // 'N'
         let ret = testNapi.SerialSetAsync(globalThis.fd, 115200, 0, 8, 1, parity, (ret) => {

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

@@ -218,7 +218,8 @@ export async function takePhoto(param, context, dir, flag = 1, callback?) {
   // @ts-ignore
   // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir);
   if (flag == 0) {
-    rtsp_server.detectVideoSnapshotSize(video_uri, fileName, (err, snapResult) => {
+    // @ts-ignore
+    rtsp_server.detectVideoSnapshotSize(video_uri, fileName, false,(err, snapResult) => {
       console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize);
       callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode })
     });

entry/src/main/ets/common/utils/PreferenceUtils.ets

@@ -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();

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

@@ -380,7 +380,7 @@ export default class UdpClientByCenter {
       }
       // console.info('surenjun2','set message_1Fn=>' + newArr.toString())
       callback && callback(newArr.toString())
-      console.info('surenjun 左方向灯=>', newArr.toString())
+      // console.info('surenjun 左方向灯=>', newArr.toString())
       this.currentValue = newArr.toString();
     } else {
       callback && callback('')

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

@@ -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');
   }
 

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

@@ -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,7 @@ struct Index {
   }
 
   async aboutToAppear() {
+
     // setInterval(() => {
     //   let date = new Date();
     //   console.info('jiangsong1:timeSynchronization begin ');
@@ -420,7 +424,18 @@ struct Index {
         }
       })
     });
-
+    const isRestart = await PreferenceUtils.getOtherModel("isRestart")
+    if (isRestart === "1") {
+      PreferenceUtils.writeOtherData("0", "isRestart")
+      setTimeout(() => {
+        router.pushUrl({
+          url: 'pages/UserInfo',
+          params: {
+            type: 1
+          }
+        }, router.RouterMode.Single);
+      }, 2000)
+    }
   }
 
   aboutToDisappear() {

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

@@ -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 > 5) {
+      PreferenceUtils.writeOtherData("1", "isRestart")
+      this.cozyDialog.open()
+      //   延迟关闭
+      setTimeout(() => {
+        this.cozyDialog.close()
+        appRecovery.restartApp()
+      }, 3000)
+    }
     this.isExamStart = false
     this.startExam = false
     this.updateTimeLimit = false
@@ -1326,6 +1343,21 @@ struct UserInfo {
           } else {
             // Image($r('app.media.ksks_btn'))
             //   .commStyle()
+            // Button(){
+            //   Text("add")
+            // }.width(100).height(30).onClick(()=>{
+            //   this.examCount++
+            //   if (this.examCount > 2) {
+            //     PreferenceUtils.writeOtherData("1", "isRestart")
+            //     this.cozyDialog.open()
+            //     //   延迟关闭
+            //     setTimeout(() => {
+            //       this.cozyDialog.close()
+            //       appRecovery.restartApp()
+            //     }, 3000)
+            //   }
+            //
+            // })
             imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.ksks_btn') })
               .margin({ bottom: 12 * this.ratio })
               .onClick(async () => {
@@ -1338,7 +1370,8 @@ struct UserInfo {
                   this.errorDialog.open()
                   return
                 }
-
+                this.examCount++
+                console.log("已经考了", this.examCount + "个学员")
                 await this.prePareExam()
               })
           }

entry/src/main/ets/pages/compontents/CozyDialog.ets

@@ -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)
+  }
+}

entry/src/main/ets/pages/compontents/FaceCompare.ets

@@ -187,8 +187,8 @@ export default struct FaceCompare {
     this.base64 = this.imageBase64 + data.base64
     faceCompare({
       sfzh: this.sfzh,
-      secondImage: this.firstImage.substr(22),
-      firstImage: data.base64,
+      secondImage:data.base64,
+      firstImage: this.firstImage.substr(22),
       type: 2,
       verifyType: 1
     })

entry/src/main/module.json5

@@ -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": [

oh-package-lock.json5

@@ -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"
     }
   }
 }