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
wangliang_wd
2024-05-29 16:28:54 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
05356f7bd58e932617f4a385143ee35092310950
05356f7b
1 parent
e5e7b1ca
feat:优化启动广告,优化早晚报
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
5 deletions
sight_harmony/features/wdBean/src/main/ets/bean/content/ContentDTO.ets
sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/SingleColumn999Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/CardView.ets
sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchAdvertisingPage.ets
sight_harmony/features/wdBean/src/main/ets/bean/content/ContentDTO.ets
View file @
05356f7
...
...
@@ -59,6 +59,7 @@ export class ContentDTO implements BaseDTO {
source: string = '';
objectId: string = '';
objectType: string = '';
objectLevel: string = '';
channelId: string = '';
relId: string = '';
relType: string = '';
...
...
sight_harmony/features/wdComponent/src/main/ets/components/MorningEveningPaper/SingleColumn999Component.ets
View file @
05356f7
...
...
@@ -169,8 +169,8 @@ export struct SingleColumn999Component {
*/
@Builder
buildPaperItem(item: ContentDTO, index: number) {
///屏蔽早晚报 音频
if (item.objectType != '13'){
///屏蔽早晚报 音频 和 音频专题
if (item.objectType != '13'&&!(item.objectType == '5' && item.objectLevel === '22')){
PaperSingleColumn999CardView({
item: item,
index: index,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/page/CardView.ets
View file @
05356f7
...
...
@@ -438,7 +438,8 @@ export struct PaperSingleColumn999CardView {
Stack({ alignContent: Alignment.BottomEnd }) {
Image(this.item?.coverUrl)
.borderRadius(5)
.aspectRatio(319 / 179) ///图片设计比例
.objectFit(ImageFit.Fill)
.aspectRatio(16 / 10) ///图片设计比例
.padding({ top: 10 })
//视频
if (this.item?.videoInfo) {
...
...
@@ -629,7 +630,11 @@ export struct PaperSingleColumn999CardView {
}else if(this.item.liveInfo.liveState === 'running'){
contentString = '直播中'
}else if(this.item.liveInfo.liveState === 'end'){
contentString = '回看'
if (this.item.liveInfo.replayUri.length > 0) {
contentString = '回看'
}else {
contentString = '已结束'
}
}
return contentString;
}
...
...
@@ -643,7 +648,10 @@ export struct PaperSingleColumn999CardView {
}else if(this.item.liveInfo.liveState === 'running'){
imageString = $r('app.media.card_live')
}else if(this.item.liveInfo.liveState === 'end'){
imageString = $r('app.media.card_play')
if (this.item.liveInfo.replayUri.length > 0) {
imageString = $r('app.media.card_play')
}else {
}
}
return imageString;
}
...
...
sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchAdvertisingPage.ets
View file @
05356f7
...
...
@@ -95,6 +95,22 @@ struct LaunchAdvertisingPage {
.width('100%')
.height('100%')
if (this.defaultModel.isAd === '1'){
Stack({alignContent:Alignment.TopStart}){
Text('广告')
.fontColor(Color.White)
.textAlign(TextAlign.Center)
.fontSize('24lpx')
.width('72lpx')
.height('36lpx')
.borderRadius(5)
.margin({top:'10lpx',left:'19lpx'})
.backgroundColor('#80000000')
}
.width('100%')
.height('100%')
}
if(this.defaultModel.screenType != '2'){
//底部logo样式 按钮加载在背景展示图上
Button(){
...
...
Please
register
or
login
to post a comment