From ff22dbedd6899996a93772434d0a8e054ff4f369 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Tue, 29 Apr 2025 17:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E4=BB=A3=E7=A0=81=E6=A0=87?= =?UTF-8?q?=E6=B3=A816?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangweiyuan --- .../AbilityLifecycleCallback.ets | 3 ++- .../entry/src/main/ets/pages/Index.ets | 5 +++-- .../main/ets/pages/AddIntTrackPreventByPassList.ets | 5 +++-- .../main/ets/pages/ClearIntTrackPreventByPassList.ets | 3 ++- .../ets/pages/CollectingAdsBlockingInformation.ets | 4 ++++ .../main/ets/pages/DisAdsBlockSpecDomPages_one.ets | 6 ++++-- .../main/ets/pages/DisAdsBlockSpecDomPages_two.ets | 6 ++++-- .../src/main/ets/pages/EnableIntTrackPrevent.ets | 4 +++- .../entry/src/main/ets/pages/EnablingAdsBlocking.ets | 5 ++++- .../src/main/ets/pages/IsIntTrackPreventEnabled.ets | 2 ++ .../src/main/ets/pages/OnIntTrackPreventResult.ets | 4 +++- .../ets/pages/RemoveIntTrackPreventByPassList.ets | 3 ++- .../src/main/ets/pages/OnInterceptRequest_one.ets | 3 ++- .../src/main/ets/pages/OnInterceptRequest_two.ets | 2 ++ .../ets/pages/LoadLocalPageFileInSandboxPath_one.ets | 2 ++ .../ets/pages/LoadLocalPageFileInSandboxPath_two.ets | 3 ++- .../src/main/ets/pages/LoadingHTMLRichTextData.ets | 3 ++- .../entry/src/main/ets/pages/LoadingLocalPages.ets | 5 ++++- .../entry/src/main/ets/pages/LoadingWebPages.ets | 4 +++- .../entry/src/main/ets/pages/CalcAdjustSafeArea.ets | 3 ++- .../entry/src/main/ets/entryability/EntryAbility.ets | 11 +++++++---- .../entry/src/main/ets/pages/Index.ets | 3 +++ .../entry/src/main/ets/pages/common.ets | 4 +++- .../src/main/ets/entry1ability/Entry1Ability.ets | 2 ++ .../entry1/src/main/ets/pages/Index.ets | 2 ++ .../entry1/src/main/ets/pages/common.ets | 3 ++- .../entry1/src/main/ets/pages/index2.ets | 3 ++- .../entry2/src/main/ets/pages/common.ets | 4 ++++ .../UseOfflineWebComp/entry2/src/main/module.json5 | 2 +- .../entry/src/main/ets/pages/Index.ets | 3 ++- .../src/main/ets/entry2ability/Entry2Ability.ets | 10 +++++++--- .../entry2/src/main/ets/pages/Index.ets | 3 ++- 32 files changed, 92 insertions(+), 33 deletions(-) diff --git a/code/BasicFeature/Ability/AbilityRuntime/entry/src/main/ets/abilitylifecyclecallback/AbilityLifecycleCallback.ets b/code/BasicFeature/Ability/AbilityRuntime/entry/src/main/ets/abilitylifecyclecallback/AbilityLifecycleCallback.ets index 430cc48537..bac9c2a34b 100644 --- a/code/BasicFeature/Ability/AbilityRuntime/entry/src/main/ets/abilitylifecyclecallback/AbilityLifecycleCallback.ets +++ b/code/BasicFeature/Ability/AbilityRuntime/entry/src/main/ets/abilitylifecyclecallback/AbilityLifecycleCallback.ets @@ -21,6 +21,7 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; const TAG: string = '[AbilityLifecycleCallback]'; const DOMAIN: number = 0xFF00; +// [Start get_sandbox_path_from_context_singleton] export class GlobalContext { private constructor() { } @@ -43,7 +44,7 @@ export class GlobalContext { this._objects.set(key, objectClass); } } - +// [End get_sandbox_path_from_context_singleton] // 声明ability生命周期回调，需配置所有回调后才可以在applicationContext注册 let abilityLifecycleCallback: AbilityLifecycleCallback = { onAbilityCreate(ability) { diff --git a/code/DocsSample/ArkWeb/LifecycleWebComp/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkWeb/LifecycleWebComp/entry/src/main/ets/pages/Index.ets index 170cc62808..5e904676c4 100755 --- a/code/DocsSample/ArkWeb/LifecycleWebComp/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkWeb/LifecycleWebComp/entry/src/main/ets/pages/Index.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start the_status_of_web_component_web_page_loading] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; import { promptAction } from '@kit.ArkUI'; @@ -127,4 +127,5 @@ struct WebComponent { }) } } -} \ No newline at end of file +} +// [End the_status_of_web_component_web_page_loading] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/AddIntTrackPreventByPassList.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/AddIntTrackPreventByPassList.ets index 882c47fbaa..aa1655f7bb 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/AddIntTrackPreventByPassList.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/AddIntTrackPreventByPassList.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start set_domains_to_bypass_intelligent_tracking] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -36,4 +36,5 @@ struct WebComponent { Web({ src: $r('app.string.web_path'), controller: this.controller }); } } -} \ No newline at end of file +} +// [End set_domains_to_bypass_intelligent_tracking] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/ClearIntTrackPreventByPassList.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/ClearIntTrackPreventByPassList.ets index cee0fd0d0c..fc8f4c0846 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/ClearIntTrackPreventByPassList.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/ClearIntTrackPreventByPassList.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start clear_all_intelligent_tracking_prevention_bypasses] import { webview } from '@kit.ArkWeb'; @Entry @@ -30,3 +30,4 @@ struct WebComponent { } } } +// [End clear_all_intelligent_tracking_prevention_bypasses] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/CollectingAdsBlockingInformation.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/CollectingAdsBlockingInformation.ets index 283ced2f34..92dcff572c 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/CollectingAdsBlockingInformation.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/CollectingAdsBlockingInformation.ets @@ -13,13 +13,16 @@ * limitations under the License. */ +// [Start collect_information_about_ad_filtering] import { webview } from '@kit.ArkWeb'; @Entry @Component struct WebComponent { @State totalAdsBlockCounts: number = 0; + // [StartExclude collect_information_about_ad_filtering] @State myString: string = 'onAdsBlocked'; + // [EndExclude collect_information_about_ad_filtering] controller: webview.WebviewController = new webview.WebviewController(); build() { @@ -36,3 +39,4 @@ struct WebComponent { } } } +// [End collect_information_about_ad_filtering] diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_one.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_one.ets index d903a58c48..e70fa2041e 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_one.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_one.ets @@ -12,13 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start turn_off_ad_filtering_for_specific_domain_pages] import { webview } from '@kit.ArkWeb'; +// [StartExclude turn_off_ad_filtering_for_specific_domain_pages] function resourceToString(resource: Resource) { return getContext().resourceManager.getStringSync(resource); } - +// [EndExclude turn_off_ad_filtering_for_specific_domain_pages] @Entry @Component struct WebComponent { @@ -62,3 +63,4 @@ struct WebComponent { } } } +// [End turn_off_ad_filtering_for_specific_domain_pages] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_two.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_two.ets index fb11841153..fe925a82e9 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_two.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/DisAdsBlockSpecDomPages_two.ets @@ -12,13 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start set_up_page_level_ad_filtering_switch] import { webview } from '@kit.ArkWeb'; +// [StartExclude set_up_page_level_ad_filtering_switch] function resourceToString(resource: Resource) { return getContext().resourceManager.getStringSync(resource); } - +// [EndExclude set_up_page_level_ad_filtering_switch] @Entry @Component struct WebComponent { @@ -63,3 +64,4 @@ struct WebComponent { } } } +// [End set_up_page_level_ad_filtering_switch] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnableIntTrackPrevent.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnableIntTrackPrevent.ets index 2abfd30abb..e317299ae7 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnableIntTrackPrevent.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnableIntTrackPrevent.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +// [Start enable_or_disable_web_component_anti_tracking] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -36,4 +37,5 @@ struct WebComponent { Web({ src: $r('app.string.web_path'), controller: this.controller }); } } -} \ No newline at end of file +} +// [End enable_or_disable_web_component_anti_tracking] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnablingAdsBlocking.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnablingAdsBlocking.ets index 6f3479240c..8eb4a81e2d 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnablingAdsBlocking.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/EnablingAdsBlocking.ets @@ -13,13 +13,15 @@ * limitations under the License. */ +// [Start app_select_list_rule_file_for_ad_filter] import { webview } from '@kit.ArkWeb'; import { picker, fileUri } from '@kit.CoreFileKit'; +// [StartExclude app_select_list_rule_file_for_ad_filter] function resourceToString(resource: Resource) { return getContext().resourceManager.getStringSync(resource); } - +// [EndExclude app_select_list_rule_file_for_ad_filter] @Entry @Component struct WebComponent { @@ -59,3 +61,4 @@ struct WebComponent { } } } +// [End app_select_list_rule_file_for_ad_filter] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/IsIntTrackPreventEnabled.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/IsIntTrackPreventEnabled.ets index cf899e8d3f..f35678435d 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/IsIntTrackPreventEnabled.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/IsIntTrackPreventEnabled.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +// [Start check_if_web_component_anti_tracking_on] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -37,3 +38,4 @@ struct WebComponent { } } } +// [End check_if_web_component_anti_tracking_on] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/OnIntTrackPreventResult.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/OnIntTrackPreventResult.ets index 6312ba1634..86bb3887db 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/OnIntTrackPreventResult.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/OnIntTrackPreventResult.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +// [Start retrieve_blocked_and_visited_domain_names] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -40,4 +41,5 @@ struct WebComponent { }) } } -} \ No newline at end of file +} +// [End retrieve_blocked_and_visited_domain_names] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/RemoveIntTrackPreventByPassList.ets b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/RemoveIntTrackPreventByPassList.ets index 86a03f28a7..504ff4f33c 100755 --- a/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/RemoveIntTrackPreventByPassList.ets +++ b/code/DocsSample/ArkWeb/ManageWebCompSecPriv/entry/src/main/ets/pages/RemoveIntTrackPreventByPassList.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start partial_domain_name_list] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -37,3 +37,4 @@ struct WebComponent { } } } +// [End partial_domain_name_list] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_one.ets b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_one.ets index 88739dc3db..99b4325373 100755 --- a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_one.ets +++ b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_one.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start build_response_resources_to_implement_custom_page_response_scenarios] import { webview } from '@kit.ArkWeb'; function resourceToString(resource: Resource) { @@ -57,3 +57,4 @@ struct WebComponent { } } } +// [End build_response_resources_to_implement_custom_page_response_scenarios] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_two.ets b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_two.ets index 4b3d0a5299..bd06563ae7 100755 --- a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_two.ets +++ b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/CustomizePageResp/entry/src/main/ets/pages/OnInterceptRequest_two.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +// [Start build_response_resource_enable_gen] import { webview } from '@kit.ArkWeb'; function resourceToString(resource: Resource) { @@ -74,3 +75,4 @@ struct WebComponent { } } } +// [End build_response_resource_enable_gen] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_one.ets b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_one.ets index a95b79c366..2545aea0f8 100755 --- a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_one.ets +++ b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_one.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +// [Start load_local_page_file_in_sandbox_path] import { webview } from '@kit.ArkWeb'; import { GlobalContext } from './GlobalContext'; @@ -31,3 +32,4 @@ struct WebComponent { } } } +// [End load_local_page_file_in_sandbox_path] diff --git a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_two.ets b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_two.ets index c85ba6a2e2..7e78e47a05 100755 --- a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_two.ets +++ b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadLocalPageFileInSandboxPath_two.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start web_components_load_html_strings_by_data_url] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -29,3 +29,4 @@ struct WebComponent { } } } +// [End web_components_load_html_strings_by_data_url] diff --git a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingHTMLRichTextData.ets b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingHTMLRichTextData.ets index 826021cc5c..ed142efe47 100755 --- a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingHTMLRichTextData.ets +++ b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingHTMLRichTextData.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start devs_load_page_fragments_for_quick_loading] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -41,3 +41,4 @@ struct WebComponent { } } } +// [End devs_load_page_fragments_for_quick_loading] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingLocalPages.ets b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingLocalPages.ets index aa7357bd6e..a09d901e5a 100755 --- a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingLocalPages.ets +++ b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingLocalPages.ets @@ -13,6 +13,8 @@ * limitations under the License. */ + +// [Start after_load_complete_call_to_change_page] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -36,4 +38,5 @@ struct WebComponent { Web({ src: $rawfile('local.html'), controller: this.controller }); } } -} \ No newline at end of file +} +// [End after_load_complete_call_to_change_page] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingWebPages.ets b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingWebPages.ets index 28abb21e03..bd01e1ff1c 100755 --- a/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingWebPages.ets +++ b/code/DocsSample/ArkWeb/ManageWebPageLoadBrowse/LoadPages/entry/src/main/ets/pages/LoadingWebPages.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +// [Start use_load_interface_to_show_web_changes] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; @@ -36,4 +37,5 @@ struct WebComponent { Web({ src: 'www.example.com', controller: this.controller }); } } -} \ No newline at end of file +} +// [End use_load_interface_to_show_web_changes] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/ProcessWebPageCont/entry/src/main/ets/pages/CalcAdjustSafeArea.ets b/code/DocsSample/ArkWeb/ProcessWebPageCont/entry/src/main/ets/pages/CalcAdjustSafeArea.ets index f2e0e972c8..ddce0c96a4 100755 --- a/code/DocsSample/ArkWeb/ProcessWebPageCont/entry/src/main/ets/pages/CalcAdjustSafeArea.ets +++ b/code/DocsSample/ArkWeb/ProcessWebPageCont/entry/src/main/ets/pages/CalcAdjustSafeArea.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start use_expand_safe_area_to_enable_immersive_effect] import { webview } from '@kit.ArkWeb'; @Entry @@ -28,3 +28,4 @@ struct WebComponent { } } } +// [End use_expand_safe_area_to_enable_immersive_effect] diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/entryability/EntryAbility.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/entryability/EntryAbility.ets index c3a1c8a89f..e068627fdb 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/entryability/EntryAbility.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,10 +13,12 @@ * limitations under the License. */ + +import { createNWeb } from "../pages/common"; import { AbilityConstant, UIAbility, Want } from '@kit.AbilityKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; import { window } from '@kit.ArkUI'; -import { createNWeb } from "../pages/common"; + export default class EntryAbility extends UIAbility { onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { @@ -26,16 +28,17 @@ export default class EntryAbility extends UIAbility { onDestroy(): void { hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy'); } - + // [Start entry_ability_window_stage_created_after_specified_page_loaded] onWindowStageCreate(windowStage: window.WindowStage): void { windowStage.loadContent('pages/Index', (err, data) => { - // 创建Web动态组件（需传入UIContext），loadContent之后的任意时机均可创建 - createNWeb('www.example.com', windowStage.getMainWindowSync().getUIContext()); + // 创建空的Web动态组件（需传入UIContext），loadContent之后的任意时机均可创建 + createNWeb("about：blank", windowStage.getMainWindowSync().getUIContext()); if (err.code) { return; } }); } + // [End entry_ability_window_stage_created_after_specified_page_loaded] onWindowStageDestroy(): void { // Main window is destroyed, release UI related resources diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/Index.ets index c20b0ca45f..05172de125 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/Index.ets @@ -15,6 +15,7 @@ // 使用NodeController的Page页 // Index.ets +// [Start nodeContainer_bind_controller_to_show_dynamic_pages] import { getNWeb } from './common' @Entry @Component @@ -33,3 +34,5 @@ struct Index { .height('100%') } } +// [End nodeContainer_bind_controller_to_show_dynamic_pages] + diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/common.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/common.ets index e22c3cd336..6c4e209e7d 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/common.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry/src/main/ets/pages/common.ets @@ -13,8 +13,9 @@ * limitations under the License. */ + +// [Start manage_dynamic_webview_components_in_harmonyos_app] // 创建NodeController -// common.ets import { UIContext, NodeController, BuilderNode, Size, FrameNode } from '@kit.ArkUI'; import { webview } from '@kit.ArkWeb'; @@ -96,3 +97,4 @@ export const createNWeb = (url: ResourceStr, uiContext: UIContext) => { export const getNWeb = (url: ResourceStr) : MyNodeController | undefined => { return nodeMap.get(url); } +// [End manage_dynamic_webview_components_in_harmonyos_app] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/entry1ability/Entry1Ability.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/entry1ability/Entry1Ability.ets index 552e7abe0b..844f1ef14f 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/entry1ability/Entry1Ability.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/entry1ability/Entry1Ability.ets @@ -27,6 +27,7 @@ export default class Entry1Ability extends UIAbility { hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy'); } + // [Start entry_ability_window_stage_created_after_page_loaded] onWindowStageCreate(windowStage: window.WindowStage): void { windowStage.loadContent('pages/Index', (err, data) => { // 创建空的Web动态组件（需传入UIContext），loadContent之后的任意时机均可创建 @@ -36,6 +37,7 @@ export default class Entry1Ability extends UIAbility { } }); } + // [End entry_ability_window_stage_created_after_page_loaded] onWindowStageDestroy(): void { // Main window is destroyed, release UI related resources diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/Index.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/Index.ets index 9f0948d444..ef124adf16 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/Index.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +// [Start navigate_to_web_page_pre_start_webview_load] import router from '@ohos.router'; import { webview } from '@kit.ArkWeb'; @@ -32,3 +33,4 @@ struct Index1 { } } } +// [End navigate_to_web_page_pre_start_webview_load] diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/common.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/common.ets index 999e9909b6..8aafa42d13 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/common.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/common.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start manage_dynamic_webview_components_in_harmonyos] // 创建NodeController import { UIContext, NodeController, BuilderNode, Size, FrameNode } from '@kit.ArkUI'; import { webview } from '@kit.ArkWeb'; @@ -95,3 +95,4 @@ export const createNWeb = (url: ResourceStr, uiContext: UIContext) => { export const getNWeb = (url: ResourceStr) : MyNodeController | undefined => { return nodeMap.get(url); } +// [End manage_dynamic_webview_components_in_harmonyos] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/index2.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/index2.ets index 46b3ca95cb..61785eaeb4 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/index2.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry1/src/main/ets/pages/index2.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start nodeContainer_bind_controller_show_dynamic_pages] import web_webview from '@ohos.web.webview'; @Entry @@ -32,3 +32,4 @@ struct index2 { .height('100%') } } +// [End nodeContainer_bind_controller_show_dynamic_pages] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/ets/pages/common.ets b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/ets/pages/common.ets index 82c5f1fb98..b424a64654 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/ets/pages/common.ets +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/ets/pages/common.ets @@ -26,6 +26,7 @@ class Data{ } // 通过布尔变量shouldInactive控制网页在后台完成预渲染后停止渲染 let shouldInactive: boolean = true; +// [Start call_onActive_method_to_pre_render_offline_web_component] @Builder function webBuilder(data:Data) { Column() { @@ -34,6 +35,7 @@ function webBuilder(data:Data) { // 调用onActive，开启渲染 data.controller.onActive(); }) + // [StartExclude call_onActive_method_to_pre_render_offline_web_component] .onFirstMeaningfulPaint(() =>{ if (!shouldInactive) { return; @@ -42,10 +44,12 @@ function webBuilder(data:Data) { data.controller.onInactive(); shouldInactive = false; }) + // [EndExclude call_onActive_method_to_pre_render_offline_web_component] .width('100%') .height('100%') } } +// [End call_onActive_method_to_pre_render_offline_web_component] let wrap = wrapBuilder(webBuilder); // 用于控制和反馈对应的NodeContianer上的节点的行为，需要与NodeContainer一起使用 export class MyNodeController extends NodeController { diff --git a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/module.json5 b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/module.json5 index c795511fa6..d40d6d37db 100755 --- a/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/module.json5 +++ b/code/DocsSample/ArkWeb/UseOfflineWebComp/entry2/src/main/module.json5 @@ -42,6 +42,6 @@ { "name" : "ohos.permission.INTERNET" } - ] + ], } } \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/UsingWebMultimedia/entry/src/main/ets/pages/Index.ets b/code/DocsSample/ArkWeb/UsingWebMultimedia/entry/src/main/ets/pages/Index.ets index d9f86c4892..b45e3d66fd 100755 --- a/code/DocsSample/ArkWeb/UsingWebMultimedia/entry/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkWeb/UsingWebMultimedia/entry/src/main/ets/pages/Index.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start click_button_to_turn_on_camera_microphone] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; import { abilityAccessCtrl } from '@kit.AbilityKit'; @@ -66,3 +66,4 @@ struct WebComponent { } } } +// [End click_button_to_turn_on_camera_microphone] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/entry2ability/Entry2Ability.ets b/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/entry2ability/Entry2Ability.ets index 97f049833e..413af92ba3 100755 --- a/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/entry2ability/Entry2Ability.ets +++ b/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/entry2ability/Entry2Ability.ets @@ -12,12 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { hilog } from '@kit.PerformanceAnalysisKit'; import { AbilityConstant, UIAbility, Want } from '@kit.AbilityKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; +// [Start allow_subsequent_rendering_to_use_ui] import { window } from '@kit.ArkUI'; export default class Entry2Ability extends UIAbility { + // [StartExclude allow_subsequent_rendering_to_use_ui] onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); } @@ -25,7 +27,7 @@ export default class Entry2Ability extends UIAbility { onDestroy(): void { hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy'); } - + // [EndExclude allow_subsequent_rendering_to_use_ui] onWindowStageCreate(windowStage: window.WindowStage): void { windowStage.loadContent('pages/Index', (err, data) => { if (err.code) { @@ -35,7 +37,7 @@ export default class Entry2Ability extends UIAbility { AppStorage.setOrCreate('UIContext', windowStage.getMainWindowSync().getUIContext()); }); } - + // [StartExclude allow_subsequent_rendering_to_use_ui] onWindowStageDestroy(): void { // Main window is destroyed, release UI related resources hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy'); @@ -50,4 +52,6 @@ export default class Entry2Ability extends UIAbility { // Ability has back to background hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground'); } + // [EndExclude allow_subsequent_rendering_to_use_ui] } +// [End allow_subsequent_rendering_to_use_ui] \ No newline at end of file diff --git a/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/pages/Index.ets b/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/pages/Index.ets index ef722e663e..778738e070 100755 --- a/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/pages/Index.ets +++ b/code/DocsSample/ArkWeb/UsingWebMultimedia/entry2/src/main/ets/pages/Index.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start video_hosting_usage] import { webview } from '@kit.ArkWeb'; import { BuilderNode, FrameNode, NodeController, NodeRenderType, UIContext } from '@kit.ArkUI'; import { AVPlayerDemo, AVPlayerListener } from './PlayerDemo'; @@ -465,3 +465,4 @@ struct WebComponent { return this.nativePlayerInfoList.find((item)=> item.embedId == embedId); } } +// [End video_hosting_usage] \ No newline at end of file -- Gitee