From 85cbe6a2f3c3c927eddbebb3b797ac97d4376103 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Fri, 25 Jul 2025 03:17:19 +0000 Subject: [PATCH 1/4] update wifi/application/portal_login/entry/src/main/ets/common/utils.ets. Signed-off-by: chen yi wen <15068825070@163.com> --- .../portal_login/entry/src/main/ets/common/utils.ets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/application/portal_login/entry/src/main/ets/common/utils.ets b/wifi/application/portal_login/entry/src/main/ets/common/utils.ets index 7c1067511..72d1a7e5f 100644 --- a/wifi/application/portal_login/entry/src/main/ets/common/utils.ets +++ b/wifi/application/portal_login/entry/src/main/ets/common/utils.ets @@ -24,10 +24,11 @@ export function shouldShowBrowseItem(): boolean { return shouldShowBrowseItem_; } -function validateURL(urlString: string): boolean { +export function validateURL(urlString: string): boolean { try { const urlObject = url.URL.parseURL(urlString); if (urlObject && urlObject.hostname) { + hilog.info(DOMAIN, TAG, '%{public}s', 'validateURL:' + urlObject.hostname); return true; } } catch (error) { -- Gitee From 1c3a8aaeabc3c28b14da827a4a19ba880b484e74 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Fri, 25 Jul 2025 03:18:04 +0000 Subject: [PATCH 2/4] update wifi/application/portal_login/entry/src/main/ets/entryability/EntryAbility.ets. Signed-off-by: chen yi wen <15068825070@163.com> --- .../src/main/ets/entryability/EntryAbility.ets | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/wifi/application/portal_login/entry/src/main/ets/entryability/EntryAbility.ets b/wifi/application/portal_login/entry/src/main/ets/entryability/EntryAbility.ets index 48615b317..839c8a91e 100644 --- a/wifi/application/portal_login/entry/src/main/ets/entryability/EntryAbility.ets +++ b/wifi/application/portal_login/entry/src/main/ets/entryability/EntryAbility.ets @@ -3,6 +3,7 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; import { window } from '@kit.ArkUI'; import { setUrl, setNetId, setShouldShowBrowseItem } from '../common/utils'; import { emitter } from '@kit.BasicServicesKit'; +import { BusinessError } from '@kit.BasicServicesKit'; const DOMAIN = 0x01560; const TAG = 'Entry'; @@ -37,6 +38,23 @@ export default class EntryAbility extends UIAbility { hilog.error(DOMAIN, TAG, 'Failed to load the content. Cause: %{public}s', JSON.stringify(err)); return; } + let windowClass: window.Window = windowStage.getMainWindowSync(); + let isLayoutFullScreen = true; + windowClass.setWindowLayoutFullScreen(isLayoutFullScreen).then(() => { + console.info('Succeeded in setting the window layout to full-screen mode.'); + }).catch((err: BusinessError) => { + console.error('Failed to set the window layout to full-screen mode. Cause:' + JSON.stringify(err)); + }); + let type = window.AvoidAreaType.TYPE_SYSTEM; + let avoidArea = windowClass.getWindowAvoidArea(type); + let topRectHeight = avoidArea.topRect.height; + AppStorage.setOrCreate('topRectHeight', topRectHeight); + windowClass.on('avoidAreaChange', (data) => { + if (data.type === window.AvoidAreaType.TYPE_SYSTEM) { + let topRectHeight = data.area.topRect.height; + AppStorage.setOrCreate('topRectHeight', topRectHeight); + } + }); hilog.info(DOMAIN, TAG, 'Succeeded in loading the content.'); }); } -- Gitee From 7faf1d3d54d0fd76f6050ddb1377ac11d7fa90c5 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Fri, 25 Jul 2025 03:21:23 +0000 Subject: [PATCH 3/4] update wifi/application/portal_login/entry/src/main/ets/pages/Index.ets. Signed-off-by: chen yi wen <15068825070@163.com> --- .../entry/src/main/ets/pages/Index.ets | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets b/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets index aa72237c8..c4448d180 100644 --- a/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets +++ b/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets @@ -5,7 +5,7 @@ import { common, OpenLinkOptions } from '@kit.AbilityKit'; import { BusinessError } from '@kit.BasicServicesKit' import { SymbolGlyphModifier } from '@kit.ArkUI' import { - getUrl, bindToNetById, extractDomain, handleNetworkChange, exitApp, shouldShowBrowseItem, UserAgentSet + getUrl, bindToNetById, extractDomain, handleNetworkChange, exitApp, shouldShowBrowseItem, UserAgentSet, validateURL } from '../common/utils' import { connection } from '@kit.NetworkKit'; import { emitter } from '@kit.BasicServicesKit'; @@ -73,13 +73,13 @@ struct Index { @State private isSelectUASheetVisible: boolean = false; @State private adaptPadding: number = 16; @State private loadProgress: number = 0; - private actionBarHeight = 56; private sheetItemHeight = 50; private contextMenuWidth = 224; private netConnect: connection.NetConnection = connection.createNetConnection(); private isInOOBE: boolean = false; @State mode: WebDarkMode = WebDarkMode.Auto; @State access: boolean = true; + @StorageProp('topRectHeight') topRectHeight: number = 0; @Builder ContextMenu() { @@ -136,7 +136,6 @@ struct Index { .alignItems(HorizontalAlign.Start) } .alignItems(VerticalAlign.Bottom) - .height(this.actionBarHeight) // UA list Column() { @@ -215,7 +214,7 @@ struct Index { } build() { - Column() { + Flex({ direction: FlexDirection.Column }) { { // Action bar Column() { Row() { @@ -296,7 +295,9 @@ struct Index { }) } .width('100%') - .height(this.actionBarHeight) + .constraintSize({ + minHeight: '56vp' + }) .backgroundColor($r('sys.color.ohos_id_color_background')) Web({ src: this.webUrl, controller: this.webviewController }) @@ -306,7 +307,7 @@ struct Index { .domStorageAccess(true) .onOverrideUrlLoading((request) => { const url = request.getRequestUrl(); - if (!url.startsWith('http') && !url.startsWith('https')) { + if (validateURL(url) && !url.startsWith('http') && !url.startsWith('https')) { (this.getUIContext().getHostContext() as common.UIAbilityContext).openLink(url) .then(() => { hilog.info(DOMAIN, TAG, 'open link success.'); @@ -389,6 +390,7 @@ struct Index { .backgroundColor($r('sys.color.ohos_id_color_background')) .width('100%') } + .padding({ top: px2vp(this.topRectHeight) }) } aboutToAppear(): void { -- Gitee From 50bd1768aa707aca440a2e7ca4f2f1d8459ca0e2 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Fri, 25 Jul 2025 03:48:18 +0000 Subject: [PATCH 4/4] update wifi/application/portal_login/entry/src/main/ets/pages/Index.ets. Signed-off-by: chen yi wen <15068825070@163.com> --- .../application/portal_login/entry/src/main/ets/pages/Index.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets b/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets index c4448d180..14f4d7f0b 100644 --- a/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets +++ b/wifi/application/portal_login/entry/src/main/ets/pages/Index.ets @@ -214,7 +214,7 @@ struct Index { } build() { - Flex({ direction: FlexDirection.Column }) { { + Flex({ direction: FlexDirection.Column }) { // Action bar Column() { Row() { -- Gitee