From d3ecb3e2e372dbd8d54178856838c157498eef91 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Tue, 12 Aug 2025 10:34:32 +0800 Subject: [PATCH 1/7] sample StateManagement manualfix Signed-off-by: wangweiyuan --- .../main/ets/commoncomponents/CodeView.ets | 28 ++-- .../main/ets/commoncomponents/TitleBar.ets | 25 +-- .../ets/commoncomponents/TitleBarDark.ets | 25 +-- .../ets/commoncomponents/ViewCodeText.ets | 23 +-- .../ets/outofsyncability/OutOfSyncAbility.ts | 2 +- .../AbilityGlobalDataSync.ets | 13 +- .../AbilityGlobalDataSyncCode.ets | 56 ++++--- .../AbilityOutOfSyncPage.ets | 24 +-- .../LocalStorageLinkPage.ets | 24 +-- .../LocalStoragePropPage.ets | 40 +++-- .../ApplyGlobalDataSync.ets | 11 +- .../ApplyGlobalDataSyncCode.ets | 46 ++--- .../StorageLinkAbilityPage.ets | 22 +-- .../StoragePropAbilityPage.ets | 30 ++-- .../model/AbilityConfigType.ts | 4 +- .../entry/src/main/ets/pages/home/Home.ets | 28 ++-- .../ets/pages/home/TabContentNavigation.ets | 158 ++++++++++-------- .../src/main/ets/pages/home/data/HomeData.ets | 24 ++- .../pages/home/model/CategoricalDataType.ets | 7 +- .../BrotherComponentSync.ets | 6 +- .../BrotherComponentSyncCode.ets | 9 +- .../ConsumeBrotherOneComponent.ets | 30 ++-- .../ConsumeBrotherTwoComponent.ets | 28 ++-- .../LinkBrotherOneComponent.ets | 38 +++-- .../LinkBrotherTwoComponent.ets | 26 +-- .../ProvideFatherComponent.ets | 13 +- .../StateFatherComponent.ets | 12 +- .../multicompomentssync/data/ColorData.ets | 16 +- .../ConsumeDescendentComponent.ets | 28 ++-- .../DeepNestComponentsSync.ets | 6 +- .../DeepNestComponentsSyncCode.ets | 7 +- .../LinkDescendentComponent.ets | 27 +-- .../ProvideGrandfatherComponent.ets | 39 ++--- .../StateGrandfatherComponent.ets | 33 ++-- .../multicompomentssync/model/ColorType.ets | 11 +- .../ObjectLinkComponent.ets | 19 ++- .../ParentChildPartialContentSync.ets | 6 +- .../ParentChildPartialContentSyncCode.ets | 46 ++--- .../uniandbidirectionsync/ComponentLink.ets | 21 ++- .../uniandbidirectionsync/ComponentProp.ets | 25 +-- .../UniAndBidirectionSync.ets | 6 +- .../UniAndBidirectionSyncCode.ets | 32 ++-- .../arraytype/ArrayType.ets | 8 +- .../arraytype/ArrayTypeCode.ets | 58 ++++--- .../decoratedobjecttype/basetype/BaseType.ets | 9 +- .../basetype/BaseTypeCode.ets | 19 ++- .../classobjecttype/ClassObjectType.ets | 6 +- .../classobjecttype/ClassObjectTypeCode.ets | 83 ++++----- .../UpdateBoundComponent.ets | 6 +- .../UpdateBoundComponentCode.ets | 33 ++-- .../entry/src/main/ets/utils/ResourceUtils.ts | 3 +- 51 files changed, 711 insertions(+), 588 deletions(-) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets index 62c1b9de..dd9cdadc 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -21,11 +21,9 @@ import { Resource, StorageLink, Watch, - $rawfile, Builder, Column, Text, - $r, Color, ItemAlign, Web, @@ -35,6 +33,12 @@ import { Alignment, BarState, SideBarPosition, + TextAttribute, + ColumnOptions, + ClickEvent, + $r, + $rawfile, + Padding } from '@kit.ArkUI'; import webView from '@ohos.web.webview'; @@ -42,7 +46,8 @@ import { TitleBar } from './TitleBar'; @Component export struct CodeView { - @BuilderParam contentView: () => void; + @BuilderParam contentView: () => void = () => { + }; @Link title: Resource; @StorageLink('sideBarShow') sideBarShow: boolean = false; @StorageLink('webSrc') @Watch('webSrcChange') webSrc: Resource = $rawfile('BaseTypeCode.ets.html'); @@ -50,18 +55,19 @@ export struct CodeView { private isShowTitle: boolean = true; private controller: webView.WebviewController = new webView.WebviewController(); - webSrcChange():void { + webSrcChange(propName: string): void { this.controller.loadUrl(this.webSrc); } - @Builder codeView() { - Column({ space: 10 }) { + @Builder + codeView() { + Column({ space: 10.0 } as ColumnOptions) { Text($r('app.string.close')) .fontSize($r('app.float.source_code_font_size')) .fontColor(Color.White) .alignSelf(ItemAlign.End) .id('close') - .onClick(() => { + .onClick((): void => { this.sideBarShow = !this.sideBarShow; }) Column() { @@ -69,9 +75,9 @@ export struct CodeView { .width('100%') .height('100%') } - .height('100%') .width('100%') - .padding({ bottom: $r('app.float.code_view_bottom') }) + .height('100%') + .padding({ bottom: $r('app.float.code_view_bottom') } as Padding) } .height('100%') .padding($r('app.float.page_padding')) @@ -95,7 +101,7 @@ export struct CodeView { } .autoHide(false) .showSideBar(this.sideBarShow) - .layoutWeight(1) + .layoutWeight(1.0) .sideBarWidth('100%') .showControlButton(false) // 大型设备查看源码和界面4:6的比例，所以占60% diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets index 2dfd21d7..10bdfd61 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,7 +15,6 @@ */ import { - getUIContext, Component, Link, Resource, @@ -23,39 +22,43 @@ import { Row, Button, Image, - $r, Text, Divider, + $r, + ColumnOptions, + TextAttribute, + Margin, + ClickEvent } from '@kit.ArkUI'; +import { Context, UIContext } from '@ohos.arkui.UIContext'; import router from '@ohos.router'; import common from '@ohos.app.ability.common'; import { startSpecifiedAbility } from '../utils/StartAbilityUtils'; -//声明一个上下文信息 -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; - @Component export struct TitleBar { @Link title: Resource; private isAbility: boolean = false; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { Row() { - Button() { + Button('') { Image($r('app.media.ic_back')) .size({ width: $r('app.float.icon_back_size'), height: $r('app.float.icon_back_size') }) } .backgroundColor($r('app.color.background_shallow_grey')) .id('backBtn') - .onClick(() => { - this.isAbility ? startSpecifiedAbility(CONTEXT, 'EntryAbility') : getUIContext().getRouter.back(); + .onClick((event: ClickEvent) => { + this.isAbility ? startSpecifiedAbility(this.CONTEXT, 'EntryAbility') : + this.getUIContext().getRouter().back(); }) Text(this.title) .fontSize($r('app.float.title_font_size')) - .margin({ left: $r('app.float.title_margin') }) + .margin({ left: $r('app.float.title_margin') } as Margin) } .width('100%') .padding($r('app.float.page_padding')) @@ -64,7 +67,7 @@ export struct TitleBar { .width('100%') .height($r('app.float.divider_height')) .color($r('app.color.divider_color')) - .margin({ bottom: 12 }) + .margin({ bottom: 12.0 } as Margin) } .width('100%') } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets index 828207d1..47896704 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,7 +15,6 @@ */ import { - getUIContext, Component, Link, Resource, @@ -23,40 +22,44 @@ import { Row, Button, Image, - $r, Text, Color, Divider, + $r, + $rawfile, + ColumnOptions, + ClickEvent, + TextAttribute, + Margin } from '@kit.ArkUI'; import router from '@ohos.router'; import common from '@ohos.app.ability.common'; import { startSpecifiedAbility } from '../utils/StartAbilityUtils'; -//声明一个上下文信息 -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; - @Component export struct TitleBarDark { @Link title: Resource; private isAbility: boolean = false; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { Row() { - Button() { + Button('') { Image($r('app.media.ic_back_white')) .size({ width: $r('app.float.icon_back_size'), height: $r('app.float.icon_back_size') }) } .id('backBtn') - .onClick(() => { - this.isAbility ? startSpecifiedAbility(CONTEXT, 'EntryAbility') : getUIContext().getRouter.back(); + .onClick((event: ClickEvent) => { + this.isAbility ? startSpecifiedAbility(this.CONTEXT, 'EntryAbility') : + this.getUIContext().getRouter().back(); }) .backgroundColor($r('app.color.nightnode_color')) Text(this.title) .fontSize($r('app.float.title_font_size')) - .margin({ left: $r('app.float.title_margin') }) + .margin({ left: $r('app.float.title_margin') } as Margin) .fontColor(Color.White) } .width('100%') @@ -66,7 +69,7 @@ export struct TitleBarDark { .width('100%') .height($r('app.float.divider_height')) .color($r('app.color.divider_color')) - .margin({ bottom: 12 }) + .margin({ bottom: 12.0 } as Margin) } .width('100%') } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets index e1ef1367..1fbb679d 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,34 +18,35 @@ import { Component, StorageLink, Resource, - $rawfile, Column, Text, - $r, ItemAlign, AppStorage, FlexAlign, + $r, + $rawfile, + ClickEvent } from '@kit.ArkUI'; @Component export struct ViewCodeText { @StorageLink('sideBarShow') sideBarShow: boolean = false; - private webSrc: Resource = $rawfile('BaseTypeCode.ets.html'); + private webSrc: Resource = $rawfile('BaseTypeCode.ets.html'); build() { - Column(){ + Column() { Text($r('app.string.source_code')) .fontColor($r('app.color.source_code_font_color')) .fontSize($r('app.float.source_code_font_size')) .alignSelf(ItemAlign.End) .id('viewSourceCode') - .onClick(() => { - // 点击查看源码 - AppStorage.SetOrCreate('sideBarShow', !this.sideBarShow); - AppStorage.SetOrCreate('webSrc', this.webSrc); - }) + .onClick((event: ClickEvent) => { + this.sideBarShow = !this.sideBarShow; // 自动同步（因 @StorageLink） + AppStorage.set('sideBarShow', this.sideBarShow); + AppStorage.set('webSrc', this.webSrc); + }); } .width('100%') - .justifyContent(FlexAlign.End) + .justifyContent(FlexAlign.End); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ts b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ts index 34907c61..ef48215f 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ts +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ts @@ -19,7 +19,7 @@ import Logger from '../utils/Logger'; const TAG = 'OutOfSyncAbility'; -export default class OutOfSyncAbility extends UIAbility { +export class OutOfSyncAbility extends UIAbility { onCreate(want, launchParam): void { Logger.info(TAG, 'Ability onCreate'); } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets index 78a2c917..050ae2b4 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -16,14 +16,15 @@ import { LocalStorage, + StorageLink, Entry, Component, State, Resource, - $r, LocalStorageLink, Column, AppStorage, + $r } from '@kit.ArkUI'; import { AbilityGlobalDataSyncCode } from './AbilityGlobalDataSyncCode'; @@ -31,9 +32,10 @@ import { CodeView } from '../../../commoncomponents/CodeView'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; import { TitleBar } from '../../../commoncomponents/TitleBar'; -let storage: LocalStorage = LocalStorage.GetShared(); +let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; + @Entry({ storage: "__get_local_storage__" }) @Component struct AbilityGlobalDataSync { @@ -55,10 +57,11 @@ struct AbilityGlobalDataSync { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : + $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets index a91fb5a4..40249ee5 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,14 +15,11 @@ */ import { - getUIContext, Component, LocalStorageLink, Column, - $rawfile, Row, Text, - $r, Toggle, ToggleType, Color, @@ -34,27 +31,31 @@ import { Button, ButtonType, Divider, + ColumnOptions, + $r, + $rawfile, + Margin, + ClickEvent } from '@kit.ArkUI'; import router from '@ohos.router'; import common from '@ohos.app.ability.common'; import { ViewCodeText } from '../../../commoncomponents/ViewCodeText'; import { startSpecifiedAbility } from '../../../utils/StartAbilityUtils'; - -// 声明一个上下文信息 -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; +import { Context, UIContext } from '@ohos.arkui.UIContext'; @Component export struct AbilityGlobalDataSyncCode { // 初始化字体大小最小值 - private minFontSize: number = 10; + private minFontSize: number = 10.0; // 和主页、Page1、Page2双向同步内容字体大小 - @LocalStorageLink('contentFontSize') contentFontSize: number = 18; + @LocalStorageLink('contentFontSize') contentFontSize: number = 18.0; // 和主页、Page1、Page2双向同步夜间模式状态 @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 查看源码 ViewCodeText({ webSrc: $rawfile('AbilityGlobalDataSyncCode.ets.html') }) Row() { @@ -72,7 +73,7 @@ export struct AbilityGlobalDataSyncCode { }) }.justifyContent(FlexAlign.SpaceAround) .width('70%') - .border({ radius: 50, color: Color.Grey, width: $r('app.float.border_width') }) + .border({ radius: 50.0, color: Color.Grey, width: $r('app.float.border_width') }) Text($r('app.string.ability_storage_nightmodelsync')) .fontSize(this.contentFontSize) @@ -91,8 +92,8 @@ export struct AbilityGlobalDataSyncCode { .fontSize($r('app.float.tips_font_size')) Slider({ value: this.contentFontSize, - min: 10, // 字体大小最小值 - max: 30, // 字体大小最大值 + min: 10.0, // 字体大小最小值 + max: 30.0, // 字体大小最大值 style: SliderStyle.OutSet }) .showTips(true) @@ -101,19 +102,19 @@ export struct AbilityGlobalDataSyncCode { this.contentFontSize = value; }) // toFixed(0)将滑动条返回值处理为整数精度 - Text(this.contentFontSize.toFixed(0)) + Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) } .width('80%') - }.margin({ top: 50 }) + }.margin({ top: 50.0 } as Margin) Text($r('app.string.ability_storage_fontsizesync')) .fontSize(this.contentFontSize) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button() { + Button('') { Text($r('app.string.enter_pageone')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -124,11 +125,12 @@ export struct AbilityGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { - getUIContext().getRouter.pushUrl({ url: 'pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage' }); + .onClick((event: ClickEvent) => { + this.getUIContext().getRouter().pushUrl( + { url: 'pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage' }); }) - Button() { + Button('') { Text($r('app.string.enter_pagetwo')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -139,12 +141,14 @@ export struct AbilityGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { - getUIContext().getRouter.pushUrl({ url: 'pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage' }); + .onClick((event: ClickEvent) => { + this.getUIContext() + .getRouter() + .pushUrl({ url: 'pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage' }); }) - Divider().width('100%').strokeWidth(1) - Button() { + Divider().width('100%').strokeWidth(1.0) + Button('') { Text($r('app.string.enter_ability_outofsync')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -155,11 +159,11 @@ export struct AbilityGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { - startSpecifiedAbility(CONTEXT,'OutOfSyncAbility'); + .onClick((event: ClickEvent) => { + startSpecifiedAbility(this.CONTEXT, 'OutOfSyncAbility'); }) } .width('100%') - .padding(10) + .padding(10.0) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets index 8e3fbb1a..29137605 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -20,15 +20,17 @@ import { Component, State, Resource, - $r, LocalStorageLink, Column, - $rawfile, Text, TextAlign, Button, ButtonType, AppStorage, + $r, + $rawfile, + ColumnOptions, + ClickEvent } from '@kit.ArkUI'; import { CodeView } from '../../../commoncomponents/CodeView'; @@ -36,9 +38,10 @@ import { ViewCodeText } from '../../../commoncomponents/ViewCodeText'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; import { TitleBar } from '../../../commoncomponents/TitleBar'; -let storage: LocalStorage = LocalStorage.GetShared(); +let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; + @Entry({ storage: "__get_local_storage__" }) @Component struct AbilityOutOfSyncPage { @@ -48,7 +51,7 @@ struct AbilityOutOfSyncPage { // 和主页、Page1、Page2不同步夜间模式状态 @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; // 和主页、Page1、Page2不同步内容字体大小 - @LocalStorageLink('contentFontSize') contentFontSize: number = 18; + @LocalStorageLink('contentFontSize') contentFontSize: number = 18.0; build() { Column() { @@ -58,7 +61,7 @@ struct AbilityOutOfSyncPage { TitleBar({ title: this.title, isAbility: true }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 30 }) { + Column({ space: 30.0 } as ColumnOptions) { // 查看源码 ViewCodeText({ webSrc: $rawfile('AbilityOutOfSyncPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) @@ -76,7 +79,7 @@ struct AbilityOutOfSyncPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button() { + Button('') { Text(this.currentModelStatus ? $r('app.string.close_nightmode') : $r('app.string.start_nightmode')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -87,7 +90,7 @@ struct AbilityOutOfSyncPage { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 更新控制夜间模式状态的变量数据，@LocalStorageLink和@LocalStorageProp关联的数据变量刷新 this.currentModelStatus = !this.currentModelStatus; }) @@ -98,10 +101,11 @@ struct AbilityOutOfSyncPage { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : + $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets index 9a49aa49..7daaff2d 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -20,15 +20,17 @@ import { Component, State, Resource, - $r, LocalStorageLink, Column, - $rawfile, Text, TextAlign, Button, ButtonType, AppStorage, + $r, + $rawfile, + ColumnOptions, + ClickEvent } from '@kit.ArkUI'; import { CodeView } from '../../../commoncomponents/CodeView'; @@ -36,9 +38,10 @@ import { ViewCodeText } from '../../../commoncomponents/ViewCodeText'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; import { TitleBar } from '../../../commoncomponents/TitleBar'; -let storage: LocalStorage = LocalStorage.GetShared(); +let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; + @Entry({ storage: "__get_local_storage__" }) @Component struct StorageLinkAbilityPage { @@ -46,7 +49,7 @@ struct StorageLinkAbilityPage { // 和主页、Page2双向同步夜间模式状态 @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; // 和主页、Page2双向同步内容字体大小 - @LocalStorageLink('contentFontSize') contentFontSize: number = 18; + @LocalStorageLink('contentFontSize') contentFontSize: number = 18.0; build() { Column() { @@ -56,7 +59,7 @@ struct StorageLinkAbilityPage { TitleBar({ title: this.title }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 30 }) { + Column({ space: 30.0 } as ColumnOptions) { // 查看源码 ViewCodeText({ webSrc: $rawfile('LocalStorageLinkPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) @@ -69,7 +72,7 @@ struct StorageLinkAbilityPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button() { + Button('') { Text(this.currentModelStatus ? $r('app.string.close_nightmode') : $r('app.string.start_nightmode')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -80,7 +83,7 @@ struct StorageLinkAbilityPage { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 更新控制夜间模式状态的变量数据，@LocalStorageLink和@StorageProp关联的数据变量刷新 this.currentModelStatus = !this.currentModelStatus; }) @@ -97,10 +100,11 @@ struct StorageLinkAbilityPage { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : + $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets index 0517320e..9fa23e44 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,18 +14,14 @@ * limitations under the License. */ -import { LocalStoragePropRef } from '@kit.ArkUI'; - import { LocalStorage, Entry, Component, State, Resource, - $r, LocalStorageLink, Column, - $rawfile, Text, TextAlign, Button, @@ -35,6 +31,12 @@ import { SliderStyle, SliderChangeMode, AppStorage, + $r, + $rawfile, + ColumnOptions, + ClickEvent, + Margin, + StorageLink } from '@kit.ArkUI'; import { CodeView } from '../../../commoncomponents/CodeView'; @@ -42,19 +44,20 @@ import { ViewCodeText } from '../../../commoncomponents/ViewCodeText'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; import { TitleBar } from '../../../commoncomponents/TitleBar'; -let storage: LocalStorage = LocalStorage.GetShared(); +let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; + @Entry({ storage: "__get_local_storage__" }) @Component struct StoragePropAbilityPage { @State title: Resource = $r('app.string.localStorage_pagetitleone'); // 初始化字体大小最小值 - private minFontSize: number = 10; + private minFontSize: number = 10.0; // 和主页、Page1双向同步夜间模式状态 - @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; + @StorageLink('currentModelStatus') currentModelStatus: boolean = true; // 和主页、Page1单向同步内容字体大小 - @LocalStoragePropRef('contentFontSize') contentFontSize: number = 18; + @StorageLink('contentFontSize') contentFontSize: number = 18.0; build() { Column() { @@ -64,7 +67,7 @@ struct StoragePropAbilityPage { TitleBar({ title: this.title }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 20 }) { + Column({ space: 20.0 } as ColumnOptions) { // 查看源码 ViewCodeText({ webSrc: $rawfile('LocalStoragePropPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) @@ -77,7 +80,7 @@ struct StoragePropAbilityPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button() { + Button('') { Text(this.currentModelStatus ? $r('app.string.close_nightmode') : $r('app.string.start_nightmode')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -88,7 +91,7 @@ struct StoragePropAbilityPage { .padding($r('app.float.page_padding')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 this.currentModelStatus = !this.currentModelStatus; }) @@ -111,8 +114,8 @@ struct StoragePropAbilityPage { .fontSize($r('app.float.tips_font_size')) Slider({ value: this.contentFontSize, - min: 10, // 字体大小最小值 - max: 30, // 字体大小最大值 + min: 10.0, // 字体大小最小值 + max: 30.0, // 字体大小最大值 style: SliderStyle.OutSet }) .showTips(true) @@ -121,12 +124,12 @@ struct StoragePropAbilityPage { this.contentFontSize = value; }) // toFixed(0)将滑动条返回值处理为整数精度 - Text(this.contentFontSize.toFixed(0)) + Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) } .width('80%') - }.margin({ top: 50 }) + }.margin({ top: 50.0 } as Margin) Text($r('app.string.localStorage_single_fontsize_binding')) .fontSize(this.contentFontSize) @@ -139,10 +142,11 @@ struct StoragePropAbilityPage { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : + $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets index 856c581b..4c580e20 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,13 +19,13 @@ import { Component, State, Resource, - $r, StorageLink, Column, AppStorage, + $r } from '@kit.ArkUI'; -import ApplyGlobalDataSyncCode from './ApplyGlobalDataSyncCode'; +import { ApplyGlobalDataSyncCode } from './ApplyGlobalDataSyncCode'; import { CodeView } from '../../../commoncomponents/CodeView'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; import { TitleBar } from '../../../commoncomponents/TitleBar'; @@ -50,10 +50,11 @@ struct ApplyGlobalDataSync { } }.width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : + $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets index 1dfb3add..1e7aa4e7 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,14 +15,11 @@ */ import { - getUIContext, Component, StorageLink, Column, - $rawfile, Row, Text, - $r, Toggle, ToggleType, Color, @@ -34,26 +31,29 @@ import { SliderChangeMode, Button, ButtonType, + ColumnOptions, + $r, + $rawfile, + ClickEvent, + Margin } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { ViewCodeText } from '../../../commoncomponents/ViewCodeText'; import { startSpecifiedAbility } from '../../../utils/StartAbilityUtils'; -// 声明一个上下文信息 -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; - @Component -export default struct ApplyGlobalDataSyncCode { +export struct ApplyGlobalDataSyncCode { // 和Ability1、Ability2页面双向同步内容字体大小 - @StorageLink('contentFontSize') contentFontSize: number = 18; + @StorageLink('contentFontSize') contentFontSize: number = 18.0; // 和Ability1、Ability2页面双向同步夜间模式状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; // 初始化字体大小最小值 - private minFontSize: number = 10; + private minFontSize: number = 10.0; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 查看源码 ViewCodeText({ webSrc: $rawfile('ApplyGlobalDataSyncCode.ets.html') }) Row() { @@ -68,11 +68,11 @@ export default struct ApplyGlobalDataSyncCode { .onChange((isOn: boolean) => { // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageLink关联的数据变量刷新 this.currentModelStatus = isOn; - AppStorage.SetOrCreate('currentModelStatus', this.currentModelStatus); + AppStorage.set('currentModelStatus', this.currentModelStatus); }) }.justifyContent(FlexAlign.SpaceAround) .width('70%') - .border({ radius: 50, color: Color.Grey, width: $r('app.float.border_width') }) + .border({ radius: 50.0, color: Color.Grey, width: $r('app.float.border_width') }) Text($r('app.string.nightmode_text')) .fontSize(this.contentFontSize) @@ -92,29 +92,29 @@ export default struct ApplyGlobalDataSyncCode { Slider({ value: this.contentFontSize, min: this.minFontSize, // 字体大小最小值 - max: 30, // 字体大小最大值 + max: 30.0, // 字体大小最大值 style: SliderStyle.OutSet }) .showTips(true) .onChange((value: number, mode: SliderChangeMode) => { // 更新控制字体大小状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 this.contentFontSize = value; - AppStorage.SetOrCreate('contentFontSize', this.contentFontSize); + AppStorage.set('contentFontSize', this.contentFontSize); }) // toFixed(0)将滑动条返回值处理为整数精度 - Text(this.contentFontSize.toFixed(0)) + Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) } .width('80%') - }.margin({ top: 50 }) + }.margin({ top: 50.0 } as Margin) Text($r('app.string.fontSize_singlesync_textone')) .fontSize(this.contentFontSize) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button() { + Button('') { Text($r('app.string.enter_abilityone')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -125,11 +125,11 @@ export default struct ApplyGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { - startSpecifiedAbility(CONTEXT, 'StoragePropAbility'); + .onClick((event: ClickEvent) => { + startSpecifiedAbility(this.CONTEXT, 'StoragePropAbility'); }) - Button() { + Button('') { Text($r('app.string.enter_abilitytwo')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -140,8 +140,8 @@ export default struct ApplyGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { - startSpecifiedAbility(CONTEXT, 'StorageLinkAbility'); + .onClick((event: ClickEvent) => { + startSpecifiedAbility(this.CONTEXT, 'StorageLinkAbility'); }) }.padding($r('app.float.page_padding')) } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets index 9b67be21..575e6d41 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,18 +19,19 @@ import { Component, State, Resource, - $r, StorageLink, Column, - $rawfile, Text, TextAlign, Button, ButtonType, AppStorage, + $r, + $rawfile, + ColumnOptions, + ClickEvent } from '@kit.ArkUI'; - import { CodeView } from '../../../commoncomponents/CodeView'; import { ViewCodeText } from '../../../commoncomponents//ViewCodeText'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; @@ -45,7 +46,7 @@ struct StorageLinkAbilityPage { // 和主页、Ability1页面双向同步夜间模式状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; // 和主页、Ability1页面双向同步内容字体大小 - @StorageLink('contentFontSize') contentFontSize: number = 18; + @StorageLink('contentFontSize') contentFontSize: number = 18.0; build() { Column() { @@ -55,7 +56,7 @@ struct StorageLinkAbilityPage { TitleBar({ title: this.title, isAbility: true }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 30 }) { + Column({ space: 30.0 } as ColumnOptions) { // 查看源码 ViewCodeText({ webSrc: $rawfile('StorageLinkAbilityPage.ets.html') }) Text($r('app.string.both_data_binding')) @@ -68,7 +69,7 @@ struct StorageLinkAbilityPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button() { + Button('') { Text(this.currentModelStatus ? $r('app.string.close_nightmode') : $r('app.string.start_nightmode')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -79,7 +80,7 @@ struct StorageLinkAbilityPage { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 this.currentModelStatus = !this.currentModelStatus; }) @@ -94,10 +95,11 @@ struct StorageLinkAbilityPage { } }.width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : + $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets index fbb47570..38c08965 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,17 +14,14 @@ * limitations under the License. */ -import { StoragePropRef } from '@kit.ArkUI'; - import { + StoragePropRef, Entry, Component, State, Resource, - $r, StorageLink, Column, - $rawfile, Text, TextAlign, Button, @@ -34,6 +31,11 @@ import { SliderStyle, SliderChangeMode, AppStorage, + $r, + $rawfile, + ColumnOptions, + ClickEvent, + Margin } from '@kit.ArkUI'; import { CodeView } from '../../../commoncomponents/CodeView'; @@ -46,11 +48,11 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; struct StoragePropAbilityPage { @State title: Resource = $r('app.string.abilityone_page'); // 初始化字体大小最小值 - private minFontSize: number = 10; + private minFontSize: number = 10.0; // 和主页、Ability2页面双向同步夜间模式状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; // 和主页、Ability2页面单向同步内容字体大小 - @StoragePropRef('contentFontSize') contentFontSize: number = 18; + private contentFontSize: number = 18.0; build() { Column() { @@ -60,7 +62,7 @@ struct StoragePropAbilityPage { TitleBar({ title: this.title, isAbility: true }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 20 }) { + Column({ space: 20.0 }as ColumnOptions) { // 查看源码 ViewCodeText({ webSrc: $rawfile('StoragePropAbilityPage.ets.html') }) Text($r('app.string.both_data_binding')) @@ -73,7 +75,7 @@ struct StoragePropAbilityPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button() { + Button('') { Text(this.currentModelStatus ? $r('app.string.close_nightmode') : $r('app.string.start_nightmode')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -84,7 +86,7 @@ struct StoragePropAbilityPage { .padding($r('app.float.page_padding')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick(() => { + .onClick(() : void=> { // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 this.currentModelStatus = !this.currentModelStatus; }) @@ -108,7 +110,7 @@ struct StoragePropAbilityPage { Slider({ value: this.contentFontSize, min: this.minFontSize, - max: 30, // 字体大小最大值 + max: 30.0, // 字体大小最大值 style: SliderStyle.OutSet }) .showTips(true) @@ -117,12 +119,12 @@ struct StoragePropAbilityPage { this.contentFontSize = value; }) // toFixed(0)将滑动条返回值处理为整数精度 - Text(this.contentFontSize.toFixed(0)) + Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) } .width('80%') - }.margin({ top: 50 }) + }.margin({ top: 50.0 }as Margin) Text($r('app.string.single_fontsize_binding')) .fontSize(this.contentFontSize) @@ -139,6 +141,6 @@ struct StoragePropAbilityPage { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ts b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ts index d9e9c567..ec6cc99e 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ts +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -export type AbilityConfigType = { - bundleName: string, +export interface AbilityConfigType { + bundleName: string; abilityName: string }; \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets index f703d602..04685b36 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -24,15 +24,18 @@ import { ForEach, TabContent, BarMode, - $r, Builder, Column, Image, Text, HorizontalAlign, + $r, + Padding, + Margin, + ArrayLike } from '@kit.ArkUI'; -import { FirstLevelCategory } from './model/CategoricalDataType'; +import { FirstLevelCategory, SecondLevelCategory, ThirdLevelCategory } from './model/CategoricalDataType'; import { HOME_TABS } from './data/HomeData'; import { TabContentNavigation } from './TabContentNavigation'; @@ -40,19 +43,19 @@ import { TabContentNavigation } from './TabContentNavigation'; @Component struct Home { // 初始化tabsBar的index值为0 - @State tabsIndex: number = 0; + tabsIndex: number = 0.0; @StorageLink('currentBreakpoint') curBp: string = 'sm'; build() { Tabs({ barPosition: this.curBp === 'sm' ? BarPosition.End : BarPosition.Start }) { ForEach(HOME_TABS, (item: FirstLevelCategory, index: number) => { TabContent() { - TabContentNavigation({ categories: item.childNodes }) + TabContentNavigation({ categories: item.childNodes }); } .tabBar(() => { this.CustomTabBar(item, index) }) - }, item => JSON.stringify(item)) + }, (item, index) => index.toString()) } .vertical(this.curBp === 'sm' ? false : true) // 大型设备tabbar的高度为40%，小型设备的高度为56vp @@ -66,21 +69,22 @@ struct Home { }) } - @Builder CustomTabBar(item: FirstLevelCategory, index: number) { + @Builder + CustomTabBar(item: FirstLevelCategory, index: number) { Column() { Image(this.tabsIndex === index ? item.iconSelected : item.icon) - .width(24) - .height(24) - .margin({ bottom: 4 }) + .width(24.0) + .height(24.0) + .margin({ bottom: 4.0 } as Margin) Text(item.tabBarName) - .fontSize(10) + .fontSize(10.0) .fontFamily('HarmonyHeiTi-Medium') .fontColor(this.tabsIndex === index ? $r('app.color.tab_bar_select') : $r('app.color.tab_bar_unselect')) } .width('100%') .id(`tabBar${index}`) - .padding({ top: 6, bottom: 6 }) + .padding({ top: 6.0, bottom: 6.0 } as Padding) .alignItems(HorizontalAlign.Center) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets index 2355b422..8de03237 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -17,15 +17,12 @@ import { ColumnAttribute, Color, - Preview, Component, Column, List, - ForEach, ListItem, Text, TextAlign, - $r, Blank, Divider, ItemAlign, @@ -33,73 +30,94 @@ import { Row, Image, Alignment, + Padding, + ClickEvent, + Margin, + $r, + ColumnOptions } from '@kit.ArkUI'; import router from '@ohos.router'; import { SecondLevelCategory, ThirdLevelCategory, FourthLevelCategory } from './model/CategoricalDataType'; - -function ColumnStyle(this: ColumnAttribute): this { - this.width('100%'); - this.borderRadius(24); - this.backgroundColor(Color.White); - this.padding({ left: 12, right: 12, bottom: 4, top: 4 }); - return this; +import { UIContext } from '@ohos.arkui.UIContext'; +import { ForEach } from '@ohos.arkui.component'; + +function ColumnStyle(this: ColumnAttribute): ColumnAttribute { + this.width('100%'); + this.borderRadius(24.0); + this.backgroundColor(Color.White); + this.padding({ + left: 12.0, + right: 12.0, + bottom: 4.0, + top: 4.0 + } as Padding); + return this; } -@Preview @Component export struct TabContentNavigation { - private categories: ThirdLevelCategory[] | SecondLevelCategory[] = []; + private categories: (ThirdLevelCategory | SecondLevelCategory)[] = []; - hasSecondLevelCategory(category): boolean { - return category && category.tag ? false : true; + hasSecondLevelCategory(category: ThirdLevelCategory | SecondLevelCategory): boolean { + return (category as SecondLevelCategory).tag !== undefined; } build() { Column() { List() { if (this.categories.length > 0 && this.hasSecondLevelCategory(this.categories[0])) { - ForEach(this.categories, (secondLevelCategory: SecondLevelCategory, secondLevelCategoryIndex: number) => { - ListItem() { - Column() { - Text(secondLevelCategory.title) - .height(48) - .fontSize(14) - .width('100%') - .textAlign(TextAlign.Start) - .fontFamily('HarmonyHeiTi-Medium') - .fontColor($r('app.color.font_color_shallow')) - .padding({ bottom: 4, top: 4, left: 24 }) - + ForEach(this.categories, (item: ThirdLevelCategory | SecondLevelCategory, index: number) => { + if (this.hasSecondLevelCategory(item)) { + const secondLevelCategory = item as SecondLevelCategory; + ListItem() { Column() { - ForEach(secondLevelCategory.childNodes, (thirdLevelCategory: ThirdLevelCategory, - thirdLevelCategoryIndex: number) => { - ThirdLevelNavigation({ - thirdLevelCategory: thirdLevelCategory, - secondLevelCategoryIndex: secondLevelCategoryIndex, - ThirdLevelNavigationIndex: thirdLevelCategoryIndex + Text(secondLevelCategory.title) + .height(48.0) + .fontSize(14.0) + .width('100%') + .textAlign(TextAlign.Start) + .fontFamily('HarmonyHeiTi-Medium') + .fontColor($r('app.color.font_color_shallow')) + .padding({ bottom: 4.0, top: 4.0, left: 24.0 } as Padding) + + Column() { + ForEach(secondLevelCategory.childNodes, (thirdLevelCategory: ThirdLevelCategory, + thirdLevelCategoryIndex: number) => { + ThirdLevelNavigation({ + thirdLevelCategory: thirdLevelCategory, + secondLevelCategoryIndex: index, // 使用外层索引 + ThirdLevelNavigationIndex: thirdLevelCategoryIndex + }) }) - }) + } + .ColumnStyle() } - .ColumnStyle() } } - }) + }, (item: ThirdLevelCategory | SecondLevelCategory) => item.toString()) // 添加key生成函数 } else { - ForEach(this.categories, (thirdLevelCategory: ThirdLevelCategory) => { - ListItem() { - Column() { - ThirdLevelNavigation({ thirdLevelCategory: thirdLevelCategory }) + ForEach(this.categories, (item: ThirdLevelCategory | SecondLevelCategory, index: number) => { + if (!this.hasSecondLevelCategory(item)) { + const thirdLevelCategory = item as ThirdLevelCategory; + ListItem() { + Column() { + ThirdLevelNavigation({ + thirdLevelCategory: thirdLevelCategory, + secondLevelCategoryIndex: -1, // 标记为没有二级分类 + ThirdLevelNavigationIndex: index + }) + } + .ColumnStyle() } - .ColumnStyle() + .margin({ top: 4.0, bottom: 4.0 } as Margin) } - .margin({ top: 4, bottom: 4 }) - }) + }, (item: ThirdLevelCategory | SecondLevelCategory) => item.toString()) // 添加key生成函数 } } .width('100%') - .layoutWeight(1) - .padding({ left: 16, right: 16, top: 4 }) + .layoutWeight(1.0) + .padding({ left: 16.0, right: 16.0, top: 4.0 } as Padding) Blank() @@ -110,7 +128,7 @@ export struct TabContentNavigation { .color($r('app.color.tab_bar_divider')) } .height('100%') - .padding({ top: 12 }) + .padding({ top: 12.0 } as Padding) } } @@ -118,15 +136,15 @@ export struct TabContentNavigation { struct ThirdLevelNavigation { @State isUnfold: boolean = false; private thirdLevelCategory: ThirdLevelCategory; - private ThirdLevelNavigationIndex: int; + private ThirdLevelNavigationIndex: number; private secondLevelCategoryIndex: number; build() { Column() { Row() { Text(this.thirdLevelCategory.title) - .fontSize(16) - .margin({ left: 16 }) + .fontSize(16.0) + .margin({ left: 16.0 } as Margin) .fontFamily('HarmonyHeiTi-Medium') .fontColor($r('app.color.font_color_dark')) @@ -134,41 +152,39 @@ struct ThirdLevelNavigation { if (this.thirdLevelCategory.childNodes) { Image(this.isUnfold ? $r('app.media.ic_down_arrow') : $r('app.media.ic_right_arrow')) - .width(this.isUnfold ? 24 : 12) - .height(this.isUnfold ? 12 : 24) - .margin({ right: this.isUnfold ? 0 : 6 }) + .width(this.isUnfold ? 24.0 : 12.0) + .height(this.isUnfold ? 12.0 : 24.0) + .margin({ right: this.isUnfold ? 0.0 : 6.0 } as Margin) } } - .height(56) + .height(56.0) .width('100%') - .onClick(() => { + .onClick((event: ClickEvent) => { if (this.thirdLevelCategory.childNodes === undefined) { - // Click to jump to the corresponding page - router.push({ - url: this.thirdLevelCategory.url + this.getUIContext().getRouter().pushUrl({ + url: this.thirdLevelCategory.url as string }); } else { this.isUnfold = !this.isUnfold; } }) - // Click to expand the fourth-level category if (this.isUnfold) { - ForEach(this.thirdLevelCategory.childNodes, (fourthLevelCategory: FourthLevelCategory) => { + ForEach(this.thirdLevelCategory.childNodes, (fourthLevelCategory: FourthLevelCategory, index: number) => { Column() { Divider() - .height(1) + .height(1.0) .opacity(0.2) - .margin({ left: 42, right: 8 }) + .margin({ left: 42.0, right: 8.0 } as Margin) .color($r('app.color.font_color_dark')) FourthLevelNavigation({ fourthLevelCategory: fourthLevelCategory }) } - }, item => JSON.stringify(item)) + }, (item: FourthLevelCategory) => item.toString()) // 添加key生成函数 } } - // 整体字符串折行会被识别出来，导致功能异常，只能放在单独一行，1和0分别为首页标题层级index - .id(`secondLevelMenu${this.secondLevelCategoryIndex}${this.secondLevelCategoryIndex === 1 ? 0 : this.ThirdLevelNavigationIndex}`) + .id(`secondLevelMenu${this.secondLevelCategoryIndex}${this.secondLevelCategoryIndex === 1 ? 0 : + this.ThirdLevelNavigationIndex}`) } } @@ -179,20 +195,20 @@ struct FourthLevelNavigation { build() { Row() { Text(this.fourthLevelCategory.title) - .fontSize(16) - .layoutWeight(1) - .margin({ left: 42 }) + .fontSize(16.0) + .layoutWeight(1.0) + .margin({ left: 42.0 } as Margin) .align(Alignment.Start) .fontFamily('HarmonyHeiTi-Medium') .fontColor($r('app.color.font_color_dark')) Blank() } - .height(48) + .height(48.0) .width('100%') - .onClick(() => { + .onClick((event: ClickEvent) => { // Click to jump to the corresponding page - router.push({ - url: this.fourthLevelCategory.url + this.getUIContext().getRouter().pushUrl({ + url: this.fourthLevelCategory.url as string }); }) } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets index 47d2e612..8b3dc2a3 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets @@ -14,15 +14,13 @@ * limitations under the License. */ -import { $r } from '@kit.ArkUI'; - import { FirstLevelCategory, FourthLevelCategory, SecondLevelCategory, - ThirdLevelCategory + ThirdLevelCategory, } from '../model/CategoricalDataType'; - +import { $r } from '@kit.ArkUI'; const DECORATED_OBJECT_TYPE: FourthLevelCategory[] = [ { @@ -48,12 +46,12 @@ const UPDATE_PRINCIPLE: FourthLevelCategory[] = [ const SINGLE_COMPONENT_CATEGORY: ThirdLevelCategory[] = [ { - tag: 1, + tag: 1.0, title: $r('app.string.decorated_object_type'), childNodes: DECORATED_OBJECT_TYPE }, { - tag: 1, + tag: 1.0, title: $r('app.string.update_principle'), childNodes: UPDATE_PRINCIPLE } @@ -72,23 +70,23 @@ const PARENT_CHILD_SYNC: FourthLevelCategory[] = [ const MULTI_COMPONENTS_CATEGORY: ThirdLevelCategory[] = [ { - tag: 1, + tag: 1.0, title: $r('app.string.parent_child_sync'), childNodes: PARENT_CHILD_SYNC }, { - tag: 1, + tag: 1.0, title: $r('app.string.parent_descendent_sync'), url: 'pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync' }, { - tag: 1, + tag: 1.0, title: $r('app.string.brother_sync'), url: 'pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync' } ]; -const PAGE_LEVEL_CATEGORY: SecondLevelCategory[] = [ +const PAGE_LEVEL_CATEGORY: Array = [ { title: $r('app.string.single_component_state'), childNodes: SINGLE_COMPONENT_CATEGORY @@ -100,14 +98,14 @@ const PAGE_LEVEL_CATEGORY: SecondLevelCategory[] = [ ]; -const APP_LEVEL_CATEGORY: ThirdLevelCategory[] = [ +const APP_LEVEL_CATEGORY: Array = [ { - tag: 1, + tag: 1.0, title: $r('app.string.application_storage_ui'), url: 'pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync', }, { - tag: 1, + tag: 1.0, title: $r('app.string.ability_storage_ui'), url: 'pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync', } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets index 91d93e00..42c31a10 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets @@ -1,7 +1,7 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License") + * Copyright (c) 2025 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 * @@ -17,13 +17,14 @@ import { Resource } from '@kit.ArkUI'; export interface FirstLevelCategory { - childNodes: SecondLevelCategory[] | ThirdLevelCategory[], + childNodes: Array, iconSelected: Resource, // The icon for the first-level category is selected icon: Resource, // The icon for the first-level category is not selected tabBarName: Resource // First-level category title } export interface SecondLevelCategory { + tag?: number, title: Resource, // Second-level category titles childNodes: ThirdLevelCategory[] } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets index ea5cbd0b..ac8312cd 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,9 +19,9 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; import { CodeView } from '../../../../commoncomponents/CodeView'; @@ -45,6 +45,6 @@ struct BrotherComponentSync { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets index 906b60d8..8916eba2 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,8 +18,10 @@ import { Component, Column, Text, - $r, TextAlign, + $r, + Margin, + Resource } from '@kit.ArkUI'; import { ProvideFatherComponent } from './ProvideFatherComponent'; @@ -27,7 +29,6 @@ import { StateFatherComponent } from './StateFatherComponent'; @Component export struct BrotherComponentSyncCode { - build() { Column() { Column() { @@ -47,7 +48,7 @@ export struct BrotherComponentSyncCode { // 共同父组件@Provide ProvideFatherComponent() } - .margin({ top: 10 }) + .margin({ top: 10.0 } as Margin) } } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets index ddd0ef45..0ae2e875 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,41 +15,42 @@ */ import { - getUIContext, Component, State, Consume, Resource, Column, - $rawfile, Text, - $r, TextAlign, Row, Select, - Circle, + SelectOption, FlexAlign, Color, + ColumnOptions, + $r, + $rawfile } from '@kit.ArkUI'; +import { Circle } from '@ohos.arkui.component'; import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; - @Component export struct ConsumeBrotherOneComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 和父组件、子组件B双向同步圆形颜色 @Consume consumeCircleColor: Resource; // 和父组件、子组件B双向同步Select组件的Index值 - @Consume currentSelectIndex: number; + @Consume currentSelectIndex: number = 0; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ConsumeBrotherOneComponent.ets.html') }) Text($r('app.string.consume_brothers_title')) @@ -58,19 +59,20 @@ export struct ConsumeBrotherOneComponent { .width('100%') .textAlign(TextAlign.Center) Row() { - Select(this.selectColors) + Select(this.selectValues) .id('consumeSelectCompA') .selected(this.currentSelectIndex) - .value(getResourceString(CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) - .onSelect((index: number) => { - // 此组件@Consume声明的数据页面更新，兄弟组件@Consume的数据页面同步更新 + .onSelect((index: number, text: string) => { + // 孙组件@Consume声明的数据页面更新，爷组件@Provide的数据页面同步更新 this.currentSelectIndex = index; this.consumeCircleColor = this.selectColors[index as int].color; }) + Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.consumeCircleColor) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets index d9f1247f..c931cccf 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -20,34 +20,37 @@ import { Consume, Resource, Column, - $rawfile, Text, - $r, TextAlign, Row, Select, - getUIContext, - Circle, FlexAlign, Color, + ColumnOptions, + $r, + $rawfile, + SelectOption } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; +import { Circle, } from '@ohos.arkui.component'; @Component export struct ConsumeBrotherTwoComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 和父组件、子组件B双向同步圆形颜色 @Consume consumeCircleColor: Resource; // 和父组件、子组件A双向同步Select组件的Index值 @Consume currentSelectIndex: number; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ConsumeBrotherTwoComponent.ets.html') }) Text($r('app.string.consume_brothers_title')) @@ -57,28 +60,29 @@ export struct ConsumeBrotherTwoComponent { .textAlign(TextAlign.Center) .height($r('app.float.button_height')) Row() { - Select(this.selectColors) + Select(this.selectValues) .id('consumeSelectCompB') .selected(this.currentSelectIndex) - .value(getResourceString(getUIContext().getHostContext(this) as common.UIAbilityContext, - this.selectColors[this.currentSelectIndex as int].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) - .onSelect((index: number) => { + .onSelect((index: number, text: string) => { // 此组件@Consume声明的数据页面更新，兄弟组件@Consume的数据页面同步更新 this.currentSelectIndex = index; this.consumeCircleColor = this.selectColors[index as int].color; }) Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) + .width($r('app.float.circle_size')) + .height($r('app.float.circle_size')) .fill(this.consumeCircleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets index 6ffae7bb..9a59c979 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,41 +15,44 @@ */ import { - getUIContext, Component, State, Link, Resource, Column, - $rawfile, Text, - $r, TextAlign, Row, Select, - Circle, FlexAlign, Color, + ColumnOptions, + $r, + $rawfile, + SizeOptions, + BorderOptions, + SelectOption } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; - -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; +import { Circle, } from '@ohos.arkui.component'; @Component export struct LinkBrotherOneComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 和父组件、子组件B双向同步圆形颜色 @Link circleColor: Resource; // 和父组件、子组件B双向同步Select组件的Index值 @Link currentSelectIndex: number; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('LinkBrotherOneComponent.ets.html') }) Text($r('app.string.link_brothers_title')) @@ -59,27 +62,32 @@ export struct LinkBrotherOneComponent { .textAlign(TextAlign.Center) .fontColor($r('app.color.tips_font_color')) Row() { - Select(this.selectColors) + Select(this.selectValues) .id('linkSelectCompA') .selected(this.currentSelectIndex) - .value(getResourceString(CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) + // .value(getResourceString(this.CONTEXT, this.selectValues[this.currentSelectIndex as int].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) - .onSelect((index: number) => { + .onSelect((index: number, text: string) => { // 此组件@Link声明的数据页面更新，兄弟组件@Link的数据页面同步更新 this.currentSelectIndex = index; this.circleColor = this.selectColors[index as int].color; }) Circle() - .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) + .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') } as SizeOptions) .fill(this.circleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') } - .padding(10) - .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) + .padding(10.0) + .border({ + radius: $r('app.float.component_radius'), + color: Color.Blue, + width: $r('app.float.border_width') + } as BorderOptions) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets index 85688a14..074bba42 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -20,34 +20,37 @@ import { Link, Resource, Column, - $rawfile, Text, - $r, TextAlign, Row, Select, - getUIContext, - Circle, FlexAlign, Color, + $r, + $rawfile, + ColumnOptions, + SelectOption } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; +import { Circle, } from '@ohos.arkui.component'; @Component export struct LinkBrotherTwoComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 和父组件、子组件A双向同步圆形颜色 @Link circleColor: Resource; // 和父组件、子组件A双向同步Select的Index值 @Link currentSelectIndex: number; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('LinkBrotherTwoComponent.ets.html') }) Text($r('app.string.link_brothers_title')) @@ -57,15 +60,16 @@ export struct LinkBrotherTwoComponent { .textAlign(TextAlign.Center) .height($r('app.float.button_height')) Row() { - Select(this.selectColors) + Select(this.selectValues) .id('linkSelectCompB') .selected(this.currentSelectIndex) - .value(getResourceString(getUIContext().getHostContext(this) as common.UIAbilityContext, this.selectColors[this.currentSelectIndex as int].value)) + // .value(getResourceString(this.CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) - .onSelect((index: number) => { + .onSelect((index: number, text: string) => { // 此组件@Link声明的数据页面更新，兄弟组件@Link的数据页面同步更新 this.currentSelectIndex = index; this.circleColor = this.selectColors[index as int].color; @@ -76,7 +80,7 @@ export struct LinkBrotherTwoComponent { }.justifyContent(FlexAlign.SpaceAround) .width('100%') } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets index 0079c1a7..a1f72f89 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,12 +19,13 @@ import { State, Provide, Resource, - $r, Column, - $rawfile, Text, TextAlign, Color, + $r, + $rawfile, + ColumnOptions, } from '@kit.ArkUI'; import { ColorType } from '../model/ColorType'; @@ -40,10 +41,10 @@ export struct ProvideFatherComponent { // 共同父组件使用@Provide初始化圆形颜色 @Provide consumeCircleColor: Resource = $r('app.color.circle_blue'); // 初始化Select组件的Index为0 - @Provide currentSelectIndex: number = 0; + @Provide currentSelectIndex: number = 0.0; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ProvideFatherComponent.ets.html') }) Text($r('app.string.parent_titletwo')) @@ -55,7 +56,7 @@ export struct ProvideFatherComponent { ConsumeBrotherOneComponent() // 和父组件双向同步子组件B ConsumeBrotherTwoComponent() - }.padding(10) + }.padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets index f48e460c..59df408d 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets @@ -18,12 +18,13 @@ import { Component, State, Resource, - $r, Column, - $rawfile, Text, TextAlign, Color, + $r, + $rawfile, + ColumnOptions } from '@kit.ArkUI'; import { ColorType } from '../model/ColorType'; @@ -37,12 +38,11 @@ export struct StateFatherComponent { // 共同父组件使用@State初始化圆形颜色 @State circleColor: Resource = $r('app.color.circle_blue'); // 初始化一个颜色数组 - @State selectColors: ColorType[] = COLOR_SELECT_DATA; // 初始化当前Select的Index为0 - @State currentSelectIndex: number = 0; + @State currentSelectIndex: number = 0.0; build() { - Column({ space: 10 }) { + Column({ space: 10.0 }as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('StateFatherComponent.ets.html') }) Text($r('app.string.parent_titleone')) @@ -60,7 +60,7 @@ export struct StateFatherComponent { circleColor: this.circleColor, currentSelectIndex: this.currentSelectIndex }) - }.padding(10) + }.padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets index d21954cd..27d7c8eb 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,17 +14,23 @@ * limitations under the License. */ -import { $r } from '@kit.ArkUI'; - import { ColorType } from '../model/ColorType' +import { $r, SelectOption } from '@kit.ArkUI'; export const COLOR_SELECT_DATA: ColorType[] = [ { - value: $r('app.string.select_colorblue'), color: $r('app.color.circle_blue') }, { - value: $r('app.string.select_colorpink'), color: $r('app.color.circle_pink') } +] + +export const NEW_COLOR_SELECT_DATA: SelectOption[] = [ + { + value: $r('app.string.select_colorblue'), + }, + { + value: $r('app.string.select_colorpink'), + } ] \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets index 9f1fc5a8..2f3e46bc 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,55 +15,55 @@ */ import { - getUIContext, Component, State, Consume, Resource, Column, - $rawfile, Row, Select, - $r, - Circle, FlexAlign, Text, TextAlign, Color, + $r, + $rawfile, + Margin, + SelectOption } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; - -// 声明一个上下文变量 -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; +import { Circle, } from '@ohos.arkui.component'; @Component export struct ConsumeDescendentComponent { // 初始化一个颜色数组数据 @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 和爷组件双向同步圆形颜色 @Consume consumeCircleColor: Resource; // 和爷组件双向同步Select的Index值 @Consume currentSelectIndex: number; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ConsumeDescendentComponent.ets.html') }) Row() { - Select(this.selectColors) + Select(this.selectValues) .selected(this.currentSelectIndex) - .value(getResourceString(CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.tips_font_size') }) .selectedOptionFont({ size: $r('app.float.tips_font_size') }) .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandsonCompB') - .onSelect((index: number) => { + .onSelect((index: number, text?: string | undefined) => { // 孙组件@Consume声明的数据页面更新，爷组件@Provide的数据页面同步更新 this.currentSelectIndex = index; this.consumeCircleColor = this.selectColors[index as int].color; @@ -74,7 +74,7 @@ export struct ConsumeDescendentComponent { }.justifyContent(FlexAlign.SpaceAround) .width('100%') - .margin({ bottom: 6 }) + .margin({ bottom: 6.0 } as Margin) Text($r('app.string.deepnest_descendent_titletwo')) .fontColor($r('app.color.tips_font_color')) @@ -82,7 +82,7 @@ export struct ConsumeDescendentComponent { .width('100%') .textAlign(TextAlign.Center) } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Red, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets index ebadb463..69912f32 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,9 +19,9 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; import { CodeView } from '../../../../commoncomponents/CodeView'; @@ -45,6 +45,6 @@ struct DeepNestComponentsSync { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets index 67687dc5..c061c869 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,8 +18,9 @@ import { Component, Column, Text, - $r, TextAlign, + Margin, + $r } from '@kit.ArkUI'; import { StateGrandfatherComponent } from './StateGrandfatherComponent'; @@ -36,7 +37,7 @@ export struct DeepNestComponentsSyncCode { .textAlign(TextAlign.Start) // 爷组件@State StateGrandfatherComponent() - }.margin({ bottom: 16 }) + }.margin({ bottom: 16.0 } as Margin) Column() { Text($r('app.string.realize_by_provide_consume')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets index 34d01d8d..48da86df 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,53 +15,54 @@ */ import { - getUIContext, Component, State, Link, Resource, Column, - $rawfile, Row, Select, - $r, - Circle, FlexAlign, Text, TextAlign, Color, + $r, + $rawfile, + Margin, + SelectOption } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; - -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; +import { Circle, } from '@ohos.arkui.component'; @Component export struct LinkDescendentComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 和父组件和爷组件双向同步圆形颜色 @Link circleColor: Resource; // 和父组件和爷组件双向同步Select的Index值 @Link currentSelectIndex: number; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('LinkDescendentComponent.ets.html') }) Row() { - Select(this.selectColors) + Select(this.selectValues) .selected(this.currentSelectIndex) - .value(getResourceString(CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.tips_font_size') }) .selectedOptionFont({ size: $r('app.float.tips_font_size') }) .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandsonCompA') - .onSelect((index: number) => { + .onSelect((index: number, text?: string | undefined) => { // 孙组件@Link组件数据页面更新，爷组件同步更新 this.currentSelectIndex = index; this.circleColor = this.selectColors[index as int].color; @@ -71,7 +72,7 @@ export struct LinkDescendentComponent { .fill(this.circleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') - .margin({ bottom: 6 }) + .margin({ bottom: 6.0 } as Margin) Text($r('app.string.deepnest_descendent_titleone')) .fontColor($r('app.color.tips_font_color')) @@ -79,7 +80,7 @@ export struct LinkDescendentComponent { .width('100%') .textAlign(TextAlign.Center) } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Red, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets index bfd9f4b3..ad395828 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,81 +15,82 @@ */ import { - getUIContext, Component, State, Provide, Resource, - $r, Column, - $rawfile, Text, TextAlign, Row, Select, - Circle, FlexAlign, Color, + $r, + $rawfile, + Margin, + SelectOption } from '@kit.ArkUI'; - import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { ConsumeDescendentComponent } from './ConsumeDescendentComponent'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; import { getResourceString } from '../../../../utils/ResourceUtils'; - -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; +import { Circle, } from '@ohos.arkui.component'; @Component export struct ProvideGrandfatherComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 初始化爷组件@Provide的原型颜色 @Provide consumeCircleColor: Resource = $r('app.color.circle_blue'); // 初始化Select组件的Index @Provide currentSelectIndex: number = 0; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { // 点击查看源码 - ViewCodeText({ webSrc: $rawfile('ProvideGrandfatherComponent.ets.html') }) + ViewCodeText({ webSrc: $rawfile('ProvideGrandfatherComponent.ets.html') }) Text($r('app.string.deepnest_parent_titletwo')) .fontSize($r('app.float.tips_font_size')) .fontColor($r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - .margin({ top: 10 }) + .margin({ top: 10.0 } as Margin) Row() { - Select(this.selectColors) + Select(this.selectValues) .selected(this.currentSelectIndex) - .value(getResourceString(CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) + // .value(getResourceString(this.CONTEXT, this.selectColors[this.currentSelectIndex].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.tips_font_size') }) .selectedOptionFont({ size: $r('app.float.tips_font_size') }) .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandfatherCompB') - .onSelect((index: number) => { + .onSelect((index: number, text?: string | undefined) => { // 爷组件@Provide声明的数据页面更新，孙组件@Consume关联的变量同步更新 this.currentSelectIndex = index; - this.consumeCircleColor = this.selectColors[index as int].color; + this.consumeCircleColor = this.selectColors[index].color; }) Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.consumeCircleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') - .margin({ bottom: 6 }) + .margin({ bottom: 6.0 } as Margin) + // 子组件 ConsumeChildComp() - }.padding(10) + }.padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } @Component struct ConsumeChildComp { - build() { Column() { Text($r('app.string.deepnest_child_titletwo')) @@ -101,7 +102,7 @@ struct ConsumeChildComp { // 双向同步孙组件 ConsumeDescendentComponent() } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets index 0dbf9497..003a2f7d 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,32 +15,30 @@ */ import { - getUIContext, Component, State, Resource, - $r, Column, - $rawfile, Text, TextAlign, Row, Select, - Circle, FlexAlign, Color, Link, + $r, + $rawfile, + ColumnOptions, + SelectOption } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { LinkDescendentComponent } from './LinkDescendentComponent'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; - -// 声明一个上下文变量 -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; +import { Circle } from '@ohos.arkui.component'; @Component export struct StateGrandfatherComponent { @@ -48,11 +46,13 @@ export struct StateGrandfatherComponent { @State circleColor: Resource = $r('app.color.circle_blue'); // 初始化一个颜色数组 @State selectColors: ColorType[] = COLOR_SELECT_DATA; + @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; // 初始化当前select组件的index - @State currentSelectIndex: number = 0; + @State currentSelectIndex: number = 0.0; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('StateGrandfatherComponent.ets.html') }) Text($r('app.string.deepnest_parent_titleone')) @@ -61,15 +61,15 @@ export struct StateGrandfatherComponent { .width('100%') .textAlign(TextAlign.Center) Row() { - Select(this.selectColors) + Select(this.selectValues) .selected(this.currentSelectIndex) - .value(getResourceString(CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) + .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.tips_font_size') }) .selectedOptionFont({ size: $r('app.float.tips_font_size') }) .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandfatherCompA') - .onSelect((index: number) => { + .onSelect((index: number, text?: string | undefined) => { // 爷组件@State声明的数据页面更新，孙组件@Link关联的变量同步更新 this.currentSelectIndex = index; this.circleColor = this.selectColors[index as int].color; @@ -79,9 +79,10 @@ export struct StateGrandfatherComponent { .fill(this.circleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') + // 双向同步子组件 LinkChildComp({ circleColor: this.circleColor, currentSelectIndex: this.currentSelectIndex }) - }.padding(10) + }.padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } @@ -107,7 +108,7 @@ struct LinkChildComp { currentSelectIndex: this.currentSelectIndex }) } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets index 2a6e7aa4..01c27eb3 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -16,7 +16,8 @@ import { Resource } from '@kit.ArkUI'; -export type ColorType = { - value:Resource, - color:Resource, -}; \ No newline at end of file +export interface ColorType { + color: Resource, +}; + + diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets index 6388b58b..18f738ed 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,14 +18,15 @@ import { Component, ObjectLink, Column, - $rawfile, Text, - $r, TextAlign, Row, TextInput, FlexAlign, Color, + ColumnOptions, + $r, + $rawfile } from '@kit.ArkUI'; import { ClassObject } from './ParentChildPartialContentSyncCode'; @@ -37,7 +38,7 @@ export struct ObjectLinkComponent { @ObjectLink childObjectData: ClassObject; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ObjectLinkComponent.ets.html') }) @@ -51,12 +52,12 @@ export struct ObjectLinkComponent { .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) .textAlign(TextAlign.Center) - .layoutWeight(1) + .layoutWeight(1.0) TextInput({ text: this.childObjectData.attributeType }) - .fontSize(20) - .layoutWeight(1) + .fontSize(20.0) + .layoutWeight(1.0) .id('childAttribute') - .onChange((value: string) => { + .onChange((value: string): void => { // 子组件对象属性更新，父元素同步 this.childObjectData.attributeType = value; }) @@ -64,6 +65,6 @@ export struct ObjectLinkComponent { .justifyContent(FlexAlign.SpaceAround) } .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) - .padding(10) + .padding(10.0) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets index f8ee9d51..38167f62 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,9 +19,9 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; import { ParentChildPartialContentSyncCode } from './ParentChildPartialContentSyncCode'; @@ -45,6 +45,6 @@ struct ParentChildPartialContentSync { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets index 1b5719da..a6115cf0 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,22 +14,23 @@ * limitations under the License. */ -import { PropRef } from '@kit.ArkUI'; - import { Observed, Resource, - $r, Component, State, Column, - $rawfile, Text, TextAlign, ForEach, Color, ObjectLink, TextInput, + $r, + $rawfile, + ColumnOptions, + PropRef, + ClickEvent } from '@kit.ArkUI'; import { ObjectLinkComponent } from './ObjectLinkComponent'; @@ -48,19 +49,20 @@ export class ClassObject { } // 初始化父组件中的数据 -const PARENT_DATA: ClassObject[] = [new ClassObject($r('app.string.partial_sync_element_one'), $r('app.string.partial_sync_attribute_one')), - new ClassObject($r('app.string.partial_sync_element_two'), $r('app.string.partial_sync_attribute_two')), - new ClassObject($r('app.string.partial_sync_element_three'), $r('app.string.partial_sync_attribute_three'))]; +const PARENT_DATA: ClassObject[] = + [new ClassObject($r('app.string.partial_sync_element_one'), $r('app.string.partial_sync_attribute_one')), + new ClassObject($r('app.string.partial_sync_element_two'), $r('app.string.partial_sync_attribute_two')), + new ClassObject($r('app.string.partial_sync_element_three'), $r('app.string.partial_sync_attribute_three'))]; @Component export struct ParentChildPartialContentSyncCode { // 初始化父组件中状态变量 @State parentData: ClassObject[] = PARENT_DATA; // 与子组件同步的的数据是数组的第几个元素，默认选中第一个 - @State syncIndex: number = 0; + @State syncIndex: number = 0.0; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ParentChildPartialContentSyncCode.ets.html') }) @@ -76,19 +78,19 @@ export struct ParentChildPartialContentSyncCode { ParentCompDataItem({ index: index, syncIndex: this.syncIndex, childObject: item }) } .backgroundColor(index === this.syncIndex ? $r('app.color.component_background_pink') : undefined) - .onClick(() => { + .onClick((): void => { this.syncIndex = index; }) - }, item => JSON.stringify(item)) + }, index => index.toString()) } .width('100%') .backgroundColor($r('app.color.component_background_pink')) //与父组件状态同步的子组件 - ObjectLinkComponent({ childObjectData: this.parentData[this.syncIndex as int] }) + ObjectLinkComponent({ childObjectData: this.parentData[this.syncIndex] }) } .width('100%') - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } @@ -96,8 +98,8 @@ export struct ParentChildPartialContentSyncCode { // 展示数组中单个元素的子组件 @Component struct ParentCompDataItem { - private index: int; - @PropRef syncIndex: number; + private index: number; + syncIndex: number; // 使用@ObjectLink修饰，与父组件中元素同步 @ObjectLink childObject: ClassObject; @@ -105,22 +107,22 @@ struct ParentCompDataItem { Column() { Text(this.childObject.elementType) .width('100%') - .fontSize(20) + .fontSize(20.0) if (this.index === this.syncIndex) { TextInput({ text: this.childObject.attributeType }) - .fontSize(20) - .id(`attribute${this.index + 1}`) - .onChange((value: string) => { + .fontSize(20.0) + .id(`attribute${this.index + 1.0}`) + .onChange((value: string): void => { // 更新父组件中元素的属性，子组件同步 this.childObject.attributeType = value; }) } else { Text(this.childObject.attributeType) .width('100%') - .fontSize(20) + .fontSize(20.0) } } - .padding(10) + .padding(10.0) .id(`arrayElement${this.index}`) } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets index 656da62b..52543e76 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,18 +18,21 @@ import { Component, Link, Column, - $rawfile, Text, - $r, TextAlign, Circle, Button, ButtonType, Color, + ColumnOptions, + $r, + $rawfile, + ClickEvent } from '@kit.ArkUI'; import { COLOR_DATA } from './UniAndBidirectionSyncCode'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; +import { Circle, } from '@ohos.arkui.component'; @Component export struct ChildCompLink { @@ -37,15 +40,15 @@ export struct ChildCompLink { @Link circleColor: string; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 - ViewCodeText({webSrc: $rawfile('ComponentLink.ets.html')}) + ViewCodeText({ webSrc: $rawfile('ComponentLink.ets.html') }) Text($r('app.string.child_component')) .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - .margin(10) + .margin(10.0) Text($r('app.string.both_direction_sync_tips')) .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) @@ -55,7 +58,7 @@ export struct ChildCompLink { Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.circleColor) - Button() { + Button('') { Text($r('app.string.both_direction_sync_btn')) .fontColor($r('app.color.button_text_color')) .fontSize($r('app.float.button_text_size')) @@ -66,12 +69,12 @@ export struct ChildCompLink { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick(() => { + .onClick((): void => { // 点击更新子组件@Link声明的变量，此子组件更新，父组件以及@Prop声明的子组件变量同步 this.circleColor = COLOR_DATA.RED; }) } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets index 4348b9a8..867ba5a1 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,38 +14,41 @@ * limitations under the License. */ -import { PropRef } from '@kit.ArkUI'; - import { Component, Column, - $rawfile, Text, - $r, + PropRef, TextAlign, Circle, Button, ButtonType, Color, + ColumnOptions, + $r, + $rawfile, + ClickEvent, + StorageProp } from '@kit.ArkUI'; +import { Circle } from '@ohos.arkui.component'; import { COLOR_DATA } from './UniAndBidirectionSyncCode'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; @Component export struct ChildCompProp { // 圆形颜色，和父组件中的状态变量单向同步，只支持基础类型 - @PropRef circleColor: string; + @StorageProp('circleColor') circleColor: string = 'red'; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ComponentProp.ets.html') }) Text($r('app.string.child_component')) .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - .margin(10) + .margin(10.0) Text($r('app.string.single_direction_sync_tips')) .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) @@ -55,7 +58,7 @@ export struct ChildCompProp { Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.circleColor) - Button() { + Button('') { Text($r('app.string.single_direction_sync_btn')) .fontColor($r('app.color.button_text_color')) .fontSize($r('app.float.button_text_size')) @@ -66,12 +69,12 @@ export struct ChildCompProp { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick(() => { + .onClick((): void => { // 点击更新子组件@Prop声明的变量，此子组件更新，父组件以及@Link声明的子组件变量不同步 this.circleColor = COLOR_DATA.BLUE; }) } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets index 7de6e685..d08948f1 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,9 +19,9 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; import { UniAndBidirectionSyncCode } from './UniAndBidirectionSyncCode'; @@ -45,6 +45,6 @@ struct UniAndBidirectionSync { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets index f904bba3..a959d730 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,22 +18,31 @@ import { Component, State, Column, - $rawfile, Text, - $r, TextAlign, - Circle, Button, ButtonType, Color, + ColumnOptions, + ClickEvent, + $r, + $rawfile } from '@kit.ArkUI'; import { ChildCompLink } from './ComponentLink'; import { ChildCompProp } from './ComponentProp'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; +import { Circle, } from '@ohos.arkui.component'; + +interface ColorData { + GREY: string; + BLUE: string; + PINK: string; + RED: string; +} // 初始化圆形的可设置颜色 -export const COLOR_DATA = { +export const COLOR_DATA: ColorData = { GREY: '#eebebeba', BLUE: '#4A90E2', PINK: '#8DF8BEBE', @@ -46,15 +55,15 @@ export struct UniAndBidirectionSyncCode { @State circleColor: string = COLOR_DATA.GREY; build() { - Column({ space: 10 }) { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('UniAndBidirectionSyncCode.ets.html') }) Text($r('app.string.parent_component')) .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - .margin(10) + .margin(10.0) Text($r('app.string.uni_and_bidirection_sync_tips')) .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) @@ -64,7 +73,7 @@ export struct UniAndBidirectionSyncCode { .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.circleColor) // 点击更新父组件的圆形颜色变量，父组件更新，子组件@Link以及@Prop继承的变量同步 - Button() { + Button('') { Text($r('app.string.uni_and_bidirection_sync_btn')) .fontColor($r('app.color.button_text_color')) .fontSize($r('app.float.button_text_size')) @@ -75,16 +84,17 @@ export struct UniAndBidirectionSyncCode { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick(() => { + .onClick((event: ClickEvent) => { this.circleColor = COLOR_DATA.PINK; }) } + // 单向同步子组件 ChildCompProp({ circleColor: this.circleColor }) // 双向同步子组件 ChildCompLink({ circleColor: this.circleColor }) } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets index 06fbbb42..aa4ac22c 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,9 +19,9 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; import { ArrayTypeCode } from './ArrayTypeCode'; @@ -29,7 +29,7 @@ import { CodeView } from '../../../../../commoncomponents/CodeView' @Entry @Component -struct ArrayType { +struct ArrayTypes { @State title: Resource = $r('app.string.array_type'); build() { @@ -45,6 +45,6 @@ struct ArrayType { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets index 28518fb7..b67912df 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets @@ -1,11 +1,11 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2 (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 + * http://www.apache.org/licenses/LICENSE-2 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -16,20 +16,23 @@ import { Resource, - $r, Component, State, Column, - $rawfile, List, ForEach, ListItem, Button, ButtonType, Color, - getUIContext, Text, Divider, + $r, + $rawfile, + ColumnOptions, + ClickEvent, + Margin, + Padding } from '@kit.ArkUI'; import promptAction from '@ohos.promptAction'; @@ -50,10 +53,10 @@ export class ArrayDataType { // 初始化数组数据 const ARRAY_TYPE_AGE_DATA: ArrayDataType[] = [new ArrayDataType(0, 'name', 17), new ArrayDataType(1, 'name', 18), - new ArrayDataType(2, 'name', 19)] + new ArrayDataType(2, 'name', 19)] // 初始化功能按钮字符串数据 const ARRAY_TYPE_BTN: Resource[] = [$r('app.string.array_type_add'), $r('app.string.array_type_delete'), - $r('app.string.array_type_update')]; + $r('app.string.array_type_update')]; @Component export struct ArrayTypeCode { @@ -61,7 +64,7 @@ export struct ArrayTypeCode { @State arrayTypeData: ArrayDataType[] = ARRAY_TYPE_AGE_DATA; build() { - Column({ space: 10 }) { + Column({ space: 10 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ArrayTypeCode.ets.html') }) // 数组内容展示 @@ -70,14 +73,16 @@ export struct ArrayTypeCode { ListItem() { ArrayDataItem({ arrayDataItem: item, itemIndex: index }) } - }, item => JSON.stringify(item)) + }, index => index.toString()) + } .width('100%') .height('40%') .backgroundColor($r('app.color.component_background_pink')) - .padding({ left: 10, right: 10 }) + .padding({ left: 10, right: 10 } as Padding) + // 功能按钮区 - ForEach(ARRAY_TYPE_BTN, (item:Resource, index:number) => { + ForEach(ARRAY_TYPE_BTN, (item: Resource, index: number) => { Button(item) .id(`arrayTypeBtn${index}`) .width('100%') @@ -86,25 +91,26 @@ export struct ArrayTypeCode { .fontSize($r('app.float.button_text_size')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick(() => { + .onClick((event: ClickEvent) => { this.handleButtonClick(index) }) - }, item => JSON.stringify(item)) + }, index => index.toString()) } .padding(10) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } - handleButtonClick(index: number){ - switch (index) { + handleButtonClick(index: number) { + const intIndex = index | 0; + switch (intIndex) { case 0: - // 数组添加元素 - this.arrayTypeData.push(new ArrayDataType(this.arrayTypeData.length, `name`, 18)); // 新增元素数据，age为18 + // 数组添加元素 + this.arrayTypeData.push(new ArrayDataType(this.arrayTypeData.length, `name`, 18)); break; case 1: if (this.arrayTypeData.length === 0) { // 当数据没有数据的时候，点击删除按钮，出现提示弹窗 - getUIContext().getPromptAction.showToast({ + promptAction.openToast({ message: $r('app.string.array_type_deletetoast') }); } else { @@ -115,13 +121,14 @@ export struct ArrayTypeCode { case 2: if (this.arrayTypeData.length === 0) { // 当数据没有数据的时候，点击更新按钮，出现提示弹窗 - getUIContext().getPromptAction.showToast({ + promptAction.openToast({ message: $r('app.string.array_type_updatetoast') }); break; } - // 初始化一个对象后给数组中的元素赋值，更新数组元素 - let temp = new ArrayDataType(this.arrayTypeData[0].id, this.arrayTypeData[0].name, this.arrayTypeData[0].age + 1); + // 初始化一个对象后给数组中的元素赋值，更新数组元素 + let temp = + new ArrayDataType(this.arrayTypeData[0].id, this.arrayTypeData[0].name, this.arrayTypeData[0].age + 1); this.arrayTypeData[0] = temp; break; default: @@ -133,7 +140,8 @@ export struct ArrayTypeCode { // 数组Item内容组件 @Component struct ArrayDataItem { - private arrayDataItem: ArrayDataType; + // private arrayDataItem: ArrayDataType; + private arrayDataItem: ArrayDataType = new ArrayDataType(0, "default", 18); private itemIndex: number; build() { @@ -148,8 +156,8 @@ struct ArrayDataItem { .fontSize(20) Divider().width('100%') .strokeWidth(1) - .margin({ top: 20 }) + .margin({ top: 20 } as Margin) } - .margin({ top: 20 }) + .margin({ top: 20 } as Margin) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets index d461a806..d7a36ac5 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,12 +19,11 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; - import { BaseTypeCode } from './BaseTypeCode'; import { CodeView } from '../../../../../commoncomponents/CodeView' @@ -35,7 +34,7 @@ struct BaseType { build() { Column() { - CodeView({ title: this.title}){ + CodeView({ title: this.title }) { BaseTypeCode() } } @@ -46,6 +45,6 @@ struct BaseType { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets index 56ccdd7f..d9c69579 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,27 +18,30 @@ import { Component, State, Resource, - $r, Column, - $rawfile, Text, TextAlign, Circle, Button, ButtonType, Color, + $r, + $rawfile, + ColumnOptions, + ClickEvent } from '@kit.ArkUI'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText' +import { Circle } from '@ohos.arkui.component'; @Component export struct BaseTypeCode { @State circleColor: Resource = $r('app.color.circle_pink'); build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 - ViewCodeText({webSrc: $rawfile('BaseTypeCode.ets.html')}) + ViewCodeText({ webSrc: $rawfile('BaseTypeCode.ets.html') }) Text($r('app.string.base_type_tip_text')) .fontColor($r('app.color.tips_font_color')) @@ -48,7 +51,7 @@ export struct BaseTypeCode { Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.circleColor) - Button() { + Button('') { Text(this.circleColor.id === $r('app.color.circle_pink') .id ? $r('app.string.set_to_blue') : $r('app.string.set_to_pink')) .fontColor($r('app.color.button_text_color')) @@ -60,7 +63,7 @@ export struct BaseTypeCode { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick(() => { + .onClick((event: ClickEvent) => { if (this.circleColor.id === $r('app.color.circle_pink').id) { this.circleColor = $r('app.color.circle_blue'); } else { @@ -68,7 +71,7 @@ export struct BaseTypeCode { } }) } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets index c5b09fdf..e3825994 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,9 +19,9 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; import { ClassObjectTypeCode } from './ClassObjectTypeCode'; @@ -45,6 +45,6 @@ struct ClassObjectType { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets index cfe7b7f0..8b9031cf 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,15 +14,11 @@ * limitations under the License. */ -import { applyStyles } from '@kit.ArkUI'; - import { - getUIContext, + applyStyles, Component, State, - $r, Column, - $rawfile, Row, Text, TextAlign, @@ -34,45 +30,50 @@ import { ObjectLink, CommonMethod, Observed, + ColumnOptions, + ClickEvent, + $r, + $rawfile, + Padding, + Margin } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; import { getResourceString } from '../../../../../utils/ResourceUtils'; -const CONTEXT: common.UIAbilityContext = getUIContext().getHostContext(this) as common.UIAbilityContext; - @Component export struct ClassObjectTypeCode { // 对象类型状态变量初始化 - @State classObjectData: ParentClass = new ParentClass(getResourceString(CONTEXT, $r('app.string.class_object')), - getResourceString(CONTEXT, $r('app.string.class_attribute')), 1, - new ChildClass(getResourceString(CONTEXT, $r('app.string.class_child_attribute')), 2)); + @State classObjectData: ParentClass = new ParentClass(getResourceString(this.CONTEXT, $r('app.string.class_object')), + getResourceString(this.CONTEXT, $r('app.string.class_attribute')), 1.0, + new ChildClass(getResourceString(this.CONTEXT, $r('app.string.class_child_attribute')), 2.0)); // 更新对象的次数 - private clickedCount: int = 0; + private clickedCount: number = 0.0; + private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ClassObjectTypeCode.ets.html') }) - Column({ space: 15 }) { + Column({ space: 15.0 } as ColumnOptions) { Row() { Text(this.classObjectData.title) - .fontSize(20) + .fontSize(20.0) .textAlign(TextAlign.End) Divider() - .layoutWeight(1) - .strokeWidth(1) - .margin({ top: 20, left: 5 }) + .layoutWeight(1.0) + .strokeWidth(1.0) + .margin({ top: 20.0, left: 5.0 } as Margin) } .width('100%') Column() { Row() { Text(this.classObjectData.attributeTitle) - .fontSize(20) + .fontSize(20.0) Text(`${this.classObjectData.attribute}`) - .fontSize(20) + .fontSize(20.0) .textAlign(TextAlign.End) } .width('100%') @@ -80,27 +81,29 @@ export struct ClassObjectTypeCode { Divider() .width('100%') - .strokeWidth(1) + .strokeWidth(1.0) } .width('100%') - .padding({ left: 50 }) + .padding({ left: 50.0 } as Padding) ChildObjectComp({ childObject: this.classObjectData.child }) // 对象的属性，使用子组件显示 } .width('100%') .backgroundColor($r('app.color.component_background_pink')) - .padding(10) + .padding(10.0) + // 点击更新对象 Button($r('app.string.class_type_update_object')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 更新对象，把新的对象直接赋值给状态变量 this.clickedCount++; - let objectTitle: string = getResourceString(CONTEXT, $r('app.string.class_object')) + this.clickedCount; - let attributeTitle: string = getResourceString(CONTEXT, $r('app.string.class_attribute')) + this.clickedCount; - let childAttributeTitle: string = getResourceString(CONTEXT, $r('app.string.class_child_attribute')) - + this.clickedCount; - let newObject = new ParentClass(objectTitle, attributeTitle, this.classObjectData.attribute + 1, - new ChildClass(childAttributeTitle, this.classObjectData.child.attribute + 1)); + let objectTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_object')) + this.clickedCount; + let attributeTitle: string = + getResourceString(this.CONTEXT, $r('app.string.class_attribute')) + this.clickedCount; + let childAttributeTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_child_attribute')) + + this.clickedCount; + let newObject = new ParentClass(objectTitle, attributeTitle, this.classObjectData.attribute + 1.0, + new ChildClass(childAttributeTitle, this.classObjectData.child.attribute + 1.0)); this.classObjectData = newObject; }) .id('updateObject') @@ -109,7 +112,7 @@ export struct ClassObjectTypeCode { .type(ButtonType.Capsule) .applyStyles(buttonStyle) Button($r('app.string.class_type_update_attribute')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 点击更新对象的属性 this.classObjectData.attribute++; }) @@ -119,7 +122,7 @@ export struct ClassObjectTypeCode { .type(ButtonType.Capsule) .applyStyles(buttonStyle) Button($r('app.string.class_type_update_child_attribute')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 点击更新对象属性的属性 this.classObjectData.child.attribute++; }) @@ -130,7 +133,7 @@ export struct ClassObjectTypeCode { .applyStyles(buttonStyle) } .width('100%') - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } @@ -145,9 +148,9 @@ struct ChildObjectComp { Column() { Row() { Text(this.childObject.title) - .fontSize(20) + .fontSize(20.0) Text(`${this.childObject.attribute}`) - .fontSize(20) + .fontSize(20.0) .textAlign(TextAlign.End) } .width('100%') @@ -155,17 +158,17 @@ struct ChildObjectComp { Divider() .width('100%') - .strokeWidth(1) + .strokeWidth(1.0) } .width('100%') - .padding({ left: 100 }) + .padding({ left: 100.0 } as Padding) } } function buttonStyle(instance: CommonMethod): void { - instance.width('100%'); - instance.height($r('app.float.button_height')); - instance.backgroundColor($r('app.color.button_background_color')); + instance.width('100%'); + instance.height($r('app.float.button_height')); + instance.backgroundColor($r('app.color.button_background_color')); } // 要更新对象属性的属性，对象属性的类需要使用@Observed修饰 diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets index 1f25ab83..a7ba64ef 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -19,9 +19,9 @@ import { Component, State, Resource, - $r, Column, AppStorage, + $r } from '@kit.ArkUI'; import { UpdateBoundComponentCode } from './UpdateBoundComponentCode'; @@ -45,6 +45,6 @@ struct UpdateBoundComponent { } aboutToDisappear(): void { - AppStorage.SetOrCreate('sideBarShow', false); + AppStorage.set('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets index 17af11f1..d208f78a 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -18,14 +18,17 @@ import { Component, State, Column, - $rawfile, Text, - $r, Row, FlexAlign, Button, ButtonType, Color, + ColumnOptions, + ClickEvent, + $r, + $rawfile, + Margin } from '@kit.ArkUI'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; @@ -37,12 +40,12 @@ export struct UpdateBoundComponentCode { // 组件内private变量 private content: string = 'content'; // 组件内变量更新的次数 - private updateCount: int = 0; + private updateCount: number = 0.0; build() { - Column({ space: 10 }) { + Column({ space: 10.0 } as ColumnOptions) { // 点击查看源码 - ViewCodeText({webSrc: $rawfile('UpdateBoundComponentCode.ets.html')}) + ViewCodeText({ webSrc: $rawfile('UpdateBoundComponentCode.ets.html') }) Column() { Text($r('app.string.only_update_state')) @@ -55,35 +58,35 @@ export struct UpdateBoundComponentCode { .fontSize($r('app.float.button_text_size')) Text(`${this.titleName}`) // titleName为状态变量，绑定Text组件 .fontColor($r('app.color.button_text_color')) - .fontSize(20) + .fontSize(20.0) } .width('100%') - .margin(10) + .margin(10.0) Text($r('app.string.only_update_private')) .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) .width('100%') - .margin({ top: 20 }) + .margin({ top: 20.0 } as Margin) Row() { Text($r('app.string.only_update_content')) .fontColor($r('app.color.button_text_color')) .fontSize($r('app.float.button_text_size')) Text(`${this.content}`) // content为private，绑定Text组件 .fontColor($r('app.color.button_text_color')) - .fontSize(20) + .fontSize(20.0) } .width('100%') - .margin(10) + .margin(10.0) } .width('100%') - .padding(10) + .padding(10.0) .justifyContent(FlexAlign.SpaceAround) .backgroundColor($r('app.color.component_background_pink')) Column() { Button($r('app.string.update_title_content')) - .onClick(() => { + .onClick((event: ClickEvent) => { // 点击更新@State和Private声明的变量，更新策略为：@State和Private的数据发生变化，@State变量绑定的组件更新，Private变量绑定的组件不更新。 this.updateCount++; this.content = `content ${this.updateCount}`; @@ -99,10 +102,10 @@ export struct UpdateBoundComponentCode { Text($r('app.string.only_update_state_components')) .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.button_text_size')) - .margin({ top: 30 }) + .margin({ top: 30.0 } as Margin) }.width('100%') } - .padding(10) + .padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ts b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ts index 2a793848..bdced81b 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ts +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ts @@ -14,13 +14,14 @@ */ import type common from '@ohos.app.ability.common'; +import { resourceManager } from '@kit.LocalizationKit' /** * getResourceString将Resource类型的数据转换成string类型的数据 * @param context * @param ResourceData */ -export function getResourceString(context: common.UIAbilityContext, resourceData: Resource): string { +export function getResourceString(context: common.UIAbilityContext, resourceData: resourceManager.Resource): string { let stringData: string = context.resourceManager.getStringSync(resourceData.id); return stringData; } \ No newline at end of file -- Gitee From 7b48b23d59e650a078954e723fa509363c437b5c Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Wed, 13 Aug 2025 14:40:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?manualfix=5F=E9=9D=99=E6=80=81=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangweiyuan --- .../decoratedobjecttype/arraytype/ArrayTypeCode.ets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets index b67912df..66eea742 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets @@ -1,11 +1,11 @@ 'use static' /* * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2 (the "License"); + * 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 + * 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, -- Gitee From ab96c0a0402f031fe76dcb838fe234b85aaa98d7 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Mon, 18 Aug 2025 10:23:38 +0800 Subject: [PATCH 3/7] sample_SateManagement_TabContentNavigationfix Signed-off-by: wangweiyuan --- .../ets/pages/home/TabContentNavigation.ets | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets index 8de03237..7f6e62e1 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets @@ -20,6 +20,7 @@ import { Component, Column, List, + ForEach, ListItem, Text, TextAlign, @@ -34,13 +35,12 @@ import { ClickEvent, Margin, $r, - ColumnOptions + ColumnOptions, } from '@kit.ArkUI'; import router from '@ohos.router'; import { SecondLevelCategory, ThirdLevelCategory, FourthLevelCategory } from './model/CategoricalDataType'; import { UIContext } from '@ohos.arkui.UIContext'; -import { ForEach } from '@ohos.arkui.component'; function ColumnStyle(this: ColumnAttribute): ColumnAttribute { this.width('100%'); @@ -57,7 +57,8 @@ function ColumnStyle(this: ColumnAttribute): ColumnAttribute { @Component export struct TabContentNavigation { - private categories: (ThirdLevelCategory | SecondLevelCategory)[] = []; + private categories: Array = + new Array(); hasSecondLevelCategory(category: ThirdLevelCategory | SecondLevelCategory): boolean { return (category as SecondLevelCategory).tag !== undefined; @@ -86,7 +87,7 @@ export struct TabContentNavigation { thirdLevelCategoryIndex: number) => { ThirdLevelNavigation({ thirdLevelCategory: thirdLevelCategory, - secondLevelCategoryIndex: index, // 使用外层索引 + secondLevelCategoryIndex: index, ThirdLevelNavigationIndex: thirdLevelCategoryIndex }) }) @@ -135,14 +136,14 @@ export struct TabContentNavigation { @Component struct ThirdLevelNavigation { @State isUnfold: boolean = false; - private thirdLevelCategory: ThirdLevelCategory; + private thirdLevelCategory?: ThirdLevelCategory; private ThirdLevelNavigationIndex: number; private secondLevelCategoryIndex: number; build() { Column() { Row() { - Text(this.thirdLevelCategory.title) + Text(this.thirdLevelCategory?.title) .fontSize(16.0) .margin({ left: 16.0 } as Margin) .fontFamily('HarmonyHeiTi-Medium') @@ -150,7 +151,7 @@ struct ThirdLevelNavigation { Blank() - if (this.thirdLevelCategory.childNodes) { + if (this.thirdLevelCategory?.childNodes) { Image(this.isUnfold ? $r('app.media.ic_down_arrow') : $r('app.media.ic_right_arrow')) .width(this.isUnfold ? 24.0 : 12.0) .height(this.isUnfold ? 12.0 : 24.0) @@ -160,9 +161,9 @@ struct ThirdLevelNavigation { .height(56.0) .width('100%') .onClick((event: ClickEvent) => { - if (this.thirdLevelCategory.childNodes === undefined) { + if (!this.thirdLevelCategory?.childNodes) { this.getUIContext().getRouter().pushUrl({ - url: this.thirdLevelCategory.url as string + url: this.thirdLevelCategory?.url as string }); } else { this.isUnfold = !this.isUnfold; @@ -170,7 +171,7 @@ struct ThirdLevelNavigation { }) if (this.isUnfold) { - ForEach(this.thirdLevelCategory.childNodes, (fourthLevelCategory: FourthLevelCategory, index: number) => { + ForEach(this.thirdLevelCategory?.childNodes!, (fourthLevelCategory: FourthLevelCategory, index: number) => { Column() { Divider() .height(1.0) @@ -180,7 +181,7 @@ struct ThirdLevelNavigation { FourthLevelNavigation({ fourthLevelCategory: fourthLevelCategory }) } - }, (item: FourthLevelCategory) => item.toString()) // 添加key生成函数 + }, (item: FourthLevelCategory) => item.title.toString()) // 添加key生成函数 } } .id(`secondLevelMenu${this.secondLevelCategoryIndex}${this.secondLevelCategoryIndex === 1 ? 0 : @@ -190,11 +191,11 @@ struct ThirdLevelNavigation { @Component struct FourthLevelNavigation { - private fourthLevelCategory: FourthLevelCategory; + private fourthLevelCategory?: FourthLevelCategory; build() { Row() { - Text(this.fourthLevelCategory.title) + Text(this.fourthLevelCategory?.title) .fontSize(16.0) .layoutWeight(1.0) .margin({ left: 42.0 } as Margin) @@ -208,7 +209,7 @@ struct FourthLevelNavigation { .onClick((event: ClickEvent) => { // Click to jump to the corresponding page this.getUIContext().getRouter().pushUrl({ - url: this.fourthLevelCategory.url as string + url: this.fourthLevelCategory?.url as string }); }) } -- Gitee From 03939afa09078e409247f8a45841d0e392043bf4 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Mon, 1 Sep 2025 12:13:10 +0800 Subject: [PATCH 4/7] fix_sample_StateManagement_manualfix_0901 Signed-off-by: wangweiyuan --- .../StateManagement/build-profile.json5 | 21 +++++++- .../main/ets/commoncomponents/CodeView.ets | 20 +++---- .../main/ets/commoncomponents/TitleBar.ets | 14 +++-- .../ets/commoncomponents/TitleBarDark.ets | 13 +++-- .../ets/commoncomponents/ViewCodeText.ets | 11 ++-- .../src/main/ets/entryability/EntryAbility.ts | 2 - .../AbilityGlobalDataSync.ets | 13 ++--- .../AbilityGlobalDataSyncCode.ets | 35 +++++------- .../AbilityOutOfSyncPage.ets | 20 +++---- .../LocalStorageLinkPage.ets | 18 +++---- .../LocalStoragePropPage.ets | 32 ++++------- .../ApplyGlobalDataSync.ets | 13 ++--- .../ApplyGlobalDataSyncCode.ets | 25 +++------ .../StorageLinkAbilityPage.ets | 19 +++---- .../StoragePropAbilityPage.ets | 20 +++---- .../entry/src/main/ets/pages/home/Home.ets | 8 +-- .../ets/pages/home/TabContentNavigation.ets | 21 ++++---- .../src/main/ets/pages/home/data/HomeData.ets | 2 - .../pages/home/model/CategoricalDataType.ets | 3 +- .../BrotherComponentSync.ets | 6 +-- .../BrotherComponentSyncCode.ets | 10 ++-- .../ConsumeBrotherOneComponent.ets | 21 +++----- .../ConsumeBrotherTwoComponent.ets | 16 ++---- .../LinkBrotherOneComponent.ets | 23 +++----- .../LinkBrotherTwoComponent.ets | 15 ++---- .../ProvideFatherComponent.ets | 10 +--- .../StateFatherComponent.ets | 10 +--- .../multicompomentssync/data/ColorData.ets | 7 ++- .../ConsumeDescendentComponent.ets | 17 +++--- .../DeepNestComponentsSync.ets | 6 +-- .../DeepNestComponentsSyncCode.ets | 8 ++- .../LinkDescendentComponent.ets | 18 +++---- .../ProvideGrandfatherComponent.ets | 26 ++++----- .../StateGrandfatherComponent.ets | 24 +++------ .../multicompomentssync/model/ColorType.ets | 4 +- .../ObjectLinkComponent.ets | 11 ++-- .../ParentChildPartialContentSync.ets | 6 +-- .../ParentChildPartialContentSyncCode.ets | 36 +++++-------- .../uniandbidirectionsync/ComponentLink.ets | 16 +++--- .../uniandbidirectionsync/ComponentProp.ets | 15 +++--- .../UniAndBidirectionSync.ets | 6 +-- .../UniAndBidirectionSyncCode.ets | 36 ++++--------- .../arraytype/ArrayType.ets | 6 +-- .../arraytype/ArrayTypeCode.ets | 25 ++------- .../decoratedobjecttype/basetype/BaseType.ets | 9 ++-- .../basetype/BaseTypeCode.ets | 11 ++-- .../classobjecttype/ClassObjectType.ets | 6 +-- .../classobjecttype/ClassObjectTypeCode.ets | 54 ++++++++----------- .../UpdateBoundComponent.ets | 6 +-- .../UpdateBoundComponentCode.ets | 23 ++++---- .../src/main/ets/utils/StartAbilityUtils.ts | 2 - 51 files changed, 303 insertions(+), 496 deletions(-) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 b/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 index 23373b24..2012ed6e 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 @@ -16,12 +16,29 @@ { "app": { "signingConfigs": [], - "compileSdkVersion": 9, - "compatibleSdkVersion": 9, "products": [ { "name": "default", "signingConfig": "default", + "targetSdkVersion": "20", + "arkTSVersion": "1.2", + "compatibleSdkVersion": "20", + "compileSdkVersion": "20", + "runtimeOS": "HarmonyOS", + "buildOption": { + "strictMode": { + "caseSensitiveCheck": true, + "useNormalizedOHMUrl": true + } + } + } + ], + "buildModeSet": [ + { + "name": "debug", + }, + { + "name": "release" } ] }, diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets index dd9cdadc..70bfed08 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/CodeView.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -38,16 +38,14 @@ import { ClickEvent, $r, $rawfile, - Padding + Padding, } from '@kit.ArkUI'; import webView from '@ohos.web.webview'; import { TitleBar } from './TitleBar'; - @Component export struct CodeView { - @BuilderParam contentView: () => void = () => { - }; + @BuilderParam contentView: () => void = () => {}; @Link title: Resource; @StorageLink('sideBarShow') sideBarShow: boolean = false; @StorageLink('webSrc') @Watch('webSrcChange') webSrc: Resource = $rawfile('BaseTypeCode.ets.html'); @@ -55,19 +53,18 @@ export struct CodeView { private isShowTitle: boolean = true; private controller: webView.WebviewController = new webView.WebviewController(); - webSrcChange(propName: string): void { + webSrcChange(propName: string):void { this.controller.loadUrl(this.webSrc); } - @Builder - codeView() { - Column({ space: 10.0 } as ColumnOptions) { + @Builder codeView() { + Column({ space: 10.0 }as ColumnOptions) { Text($r('app.string.close')) .fontSize($r('app.float.source_code_font_size')) .fontColor(Color.White) .alignSelf(ItemAlign.End) .id('close') - .onClick((): void => { + .onClick(() : void=> { this.sideBarShow = !this.sideBarShow; }) Column() { @@ -77,7 +74,7 @@ export struct CodeView { } .width('100%') .height('100%') - .padding({ bottom: $r('app.float.code_view_bottom') } as Padding) + .padding({ bottom: $r('app.float.code_view_bottom') }as Padding ) } .height('100%') .padding($r('app.float.page_padding')) @@ -104,7 +101,6 @@ export struct CodeView { .layoutWeight(1.0) .sideBarWidth('100%') .showControlButton(false) - // 大型设备查看源码和界面4:6的比例，所以占60% .maxSideBarWidth(this.curBp === 'sm' ? '100%' : '60%') .sideBarPosition(SideBarPosition.End) } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets index 10bdfd61..59fda2ae 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBar.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -28,10 +28,9 @@ import { ColumnOptions, TextAttribute, Margin, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; - -import { Context, UIContext } from '@ohos.arkui.UIContext'; +import { Context,UIContext} from '@ohos.arkui.UIContext'; import router from '@ohos.router'; import common from '@ohos.app.ability.common'; import { startSpecifiedAbility } from '../utils/StartAbilityUtils'; @@ -51,14 +50,13 @@ export struct TitleBar { } .backgroundColor($r('app.color.background_shallow_grey')) .id('backBtn') - .onClick((event: ClickEvent) => { - this.isAbility ? startSpecifiedAbility(this.CONTEXT, 'EntryAbility') : - this.getUIContext().getRouter().back(); + .onClick((event:ClickEvent) => { + this.isAbility ? startSpecifiedAbility(this.CONTEXT, 'EntryAbility') : this.getUIContext().getRouter().back(); }) Text(this.title) .fontSize($r('app.float.title_font_size')) - .margin({ left: $r('app.float.title_margin') } as Margin) + .margin({ left: $r('app.float.title_margin') }as Margin) } .width('100%') .padding($r('app.float.page_padding')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets index 47896704..4f249317 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/TitleBarDark.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -30,7 +30,7 @@ import { ColumnOptions, ClickEvent, TextAttribute, - Margin + Margin, } from '@kit.ArkUI'; import router from '@ohos.router'; @@ -51,15 +51,14 @@ export struct TitleBarDark { .size({ width: $r('app.float.icon_back_size'), height: $r('app.float.icon_back_size') }) } .id('backBtn') - .onClick((event: ClickEvent) => { - this.isAbility ? startSpecifiedAbility(this.CONTEXT, 'EntryAbility') : - this.getUIContext().getRouter().back(); + .onClick((event:ClickEvent) => { + this.isAbility ? startSpecifiedAbility(this.CONTEXT, 'EntryAbility') : this.getUIContext().getRouter().back(); }) .backgroundColor($r('app.color.nightnode_color')) Text(this.title) .fontSize($r('app.float.title_font_size')) - .margin({ left: $r('app.float.title_margin') } as Margin) + .margin({ left: $r('app.float.title_margin') }as Margin) .fontColor(Color.White) } .width('100%') @@ -69,7 +68,7 @@ export struct TitleBarDark { .width('100%') .height($r('app.float.divider_height')) .color($r('app.color.divider_color')) - .margin({ bottom: 12.0 } as Margin) + .margin({ bottom: 12.0 }as Margin) } .width('100%') } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets index 1fbb679d..2262fde8 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets @@ -1,6 +1,5 @@ -'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -25,7 +24,7 @@ import { FlexAlign, $r, $rawfile, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; @Component @@ -41,9 +40,9 @@ export struct ViewCodeText { .alignSelf(ItemAlign.End) .id('viewSourceCode') .onClick((event: ClickEvent) => { - this.sideBarShow = !this.sideBarShow; // 自动同步（因 @StorageLink） - AppStorage.set('sideBarShow', this.sideBarShow); - AppStorage.set('webSrc', this.webSrc); + this.sideBarShow = !this.sideBarShow; + AppStorage.setOrCreate('sideBarShow', this.sideBarShow); + AppStorage.setOrCreate('webSrc', this.webSrc); }); } .width('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ts b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ts index 65e352cd..f1b80b68 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ts +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ts @@ -30,7 +30,6 @@ export default class EntryAbility extends UIAbility { onCreate(want, launchParam): void { this.storage = new LocalStorage(); this.storage.setOrCreate('currentModelStatus', true); - // 设置当前内容字体为18 this.storage.setOrCreate('contentFontSize', FONT_SIZE); Logger.info(TAG, 'Ability onCreate'); } @@ -42,7 +41,6 @@ export default class EntryAbility extends UIAbility { updateBreakpoint(windowWidth: number): void { let windowWidthVp: number = windowWidth / (display.getDefaultDisplaySync().densityDPI / DPI); let curBp: string; - // 520以及840分别为小屏和中屏的最大宽度 if (windowWidthVp < SMALL_SCREEN_WIDTH) { curBp = 'sm'; } else if (windowWidthVp < MIDDLE_SCREEN_WIDTH) { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets index 050ae2b4..80b32c29 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -24,7 +24,7 @@ import { LocalStorageLink, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { AbilityGlobalDataSyncCode } from './AbilityGlobalDataSyncCode'; @@ -35,17 +35,13 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; - @Entry({ storage: "__get_local_storage__" }) @Component struct AbilityGlobalDataSync { @State title: Resource = $r('app.string.ability_storage_ui'); - // 初始化夜间模式的状态 @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; - build() { Column() { - // 展示不同模式下的标题 if (this.currentModelStatus) { TitleBarDark({ title: this.title }) } else { @@ -57,11 +53,10 @@ struct AbilityGlobalDataSync { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : - $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets index 40249ee5..72e0acb5 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -35,7 +35,7 @@ import { $r, $rawfile, Margin, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; import router from '@ohos.router'; @@ -46,29 +46,25 @@ import { Context, UIContext } from '@ohos.arkui.UIContext'; @Component export struct AbilityGlobalDataSyncCode { - // 初始化字体大小最小值 private minFontSize: number = 10.0; - // 和主页、Page1、Page2双向同步内容字体大小 + @LocalStorageLink('contentFontSize') contentFontSize: number = 18.0; - // 和主页、Page1、Page2双向同步夜间模式状态 + @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('AbilityGlobalDataSyncCode.ets.html') }) Row() { Text($r('app.string.nightmode')) .fontSize(this.contentFontSize) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) - // 控制夜间模式 Toggle({ type: ToggleType.Switch, isOn: this.currentModelStatus }) .id('nightModeSwitch') .selectedColor(Color.Blue) .switchPointColor(Color.White) .onChange((isOn: boolean) => { - // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageLink关联的数据变量刷新 this.currentModelStatus = isOn; }) }.justifyContent(FlexAlign.SpaceAround) @@ -79,7 +75,6 @@ export struct AbilityGlobalDataSyncCode { .fontSize(this.contentFontSize) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .textAlign(TextAlign.Center) - // slider滑动模块控制字体大小 Column() { Text($r('app.string.fontSize_text')) .fontSize(this.contentFontSize) @@ -92,22 +87,20 @@ export struct AbilityGlobalDataSyncCode { .fontSize($r('app.float.tips_font_size')) Slider({ value: this.contentFontSize, - min: 10.0, // 字体大小最小值 - max: 30.0, // 字体大小最大值 + min: 10.0, + max: 30.0, style: SliderStyle.OutSet }) .showTips(true) .onChange((value: number, mode: SliderChangeMode) => { - // 更新控制字体大小状态的变量数据，@LocalStorageLink和@LocalStorageProp关联的数据变量刷新 this.contentFontSize = value; }) - // toFixed(0)将滑动条返回值处理为整数精度 Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) } .width('80%') - }.margin({ top: 50.0 } as Margin) + }.margin({ top: 50.0 }as Margin) Text($r('app.string.ability_storage_fontsizesync')) .fontSize(this.contentFontSize) @@ -125,7 +118,7 @@ export struct AbilityGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { + .onClick((event:ClickEvent) => { this.getUIContext().getRouter().pushUrl( { url: 'pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage' }); }) @@ -141,10 +134,8 @@ export struct AbilityGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { - this.getUIContext() - .getRouter() - .pushUrl({ url: 'pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage' }); + .onClick((event:ClickEvent) => { + this.getUIContext().getRouter().pushUrl({ url: 'pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage' }); }) Divider().width('100%').strokeWidth(1.0) @@ -159,8 +150,8 @@ export struct AbilityGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { - startSpecifiedAbility(this.CONTEXT, 'OutOfSyncAbility'); + .onClick((event:ClickEvent) => { + startSpecifiedAbility(this.CONTEXT,'OutOfSyncAbility'); }) } .width('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets index 29137605..d9fcb877 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -30,9 +30,8 @@ import { $r, $rawfile, ColumnOptions, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; - import { CodeView } from '../../../commoncomponents/CodeView'; import { ViewCodeText } from '../../../commoncomponents/ViewCodeText'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; @@ -41,16 +40,12 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; - @Entry({ storage: "__get_local_storage__" }) @Component struct AbilityOutOfSyncPage { - // 判断是否关联ability的变量 @State isAbility: boolean = true; @State title: Resource = $r('app.string.localStorage_abilitytitle'); - // 和主页、Page1、Page2不同步夜间模式状态 @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; - // 和主页、Page1、Page2不同步内容字体大小 @LocalStorageLink('contentFontSize') contentFontSize: number = 18.0; build() { @@ -61,8 +56,7 @@ struct AbilityOutOfSyncPage { TitleBar({ title: this.title, isAbility: true }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 30.0 } as ColumnOptions) { - // 查看源码 + Column({ space: 30.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('AbilityOutOfSyncPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) .fontSize(this.contentFontSize) @@ -90,8 +84,7 @@ struct AbilityOutOfSyncPage { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { - // 更新控制夜间模式状态的变量数据，@LocalStorageLink和@LocalStorageProp关联的数据变量刷新 + .onClick((event:ClickEvent) => { this.currentModelStatus = !this.currentModelStatus; }) } @@ -101,11 +94,10 @@ struct AbilityOutOfSyncPage { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : - $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets index 7daaff2d..4889b7c5 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -30,7 +30,7 @@ import { $r, $rawfile, ColumnOptions, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; import { CodeView } from '../../../commoncomponents/CodeView'; @@ -41,14 +41,11 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; - @Entry({ storage: "__get_local_storage__" }) @Component struct StorageLinkAbilityPage { @State title: Resource = $r('app.string.localStorage_pagetitletwo'); - // 和主页、Page2双向同步夜间模式状态 @LocalStorageLink('currentModelStatus') currentModelStatus: boolean = true; - // 和主页、Page2双向同步内容字体大小 @LocalStorageLink('contentFontSize') contentFontSize: number = 18.0; build() { @@ -59,8 +56,7 @@ struct StorageLinkAbilityPage { TitleBar({ title: this.title }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 30.0 } as ColumnOptions) { - // 查看源码 + Column({ space: 30.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('LocalStorageLinkPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) .fontSize(this.contentFontSize) @@ -83,8 +79,7 @@ struct StorageLinkAbilityPage { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { - // 更新控制夜间模式状态的变量数据，@LocalStorageLink和@StorageProp关联的数据变量刷新 + .onClick((event:ClickEvent) => { this.currentModelStatus = !this.currentModelStatus; }) @@ -100,11 +95,10 @@ struct StorageLinkAbilityPage { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : - $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets index 9fa23e44..720bd9f5 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -36,7 +36,8 @@ import { ColumnOptions, ClickEvent, Margin, - StorageLink + StorageLink, + } from '@kit.ArkUI'; import { CodeView } from '../../../commoncomponents/CodeView'; @@ -47,18 +48,13 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; let storage: LocalStorage = new LocalStorage(); const __get_local_storage__ = (): LocalStorage => storage; - @Entry({ storage: "__get_local_storage__" }) @Component struct StoragePropAbilityPage { @State title: Resource = $r('app.string.localStorage_pagetitleone'); - // 初始化字体大小最小值 private minFontSize: number = 10.0; - // 和主页、Page1双向同步夜间模式状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; - // 和主页、Page1单向同步内容字体大小 @StorageLink('contentFontSize') contentFontSize: number = 18.0; - build() { Column() { if (this.currentModelStatus) { @@ -67,8 +63,7 @@ struct StoragePropAbilityPage { TitleBar({ title: this.title }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 20.0 } as ColumnOptions) { - // 查看源码 + Column({ space: 20.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('LocalStoragePropPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) .fontSize(this.contentFontSize) @@ -80,7 +75,7 @@ struct StoragePropAbilityPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - Button('') { + Button('') { //修改添加 '' Text(this.currentModelStatus ? $r('app.string.close_nightmode') : $r('app.string.start_nightmode')) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.button_text_color')) .fontSize(this.contentFontSize) @@ -91,8 +86,7 @@ struct StoragePropAbilityPage { .padding($r('app.float.page_padding')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick((event: ClickEvent) => { - // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 + .onClick((event:ClickEvent) => { this.currentModelStatus = !this.currentModelStatus; }) @@ -101,7 +95,6 @@ struct StoragePropAbilityPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - // slider模块控制字体大小 Column() { Text($r('app.string.fontSize_text')) .fontSize(this.contentFontSize) @@ -114,22 +107,20 @@ struct StoragePropAbilityPage { .fontSize($r('app.float.tips_font_size')) Slider({ value: this.contentFontSize, - min: 10.0, // 字体大小最小值 - max: 30.0, // 字体大小最大值 + min: 10.0, + max: 30.0, style: SliderStyle.OutSet }) .showTips(true) .onChange((value: number, mode: SliderChangeMode) => { - // 更新控制字体大小的变量数据，@LocalStorageLink关联的数据变量不刷新同步 this.contentFontSize = value; }) - // toFixed(0)将滑动条返回值处理为整数精度 Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) } .width('80%') - }.margin({ top: 50.0 } as Margin) + }.margin({ top: 50.0 }as Margin) Text($r('app.string.localStorage_single_fontsize_binding')) .fontSize(this.contentFontSize) @@ -142,11 +133,10 @@ struct StoragePropAbilityPage { } .width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : - $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets index 4c580e20..7ddf5fac 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -22,10 +22,10 @@ import { StorageLink, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; -import { ApplyGlobalDataSyncCode } from './ApplyGlobalDataSyncCode'; +import {ApplyGlobalDataSyncCode} from './ApplyGlobalDataSyncCode'; import { CodeView } from '../../../commoncomponents/CodeView'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; import { TitleBar } from '../../../commoncomponents/TitleBar'; @@ -34,12 +34,10 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; @Component struct ApplyGlobalDataSync { @State title: Resource = $r('app.string.application_storage_ui'); - // 当前夜间模式的状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; build() { Column() { - // 展示不同模式状态下的标题 if (this.currentModelStatus) { TitleBarDark({ title: this.title }) } else { @@ -50,11 +48,10 @@ struct ApplyGlobalDataSync { } }.width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : - $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets index 1e7aa4e7..3a0c6b07 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -35,7 +35,7 @@ import { $r, $rawfile, ClickEvent, - Margin + Margin, } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; @@ -44,29 +44,23 @@ import { startSpecifiedAbility } from '../../../utils/StartAbilityUtils'; @Component export struct ApplyGlobalDataSyncCode { - // 和Ability1、Ability2页面双向同步内容字体大小 @StorageLink('contentFontSize') contentFontSize: number = 18.0; - // 和Ability1、Ability2页面双向同步夜间模式状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; - // 初始化字体大小最小值 private minFontSize: number = 10.0; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ApplyGlobalDataSyncCode.ets.html') }) Row() { Text($r('app.string.nightmode')) .fontSize(this.contentFontSize) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) - // 开发控制夜间模式 Toggle({ type: ToggleType.Switch, isOn: this.currentModelStatus }) .id('nightModeSwitch') .selectedColor(Color.Blue) .switchPointColor(Color.White) .onChange((isOn: boolean) => { - // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageLink关联的数据变量刷新 this.currentModelStatus = isOn; AppStorage.set('currentModelStatus', this.currentModelStatus); }) @@ -78,7 +72,6 @@ export struct ApplyGlobalDataSyncCode { .fontSize(this.contentFontSize) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .textAlign(TextAlign.Center) - // slider滑动模块控制字体大小 Column() { Text($r('app.string.fontSize_text')) .fontSize(this.contentFontSize) @@ -91,23 +84,21 @@ export struct ApplyGlobalDataSyncCode { .fontSize($r('app.float.tips_font_size')) Slider({ value: this.contentFontSize, - min: this.minFontSize, // 字体大小最小值 - max: 30.0, // 字体大小最大值 + min: this.minFontSize, + max: 30.0, style: SliderStyle.OutSet }) .showTips(true) .onChange((value: number, mode: SliderChangeMode) => { - // 更新控制字体大小状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 this.contentFontSize = value; AppStorage.set('contentFontSize', this.contentFontSize); }) - // toFixed(0)将滑动条返回值处理为整数精度 Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) } .width('80%') - }.margin({ top: 50.0 } as Margin) + }.margin({ top: 50.0 }as Margin) Text($r('app.string.fontSize_singlesync_textone')) .fontSize(this.contentFontSize) @@ -125,7 +116,7 @@ export struct ApplyGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { + .onClick((event:ClickEvent) => { startSpecifiedAbility(this.CONTEXT, 'StoragePropAbility'); }) @@ -140,7 +131,7 @@ export struct ApplyGlobalDataSyncCode { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { + .onClick((event:ClickEvent) => { startSpecifiedAbility(this.CONTEXT, 'StorageLinkAbility'); }) }.padding($r('app.float.page_padding')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets index 575e6d41..6fa74074 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -29,9 +29,10 @@ import { $r, $rawfile, ColumnOptions, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; + import { CodeView } from '../../../commoncomponents/CodeView'; import { ViewCodeText } from '../../../commoncomponents//ViewCodeText'; import { TitleBarDark } from '../../../commoncomponents/TitleBarDark'; @@ -41,11 +42,8 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; @Component struct StorageLinkAbilityPage { @State title: Resource = $r('app.string.abilitytwo_page'); - // 判断是否关联ability的变量 @State isAbility: boolean = true; - // 和主页、Ability1页面双向同步夜间模式状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; - // 和主页、Ability1页面双向同步内容字体大小 @StorageLink('contentFontSize') contentFontSize: number = 18.0; build() { @@ -56,8 +54,7 @@ struct StorageLinkAbilityPage { TitleBar({ title: this.title, isAbility: true }) } CodeView({ title: this.title, isShowTitle: false }) { - Column({ space: 30.0 } as ColumnOptions) { - // 查看源码 + Column({ space: 30.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('StorageLinkAbilityPage.ets.html') }) Text($r('app.string.both_data_binding')) .fontSize(this.contentFontSize) @@ -80,8 +77,7 @@ struct StorageLinkAbilityPage { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .padding($r('app.float.page_padding')) - .onClick((event: ClickEvent) => { - // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 + .onClick((event:ClickEvent) => { this.currentModelStatus = !this.currentModelStatus; }) @@ -95,11 +91,10 @@ struct StorageLinkAbilityPage { } }.width('100%') .height('100%') - .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : - $r('app.color.background_shallow_grey')) + .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets index 38c08965..3a3cc711 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -14,8 +14,9 @@ * limitations under the License. */ +import { StoragePropRef } from '@kit.ArkUI'; + import { - StoragePropRef, Entry, Component, State, @@ -35,7 +36,8 @@ import { $rawfile, ColumnOptions, ClickEvent, - Margin + Margin, + } from '@kit.ArkUI'; import { CodeView } from '../../../commoncomponents/CodeView'; @@ -47,11 +49,8 @@ import { TitleBar } from '../../../commoncomponents/TitleBar'; @Component struct StoragePropAbilityPage { @State title: Resource = $r('app.string.abilityone_page'); - // 初始化字体大小最小值 private minFontSize: number = 10.0; - // 和主页、Ability2页面双向同步夜间模式状态 @StorageLink('currentModelStatus') currentModelStatus: boolean = true; - // 和主页、Ability2页面单向同步内容字体大小 private contentFontSize: number = 18.0; build() { @@ -63,7 +62,6 @@ struct StoragePropAbilityPage { } CodeView({ title: this.title, isShowTitle: false }) { Column({ space: 20.0 }as ColumnOptions) { - // 查看源码 ViewCodeText({ webSrc: $rawfile('StoragePropAbilityPage.ets.html') }) Text($r('app.string.both_data_binding')) .fontSize(this.contentFontSize) @@ -87,7 +85,6 @@ struct StoragePropAbilityPage { .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) .onClick(() : void=> { - // 更新控制夜间模式状态的变量数据，@StorageLink和@StorageProp关联的数据变量刷新 this.currentModelStatus = !this.currentModelStatus; }) @@ -96,7 +93,6 @@ struct StoragePropAbilityPage { .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - // slider模块控制字体大小 Column() { Text($r('app.string.fontSize_text')) .fontSize(this.contentFontSize) @@ -110,15 +106,13 @@ struct StoragePropAbilityPage { Slider({ value: this.contentFontSize, min: this.minFontSize, - max: 30.0, // 字体大小最大值 + max: 30.0, style: SliderStyle.OutSet }) .showTips(true) .onChange((value: number, mode: SliderChangeMode) => { - // 更新控制字体大小的变量数据，@StorageLink关联的数据变量不刷新同步 this.contentFontSize = value; }) - // toFixed(0)将滑动条返回值处理为整数精度 Text(this.contentFontSize.toFixed(0.0)) .fontColor(this.currentModelStatus ? $r('app.color.color_white') : $r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) @@ -141,6 +135,6 @@ struct StoragePropAbilityPage { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets index 04685b36..04c98aac 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/Home.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -32,7 +32,6 @@ import { $r, Padding, Margin, - ArrayLike } from '@kit.ArkUI'; import { FirstLevelCategory, SecondLevelCategory, ThirdLevelCategory } from './model/CategoricalDataType'; @@ -42,8 +41,7 @@ import { TabContentNavigation } from './TabContentNavigation'; @Entry @Component struct Home { - // 初始化tabsBar的index值为0 - tabsIndex: number = 0.0; + @State tabsIndex: number = 0.0; @StorageLink('currentBreakpoint') curBp: string = 'sm'; build() { @@ -58,9 +56,7 @@ struct Home { }, (item, index) => index.toString()) } .vertical(this.curBp === 'sm' ? false : true) - // 大型设备tabbar的高度为40%，小型设备的高度为56vp .barHeight(this.curBp === 'sm' ? '56vp' : '40%') - // 大型设备tabbar的宽度为56vp，小型设备的宽度为100% .barWidth(this.curBp === 'sm' ? '100%' : '56vp') .barMode(BarMode.Fixed) .backgroundColor($r('app.color.background_shallow_grey')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets index 7f6e62e1..8d072b97 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -41,8 +41,7 @@ import { import router from '@ohos.router'; import { SecondLevelCategory, ThirdLevelCategory, FourthLevelCategory } from './model/CategoricalDataType'; import { UIContext } from '@ohos.arkui.UIContext'; - -function ColumnStyle(this: ColumnAttribute): ColumnAttribute { +function ColumnStyle(this: ColumnAttribute): ColumnAttribute { this.width('100%'); this.borderRadius(24.0); this.backgroundColor(Color.White); @@ -57,8 +56,7 @@ function ColumnStyle(this: ColumnAttribute): ColumnAttribute { @Component export struct TabContentNavigation { - private categories: Array = - new Array(); + private categories: Array = new Array(); hasSecondLevelCategory(category: ThirdLevelCategory | SecondLevelCategory): boolean { return (category as SecondLevelCategory).tag !== undefined; @@ -96,7 +94,7 @@ export struct TabContentNavigation { } } } - }, (item: ThirdLevelCategory | SecondLevelCategory) => item.toString()) // 添加key生成函数 + }, (item: ThirdLevelCategory | SecondLevelCategory) => item.toString()) } else { ForEach(this.categories, (item: ThirdLevelCategory | SecondLevelCategory, index: number) => { if (!this.hasSecondLevelCategory(item)) { @@ -105,7 +103,7 @@ export struct TabContentNavigation { Column() { ThirdLevelNavigation({ thirdLevelCategory: thirdLevelCategory, - secondLevelCategoryIndex: -1, // 标记为没有二级分类 + secondLevelCategoryIndex: -1, ThirdLevelNavigationIndex: index }) } @@ -113,7 +111,7 @@ export struct TabContentNavigation { } .margin({ top: 4.0, bottom: 4.0 } as Margin) } - }, (item: ThirdLevelCategory | SecondLevelCategory) => item.toString()) // 添加key生成函数 + }, (item: ThirdLevelCategory | SecondLevelCategory) => item.toString()) } } .width('100%') @@ -170,7 +168,7 @@ struct ThirdLevelNavigation { } }) - if (this.isUnfold) { + if (this.isUnfold ) { ForEach(this.thirdLevelCategory?.childNodes!, (fourthLevelCategory: FourthLevelCategory, index: number) => { Column() { Divider() @@ -181,11 +179,10 @@ struct ThirdLevelNavigation { FourthLevelNavigation({ fourthLevelCategory: fourthLevelCategory }) } - }, (item: FourthLevelCategory) => item.title.toString()) // 添加key生成函数 + }, (item: FourthLevelCategory) => item.title.toString() ) } } - .id(`secondLevelMenu${this.secondLevelCategoryIndex}${this.secondLevelCategoryIndex === 1 ? 0 : - this.ThirdLevelNavigationIndex}`) + .id(`secondLevelMenu${this.secondLevelCategoryIndex}${this.secondLevelCategoryIndex === 1 ? 0 : this.ThirdLevelNavigationIndex}`) } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets index 8b3dc2a3..f05d2619 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets @@ -97,7 +97,6 @@ const PAGE_LEVEL_CATEGORY: Array = [ } ]; - const APP_LEVEL_CATEGORY: Array = [ { tag: 1.0, @@ -111,7 +110,6 @@ const APP_LEVEL_CATEGORY: Array = [ } ]; - export const HOME_TABS: FirstLevelCategory[] = [ { tabBarName: $r('app.string.page_level'), diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets index 42c31a10..876b3dad 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -15,7 +15,6 @@ */ import { Resource } from '@kit.ArkUI'; - export interface FirstLevelCategory { childNodes: Array, iconSelected: Resource, // The icon for the first-level category is selected diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets index ac8312cd..27242502 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,7 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { CodeView } from '../../../../commoncomponents/CodeView'; @@ -45,6 +45,6 @@ struct BrotherComponentSync { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets index 8916eba2..1a19bff8 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,8 @@ import { TextAlign, $r, Margin, - Resource + Resource, + } from '@kit.ArkUI'; import { ProvideFatherComponent } from './ProvideFatherComponent'; @@ -29,6 +30,7 @@ import { StateFatherComponent } from './StateFatherComponent'; @Component export struct BrotherComponentSyncCode { + build() { Column() { Column() { @@ -36,7 +38,6 @@ export struct BrotherComponentSyncCode { .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - // 共同父组件@State StateFatherComponent() } @@ -45,10 +46,9 @@ export struct BrotherComponentSyncCode { .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - // 共同父组件@Provide ProvideFatherComponent() } - .margin({ top: 10.0 } as Margin) + .margin({ top: 10.0 }as Margin) } } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets index 0ae2e875..7e9650f4 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -29,13 +29,12 @@ import { Color, ColumnOptions, $r, - $rawfile + $rawfile, } from '@kit.ArkUI'; - -import { Circle } from '@ohos.arkui.component'; +import { Circle} from '@ohos.arkui.component'; import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; -import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; +import { COLOR_SELECT_DATA,NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; @@ -43,15 +42,12 @@ import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; export struct ConsumeBrotherOneComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 和父组件、子组件B双向同步圆形颜色 @Consume consumeCircleColor: Resource; - // 和父组件、子组件B双向同步Select组件的Index值 - @Consume currentSelectIndex: number = 0; + @Consume currentSelectIndex: int = 0; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ConsumeBrotherOneComponent.ets.html') }) Text($r('app.string.consume_brothers_title')) .fontSize($r('app.float.tips_font_size')) @@ -67,9 +63,8 @@ export struct ConsumeBrotherOneComponent { .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) - .onSelect((index: number, text: string) => { - // 孙组件@Consume声明的数据页面更新，爷组件@Provide的数据页面同步更新 - this.currentSelectIndex = index; + .onSelect((index: number,text: string ) => { + this.currentSelectIndex = index as int; this.consumeCircleColor = this.selectColors[index as int].color; }) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets index c931cccf..a76c80a3 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -37,21 +37,18 @@ import { ColorType } from '../model/ColorType'; import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct ConsumeBrotherTwoComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 和父组件、子组件B双向同步圆形颜色 @Consume consumeCircleColor: Resource; - // 和父组件、子组件A双向同步Select组件的Index值 - @Consume currentSelectIndex: number; + @Consume currentSelectIndex: int; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ConsumeBrotherTwoComponent.ets.html') }) Text($r('app.string.consume_brothers_title')) .fontColor($r('app.color.tips_font_color')) @@ -69,14 +66,11 @@ export struct ConsumeBrotherTwoComponent { .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) .onSelect((index: number, text: string) => { - // 此组件@Consume声明的数据页面更新，兄弟组件@Consume的数据页面同步更新 - this.currentSelectIndex = index; + this.currentSelectIndex = index as int; this.consumeCircleColor = this.selectColors[index as int].color; }) Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) - .width($r('app.float.circle_size')) - .height($r('app.float.circle_size')) .fill(this.consumeCircleColor) }.justifyContent(FlexAlign.SpaceAround) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets index 9a59c979..e9b83ef6 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -39,21 +39,18 @@ import { ColorType } from '../model/ColorType'; import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct LinkBrotherOneComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 和父组件、子组件B双向同步圆形颜色 @Link circleColor: Resource; - // 和父组件、子组件B双向同步Select组件的Index值 - @Link currentSelectIndex: number; + @Link currentSelectIndex: int; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('LinkBrotherOneComponent.ets.html') }) Text($r('app.string.link_brothers_title')) .fontSize($r('app.float.tips_font_size')) @@ -65,29 +62,23 @@ export struct LinkBrotherOneComponent { Select(this.selectValues) .id('linkSelectCompA') .selected(this.currentSelectIndex) - // .value(getResourceString(this.CONTEXT, this.selectValues[this.currentSelectIndex as int].value)) .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) .onSelect((index: number, text: string) => { - // 此组件@Link声明的数据页面更新，兄弟组件@Link的数据页面同步更新 - this.currentSelectIndex = index; + this.currentSelectIndex = index as int; this.circleColor = this.selectColors[index as int].color; }) Circle() - .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') } as SizeOptions) + .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }as SizeOptions) .fill(this.circleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') } .padding(10.0) - .border({ - radius: $r('app.float.component_radius'), - color: Color.Blue, - width: $r('app.float.border_width') - } as BorderOptions) + .border({ radius: $r('app.float.component_radius'), color: Color.Blue, width: $r('app.float.border_width') }as BorderOptions) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets index 074bba42..677e1285 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -37,21 +37,18 @@ import { ColorType } from '../model/ColorType'; import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct LinkBrotherTwoComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 和父组件、子组件A双向同步圆形颜色 @Link circleColor: Resource; - // 和父组件、子组件A双向同步Select的Index值 - @Link currentSelectIndex: number; + @Link currentSelectIndex: int; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('LinkBrotherTwoComponent.ets.html') }) Text($r('app.string.link_brothers_title')) .fontColor($r('app.color.tips_font_color')) @@ -63,15 +60,13 @@ export struct LinkBrotherTwoComponent { Select(this.selectValues) .id('linkSelectCompB') .selected(this.currentSelectIndex) - // .value(getResourceString(this.CONTEXT, this.selectColors[this.currentSelectIndex as int].value)) .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) .onSelect((index: number, text: string) => { - // 此组件@Link声明的数据页面更新，兄弟组件@Link的数据页面同步更新 - this.currentSelectIndex = index; + this.currentSelectIndex = index as int; this.circleColor = this.selectColors[index as int].color; }) Circle() diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets index a1f72f89..020cab6e 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ProvideFatherComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -36,25 +36,19 @@ import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; @Component export struct ProvideFatherComponent { - // 初始化一个颜色数组 @State selectColors: ColorType[] = COLOR_SELECT_DATA; - // 共同父组件使用@Provide初始化圆形颜色 @Provide consumeCircleColor: Resource = $r('app.color.circle_blue'); - // 初始化Select组件的Index为0 @Provide currentSelectIndex: number = 0.0; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ProvideFatherComponent.ets.html') }) Text($r('app.string.parent_titletwo')) .fontSize($r('app.float.tips_font_size')) .fontColor($r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - // 和父组件双向同步子组件A ConsumeBrotherOneComponent() - // 和父组件双向同步子组件B ConsumeBrotherTwoComponent() }.padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets index 59df408d..7b83e2dd 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/StateFatherComponent.ets @@ -24,7 +24,7 @@ import { Color, $r, $rawfile, - ColumnOptions + ColumnOptions, } from '@kit.ArkUI'; import { ColorType } from '../model/ColorType'; @@ -35,27 +35,21 @@ import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; @Component export struct StateFatherComponent { - // 共同父组件使用@State初始化圆形颜色 @State circleColor: Resource = $r('app.color.circle_blue'); - // 初始化一个颜色数组 - // 初始化当前Select的Index为0 - @State currentSelectIndex: number = 0.0; + @State currentSelectIndex: int = 0; build() { Column({ space: 10.0 }as ColumnOptions) { - // 点击查看源码 ViewCodeText({ webSrc: $rawfile('StateFatherComponent.ets.html') }) Text($r('app.string.parent_titleone')) .fontSize($r('app.float.tips_font_size')) .fontColor($r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - // 和父组件双向同步子组件A LinkBrotherOneComponent({ circleColor: this.circleColor, currentSelectIndex: this.currentSelectIndex }) - // 和父组件双向同步子组件B LinkBrotherTwoComponent({ circleColor: this.circleColor, currentSelectIndex: this.currentSelectIndex diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets index 27d7c8eb..08477e7e 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/data/ColorData.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -15,7 +15,10 @@ */ import { ColorType } from '../model/ColorType' -import { $r, SelectOption } from '@kit.ArkUI'; +import { + $r, + SelectOption, +} from '@kit.ArkUI'; export const COLOR_SELECT_DATA: ColorType[] = [ { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets index 2f3e46bc..880d4fb9 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ConsumeDescendentComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -37,22 +37,18 @@ import { ColorType } from '../model/ColorType'; import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct ConsumeDescendentComponent { - // 初始化一个颜色数组数据 @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 和爷组件双向同步圆形颜色 @Consume consumeCircleColor: Resource; - // 和爷组件双向同步Select的Index值 - @Consume currentSelectIndex: number; + @Consume currentSelectIndex: int; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { - // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ConsumeDescendentComponent.ets.html') }) Row() { Select(this.selectValues) @@ -63,9 +59,8 @@ export struct ConsumeDescendentComponent { .selectedOptionFont({ size: $r('app.float.tips_font_size') }) .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandsonCompB') - .onSelect((index: number, text?: string | undefined) => { - // 孙组件@Consume声明的数据页面更新，爷组件@Provide的数据页面同步更新 - this.currentSelectIndex = index; + .onSelect((index: number,text?: string | undefined) => { + this.currentSelectIndex = index as int; this.consumeCircleColor = this.selectColors[index as int].color; }) Circle() @@ -74,7 +69,7 @@ export struct ConsumeDescendentComponent { }.justifyContent(FlexAlign.SpaceAround) .width('100%') - .margin({ bottom: 6.0 } as Margin) + .margin({ bottom: 6.0 }as Margin) Text($r('app.string.deepnest_descendent_titletwo')) .fontColor($r('app.color.tips_font_color')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets index 69912f32..bd9edbd1 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,7 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { CodeView } from '../../../../commoncomponents/CodeView'; @@ -45,6 +45,6 @@ struct DeepNestComponentsSync { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets index c061c869..5a1141ff 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -20,7 +20,7 @@ import { Text, TextAlign, Margin, - $r + $r, } from '@kit.ArkUI'; import { StateGrandfatherComponent } from './StateGrandfatherComponent'; @@ -35,16 +35,14 @@ export struct DeepNestComponentsSyncCode { .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - // 爷组件@State StateGrandfatherComponent() - }.margin({ bottom: 16.0 } as Margin) + }.margin({ bottom: 16.0 }as Margin) Column() { Text($r('app.string.realize_by_provide_consume')) .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - // 爷组件@Provide ProvideGrandfatherComponent() } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets index 48da86df..3a7c539d 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -29,7 +29,7 @@ import { $r, $rawfile, Margin, - SelectOption + SelectOption, } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; @@ -37,21 +37,18 @@ import { ColorType } from '../model/ColorType'; import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct LinkDescendentComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 和父组件和爷组件双向同步圆形颜色 @Link circleColor: Resource; - // 和父组件和爷组件双向同步Select的Index值 - @Link currentSelectIndex: number; + @Link currentSelectIndex: int; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { - // 点击查看源码 ViewCodeText({ webSrc: $rawfile('LinkDescendentComponent.ets.html') }) Row() { Select(this.selectValues) @@ -62,9 +59,8 @@ export struct LinkDescendentComponent { .selectedOptionFont({ size: $r('app.float.tips_font_size') }) .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandsonCompA') - .onSelect((index: number, text?: string | undefined) => { - // 孙组件@Link组件数据页面更新，爷组件同步更新 - this.currentSelectIndex = index; + .onSelect((index: number,text?: string | undefined) => { + this.currentSelectIndex = index as int; this.circleColor = this.selectColors[index as int].color; }) Circle() @@ -72,7 +68,7 @@ export struct LinkDescendentComponent { .fill(this.circleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') - .margin({ bottom: 6.0 } as Margin) + .margin({ bottom: 6.0 }as Margin) Text($r('app.string.deepnest_descendent_titleone')) .fontColor($r('app.color.tips_font_color')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets index ad395828..f56f0c71 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/ProvideGrandfatherComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -32,38 +32,35 @@ import { SelectOption } from '@kit.ArkUI'; + import common from '@ohos.app.ability.common'; import { ColorType } from '../model/ColorType'; import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { ConsumeDescendentComponent } from './ConsumeDescendentComponent'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; import { getResourceString } from '../../../../utils/ResourceUtils'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct ProvideGrandfatherComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 初始化爷组件@Provide的原型颜色 @Provide consumeCircleColor: Resource = $r('app.color.circle_blue'); - // 初始化Select组件的Index - @Provide currentSelectIndex: number = 0; + @Provide currentSelectIndex: int = 0; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { Column() { - // 点击查看源码 - ViewCodeText({ webSrc: $rawfile('ProvideGrandfatherComponent.ets.html') }) + ViewCodeText({ webSrc: $rawfile('ProvideGrandfatherComponent.ets.html') }) Text($r('app.string.deepnest_parent_titletwo')) .fontSize($r('app.float.tips_font_size')) .fontColor($r('app.color.tips_font_color')) .width('100%') .textAlign(TextAlign.Center) - .margin({ top: 10.0 } as Margin) + .margin({ top: 10.0 }as Margin) Row() { Select(this.selectValues) .selected(this.currentSelectIndex) - // .value(getResourceString(this.CONTEXT, this.selectColors[this.currentSelectIndex].value)) .value(this.selectValues[this.currentSelectIndex].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.tips_font_size') }) @@ -71,18 +68,15 @@ export struct ProvideGrandfatherComponent { .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandfatherCompB') .onSelect((index: number, text?: string | undefined) => { - // 爷组件@Provide声明的数据页面更新，孙组件@Consume关联的变量同步更新 - this.currentSelectIndex = index; - this.consumeCircleColor = this.selectColors[index].color; + this.currentSelectIndex = index as int; + this.consumeCircleColor = this.selectColors[index as int].color; }) Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.consumeCircleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') - .margin({ bottom: 6.0 } as Margin) - - // 子组件 + .margin({ bottom: 6.0 }as Margin) ConsumeChildComp() }.padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) @@ -91,6 +85,7 @@ export struct ProvideGrandfatherComponent { @Component struct ConsumeChildComp { + build() { Column() { Text($r('app.string.deepnest_child_titletwo')) @@ -99,7 +94,6 @@ struct ConsumeChildComp { .width('100%') .textAlign(TextAlign.Center) .height($r('app.float.button_height')) - // 双向同步孙组件 ConsumeDescendentComponent() } .padding(10.0) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets index 003a2f7d..759749e9 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -38,22 +38,18 @@ import { ColorType } from '../model/ColorType'; import { COLOR_SELECT_DATA, NEW_COLOR_SELECT_DATA } from '../data/ColorData'; import { getResourceString } from '../../../../utils/ResourceUtils'; import { ViewCodeText } from '../../../../commoncomponents/ViewCodeText'; -import { Circle } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct StateGrandfatherComponent { - // 初始化爷组件@State的圆形颜色 @State circleColor: Resource = $r('app.color.circle_blue'); - // 初始化一个颜色数组 @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; - // 初始化当前select组件的index - @State currentSelectIndex: number = 0.0; + @State currentSelectIndex: int = 0; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('StateGrandfatherComponent.ets.html') }) Text($r('app.string.deepnest_parent_titleone')) .fontSize($r('app.float.tips_font_size')) @@ -70,8 +66,7 @@ export struct StateGrandfatherComponent { .optionFont({ size: $r('app.float.tips_font_size') }) .id('grandfatherCompA') .onSelect((index: number, text?: string | undefined) => { - // 爷组件@State声明的数据页面更新，孙组件@Link关联的变量同步更新 - this.currentSelectIndex = index; + this.currentSelectIndex = index as int; this.circleColor = this.selectColors[index as int].color; }) Circle() @@ -79,8 +74,6 @@ export struct StateGrandfatherComponent { .fill(this.circleColor) }.justifyContent(FlexAlign.SpaceAround) .width('100%') - - // 双向同步子组件 LinkChildComp({ circleColor: this.circleColor, currentSelectIndex: this.currentSelectIndex }) }.padding(10.0) .border({ radius: $r('app.float.component_radius'), color: Color.Grey, width: $r('app.float.border_width') }) @@ -89,10 +82,8 @@ export struct StateGrandfatherComponent { @Component struct LinkChildComp { - // 和父组件和子组件双向同步圆形颜色 @Link circleColor: Resource; - // 和父组件和子组件双向同步Select的Index值 - @Link currentSelectIndex: number; + @Link currentSelectIndex: int; build() { Column() { @@ -102,10 +93,9 @@ struct LinkChildComp { .width('100%') .textAlign(TextAlign.Center) .height($r('app.float.button_height')) - // 双向同步孙组件 LinkDescendentComponent({ circleColor: this.circleColor, - currentSelectIndex: this.currentSelectIndex + currentSelectIndex: this.currentSelectIndex as int }) } .padding(10.0) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets index 01c27eb3..dbfbee43 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/model/ColorType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -17,7 +17,7 @@ import { Resource } from '@kit.ArkUI'; export interface ColorType { - color: Resource, + color: Resource, }; diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets index 18f738ed..3c54164f 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ObjectLinkComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -26,7 +26,7 @@ import { Color, ColumnOptions, $r, - $rawfile + $rawfile, } from '@kit.ArkUI'; import { ClassObject } from './ParentChildPartialContentSyncCode'; @@ -34,12 +34,10 @@ import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; @Component export struct ObjectLinkComponent { - // 使用@ObjectLink修饰，与父组件中元素同步 @ObjectLink childObjectData: ClassObject; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ObjectLinkComponent.ets.html') }) Text($r('app.string.partial_sync_text')) @@ -57,8 +55,7 @@ export struct ObjectLinkComponent { .fontSize(20.0) .layoutWeight(1.0) .id('childAttribute') - .onChange((value: string): void => { - // 子组件对象属性更新，父元素同步 + .onChange((value: string): void=> { this.childObjectData.attributeType = value; }) } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets index 38167f62..279bee7b 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,7 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { ParentChildPartialContentSyncCode } from './ParentChildPartialContentSyncCode'; @@ -45,6 +45,6 @@ struct ParentChildPartialContentSync { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets index a6115cf0..78e7e844 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -14,6 +14,8 @@ * limitations under the License. */ +import { PropRef } from '@kit.ArkUI'; + import { Observed, Resource, @@ -29,14 +31,12 @@ import { $r, $rawfile, ColumnOptions, - PropRef, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; import { ObjectLinkComponent } from './ObjectLinkComponent'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; -// 数组中元素的类，使用@Observed修饰 @Observed export class ClassObject { public elementType: Resource; @@ -48,22 +48,17 @@ export class ClassObject { } } -// 初始化父组件中的数据 -const PARENT_DATA: ClassObject[] = - [new ClassObject($r('app.string.partial_sync_element_one'), $r('app.string.partial_sync_attribute_one')), - new ClassObject($r('app.string.partial_sync_element_two'), $r('app.string.partial_sync_attribute_two')), - new ClassObject($r('app.string.partial_sync_element_three'), $r('app.string.partial_sync_attribute_three'))]; +const PARENT_DATA: ClassObject[] = [new ClassObject($r('app.string.partial_sync_element_one'), $r('app.string.partial_sync_attribute_one')), + new ClassObject($r('app.string.partial_sync_element_two'), $r('app.string.partial_sync_attribute_two')), + new ClassObject($r('app.string.partial_sync_element_three'), $r('app.string.partial_sync_attribute_three'))]; @Component export struct ParentChildPartialContentSyncCode { - // 初始化父组件中状态变量 @State parentData: ClassObject[] = PARENT_DATA; - // 与子组件同步的的数据是数组的第几个元素，默认选中第一个 - @State syncIndex: number = 0.0; + @State syncIndex: int = 0; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ParentChildPartialContentSyncCode.ets.html') }) Text($r('app.string.partial_sync_parent_tips')) @@ -71,23 +66,21 @@ export struct ParentChildPartialContentSyncCode { .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Start) - // 父组件中List展示状态变量中的内容 Column() { ForEach(this.parentData, (item: ClassObject, index: number) => { Column() { ParentCompDataItem({ index: index, syncIndex: this.syncIndex, childObject: item }) } .backgroundColor(index === this.syncIndex ? $r('app.color.component_background_pink') : undefined) - .onClick((): void => { - this.syncIndex = index; + .onClick(() : void=> { + this.syncIndex = index as int; }) }, index => index.toString()) } .width('100%') .backgroundColor($r('app.color.component_background_pink')) - //与父组件状态同步的子组件 - ObjectLinkComponent({ childObjectData: this.parentData[this.syncIndex] }) + ObjectLinkComponent({ childObjectData: this.parentData[this.syncIndex as int] }) } .width('100%') .padding(10.0) @@ -95,12 +88,10 @@ export struct ParentChildPartialContentSyncCode { } } -// 展示数组中单个元素的子组件 @Component struct ParentCompDataItem { private index: number; syncIndex: number; - // 使用@ObjectLink修饰，与父组件中元素同步 @ObjectLink childObject: ClassObject; build() { @@ -112,8 +103,7 @@ struct ParentCompDataItem { TextInput({ text: this.childObject.attributeType }) .fontSize(20.0) .id(`attribute${this.index + 1.0}`) - .onChange((value: string): void => { - // 更新父组件中元素的属性，子组件同步 + .onChange((value: string):void => { this.childObject.attributeType = value; }) } else { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets index 52543e76..a4aa6fc5 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentLink.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -27,22 +27,20 @@ import { ColumnOptions, $r, $rawfile, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; import { COLOR_DATA } from './UniAndBidirectionSyncCode'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; @Component export struct ChildCompLink { - // 圆形颜色，和父组件中的状态变量双向同步 @Link circleColor: string; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 - ViewCodeText({ webSrc: $rawfile('ComponentLink.ets.html') }) + Column({ space: 10.0 }as ColumnOptions) { + ViewCodeText({webSrc: $rawfile('ComponentLink.ets.html')}) Text($r('app.string.child_component')) .fontSize($r('app.float.tips_font_size')) @@ -54,7 +52,6 @@ export struct ChildCompLink { .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Center) - // 绑定@Link变量的Circle组件 Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.circleColor) @@ -69,8 +66,7 @@ export struct ChildCompLink { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick((): void => { - // 点击更新子组件@Link声明的变量，此子组件更新，父组件以及@Prop声明的子组件变量同步 + .onClick(() : void=> { this.circleColor = COLOR_DATA.RED; }) } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets index 867ba5a1..d90d3113 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/ComponentProp.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -14,11 +14,12 @@ * limitations under the License. */ +import { PropRef } from '@kit.ArkUI'; + import { Component, Column, Text, - PropRef, TextAlign, Circle, Button, @@ -30,19 +31,17 @@ import { ClickEvent, StorageProp } from '@kit.ArkUI'; +import { Circle,} from '@ohos.arkui.component'; -import { Circle } from '@ohos.arkui.component'; import { COLOR_DATA } from './UniAndBidirectionSyncCode'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; @Component export struct ChildCompProp { - // 圆形颜色，和父组件中的状态变量单向同步，只支持基础类型 @StorageProp('circleColor') circleColor: string = 'red'; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ComponentProp.ets.html') }) Text($r('app.string.child_component')) .fontSize($r('app.float.tips_font_size')) @@ -54,7 +53,6 @@ export struct ChildCompProp { .fontSize($r('app.float.tips_font_size')) .width('100%') .textAlign(TextAlign.Center) - // 绑定@Link变量的Circle组件 Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.circleColor) @@ -69,8 +67,7 @@ export struct ChildCompProp { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick((): void => { - // 点击更新子组件@Prop声明的变量，此子组件更新，父组件以及@Link声明的子组件变量不同步 + .onClick(() : void=> { this.circleColor = COLOR_DATA.BLUE; }) } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets index d08948f1..6a23ae60 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,7 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { UniAndBidirectionSyncCode } from './UniAndBidirectionSyncCode'; @@ -45,6 +45,6 @@ struct UniAndBidirectionSync { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets index a959d730..914e7b2a 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSyncCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -26,38 +26,28 @@ import { ColumnOptions, ClickEvent, $r, - $rawfile + $rawfile, } from '@kit.ArkUI'; import { ChildCompLink } from './ComponentLink'; import { ChildCompProp } from './ComponentProp'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; -import { Circle, } from '@ohos.arkui.component'; +import { Circle,} from '@ohos.arkui.component'; -interface ColorData { - GREY: string; - BLUE: string; - PINK: string; - RED: string; -} - -// 初始化圆形的可设置颜色 -export const COLOR_DATA: ColorData = { - GREY: '#eebebeba', - BLUE: '#4A90E2', - PINK: '#8DF8BEBE', - RED: '#FFF30823', +export enum COLOR_DATA { + GREY = '#eebebeba', + BLUE = '#4A90E2', + PINK = '#8DF8BEBE', + RED = '#FFF30823', } @Component export struct UniAndBidirectionSyncCode { - // 初始化圆形颜色的状态变量 @State circleColor: string = COLOR_DATA.GREY; build() { - Column({ space: 10.0 } as ColumnOptions) { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('UniAndBidirectionSyncCode.ets.html') }) Text($r('app.string.parent_component')) .fontSize($r('app.float.tips_font_size')) @@ -72,7 +62,6 @@ export struct UniAndBidirectionSyncCode { Circle() .size({ width: $r('app.float.circle_size'), height: $r('app.float.circle_size') }) .fill(this.circleColor) - // 点击更新父组件的圆形颜色变量，父组件更新，子组件@Link以及@Prop继承的变量同步 Button('') { Text($r('app.string.uni_and_bidirection_sync_btn')) .fontColor($r('app.color.button_text_color')) @@ -84,14 +73,11 @@ export struct UniAndBidirectionSyncCode { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick((event: ClickEvent) => { + .onClick((event:ClickEvent) => { this.circleColor = COLOR_DATA.PINK; }) } - - // 单向同步子组件 ChildCompProp({ circleColor: this.circleColor }) - // 双向同步子组件 ChildCompLink({ circleColor: this.circleColor }) } .padding(10.0) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets index aa4ac22c..6cc9a724 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,7 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { ArrayTypeCode } from './ArrayTypeCode'; @@ -45,6 +45,6 @@ struct ArrayTypes { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets index 66eea742..7409cb06 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets @@ -1,11 +1,11 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2 (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 + * http://www.apache.org/licenses/LICENSE-2 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -32,13 +32,12 @@ import { ColumnOptions, ClickEvent, Margin, - Padding + Padding, } from '@kit.ArkUI'; import promptAction from '@ohos.promptAction'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText' -// 数组中元素的类 export class ArrayDataType { public id: number; public name: string; @@ -51,23 +50,18 @@ export class ArrayDataType { } } -// 初始化数组数据 const ARRAY_TYPE_AGE_DATA: ArrayDataType[] = [new ArrayDataType(0, 'name', 17), new ArrayDataType(1, 'name', 18), new ArrayDataType(2, 'name', 19)] -// 初始化功能按钮字符串数据 const ARRAY_TYPE_BTN: Resource[] = [$r('app.string.array_type_add'), $r('app.string.array_type_delete'), $r('app.string.array_type_update')]; @Component export struct ArrayTypeCode { - // 数组类型状态变量初始化 @State arrayTypeData: ArrayDataType[] = ARRAY_TYPE_AGE_DATA; build() { Column({ space: 10 } as ColumnOptions) { - // 点击查看源码 ViewCodeText({ webSrc: $rawfile('ArrayTypeCode.ets.html') }) - // 数组内容展示 List() { ForEach(this.arrayTypeData, (item: ArrayDataType, index: number) => { ListItem() { @@ -80,8 +74,6 @@ export struct ArrayTypeCode { .height('40%') .backgroundColor($r('app.color.component_background_pink')) .padding({ left: 10, right: 10 } as Padding) - - // 功能按钮区 ForEach(ARRAY_TYPE_BTN, (item: Resource, index: number) => { Button(item) .id(`arrayTypeBtn${index}`) @@ -104,29 +96,24 @@ export struct ArrayTypeCode { const intIndex = index | 0; switch (intIndex) { case 0: - // 数组添加元素 this.arrayTypeData.push(new ArrayDataType(this.arrayTypeData.length, `name`, 18)); break; case 1: if (this.arrayTypeData.length === 0) { - // 当数据没有数据的时候，点击删除按钮，出现提示弹窗 promptAction.openToast({ message: $r('app.string.array_type_deletetoast') }); } else { - // 数组删除元素 - this.arrayTypeData.splice(this.arrayTypeData.length - 1, 1); // 删除最后一个元素 + this.arrayTypeData.splice(this.arrayTypeData.length - 1, 1); } break; case 2: if (this.arrayTypeData.length === 0) { - // 当数据没有数据的时候，点击更新按钮，出现提示弹窗 promptAction.openToast({ message: $r('app.string.array_type_updatetoast') }); break; } - // 初始化一个对象后给数组中的元素赋值，更新数组元素 let temp = new ArrayDataType(this.arrayTypeData[0].id, this.arrayTypeData[0].name, this.arrayTypeData[0].age + 1); this.arrayTypeData[0] = temp; @@ -137,10 +124,8 @@ export struct ArrayTypeCode { } } -// 数组Item内容组件 @Component struct ArrayDataItem { - // private arrayDataItem: ArrayDataType; private arrayDataItem: ArrayDataType = new ArrayDataType(0, "default", 18); private itemIndex: number; diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets index d7a36ac5..6831d565 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,9 +21,10 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; + import { BaseTypeCode } from './BaseTypeCode'; import { CodeView } from '../../../../../commoncomponents/CodeView' @@ -34,7 +35,7 @@ struct BaseType { build() { Column() { - CodeView({ title: this.title }) { + CodeView({ title: this.title}){ BaseTypeCode() } } @@ -45,6 +46,6 @@ struct BaseType { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets index d9c69579..13ef84a8 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseTypeCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -28,7 +28,7 @@ import { $r, $rawfile, ColumnOptions, - ClickEvent + ClickEvent, } from '@kit.ArkUI'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText' @@ -39,9 +39,8 @@ export struct BaseTypeCode { @State circleColor: Resource = $r('app.color.circle_pink'); build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 - ViewCodeText({ webSrc: $rawfile('BaseTypeCode.ets.html') }) + Column({ space: 10.0 }as ColumnOptions) { + ViewCodeText({webSrc: $rawfile('BaseTypeCode.ets.html')}) Text($r('app.string.base_type_tip_text')) .fontColor($r('app.color.tips_font_color')) @@ -63,7 +62,7 @@ export struct BaseTypeCode { .height($r('app.float.button_height')) .type(ButtonType.Capsule) .backgroundColor($r('app.color.button_background_color')) - .onClick((event: ClickEvent) => { + .onClick((event:ClickEvent) => { if (this.circleColor.id === $r('app.color.circle_pink').id) { this.circleColor = $r('app.color.circle_blue'); } else { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets index e3825994..5b94a34b 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,7 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { ClassObjectTypeCode } from './ClassObjectTypeCode'; @@ -45,6 +45,6 @@ struct ClassObjectType { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets index 8b9031cf..36af6225 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -14,8 +14,9 @@ * limitations under the License. */ +import { applyStyles } from '@kit.ArkUI'; + import { - applyStyles, Component, State, Column, @@ -35,7 +36,7 @@ import { $r, $rawfile, Padding, - Margin + Margin, } from '@kit.ArkUI'; import common from '@ohos.app.ability.common'; @@ -44,19 +45,16 @@ import { getResourceString } from '../../../../../utils/ResourceUtils'; @Component export struct ClassObjectTypeCode { - // 对象类型状态变量初始化 @State classObjectData: ParentClass = new ParentClass(getResourceString(this.CONTEXT, $r('app.string.class_object')), - getResourceString(this.CONTEXT, $r('app.string.class_attribute')), 1.0, - new ChildClass(getResourceString(this.CONTEXT, $r('app.string.class_child_attribute')), 2.0)); - // 更新对象的次数 + getResourceString(this.CONTEXT, $r('app.string.class_attribute')), 1.0, + new ChildClass(getResourceString(this.CONTEXT, $r('app.string.class_child_attribute')), 2.0)); private clickedCount: number = 0.0; private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 + Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ClassObjectTypeCode.ets.html') }) - Column({ space: 15.0 } as ColumnOptions) { + Column({ space: 15.0 }as ColumnOptions) { Row() { Text(this.classObjectData.title) .fontSize(20.0) @@ -64,7 +62,7 @@ export struct ClassObjectTypeCode { Divider() .layoutWeight(1.0) .strokeWidth(1.0) - .margin({ top: 20.0, left: 5.0 } as Margin) + .margin({ top: 20.0, left: 5.0 }as Margin) } .width('100%') @@ -84,26 +82,22 @@ export struct ClassObjectTypeCode { .strokeWidth(1.0) } .width('100%') - .padding({ left: 50.0 } as Padding) + .padding({ left: 50.0 }as Padding ) - ChildObjectComp({ childObject: this.classObjectData.child }) // 对象的属性，使用子组件显示 + ChildObjectComp({ childObject: this.classObjectData.child }) } .width('100%') .backgroundColor($r('app.color.component_background_pink')) .padding(10.0) - - // 点击更新对象 Button($r('app.string.class_type_update_object')) - .onClick((event: ClickEvent) => { - // 更新对象，把新的对象直接赋值给状态变量 + .onClick((event:ClickEvent) => { this.clickedCount++; let objectTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_object')) + this.clickedCount; - let attributeTitle: string = - getResourceString(this.CONTEXT, $r('app.string.class_attribute')) + this.clickedCount; + let attributeTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_attribute')) + this.clickedCount; let childAttributeTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_child_attribute')) - + this.clickedCount; + + this.clickedCount; let newObject = new ParentClass(objectTitle, attributeTitle, this.classObjectData.attribute + 1.0, - new ChildClass(childAttributeTitle, this.classObjectData.child.attribute + 1.0)); + new ChildClass(childAttributeTitle, this.classObjectData.child.attribute + 1.0)); this.classObjectData = newObject; }) .id('updateObject') @@ -112,8 +106,7 @@ export struct ClassObjectTypeCode { .type(ButtonType.Capsule) .applyStyles(buttonStyle) Button($r('app.string.class_type_update_attribute')) - .onClick((event: ClickEvent) => { - // 点击更新对象的属性 + .onClick((event:ClickEvent) => { this.classObjectData.attribute++; }) .id('updateObjectAttribute') @@ -122,8 +115,7 @@ export struct ClassObjectTypeCode { .type(ButtonType.Capsule) .applyStyles(buttonStyle) Button($r('app.string.class_type_update_child_attribute')) - .onClick((event: ClickEvent) => { - // 点击更新对象属性的属性 + .onClick((event:ClickEvent) => { this.classObjectData.child.attribute++; }) .id('updateAttributeOfAttribute') @@ -138,10 +130,8 @@ export struct ClassObjectTypeCode { } } -// 对象中属性的组件 @Component struct ChildObjectComp { - // 使用@ObjectLink修饰，与父组件同步对象的属性 @ObjectLink childObject: ChildClass; build() { @@ -161,17 +151,16 @@ struct ChildObjectComp { .strokeWidth(1.0) } .width('100%') - .padding({ left: 100.0 } as Padding) + .padding({ left: 100.0 }as Padding ) } } function buttonStyle(instance: CommonMethod): void { - instance.width('100%'); - instance.height($r('app.float.button_height')); - instance.backgroundColor($r('app.color.button_background_color')); + instance.width('100%'); + instance.height($r('app.float.button_height')); + instance.backgroundColor($r('app.color.button_background_color')); } -// 要更新对象属性的属性，对象属性的类需要使用@Observed修饰 @Observed class ChildClass { public title: string; @@ -195,6 +184,5 @@ class ParentClass { this.attributeTitle = attributeTitle; this.attribute = attribute; this.child = child; - } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets index a7ba64ef..2abd7013 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -21,7 +21,7 @@ import { Resource, Column, AppStorage, - $r + $r, } from '@kit.ArkUI'; import { UpdateBoundComponentCode } from './UpdateBoundComponentCode'; @@ -45,6 +45,6 @@ struct UpdateBoundComponent { } aboutToDisappear(): void { - AppStorage.set('sideBarShow', false); + AppStorage.setOrCreate('sideBarShow', false); } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets index d208f78a..a0fe31dd 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponentCode.ets @@ -1,6 +1,6 @@ 'use static' /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 @@ -28,24 +28,20 @@ import { ClickEvent, $r, $rawfile, - Margin + Margin, } from '@kit.ArkUI'; import { ViewCodeText } from '../../../../../commoncomponents/ViewCodeText'; @Component export struct UpdateBoundComponentCode { - // 组件内状态变量 @State titleName: string = 'title'; - // 组件内private变量 private content: string = 'content'; - // 组件内变量更新的次数 private updateCount: number = 0.0; build() { - Column({ space: 10.0 } as ColumnOptions) { - // 点击查看源码 - ViewCodeText({ webSrc: $rawfile('UpdateBoundComponentCode.ets.html') }) + Column({ space: 10.0 }as ColumnOptions) { + ViewCodeText({webSrc: $rawfile('UpdateBoundComponentCode.ets.html')}) Column() { Text($r('app.string.only_update_state')) @@ -56,7 +52,7 @@ export struct UpdateBoundComponentCode { Text($r('app.string.only_update_title')) .fontColor($r('app.color.button_text_color')) .fontSize($r('app.float.button_text_size')) - Text(`${this.titleName}`) // titleName为状态变量，绑定Text组件 + Text(`${this.titleName}`) .fontColor($r('app.color.button_text_color')) .fontSize(20.0) } @@ -67,12 +63,12 @@ export struct UpdateBoundComponentCode { .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.tips_font_size')) .width('100%') - .margin({ top: 20.0 } as Margin) + .margin({ top: 20.0 }as Margin) Row() { Text($r('app.string.only_update_content')) .fontColor($r('app.color.button_text_color')) .fontSize($r('app.float.button_text_size')) - Text(`${this.content}`) // content为private，绑定Text组件 + Text(`${this.content}`) .fontColor($r('app.color.button_text_color')) .fontSize(20.0) } @@ -86,8 +82,7 @@ export struct UpdateBoundComponentCode { Column() { Button($r('app.string.update_title_content')) - .onClick((event: ClickEvent) => { - // 点击更新@State和Private声明的变量，更新策略为：@State和Private的数据发生变化，@State变量绑定的组件更新，Private变量绑定的组件不更新。 + .onClick((event:ClickEvent) => { this.updateCount++; this.content = `content ${this.updateCount}`; this.titleName = `title ${this.updateCount}`; @@ -102,7 +97,7 @@ export struct UpdateBoundComponentCode { Text($r('app.string.only_update_state_components')) .fontColor($r('app.color.tips_font_color')) .fontSize($r('app.float.button_text_size')) - .margin({ top: 30.0 } as Margin) + .margin({ top: 30.0 }as Margin) }.width('100%') } .padding(10.0) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ts b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ts index 388a260f..44f93ec4 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ts +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ts @@ -24,11 +24,9 @@ export function startSpecifiedAbility(context: common.UIAbilityContext, abilityN }; context.startAbility(abilityConfig, (err) => { if (err.code) { - // 处理业务逻辑错误 Logger.error(`startAbility failed, code is ${err.code}, message is ${err.message}`); return; } - // 执行正常业务 Logger.info('startAbility succeed'); }); } \ No newline at end of file -- Gitee From 073b121d1cb2707cdd685b30852bb7356332ccc5 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Mon, 1 Sep 2025 14:23:50 +0800 Subject: [PATCH 5/7] fix_sample_stateManagement_maualfix_0901 Signed-off-by: wangweiyuan --- .../decoratedobjecttype/arraytype/ArrayTypeCode.ets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets index 7409cb06..b1fc1e35 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayTypeCode.ets @@ -1,11 +1,11 @@ 'use static' /* * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2 (the "License"); + * 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 + * 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, -- Gitee From a71e016ac4342b42826af71444c724f0196acd27 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Mon, 8 Sep 2025 15:22:46 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=9D=A2=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=EF=BC=8CWebviewController=E5=B7=B2?= =?UTF-8?q?=E6=8F=90=E5=8D=95DTS2025090506994?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangweiyuan --- OAT.xml | 3 + .../ets/constants/ImageViewerConstants.d.ets | 7 + .../main/ets/entryability/EntryAbility.d.ets | 15 + .../EntryBackupAbility.d.ets | 10 + .../ets/model/CommonLazyDataSourceModel.d.ets | 26 + .../src/main/ets/model/OffsetModel.d.ets | 18 + .../src/main/ets/model/PositionModel.d.ets | 7 + .../src/main/ets/model/RotateModel.d.ets | 15 + .../src/main/ets/model/ScaleModel.d.ets | 19 + .../ets/constants/ImageViewerConstants.ts | 8 + .../src/main/ets/entryability/EntryAbility.ts | 16 + .../entrybackupability/EntryBackupAbility.ts | 11 + .../ets/model/CommonLazyDataSourceModel.ts | 23 + .../static/src/main/ets/model/OffsetModel.ts | 18 + .../src/main/ets/model/PositionModel.ts | 7 + .../static/src/main/ets/model/RotateModel.ts | 15 + .../static/src/main/ets/model/ScaleModel.ts | 19 + .../ets/constants/ImageViewerConstants.ts | 6 + .../src/main/ets/entryability/EntryAbility.ts | 17 + .../entrybackupability/EntryBackupAbility.ts | 12 + .../ets/model/CommonLazyDataSourceModel.ts | 23 + .../src/main/ets/model/OffsetModel.ts | 9 + .../src/main/ets/model/PositionModel.ts | 6 + .../src/main/ets/model/RotateModel.ts | 8 + .../src/main/ets/model/ScaleModel.ts | 9 + .../ets/constants/ImageViewerConstants.d.ets | 7 + .../main/ets/entryability/EntryAbility.d.ets | 15 + .../EntryBackupAbility.d.ets | 10 + .../ets/model/CommonLazyDataSourceModel.d.ets | 26 + .../src/main/ets/model/OffsetModel.d.ets | 17 + .../src/main/ets/model/PositionModel.d.ets | 6 + .../src/main/ets/model/RotateModel.d.ets | 14 + .../src/main/ets/model/ScaleModel.d.ets | 18 + .../ImageViewer/oh-package-lock.json5 | 43 + .../StateManagement/.gitignore | 4 +- .../StateManagement/AppScope/app.json5 | 24 +- .../resources/base/media/background.png | Bin 0 -> 91942 bytes .../resources/base/media/foreground.png | Bin 0 -> 15325 bytes .../resources/base/media/layered_image.json | 7 + .../StateManagement/build-profile.json5 | 23 +- .../StateManagement/entry/.gitignore | 4 +- .../StateManagement/entry/build-profile.json5 | 19 +- .../StateManagement/entry/hvigorfile.ts | 8 +- .../entry/obfuscation-rules.txt | 23 + .../StateManagement/entry/oh-package.json5 | 11 +- .../ets/commoncomponents/ViewCodeText.ets | 1 + .../main/ets/entryability/EntryAbility.ets | 97 ++ .../ets/outofsyncability/OutOfSyncAbility.ets | 60 ++ .../AbilityGlobalDataSync.ets | 5 +- .../LocalStorageLinkPage.ets | 5 +- .../LocalStoragePropPage.ets | 5 +- .../ApplyGlobalDataSync.ets | 5 +- .../model/AbilityConfigType.ets | 19 + .../ets/pages/home/TabContentNavigation.ets | 10 +- .../src/main/ets/pages/home/data/HomeData.ets | 23 +- .../pages/home/model/CategoricalDataType.ets | 6 +- .../BrotherComponentSync.ets | 5 +- .../ConsumeBrotherOneComponent.ets | 14 +- .../ConsumeBrotherTwoComponent.ets | 12 +- .../LinkBrotherOneComponent.ets | 6 +- .../LinkBrotherTwoComponent.ets | 6 +- .../DeepNestComponentsSync.ets | 5 +- .../LinkDescendentComponent.ets | 6 +- .../StateGrandfatherComponent.ets | 8 +- .../ParentChildPartialContentSync.ets | 5 +- .../UniAndBidirectionSync.ets | 5 +- .../arraytype/ArrayType.ets | 5 +- .../decoratedobjecttype/basetype/BaseType.ets | 6 +- .../classobjecttype/ClassObjectType.ets | 5 +- .../classobjecttype/ClassObjectTypeCode.ets | 35 +- .../UpdateBoundComponent.ets | 5 +- .../storagelinkability/StorageLinkAbility.ets | 60 ++ .../storagepropability/StoragePropAbility.ets | 60 ++ .../entry/src/main/ets/utils/Logger.ets | 45 + .../src/main/ets/utils/ResourceUtils.ets | 27 + .../src/main/ets/utils/StartAbilityUtils.ets | 33 + .../entry/src/main/module.json5 | 27 +- .../main/resources/base/element/string.json | 3 + .../resources/base/media/layered_image.png | Bin 0 -> 6790 bytes .../main/resources/dark/element/color.json | 8 + .../src/ohosTest/ets/test/Ability.test.ets | 827 +----------------- .../entry/src/ohosTest/ets/test/List.test.ets | 4 +- .../entry/src/ohosTest/module.json5 | 34 +- .../hvigor/hvigor-config.json5 | 23 +- .../StateManagement/hvigorfile.ts | 8 +- .../StateManagement/oh-package.json5 | 16 +- 86 files changed, 1170 insertions(+), 975 deletions(-) create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets create mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/oh-package-lock.json5 create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/background.png create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/foreground.png create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/layered_image.json create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/obfuscation-rules.txt create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagelinkability/StorageLinkAbility.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagepropability/StoragePropAbility.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/Logger.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ets create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/base/media/layered_image.png create mode 100644 sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/dark/element/color.json diff --git a/OAT.xml b/OAT.xml index 0e2a9e26..1a64ff47 100644 --- a/OAT.xml +++ b/OAT.xml @@ -139,6 +139,9 @@ Note:If the text contains special characters, please escape them according to th + + + diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets new file mode 100644 index 00000000..5191b72b --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets @@ -0,0 +1,7 @@ +'use static' +export declare function main(): void; +export declare class ImageViewerConstants { + public static get ANIMATE_DURATION(): number; + public static get SWIPER_CACHE_COUNT(): number; + public constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets new file mode 100644 index 00000000..4c51b5d2 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets @@ -0,0 +1,15 @@ +'use static' +import { AbilityConstant, UIAbility, Want } from "@kit.AbilityKit"; +import { window } from "@kit.ArkUI"; +export declare function main(): void; +export declare const DOMAIN: number = 0.0; +declare class EntryAbility extends UIAbility { + public onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void; + public onDestroy(): void; + public onWindowStageCreate(windowStage: window.WindowStage): void; + public onWindowStageDestroy(): void; + public onForeground(): void; + public onBackground(): void; + public constructor(); +} +export default EntryAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets new file mode 100644 index 00000000..ad174cd3 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets @@ -0,0 +1,10 @@ +'use static' +import { BackupExtensionAbility, BundleVersion } from "@kit.CoreFileKit"; +export declare function main(): void; +export declare const DOMAIN: number; +declare class EntryBackupAbility extends BackupExtensionAbility { + public onBackup(): Promise; + public onRestore(bundleVersion: BundleVersion): Promise; + public constructor(); +} +export default EntryBackupAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets new file mode 100644 index 00000000..b3a9c0b3 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets @@ -0,0 +1,26 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +import { IDataSource, DataChangeListener } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class BasicDataSource implements IDataSource { + public totalCount(): number; + public getData(index: number): T; + public registerDataChangeListener(listener: DataChangeListener): void; + public unregisterDataChangeListener(listener: DataChangeListener): void; + public notifyDataReload(): void; + public notifyDataAdd(index: number): void; + public notifyDataChange(index: number): void; + public notifyDataDelete(index: number): void; + public notifyDataMove(from: number, to: number): void; + public constructor(); +} +@Observed +export declare class CommonLazyDataSourceModel extends BasicDataSource { + public totalCount(): number; + public getData(index: number): T; + public addData(index: number, data: T): void; + public pushData(data: T): void; + public clearAndPushAll(data: Array): void; + public constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets new file mode 100644 index 00000000..5996b930 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets @@ -0,0 +1,18 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class OffsetModel { + public get currentX(): number; + public set currentX(value: number); + public get currentY(): number; + public set currentY(value: number); + public get lastX(): number; + public set lastX(value: number); + public get lastY(): number; + public set lastY(value: number); + public reset(): void; + public stash(): void; + public toString(): string; + constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets new file mode 100644 index 00000000..dd1e6097 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets @@ -0,0 +1,7 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class PositionModel { + constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets new file mode 100644 index 00000000..61290bdb --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets @@ -0,0 +1,15 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class RotateModel { + public get currentRotate(): number; + public set currentRotate(value: number); + public get lastRotate(): number; + public set lastRotate(value: number); + public get startAngle(): number; + public set startAngle(value: number); + public reset(): void; + public stash(): void; + constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets new file mode 100644 index 00000000..4d705a34 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets @@ -0,0 +1,19 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class ScaleModel { + public get scaleValue(): number; + public set scaleValue(value: number); + public get lastValue(): number; + public set lastValue(value: number); + public get maxScaleValue(): number; + public set maxScaleValue(value: number); + public get extraScaleValue(): number; + public set extraScaleValue(value: number); + public get defaultScaleValue(): number; + public reset(): void; + public stash(): void; + public toString(): string; + constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts new file mode 100644 index 00000000..f33b6608 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts @@ -0,0 +1,8 @@ +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;', 'main'); +export const ImageViewerConstants = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;'); +export const ANIMATE_DURATION = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'ANIMATE_DURATION'); +export const SWIPER_CACHE_COUNT = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'SWIPER_CACHE_COUNT'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts new file mode 100644 index 00000000..938de8f1 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts @@ -0,0 +1,16 @@ +import { AbilityConstant, UIAbility, Want } from "@kit.AbilityKit"; +import { window } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/ETSGLOBAL;', 'main'); +export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/ETSGLOBAL;').DOMAIN; +const EntryAbility = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;'); +export default EntryAbility; +export const onCreate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onCreate'); +export const onDestroy = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onDestroy'); +export const onWindowStageCreate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageCreate'); +export const onWindowStageDestroy = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageDestroy'); +export const onForeground = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onForeground'); +export const onBackground = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onBackground'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts new file mode 100644 index 00000000..bdbca82a --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts @@ -0,0 +1,11 @@ +import { BackupExtensionAbility } from "@kit.CoreFileKit"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;', 'main'); +export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;').DOMAIN; +const EntryBackupAbility = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;'); +export default EntryBackupAbility; +export const onBackup = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onBackup'); +export const onRestore = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onRestore'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts new file mode 100644 index 00000000..292d78b4 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts @@ -0,0 +1,23 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;', 'main'); +export const BasicDataSource = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;'); +export const totalCount = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'totalCount'); +export const getData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'getData'); +export const registerDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'registerDataChangeListener'); +export const unregisterDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'unregisterDataChangeListener'); +export const notifyDataReload = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataReload'); +export const notifyDataAdd = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataAdd'); +export const notifyDataChange = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataChange'); +export const notifyDataDelete = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataDelete'); +export const notifyDataMove = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataMove'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'constructor'); +export const CommonLazyDataSourceModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;'); +export const totalCount = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'totalCount'); +export const getData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'getData'); +export const addData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'addData'); +export const pushData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'pushData'); +export const clearAndPushAll = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'clearAndPushAll'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts new file mode 100644 index 00000000..4d7d9f04 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts @@ -0,0 +1,18 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/OffsetModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/ETSGLOBAL;', 'main'); +export const OffsetModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;'); +export const currentX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentX'); +export const currentX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentX'); +export const currentY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentY'); +export const currentY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentY'); +export const lastX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastX'); +export const lastX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastX'); +export const lastY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastY'); +export const lastY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastY'); +export const reset = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'reset'); +export const stash = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'stash'); +export const toString = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'toString'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts new file mode 100644 index 00000000..eccc2a43 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts @@ -0,0 +1,7 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/PositionModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/PositionModel/ETSGLOBAL;', 'main'); +export const PositionModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/PositionModel/PositionModel;'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/PositionModel/PositionModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts new file mode 100644 index 00000000..7072ecbf --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts @@ -0,0 +1,15 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/RotateModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/ETSGLOBAL;', 'main'); +export const RotateModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;'); +export const currentRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'currentRotate'); +export const currentRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'currentRotate'); +export const lastRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'lastRotate'); +export const lastRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'lastRotate'); +export const startAngle = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'startAngle'); +export const startAngle = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'startAngle'); +export const reset = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'reset'); +export const stash = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'stash'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts new file mode 100644 index 00000000..19f195c5 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts @@ -0,0 +1,19 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/ScaleModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ETSGLOBAL;', 'main'); +export const ScaleModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;'); +export const scaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'scaleValue'); +export const scaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'scaleValue'); +export const lastValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'lastValue'); +export const lastValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'lastValue'); +export const maxScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'maxScaleValue'); +export const maxScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'maxScaleValue'); +export const extraScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'extraScaleValue'); +export const extraScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'extraScaleValue'); +export const defaultScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'defaultScaleValue'); +export const reset = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'reset'); +export const stash = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'stash'); +export const toString = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'toString'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts new file mode 100644 index 00000000..5635c008 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts @@ -0,0 +1,6 @@ +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;', 'main'); +export const ImageViewerConstants = (globalThis as any).Panda.getClass('Lentry/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts new file mode 100644 index 00000000..376ce3e5 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts @@ -0,0 +1,17 @@ +import { AbilityConstant, ConfigurationConstant, UIAbility, Want } from "@kit.AbilityKit"; +import { hilog } from "@kit.PerformanceAnalysisKit"; +import { window } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entryability/EntryAbility/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/ETSGLOBAL;', 'main'); +export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entryability/EntryAbility/ETSGLOBAL;').DOMAIN; +const EntryAbility = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;'); +export default EntryAbility; +export const onCreate = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onCreate'); +export const onDestroy = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onDestroy'); +export const onWindowStageCreate = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageCreate'); +export const onWindowStageDestroy = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageDestroy'); +export const onForeground = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onForeground'); +export const onBackground = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onBackground'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts new file mode 100644 index 00000000..dcad2072 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts @@ -0,0 +1,12 @@ +import { hilog } from "@kit.PerformanceAnalysisKit"; +import { BackupExtensionAbility } from "@kit.CoreFileKit"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;', 'main'); +export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;').DOMAIN; +const EntryBackupAbility = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;'); +export default EntryBackupAbility; +export const onBackup = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onBackup'); +export const onRestore = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onRestore'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts new file mode 100644 index 00000000..0a2cad72 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts @@ -0,0 +1,23 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;', 'main'); +export const BasicDataSource = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;'); +export const totalCount = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'totalCount'); +export const getData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'getData'); +export const registerDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'registerDataChangeListener'); +export const unregisterDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'unregisterDataChangeListener'); +export const notifyDataReload = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataReload'); +export const notifyDataAdd = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataAdd'); +export const notifyDataChange = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataChange'); +export const notifyDataDelete = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataDelete'); +export const notifyDataMove = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataMove'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'constructor'); +export const CommonLazyDataSourceModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;'); +export const totalCount = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'totalCount'); +export const getData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'getData'); +export const addData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'addData'); +export const pushData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'pushData'); +export const clearAndPushAll = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'clearAndPushAll'); +export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts new file mode 100644 index 00000000..bbafdd06 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts @@ -0,0 +1,9 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/OffsetModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/ETSGLOBAL;', 'main'); +export const OffsetModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/OffsetModel/OffsetModel;'); +export const reset = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/OffsetModel;', 'reset'); +export const stash = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/OffsetModel;', 'stash'); +export const toString = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/OffsetModel;', 'toString'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts new file mode 100644 index 00000000..3c4ed676 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts @@ -0,0 +1,6 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/PositionModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/PositionModel/ETSGLOBAL;', 'main'); +export const PositionModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/PositionModel/PositionModel;'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts new file mode 100644 index 00000000..93091aa2 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts @@ -0,0 +1,8 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/RotateModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/RotateModel/ETSGLOBAL;', 'main'); +export const RotateModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/RotateModel/RotateModel;'); +export const reset = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/RotateModel/RotateModel;', 'reset'); +export const stash = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/RotateModel/RotateModel;', 'stash'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts new file mode 100644 index 00000000..84e0427c --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts @@ -0,0 +1,9 @@ +import { Observed } from "@kit.ArkUI"; +let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/ScaleModel/ETSGLOBAL;'); +ETSGLOBAL._$init$_(); +export {}; +export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ETSGLOBAL;', 'main'); +export const ScaleModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/ScaleModel/ScaleModel;'); +export const reset = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ScaleModel;', 'reset'); +export const stash = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ScaleModel;', 'stash'); +export const toString = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ScaleModel;', 'toString'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets new file mode 100644 index 00000000..b89582b3 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets @@ -0,0 +1,7 @@ +'use static' +export declare function main(): void; +export declare class ImageViewerConstants { + public static get ANIMATE_DURATION(): number; + public static get SWIPER_CACHE_COUNT(): number; + constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets new file mode 100644 index 00000000..eacd3894 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets @@ -0,0 +1,15 @@ +'use static' +import { AbilityConstant, UIAbility, Want } from "@kit.AbilityKit"; +import { window } from "@kit.ArkUI"; +export declare function main(): void; +export declare const DOMAIN: number; +declare class EntryAbility extends UIAbility { + public onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void; + public onDestroy(): void; + public onWindowStageCreate(windowStage: window.WindowStage): void; + public onWindowStageDestroy(): void; + public onForeground(): void; + public onBackground(): void; + constructor(); +} +export default EntryAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets new file mode 100644 index 00000000..2dda69c4 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets @@ -0,0 +1,10 @@ +'use static' +import { BackupExtensionAbility, BundleVersion } from "@kit.CoreFileKit"; +export declare function main(): void; +export declare const DOMAIN: number; +declare class EntryBackupAbility extends BackupExtensionAbility { + public onBackup(): Promise; + public onRestore(bundleVersion: BundleVersion): Promise; + constructor(); +} +export default EntryBackupAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets new file mode 100644 index 00000000..53c0638c --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets @@ -0,0 +1,26 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +import { IDataSource, DataChangeListener } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class BasicDataSource implements IDataSource { + public totalCount(): number; + public getData(index: number): T; + public registerDataChangeListener(listener: DataChangeListener): void; + public unregisterDataChangeListener(listener: DataChangeListener): void; + public notifyDataReload(): void; + public notifyDataAdd(index: number): void; + public notifyDataChange(index: number): void; + public notifyDataDelete(index: number): void; + public notifyDataMove(from: number, to: number): void; + constructor(); +} +@Observed +export declare class CommonLazyDataSourceModel extends BasicDataSource { + public totalCount(): number; + public getData(index: number): T; + public addData(index: number, data: T): void; + public pushData(data: T): void; + public clearAndPushAll(data: Array): void; + constructor(); +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets new file mode 100644 index 00000000..6687768b --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets @@ -0,0 +1,17 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class OffsetModel { + public get currentX(): number; + public set currentX(value: number); + public get currentY(): number; + public set currentY(value: number); + public get lastX(): number; + public set lastX(value: number); + public get lastY(): number; + public set lastY(value: number); + public reset(): void; + public stash(): void; + public toString(): string; +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets new file mode 100644 index 00000000..ca1bb586 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets @@ -0,0 +1,6 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class PositionModel { +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets new file mode 100644 index 00000000..cdc23d03 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets @@ -0,0 +1,14 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class RotateModel { + public get currentRotate(): number; + public set currentRotate(value: number); + public get lastRotate(): number; + public set lastRotate(value: number); + public get startAngle(): number; + public set startAngle(value: number); + public reset(): void; + public stash(): void; +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets new file mode 100644 index 00000000..176f31fe --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets @@ -0,0 +1,18 @@ +'use static' +import { Observed } from "@kit.ArkUI"; +export declare function main(): void; +@Observed +export declare class ScaleModel { + public get scaleValue(): number; + public set scaleValue(value: number); + public get lastValue(): number; + public set lastValue(value: number); + public get maxScaleValue(): number; + public set maxScaleValue(value: number); + public get extraScaleValue(): number; + public set extraScaleValue(value: number); + public get defaultScaleValue(): number; + public reset(): void; + public stash(): void; + public toString(): string; +} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/oh-package-lock.json5 b/sample/EnhanceSampleArk1.2/ImageViewer/oh-package-lock.json5 new file mode 100644 index 00000000..ef831b53 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/ImageViewer/oh-package-lock.json5 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2025 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. + */ + +{ + "meta": { + "stableOrder": true, + "enableUnifiedLockfile": false + }, + "lockfileVersion": 3, + "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", + "specifiers": { + "@ohos/hamock@1.0.0": "@ohos/hamock@1.0.0", + "@ohos/hypium@1.0.21": "@ohos/hypium@1.0.21" + }, + "packages": { + "@ohos/hamock@1.0.0": { + "name": "@ohos/hamock", + "version": "1.0.0", + "integrity": "sha512-K6lDPYc6VkKe6ZBNQa9aoG+ZZMiwqfcR/7yAVFSUGIuOAhPvCJAo9+t1fZnpe0dBRBPxj2bxPPbKh69VuyAtDg==", + "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hamock/-/hamock-1.0.0.har", + "registryType": "ohpm" + }, + "@ohos/hypium@1.0.21": { + "name": "@ohos/hypium", + "version": "1.0.21", + "integrity": "sha512-iyKGMXxE+9PpCkqEwu0VykN/7hNpb+QOeIuHwkmZnxOpI+dFZt6yhPB7k89EgV1MiSK/ieV/hMjr5Z2mWwRfMQ==", + "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.21.har", + "registryType": "ohpm" + } + } +} \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/.gitignore b/sample/EnhanceSampleArk1.2/StateManagement/.gitignore index 42904af5..d2ff2014 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/.gitignore +++ b/sample/EnhanceSampleArk1.2/StateManagement/.gitignore @@ -1,4 +1,5 @@ /node_modules +/oh_modules /local.properties /.idea **/build @@ -7,4 +8,5 @@ /.clangd /.clang-format /.clang-tidy -/oh_modules \ No newline at end of file +**/.test +/.appanalyzer \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 b/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 index 10a0cdb2..a8ee954e 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 @@ -1,26 +1,10 @@ -/* - * Copyright (c) 2023 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. - */ - { "app": { - "bundleName": "com.samples.statemanagement", - "vendor": "samples", + "bundleName": "com.example.myapplication", + "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", - "icon": "$media:app_icon", - "label": "$string:app_name", - "distributedNotificationEnabled": true + "icon": "$media:layered_image", + "label": "$string:app_name" } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/background.png b/sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/background.png new file mode 100644 index 0000000000000000000000000000000000000000..923f2b3f27e915d6871871deea0420eb45ce102f GIT binary patch literal 91942 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 M;JyCV_snDe2la%mzyJUM literal 0 HcmV?d00001 diff --git a/sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/layered_image.json b/sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/layered_image.json new file mode 100644 index 00000000..fb499204 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/AppScope/resources/base/media/layered_image.json @@ -0,0 +1,7 @@ +{ + "layered-image": + { + "background" : "$media:background", + "foreground" : "$media:foreground" + } +} \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 b/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 index 2012ed6e..118cc94b 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,15 +15,28 @@ { "app": { - "signingConfigs": [], + "signingConfigs": [ + { + "name": "default", + "material": { + "certpath": "C:/Users/Administrator/.ohos/config/openharmony/default_test_new_7Dxo2Gn7T8nQLjmWfRfSzpsSGC0pisGUh2tWi1zLexE=.cer", + "keyAlias": "debugKey", + "keyPassword": "0000001B221C6418DEFD83C2487414C4E8BD598C319F4CAC030B4D3C2C7D3481A604828555E107B1054C92", + "profile": "C:/Users/Administrator/.ohos/config/openharmony/default_test_new_7Dxo2Gn7T8nQLjmWfRfSzpsSGC0pisGUh2tWi1zLexE=.p7b", + "signAlg": "SHA256withECDSA", + "storeFile": "C:/Users/Administrator/.ohos/config/openharmony/default_test_new_7Dxo2Gn7T8nQLjmWfRfSzpsSGC0pisGUh2tWi1zLexE=.p12", + "storePassword": "0000001B13824B61C1F99760150E80D7FEE89B7AF692A6396D77B672BF622B16132D1AB781CC37A968B638" + } + } + ], "products": [ { "name": "default", "signingConfig": "default", - "targetSdkVersion": "20", + "targetSdkVersion": "6.0.0(20)", "arkTSVersion": "1.2", - "compatibleSdkVersion": "20", - "compileSdkVersion": "20", + "compatibleSdkVersion": "6.0.0(20)", + "compileSdkVersion": "6.0.0(20)", "runtimeOS": "HarmonyOS", "buildOption": { "strictMode": { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/.gitignore b/sample/EnhanceSampleArk1.2/StateManagement/entry/.gitignore index 5a6ba80f..e2713a27 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/.gitignore +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/.gitignore @@ -1,4 +1,6 @@ /node_modules +/oh_modules /.preview /build -/.cxx \ No newline at end of file +/.cxx +/.test \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/build-profile.json5 b/sample/EnhanceSampleArk1.2/StateManagement/entry/build-profile.json5 index ddd6e5f1..e7569e30 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/build-profile.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/build-profile.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,9 +14,24 @@ */ { - "apiType": 'stageMode', + "apiType": "stageMode", "buildOption": { }, + "buildOptionSet": [ + { + "name": "release", + "arkOptions": { + "obfuscation": { + "ruleOptions": { + "enable": false, + "files": [ + "./obfuscation-rules.txt" + ] + } + } + } + }, + ], "targets": [ { "name": "default" diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/hvigorfile.ts b/sample/EnhanceSampleArk1.2/StateManagement/entry/hvigorfile.ts index f9973af5..cfa8a00f 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/hvigorfile.ts +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/hvigorfile.ts @@ -13,5 +13,9 @@ * limitations under the License. */ -// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -export { hapTasks } from '@ohos/hvigor-ohos-plugin'; +import { hapTasks } from '@ohos/hvigor-ohos-plugin'; + +export default { + system: hapTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ + plugins: [] /* Custom plugin to extend the functionality of Hvigor. */ +} \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/obfuscation-rules.txt b/sample/EnhanceSampleArk1.2/StateManagement/entry/obfuscation-rules.txt new file mode 100644 index 00000000..272efb6c --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/obfuscation-rules.txt @@ -0,0 +1,23 @@ +# Define project specific obfuscation rules here. +# You can include the obfuscation configuration files in the current module's build-profile.json5. +# +# For more details, see +# https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/source-obfuscation-V5 + +# Obfuscation options: +# -disable-obfuscation: disable all obfuscations +# -enable-property-obfuscation: obfuscate the property names +# -enable-toplevel-obfuscation: obfuscate the names in the global scope +# -compact: remove unnecessary blank spaces and all line feeds +# -remove-log: remove all console.* statements +# -print-namecache: print the name cache that contains the mapping from the old names to new names +# -apply-namecache: reuse the given cache file + +# Keep options: +# -keep-property-name: specifies property names that you want to keep +# -keep-global-name: specifies names that you want to keep in the global scope + +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/oh-package.json5 b/sample/EnhanceSampleArk1.2/StateManagement/entry/oh-package.json5 index 907d65a0..c9cb6c81 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/oh-package.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/oh-package.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,11 +14,12 @@ */ { - "license": "ISC", - "devDependencies": {}, "name": "entry", - "description": "example description", - "repository": {}, "version": "1.0.0", + "description": "Please describe the basic information.", + "main": "", + "author": "", + "license": "", "dependencies": {} } + diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets index 2262fde8..7cfca7f4 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/commoncomponents/ViewCodeText.ets @@ -1,3 +1,4 @@ +'use static' /* * Copyright (c) 2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ets new file mode 100644 index 00000000..0c8f2a87 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/entryability/EntryAbility.ets @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2023 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 UIAbility from '@ohos.app.ability.UIAbility'; +import AbilityConstant from '@ohos.app.ability.AbilityConstant'; +import Want from '@ohos.app.ability.Want'; +import type window from '@ohos.window'; +import { hilog } from '@kit.PerformanceAnalysisKit'; +import Logger from '../utils/Logger'; +import display from '@ohos.display'; + +import { AppStorage, LocalStorage } from '@kit.ArkUI'; + +const TAG: string = 'EntryAbility'; +const FONT_SIZE: number = 18; +const DPI: number = 160; +const SMALL_SCREEN_WIDTH: number = 520; +const MIDDLE_SCREEN_WIDTH: number = 520; + +export default class EntryAbility extends UIAbility { + private storage!: LocalStorage; + + onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { + hilog.info(0x0000, 'testTag', 'EntryAbility onCreate'); + this.storage = new LocalStorage(); + this.storage.setOrCreate('currentModelStatus', true); + this.storage.setOrCreate('contentFontSize', FONT_SIZE); + hilog.info(0x0000, 'testTag', '11111111111'); + Logger.info(TAG, 'Ability onCreate'); + } + + onDestroy(): void { + // Logger.info(TAG, 'Ability onDestroy'); + } + + updateBreakpoint(windowWidth: number): void { + let windowWidthVp: number = windowWidth / (display.getDefaultDisplaySync().densityDPI / DPI); + let curBp: string; + if (windowWidthVp < SMALL_SCREEN_WIDTH) { + curBp = 'sm'; + } else if (windowWidthVp < MIDDLE_SCREEN_WIDTH) { + curBp = 'md'; + } else { + curBp = 'lg'; + } + // Logger.info(TAG, `breakpoint: ${curBp}`); + AppStorage.setOrCreate('currentBreakpoint', curBp); + } + + onWindowStageCreate(windowStage: window.WindowStage): void { + // Main window is created, set main page for this ability + // Logger.info(TAG, 'Ability onWindowStageCreate'); + windowStage.getMainWindow().then((windowObj) => { + let windowWidth: number = windowObj.getWindowProperties().windowRect.width; + this.updateBreakpoint(windowWidth); + windowObj.on('windowSizeChange', (currentWindowSize) => { + let currentWindowWidth: number = currentWindowSize.width; + this.updateBreakpoint(currentWindowWidth); + + if (windowObj.getWindowProperties().isFullScreen) { + // Logger.info(TAG, 'isFullScreen'); + } + if (windowObj.getWindowProperties().isLayoutFullScreen) { + // Logger.info(TAG, 'isLayoutFullScreen'); + } + }); + }); + windowStage.loadContent('pages/home/Home', this.storage); + } + + onWindowStageDestroy(): void { + // Main window is destroyed, release UI related resources + // Logger.info(TAG, 'Ability onWindowStageDestroy'); + } + + onForeground(): void { + // Ability has brought to foreground + // Logger.info(TAG, 'Ability onForeground'); + } + + onBackground(): void { + // Ability has back to background + // Logger.info(TAG, 'Ability onBackground'); + } +} diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ets new file mode 100644 index 00000000..9fab77c9 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/outofsyncability/OutOfSyncAbility.ets @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2023 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 UIAbility from '@ohos.app.ability.UIAbility'; +import AbilityConstant from '@ohos.app.ability.AbilityConstant'; +import Want from '@ohos.app.ability.Want'; +import type window from '@ohos.window'; +import Logger from '../utils/Logger'; + +const TAG = 'OutOfSyncAbility'; + +export class OutOfSyncAbility extends UIAbility { + onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { + Logger.info(TAG, 'Ability onCreate'); + } + + onDestroy(): void { + Logger.info(TAG, 'Ability onDestroy'); + } + + onWindowStageCreate(windowStage: window.WindowStage): void { + // Main window is created, set main page for this ability + Logger.info(TAG, 'Ability onWindowStageCreate'); + + windowStage.loadContent('pages/applylevelstagemanagement/abilityglobaldatasync/AbilityOutOfSyncPage', (err, data) => { + if (err && err.code) { + Logger.error(TAG, `Failed to load the content. Cause: %{public}s${JSON.stringify(err)}`); + return; + } + Logger.info(TAG, `Succeeded in loading the content. Data: %{public}s${JSON.stringify(data)}}`); + }); + } + + onWindowStageDestroy(): void { + // Main window is destroyed, release UI related resources + Logger.info(TAG, 'Ability onWindowStageDestroy'); + } + + onForeground(): void { + // Ability has brought to foreground + Logger.info(TAG, 'Ability onForeground'); + } + + onBackground(): void { + // Ability has back to background + Logger.info(TAG, 'Ability onBackground'); + } +} diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets index 80b32c29..05c00053 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync.ets @@ -47,9 +47,10 @@ struct AbilityGlobalDataSync { } else { TitleBar({ title: this.title }) } - CodeView({ title: this.title, isShowTitle: false }) { + // TODO Exception + // CodeView({ title: this.title, isShowTitle: false }) { AbilityGlobalDataSyncCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets index 4889b7c5..3c6ed9e6 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStorageLinkPage.ets @@ -55,7 +55,8 @@ struct StorageLinkAbilityPage { } else { TitleBar({ title: this.title }) } - CodeView({ title: this.title, isShowTitle: false }) { + // TODO Exception + // CodeView({ title: this.title, isShowTitle: false }) { Column({ space: 30.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('LocalStorageLinkPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) @@ -92,7 +93,7 @@ struct StorageLinkAbilityPage { .height('100%') .padding($r('app.float.page_padding')) } - } + // } .width('100%') .height('100%') .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets index 720bd9f5..381c2d6e 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/abilityglobaldatasync/LocalStoragePropPage.ets @@ -62,7 +62,8 @@ struct StoragePropAbilityPage { } else { TitleBar({ title: this.title }) } - CodeView({ title: this.title, isShowTitle: false }) { + // TODO Exception + // CodeView({ title: this.title, isShowTitle: false }) { Column({ space: 20.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('LocalStoragePropPage.ets.html') }) Text($r('app.string.localStorage_both_data_binding')) @@ -130,7 +131,7 @@ struct StoragePropAbilityPage { } .padding($r('app.float.page_padding')) } - } + // } .width('100%') .height('100%') .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets index 7ddf5fac..f5aba86e 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync.ets @@ -43,9 +43,10 @@ struct ApplyGlobalDataSync { } else { TitleBar({ title: this.title }) } - CodeView({ title: this.title, isShowTitle: false }) { + // TODO Exception + // CodeView({ title: this.title, isShowTitle: false }) { ApplyGlobalDataSyncCode() - } + // } }.width('100%') .height('100%') .backgroundColor(this.currentModelStatus ? $r('app.color.nightnode_color') : $r('app.color.background_shallow_grey')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ets new file mode 100644 index 00000000..ec6cc99e --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/applylevelstagemanagement/model/AbilityConfigType.ets @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2023 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. + */ + +export interface AbilityConfigType { + bundleName: string; + abilityName: string +}; \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets index 8d072b97..8465800a 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/TabContentNavigation.ets @@ -36,6 +36,7 @@ import { Margin, $r, ColumnOptions, + Scroll, } from '@kit.ArkUI'; import router from '@ohos.router'; @@ -59,11 +60,12 @@ export struct TabContentNavigation { private categories: Array = new Array(); hasSecondLevelCategory(category: ThirdLevelCategory | SecondLevelCategory): boolean { - return (category as SecondLevelCategory).tag !== undefined; + return category.type === "secondLevelCategory"; } build() { Column() { + Blank() List() { if (this.categories.length > 0 && this.hasSecondLevelCategory(this.categories[0])) { ForEach(this.categories, (item: ThirdLevelCategory | SecondLevelCategory, index: number) => { @@ -168,7 +170,7 @@ struct ThirdLevelNavigation { } }) - if (this.isUnfold ) { + if (this.isUnfold) { ForEach(this.thirdLevelCategory?.childNodes!, (fourthLevelCategory: FourthLevelCategory, index: number) => { Column() { Divider() @@ -179,7 +181,7 @@ struct ThirdLevelNavigation { FourthLevelNavigation({ fourthLevelCategory: fourthLevelCategory }) } - }, (item: FourthLevelCategory) => item.title.toString() ) + }, (item: FourthLevelCategory) => item.title.toString()) } } .id(`secondLevelMenu${this.secondLevelCategoryIndex}${this.secondLevelCategoryIndex === 1 ? 0 : this.ThirdLevelNavigationIndex}`) @@ -207,7 +209,7 @@ struct FourthLevelNavigation { // Click to jump to the corresponding page this.getUIContext().getRouter().pushUrl({ url: this.fourthLevelCategory?.url as string - }); + }) }) } } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets index f05d2619..3a562037 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/data/HomeData.ets @@ -48,12 +48,14 @@ const SINGLE_COMPONENT_CATEGORY: ThirdLevelCategory[] = [ { tag: 1.0, title: $r('app.string.decorated_object_type'), - childNodes: DECORATED_OBJECT_TYPE + childNodes: DECORATED_OBJECT_TYPE, + type: "thirdLevelCategory" }, { tag: 1.0, title: $r('app.string.update_principle'), - childNodes: UPDATE_PRINCIPLE + childNodes: UPDATE_PRINCIPLE, + type: "thirdLevelCategory" } ]; @@ -72,28 +74,33 @@ const MULTI_COMPONENTS_CATEGORY: ThirdLevelCategory[] = [ { tag: 1.0, title: $r('app.string.parent_child_sync'), - childNodes: PARENT_CHILD_SYNC + childNodes: PARENT_CHILD_SYNC, + type: "thirdLevelCategory" }, { tag: 1.0, title: $r('app.string.parent_descendent_sync'), - url: 'pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync' + url: 'pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync', + type: "thirdLevelCategory" }, { tag: 1.0, title: $r('app.string.brother_sync'), - url: 'pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync' + url: 'pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync', + type: "thirdLevelCategory" } ]; const PAGE_LEVEL_CATEGORY: Array = [ { title: $r('app.string.single_component_state'), - childNodes: SINGLE_COMPONENT_CATEGORY + childNodes: SINGLE_COMPONENT_CATEGORY, + type: "secondLevelCategory" }, { title: $r('app.string.multi_component_sync'), - childNodes: MULTI_COMPONENTS_CATEGORY + childNodes: MULTI_COMPONENTS_CATEGORY, + type: "secondLevelCategory" } ]; @@ -102,11 +109,13 @@ const APP_LEVEL_CATEGORY: Array = [ tag: 1.0, title: $r('app.string.application_storage_ui'), url: 'pages/applylevelstagemanagement/applyglobaldatasync/ApplyGlobalDataSync', + type: "thirdLevelCategory" }, { tag: 1.0, title: $r('app.string.ability_storage_ui'), url: 'pages/applylevelstagemanagement/abilityglobaldatasync/AbilityGlobalDataSync', + type: "thirdLevelCategory" } ]; diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets index 876b3dad..9db7516a 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/home/model/CategoricalDataType.ets @@ -25,14 +25,16 @@ export interface FirstLevelCategory { export interface SecondLevelCategory { tag?: number, title: Resource, // Second-level category titles - childNodes: ThirdLevelCategory[] + childNodes: ThirdLevelCategory[], + type: string } export interface ThirdLevelCategory { tag: number, // Third-level category tag title: Resource, // Third-level category headings url?: string, // Third-level category detail page URL - childNodes?: FourthLevelCategory[] + childNodes?: FourthLevelCategory[], + type: string } export interface FourthLevelCategory { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets index 27242502..099d1439 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/BrotherComponentSync.ets @@ -34,9 +34,10 @@ struct BrotherComponentSync { build() { Column() { - CodeView({ title: this.title }) { + // TODO Exception + // CodeView({ title: this.title }) { BrotherComponentSyncCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets index 7e9650f4..76d385ef 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherOneComponent.ets @@ -43,8 +43,12 @@ export struct ConsumeBrotherOneComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; @Consume consumeCircleColor: Resource; - @Consume currentSelectIndex: int = 0; - private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; + @Consume currentSelectIndex: number = 0.0; + private CONTEXT: common.UIAbilityContext | undefined = undefined; + + aboutToAppear() { + this.CONTEXT = ((this.getUIContext()?.getHostContext()) as common.UIAbilityContext); + } build() { Column({ space: 10.0 }as ColumnOptions) { @@ -58,13 +62,13 @@ export struct ConsumeBrotherOneComponent { Select(this.selectValues) .id('consumeSelectCompA') .selected(this.currentSelectIndex) - .value(this.selectValues[this.currentSelectIndex].value) + .value(this.selectValues[this.currentSelectIndex as int].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) - .onSelect((index: number,text: string ) => { - this.currentSelectIndex = index as int; + .onSelect((index: number, text: string ) => { + this.currentSelectIndex = index; this.consumeCircleColor = this.selectColors[index as int].color; }) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets index a76c80a3..d662c8d0 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/ConsumeBrotherTwoComponent.ets @@ -44,8 +44,12 @@ export struct ConsumeBrotherTwoComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; @Consume consumeCircleColor: Resource; - @Consume currentSelectIndex: int; - private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; + @Consume currentSelectIndex: number = 0.0; + private CONTEXT: common.UIAbilityContext | undefined = undefined; + + aboutToAppear() { + this.CONTEXT = ((this.getUIContext()?.getHostContext()) as common.UIAbilityContext); + } build() { Column({ space: 10.0 }as ColumnOptions) { @@ -60,13 +64,13 @@ export struct ConsumeBrotherTwoComponent { Select(this.selectValues) .id('consumeSelectCompB') .selected(this.currentSelectIndex) - .value(this.selectValues[this.currentSelectIndex].value) + .value(this.selectValues[this.currentSelectIndex as int].value) .fontColor($r('app.color.button_text_color')) .font({ size: $r('app.float.select_font_size') }) .selectedOptionFont({ size: $r('app.float.select_font_size') }) .optionFont({ size: $r('app.float.select_font_size') }) .onSelect((index: number, text: string) => { - this.currentSelectIndex = index as int; + this.currentSelectIndex = index; this.consumeCircleColor = this.selectColors[index as int].color; }) Circle() diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets index e9b83ef6..f5291111 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherOneComponent.ets @@ -47,7 +47,11 @@ export struct LinkBrotherOneComponent { @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; @Link circleColor: Resource; @Link currentSelectIndex: int; - private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; + private CONTEXT: common.UIAbilityContext | undefined = undefined; + + aboutToAppear() { + this.CONTEXT = ((this.getUIContext()?.getHostContext()) as common.UIAbilityContext); + } build() { Column({ space: 10.0 }as ColumnOptions) { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets index 677e1285..f250002f 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/brothercomponentssync/LinkBrotherTwoComponent.ets @@ -45,7 +45,11 @@ export struct LinkBrotherTwoComponent { @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; @Link circleColor: Resource; @Link currentSelectIndex: int; - private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; + private CONTEXT: common.UIAbilityContext | undefined = undefined; + + aboutToAppear() { + this.CONTEXT = ((this.getUIContext()?.getHostContext()) as common.UIAbilityContext); + } build() { Column({ space: 10.0 }as ColumnOptions) { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets index bd9edbd1..5d9515a2 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/DeepNestComponentsSync.ets @@ -34,9 +34,10 @@ struct DeepNestComponentsSync { build() { Column() { - CodeView({ title: this.title }) { + // TODO Exception + // CodeView({ title: this.title }) { DeepNestComponentsSyncCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets index 3a7c539d..35553504 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/LinkDescendentComponent.ets @@ -45,7 +45,11 @@ export struct LinkDescendentComponent { @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; @Link circleColor: Resource; @Link currentSelectIndex: int; - private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; + private CONTEXT: common.UIAbilityContext | undefined = undefined; + + aboutToAppear() { + this.CONTEXT = ((this.getUIContext()?.getHostContext()) as common.UIAbilityContext); + } build() { Column() { diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets index 759749e9..b200da55 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/deepnestcomponentssync/StateGrandfatherComponent.ets @@ -46,7 +46,11 @@ export struct StateGrandfatherComponent { @State selectColors: ColorType[] = COLOR_SELECT_DATA; @State selectValues: SelectOption[] = NEW_COLOR_SELECT_DATA; @State currentSelectIndex: int = 0; - private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; + private CONTEXT: common.UIAbilityContext | undefined = undefined; + + aboutToAppear() { + this.CONTEXT = ((this.getUIContext()?.getHostContext()) as common.UIAbilityContext); + } build() { Column({ space: 10.0 }as ColumnOptions) { @@ -95,7 +99,7 @@ struct LinkChildComp { .height($r('app.float.button_height')) LinkDescendentComponent({ circleColor: this.circleColor, - currentSelectIndex: this.currentSelectIndex as int + currentSelectIndex: this.currentSelectIndex }) } .padding(10.0) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets index 279bee7b..c5740323 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/parentchildpartialcontentsync/ParentChildPartialContentSync.ets @@ -34,9 +34,10 @@ struct ParentChildPartialContentSync { build() { Column() { - CodeView({ title: this.title }) { + // TODO Exception + // CodeView({ title: this.title }) { ParentChildPartialContentSyncCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets index 6a23ae60..69e5d875 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/multicompomentssync/parentchildcomponentsync/uniandbidirectionsync/UniAndBidirectionSync.ets @@ -34,9 +34,10 @@ struct UniAndBidirectionSync { build() { Column() { - CodeView({ title: this.title }) { + // TODO Exception + // CodeView({ title: this.title }) { UniAndBidirectionSyncCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets index 6cc9a724..059f5dcb 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/arraytype/ArrayType.ets @@ -34,9 +34,10 @@ struct ArrayTypes { build() { Column() { - CodeView({ title: this.title }) { + // TODO Exception + // CodeView({ title: this.title }) { ArrayTypeCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets index 6831d565..fca92781 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/basetype/BaseType.ets @@ -24,7 +24,6 @@ import { $r, } from '@kit.ArkUI'; - import { BaseTypeCode } from './BaseTypeCode'; import { CodeView } from '../../../../../commoncomponents/CodeView' @@ -35,9 +34,10 @@ struct BaseType { build() { Column() { - CodeView({ title: this.title}){ + // TODO Exception + // CodeView({ title: this.title }) { BaseTypeCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets index 5b94a34b..f4ac2699 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectType.ets @@ -34,9 +34,10 @@ struct ClassObjectType { build() { Column() { - CodeView({ title: this.title }) { + // TODO Exception + // CodeView({ title: this.title }) { ClassObjectTypeCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets index 36af6225..f49669fe 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/decoratedobjecttype/classobjecttype/ClassObjectTypeCode.ets @@ -45,18 +45,23 @@ import { getResourceString } from '../../../../../utils/ResourceUtils'; @Component export struct ClassObjectTypeCode { - @State classObjectData: ParentClass = new ParentClass(getResourceString(this.CONTEXT, $r('app.string.class_object')), - getResourceString(this.CONTEXT, $r('app.string.class_attribute')), 1.0, - new ChildClass(getResourceString(this.CONTEXT, $r('app.string.class_child_attribute')), 2.0)); + @State classObjectData: ParentClass | undefined = undefined; private clickedCount: number = 0.0; - private CONTEXT: common.UIAbilityContext = this.getUIContext().getHostContext() as common.UIAbilityContext; + private CONTEXT: common.UIAbilityContext | undefined = undefined; + + aboutToAppear() { + this.CONTEXT = ((this.getUIContext()?.getHostContext()) as common.UIAbilityContext); + this.classObjectData = new ParentClass(getResourceString(this.CONTEXT as common.UIAbilityContext, $r('app.string.class_object')), + getResourceString(this.CONTEXT as common.UIAbilityContext, $r('app.string.class_attribute')), 1.0, + new ChildClass(getResourceString(this.CONTEXT as common.UIAbilityContext, $r('app.string.class_child_attribute')), 2.0)); + } build() { Column({ space: 10.0 }as ColumnOptions) { ViewCodeText({ webSrc: $rawfile('ClassObjectTypeCode.ets.html') }) Column({ space: 15.0 }as ColumnOptions) { Row() { - Text(this.classObjectData.title) + Text((this.classObjectData as ParentClass).title) .fontSize(20.0) .textAlign(TextAlign.End) Divider() @@ -68,9 +73,9 @@ export struct ClassObjectTypeCode { Column() { Row() { - Text(this.classObjectData.attributeTitle) + Text((this.classObjectData as ParentClass).attributeTitle) .fontSize(20.0) - Text(`${this.classObjectData.attribute}`) + Text(`${(this.classObjectData as ParentClass).attribute}`) .fontSize(20.0) .textAlign(TextAlign.End) } @@ -84,7 +89,7 @@ export struct ClassObjectTypeCode { .width('100%') .padding({ left: 50.0 }as Padding ) - ChildObjectComp({ childObject: this.classObjectData.child }) + ChildObjectComp({ childObject: (this.classObjectData as ParentClass).child }) } .width('100%') .backgroundColor($r('app.color.component_background_pink')) @@ -92,12 +97,12 @@ export struct ClassObjectTypeCode { Button($r('app.string.class_type_update_object')) .onClick((event:ClickEvent) => { this.clickedCount++; - let objectTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_object')) + this.clickedCount; - let attributeTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_attribute')) + this.clickedCount; - let childAttributeTitle: string = getResourceString(this.CONTEXT, $r('app.string.class_child_attribute')) + let objectTitle: string = getResourceString(this.CONTEXT as common.UIAbilityContext, $r('app.string.class_object')) + this.clickedCount; + let attributeTitle: string = getResourceString(this.CONTEXT as common.UIAbilityContext, $r('app.string.class_attribute')) + this.clickedCount; + let childAttributeTitle: string = getResourceString(this.CONTEXT as common.UIAbilityContext, $r('app.string.class_child_attribute')) + this.clickedCount; - let newObject = new ParentClass(objectTitle, attributeTitle, this.classObjectData.attribute + 1.0, - new ChildClass(childAttributeTitle, this.classObjectData.child.attribute + 1.0)); + let newObject = new ParentClass(objectTitle, attributeTitle, (this.classObjectData as ParentClass).attribute + 1.0, + new ChildClass(childAttributeTitle, (this.classObjectData as ParentClass).child.attribute + 1.0)); this.classObjectData = newObject; }) .id('updateObject') @@ -107,7 +112,7 @@ export struct ClassObjectTypeCode { .applyStyles(buttonStyle) Button($r('app.string.class_type_update_attribute')) .onClick((event:ClickEvent) => { - this.classObjectData.attribute++; + (this.classObjectData as ParentClass).attribute++; }) .id('updateObjectAttribute') .fontColor($r('app.color.button_text_color')) @@ -116,7 +121,7 @@ export struct ClassObjectTypeCode { .applyStyles(buttonStyle) Button($r('app.string.class_type_update_child_attribute')) .onClick((event:ClickEvent) => { - this.classObjectData.child.attribute++; + (this.classObjectData as ParentClass).child.attribute++; }) .id('updateAttributeOfAttribute') .fontColor($r('app.color.button_text_color')) diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets index 2abd7013..8e8c4f71 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/pages/pagelevelstagemanagement/singlecomponentstatevariables/updatetactics/updateboundcomponent/UpdateBoundComponent.ets @@ -34,9 +34,10 @@ struct UpdateBoundComponent { build() { Column() { - CodeView({ title: this.title }) { + // TODO Exception + // CodeView({ title: this.title }) { UpdateBoundComponentCode() - } + // } } .width('100%') .height('100%') diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagelinkability/StorageLinkAbility.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagelinkability/StorageLinkAbility.ets new file mode 100644 index 00000000..4fadccb7 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagelinkability/StorageLinkAbility.ets @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2023 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 UIAbility from '@ohos.app.ability.UIAbility'; +import AbilityConstant from '@ohos.app.ability.AbilityConstant'; +import Want from '@ohos.app.ability.Want'; +import type window from '@ohos.window'; +import Logger from '../utils/Logger'; + +const TAG = 'StorageLinkAbility'; + +export default class StorageLinkAbility extends UIAbility { + onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { + Logger.info(TAG, 'Ability onCreate'); + } + + onDestroy(): void { + Logger.info(TAG, 'Ability onDestroy'); + } + + onWindowStageCreate(windowStage: window.WindowStage): void { + // Main window is created, set main page for this ability + Logger.info(TAG, 'Ability onWindowStageCreate'); + + windowStage.loadContent('pages/applylevelstagemanagement/applyglobaldatasync/StorageLinkAbilityPage', (err, data) => { + if (err && err.code) { + Logger.error(TAG, 'Failed to load the content. Cause: %{public}s'); + return; + } + Logger.info(TAG, 'Succeeded in loading the content. Data: %{public}s'); + }); + } + + onWindowStageDestroy(): void { + // Main window is destroyed, release UI related resources + Logger.info(TAG, 'Ability onWindowStageDestroy'); + } + + onForeground(): void { + // Ability has brought to foreground + Logger.info(TAG, 'Ability onForeground'); + } + + onBackground(): void { + // Ability has back to background + Logger.info(TAG, 'Ability onBackground'); + } +} diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagepropability/StoragePropAbility.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagepropability/StoragePropAbility.ets new file mode 100644 index 00000000..96bfb200 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/storagepropability/StoragePropAbility.ets @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2023 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 UIAbility from '@ohos.app.ability.UIAbility'; +import AbilityConstant from '@ohos.app.ability.AbilityConstant'; +import Want from '@ohos.app.ability.Want'; +import type window from '@ohos.window'; +import Logger from '../utils/Logger'; + +const TAG = 'StoragePropAbility'; + +export default class StoragePropAbility extends UIAbility { + onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { + Logger.info(TAG, 'Ability onCreate'); + } + + onDestroy(): void { + Logger.info(TAG, 'Ability onDestroy'); + } + + onWindowStageCreate(windowStage: window.WindowStage): void { + // Main window is created, set main page for this ability + Logger.info(TAG, 'Ability onWindowStageCreate'); + + windowStage.loadContent('pages/applylevelstagemanagement/applyglobaldatasync/StoragePropAbilityPage', (err, data) => { + if (err && err.code) { + Logger.error(TAG, 'Failed to load the content. Cause: %{public}s'); + return; + } + Logger.info(TAG, 'Succeeded in loading the content. Data: %{public}s'); + }); + } + + onWindowStageDestroy(): void { + // Main window is destroyed, release UI related resources + Logger.info(TAG, 'Ability onWindowStageDestroy'); + } + + onForeground(): void { + // Ability has brought to foreground + Logger.info(TAG, 'Ability onForeground'); + } + + onBackground(): void { + // Ability has back to background + Logger.info(TAG, 'Ability onBackground'); + } +} diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/Logger.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/Logger.ets new file mode 100644 index 00000000..93892bc2 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/Logger.ets @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2023 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 '@ohos.hilog'; + +const FORMAT: string = '%{public}s, %{public}s'; + +class Logger { + + private prefix: string; + + constructor(prefix: string) { + this.prefix = prefix; + } + + debug(...args: string[]): void { + hilog.debug(0xFF00, this.prefix, FORMAT, args); + } + + info(...args: string[]): void { + hilog.info(0xFF00, this.prefix, FORMAT, args); + } + + warn(...args: string[]): void { + hilog.warn(0xFF00, this.prefix, FORMAT, args); + } + + error(...args: string[]): void { + hilog.error(0xFF00, this.prefix, FORMAT, args); + } +} + +export default new Logger('Sample_StateManagement'); \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ets new file mode 100644 index 00000000..bdced81b --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/ResourceUtils.ets @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2023 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 type common from '@ohos.app.ability.common'; +import { resourceManager } from '@kit.LocalizationKit' + +/** + * getResourceString将Resource类型的数据转换成string类型的数据 + * @param context + * @param ResourceData + */ +export function getResourceString(context: common.UIAbilityContext, resourceData: resourceManager.Resource): string { + let stringData: string = context.resourceManager.getStringSync(resourceData.id); + return stringData; +} \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ets new file mode 100644 index 00000000..f23a4715 --- /dev/null +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/ets/utils/StartAbilityUtils.ets @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 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 type common from '@ohos.app.ability.common'; +import Want from '@ohos.app.ability.Want'; +import type { AbilityConfigType } from '../pages/applylevelstagemanagement/model/AbilityConfigType'; +import Logger from './Logger'; + +export function startSpecifiedAbility(context: common.UIAbilityContext, abilityName: string): void { + let abilityConfig: Want = { + bundleName: 'com.samples.statemanagement', + abilityName: abilityName + }; + context.startAbility(abilityConfig, (err) => { + if (err && err.code) { + Logger.error(`startAbility failed, code is ${err.code}, message is ${err.message}`); + return; + } + Logger.info('startAbility succeed'); + }); +} \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/module.json5 b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/module.json5 index 862cca18..ac5fbe01 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/module.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/module.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -20,8 +20,9 @@ "description": "$string:module_desc", "mainElement": "EntryAbility", "deviceTypes": [ - "default", - "tablet" + "phone", + "tablet", + "2in1" ], "deliveryWithInstall": true, "installationFree": false, @@ -29,37 +30,27 @@ "abilities": [ { "name": "EntryAbility", - "srcEntrance": "./ets/entryability/EntryAbility.ts", + "srcEntry": "./ets/entryability/EntryAbility.ets", "description": "$string:EntryAbility_desc", "icon": "$media:icon", "label": "$string:EntryAbility_label", "startWindowIcon": "$media:icon", "startWindowBackground": "$color:start_window_background", - "visible": true, + "exported": true, "skills": [ { "entities": [ "entity.system.home" ], "actions": [ - "action.system.home" + "ohos.want.action.home" ] } ] }, - { - "name": "StoragePropAbility", - "srcEntrance": "./ets/storagepropability/StoragePropAbility.ts", - "description": "$string:storagepropability_desc", - "icon": "$media:icon", - "label": "$string:storagepropability_label", - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:start_window_background", - "visible": true - }, { "name": "StorageLinkAbility", - "srcEntrance": "./ets/storagelinkability/StorageLinkAbility.ts", + "srcEntry": "./ets/storagelinkability/StorageLinkAbility.ets", "description": "$string:storagelinkability_desc", "icon": "$media:icon", "label": "$string:storagelinkability_label", @@ -69,7 +60,7 @@ }, { "name": "OutOfSyncAbility", - "srcEntrance": "./ets/outofsyncability/OutOfSyncAbility.ts", + "srcEntry": "./ets/outofsyncability/OutOfSyncAbility.ets", "description": "$string:outofsyncability_desc", "icon": "$media:icon", "label": "$string:outofsyncability_label", diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/base/element/string.json b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/base/element/string.json index a94a8616..e886661b 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/base/element/string.json +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/base/element/string.json @@ -427,6 +427,9 @@ { "name": "outofsyncability_label", "value": "label" + },{ + "name": "app_name", + "value": "MyApplication" } ] } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/base/media/layered_image.png b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/main/resources/base/media/layered_image.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c GIT binary patch literal 6790 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 { // Defines a test suite. Two parameters are supported: test suite name and test suite function. - beforeAll(function () { + beforeAll(() => { // Presets an action, which is performed only once before all test cases of the test suite start. // This API supports only one parameter: preset action function. - }); - beforeEach(function () { + }) + beforeEach(() => { // Presets an action, which is performed before each unit test case starts. // The number of execution times is the same as the number of test cases defined by **it**. // This API supports only one parameter: preset action function. - }); - afterEach(function () { + }) + afterEach(() => { // Presets a clear action, which is performed after each unit test case ends. // The number of execution times is the same as the number of test cases defined by **it**. // This API supports only one parameter: clear action function. - }); - afterAll(function () { + }) + afterAll(() => { // Presets a clear action, which is performed after all test cases of the test suite end. // This API supports only one parameter: clear action function. - }); - it('assertContain', 0, function () { - - Logger.info("Sample_StateManagement test start") - /** - * 打开应用 - */ - it(BUNDLE + 'StartAbility_001', 0, async function (done) { - Logger.info(TAG, BUNDLE + 'StartAbility_001 begin') - let abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - try { - await abilityDelegator.startAbility({ - bundleName: 'com.samples.statemanagement', - abilityName: 'EntryAbility' - }) - done() - } catch (exception) { - Logger.info(TAG, `StartAbility_001 end ${JSON.stringify(exception)}`) - expect(0).assertEqual(exception.code) - done() - } - Logger.info(TAG, BUNDLE + 'StartAbility_001' + ' end') - }) - - /** - * 打开折叠层 - */ - it(BUNDLE + 'FolderLayerFunction_001', 0, async function () { - let testName = 'FolderLayerFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let driver = Driver.create(); - await driver.delayMs(500); - // 打开修饰对象模块的折叠 - await driver.assertComponentExist(ON.id('secondLevelMenu00')); - let decoratedOject = await driver.findComponent(ON.id('secondLevelMenu00')); - await decoratedOject.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.id('secondLevelMenu01')); - let updatedBound = await driver.findComponent(ON.id('secondLevelMenu01')); - await updatedBound.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.id('secondLevelMenu10')); - let multiComponentsSync = await driver.findComponent(ON.id('secondLevelMenu10')); - await multiComponentsSync.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - /** - * 测试基础类型状态管理 - */ - it(BUNDLE + 'BaseTypeFunction_001', 0, async function () { - let testName = 'BaseTypeFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入基础类型页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.base_type')))); - let enterPage = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.base_type')))); - await enterPage.click(); - await driver.delayMs(500); - // 设置圆形颜色 - await driver.assertComponentExist(ON.id('circleColorBtn')); - let setCircleColor = await driver.findComponent(ON.id('circleColorBtn')); - await setCircleColor.click(); - await driver.delayMs(500); - // 再次设置圆形颜色 - await setCircleColor.click(); - await driver.delayMs(500); - // 查看源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - /** - * 测试数组类型状态管理 - */ - it(BUNDLE + 'ArrayTypeFunction_001', 0, async function () { - let testName = 'ArrayTypeFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入数组类型页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.array_type')))); - let enterPage = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.array_type')))); - await enterPage.click(); - await driver.delayMs(500); - // 点击删除元素 - await driver.assertComponentExist(ON.id('arrayTypeBtn1')); - let arrayTypeDeleteBtn = await driver.findComponent(ON.id('arrayTypeBtn1')); - await arrayTypeDeleteBtn.click(); - await driver.delayMs(500); - await arrayTypeDeleteBtn.click(); - await driver.delayMs(500); - await arrayTypeDeleteBtn.click(); - await driver.delayMs(500); - await arrayTypeDeleteBtn.click(); - await driver.delayMs(500); - // 点击添加元素 - await driver.assertComponentExist(ON.id('arrayTypeBtn0')); - let arrayTypeAddBtn = await driver.findComponent(ON.id('arrayTypeBtn0')); - await arrayTypeAddBtn.click(); - await driver.delayMs(500); - // 点击更新元素 - await driver.assertComponentExist(ON.id('arrayTypeBtn2')); - let arrayTypeUpdateBtn = await driver.findComponent(ON.id('arrayTypeBtn2')); - await arrayTypeUpdateBtn.click(); - await driver.delayMs(500); - await arrayTypeDeleteBtn.click(); - await driver.delayMs(500); - await arrayTypeUpdateBtn.click(); - await driver.delayMs(500); - await arrayTypeAddBtn.click(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }) - - /** - * 测试类对象类型状态管理 - */ - it(BUNDLE + 'ObjectTypeFunction_001', 0, async function () { - let testName = 'ObjectTypeFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入类对象类型页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.class_type')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.class_type')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击更新对象 - await driver.assertComponentExist(ON.id('updateObject')); - let updateObjectBtn = await driver.findComponent(ON.id('updateObject')); - await updateObjectBtn.click(); - await driver.delayMs(500); - await updateObjectBtn.click(); - await driver.delayMs(500); - // 点击更新对象属性 - await driver.assertComponentExist(ON.id('updateObjectAttribute')); - let updateObjectAttributeBtn = await driver.findComponent(ON.id('updateObjectAttribute')); - await updateObjectAttributeBtn.click(); - await driver.delayMs(500); - await updateObjectAttributeBtn.click(); - await driver.delayMs(500); - // 点击更新属性的属性 - await driver.assertComponentExist(ON.id('updateAttributeOfAttribute')); - let updateAttributeOfAttributeBtn = await driver.findComponent(ON.id('updateAttributeOfAttribute')); - await updateAttributeOfAttributeBtn.click(); - await driver.delayMs(500); - await updateAttributeOfAttributeBtn.click(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - /** - * 测试只更新所绑定的组件 - */ - it(BUNDLE + 'UpdateBindComponentFunction_001', 0, async function () { - let testName = 'UpdateBindComponentFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入只更新所绑定的组件页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.only_update_bound_components')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.only_update_bound_components')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击更新对象 - await driver.assertComponentExist(ON.id('titleAndContentBtn')); - let updateTitleAndContent = await driver.findComponent(ON.id('titleAndContentBtn')); - await updateTitleAndContent.click(); - await driver.delayMs(500); - await updateTitleAndContent.click(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - /** - * 测试单、双向同步 - */ - it(BUNDLE + 'SingleBindFunction_001', 0, async function () { - let testName = 'SingleBindFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入单双向同步页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.single_and_two_way_sync')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.single_and_two_way_sync')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击设置粉色 - await driver.assertComponentExist(ON.id('pinkColorBtn')); - let pinkColorBtn = await driver.findComponent(ON.id('pinkColorBtn')); - await pinkColorBtn.click(); - await driver.delayMs(500); - // 设置蓝色 - await driver.assertComponentExist(ON.id('blueColorBtn')); - let blueColorBtn = await driver.findComponent(ON.id('blueColorBtn')); - await blueColorBtn.click(); - await driver.delayMs(500); - // 设置红色 - await driver.assertComponentExist(ON.id('redColorBtn')); - let redColorBtn = await driver.findComponent(ON.id('redColorBtn')); - await redColorBtn.click(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }) - - /** - * 测试子组件同步父组件的内容 - */ - it(BUNDLE + 'ChildParentFunction_001', 0, async function () { - let testName = 'ChildParentFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入单双向同步页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.partial_sync')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.partial_sync')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击修改父组件第一个属性文本 - let inputMethodController = inputMethod.getController(); - await driver.assertComponentExist(ON.id('attribute1')); - let attributeOne = await driver.findComponent(ON.id('attribute1')); - await attributeOne.inputText('123'); - inputMethodController.stopInputSession(); - await driver.delayMs(500); - // 点击修改子组件属性文本 - await driver.assertComponentExist(ON.id('childAttribute')); - let childAttribute = await driver.findComponent(ON.id('childAttribute')); - await childAttribute.click(); - await driver.delayMs(500); - await childAttribute.inputText('321'); - inputMethodController.stopInputSession(); - await driver.delayMs(500); - // 点击修改父组件第二个属性文本 - await driver.assertComponentExist(ON.id('arrayElement1')); - let arrayElementOne = await driver.findComponent(ON.id('arrayElement1')); - await arrayElementOne.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.id('attribute2')); - let attributeTwo = await driver.findComponent(ON.id('attribute2')); - await attributeTwo.inputText('456'); - inputMethodController.stopInputSession(); - await driver.delayMs(500); - // 点击修改父组件第三个属性文本 - await driver.assertComponentExist(ON.id('arrayElement2')); - let arrayElementTwo = await driver.findComponent(ON.id('arrayElement2')); - await arrayElementTwo.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.id('attribute3')); - let attributeThree = await driver.findComponent(ON.id('attribute3')); - await attributeThree.click(); - await driver.delayMs(500); - await attributeThree.inputText('789'); - inputMethodController.stopInputSession(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }) - - /** - * 测试爷孙组件之间状态同步 - */ - it(BUNDLE + 'DeepBindFunction_001', 0, async function () { - let testName = 'DeepBindFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入单双向同步页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.parent_descendent_sync')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.parent_descendent_sync')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击孙组件select组件并选择颜色 - await driver.assertComponentExist(ON.id('grandsonCompA')); - let grandsonA = await driver.findComponent(ON.id('grandsonCompA')); - await grandsonA.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - let selectedPink = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - await selectedPink.click(); - await driver.delayMs(500); - // 点击爷组件select组件并选择颜色 - await driver.assertComponentExist(ON.id('grandfatherCompA')); - let grandfatherCompA = await driver.findComponent(ON.id('grandfatherCompA')); - await grandfatherCompA.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - let selectedBlueCompA = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - await selectedBlueCompA.click(); - await driver.delayMs(500); - // 点击孙组件select组件并选择颜色 - await driver.assertComponentExist(ON.id('grandsonCompB')); - let grandsonCompB = await driver.findComponent(ON.id('grandsonCompB')); - await grandsonCompB.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - let selectedPinkCompB = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - await selectedPinkCompB.click(); - await driver.delayMs(500); - // 点击爷组件select组件并选择颜色 - await driver.assertComponentExist(ON.id('grandfatherCompB')); - let grandfatherCompB = await driver.findComponent(ON.id('grandfatherCompB')); - await grandfatherCompB.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - let selectedBlueCompB = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - await selectedBlueCompB.click(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500) - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - /** - * 测试兄弟组件之间状态同步 - */ - it(BUNDLE + 'BrotherBindFunction_001', 0, async function () { - let testName = 'BrotherBindFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 进入单双向同步页面 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.brother_sync')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.brother_sync')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击子组件B中的select组件并选择颜色 - await driver.assertComponentExist(ON.id('linkSelectCompB')); - let linkSelectCompB = await driver.findComponent(ON.id('linkSelectCompB')); - await linkSelectCompB.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - let linkselectedPinkB = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - await linkselectedPinkB.click(); - await driver.delayMs(500); - // 点击子组件B中的select组件并选择颜色 - await driver.assertComponentExist(ON.id('linkSelectCompA')); - let linkSelectCompA = await driver.findComponent(ON.id('linkSelectCompA')); - await linkSelectCompA.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - let linkselectedBlueA = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - await linkselectedBlueA.click(); - await driver.delayMs(500); - // 点击子组件B中的select组件并选择颜色 - await driver.assertComponentExist(ON.id('consumeSelectCompB')); - let consumeSelectCompB = await driver.findComponent(ON.id('consumeSelectCompB')); - await consumeSelectCompB.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - let consumeSelectedPinkB = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorpink')))); - await consumeSelectedPinkB.click(); - await driver.delayMs(500); - // 点击子组件B中的select组件并选择颜色 - await driver.assertComponentExist(ON.id('consumeSelectCompA')); - let consumeSelectCompA = await driver.findComponent(ON.id('consumeSelectCompA')); - await consumeSelectCompA.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - let consumeSelectedBlueA = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.select_colorblue')))); - await consumeSelectedBlueA.click(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - /** - * 应用内全局数据与UI之间的状态同步 - */ - it(BUNDLE + 'GlobalSynFunction_001', 0, async function () { - let testName = 'GlobalSynFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - // 切换到应用级状态变量 - await driver.assertComponentExist(ON.id('tabBar1')); - let applyLeval = await driver.findComponent(ON.id('tabBar1')); - await applyLeval.click(); - await driver.delayMs(500); - // 进入应用内全局数据与UI之间的状态同步 - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.application_storage_ui')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.application_storage_ui')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击Toggle组件，控制夜间模式 - await driver.assertComponentExist(ON.id('nightModeSwitch')); - let nightModeSwitch = await driver.findComponent(ON.id('nightModeSwitch')); - await nightModeSwitch.click(); - await driver.delayMs(500); - // 滑动slider调整 固定坐标只支持RK3568，其他设备需要调整 - await driver.drag(320, 473, 420, 473, 800) - await driver.delayMs(500); - // 进入Ability1 - await driver.assertComponentExist(ON.id('enterAbilityOne')); - let enterAbilityOne = await driver.findComponent(ON.id('enterAbilityOne')); - await enterAbilityOne.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - // 进入Ability2 - await driver.assertComponentExist(ON.id('enterAbilityTwo')); - let enterAbilityTwo = await driver.findComponent(ON.id('enterAbilityTwo')); - await enterAbilityTwo.click(); - await driver.delayMs(500); - // 返回 - await driver.pressBack(); - await driver.delayMs(500); - // 再次进入Ability1 - await enterAbilityOne.click(); - await driver.delayMs(500); - // 点击控制夜间模式按钮 - await driver.assertComponentExist(ON.id('nightModeSwitchTwo')); - let nightModeSwitchTwo = await driver.findComponent(ON.id('nightModeSwitchTwo')); - await nightModeSwitchTwo.click(); - await driver.delayMs(500); - // 滑动slider调整 固定坐标只支持RK3568，其他设备需要调整 - await driver.drag(320, 745, 420, 745, 800) - await driver.delayMs(500); - // 返回首页 - await driver.pressBack(); - await driver.delayMs(500); - // 进入Ability2 - await enterAbilityTwo.click(); - await driver.delayMs(500); - // 点击控制夜间模式按钮 - await driver.assertComponentExist(ON.id('nightModeSwitchThree')); - let nightModeSwitchThree = await driver.findComponent(ON.id('nightModeSwitchThree')); - await nightModeSwitchThree.click(); - await driver.delayMs(500); - // 返回首页 - await driver.pressBack(); - await driver.delayMs(500); - // 再次进入Ability1 - await enterAbilityOne.click(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - // 返回 - await driver.pressBack(); - await driver.delayMs(500); - await driver.pressBack(); - await driver.delayMs(500) - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - /** - * 应用内全局数据与UI之间的状态同步 - */ - it(BUNDLE + 'AbilitySynFunction_001', 0, async function () { - let testName = 'AbilitySynFunction' - Logger.info(TAG, BUNDLE + testName + ' begin') - - let abilityDelegatorRegistry = AbilityDelegatorRegistry.getAbilityDelegator(); - let context = await abilityDelegatorRegistry.getAppContext(); - let manager = context.resourceManager; - - let driver: Driver = Driver.create(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.text(await manager.getStringValue($r('app.string.ability_storage_ui')))); - let enterPageText = await driver.findComponent(ON.text(await manager.getStringValue($r('app.string.ability_storage_ui')))); - await enterPageText.click(); - await driver.delayMs(500); - // 点击Toggle组件，控制夜间模式 - await driver.assertComponentExist(ON.id('nightModeSwitch')); - let nightModeSwitch = await driver.findComponent(ON.id('nightModeSwitch')); - await nightModeSwitch.click(); - await driver.delayMs(500); - // 滑动slider调整 固定坐标只支持RK3568，其他设备需要调整 - await driver.drag(320, 470, 420, 470, 800) - await driver.delayMs(500); - // 进入Page1 - await driver.assertComponentExist(ON.id('enterPageOne')); - let enterPageOne = await driver.findComponent(ON.id('enterPageOne')); - await enterPageOne.click(); - await driver.delayMs(500); - // 返回 - await driver.assertComponentExist(ON.id('backBtn')); - let backBtn = await driver.findComponent(ON.id('backBtn')); - await backBtn.click(); - await driver.delayMs(500); - // 进入Page2 - await driver.assertComponentExist(ON.id('enterPageTwo')); - let enterPageTwo = await driver.findComponent(ON.id('enterPageTwo')); - await enterPageTwo.click(); - await driver.delayMs(500); - await driver.pressBack(); - await driver.delayMs(500); - // 进入跨Ability页面 - await driver.assertComponentExist(ON.id('enterOutOfAbility')); - let enterAbility = await driver.findComponent(ON.id('enterOutOfAbility')); - await enterAbility.click(); - await driver.delayMs(500); - // 返回 - await driver.pressBack(); - await driver.delayMs(500); - // 进入Page1 - await enterPageOne.click(); - await driver.delayMs(500); - // 点击控制夜间模式按钮 - await driver.assertComponentExist(ON.id('nightModeSwitchTwo')); - let nightModeSwitchTwo = await driver.findComponent(ON.id('nightModeSwitchTwo')); - await nightModeSwitchTwo.click(); - await driver.delayMs(500); - // 滑动slider调整 固定坐标只支持RK3568，其他设备需要调整 - await driver.drag(320, 745, 380, 745, 800) - await driver.delayMs(500); - // 返回首页 - await driver.pressBack(); - await driver.delayMs(500); - // 进入Ability - await enterAbility.click(); - await driver.delayMs(500); - await driver.pressBack(); - await driver.delayMs(500); - // 进入Page2 - await enterPageTwo.click(); - await driver.delayMs(500); - // 点击控制夜间模式按钮 - await driver.assertComponentExist(ON.id('nightModeSwitchThree')); - let nightModeSwitchThree = await driver.findComponent(ON.id('nightModeSwitchThree')); - await nightModeSwitchThree.click(); - await driver.delayMs(500); - // 返回首页 - await driver.pressBack(); - await driver.delayMs(500); - // 再次进入Page1 - await enterPageOne.click(); - await driver.delayMs(500); - await driver.pressBack(); - await driver.delayMs(500); - // 再次进入Ability - await enterAbility.click(); - await driver.delayMs(500); - await driver.assertComponentExist(ON.id('nightModeSwitchFour')); - let nightModeSwitchFour = await driver.findComponent(ON.id('nightModeSwitchFour')); - await nightModeSwitchFour.click(); - await driver.delayMs(500); - await driver.pressBack(); - await driver.delayMs(500); - // 再次进入Page1 - await enterPageOne.click(); - await driver.delayMs(500); - await driver.pressBack(); - await driver.delayMs(500); - // 进入Page2 - await enterPageTwo.click(); - await driver.delayMs(500); - await driver.pressBack(); - await driver.delayMs(500); - // 展示源码 - await driver.assertComponentExist(ON.id('viewSourceCode')); - let viewSourceCode = await driver.findComponent(ON.id('viewSourceCode')); - await viewSourceCode.click(); - await driver.delayMs(500); - // 关闭web源码 - await driver.assertComponentExist(ON.id('close')); - let closeWebBtn = await driver.findComponent(ON.id('close')); - await closeWebBtn.click(); - await driver.delayMs(500); - - Logger.info(TAG, BUNDLE + testName + ' end') - }); - - Logger.info("Sample_StateManagement test end") + }) + it('assertContain', 0, () => { + // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. + hilog.info(0x0000, 'testTag', '%{public}s', 'it begin'); + let a = 'abc'; + let b = 'b'; + // Defines a variety of assertion methods, which are used to declare expected boolean conditions. + expect(a).assertContain(b); + expect(a).assertEqual(a); }) }) } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/ets/test/List.test.ets b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/ets/test/List.test.ets index 76e5c3bb..1eac52fc 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/ets/test/List.test.ets +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/ets/test/List.test.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,9 +14,7 @@ */ import abilityTest from './Ability.test'; -//import appTest from './App.test'; export default function testsuite() { abilityTest(); -// appTest(); } \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/module.json5 b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/module.json5 index 22e2c611..6b9889e8 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/module.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/entry/src/ohosTest/module.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -17,36 +17,12 @@ "module": { "name": "entry_test", "type": "feature", - "description": "$string:module_test_desc", - "mainElement": "TestAbility", "deviceTypes": [ - "default", - "tablet" + "phone", + "tablet", + "2in1" ], "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:test_pages", - "abilities": [ - { - "name": "TestAbility", - "srcEntrance": "./ets/testability/TestAbility.ets", - "description": "$string:TestAbility_desc", - "icon": "$media:icon", - "label": "$string:TestAbility_label", - "visible": true, - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:start_window_background", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ] + "installationFree": false } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/hvigor/hvigor-config.json5 b/sample/EnhanceSampleArk1.2/StateManagement/hvigor/hvigor-config.json5 index 83512251..b8fea3f0 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/hvigor/hvigor-config.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/hvigor/hvigor-config.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,8 +14,25 @@ */ { - "hvigorVersion": "2.0.0", + "modelVersion": "6.0.0", "dependencies": { - "@ohos/hvigor-ohos-plugin": "2.0.0" + }, + "execution": { + // "analyze": "normal", /* Define the build analyze mode. Value: [ "normal" | "advanced" | "ultrafine" | false ]. Default: "normal" */ + // "daemon": true, /* Enable daemon compilation. Value: [ true | false ]. Default: true */ + // "incremental": true, /* Enable incremental compilation. Value: [ true | false ]. Default: true */ + // "parallel": true, /* Enable parallel compilation. Value: [ true | false ]. Default: true */ + // "typeCheck": false, /* Enable typeCheck. Value: [ true | false ]. Default: false */ + // "optimizationStrategy": "memory" /* Define the optimization strategy. Value: [ "memory" | "performance" ]. Default: "memory" */ + }, + "logging": { + // "level": "info" /* Define the log level. Value: [ "debug" | "info" | "warn" | "error" ]. Default: "info" */ + }, + "debugging": { + // "stacktrace": false /* Disable stacktrace compilation. Value: [ true | false ]. Default: false */ + }, + "nodeOptions": { + // "maxOldSpaceSize": 8192 /* Enable nodeOptions maxOldSpaceSize compilation. Unit M. Used for the daemon process. Default: 8192*/ + // "exposeGC": true /* Enable to trigger garbage collection explicitly. Default: true*/ } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/hvigorfile.ts b/sample/EnhanceSampleArk1.2/StateManagement/hvigorfile.ts index f6a51f2e..e3340f07 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/hvigorfile.ts +++ b/sample/EnhanceSampleArk1.2/StateManagement/hvigorfile.ts @@ -13,5 +13,9 @@ * limitations under the License. */ -// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -export { appTasks } from '@ohos/hvigor-ohos-plugin'; \ No newline at end of file +import { appTasks } from '@ohos/hvigor-ohos-plugin'; + +export default { + system: appTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ + plugins: [] /* Custom plugin to extend the functionality of Hvigor. */ +} \ No newline at end of file diff --git a/sample/EnhanceSampleArk1.2/StateManagement/oh-package.json5 b/sample/EnhanceSampleArk1.2/StateManagement/oh-package.json5 index ebf20792..692d45a3 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/oh-package.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/oh-package.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -14,13 +14,11 @@ */ { - "license": "ISC", - "devDependencies": { - "@ohos/hypium": "1.0.6" + "modelVersion": "6.0.0", + "description": "Please describe the basic information.", + "dependencies": { + }, - "name": "myapplication", - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": {} + "devDependencies": { + } } -- Gitee From 7780f84a3c594f65dbfbedf6e78d698e9c5b1018 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Mon, 8 Sep 2025 16:03:22 +0800 Subject: [PATCH 7/7] fix code check Signed-off-by: wangweiyuan --- .../ets/constants/ImageViewerConstants.d.ets | 7 ----- .../main/ets/entryability/EntryAbility.d.ets | 15 ----------- .../EntryBackupAbility.d.ets | 10 ------- .../ets/model/CommonLazyDataSourceModel.d.ets | 26 ------------------- .../src/main/ets/model/OffsetModel.d.ets | 18 ------------- .../src/main/ets/model/PositionModel.d.ets | 7 ----- .../src/main/ets/model/RotateModel.d.ets | 15 ----------- .../src/main/ets/model/ScaleModel.d.ets | 19 -------------- .../ets/constants/ImageViewerConstants.ts | 8 ------ .../src/main/ets/entryability/EntryAbility.ts | 16 ------------ .../entrybackupability/EntryBackupAbility.ts | 11 -------- .../ets/model/CommonLazyDataSourceModel.ts | 23 ---------------- .../static/src/main/ets/model/OffsetModel.ts | 18 ------------- .../src/main/ets/model/PositionModel.ts | 7 ----- .../static/src/main/ets/model/RotateModel.ts | 15 ----------- .../static/src/main/ets/model/ScaleModel.ts | 19 -------------- .../ets/constants/ImageViewerConstants.ts | 6 ----- .../src/main/ets/entryability/EntryAbility.ts | 17 ------------ .../entrybackupability/EntryBackupAbility.ts | 12 --------- .../ets/model/CommonLazyDataSourceModel.ts | 23 ---------------- .../src/main/ets/model/OffsetModel.ts | 9 ------- .../src/main/ets/model/PositionModel.ts | 6 ----- .../src/main/ets/model/RotateModel.ts | 8 ------ .../src/main/ets/model/ScaleModel.ts | 9 ------- .../ets/constants/ImageViewerConstants.d.ets | 7 ----- .../main/ets/entryability/EntryAbility.d.ets | 15 ----------- .../EntryBackupAbility.d.ets | 10 ------- .../ets/model/CommonLazyDataSourceModel.d.ets | 26 ------------------- .../src/main/ets/model/OffsetModel.d.ets | 17 ------------ .../src/main/ets/model/PositionModel.d.ets | 6 ----- .../src/main/ets/model/RotateModel.d.ets | 14 ---------- .../src/main/ets/model/ScaleModel.d.ets | 18 ------------- .../StateManagement/AppScope/app.json5 | 24 ++++++++++++++--- .../StateManagement/build-profile.json5 | 15 +---------- 34 files changed, 21 insertions(+), 455 deletions(-) delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets delete mode 100644 sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets deleted file mode 100644 index 5191b72b..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets +++ /dev/null @@ -1,7 +0,0 @@ -'use static' -export declare function main(): void; -export declare class ImageViewerConstants { - public static get ANIMATE_DURATION(): number; - public static get SWIPER_CACHE_COUNT(): number; - public constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets deleted file mode 100644 index 4c51b5d2..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entryability/EntryAbility.d.ets +++ /dev/null @@ -1,15 +0,0 @@ -'use static' -import { AbilityConstant, UIAbility, Want } from "@kit.AbilityKit"; -import { window } from "@kit.ArkUI"; -export declare function main(): void; -export declare const DOMAIN: number = 0.0; -declare class EntryAbility extends UIAbility { - public onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void; - public onDestroy(): void; - public onWindowStageCreate(windowStage: window.WindowStage): void; - public onWindowStageDestroy(): void; - public onForeground(): void; - public onBackground(): void; - public constructor(); -} -export default EntryAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets deleted file mode 100644 index ad174cd3..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets +++ /dev/null @@ -1,10 +0,0 @@ -'use static' -import { BackupExtensionAbility, BundleVersion } from "@kit.CoreFileKit"; -export declare function main(): void; -export declare const DOMAIN: number; -declare class EntryBackupAbility extends BackupExtensionAbility { - public onBackup(): Promise; - public onRestore(bundleVersion: BundleVersion): Promise; - public constructor(); -} -export default EntryBackupAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets deleted file mode 100644 index b3a9c0b3..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets +++ /dev/null @@ -1,26 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -import { IDataSource, DataChangeListener } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class BasicDataSource implements IDataSource { - public totalCount(): number; - public getData(index: number): T; - public registerDataChangeListener(listener: DataChangeListener): void; - public unregisterDataChangeListener(listener: DataChangeListener): void; - public notifyDataReload(): void; - public notifyDataAdd(index: number): void; - public notifyDataChange(index: number): void; - public notifyDataDelete(index: number): void; - public notifyDataMove(from: number, to: number): void; - public constructor(); -} -@Observed -export declare class CommonLazyDataSourceModel extends BasicDataSource { - public totalCount(): number; - public getData(index: number): T; - public addData(index: number, data: T): void; - public pushData(data: T): void; - public clearAndPushAll(data: Array): void; - public constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets deleted file mode 100644 index 5996b930..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/OffsetModel.d.ets +++ /dev/null @@ -1,18 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class OffsetModel { - public get currentX(): number; - public set currentX(value: number); - public get currentY(): number; - public set currentY(value: number); - public get lastX(): number; - public set lastX(value: number); - public get lastY(): number; - public set lastY(value: number); - public reset(): void; - public stash(): void; - public toString(): string; - constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets deleted file mode 100644 index dd1e6097..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/PositionModel.d.ets +++ /dev/null @@ -1,7 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class PositionModel { - constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets deleted file mode 100644 index 61290bdb..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/RotateModel.d.ets +++ /dev/null @@ -1,15 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class RotateModel { - public get currentRotate(): number; - public set currentRotate(value: number); - public get lastRotate(): number; - public set lastRotate(value: number); - public get startAngle(): number; - public set startAngle(value: number); - public reset(): void; - public stash(): void; - constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets deleted file mode 100644 index 4d705a34..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgen/static/src/main/ets/model/ScaleModel.d.ets +++ /dev/null @@ -1,19 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class ScaleModel { - public get scaleValue(): number; - public set scaleValue(value: number); - public get lastValue(): number; - public set lastValue(value: number); - public get maxScaleValue(): number; - public set maxScaleValue(value: number); - public get extraScaleValue(): number; - public set extraScaleValue(value: number); - public get defaultScaleValue(): number; - public reset(): void; - public stash(): void; - public toString(): string; - constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts deleted file mode 100644 index f33b6608..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/constants/ImageViewerConstants.ts +++ /dev/null @@ -1,8 +0,0 @@ -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;', 'main'); -export const ImageViewerConstants = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;'); -export const ANIMATE_DURATION = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'ANIMATE_DURATION'); -export const SWIPER_CACHE_COUNT = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'SWIPER_CACHE_COUNT'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts deleted file mode 100644 index 938de8f1..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entryability/EntryAbility.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { AbilityConstant, UIAbility, Want } from "@kit.AbilityKit"; -import { window } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/ETSGLOBAL;', 'main'); -export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/ETSGLOBAL;').DOMAIN; -const EntryAbility = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;'); -export default EntryAbility; -export const onCreate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onCreate'); -export const onDestroy = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onDestroy'); -export const onWindowStageCreate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageCreate'); -export const onWindowStageDestroy = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageDestroy'); -export const onForeground = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onForeground'); -export const onBackground = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onBackground'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entryability/EntryAbility/EntryAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts deleted file mode 100644 index bdbca82a..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { BackupExtensionAbility } from "@kit.CoreFileKit"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;', 'main'); -export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;').DOMAIN; -const EntryBackupAbility = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;'); -export default EntryBackupAbility; -export const onBackup = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onBackup'); -export const onRestore = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onRestore'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts deleted file mode 100644 index 292d78b4..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;', 'main'); -export const BasicDataSource = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;'); -export const totalCount = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'totalCount'); -export const getData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'getData'); -export const registerDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'registerDataChangeListener'); -export const unregisterDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'unregisterDataChangeListener'); -export const notifyDataReload = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataReload'); -export const notifyDataAdd = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataAdd'); -export const notifyDataChange = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataChange'); -export const notifyDataDelete = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataDelete'); -export const notifyDataMove = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataMove'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'constructor'); -export const CommonLazyDataSourceModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;'); -export const totalCount = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'totalCount'); -export const getData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'getData'); -export const addData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'addData'); -export const pushData = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'pushData'); -export const clearAndPushAll = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'clearAndPushAll'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts deleted file mode 100644 index 4d7d9f04..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/OffsetModel.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/OffsetModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/ETSGLOBAL;', 'main'); -export const OffsetModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;'); -export const currentX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentX'); -export const currentX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentX'); -export const currentY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentY'); -export const currentY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'currentY'); -export const lastX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastX'); -export const lastX = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastX'); -export const lastY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastY'); -export const lastY = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'lastY'); -export const reset = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'reset'); -export const stash = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'stash'); -export const toString = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'toString'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/OffsetModel/OffsetModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts deleted file mode 100644 index eccc2a43..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/PositionModel.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/PositionModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/PositionModel/ETSGLOBAL;', 'main'); -export const PositionModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/PositionModel/PositionModel;'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/PositionModel/PositionModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts deleted file mode 100644 index 7072ecbf..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/RotateModel.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/RotateModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/ETSGLOBAL;', 'main'); -export const RotateModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;'); -export const currentRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'currentRotate'); -export const currentRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'currentRotate'); -export const lastRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'lastRotate'); -export const lastRotate = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'lastRotate'); -export const startAngle = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'startAngle'); -export const startAngle = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'startAngle'); -export const reset = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'reset'); -export const stash = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'stash'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/RotateModel/RotateModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts deleted file mode 100644 index 19f195c5..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/declgen/static/src/main/ets/model/ScaleModel.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/ScaleModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ETSGLOBAL;', 'main'); -export const ScaleModel = (globalThis as any).Panda.getClass('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;'); -export const scaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'scaleValue'); -export const scaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'scaleValue'); -export const lastValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'lastValue'); -export const lastValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'lastValue'); -export const maxScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'maxScaleValue'); -export const maxScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'maxScaleValue'); -export const extraScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'extraScaleValue'); -export const extraScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'extraScaleValue'); -export const defaultScaleValue = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'defaultScaleValue'); -export const reset = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'reset'); -export const stash = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'stash'); -export const toString = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'toString'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/declgen/static/src/main/ets/model/ScaleModel/ScaleModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts deleted file mode 100644 index 5635c008..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/constants/ImageViewerConstants.ts +++ /dev/null @@ -1,6 +0,0 @@ -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/constants/ImageViewerConstants/ETSGLOBAL;', 'main'); -export const ImageViewerConstants = (globalThis as any).Panda.getClass('Lentry/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/constants/ImageViewerConstants/ImageViewerConstants;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts deleted file mode 100644 index 376ce3e5..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entryability/EntryAbility.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { AbilityConstant, ConfigurationConstant, UIAbility, Want } from "@kit.AbilityKit"; -import { hilog } from "@kit.PerformanceAnalysisKit"; -import { window } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entryability/EntryAbility/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/ETSGLOBAL;', 'main'); -export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entryability/EntryAbility/ETSGLOBAL;').DOMAIN; -const EntryAbility = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;'); -export default EntryAbility; -export const onCreate = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onCreate'); -export const onDestroy = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onDestroy'); -export const onWindowStageCreate = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageCreate'); -export const onWindowStageDestroy = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onWindowStageDestroy'); -export const onForeground = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onForeground'); -export const onBackground = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'onBackground'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entryability/EntryAbility/EntryAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts deleted file mode 100644 index dcad2072..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/entrybackupability/EntryBackupAbility.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { hilog } from "@kit.PerformanceAnalysisKit"; -import { BackupExtensionAbility } from "@kit.CoreFileKit"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;', 'main'); -export const DOMAIN = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/ETSGLOBAL;').DOMAIN; -const EntryBackupAbility = (globalThis as any).Panda.getClass('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;'); -export default EntryBackupAbility; -export const onBackup = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onBackup'); -export const onRestore = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'onRestore'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/entrybackupability/EntryBackupAbility/EntryBackupAbility;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts deleted file mode 100644 index 0a2cad72..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/CommonLazyDataSourceModel.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/ETSGLOBAL;', 'main'); -export const BasicDataSource = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;'); -export const totalCount = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'totalCount'); -export const getData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'getData'); -export const registerDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'registerDataChangeListener'); -export const unregisterDataChangeListener = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'unregisterDataChangeListener'); -export const notifyDataReload = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataReload'); -export const notifyDataAdd = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataAdd'); -export const notifyDataChange = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataChange'); -export const notifyDataDelete = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataDelete'); -export const notifyDataMove = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'notifyDataMove'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/BasicDataSource;', 'constructor'); -export const CommonLazyDataSourceModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;'); -export const totalCount = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'totalCount'); -export const getData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'getData'); -export const addData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'addData'); -export const pushData = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'pushData'); -export const clearAndPushAll = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'clearAndPushAll'); -export const constructor = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/CommonLazyDataSourceModel/CommonLazyDataSourceModel;', 'constructor'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts deleted file mode 100644 index bbafdd06..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/OffsetModel.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/OffsetModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/ETSGLOBAL;', 'main'); -export const OffsetModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/OffsetModel/OffsetModel;'); -export const reset = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/OffsetModel;', 'reset'); -export const stash = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/OffsetModel;', 'stash'); -export const toString = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/OffsetModel/OffsetModel;', 'toString'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts deleted file mode 100644 index 3c4ed676..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/PositionModel.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/PositionModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/PositionModel/ETSGLOBAL;', 'main'); -export const PositionModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/PositionModel/PositionModel;'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts deleted file mode 100644 index 93091aa2..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/RotateModel.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/RotateModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/RotateModel/ETSGLOBAL;', 'main'); -export const RotateModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/RotateModel/RotateModel;'); -export const reset = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/RotateModel/RotateModel;', 'reset'); -export const stash = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/RotateModel/RotateModel;', 'stash'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts deleted file mode 100644 index 84e0427c..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/declgenBridgeCode/src/main/ets/model/ScaleModel.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Observed } from "@kit.ArkUI"; -let ETSGLOBAL = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/ScaleModel/ETSGLOBAL;'); -ETSGLOBAL._$init$_(); -export {}; -export const main = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ETSGLOBAL;', 'main'); -export const ScaleModel = (globalThis as any).Panda.getClass('Lentry/src/main/ets/model/ScaleModel/ScaleModel;'); -export const reset = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ScaleModel;', 'reset'); -export const stash = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ScaleModel;', 'stash'); -export const toString = (globalThis as any).Panda.getFunction('Lentry/src/main/ets/model/ScaleModel/ScaleModel;', 'toString'); diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets deleted file mode 100644 index b89582b3..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/constants/ImageViewerConstants.d.ets +++ /dev/null @@ -1,7 +0,0 @@ -'use static' -export declare function main(): void; -export declare class ImageViewerConstants { - public static get ANIMATE_DURATION(): number; - public static get SWIPER_CACHE_COUNT(): number; - constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets deleted file mode 100644 index eacd3894..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entryability/EntryAbility.d.ets +++ /dev/null @@ -1,15 +0,0 @@ -'use static' -import { AbilityConstant, UIAbility, Want } from "@kit.AbilityKit"; -import { window } from "@kit.ArkUI"; -export declare function main(): void; -export declare const DOMAIN: number; -declare class EntryAbility extends UIAbility { - public onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void; - public onDestroy(): void; - public onWindowStageCreate(windowStage: window.WindowStage): void; - public onWindowStageDestroy(): void; - public onForeground(): void; - public onBackground(): void; - constructor(); -} -export default EntryAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets deleted file mode 100644 index 2dda69c4..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/entrybackupability/EntryBackupAbility.d.ets +++ /dev/null @@ -1,10 +0,0 @@ -'use static' -import { BackupExtensionAbility, BundleVersion } from "@kit.CoreFileKit"; -export declare function main(): void; -export declare const DOMAIN: number; -declare class EntryBackupAbility extends BackupExtensionAbility { - public onBackup(): Promise; - public onRestore(bundleVersion: BundleVersion): Promise; - constructor(); -} -export default EntryBackupAbility; diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets deleted file mode 100644 index 53c0638c..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/CommonLazyDataSourceModel.d.ets +++ /dev/null @@ -1,26 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -import { IDataSource, DataChangeListener } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class BasicDataSource implements IDataSource { - public totalCount(): number; - public getData(index: number): T; - public registerDataChangeListener(listener: DataChangeListener): void; - public unregisterDataChangeListener(listener: DataChangeListener): void; - public notifyDataReload(): void; - public notifyDataAdd(index: number): void; - public notifyDataChange(index: number): void; - public notifyDataDelete(index: number): void; - public notifyDataMove(from: number, to: number): void; - constructor(); -} -@Observed -export declare class CommonLazyDataSourceModel extends BasicDataSource { - public totalCount(): number; - public getData(index: number): T; - public addData(index: number, data: T): void; - public pushData(data: T): void; - public clearAndPushAll(data: Array): void; - constructor(); -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets deleted file mode 100644 index 6687768b..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/OffsetModel.d.ets +++ /dev/null @@ -1,17 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class OffsetModel { - public get currentX(): number; - public set currentX(value: number); - public get currentY(): number; - public set currentY(value: number); - public get lastX(): number; - public set lastX(value: number); - public get lastY(): number; - public set lastY(value: number); - public reset(): void; - public stash(): void; - public toString(): string; -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets deleted file mode 100644 index ca1bb586..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/PositionModel.d.ets +++ /dev/null @@ -1,6 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class PositionModel { -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets deleted file mode 100644 index cdc23d03..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/RotateModel.d.ets +++ /dev/null @@ -1,14 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class RotateModel { - public get currentRotate(): number; - public set currentRotate(value: number); - public get lastRotate(): number; - public set lastRotate(value: number); - public get startAngle(): number; - public set startAngle(value: number); - public reset(): void; - public stash(): void; -} diff --git a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets b/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets deleted file mode 100644 index 176f31fe..00000000 --- a/sample/EnhanceSampleArk1.2/ImageViewer/entry/declgen/static/src/main/ets/model/ScaleModel.d.ets +++ /dev/null @@ -1,18 +0,0 @@ -'use static' -import { Observed } from "@kit.ArkUI"; -export declare function main(): void; -@Observed -export declare class ScaleModel { - public get scaleValue(): number; - public set scaleValue(value: number); - public get lastValue(): number; - public set lastValue(value: number); - public get maxScaleValue(): number; - public set maxScaleValue(value: number); - public get extraScaleValue(): number; - public set extraScaleValue(value: number); - public get defaultScaleValue(): number; - public reset(): void; - public stash(): void; - public toString(): string; -} diff --git a/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 b/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 index a8ee954e..54a17abb 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/AppScope/app.json5 @@ -1,10 +1,26 @@ +/* + * Copyright (c) 2025 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. + */ + { "app": { - "bundleName": "com.example.myapplication", - "vendor": "example", + "bundleName": "com.samples.statemanagement", + "vendor": "samples", "versionCode": 1000000, "versionName": "1.0.0", - "icon": "$media:layered_image", - "label": "$string:app_name" + "icon": "$media:app_icon", + "label": "$string:app_name", + "distributedNotificationEnabled": true } } diff --git a/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 b/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 index 118cc94b..5a762afa 100644 --- a/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 +++ b/sample/EnhanceSampleArk1.2/StateManagement/build-profile.json5 @@ -15,20 +15,7 @@ { "app": { - "signingConfigs": [ - { - "name": "default", - "material": { - "certpath": "C:/Users/Administrator/.ohos/config/openharmony/default_test_new_7Dxo2Gn7T8nQLjmWfRfSzpsSGC0pisGUh2tWi1zLexE=.cer", - "keyAlias": "debugKey", - "keyPassword": "0000001B221C6418DEFD83C2487414C4E8BD598C319F4CAC030B4D3C2C7D3481A604828555E107B1054C92", - "profile": "C:/Users/Administrator/.ohos/config/openharmony/default_test_new_7Dxo2Gn7T8nQLjmWfRfSzpsSGC0pisGUh2tWi1zLexE=.p7b", - "signAlg": "SHA256withECDSA", - "storeFile": "C:/Users/Administrator/.ohos/config/openharmony/default_test_new_7Dxo2Gn7T8nQLjmWfRfSzpsSGC0pisGUh2tWi1zLexE=.p12", - "storePassword": "0000001B13824B61C1F99760150E80D7FEE89B7AF692A6396D77B672BF622B16132D1AB781CC37A968B638" - } - } - ], + "signingConfigs": [], "products": [ { "name": "default", -- Gitee