developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yangchenggong1_wd
955304a7 1 parent c4537174

fix |> 20302 uat>导航换肤，新闻频道列表页，内容区背景未展示换肤图片(顶部圆角显示)

Inline Side-by-side
Showing 44 changed files with 291 additions and 55 deletions
... ... @@ -64,7 +64,10 @@ export struct CardParser {
// Text(JSON.stringify(this.contentDTO.appStyle))
// Text(this.contentDTO.newsTitle)
this.contentBuilder(this.contentDTO);
}
}.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
@Builder
... ... @@ -86,7 +89,8 @@ export struct CardParser {
contentDTO,
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName
pageName: this.pageName,
compIndex:this.compIndex
})
this.getBehindDivider()
} else {
... ... @@ -96,7 +100,8 @@ export struct CardParser {
contentDTO,
pageId: this.pageId,
pageName: this.pageName,
loadImg: this.loadImg
loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_03) {
... ... @@ -104,7 +109,8 @@ export struct CardParser {
compDTO: this.compDTO,
contentDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_04) {
... ... @@ -112,7 +118,8 @@ export struct CardParser {
compDTO: this.compDTO,
contentDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_05) {
... ... @@ -121,7 +128,8 @@ export struct CardParser {
contentDTO,
titleShowPolicy: this.compDTO.titleShowPolicy,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle.Card_13) {
... ... @@ -129,7 +137,8 @@ export struct CardParser {
compDTO: this.compDTO,
contentDTO: this.contentDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_10 || contentDTO.appStyle === CompStyle.Card_09) {
... ... @@ -137,7 +146,8 @@ export struct CardParser {
compDTO: this.compDTO,
contentDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_11) {
... ... @@ -145,7 +155,8 @@ export struct CardParser {
compDTO: this.compDTO,
contentDTO,
pageId: this.pageId,
pageName: this.pageName
pageName: this.pageName,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_12) {
... ... @@ -153,7 +164,8 @@ export struct CardParser {
compDTO: this.compDTO,
contentDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
... ... @@ -162,7 +174,8 @@ export struct CardParser {
contentDTO,
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_15) {
... ... @@ -170,7 +183,8 @@ export struct CardParser {
contentDTO,
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_16) {
... ... @@ -178,7 +192,8 @@ export struct CardParser {
contentDTO,
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_17) {
... ... @@ -186,7 +201,8 @@ export struct CardParser {
compDTO: this.compDTO,
contentDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_19) {
... ... @@ -195,7 +211,8 @@ export struct CardParser {
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName,
isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg
isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_20) {
... ... @@ -204,7 +221,8 @@ export struct CardParser {
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName,
isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg
isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_21) {
... ... @@ -212,7 +230,8 @@ export struct CardParser {
contentDTO,
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.loadImg
pageName: this.pageName, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_01) {
... ... @@ -221,7 +240,8 @@ export struct CardParser {
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName,
index: this.compIndex, loadImg: this.loadImg
index: this.compIndex, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_02) {
... ... @@ -230,7 +250,8 @@ export struct CardParser {
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName,
index:this.compIndex, loadImg: this.loadImg
index:this.compIndex, loadImg: this.loadImg,
compIndex:this.compIndex
})
this.getBehindDivider()
} else {
... ...
... ... @@ -74,13 +74,22 @@ export struct CompParser {
Column() {
// Text('CompParser')
// Text(JSON.stringify(this.compDTO.compStyle))
this.componentBuilder();
}
.margin({
Column(){
this.componentBuilder();
}.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius') : 0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius') : 0
})
/*.margin({
left: this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 ? 0 : 6,
right: (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05 || this.compDTO.compStyle === CompStyle.Zh_Single_Row_02 ||
this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) ? 0 : 6
})
})*/
}
// @Builder
... ... @@ -115,17 +124,17 @@ export struct CompParser {
if (this.compDTO.operDataList[0]?.objectType !== '3' &&
this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
if (this.compDTO.compStyle === CompStyle.Label_03) {
LabelComponent({ compDTO: this.compDTO })
LabelComponent({ compDTO: this.compDTO ,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
if (this.compDTO.operDataList.length > this.audioItems.length) {
ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
}
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
// Text('LiveHorizontalCardComponent')
LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
if (this.compDTO.operDataList.length > 1) {
... ... @@ -133,26 +142,26 @@ export struct CompParser {
HorizontalStrokeCardThreeTwoRadioForMoreComponent({
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.pageModel.loadImg
pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
} else {
// Text('HorizontalStrokeCardThreeTwoRadioForOneComponent')
HorizontalStrokeCardThreeTwoRadioForOneComponent({
compDTO: this.compDTO,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.pageModel.loadImg
pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
}
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
//ZhGridLayout02({ compDTO: this.compDTO })
CompNormalTitle({ compDTO: this.compDTO })
CompNormalTitle({ compDTO: this.compDTO ,compIndex: this.compIndex})
// this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
... ... @@ -160,20 +169,20 @@ export struct CompParser {
compDTO: this.compDTO,
operDataList: this.compDTO.operDataList,
pageId: this.pageId,
pageName: this.pageName, loadImg: this.pageModel.loadImg
pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
// this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,bottomNavi:this.bottomNavi})
ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,bottomNavi:this.bottomNavi,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
// ZhSingleRow05({ compDTO })
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
//头图卡 和comStyle 2相同，
... ... @@ -183,7 +192,7 @@ export struct CompParser {
titleShowPolicy: this.compDTO.titleShowPolicy,
pageId: this.pageId,
pageName: this.pageName,
loadImg: this.pageModel.loadImg
loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
... ... @@ -193,7 +202,7 @@ export struct CompParser {
contentDTO: this.compDTO.operDataList[0],
pageId: this.pageId,
pageName: this.pageName,
loadImg: this.pageModel.loadImg
loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Card_09) {
... ... @@ -202,7 +211,7 @@ export struct CompParser {
compDTO: this.compDTO,
contentDTO: this.compDTO.operDataList[0],
pageId: this.pageId,
pageName: this.pageName, loadImg: this.pageModel.loadImg
pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Card_13) {
... ... @@ -210,7 +219,7 @@ export struct CompParser {
compDTO: this.compDTO,
contentDTO: this.compDTO.operDataList[0],
pageId: this.pageId,
pageName: this.pageName, loadImg: this.pageModel.loadImg
pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Card_03) {
... ... @@ -218,11 +227,11 @@ export struct CompParser {
compDTO: this.compDTO,
contentDTO: this.compDTO.operDataList[0],
pageId: this.pageId,
pageName: this.pageName, loadImg: this.pageModel.loadImg
pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName ,compIndex: this.compIndex})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
// ZhSingleColumn05({ compDTO: compDTO })
... ... @@ -230,7 +239,7 @@ export struct CompParser {
ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, pageModel: this.pageModel, compIndex: this.compIndex, loadImg: this.pageModel.loadImg })
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO ,compIndex: this.compIndex})
this.getBehindDivider()
//Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
} else if (!Number.isNaN(Number(this.compDTO.compStyle)) || this.compDTO.compType === 'appStyle') {
... ...
... ... @@ -21,7 +21,7 @@ import PageModel from '../../viewmodel/PageModel';
export struct AdvCardParser {
@State compDTO: CompDTO = {} as CompDTO;
pageModel: PageModel = new PageModel();
@State compIndex: number = 0;
build() {
... ... @@ -31,20 +31,20 @@ export struct AdvCardParser {
@Builder
contentBuilder(pageModel: PageModel, compDTO: CompDTO) {
if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_5) { //三图广告
CardAdvThreeImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
CardAdvThreeImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
} else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告
CardAdvSmallImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
CardAdvSmallImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
} else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_7 ||
compDTO.matInfo.advSubType === CompStyle.Card_Adv_12) { // 长通栏广告 和 顶部长通栏广告
CardAdvLongImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
CardAdvLongImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
} else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告
CardAdvBigImageComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg})
CardAdvBigImageComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg,compIndex:this.compIndex})
} else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告
CardAdvVideoComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
CardAdvVideoComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
} else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告
CardAdvVideoExComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg})
CardAdvVideoExComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg,compIndex:this.compIndex})
} else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告
CardAdvGanMiComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg})
CardAdvGanMiComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg,compIndex:this.compIndex})
}
}
}
\ No newline at end of file
... ...
... ... @@ -18,6 +18,7 @@ const TAG: string = 'Card2Component';
@Component
export struct CardAdvBigImageComponent {
@State compDTO: CompDTO = {} as CompDTO
@State compIndex: number = 0;
@Prop loadImg: boolean = true;
pageModel: PageModel = new PageModel();
... ... @@ -53,6 +54,10 @@ export struct CardAdvBigImageComponent {
top: 8,
})
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
left: 10,
... ...
... ... @@ -26,6 +26,8 @@ export struct CardAdvGanMiComponent {
@State advLength: number = 0;
pageModel: PageModel = new PageModel();
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
// this.loadImg = await onlyWifiLoadImg();
... ... @@ -134,6 +136,10 @@ export struct CardAdvGanMiComponent {
this.commonButton()
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
top: $r('app.float.card_comp_pagePadding_tb'),
... ...
... ... @@ -22,6 +22,7 @@ export struct CardAdvLongImageComponent {
@State haveTitle: boolean = true
pageModel: PageModel = new PageModel();
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
// this.loadImg = await onlyWifiLoadImg();
... ... @@ -55,6 +56,10 @@ export struct CardAdvLongImageComponent {
top: 8,
})
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
left: 10,
... ...
... ... @@ -24,6 +24,7 @@ export struct CardAdvSmallImageComponent {
@State isBigThreeLine: boolean = false // 标题的行数大于等于3行 是true
pageModel: PageModel = new PageModel();
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
// this.loadImg = await onlyWifiLoadImg();
... ... @@ -85,6 +86,10 @@ export struct CardAdvSmallImageComponent {
})
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width("100%")
.height(this.isBigThreeLine ? 127 : 106)
.padding({
... ...
... ... @@ -21,6 +21,7 @@ export struct CardAdvThreeImageComponent {
@State compDTO: CompDTO = {} as CompDTO
@Prop loadImg: boolean = true;
pageModel: PageModel = new PageModel();
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
// this.loadImg = await onlyWifiLoadImg();
... ... @@ -78,6 +79,10 @@ export struct CardAdvThreeImageComponent {
})
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
left: 10,
... ...
... ... @@ -23,6 +23,7 @@ export struct CardAdvVideoComponent {
@State contentDTO: ContentDTO = new ContentDTO()
@Prop loadImg: boolean = true;
pageModel: PageModel = new PageModel();
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
// this.loadImg = await onlyWifiLoadImg();
... ... @@ -61,6 +62,10 @@ export struct CardAdvVideoComponent {
top: 8,
})
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
left: 10,
... ...
... ... @@ -23,6 +23,7 @@ export struct CardAdvVideoExComponent {
@State advExtraData: AdvExtraData = {} as AdvExtraData
pageModel: PageModel = new PageModel();
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
// this.loadImg = await onlyWifiLoadImg();
... ... @@ -84,6 +85,10 @@ export struct CardAdvVideoExComponent {
this.commonButton()
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
left: 10,
... ...
... ... @@ -31,6 +31,7 @@ export struct Card10Component {
basePageHelp: BasePageHelp = new BasePageHelp
// 稿件参与批查，需要对列表信息单独重绘
@State isBatchData: boolean = false
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
console.log('Card10Component-compDTO', JSON.stringify(this.compDTO))
... ... @@ -173,6 +174,10 @@ export struct Card10Component {
})
}
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
left: 10,
... ...
... ... @@ -25,6 +25,7 @@ export struct Card11Component {
@ObjectLink compDTO: CompDTO
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -95,6 +96,10 @@ export struct Card11Component {
top: $r('app.float.card_comp_pagePadding_tb'),
bottom: $r('app.float.card_comp_pagePadding_tb')
})
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.backgroundColor($r("app.color.white"))
.onClick((event: ClickEvent) => {
///我的收藏 编辑状态点击
... ...
... ... @@ -24,6 +24,7 @@ export struct Card12Component {
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
aboutToAppear(): void {
this.titleInit();
... ... @@ -78,6 +79,10 @@ export struct Card12Component {
}
CarderInteraction({contentDTO: this.contentDTO})
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -25,6 +25,7 @@ export struct Card14Component {
@State clicked: boolean = false;
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -99,6 +100,10 @@ export struct Card14Component {
//TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -29,6 +29,7 @@ export struct Card15Component {
@State clicked: boolean = false;
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -97,6 +98,10 @@ export struct Card15Component {
CarderInteraction({contentDTO: this.contentDTO})
//TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -31,6 +31,7 @@ export struct Card16Component {
@State clicked: boolean = false;
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -130,6 +131,10 @@ export struct Card16Component {
CarderInteraction({contentDTO: this.contentDTO})
//TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -26,6 +26,7 @@ export struct Card17Component {
@ObjectLink compDTO: CompDTO
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
console.log('Card17Component', JSON.stringify(this.contentDTO))
... ... @@ -151,6 +152,10 @@ export struct Card17Component {
// 评论等信息
CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO, viewShowData: false })
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -25,6 +25,7 @@ export struct Card19Component {
@State textArr: textItem[] = []
@Prop loadImg: boolean = true;
isPeopleShipHome: boolean = false;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -89,6 +90,10 @@ export struct Card19Component {
CarderInteraction({ contentDTO: this.contentDTO })
//TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -28,6 +28,7 @@ export struct Card20Component {
@State textArr: textItem[] = []
@Prop loadImg: boolean = true;
isPeopleShipHome: boolean = false;
@State compIndex: number = 0;
aboutToAppear(): void {
this.titleInit();
... ... @@ -109,6 +110,10 @@ export struct Card20Component {
CarderInteraction({contentDTO: this.contentDTO})
//TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -25,6 +25,7 @@ export struct Card21Component {
@State clicked: boolean = false;
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -110,6 +111,10 @@ export struct Card21Component {
persistentStorage(this.contentDTO.objectId);
ProcessUtils.processPage(this.contentDTO)
})
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -31,6 +31,7 @@ export struct Card2Component {
@ObjectLink compDTO: CompDTO
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -126,6 +127,10 @@ export struct Card2Component {
// 评论等信息
CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -24,6 +24,7 @@ export struct Card3Component {
@ObjectLink compDTO: CompDTO
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
this.titleInit();
... ... @@ -84,6 +85,10 @@ export struct Card3Component {
// 评论等信息
CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -30,6 +30,7 @@ export struct Card4Component {
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@ObjectLink compDTO: CompDTO
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
const curRouter = router.getState().name;
... ... @@ -147,6 +148,10 @@ export struct Card4Component {
//bottom 评论等信息
CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -25,6 +25,7 @@ export struct Card5Component {
@State clicked: boolean = false;
@State titleMarked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
// console.log(TAG, JSON.stringify(this.compDTO),this.contentDTO.titleShow)
... ... @@ -139,6 +140,10 @@ export struct Card5Component {
}
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.alignContent(Alignment.Bottom)
.padding({
left: 10,
... ...
... ... @@ -27,6 +27,7 @@ export struct Card6Component {
@State textArr: textItem[] = []
@ObjectLink compDTO: CompDTO
@State contentDTO: ContentDTO = new ContentDTO();
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
console.log('Card6Component', JSON.stringify(this.contentDTO))
... ... @@ -128,6 +129,10 @@ export struct Card6Component {
}
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.onClick((event: ClickEvent) => {
///我的收藏 编辑状态点击
if (this.compDTO.isCollectionEditting) {
... ...
... ... @@ -28,6 +28,7 @@ export struct Card9Component {
pageShowTime:number = 0;
pageHideTime:number = 0;
@State hideDetail: boolean = false;
@State compIndex: number = 0;
onPageShow() {
this.pageShowTime = DateTimeUtils.getTimeStamp()
... ... @@ -154,6 +155,10 @@ export struct Card9Component {
.justifyContent(FlexAlign.Center)
}
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_WIDTH)
.padding({
top: 14,
... ...
... ... @@ -24,6 +24,7 @@ export struct LiveBigImage01Component {
index: number = 0
@State isLoadingAttention: boolean = false
@State curRouter: string = ''
@State compIndex: number = 0;
async aboutToAppear() {
const curRouter = router.getState().name;
... ... @@ -153,7 +154,10 @@ export struct LiveBigImage01Component {
.justifyContent(FlexAlign.SpaceBetween)
}
.borderRadius(4)
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.backgroundColor(Color.White)
.width('calc(100% - 24vp)')
.margin({
... ...
... ... @@ -20,6 +20,8 @@ export struct LiveBigImage02Component {
@Prop loadImg: boolean = true;
@State clicked: boolean = false;
index: number = 0
@State compIndex: number = 0;
async aboutToAppear() {
const curRouter = router.getState().name;
this.clicked = hasClicked(this.contentDTO.objectId,curRouter)
... ... @@ -85,6 +87,10 @@ export struct LiveBigImage02Component {
.margin({ top: 8, bottom: 8 })
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width('100%')
.padding({
left: $r('app.float.card_comp_pagePadding_lf'),
... ...
... ... @@ -23,6 +23,7 @@ export struct SearchContentComponent {
@Prop loadImg: boolean = true;
@State clicked: boolean = false;
@State textArr: textItem[] = []
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
... ... @@ -79,6 +80,10 @@ export struct SearchContentComponent {
//bottom 评论等信息
CardSourceInfo({compDTO:new CompDTO, contentDTO: this.contentDTO })
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -13,7 +13,7 @@ import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
@Component
export struct CompNormalTitle {
@State compDTO: CompDTO = new CompDTO
@State compIndex: number = 0;
aboutToAppear() {
}
... ... @@ -41,6 +41,10 @@ export struct CompNormalTitle {
})
.backgroundColor(0xffffff)
.width(CommonConstants.FULL_WIDTH)
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
}
... ...
... ... @@ -57,6 +57,7 @@ export struct ZhCarouselLayout01 {
@Prop loadImg: boolean = true;
private data: MyDataSource = new MyDataSource([])
@State compIndex: number = 0;
watchCurrentBreakpoint() {
Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
... ... @@ -177,6 +178,10 @@ export struct ZhCarouselLayout01 {
})
.backgroundColor(0xffffff)
.width(CommonConstants.FULL_WIDTH)
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
} else {
CarouselLayout01CardView({
item: this.filterAtv()[0],
... ...
... ... @@ -19,6 +19,7 @@ export struct ZhGridLayout02NewsContent {
@ObjectLink compDTO: CompDTO
@State operDataList: ContentDTO[] = []
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
... ... @@ -46,7 +47,10 @@ export struct ZhGridLayout02NewsContent {
})
.backgroundColor(0xffffff)
.width(CommonConstants.FULL_WIDTH)
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
@Builder
... ...
... ... @@ -20,6 +20,7 @@ export struct ZhGridLayout03 {
@State pageName: string = '';
@State compDTO: CompDTO = {} as CompDTO
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
if (this.compDTO.operDataList) {
... ... @@ -46,6 +47,10 @@ export struct ZhGridLayout03 {
})
.backgroundColor(0xffffff)
.width('100%')
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
/**
... ...
... ... @@ -18,6 +18,7 @@ export struct ZhSingleColumn04 {
// {newsTitle: "民检普法课堂：正当防卫是什么正当防卫是什么正当防卫是什么正当防卫是什么？", tagWord: 1} as ContentDTO,
// {newsTitle: "审批站”进菜市场 学才艺有云课堂", tagWord: 2} as ContentDTO,
]
@State compIndex: number = 0;
aboutToAppear() {
this.operDataList = this.compDTO.operDataList;
... ... @@ -44,6 +45,10 @@ export struct ZhSingleColumn04 {
})
}
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -279,6 +279,10 @@ export struct ZhSingleColumn09 {
.borderRadius(3)
.justifyContent(FlexAlign.SpaceBetween)
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.padding({
left: 10,
right: 10,
... ...
... ... @@ -24,6 +24,7 @@ export struct ZhSingleRow02 {
@State moreWidth:number = 22
@State moreTips: string = ''
scroller: Scroller = new Scroller()
@State compIndex: number = 0;
resetMoreTips() {
if (this.moreWidth < this.initMoreWidth * 2) {
... ... @@ -163,6 +164,10 @@ export struct ZhSingleRow02 {
.backgroundColor(0xffffff)
.width('102%')
.margin({ bottom: 8, left: -6 })
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
@Builder
... ...
... ... @@ -47,6 +47,7 @@ export struct ZhSingleRow03 {
@State moreTips: string = ''
scroller: Scroller = new Scroller()
@Consume @Watch('pageShowForUpdateData') pageShow :number
@State compIndex: number = 0;
resetMoreTips() {
console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)
... ... @@ -269,6 +270,10 @@ export struct ZhSingleRow03 {
})
.backgroundColor(0xffffff)
.width('100%')
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
@Builder
... ...
... ... @@ -16,6 +16,7 @@ export struct ZhSingleRow04 {
@State pageName: string = '';
@State compDTO: CompDTO = {} as CompDTO
bottomNavi:BottomNavi = BottomNavi.PEOPLE
@State compIndex: number = 0;
build() {
Column() {
... ... @@ -105,6 +106,10 @@ export struct ZhSingleRow04 {
})
.backgroundColor(0xffffff)
.width('100%')
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
}
... ...
... ... @@ -27,6 +27,7 @@ export struct ZhSingleRow06 {
likeStatus: '0'
} as batchLikeAndCollectResult // 点赞、收藏状态
@Prop loadImg: boolean = true;
@State compIndex: number = 0;
async aboutToAppear(): Promise<void> {
console.log('Zh_Single_Row-06', JSON.stringify(this.compDTO.operDataList[0]?.commentInfo))
... ... @@ -184,6 +185,10 @@ export struct ZhSingleRow06 {
.onClick(() => {
InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
})
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
@Builder
... ...
import { BottomNavi, CommonConstants, ViewType } from 'wdConstant';
import { BottomNavi, CommonConstants, CompStyle, ViewType } from 'wdConstant';
import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
import { EmptyComponent, WDViewDefaultType } from '../view/EmptyComponent';
import PageModel from '../../viewmodel/PageModel';
... ... @@ -132,8 +132,16 @@ export struct PageComponent {
}
)
}
}
}.margin({
left: compDTO.compStyle === CompStyle.Zh_Single_Row_04 ? 0 : 6,
right: (compDTO.compStyle === CompStyle.Zh_Single_Row_05 || compDTO.compStyle === CompStyle.Zh_Single_Row_02 ||
compDTO.compStyle === CompStyle.Zh_Single_Row_04) ? 0 : 6
})
.grayscale(this.isMourning && compIndex < 8 ? 1 : 0)
.borderRadius({
topLeft:compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:compIndex === 0 ? $r('app.float.image_border_radius'):0
})
},
(compDTO: CompDTO, compIndex: number) => JSON.stringify(compDTO))
... ...
... ... @@ -14,6 +14,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
@State moreWidth:number = 22
@State moreTips: string = ''
scroller: Scroller = new Scroller()
@State compIndex: number = 0;
resetMoreTips() {
console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)
... ... @@ -208,6 +209,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
left: this.compDTO.operDataList.length >= 2 ? -6 : 0,
bottom: 8
})
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
private jumpToLiveMorePage() {
... ...
... ... @@ -12,6 +12,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
@State pageName: string = '';
@State compDTO: CompDTO = {} as CompDTO
@State clicked: boolean = false;
@State compIndex: number = 0;
build() {
Column() {
... ... @@ -77,6 +78,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
this.clicked = true;
ProcessUtils.processPage(this.compDTO?.operDataList[0])
})
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
}
showMore() {
... ...
... ... @@ -12,6 +12,7 @@ const TAG = 'LabelComponent';
@Component
export struct LabelComponent {
@State compDTO: CompDTO = {} as CompDTO
@State compIndex: number = 0;
build() {
Row() {
... ... @@ -28,6 +29,10 @@ export struct LabelComponent {
.maxLines(1)// .backgroundColor(Color.Yellow)
.textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
}
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.width(CommonConstants.FULL_PARENT)
.justifyContent(FlexAlign.Start)
}
... ...
... ... @@ -22,6 +22,7 @@ export struct LiveHorizontalCardComponent {
@State moreWidth:number = 22
@State moreTips: string = ''
scroller: Scroller = new Scroller()
@State compIndex: number = 0;
resetMoreTips() {
console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)
... ... @@ -267,6 +268,10 @@ export struct LiveHorizontalCardComponent {
.margin({
left: this.compDTO.operDataList.length >= 2 ? -6 : 0
})
.borderRadius({
topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
})
.backgroundColor($r("app.color.white"))
}
... ...