developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
liyubing
dd4e7d86 2 parents a130f613 6bcf54bf

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 13 changed files with 135 additions and 98 deletions
@@ -321,6 +321,10 @@ @@ -321,6 +321,10 @@
321 "value": "15vp" 321 "value": "15vp"
322 }, 322 },
323 { 323 {
  324 + "name": "vp_15_7",
  325 + "value": "15.7vp"
  326 + },
  327 + {
324 "name": "vp_18", 328 "name": "vp_18",
325 "value": "18vp" 329 "value": "18vp"
326 }, 330 },
@@ -14,37 +14,37 @@ export interface ShareInfoDTO { @@ -14,37 +14,37 @@ export interface ShareInfoDTO {
14 //分享链接 14 //分享链接
15 shareUrl: string; 15 shareUrl: string;
16 //首发时间 16 //首发时间
17 - publishTime:string; 17 + appCustomPublishTime:string;
18 //图片 18 //图片
19 - imageUrl:string; 19 + appCustomImageUrl:string;
20 //直播和内容的举报，仅针对人民号发布的才能举报，cms创建的没有举报按钮 20 //直播和内容的举报，仅针对人民号发布的才能举报，cms创建的没有举报按钮
21 - showReport:boolean; 21 + appCustomShowReport:boolean;
22 //点赞按钮显示 -1：不展示 0：未点赞 1：已点赞 22 //点赞按钮显示 -1：不展示 0：未点赞 1：已点赞
23 - showLike:number; 23 + appCustomShowLike:number;
24 //0 分享海报关闭，1 分享海报开启 24 //0 分享海报关闭，1 分享海报开启
25 - posterShareControl:string; 25 + appCustomPosterShareControl:string;
26 //是否展示海报 -1-不展示图标 26 //是否展示海报 -1-不展示图标
27 - showPoster:number; 27 + appCustomShowPoster:number;
28 //海报展示类型 1：专题、文章、图文、视频、直播 2：人民号 3：评论 4:电子报海报 5:音频专题海报 6:早晚报专题海报 7:榜单H5 8:H5普通文章专题，包含时间链 28 //海报展示类型 1：专题、文章、图文、视频、直播 2：人民号 3：评论 4:电子报海报 5:音频专题海报 6:早晚报专题海报 7:榜单H5 8:H5普通文章专题，包含时间链
29 - showPosterType:number; 29 + appCustomShowPosterType:number;
30 //接口返回： 内容id、内容类型 30 //接口返回： 内容id、内容类型
31 - contentId:string; 31 + appCustomContentId:string;
32 //内容类型，分享的类型 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,14动态图文,15动态视频 32 //内容类型，分享的类型 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,14动态图文,15动态视频
33 - contentType:string; 33 + appCustomContentType:string;
34 //关系id 34 //关系id
35 - targetRelId:string; 35 + appCustomTargetRelId:string;
36 //关系类型，1.频道关系；2.专题关系 36 //关系类型，1.频道关系；2.专题关系
37 - targetRelType:string; 37 + appCustomTargetRelType:string;
38 //21:文章专题,22:音频专题,23:直播专题,24:话题专题,25:早晚报专题 38 //21:文章专题,22:音频专题,23:直播专题,24:话题专题,25:早晚报专题
39 - topicType:string; 39 + appCustomTopicType:string;
40 //早晚报；1-早报；2-午报；3-晚报 40 //早晚报；1-早报；2-午报；3-晚报
41 - topicPattern:number; 41 + appCustomTopicPattern:number;
42 //是否有头版 42 //是否有头版
43 - isFrontDaily:boolean; 43 + appCustomIsFrontDaily:boolean;
44 //分享海报简介 44 //分享海报简介
45 - posterSummary:string;  
46 - sharePosterItemList: SharePosterItemBean[] 45 + appCustomPosterSummary:string;
  46 + appCustomSharePosterItemList: SharePosterItemBean[]
47 //分享海报标题 47 //分享海报标题
48 - posterTitle:string; 48 + appCustomPosterTitle:string;
49 49
50 } 50 }
@@ -444,17 +444,17 @@ export struct ENewspaperPageComponent { @@ -444,17 +444,17 @@ export struct ENewspaperPageComponent {
444 let contentDetailData: ContentDetailDTO = { 444 let contentDetailData: ContentDetailDTO = {
445 shareInfo:{ 445 shareInfo:{
446 shareTitle:this.newspaperListBean?.list[this.swiperIndex].pageName, 446 shareTitle:this.newspaperListBean?.list[this.swiperIndex].pageName,
447 - publishTime:this.newspaperListBean?.list[this.swiperIndex].periodNum,  
448 - imageUrl:this.newspaperListBean?.list[this.swiperIndex].pagePic, 447 + appCustomPublishTime:this.newspaperListBean?.list[this.swiperIndex].periodNum,
  448 + appCustomImageUrl:this.newspaperListBean?.list[this.swiperIndex].pagePic,
449 shareUrl:this.newspaperListBean?.list[this.swiperIndex].sharePagePic.shareUrl, 449 shareUrl:this.newspaperListBean?.list[this.swiperIndex].sharePagePic.shareUrl,
450 sharePosterCoverUrl:this.newspaperListBean?.list[this.swiperIndex].sharePagePic.sharePosterCoverUrl, 450 sharePosterCoverUrl:this.newspaperListBean?.list[this.swiperIndex].sharePagePic.sharePosterCoverUrl,
451 - showReport:false,  
452 - showLike:-1, 451 + appCustomShowReport:false,
  452 + appCustomShowLike:-1,
453 shareOpen:1, 453 shareOpen:1,
454 sharePosterOpen:1, 454 sharePosterOpen:1,
455 - posterShareControl:'-1',  
456 - showPoster:-1,  
457 - showPosterType:4, 455 + appCustomPosterShareControl:'-1',
  456 + appCustomShowPoster:-1,
  457 + appCustomShowPosterType:4,
458 } 458 }
459 } as ContentDetailDTO 459 } as ContentDetailDTO
460 WDShare.shareContent(contentDetailData,TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage) 460 WDShare.shareContent(contentDetailData,TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage)
@@ -26,6 +26,7 @@ import { common } from '@kit.AbilityKit'; @@ -26,6 +26,7 @@ import { common } from '@kit.AbilityKit';
26 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils' 26 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
27 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index' 27 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
28 import { ColorUtils } from '../../utils/ColorUtils'; 28 import { ColorUtils } from '../../utils/ColorUtils';
  29 +import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent';
29 30
30 const TAG = 'MorningEveningPaperComponent'; 31 const TAG = 'MorningEveningPaperComponent';
31 32
@@ -37,6 +38,7 @@ export struct MorningEveningPaperComponent { @@ -37,6 +38,7 @@ export struct MorningEveningPaperComponent {
37 @State compListItem: CompList = {} as CompList 38 @State compListItem: CompList = {} as CompList
38 @Provide commentList: InteractDataDTO[] = [] 39 @Provide commentList: InteractDataDTO[] = []
39 @State audioPlayUrl: string = "" 40 @State audioPlayUrl: string = ""
  41 + @State isNoListContent:boolean = false;
40 // @Consume dailyPaperTopicPageId: number 42 // @Consume dailyPaperTopicPageId: number
41 // @Provide compListItem: CompList = {} as CompList 43 // @Provide compListItem: CompList = {} as CompList
42 // @State morningEveningPaperDTO: MorningEveningPaperDTO = { 44 // @State morningEveningPaperDTO: MorningEveningPaperDTO = {
@@ -172,6 +174,7 @@ export struct MorningEveningPaperComponent { @@ -172,6 +174,7 @@ export struct MorningEveningPaperComponent {
172 this.totalTime = DateFormatUtil.secondToTime(duration); 174 this.totalTime = DateFormatUtil.secondToTime(duration);
173 this.progressVal = Math.floor(position * 100 / duration); 175 this.progressVal = Math.floor(position * 100 / duration);
174 } 176 }
  177 + this.isNoListContent = this.compListItem && this.compListItem?.operDataList?.length > 0 ?false:true
175 } catch (exception) { 178 } catch (exception) {
176 179
177 } 180 }
@@ -264,12 +267,16 @@ export struct MorningEveningPaperComponent { @@ -264,12 +267,16 @@ export struct MorningEveningPaperComponent {
264 } 267 }
265 268
266 ListItem() { 269 ListItem() {
267 - SingleColumn999Component({  
268 - compListItem: this.compListItem,  
269 - })  
270 - .margin({  
271 - top: this.isHasTopView ? 10 : 44+this.topSafeHeight 270 + if(this.isNoListContent){
  271 + EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
  272 + }else {
  273 + SingleColumn999Component({
  274 + compListItem: this.compListItem,
272 }) 275 })
  276 + .margin({
  277 + top: this.isHasTopView ? 10 : 44+this.topSafeHeight
  278 + })
  279 + }
273 } 280 }
274 } 281 }
275 // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`) 282 // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
@@ -157,20 +157,20 @@ export struct PaperTitleComponent { @@ -157,20 +157,20 @@ export struct PaperTitleComponent {
157 let contentDetailData: ContentDetailDTO = { 157 let contentDetailData: ContentDetailDTO = {
158 newsId:Number.parseInt(this.topicInfo.topicId), 158 newsId:Number.parseInt(this.topicInfo.topicId),
159 shareInfo:{ 159 shareInfo:{
160 - contentId:this.topicInfo.topicId,  
161 - contentType:this.topicInfo.topicType+'', 160 + appCustomContentId:this.topicInfo.topicId,
  161 + appCustomContentType:this.topicInfo.topicType+'',
162 shareTitle:this.topicInfo.shareTitle, 162 shareTitle:this.topicInfo.shareTitle,
163 shareSummary:this.topicInfo.shareSummary, 163 shareSummary:this.topicInfo.shareSummary,
164 - imageUrl:this.topicInfo.shareCoverUrl, 164 + appCustomImageUrl:this.topicInfo.shareCoverUrl,
165 sharePosterCoverUrl:this.topicInfo.sharePosterCoverUrl, 165 sharePosterCoverUrl:this.topicInfo.sharePosterCoverUrl,
166 shareUrl:this.topicInfo.shareUrl, 166 shareUrl:this.topicInfo.shareUrl,
167 - targetRelId:this.topicInfo.relId,  
168 - targetRelType:this.topicInfo.relType,  
169 - showReport:false,  
170 - showLike:-1, 167 + appCustomTargetRelId:this.topicInfo.relId,
  168 + appCustomTargetRelType:this.topicInfo.relType,
  169 + appCustomShowReport:false,
  170 + appCustomShowLike:-1,
171 shareOpen:1, 171 shareOpen:1,
172 sharePosterOpen:this.topicInfo.posterFlag, 172 sharePosterOpen:this.topicInfo.posterFlag,
173 - showPoster:this.topicInfo.posterFlag>0?1:-1, 173 + appCustomShowPoster:this.topicInfo.posterFlag>0?1:-1,
174 } 174 }
175 } as ContentDetailDTO 175 } as ContentDetailDTO
176 WDShare.setTopicBeanToShareBean(contentDetailData.shareInfo,this.topicInfo) 176 WDShare.setTopicBeanToShareBean(contentDetailData.shareInfo,this.topicInfo)
@@ -152,7 +152,7 @@ export struct SingleColumn999Component { @@ -152,7 +152,7 @@ export struct SingleColumn999Component {
152 scrollBackward: NestedScrollMode.SELF_FIRST 152 scrollBackward: NestedScrollMode.SELF_FIRST
153 }) 153 })
154 } else { 154 } else {
155 - EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent}) 155 + // EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoListContent})
156 } 156 }
157 } 157 }
158 158
@@ -55,6 +55,7 @@ export struct ZhSingleRow02 { @@ -55,6 +55,7 @@ export struct ZhSingleRow02 {
55 if (this.moreWidth > this.initMoreWidth) { 55 if (this.moreWidth > this.initMoreWidth) {
56 this.moreWidth = 16 56 this.moreWidth = 16
57 } 57 }
  58 + this.resetMoreTips()
58 } 59 }
59 60
60 toMore() { 61 toMore() {
@@ -26,7 +26,7 @@ export struct PeopleShipRecommendComponent { @@ -26,7 +26,7 @@ export struct PeopleShipRecommendComponent {
26 .height('30vp') 26 .height('30vp')
27 .fontColor($r('app.color.color_222222')) 27 .fontColor($r('app.color.color_222222'))
28 .fontWeight(600) 28 .fontWeight(600)
29 - .fontSize($r('app.float.vp_18')) 29 + .fontSize($r('app.float.vp_15_7'))
30 30
31 Blank() 31 Blank()
32 Button({ type: ButtonType.Normal, stateEffect: false }) { 32 Button({ type: ButtonType.Normal, stateEffect: false }) {
@@ -35,7 +35,7 @@ export struct PeopleShipRecommendComponent { @@ -35,7 +35,7 @@ export struct PeopleShipRecommendComponent {
35 .height('30vp') 35 .height('30vp')
36 .fontColor($r('app.color.color_999999')) 36 .fontColor($r('app.color.color_999999'))
37 .fontWeight(400) 37 .fontWeight(400)
38 - .fontSize($r('app.float.vp_14')) 38 + .fontSize($r('app.float.vp_13'))
39 Image($r('app.media.ic_refresh')) 39 Image($r('app.media.ic_refresh'))
40 .width('14vp') 40 .width('14vp')
41 .height('14vp') 41 .height('14vp')
@@ -56,7 +56,7 @@ export struct PeopleShipRecommendComponent { @@ -56,7 +56,7 @@ export struct PeopleShipRecommendComponent {
56 .width('100%') 56 .width('100%')
57 .alignSelf(ItemAlign.Start) 57 .alignSelf(ItemAlign.Start)
58 .margin({ 58 .margin({
59 - top: '10vp', 59 + top: '-50vp',
60 bottom: '10vp' 60 bottom: '10vp'
61 }) 61 })
62 62
@@ -75,7 +75,7 @@ export struct PeopleShipRecommendComponent { @@ -75,7 +75,7 @@ export struct PeopleShipRecommendComponent {
75 .columnsTemplate('1fr 1fr 1fr') 75 .columnsTemplate('1fr 1fr 1fr')
76 .columnsGap(20) 76 .columnsGap(20)
77 .rowsGap(16) 77 .rowsGap(16)
78 - .height(Math.ceil(this.rmhList.length / 3.0) * 132) 78 + .height(Math.ceil(this.rmhList.length / 3.0) * 126)
79 .backgroundColor(Color.Transparent) 79 .backgroundColor(Color.Transparent)
80 .margin({ 80 .margin({
81 right: '20vp', 81 right: '20vp',
@@ -94,7 +94,7 @@ export struct PeopleShipRecommendComponent { @@ -94,7 +94,7 @@ export struct PeopleShipRecommendComponent {
94 .borderRadius('3vp') 94 .borderRadius('3vp')
95 .fontColor($r('app.color.color_999999')) 95 .fontColor($r('app.color.color_999999'))
96 .fontWeight(500) 96 .fontWeight(500)
97 - .fontSize($r('app.float.vp_14')) 97 + .fontSize($r('app.float.vp_13'))
98 .fontColor(Color.White) 98 .fontColor(Color.White)
99 .onClick(() => { 99 .onClick(() => {
100 // 点击一键关注 100 // 点击一键关注
@@ -11,8 +11,8 @@ export struct PeopleShipRecommendHeadComponent { @@ -11,8 +11,8 @@ export struct PeopleShipRecommendHeadComponent {
11 Column(){ 11 Column(){
12 Stack({ alignContent: Alignment.BottomEnd }) { 12 Stack({ alignContent: Alignment.BottomEnd }) {
13 Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon')) 13 Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'))
14 - .width('44vp')  
15 - .height('44vp') 14 + .width('40vp')
  15 + .height('40vp')
16 .borderRadius('22vp') 16 .borderRadius('22vp')
17 .objectFit(ImageFit.Cover) 17 .objectFit(ImageFit.Cover)
18 18
@@ -23,12 +23,12 @@ export struct PeopleShipRecommendHeadComponent { @@ -23,12 +23,12 @@ export struct PeopleShipRecommendHeadComponent {
23 .margin({ 23 .margin({
24 right: '-3vp' 24 right: '-3vp'
25 }) 25 })
26 - }.margin({ top: 12, bottom: 8 }) 26 + }.margin({ top: 4, bottom: 8 })
27 27
28 Row() { 28 Row() {
29 Text(this.rmhInfo.userName) 29 Text(this.rmhInfo.userName)
30 .fontColor($r('app.color.color_222222')) 30 .fontColor($r('app.color.color_222222'))
31 - .fontSize($r('app.float.vp_14')) 31 + .fontSize($r('app.float.vp_13'))
32 .fontWeight(600) 32 .fontWeight(600)
33 .maxLines(1) 33 .maxLines(1)
34 .textOverflow({overflow: TextOverflow.Ellipsis}) 34 .textOverflow({overflow: TextOverflow.Ellipsis})
@@ -49,14 +49,14 @@ export struct PeopleShipRecommendHeadComponent { @@ -49,14 +49,14 @@ export struct PeopleShipRecommendHeadComponent {
49 49
50 Text(this.rmhInfo.introduction) 50 Text(this.rmhInfo.introduction)
51 .fontColor($r('app.color.color_B0B0B0')) 51 .fontColor($r('app.color.color_B0B0B0'))
52 - .fontSize($r('app.float.vp_12'))  
53 - .margin({ top: 8, bottom: 14 }) 52 + .fontSize($r('app.float.vp_11'))
  53 + .margin({ top: 6, bottom: 14 })
54 .textOverflow({overflow: TextOverflow.Ellipsis}) 54 .textOverflow({overflow: TextOverflow.Ellipsis})
55 .maxLines(2) 55 .maxLines(2)
56 .height(34) 56 .height(34)
57 } 57 }
58 .width('100%') 58 .width('100%')
59 - .height('116vp') 59 + .height('110vp')
60 60
61 } 61 }
62 62
@@ -53,14 +53,23 @@ export struct LiveHorizontalCardComponent { @@ -53,14 +53,23 @@ export struct LiveHorizontalCardComponent {
53 53
54 resetEdgeAnimation() { 54 resetEdgeAnimation() {
55 if (this.moreWidth > this.initMoreWidth) { 55 if (this.moreWidth > this.initMoreWidth) {
56 - this.moreWidth = this.moreWidth - 1  
57 - this.resetEdgeAnimation(); 56 + this.moreWidth = 16
58 } 57 }
59 this.resetMoreTips() 58 this.resetMoreTips()
60 } 59 }
61 60
62 toMore() { 61 toMore() {
63 if (this.moreWidth > this.initMoreWidth * 2) { 62 if (this.moreWidth > this.initMoreWidth * 2) {
  63 + this.liveToMore();
  64 + }
  65 + }
  66 +
  67 + liveToMore() {
  68 + if (!!this.compDTO.dataSourceType) {
  69 + if (this.compDTO.dataSourceType === 'OBJECT_POS') {
  70 + ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
  71 + return;
  72 + }
64 if (this.compDTO.linkUrl) { 73 if (this.compDTO.linkUrl) {
65 let taskAction: Action = { 74 let taskAction: Action = {
66 type: 'JUMP_H5_BY_WEB_VIEW', 75 type: 'JUMP_H5_BY_WEB_VIEW',
@@ -72,8 +81,19 @@ export struct LiveHorizontalCardComponent { @@ -72,8 +81,19 @@ export struct LiveHorizontalCardComponent {
72 } else { 81 } else {
73 this.jumpToLiveMorePage() 82 this.jumpToLiveMorePage()
74 } 83 }
  84 + } else {
  85 + if (this.compDTO?.objectType === '11') {
  86 + } else {
  87 + const contentDTO: ContentDTO = {
  88 + objectId: this.compDTO.objectId,
  89 + objectType: this.compDTO.objectType,
  90 + linkUrl: this.compDTO.linkUrl,
  91 + pageId: this.compDTO.pageId
  92 + } as ContentDTO
  93 + ProcessUtils.processPage(contentDTO)
  94 + }
75 } 95 }
76 - } 96 +}
77 97
78 async aboutToAppear(): Promise<void> { 98 async aboutToAppear(): Promise<void> {
79 this.loadImg = await onlyWifiLoadImg(); 99 this.loadImg = await onlyWifiLoadImg();
@@ -105,17 +125,7 @@ export struct LiveHorizontalCardComponent { @@ -105,17 +125,7 @@ export struct LiveHorizontalCardComponent {
105 .height(14) 125 .height(14)
106 } 126 }
107 .onClick(() => { 127 .onClick(() => {
108 - if (this.compDTO.linkUrl) {  
109 - let taskAction: Action = {  
110 - type: 'JUMP_H5_BY_WEB_VIEW',  
111 - params: {  
112 - url: this.compDTO.linkUrl  
113 - } as Params,  
114 - };  
115 - WDRouterRule.jumpWithAction(taskAction)  
116 - } else {  
117 - this.jumpToLiveMorePage()  
118 - } 128 + this.liveToMore();
119 }) 129 })
120 } 130 }
121 }.justifyContent(FlexAlign.SpaceBetween) 131 }.justifyContent(FlexAlign.SpaceBetween)
@@ -165,21 +175,30 @@ export struct LiveHorizontalCardComponent { @@ -165,21 +175,30 @@ export struct LiveHorizontalCardComponent {
165 }) 175 })
166 }) 176 })
167 } 177 }
168 - if (this.compDTO.operDataList.length >= 2) {  
169 - Column() {  
170 - if (this.moreWidth > this.initMoreWidth + 2) {  
171 - Text(this.moreTips)  
172 - .fontSize(8)  
173 - .fontColor(0x858585)  
174 - .width(8) 178 + if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
  179 + Row() {
  180 + Ellipse()
  181 + .width(2* (this.moreWidth - this.initMoreWidth - 1))
  182 + .height('100%')
  183 + .fill(0xe9e9e9)
  184 + .position({ left: -(this.moreWidth - this.initMoreWidth - 3) * 0.8 , top: 0 })
  185 +
  186 + Column() {
  187 + if (this.moreWidth > this.initMoreWidth + 2) {
  188 + Text(this.moreTips)
  189 + .fontSize(8)
  190 + .fontColor(0x858585)
  191 + .width(8)
  192 + }
175 } 193 }
  194 + .justifyContent(FlexAlign.Center)
  195 + .align(Alignment.Center)
  196 + .height('100%')
  197 + .width(this.initMoreWidth)
  198 + .backgroundColor(0xe9e9e9)
  199 + .borderRadius({ topLeft: 5, bottomLeft: 5 })
176 } 200 }
177 - .justifyContent(FlexAlign.Center)  
178 - .align(Alignment.Center)  
179 - .width(this.moreWidth)  
180 - .backgroundColor(0xf1f3f4)  
181 - .borderRadius({ topLeft: 5, bottomLeft: 5 })  
182 - .height(this.compDTO.operDataList.length == 2 ? 180 : 146) 201 + .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)})
183 } 202 }
184 } 203 }
185 } 204 }
@@ -321,6 +321,10 @@ @@ -321,6 +321,10 @@
321 "value": "15vp" 321 "value": "15vp"
322 }, 322 },
323 { 323 {
  324 + "name": "vp_15_7",
  325 + "value": "15.7vp"
  326 + },
  327 + {
324 "name": "vp_18", 328 "name": "vp_18",
325 "value": "18vp" 329 "value": "18vp"
326 }, 330 },
@@ -32,21 +32,21 @@ export class WDShare { @@ -32,21 +32,21 @@ export class WDShare {
32 32
33 //专题分享数据转换 33 //专题分享数据转换
34 static setTopicBeanToShareBean(shareBean: ShareInfoDTO, topicInfoBean: TopicInfo){ 34 static setTopicBeanToShareBean(shareBean: ShareInfoDTO, topicInfoBean: TopicInfo){
35 - shareBean.topicType = topicInfoBean.topicType+'' 35 + shareBean.appCustomTopicType = topicInfoBean.topicType+''
36 //21:文章专题,22:音频专题,23:直播专题,24:话题专题,25:早晚报专题,26:时间链 36 //21:文章专题,22:音频专题,23:直播专题,24:话题专题,25:早晚报专题,26:时间链
37 if(25 == topicInfoBean.topicType){ 37 if(25 == topicInfoBean.topicType){
38 - shareBean.showPosterType = 6  
39 - shareBean.topicPattern = topicInfoBean.topicPattern  
40 - shareBean.publishTime = topicInfoBean.topicDate 38 + shareBean.appCustomShowPosterType = 6
  39 + shareBean.appCustomTopicPattern = topicInfoBean.topicPattern
  40 + shareBean.appCustomPublishTime = topicInfoBean.topicDate
41 if(topicInfoBean.frontLinkObject == null){ 41 if(topicInfoBean.frontLinkObject == null){
42 - shareBean.isFrontDaily = false 42 + shareBean.appCustomIsFrontDaily = false
43 if(topicInfoBean.shareContentList != null && topicInfoBean.shareContentList.length>0){ 43 if(topicInfoBean.shareContentList != null && topicInfoBean.shareContentList.length>0){
44 - shareBean.sharePosterItemList = [] as SharePosterItemBean[]  
45 - shareBean.sharePosterItemList.length = topicInfoBean.shareContentList.length 44 + shareBean.appCustomSharePosterItemList = [] as SharePosterItemBean[]
  45 + shareBean.appCustomSharePosterItemList.length = topicInfoBean.shareContentList.length
46 for (let index = 0; index < topicInfoBean.shareContentList.length; index++) { 46 for (let index = 0; index < topicInfoBean.shareContentList.length; index++) {
47 let element = topicInfoBean.shareContentList[index] 47 let element = topicInfoBean.shareContentList[index]
48 if(element != null){ 48 if(element != null){
49 - shareBean.sharePosterItemList[index] = { 49 + shareBean.appCustomSharePosterItemList[index] = {
50 title:topicInfoBean.shareContentList[index].newsTitle, 50 title:topicInfoBean.shareContentList[index].newsTitle,
51 imageUrl:topicInfoBean.shareContentList[index].coverUrl, 51 imageUrl:topicInfoBean.shareContentList[index].coverUrl,
52 } as SharePosterItemBean 52 } as SharePosterItemBean
@@ -54,25 +54,25 @@ export class WDShare { @@ -54,25 +54,25 @@ export class WDShare {
54 } 54 }
55 } 55 }
56 }else{ 56 }else{
57 - shareBean.isFrontDaily = true 57 + shareBean.appCustomIsFrontDaily = true
58 shareBean.sharePosterCoverUrl = topicInfoBean.frontLinkObject.coverUrl 58 shareBean.sharePosterCoverUrl = topicInfoBean.frontLinkObject.coverUrl
59 - shareBean.posterSummary = topicInfoBean.frontLinkObject.summary 59 + shareBean.appCustomPosterSummary = topicInfoBean.frontLinkObject.summary
60 } 60 }
61 }else{ 61 }else{
62 //文章/直播/话题专题(H5普通文章专题，包含时间链) 62 //文章/直播/话题专题(H5普通文章专题，包含时间链)
63 - shareBean.showPosterType = 8 63 + shareBean.appCustomShowPosterType = 8
64 //海报的头图 64 //海报的头图
65 shareBean.sharePosterCoverUrl = topicInfoBean.backgroundImgUrl 65 shareBean.sharePosterCoverUrl = topicInfoBean.backgroundImgUrl
66 - shareBean.isFrontDaily = false  
67 - shareBean.posterTitle = topicInfoBean.title  
68 - shareBean.posterSummary = topicInfoBean.summary 66 + shareBean.appCustomIsFrontDaily = false
  67 + shareBean.appCustomPosterTitle = topicInfoBean.title
  68 + shareBean.appCustomPosterSummary = topicInfoBean.summary
69 if(topicInfoBean.shareContentList != null && topicInfoBean.shareContentList.length>0){ 69 if(topicInfoBean.shareContentList != null && topicInfoBean.shareContentList.length>0){
70 - shareBean.sharePosterItemList = [] as SharePosterItemBean[]  
71 - shareBean.sharePosterItemList.length = topicInfoBean.shareContentList.length 70 + shareBean.appCustomSharePosterItemList = [] as SharePosterItemBean[]
  71 + shareBean.appCustomSharePosterItemList.length = topicInfoBean.shareContentList.length
72 for (let index = 0; index < topicInfoBean.shareContentList.length; index++) { 72 for (let index = 0; index < topicInfoBean.shareContentList.length; index++) {
73 let element = topicInfoBean.shareContentList[index] 73 let element = topicInfoBean.shareContentList[index]
74 if(element != null){ 74 if(element != null){
75 - shareBean.sharePosterItemList[index] = { 75 + shareBean.appCustomSharePosterItemList[index] = {
76 title:topicInfoBean.shareContentList[index].newsTitle, 76 title:topicInfoBean.shareContentList[index].newsTitle,
77 imageUrl:topicInfoBean.shareContentList[index].coverUrl, 77 imageUrl:topicInfoBean.shareContentList[index].coverUrl,
78 timeNode:topicInfoBean.shareContentList[index].publishTime, 78 timeNode:topicInfoBean.shareContentList[index].publishTime,
@@ -138,10 +138,12 @@ struct LaunchAdvertisingPage { @@ -138,10 +138,12 @@ struct LaunchAdvertisingPage {
138 }) 138 })
139 } 139 }
140 if(this.defaultModel.screenType === '1') { 140 if(this.defaultModel.screenType === '1') {
141 - Image($r('app.media.LaunchPage_logo'))  
142 - .width('278lpx')  
143 - .height('154lpx')  
144 - .margin({top: '28lpx',bottom:'28lpx'}) 141 + Column(){
  142 + Image($r('app.media.LaunchPage_logo'))
  143 + .width('278lpx')
  144 + .height('154lpx')
  145 + .margin({top:20})
  146 + }.width('100%').height('16%').backgroundColor(Color.White).expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
145 } 147 }
146 } 148 }
147 .width('100%') 149 .width('100%')