Showing
4 changed files
with
28 additions
and
3 deletions
| @@ -59,6 +59,7 @@ export class ContentDTO implements BaseDTO { | @@ -59,6 +59,7 @@ export class ContentDTO implements BaseDTO { | ||
| 59 | source: string = ''; | 59 | source: string = ''; |
| 60 | objectId: string = ''; | 60 | objectId: string = ''; |
| 61 | objectType: string = ''; | 61 | objectType: string = ''; |
| 62 | + objectLevel: string = ''; | ||
| 62 | channelId: string = ''; | 63 | channelId: string = ''; |
| 63 | relId: string = ''; | 64 | relId: string = ''; |
| 64 | relType: string = ''; | 65 | relType: string = ''; |
| @@ -169,8 +169,8 @@ export struct SingleColumn999Component { | @@ -169,8 +169,8 @@ export struct SingleColumn999Component { | ||
| 169 | */ | 169 | */ |
| 170 | @Builder | 170 | @Builder |
| 171 | buildPaperItem(item: ContentDTO, index: number) { | 171 | buildPaperItem(item: ContentDTO, index: number) { |
| 172 | - ///屏蔽早晚报 音频 | ||
| 173 | - if (item.objectType != '13'){ | 172 | + ///屏蔽早晚报 音频 和 音频专题 |
| 173 | + if (item.objectType != '13'&&!(item.objectType == '5' && item.objectLevel === '22')){ | ||
| 174 | PaperSingleColumn999CardView({ | 174 | PaperSingleColumn999CardView({ |
| 175 | item: item, | 175 | item: item, |
| 176 | index: index, | 176 | index: index, |
| @@ -438,7 +438,8 @@ export struct PaperSingleColumn999CardView { | @@ -438,7 +438,8 @@ export struct PaperSingleColumn999CardView { | ||
| 438 | Stack({ alignContent: Alignment.BottomEnd }) { | 438 | Stack({ alignContent: Alignment.BottomEnd }) { |
| 439 | Image(this.item?.coverUrl) | 439 | Image(this.item?.coverUrl) |
| 440 | .borderRadius(5) | 440 | .borderRadius(5) |
| 441 | - .aspectRatio(319 / 179) ///图片设计比例 | 441 | + .objectFit(ImageFit.Fill) |
| 442 | + .aspectRatio(16 / 10) ///图片设计比例 | ||
| 442 | .padding({ top: 10 }) | 443 | .padding({ top: 10 }) |
| 443 | //视频 | 444 | //视频 |
| 444 | if (this.item?.videoInfo) { | 445 | if (this.item?.videoInfo) { |
| @@ -629,7 +630,11 @@ export struct PaperSingleColumn999CardView { | @@ -629,7 +630,11 @@ export struct PaperSingleColumn999CardView { | ||
| 629 | }else if(this.item.liveInfo.liveState === 'running'){ | 630 | }else if(this.item.liveInfo.liveState === 'running'){ |
| 630 | contentString = '直播中' | 631 | contentString = '直播中' |
| 631 | }else if(this.item.liveInfo.liveState === 'end'){ | 632 | }else if(this.item.liveInfo.liveState === 'end'){ |
| 633 | + if (this.item.liveInfo.replayUri.length > 0) { | ||
| 632 | contentString = '回看' | 634 | contentString = '回看' |
| 635 | + }else { | ||
| 636 | + contentString = '已结束' | ||
| 637 | + } | ||
| 633 | } | 638 | } |
| 634 | return contentString; | 639 | return contentString; |
| 635 | } | 640 | } |
| @@ -643,7 +648,10 @@ export struct PaperSingleColumn999CardView { | @@ -643,7 +648,10 @@ export struct PaperSingleColumn999CardView { | ||
| 643 | }else if(this.item.liveInfo.liveState === 'running'){ | 648 | }else if(this.item.liveInfo.liveState === 'running'){ |
| 644 | imageString = $r('app.media.card_live') | 649 | imageString = $r('app.media.card_live') |
| 645 | }else if(this.item.liveInfo.liveState === 'end'){ | 650 | }else if(this.item.liveInfo.liveState === 'end'){ |
| 651 | + if (this.item.liveInfo.replayUri.length > 0) { | ||
| 646 | imageString = $r('app.media.card_play') | 652 | imageString = $r('app.media.card_play') |
| 653 | + }else { | ||
| 654 | + } | ||
| 647 | } | 655 | } |
| 648 | return imageString; | 656 | return imageString; |
| 649 | } | 657 | } |
| @@ -95,6 +95,22 @@ struct LaunchAdvertisingPage { | @@ -95,6 +95,22 @@ struct LaunchAdvertisingPage { | ||
| 95 | .width('100%') | 95 | .width('100%') |
| 96 | .height('100%') | 96 | .height('100%') |
| 97 | 97 | ||
| 98 | + if (this.defaultModel.isAd === '1'){ | ||
| 99 | + Stack({alignContent:Alignment.TopStart}){ | ||
| 100 | + Text('广告') | ||
| 101 | + .fontColor(Color.White) | ||
| 102 | + .textAlign(TextAlign.Center) | ||
| 103 | + .fontSize('24lpx') | ||
| 104 | + .width('72lpx') | ||
| 105 | + .height('36lpx') | ||
| 106 | + .borderRadius(5) | ||
| 107 | + .margin({top:'10lpx',left:'19lpx'}) | ||
| 108 | + .backgroundColor('#80000000') | ||
| 109 | + } | ||
| 110 | + .width('100%') | ||
| 111 | + .height('100%') | ||
| 112 | + } | ||
| 113 | + | ||
| 98 | if(this.defaultModel.screenType != '2'){ | 114 | if(this.defaultModel.screenType != '2'){ |
| 99 | //底部logo样式 按钮加载在背景展示图上 | 115 | //底部logo样式 按钮加载在背景展示图上 |
| 100 | Button(){ | 116 | Button(){ |
-
Please register or login to post a comment