diff --git a/build-profile.json5 b/build-profile.json5 index 61c6b5dc..33a57880 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,9 +5,9 @@ "name": "default", "material": { "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.cer", - "storePassword": "0000001BDD909DD8404E8B92703D5184A866B60293C42962B835ADAE4424AB5244CA8CC5F5B6B9F28F51B1", + "storePassword": "0000001BAC2A2242CBD30042192466419A8087398301FC1759A9BBCFD659DD68D4D6AC1F21A3C57322816D", "keyAlias": "debugKey", - "keyPassword": "0000001B385A41E5971B34BE4AE810C6CB23838F88571ADB42DEAE3687C1AD6F3FCE35E98545F32AA4D057", + "keyPassword": "0000001B6BC513F0EF12E88D402A699731288AA9D23B4A26CCDD08F4A6CBC6FDDBBCCEFBB2C5AFE4D3E3E8", "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p7b", "signAlg": "SHA256withECDSA", "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_subject-two_Kl4t-ZSvZeuUm9s8O-e6FIH2VFR_OaNyhDP8kPjIWgU=.p12" diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index 4abacc93..3aee742e 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/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('联网更新失败,请检查网络后重新更新') diff --git a/entry/src/main/ets/common/service/initable.ts b/entry/src/main/ets/common/service/initable.ts index 71f79109..def04b15 100644 --- a/entry/src/main/ets/common/service/initable.ts +++ b/entry/src/main/ets/common/service/initable.ts @@ -32,7 +32,6 @@ import { GlobalConfig } from '../../config/index'; import prompt from '@ohos.promptAction' import DB, { ColumnType } from '../database/DbSql'; import { MA_SYS_SET_COLUMN } from '../../model/Table'; -import { getChuankouFn } from './indexService' // @ts-nocheck //读表 @@ -456,10 +455,6 @@ export async function upDataZhongxinginitialization(param) { resolve(false) } } - // 初始化串口 - if(!globalThis.ChounkouInit){ - getChuankouFn() - } resolve(true) }).catch((Error) => { console.log("init table5", JSON.stringify(Error)) diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index ffb6ea24..1ae75d9c 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -380,16 +380,7 @@ 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 '); @@ -433,7 +424,16 @@ struct Index { } }) }); - + const isRestart = await PreferenceUtils.getOtherModel("isRestart") + if (isRestart === "1") { + PreferenceUtils.writeOtherData("0", "isRestart") + router.pushUrl({ + url: 'pages/UserInfo', + params: { + type: 1 + } + }, router.RouterMode.Single); + } } aboutToDisappear() { diff --git a/entry/src/main/ets/pages/judgeSDK/api/index.ts b/entry/src/main/ets/pages/judgeSDK/api/index.ts index b444ac28..6ec593da 100644 --- a/entry/src/main/ets/pages/judgeSDK/api/index.ts +++ b/entry/src/main/ets/pages/judgeSDK/api/index.ts @@ -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