From 637e41248c5b5bf371e793296ab91b21e2510374 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Wed, 25 Jun 2025 13:38:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/config/LogEnum.ets | 5 ++++- entry/src/main/ets/pages/Index.ets | 3 ++- entry/src/main/ets/utils/Common.ets | 6 ++++++ entry/src/main/ets/utils/table/Operation.ets | 15 +++++++++------ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/entry/src/main/ets/config/LogEnum.ets b/entry/src/main/ets/config/LogEnum.ets index ab742b5..9bdc88b 100644 --- a/entry/src/main/ets/config/LogEnum.ets +++ b/entry/src/main/ets/config/LogEnum.ets @@ -46,4 +46,7 @@ export const CommonFileTag = '[CommonFile]'; export const HomeTag = '[Home]'; //judge -export const JudgeTag = '[Judge]'; \ No newline at end of file +export const JudgeTag = '[Judge]'; + +//初始化表 +export const InitTableTag = '[InitTable]'; \ No newline at end of file diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index dc1563b..16f0b90 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -1,7 +1,7 @@ import common from '@ohos.app.ability.common'; import router from '@ohos.router'; -import { HomeTag, JudgeConfig } from '../config'; +import { HomeTag, InitTableTag, JudgeConfig } from '../config'; import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; import { BaseInfoType } from '../model/Common'; import { CarInfoType, InitializeTheCentralTableType, MASYSSETTableType, TimeSynchronizationRspBody } from '../model'; @@ -147,6 +147,7 @@ struct Index { singlePlay: this.singlePlay } InitializeTheCentralTable(param).then((ret) => { + dConsole.log(InitTableTag, "初始化表成功", ret) if (ret) { GetSyncData("MA_SYSSET").then(data => { data.forEach(sys => { diff --git a/entry/src/main/ets/utils/Common.ets b/entry/src/main/ets/utils/Common.ets index 9de3b02..c5a1e30 100644 --- a/entry/src/main/ets/utils/Common.ets +++ b/entry/src/main/ets/utils/Common.ets @@ -279,9 +279,15 @@ export async function UseAuth(context: common.UIAbilityContext): Promise status === 0)) { return true; } else { + Prompt.showToast({ + message: "部分权限未授权,请全部授权,否则无法正常使用", + }) return false; } } catch (err) { + Prompt.showToast({ + message: "授权出错,请联系开发者或检查权限设置", + }) return false; } } \ No newline at end of file diff --git a/entry/src/main/ets/utils/table/Operation.ets b/entry/src/main/ets/utils/table/Operation.ets index 9df1cca..1ee6e41 100644 --- a/entry/src/main/ets/utils/table/Operation.ets +++ b/entry/src/main/ets/utils/table/Operation.ets @@ -5,8 +5,9 @@ import { BusinessError } from '@ohos.base'; import Prompt from '@system.prompt'; import { initialization } from '../../api'; -import { GlobalConfig } from '../../config'; +import { GlobalConfig, InitTableTag } from '../../config'; import FileUtils from '../FileUtils'; +import { dConsole } from '../LogWorker'; // 建表操作 export async function InitTable() { @@ -137,7 +138,7 @@ export async function InitializeTheCentralTable(params: InitializeTheCentralTabl // 后端传递的字段首字母小写了,需要转换下 let newKey = key.charAt(0).toUpperCase() + key.slice(1) let isExit = CenterMap.has(newKey) - console.log("-------------------表名-----------------------", newKey, isExit) + console.log(InitTableTag, "-------------------表名-----------------------", newKey, isExit) if (isExit) { console.log("可以插入的表", newKey, CenterMap.get(newKey)) let arrList: Array | RecordType = [] @@ -150,18 +151,20 @@ export async function InitializeTheCentralTable(params: InitializeTheCentralTabl const folderPath = await fileUtil.initFolder(`/config/tableList`); fileUtil.addFile(`${folderPath}/${RemappingTableName.get(newKey)}.txt`, JSON.stringify(arrList)) try { - console.log("插入表操作", newKey) - console.log("插入表别名", RemappingTableName.get(newKey)) - console.log("插入表长度", arrList.length) + console.log(InitTableTag, "插入表操作", newKey) + console.log(InitTableTag, "插入表别名", RemappingTableName.get(newKey)) + console.log(InitTableTag, "插入表长度", arrList.length) const result = await SqlInsertTable(RemappingTableName.get(newKey)!, arrList); - console.log("插入表结果,表", newKey, "结果", result) + console.log(InitTableTag, "插入表结果,表", newKey, "结果", result) if (!result) { Prompt.showToast({ message: '初始化数据库失败' }) } + console.log(InitTableTag, "~~~~~~~~~~~~~~~~~~~~~~初始化成功~~~~~~~~~~~~~~~~~~~~~~", newKey) resolve(result) } catch (e) { + dConsole.error(InitTableTag, "初始化表失败", JSON.stringify(e)) reject(e) } }