From 373cbd7c6a8d80d3d67968728f2d5c26b7681392 Mon Sep 17 00:00:00 2001 From: "DESKTOP-9FJNTIC\\gyb" <121287102@qq.com> Date: Fri, 12 Sep 2025 16:05:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index 9c5b0d6..149be09 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,7 +4,7 @@ { "name": "default", "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", + "compatibleSdkVersion": "5.0.2(14)", "runtimeOS": "HarmonyOS" } ], @@ -17,12 +17,25 @@ } ], "signingConfigs": [ + { + "name": "default", + "type": "HarmonyOS", + "material": { + "certpath": "C:\\Users\\gyb\\.ohos\\config\\default_visionkit-samplecode-sheet-extraction-demo-arkts_WOjuaRhWhSgqB3mZLsAgc7iJMQG7QKCG9pjxOqk4mas=.cer", + "keyAlias": "debugKey", + "keyPassword": "0000001B25058620F637BA638198CE53C08A961A37AA169E31ECFEF21EEB595B28F2EAC9D6FA22194A6F99", + "profile": "C:\\Users\\gyb\\.ohos\\config\\default_visionkit-samplecode-sheet-extraction-demo-arkts_WOjuaRhWhSgqB3mZLsAgc7iJMQG7QKCG9pjxOqk4mas=.p7b", + "signAlg": "SHA256withECDSA", + "storeFile": "C:\\Users\\gyb\\.ohos\\config\\default_visionkit-samplecode-sheet-extraction-demo-arkts_WOjuaRhWhSgqB3mZLsAgc7iJMQG7QKCG9pjxOqk4mas=.p12", + "storePassword": "0000001B68709B2E8B18E0FF97A953018BC620654936D4D4F223BF56C3611651D5182DF66ED8417FD22A0C" + } + } ] }, "modules": [ { - "name": "entry", - "srcPath": "./entry", + "name": "sheetrecognitionsample", + "srcPath": "./sheetrecognitionsample", "targets": [ { "name": "default", @@ -31,6 +44,10 @@ ] } ] + }, + { + "name": "sheetrecognitionlibrary", + "srcPath": "./sheetrecognitionlibrary" } ] } \ No newline at end of file -- Gitee From 2f637cd28488b77729df17503f75453ba112ef7b Mon Sep 17 00:00:00 2001 From: "DESKTOP-9FJNTIC\\gyb" <121287102@qq.com> Date: Thu, 18 Sep 2025 21:26:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?logger=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sheetrecognitionlibrary/Index.ets | 2 +- .../components/SheetExtractionComponent.ets | 4 +- .../src/main/ets/utils/FileUtil.ets | 10 ++--- .../src/main/ets/utils/Logger.ets | 45 +++++++++++++++++++ .../src/main/ets/utils/WindowUtil.ets | 18 +++++--- .../main/ets/entryability/EntryAbility.ets | 19 ++++---- 6 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 sheetrecognitionlibrary/src/main/ets/utils/Logger.ets diff --git a/sheetrecognitionlibrary/Index.ets b/sheetrecognitionlibrary/Index.ets index 020d933..0ced99e 100644 --- a/sheetrecognitionlibrary/Index.ets +++ b/sheetrecognitionlibrary/Index.ets @@ -1,5 +1,5 @@ export { MainComponent } from './src/main/ets/components/MainComponent'; export { SheetRecognitionController } from './src/main/ets/SheetRecognitionController'; - +export { default as Logger } from './src/main/ets/utils/Logger'; diff --git a/sheetrecognitionlibrary/src/main/ets/components/SheetExtractionComponent.ets b/sheetrecognitionlibrary/src/main/ets/components/SheetExtractionComponent.ets index e64fbce..d6e95aa 100644 --- a/sheetrecognitionlibrary/src/main/ets/components/SheetExtractionComponent.ets +++ b/sheetrecognitionlibrary/src/main/ets/components/SheetExtractionComponent.ets @@ -3,11 +3,11 @@ */ import { DocType, DocumentScanner, SaveOption } from '@kit.VisionKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { picker } from '@kit.CoreFileKit'; import { fileIo as fs } from '@kit.CoreFileKit'; import { FileUtil } from '../utils/FileUtil'; import { CommonConstants } from '../constants/CommonConstants'; +import Logger from '../utils/Logger'; const TAG: string = 'SheetExtractionPage'; @@ -90,7 +90,7 @@ export struct SheetExtractionComponent { message: $r('app.string.save_error'), alignment: Alignment.Center }); - hilog.error(0x0001, TAG, `error: ${error}`); + Logger.error(TAG, `error: ${error}`); reject(''); } finally { fs.closeSync(originFile); diff --git a/sheetrecognitionlibrary/src/main/ets/utils/FileUtil.ets b/sheetrecognitionlibrary/src/main/ets/utils/FileUtil.ets index 79749f8..50b58d1 100644 --- a/sheetrecognitionlibrary/src/main/ets/utils/FileUtil.ets +++ b/sheetrecognitionlibrary/src/main/ets/utils/FileUtil.ets @@ -15,7 +15,7 @@ import type { BusinessError } from '@kit.BasicServicesKit'; import { fileIo as fs, ReadOptions, WriteOptions } from '@kit.CoreFileKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; +import Logger from './Logger'; const TAG: string = '[FileUtil]'; @@ -25,7 +25,7 @@ export class FileUtil { return fs.accessSync(path); } catch (error) { const err = error as BusinessError; - hilog.error(0x0000, TAG, `Operate file failed. Cause code: ${err.code}, message: ${err.message}`); + Logger.error(TAG, `Operate file failed. Cause code: ${err.code}, message: ${err.message}`); } return false; } @@ -48,7 +48,7 @@ export class FileUtil { } } catch (error) { const err = error as BusinessError; - hilog.error(0x0000, TAG, `Operate file failed. Cause code: ${err.code}, message: ${err.message}`); + Logger.error(TAG, `Operate file failed. Cause code: ${err.code}, message: ${err.message}`); } return 0; } @@ -82,14 +82,14 @@ export class FileUtil { } } catch (error) { const err = error as BusinessError; - hilog.error(0x0000, TAG, `Write file failed. Cause code: ${err.code}, message: ${err.message}`); + Logger.error(TAG, `Write file failed. Cause code: ${err.code}, message: ${err.message}`); } finally { try { fs.close(srcFile); fs.close(destFile); } catch (error) { const err = error as BusinessError; - hilog.error(0x0000, TAG, `Close file failed. Cause code: ${err.code}, message: ${err.message}`); + Logger.error(TAG, `Close file failed. Cause code: ${err.code}, message: ${err.message}`); } } } diff --git a/sheetrecognitionlibrary/src/main/ets/utils/Logger.ets b/sheetrecognitionlibrary/src/main/ets/utils/Logger.ets new file mode 100644 index 0000000..2389600 --- /dev/null +++ b/sheetrecognitionlibrary/src/main/ets/utils/Logger.ets @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { hilog } from '@kit.PerformanceAnalysisKit'; + +class Logger { + private domain: number; + private prefix: string; + private format: string = '%{public}s, %{public}s'; + + public constructor(prefix: string) { + this.prefix = prefix; + this.domain = 0x0000; + } + + public debug(...args: Object[]): void { + hilog.debug(this.domain, this.prefix, this.format, args); + } + + public info(...args: Object[]): void { + hilog.info(this.domain, this.prefix, this.format, args); + } + + public warn(...args: Object[]): void { + hilog.warn(this.domain, this.prefix, this.format, args); + } + + public error(...args: Object[]): void { + hilog.error(this.domain, this.prefix, this.format, args); + } +} + +export default new Logger('[SheetRecognition]'); \ No newline at end of file diff --git a/sheetrecognitionlibrary/src/main/ets/utils/WindowUtil.ets b/sheetrecognitionlibrary/src/main/ets/utils/WindowUtil.ets index 39e8e34..7b87de9 100644 --- a/sheetrecognitionlibrary/src/main/ets/utils/WindowUtil.ets +++ b/sheetrecognitionlibrary/src/main/ets/utils/WindowUtil.ets @@ -15,10 +15,10 @@ import { window } from '@kit.ArkUI'; import type { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { common, ConfigurationConstant } from '@kit.AbilityKit'; import { CommonConstants } from '../constants/CommonConstants'; import { BreakpointSystem } from './BreakpointSystem'; +import Logger from './Logger'; const TAG: string = '[WindowUtil]'; @@ -35,7 +35,7 @@ export class WindowUtil { WindowUtil.registerBreakPoint(windowStage); WindowUtil.requestFullScreen(windowStage); } catch (err) { - hilog.error(0x0000, TAG, `WindowUtil initialize failed. Cause: ${err.code} ${err.message}`); + Logger.error(TAG, `WindowUtil initialize failed. Cause: ${err.code} ${err.message}`); } } @@ -49,13 +49,13 @@ export class WindowUtil { try { const promise: Promise = windowClass.setWindowLayoutFullScreen(true); promise.then(() => { - hilog.info(0x0000, TAG, 'Succeeded in setting the window layout to full-screen mode.'); + Logger.info(TAG, 'Succeeded in setting the window layout to full-screen mode.'); }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, + Logger.error(TAG, `Failed to set the window layout to full-screen mode. Cause: ${err.code}, ${err.message}`); }); } catch { - hilog.error(0x0000, TAG, 'Failed to set the window layout to full-screen mode.'); + Logger.error(TAG, 'Failed to set the window layout to full-screen mode.'); } }); } @@ -63,7 +63,7 @@ export class WindowUtil { public static registerBreakPoint(windowStage: window.WindowStage) { windowStage.getMainWindow((err: BusinessError, data: window.Window) => { if (err.code) { - hilog.error(0x0000, TAG, `Failed to get main window: ${err.message}`); + Logger.error(TAG, `Failed to get main window: ${err.message}`); return; } BreakpointSystem.getInstance().updateBp(); @@ -96,6 +96,10 @@ export class WindowUtil { } public static updatedColorMode(context: common.UIAbilityContext): void { - context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); + try { + context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); + } catch (error) { + Logger.error(TAG, `updatedColorMode fail.`); + } } } \ No newline at end of file diff --git a/sheetrecognitionsample/src/main/ets/entryability/EntryAbility.ets b/sheetrecognitionsample/src/main/ets/entryability/EntryAbility.ets index 9791fd3..2111143 100644 --- a/sheetrecognitionsample/src/main/ets/entryability/EntryAbility.ets +++ b/sheetrecognitionsample/src/main/ets/entryability/EntryAbility.ets @@ -3,46 +3,45 @@ */ import { UIAbility } from '@kit.AbilityKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { window } from '@kit.ArkUI'; -import { SheetRecognitionController } from '@ohos_samples/textRecognitionlibrary'; +import { Logger, SheetRecognitionController } from '@ohos_samples/textRecognitionlibrary'; export default class EntryAbility extends UIAbility { onCreate(): void { - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); + Logger.info('testTag', '%{public}s', 'Ability onCreate'); SheetRecognitionController.updatedColorMode(this.context); } onDestroy(): void { - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy'); + Logger.info('testTag', '%{public}s', 'Ability onDestroy'); } onWindowStageCreate(windowStage: window.WindowStage): void { // Main window is created, set main page for this ability - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate'); + Logger.info('testTag', '%{public}s', 'Ability onWindowStageCreate'); windowStage.loadContent('pages/Index', (err) => { if (err.code) { - hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); + Logger.error('testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); return; } SheetRecognitionController.initWindowConfig(windowStage); - hilog.info(0x0000, 'testTag', 'Succeeded in loading the content.'); + Logger.info('testTag', 'Succeeded in loading the content.'); }); } onWindowStageDestroy(): void { // Main window is destroyed, release UI related resources - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy'); + Logger.info('testTag', '%{public}s', 'Ability onWindowStageDestroy'); } onForeground(): void { // Ability has brought to foreground - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground'); + Logger.info('testTag', '%{public}s', 'Ability onForeground'); } onBackground(): void { // Ability has back to background - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground'); + Logger.info('testTag', '%{public}s', 'Ability onBackground'); } } -- Gitee