From 2261f60588c4d1e91ca848088f0184e30ac8d714 Mon Sep 17 00:00:00 2001 From: EasyGuohf <163991322+EasyGuohf@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:51:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=84=E8=8C=83=EF=BC=9Atry/catch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/common/utils/WindowUtil.ets | 15 ++++---- .../main/ets/view/BackgroundColorChange.ets | 35 +++++++++++-------- .../src/main/ets/view/TextBoxShowCursor.ets | 8 ++++- .../main/ets/entryability/EntryAbility.ets | 8 ++++- 4 files changed, 42 insertions(+), 24 deletions(-) diff --git a/verificationcodescenariolibrary/src/main/ets/common/utils/WindowUtil.ets b/verificationcodescenariolibrary/src/main/ets/common/utils/WindowUtil.ets index 99e54ce..f31bcd5 100644 --- a/verificationcodescenariolibrary/src/main/ets/common/utils/WindowUtil.ets +++ b/verificationcodescenariolibrary/src/main/ets/common/utils/WindowUtil.ets @@ -61,27 +61,26 @@ export class WindowUtil { const systemAvoidArea: window.AvoidArea = data.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM); const navIndicatorAvoidArea: window.AvoidArea = data.getWindowAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR); - WindowUtil.setAvoidArea(data, window.AvoidAreaType.TYPE_SYSTEM, systemAvoidArea); - WindowUtil.setAvoidArea(data, window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR, navIndicatorAvoidArea); + WindowUtil.setAvoidArea(window.AvoidAreaType.TYPE_SYSTEM, systemAvoidArea); + WindowUtil.setAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR, navIndicatorAvoidArea); data.on('windowSizeChange', () => BreakpointSystem.getInstance().onWindowSizeChange(data)); data.on('avoidAreaChange', (avoidAreaOption) => { - WindowUtil.setAvoidArea(data, avoidAreaOption.type, avoidAreaOption.area); + WindowUtil.setAvoidArea(avoidAreaOption.type, avoidAreaOption.area); }); } catch (err) { const error = err as BusinessError; hilog.error(0x0000, TAG, `Register avoidAreaChange or windowSizeChange failed. code: ${error.code}, message: ${error.message}`); } - } // Get status bar height and indicator height. - private static setAvoidArea(data: window.Window, type: window.AvoidAreaType, area: window.AvoidArea) { - const context: UIContext = data.getUIContext(); + private static setAvoidArea(type: window.AvoidAreaType, area: window.AvoidArea) { + const context: UIContext | undefined = AppStorage.get(Constants.KEY_UI_CONTEXT); if (type === window.AvoidAreaType.TYPE_SYSTEM) { - AppStorage.setOrCreate(Constants.KEY_STATUS_BAR_HEIGHT, context.px2vp(area.topRect.height)); + AppStorage.setOrCreate(Constants.KEY_STATUS_BAR_HEIGHT, context?.px2vp(area.topRect.height)); } else if (type === window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR) { - AppStorage.setOrCreate(Constants.KEY_NAV_INDICATOR_HEIGHT, context.px2vp(area.bottomRect.height)); + AppStorage.setOrCreate(Constants.KEY_NAV_INDICATOR_HEIGHT, context?.px2vp(area.bottomRect.height)); } } } \ No newline at end of file diff --git a/verificationcodescenariolibrary/src/main/ets/view/BackgroundColorChange.ets b/verificationcodescenariolibrary/src/main/ets/view/BackgroundColorChange.ets index 66078b4..b9e6c25 100644 --- a/verificationcodescenariolibrary/src/main/ets/view/BackgroundColorChange.ets +++ b/verificationcodescenariolibrary/src/main/ets/view/BackgroundColorChange.ets @@ -89,15 +89,20 @@ struct BackgroundColorChange { } listen() { - this.inputController.on('insertText', (text: string) => { - if (this.codeText.length >= this.verifyCodeLength || isNaN(Number(text)) || text === ' ') { - return; - } - this.codeText += text; - }) - this.inputController.on('deleteLeft', () => { - this.codeText = this.codeText.substring(0, this.codeText.length - 1); - }) + try { + this.inputController.on('insertText', (text: string) => { + if (this.codeText.length >= this.verifyCodeLength || isNaN(Number(text)) || text === ' ') { + return; + } + this.codeText += text; + }); + this.inputController.on('deleteLeft', () => { + this.codeText = this.codeText.substring(0, this.codeText.length - 1); + }); + } catch (error) { + const err: BusinessError = error as BusinessError; + hilog.error(0x0000, TAG, '%{public}s', `Register callback failed: ${err.code}, ${err.message}`); + } } detach(): void { @@ -214,11 +219,13 @@ struct BackgroundColorChange { .fontColor($r('sys.color.brand')) } .margin({ top: $r('sys.float.padding_level6') }) - .padding({ right: new BreakpointType({ - sm: $r('sys.float.padding_level0'), - md: $r('sys.float.padding_level3'), - lg: $r('sys.float.padding_level3') - }).getValue(this.curBp) }) + .padding({ + right: new BreakpointType({ + sm: $r('sys.float.padding_level0'), + md: $r('sys.float.padding_level3'), + lg: $r('sys.float.padding_level3') + }).getValue(this.curBp) + }) .alignSelf(ItemAlign.Center) .justifyContent(FlexAlign.End) .width(this.curBp === 'sm' ? '100%' : $r('app.float.input_width')) diff --git a/verificationcodescenariolibrary/src/main/ets/view/TextBoxShowCursor.ets b/verificationcodescenariolibrary/src/main/ets/view/TextBoxShowCursor.ets index 9c2d06e..fda25e2 100644 --- a/verificationcodescenariolibrary/src/main/ets/view/TextBoxShowCursor.ets +++ b/verificationcodescenariolibrary/src/main/ets/view/TextBoxShowCursor.ets @@ -142,7 +142,13 @@ struct TextBoxShowCursor { getCursorTranslateX(): number { if (canIUse('SystemCapability.Window.SessionManager')) { - let foldStatus = display.getFoldStatus(); + let foldStatus = display.FoldStatus.FOLD_STATUS_UNKNOWN; + try { + foldStatus = display.getFoldStatus(); + } catch (error) { + const err: BusinessError = error as BusinessError; + hilog.error(0x0000, TAG, '%{public}s', `Get foldStatus failed: ${err.code}, ${err.message}`); + } if (deviceInfo.productSeries === 'VDE' && foldStatus === display.FoldStatus.FOLD_STATUS_EXPANDED) { return Constants.ITEM_CODE_START + this.codeText.length * Constants.ITEM_CODE_WIDTH; } diff --git a/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets b/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets index 5eca7fd..792c3dc 100644 --- a/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets +++ b/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets @@ -15,6 +15,7 @@ import { ConfigurationConstant, UIAbility } from '@kit.AbilityKit'; import { window } from '@kit.ArkUI'; +import { BusinessError } from '@kit.BasicServicesKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; import { VerificationCodeController } from '@ohos_samples/verificationcodescenariolibrary'; @@ -23,7 +24,12 @@ const TAG: string = '[EntryAbility]'; export default class EntryAbility extends UIAbility { onCreate(): void { hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); - this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); + try { + this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); + } catch (error) { + const err: BusinessError = error as BusinessError; + hilog.error(0x0000, TAG, '%{public}s', `Set colorMode failed: ${err.code}, ${err.message}`); + } } onDestroy(): void { -- Gitee From 1f27b429b19b8461df774eade7c03b1e80fe511f Mon Sep 17 00:00:00 2001 From: EasyGuohf <163991322+EasyGuohf@users.noreply.github.com> Date: Tue, 12 Aug 2025 16:25:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- verificationcodescenariosample/oh-package.json5 | 2 +- .../src/main/ets/entryability/EntryAbility.ets | 2 +- verificationcodescenariosample/src/main/ets/pages/Index.ets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/verificationcodescenariosample/oh-package.json5 b/verificationcodescenariosample/oh-package.json5 index 850379f..283d99f 100644 --- a/verificationcodescenariosample/oh-package.json5 +++ b/verificationcodescenariosample/oh-package.json5 @@ -6,6 +6,6 @@ "author": "", "license": "", "dependencies": { - "@ohos_samples/verificationcodescenariolibrary": "file:../verificationcodescenariolibrary" + "verificationcodescenariolibrary": "file:../verificationcodescenariolibrary" } } \ No newline at end of file diff --git a/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets b/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets index 792c3dc..2a1d674 100644 --- a/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets +++ b/verificationcodescenariosample/src/main/ets/entryability/EntryAbility.ets @@ -17,7 +17,7 @@ import { ConfigurationConstant, UIAbility } from '@kit.AbilityKit'; import { window } from '@kit.ArkUI'; import { BusinessError } from '@kit.BasicServicesKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; -import { VerificationCodeController } from '@ohos_samples/verificationcodescenariolibrary'; +import { VerificationCodeController } from 'verificationcodescenariolibrary'; const TAG: string = '[EntryAbility]'; diff --git a/verificationcodescenariosample/src/main/ets/pages/Index.ets b/verificationcodescenariosample/src/main/ets/pages/Index.ets index 18a2351..4ca1e91 100644 --- a/verificationcodescenariosample/src/main/ets/pages/Index.ets +++ b/verificationcodescenariosample/src/main/ets/pages/Index.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { VerificationCodeScenarioComponent } from '@ohos_samples/verificationcodescenariolibrary'; +import { VerificationCodeScenarioComponent } from 'verificationcodescenariolibrary'; @Entry @Component -- Gitee