Showing
4 changed files
with
19 additions
and
6 deletions
| @@ -181,6 +181,10 @@ | @@ -181,6 +181,10 @@ | ||
| 181 | "value": "40vp" | 181 | "value": "40vp" |
| 182 | }, | 182 | }, |
| 183 | { | 183 | { |
| 184 | + "name": "top_tab_bar_height_common", | ||
| 185 | + "value": "44vp" | ||
| 186 | + }, | ||
| 187 | + { | ||
| 184 | "name": "top_tab_item_max_width", | 188 | "name": "top_tab_item_max_width", |
| 185 | "value": "300vp" | 189 | "value": "300vp" |
| 186 | }, | 190 | }, |
| @@ -172,7 +172,8 @@ export struct TopNavigationComponentNew { | @@ -172,7 +172,8 @@ export struct TopNavigationComponentNew { | ||
| 172 | .onClick(() => { | 172 | .onClick(() => { |
| 173 | if (NetworkUtil.isNetConnected()) { | 173 | if (NetworkUtil.isNetConnected()) { |
| 174 | ProcessUtils.gotoMorningEveningPaper() | 174 | ProcessUtils.gotoMorningEveningPaper() |
| 175 | - TrackingButton.click('morning_evening_news_click',TrackConstants.SummaryType.MorningAndEveningNews,TrackConstants.SummaryType.MorningAndEveningNews) | 175 | + TrackingButton.click('morning_evening_news_click', TrackConstants.SummaryType.MorningAndEveningNews, |
| 176 | + TrackConstants.SummaryType.MorningAndEveningNews) | ||
| 176 | } else { | 177 | } else { |
| 177 | ToastUtils.showToast('网络出小差了,请检查网络后重试', 1000) | 178 | ToastUtils.showToast('网络出小差了,请检查网络后重试', 1000) |
| 178 | } | 179 | } |
| @@ -240,7 +241,7 @@ export struct TopNavigationComponentNew { | @@ -240,7 +241,7 @@ export struct TopNavigationComponentNew { | ||
| 240 | .width('24vp') | 241 | .width('24vp') |
| 241 | .height('24vp') | 242 | .height('24vp') |
| 242 | } | 243 | } |
| 243 | - .height('40vp') | 244 | + .height($r('app.float.top_tab_bar_height_common')) |
| 244 | .width('40vp') | 245 | .width('40vp') |
| 245 | .margin({ right: 10 }) | 246 | .margin({ right: 10 }) |
| 246 | .alignItems(VerticalAlign.Center) | 247 | .alignItems(VerticalAlign.Center) |
| @@ -251,9 +252,9 @@ export struct TopNavigationComponentNew { | @@ -251,9 +252,9 @@ export struct TopNavigationComponentNew { | ||
| 251 | 'right': { 'anchor': '__container__', 'align': HorizontalAlign.End } | 252 | 'right': { 'anchor': '__container__', 'align': HorizontalAlign.End } |
| 252 | }) | 253 | }) |
| 253 | .onClick(() => { | 254 | .onClick(() => { |
| 254 | - TrackingButton.searchClick( TrackConstants.PageName.Search, "PEOPLE") | 255 | + TrackingButton.searchClick(TrackConstants.PageName.Search, "PEOPLE") |
| 255 | let params = { 'tabName': "PEOPLE" } as Record<string, string> | 256 | let params = { 'tabName': "PEOPLE" } as Record<string, string> |
| 256 | - WDRouterRule.jumpWithPage(WDRouterPage.searchPage,params) | 257 | + WDRouterRule.jumpWithPage(WDRouterPage.searchPage, params) |
| 257 | }) | 258 | }) |
| 258 | 259 | ||
| 259 | List({ scroller: this.listScroller }) { | 260 | List({ scroller: this.listScroller }) { |
| @@ -266,9 +267,9 @@ export struct TopNavigationComponentNew { | @@ -266,9 +267,9 @@ export struct TopNavigationComponentNew { | ||
| 266 | .listDirection(Axis.Horizontal) | 267 | .listDirection(Axis.Horizontal) |
| 267 | .scrollBar(BarState.Off) | 268 | .scrollBar(BarState.Off) |
| 268 | .edgeEffect(EdgeEffect.None) | 269 | .edgeEffect(EdgeEffect.None) |
| 269 | - .height($r('app.float.top_tab_bar_height')) | 270 | + .height($r('app.float.top_tab_bar_height_common')) |
| 270 | .backgroundColor(this.barBackgroundColor) | 271 | .backgroundColor(this.barBackgroundColor) |
| 271 | - .padding({ top: 6 }) | 272 | + .margin({top:10}) |
| 272 | .onAreaChange((oldValue: Area, newValue: Area) => { | 273 | .onAreaChange((oldValue: Area, newValue: Area) => { |
| 273 | let width = Number.parseFloat(newValue.width.toString()) | 274 | let width = Number.parseFloat(newValue.width.toString()) |
| 274 | this.tabsWidth = Number.isNaN(width) ? 0 : width | 275 | this.tabsWidth = Number.isNaN(width) ? 0 : width |
| @@ -181,6 +181,10 @@ | @@ -181,6 +181,10 @@ | ||
| 181 | "value": "40vp" | 181 | "value": "40vp" |
| 182 | }, | 182 | }, |
| 183 | { | 183 | { |
| 184 | + "name": "top_tab_bar_height_common", | ||
| 185 | + "value": "44vp" | ||
| 186 | + }, | ||
| 187 | + { | ||
| 184 | "name": "top_tab_item_max_width", | 188 | "name": "top_tab_item_max_width", |
| 185 | "value": "300vp" | 189 | "value": "300vp" |
| 186 | }, | 190 | }, |
| @@ -111,6 +111,7 @@ export struct VideoChannelPage { | @@ -111,6 +111,7 @@ export struct VideoChannelPage { | ||
| 111 | }, (item: TopNavDTO) => item.channelId + '') | 111 | }, (item: TopNavDTO) => item.channelId + '') |
| 112 | } | 112 | } |
| 113 | .width('100%') | 113 | .width('100%') |
| 114 | + | ||
| 114 | .justifyContent(FlexAlign.Center) | 115 | .justifyContent(FlexAlign.Center) |
| 115 | .backgroundColor(this.currentTopNavSelectedIndex === 0 ? Color.Transparent : Color.White) | 116 | .backgroundColor(this.currentTopNavSelectedIndex === 0 ? Color.Transparent : Color.White) |
| 116 | 117 | ||
| @@ -136,6 +137,8 @@ export struct VideoChannelPage { | @@ -136,6 +137,8 @@ export struct VideoChannelPage { | ||
| 136 | 137 | ||
| 137 | } | 138 | } |
| 138 | .zIndex(20) | 139 | .zIndex(20) |
| 140 | + .height($r('app.float.top_tab_bar_height_common')) | ||
| 141 | + .margin({top:10}) | ||
| 139 | .visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None) | 142 | .visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None) |
| 140 | 143 | ||
| 141 | } | 144 | } |
| @@ -173,6 +176,7 @@ export struct VideoChannelPage { | @@ -173,6 +176,7 @@ export struct VideoChannelPage { | ||
| 173 | .cachedCount(-1) | 176 | .cachedCount(-1) |
| 174 | .displayCount(1, true) | 177 | .displayCount(1, true) |
| 175 | .alignSelf(ItemAlign.Start) | 178 | .alignSelf(ItemAlign.Start) |
| 179 | + .effectMode(EdgeEffect.None) | ||
| 176 | .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP]) | 180 | .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP]) |
| 177 | .onChange((index: number) => { | 181 | .onChange((index: number) => { |
| 178 | this.currentTopNavSelectedIndex = index | 182 | this.currentTopNavSelectedIndex = index |
-
Please register or login to post a comment