diff --git a/features/home/src/main/ets/view/BannerView.ets b/features/home/src/main/ets/view/BannerView.ets index a778418e15a47974509fb5ef3803d0995828e34c..036227b69ce38b74ee1108f59e47996d7dec948b 100644 --- a/features/home/src/main/ets/view/BannerView.ets +++ b/features/home/src/main/ets/view/BannerView.ets @@ -128,28 +128,28 @@ export struct BannerView { .height(item.getBannerImg().getHeight().getValue(this.currentWidthBreakpoint)) .width('100%') // The width and height vary with the container assembly and the aspect ratio remains unchanged. - .aspectRatio(new BreakpointType(HomeConstants.BANNER_RATIOS[0], HomeConstants.BANNER_RATIOS[1], - HomeConstants.BANNER_RATIOS[2]).getValue(this.currentWidthBreakpoint)) + .aspectRatio(new BreakpointType(1.49, 1.6, + 2.1).getValue(this.currentWidthBreakpoint)) .groupDefaultFocus(index === 0 ? true : false) .focusable(true) .padding({ top: $r('app.float.banner_margin'), bottom: $r('app.float.banner_margin'), - left: this.currentWidthBreakpoint === BreakpointConstants.BREAKPOINT_SM ? $r('app.float.banner_padding_sm') : 0, - right: this.currentWidthBreakpoint === BreakpointConstants.BREAKPOINT_SM ? $r('app.float.banner_padding_sm') : 0 + left: this.currentWidthBreakpoint === 'sm' ? $r('app.float.banner_padding_sm') : 0, + right: this.currentWidthBreakpoint === 'sm' ? $r('app.float.banner_padding_sm') : 0 }) // [EndExclude jh_lazy_for_each] }, (item: Banner, index: number) => index + JSON.stringify(item)) } // [StartExclude jh_lazy_for_each] - .displayCount(this.currentWidthBreakpoint === BreakpointConstants.BREAKPOINT_SM ? 1 : HomeConstants.TWO) + .displayCount(this.currentWidthBreakpoint === 'sm' ? 1 : 2) // Interval between banner images - .itemSpace(HomeConstants.SWIPER_ITEM_SPACE) - .prevMargin(new BreakpointType($r('app.float.swiper_prev_next_margin_sm'), - $r('app.float.swiper_prev_next_margin_md'), $r('app.float.swiper_prev_next_margin_lg')) + .itemSpace('12vp') + .prevMargin(new BreakpointType("0vp", + "12vp", "64vp") .getValue(this.currentWidthBreakpoint)) - .nextMargin(new BreakpointType($r('app.float.swiper_prev_next_margin_sm'), - $r('app.float.swiper_prev_next_margin_md'), $r('app.float.swiper_prev_next_margin_lg')) + .nextMargin(new BreakpointType("0vp", + "12vp", "64vp") .getValue(this.currentWidthBreakpoint)) // [End swiper1_lazyforeach] // Setting the navigation point Style of the swiper. diff --git a/products/phone/src/main/ets/entryability/EntryAbility.ets b/products/phone/src/main/ets/entryability/EntryAbility.ets index 2953f6bc763e973840c965c9899e6e5b548d13e3..b208a06c808db4ca4367e6a9cb3fcdb0260a4629 100644 --- a/products/phone/src/main/ets/entryability/EntryAbility.ets +++ b/products/phone/src/main/ets/entryability/EntryAbility.ets @@ -80,7 +80,7 @@ export default class EntryAbility extends UIAbility { } // [End EntryAbility] - // [StartExclude EntryAbility] + // [StartExclude multi_entryAbility] onWindowStageDestroy() { // Main window is destroyed, release UI related resources hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy');