From d1a1fc8b4496622b9b28d63259a34839194b9e2b Mon Sep 17 00:00:00 2001 From: surenjun Date: Tue, 28 Oct 2025 15:26:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=B8=B2=E5=8F=A3=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/service/indexService.ts | 1 + entry/src/main/ets/common/service/initable.ts | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index 4abacc93..f885899b 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -323,6 +323,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)) From 4578177d37977403ede067837465a114b79cf6b5 Mon Sep 17 00:00:00 2001 From: surenjun Date: Tue, 28 Oct 2025 15:27:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E4=B8=B2=E5=8F=A3=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E6=97=B6=E6=9C=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 10 +++++----- entry/src/main/ets/common/service/indexService.ts | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index cd352219..7c2361e1 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -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/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.cer", + "storePassword": "0000001BB275D58DD39E5E5B74DD91C7D3D9217EEFEA855908868FD523A97460BFE0FFE09AD1CF71705E29", "keyAlias": "debugKey", - "keyPassword": "0000001B9F28F62DC3596874829120C11C241553B9134766FDA5315E81776F4AB7C392D24F996EDE2E3E5A", - "profile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.p7b", + "keyPassword": "0000001B6AE7EB0476A22556368A0784AC4697773CE7CBB790A63ADBBA59C99E654E955CA4C41C7BE4A44D", + "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p7b", "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.p12" + "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p12" } } ], diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index f885899b..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',