diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 51b3851f4a9c0d20d912afe86eae0116c6e3e9da..dd200ad1f2fa979c9c7984ecd0e8b92690e42552 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -57,11 +57,8 @@ export default class EntryAbility extends UIAbility { windowStage.getMainWindow().then((windowObj: window.Window) => { let type = window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR; try { - let avoidArea = windowObj.getWindowAvoidArea(type); - let bottomRectHeight = avoidArea.bottomRect.height; - AppStorage.setOrCreate('bottomRectHeight', bottomRectHeight); type = window.AvoidAreaType.TYPE_SYSTEM; - avoidArea = windowObj.getWindowAvoidArea(type); + let avoidArea = windowObj.getWindowAvoidArea(type); let topRectHeight = avoidArea.topRect.height; AppStorage.setOrCreate('topRectHeight', topRectHeight); this.updateBreakpoint(windowObj.getWindowProperties().windowRect.width); diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 713a34a7c24a04029a22e99fac20568c948066a1..c4db74805b3e5d863b7fbdd18afc400b42daffe1 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -45,8 +45,7 @@ struct NestedCeiling { }, }) @StorageLink('currentBreakpoint') curBp: string = CommonConstants.BREAK_POINT_SM; - @StorageProp('topRectHeight') - topRectHeight: number = 0; + @StorageProp('topRectHeight') topRectHeight: number = 0; private scrollerForScroll: Scroller = new Scroller(); private scrollerForList: Scroller = new Scroller(); @@ -69,7 +68,7 @@ struct NestedCeiling { } @Builder - listBuilder(listName: ResourceStr, tabName: ResourceStr, index: number) { + listBuilder(listName: ResourceStr) { List({ scroller: this.scrollerForList }) { ForEach(listArr, (item: string, index: number) => { ListItem() { @@ -134,9 +133,9 @@ struct NestedCeiling { .width(this.curBp === 'sm' ? '100%' : 448) .margin({ bottom: $r('sys.float.padding_level6') }) if (this.currentIndex === 0) { - this.listBuilder($r('app.string.goods'), $r('app.string.Promotional'), 0) + this.listBuilder($r('app.string.goods')) } else { - this.listBuilder($r('app.string.Itinerary'), $r('app.string.Travel'), 1) + this.listBuilder($r('app.string.Itinerary')) } } } @@ -149,7 +148,8 @@ struct NestedCeiling { $r('sys.float.padding_level16')).getValue(this.curBp), right: new BreakpointType($r('sys.float.padding_level8'), $r('sys.float.padding_level12'), $r('sys.float.padding_level16')).getValue(this.curBp), - top: px2vp(this.topRectHeight) + top: px2vp(this.topRectHeight), + bottom: '155vp', }) .width(CommonConstants.FULL_WIDTH) .height(CommonConstants.FULL_HEIGHT) diff --git a/screenshots/device/scroll1.png b/screenshots/device/scroll1.png index 83d894877fa8e7d4a6df94a7a157ded27bbf1807..7cb9e6836610dc5c83ffc8abc39faad7a8ea1e79 100644 Binary files a/screenshots/device/scroll1.png and b/screenshots/device/scroll1.png differ diff --git a/screenshots/device/scroll2.png b/screenshots/device/scroll2.png index c9d42a4f3377345b6f8ef4d78dcaa1479a676b09..a095b743fc6c82eb0ffe587cd5b0ffaefdb1f16d 100644 Binary files a/screenshots/device/scroll2.png and b/screenshots/device/scroll2.png differ diff --git a/screenshots/device/scroll3.png b/screenshots/device/scroll3.png index 24054b3d3da111a6996a1e982cc6ca547aabc3df..658d3bcd7cd2d83d254bd35755e37f433360e56a 100644 Binary files a/screenshots/device/scroll3.png and b/screenshots/device/scroll3.png differ diff --git a/screenshots/device/scroll_en1.png b/screenshots/device/scroll_en1.png index 3a6754e029b596f910c3f7bb70f4a62f8df9efc4..4f9b0a3611fd6de7407d3bf6061789f961f789a9 100644 Binary files a/screenshots/device/scroll_en1.png and b/screenshots/device/scroll_en1.png differ diff --git a/screenshots/device/scroll_en2.png b/screenshots/device/scroll_en2.png index 98a7528624a9965efa5bd971e8f641b478830403..17ec51d31f519bb7720e4131e2a61b17a84076f1 100644 Binary files a/screenshots/device/scroll_en2.png and b/screenshots/device/scroll_en2.png differ diff --git a/screenshots/device/scroll_en3.png b/screenshots/device/scroll_en3.png index 681ea1215f0b1a65b722a7b01143e0a8f91324eb..e2b7c1aeb9b716d0354f97e27c2050f7b689285b 100644 Binary files a/screenshots/device/scroll_en3.png and b/screenshots/device/scroll_en3.png differ