Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
liyubing
2024-05-25 16:15:13 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
bd48c0c6b47b7b4f6f583fb4071353e64a415685
bd48c0c6
1 parent
b7edcbcb
fix:直播中的节目在无法获取到播放信息流时APP异常报错且提示信息与安卓不一致
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
6 deletions
sight_harmony/AppScope/resources/base/element/float.json
sight_harmony/features/wdComponent/src/main/ets/components/page/TopNavigationComponentNew.ets
sight_harmony/features/wdComponent/src/main/resources/base/element/float.json
sight_harmony/products/phone/src/main/ets/pages/view/VideoChannelPage.ets
sight_harmony/AppScope/resources/base/element/float.json
View file @
bd48c0c
...
...
@@ -181,6 +181,10 @@
"value"
:
"40vp"
},
{
"name"
:
"top_tab_bar_height_common"
,
"value"
:
"44vp"
},
{
"name"
:
"top_tab_item_max_width"
,
"value"
:
"300vp"
},
...
...
sight_harmony/features/wdComponent/src/main/ets/components/page/TopNavigationComponentNew.ets
View file @
bd48c0c
...
...
@@ -172,7 +172,8 @@ export struct TopNavigationComponentNew {
.onClick(() => {
if (NetworkUtil.isNetConnected()) {
ProcessUtils.gotoMorningEveningPaper()
TrackingButton.click('morning_evening_news_click',TrackConstants.SummaryType.MorningAndEveningNews,TrackConstants.SummaryType.MorningAndEveningNews)
TrackingButton.click('morning_evening_news_click', TrackConstants.SummaryType.MorningAndEveningNews,
TrackConstants.SummaryType.MorningAndEveningNews)
} else {
ToastUtils.showToast('网络出小差了,请检查网络后重试', 1000)
}
...
...
@@ -240,7 +241,7 @@ export struct TopNavigationComponentNew {
.width('24vp')
.height('24vp')
}
.height(
'40vp'
)
.height(
$r('app.float.top_tab_bar_height_common')
)
.width('40vp')
.margin({ right: 10 })
.alignItems(VerticalAlign.Center)
...
...
@@ -251,9 +252,9 @@ export struct TopNavigationComponentNew {
'right': { 'anchor': '__container__', 'align': HorizontalAlign.End }
})
.onClick(() => {
TrackingButton.searchClick(
TrackConstants.PageName.Search, "PEOPLE")
TrackingButton.searchClick(TrackConstants.PageName.Search, "PEOPLE")
let params = { 'tabName': "PEOPLE" } as Record<string, string>
WDRouterRule.jumpWithPage(WDRouterPage.searchPage,params)
WDRouterRule.jumpWithPage(WDRouterPage.searchPage,
params)
})
List({ scroller: this.listScroller }) {
...
...
@@ -266,9 +267,9 @@ export struct TopNavigationComponentNew {
.listDirection(Axis.Horizontal)
.scrollBar(BarState.Off)
.edgeEffect(EdgeEffect.None)
.height($r('app.float.top_tab_bar_height'))
.height($r('app.float.top_tab_bar_height
_common
'))
.backgroundColor(this.barBackgroundColor)
.
padding({ top: 6
})
.
margin({top:10
})
.onAreaChange((oldValue: Area, newValue: Area) => {
let width = Number.parseFloat(newValue.width.toString())
this.tabsWidth = Number.isNaN(width) ? 0 : width
...
...
sight_harmony/features/wdComponent/src/main/resources/base/element/float.json
View file @
bd48c0c
...
...
@@ -181,6 +181,10 @@
"value"
:
"40vp"
},
{
"name"
:
"top_tab_bar_height_common"
,
"value"
:
"44vp"
},
{
"name"
:
"top_tab_item_max_width"
,
"value"
:
"300vp"
},
...
...
sight_harmony/products/phone/src/main/ets/pages/view/VideoChannelPage.ets
View file @
bd48c0c
...
...
@@ -111,6 +111,7 @@ export struct VideoChannelPage {
}, (item: TopNavDTO) => item.channelId + '')
}
.width('100%')
.justifyContent(FlexAlign.Center)
.backgroundColor(this.currentTopNavSelectedIndex === 0 ? Color.Transparent : Color.White)
...
...
@@ -136,6 +137,8 @@ export struct VideoChannelPage {
}
.zIndex(20)
.height($r('app.float.top_tab_bar_height_common'))
.margin({top:10})
.visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
}
...
...
@@ -173,6 +176,7 @@ export struct VideoChannelPage {
.cachedCount(-1)
.displayCount(1, true)
.alignSelf(ItemAlign.Start)
.effectMode(EdgeEffect.None)
.expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
.onChange((index: number) => {
this.currentTopNavSelectedIndex = index
...
...
Please
register
or
login
to post a comment