diff --git a/entry/src/main/ets/common/Constants.ets b/entry/src/main/ets/common/Constants.ets index a58ce5f22c08b9f2013d37b75ee72689567ff350..223fb043f398ffe8e0a4845838727c97e912244e 100644 --- a/entry/src/main/ets/common/Constants.ets +++ b/entry/src/main/ets/common/Constants.ets @@ -17,29 +17,35 @@ export class Constants { /** * Text border radius. */ - static readonly TEXT_BORDER_RADIUS: number = 16; + public static readonly TEXT_BORDER_RADIUS: number = 16; + /** * Background color. */ - static readonly BACK_COLOR: string = '#F1F3F5'; + public static readonly BACK_COLOR: string = '#F1F3F5'; + /** * All breakpoints */ - static readonly BREAKPOINTS: string[] = ['sm', 'md', 'lg']; + public static readonly BREAKPOINTS: string[] = ['sm', 'md', 'lg']; + /** * Full Screen width */ - static readonly FULL_WIDTH: string = "100%"; + public static readonly FULL_WIDTH: string = "100%"; + /** * Full Screen height */ - static readonly FULL_HEIGHT: string = "100%"; + public static readonly FULL_HEIGHT: string = "100%"; + /** * Index page padding top size. */ - static readonly PADDING_TOP_INDEX: number = 64; + public static readonly PADDING_TOP_INDEX: number = 64; + /** * Index page padding bottom size. */ - static readonly PADDING_BOTTOM_INDEX: number = 16; + public static readonly PADDING_BOTTOM_INDEX: number = 16; } \ No newline at end of file diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index a7a24f92aea33afd1fd7118998cdc82a7d924f4e..242952c91ca0422854a9510c5a4b603c4217005a 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -19,7 +19,6 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; import { BusinessError } from '@kit.BasicServicesKit'; import { resourceManager } from '@kit.LocalizationKit'; import { createNWeb } from '../pages/WebPage'; -import { Constants } from '../common/Constants'; import { ConfigMapKey, ResourceUtil } from '../common/ResourceUtil'; export default class EntryAbility extends UIAbility { diff --git a/entry/src/main/ets/pages/WebPage.ets b/entry/src/main/ets/pages/WebPage.ets index 86421d2030cd320553c3106e233e9ab67dfaea98..1f7a02e73ff39a00d6c6200ddea7640f4f7f7a4c 100644 --- a/entry/src/main/ets/pages/WebPage.ets +++ b/entry/src/main/ets/pages/WebPage.ets @@ -15,17 +15,17 @@ import { webview } from '@kit.ArkWeb'; import { UIContext, NodeController, BuilderNode, FrameNode } from '@kit.ArkUI'; -import { Constants } from '../common/Constants'; import { ConfigMapKey, ResourceUtil } from '../common/ResourceUtil'; import { common } from '@kit.AbilityKit'; class Data { - url: string = ResourceUtil.getRawFileStringByKey(getContext(this) as common.UIAbilityContext, ConfigMapKey.GALLERY_URL); - controller: WebviewController = new webview.WebviewController(); + public url: string = + ResourceUtil.getRawFileStringByKey(getContext(this) as common.UIAbilityContext, ConfigMapKey.GALLERY_URL); + public controller: WebviewController = new webview.WebviewController(); } @Builder -function WebBuilder(data: Data) { +function webBuilder(data: Data) { Column() { Web({ src: data.url, controller: data.controller }) .width($r('app.string.full_height_width')) @@ -34,7 +34,7 @@ function WebBuilder(data: Data) { } } -let wrap = wrapBuilder(WebBuilder); +let wrap = wrapBuilder(webBuilder); export class MyNodeController extends NodeController { private rootNode: BuilderNode | null = null; @@ -55,7 +55,7 @@ export class MyNodeController extends NodeController { } } -let NodeMap: Map = new Map(); +let nodeMap: Map = new Map(); let controllerMap: Map = new Map(); @@ -64,9 +64,9 @@ export const createNWeb = (url: string, uiContext: UIContext) => { let controller = new webview.WebviewController(); baseNode.initWeb(url, uiContext, controller); controllerMap.set(url, controller) - NodeMap.set(url, baseNode); + nodeMap.set(url, baseNode); } export const getNWeb = (url: string): MyNodeController | undefined => { - return NodeMap.get(url); + return nodeMap.get(url); } \ No newline at end of file diff --git a/screenshots/device/phone.png b/screenshots/device/phone.png index 3c88af73657dcce59ad12e023da9c79b8c27a416..ab011c01cdb04e36073012690123e0bd0fdd256f 100644 Binary files a/screenshots/device/phone.png and b/screenshots/device/phone.png differ diff --git a/screenshots/device/phone_EN.png b/screenshots/device/phone_EN.png index f653e0fe6c95ae7b3d2a099fa4eed8b51643857b..86fa611e9195e8d6a60e57d8f2df0093e5ac5670 100644 Binary files a/screenshots/device/phone_EN.png and b/screenshots/device/phone_EN.png differ