diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/build-profile.json5 b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/build-profile.json5 index df3f267e66efc3aa49b952be0ea3315af0d256e6..0d4a03d0a707b773d4ef140121aa0f45bdcd67fe 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/build-profile.json5 +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/build-profile.json5 @@ -26,8 +26,7 @@ "targetSdkVersion": 18, "buildOption": { "strictMode": { - "caseSensitiveCheck": true, - "useNormalizedOHMUrl": true + "caseSensitiveCheck": true } } } diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Embedded.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Embedded.ets index 3daf610581df4e097edabdc5f1286cf9075f05b4..1fbea9aec2db890e697a8364d820fce152603a0e 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Embedded.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Embedded.ets @@ -13,14 +13,13 @@ * limitations under the License. */ -let storage = LocalStorage.getShared(); +import { Want } from '@kit.AbilityKit' -@Entry(storage) @Component export struct Embedded { @State message: string = 'Message: ' private want: Want = { - bundleName: 'com.example.embeddeddemo', + bundleName: 'com.samples.uiextensionandaccessibility', abilityName: 'ExampleEmbeddedAbility', } diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Extension.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Extension.ets index a2764388230f81883faa68a2846598d1e8a37cd6..c9814c7b6e74a155ee0f07c7c6e04682ca6c55f3 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Extension.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/EmbeddedComponent/Extension.ets @@ -33,7 +33,7 @@ struct Extension { this.session?.terminateSelfWithResult({ resultCode: 1, want: { - bundleName: 'com.example.embeddeddemo', + bundleName: 'com.samples.uiextensionandaccessibility', abilityName: 'ExampleEmbeddedAbility', } }); diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/FullScreenLaunch.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/FullScreenLaunch.ets index 1cb3be7884766fe945f9ba83b5bdbd52433717d2..b4412c5c440bcb03b1177e7978fe9a09b1ac30dc 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/FullScreenLaunch.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/FullScreenLaunch.ets @@ -25,7 +25,7 @@ function sampleColumnChild() { @Component export struct FullScreenLaunch { - @State appId: string = '6917571765457174309'; // 原子化服务appId + @State appId: string = '5765880207855083101'; // 原子化服务appId build() { NavDestination() { diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/Index.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/Index.ets index efaf2310ff547faa7218752546c8a15ba264b727..5d3e4520ac0657c95438f443e5e593c6c8d29b4d 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/Index.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/FullScreenLaunchComponent/Index.ets @@ -59,7 +59,7 @@ struct FullScreenExample { .padding({ left: 16, right: 16 }) } .backgroundColor('#f1f3f5') - .title(resource.resourceToString($r('app.string.pageIndex_FullScreenComponent')), { + .title(resource.resourceToString($r('app.string.pageIndex_FullScreenLaunchComponent')), { backgroundBlurStyle: BlurStyle.COMPONENT_THICK, barStyle: BarStyle.STACK }) diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/Index.ets index 2e9f8fb0445e052029f1ea734a3f0a5c1cc123bf..0b565e9579b444e0e227a620296da67e27ffff08 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/Index.ets @@ -33,7 +33,7 @@ const routes: Route[] = [ name: EMBEDDED_ROUTE_PREFIX }, { - title: resource.resourceToString($r('app.string.pageIndex_FullScreenComponent')), + title: resource.resourceToString($r('app.string.pageIndex_FullScreenLaunchComponent')), name: SCREEN_ROUTE_PREFIX }, { diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/IsolatedComponent/Isolated.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/IsolatedComponent/Isolated.ets index 308a73adf5915ae339c92b8b8331bdd05e1c99ab..be205c089d6f7a149d6a8f4d7d117d5cfb9a2f82 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/IsolatedComponent/Isolated.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/IsolatedComponent/Isolated.ets @@ -42,7 +42,7 @@ export struct Isolated { // abc文件名 private fileName: string = 'modules'; // abc文件所属应用的bundleName - private bundleName: string = 'com.example.isolateddemo'; + private bundleName: string = 'com.samples.uiextensionandaccessibility'; // 受限worker private worker ?: worker.RestrictedWorker = new worker.RestrictedWorker('entry/ets/workers/OhCardWorker.ets'); diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UIExtensionComponent/UIExtension.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UIExtensionComponent/UIExtension.ets index def3b867916f99e9c7aa8a921b0108d6aaa742ce..47b27931ad69a11ed6366072ea84a262194237b9 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UIExtensionComponent/UIExtension.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UIExtensionComponent/UIExtension.ets @@ -57,7 +57,7 @@ export struct UIExtension { Text(this.message3).fontSize(25) UIExtensionComponent({ - bundleName: 'com.example.newdemo', + bundleName: 'com.samples.uiextensionandaccessibility', abilityName: 'UIExtensionProvider', parameters: { 'ability.want.params.uiExtensionType': 'sys/commonUI' diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UniversalAttributesAccessibility/AccessibilityGroup.ets b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UniversalAttributesAccessibility/AccessibilityGroup.ets index 4e79528903e907813ff22b3b5c28b461755a704e..86d6026b4084882c1ed8f05ad04092de7aec0eb9 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UniversalAttributesAccessibility/AccessibilityGroup.ets +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/ets/pages/UniversalAttributesAccessibility/AccessibilityGroup.ets @@ -26,11 +26,10 @@ export struct AccessibilityGroup { Button().accessibilityLevel('yes').accessibilityText($r('app.string.UniversalAttributesAccessibility_text2')) Button($r('app.string.UniversalAttributesAccessibility_text3')).accessibilityLevel('yes') Button() - Button('btnl23').accessibilityText($r('app.string.UniversalAttributesAccessibility_text4')).accessibilityLevel('yes') + Button('btn123').accessibilityText($r('app.string.UniversalAttributesAccessibility_text4')).accessibilityLevel('yes') Button('btn123').accessibilityLevel('yes') } .accessibilityGroup(true, { accessibilityPreferred: true }) - //.accessibilityGroup(true) .borderWidth(5) .width('100%') .height('100%') diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/element/string.json b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/element/string.json index 94eee2575103038b01564fd27fcc025c1fe73aec..83d34a5137a2312b8855bbe7b0fe9385b7a29188 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/element/string.json +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/element/string.json @@ -25,8 +25,8 @@ "value": "EmbeddedComponent 组件" }, { - "name": "pageIndex_FullScreenComponent", - "value": "FullScreenComponent 组件" + "name": "pageIndex_FullScreenLaunchComponent", + "value": "FullScreenLaunchComponent 组件" }, { "name": "pageIndex_IsolatedComponent", diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/profile/main_pages.json b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/profile/main_pages.json index 327b7d2d0a9b70fa962740f6e56694a308fa1781..de08984e8245176d75f951378c91f02fedf74b8d 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/profile/main_pages.json +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/entry/src/main/resources/base/profile/main_pages.json @@ -2,6 +2,7 @@ "src": [ "pages/Index", "pages/IsolatedComponent/Extension", - "pages/EmbeddedComponent/Extension" + "pages/EmbeddedComponent/Extension", + "pages/UIExtensionComponent/Extension" ] } diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/ohosTest.md b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/ohosTest.md index c47aa8e35c3e3a944272110704fdf68cc09ec9d1..6fd4d7997abf069bf500c2f85018232c82795a6b 100644 --- a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/ohosTest.md +++ b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/ohosTest.md @@ -8,11 +8,11 @@ |查看预览界面ListenItem| 进入预览界面 | |ListenItem|是|Pass| |查看UIExtensionComponent界面ListenItem| 进入UIExtensionComponent界面 | |ListenItem|是|Pass| |查看EmbeddedComponent界面ListenItem| 进入EmbeddedComponent界面 | |ListenItem|是|Pass| -|查看IsolatedComponent界面ListenItem| 进入FullScreenComponent界面 | |ListenItem|是|Pass| -|查看FullScreenComponent界面ListenItem| 进入FullScreenComponent界面 | |ListenItem|是|Pass| -|查看ArkUI 无障碍能力界面ListenItem| 进入FullScreenComponent界面 | |ListenItem|是|Pass| +|查看IsolatedComponent界面ListenItem| 进入FullScreenLaunchComponent界面 | |ListenItem|是|Pass| +|查看FullScreenLaunchComponent界面ListenItem| 进入FullScreenLaunchComponent界面 | |ListenItem|是|Pass| +|查看ArkUI 无障碍能力界面ListenItem| 进入FullScreenLaunchComponent界面 | |ListenItem|是|Pass| |UIExtensionComponent 组件页面| 点击 使用UIExtensionComponent 组件 | |进入 使用UIExtensionComponent 组件页面|是|Pass| |EmbeddedComponent 组件页面| 点击 使用EmbeddedComponent 组件 | |进入 使用EmbeddedComponent 组件页面|是|Pass| |IsolatedComponent 组件页面| 点击 使用IsolatedComponent 组件 | |进入 使用IsolatedComponent 组件页面|是|Pass| -|FullScreenComponent 组件页面| 点 击使用FullScreenComponent 组件 | |进入 使用FullScreenComponent 组件页面|是|Pass| +|FullScreenLaunchComponent 组件页面| 点 击使用FullScreenLaunchComponent 组件 | |进入 使用FullScreenLaunchComponent 组件页面|是|Pass| |ArkUI 无障碍能力页面| 点击 使用EmbeddedComponent 组件 | |进入 ArkUI 无障碍能力页面|是|Pass| \ No newline at end of file diff --git a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/screenshots/device/image1.jpg b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/screenshots/device/image1.jpg index 34d2fd7bea78cd0811f2e91307423c1e4b33a54f..e178f64fb7b3bd2cfcf29348e00a6f044b229628 100644 Binary files a/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/screenshots/device/image1.jpg and b/code/DocsSample/ArkUISample/UIExtensionAndAccessibility/screenshots/device/image1.jpg differ