developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
ba3d93cf 2 parents 6a33528d fb86ae50

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main 

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 20234 【uat】 进入热点，查看“英姿飒爽！武警女兵进行课目训练太帅了”卡片图片，卡片图片拉伸了，预期不拉申
  fix: 19537 【UI走查-卡片】折叠屏展开-人民号动态视频卡
  fix: 19535 【UI走查-卡片】折叠屏展开-人民号小视频卡
  fix: 19533 【UI走查-卡片】折叠屏展开-所有带图片的卡片，图片都要增加一个描边
  fix: 19532 【UI走查-卡片】折叠屏展开-人民号三图卡
  fix: 19531 【UI走查-卡片】折叠屏展开-人民号单图卡
  fix |> 修复进入人民号文章详情页，鸿蒙显示最新评论
  fix: 轮播图只有一条数据时折叠屏展开适配
  fix: 直播预告卡折叠屏展开适配
Inline Side-by-side
Showing 30 changed files with 232 additions and 97 deletions
@@ -155,6 +155,7 @@ export struct RmhTitle { @@ -155,6 +155,7 @@ export struct RmhTitle {
155 .height(21) 155 .height(21)
156 .lineHeight(21) 156 .lineHeight(21)
157 .margin({bottom: 1}) 157 .margin({bottom: 1})
  158 +
158 Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) { 159 Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) {
159 Row() { 160 Row() {
160 if (!(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)) { 161 if (!(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)) {
@@ -184,9 +185,9 @@ export struct RmhTitle { @@ -184,9 +185,9 @@ export struct RmhTitle {
184 } 185 }
185 186
186 } 187 }
187 - .width('75%')  
188 .height(14) 188 .height(14)
189 } 189 }
  190 + .width('calc(100% - 36vp - 8vp)')
190 } 191 }
191 .justifyContent(FlexAlign.SpaceBetween) 192 .justifyContent(FlexAlign.SpaceBetween)
192 193
@@ -41,9 +41,12 @@ export struct CardAdvBigImageComponent { @@ -41,9 +41,12 @@ export struct CardAdvBigImageComponent {
41 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5) 41 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
42 .width(CommonConstants.FULL_WIDTH) 42 .width(CommonConstants.FULL_WIDTH)
43 .aspectRatio(16 / 9) 43 .aspectRatio(16 / 9)
44 - .borderRadius(4)  
45 - .borderWidth(0.5)  
46 - .borderColor($r('app.color.color_0D000000')) 44 + .border({
  45 + width: 0.5,
  46 + color: '#0D000000', // 5% 透明度的黑色
  47 + style: BorderStyle.Solid,
  48 + radius: 4
  49 + })
47 .width(CommonConstants.FULL_WIDTH) 50 .width(CommonConstants.FULL_WIDTH)
48 51
49 CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({ 52 CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({
@@ -51,9 +51,12 @@ export struct CardAdvGanMiComponent { @@ -51,9 +51,12 @@ export struct CardAdvGanMiComponent {
51 .width(CommonConstants.FULL_WIDTH) 51 .width(CommonConstants.FULL_WIDTH)
52 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5) 52 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
53 .aspectRatio(343 / 40) 53 .aspectRatio(343 / 40)
54 - .borderRadius(4)  
55 - .borderWidth(0.5)  
56 - .borderColor($r('app.color.color_0D000000')) 54 + .border({
  55 + width: 0.5,
  56 + color: '#0D000000', // 5% 透明度的黑色
  57 + style: BorderStyle.Solid,
  58 + radius: 4
  59 + })
57 60
58 // 广告标签和删除功能 61 // 广告标签和删除功能
59 CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO }) 62 CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO })
@@ -79,9 +82,12 @@ export struct CardAdvGanMiComponent { @@ -79,9 +82,12 @@ export struct CardAdvGanMiComponent {
79 .width('100%') 82 .width('100%')
80 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5) 83 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
81 .aspectRatio(150 / 84) 84 .aspectRatio(150 / 84)
82 - .borderWidth(0.5)  
83 - .borderColor($r('app.color.color_0D000000'))  
84 - .borderRadius(4) 85 + .border({
  86 + width: 0.5,
  87 + color: '#0D000000', // 5% 透明度的黑色
  88 + style: BorderStyle.Solid,
  89 + radius: 4
  90 + })
85 91
86 Text(content.title) 92 Text(content.title)
87 .fontSize('16fp') 93 .fontSize('16fp')
@@ -44,9 +44,12 @@ export struct CardAdvLongImageComponent { @@ -44,9 +44,12 @@ export struct CardAdvLongImageComponent {
44 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5) 44 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
45 .width(CommonConstants.FULL_WIDTH) 45 .width(CommonConstants.FULL_WIDTH)
46 .aspectRatio(343 / 96) 46 .aspectRatio(343 / 96)
47 - .borderRadius(4)  
48 - .borderWidth(0.5)  
49 - .borderColor($r('app.color.color_0D000000')) 47 + .border({
  48 + width: 0.5,
  49 + color: '#0D000000', // 5% 透明度的黑色
  50 + style: BorderStyle.Solid,
  51 + radius: 4
  52 + })
50 53
51 CardAdvBottom({ pageModel: this.pageModel, compDTO:this.compDTO }).margin({ 54 CardAdvBottom({ pageModel: this.pageModel, compDTO:this.compDTO }).margin({
52 top: 8, 55 top: 8,
@@ -66,6 +66,7 @@ export struct CardAdvSmallImageComponent { @@ -66,6 +66,7 @@ export struct CardAdvSmallImageComponent {
66 .borderWidth(0.5) 66 .borderWidth(0.5)
67 .borderColor($r('app.color.color_0D000000')) 67 .borderColor($r('app.color.color_0D000000'))
68 .borderRadius(4)//.alt('wwww.baidu.com') 68 .borderRadius(4)//.alt('wwww.baidu.com')
  69 + .borderStyle(BorderStyle.Solid)
69 .alignRules({ 70 .alignRules({
70 top: { anchor: 'title_name', align: VerticalAlign.Top }, 71 top: { anchor: 'title_name', align: VerticalAlign.Top },
71 left: { anchor: 'title_name', align: HorizontalAlign.End }, 72 left: { anchor: 'title_name', align: HorizontalAlign.End },
@@ -57,6 +57,8 @@ export struct CardAdvThreeImageComponent { @@ -57,6 +57,8 @@ export struct CardAdvThreeImageComponent {
57 bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0, 57 bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
58 }) 58 })
59 .borderColor($r('app.color.color_0D000000')) 59 .borderColor($r('app.color.color_0D000000'))
  60 + .borderStyle(BorderStyle.Solid)
  61 + .borderWidth(0.5)
60 } 62 }
61 } 63 }
62 }) 64 })
@@ -47,6 +47,7 @@ export struct CardAdvVideoComponent { @@ -47,6 +47,7 @@ export struct CardAdvVideoComponent {
47 .borderRadius(4) 47 .borderRadius(4)
48 .borderWidth(0.5) 48 .borderWidth(0.5)
49 .borderColor($r('app.color.color_0D000000')) 49 .borderColor($r('app.color.color_0D000000'))
  50 + .borderStyle(BorderStyle.Solid)
50 //播放状态+时长 51 //播放状态+时长
51 CardMediaInfo({ 52 CardMediaInfo({
52 contentDTO: this.contentDTO, livePeopleNum:false, 53 contentDTO: this.contentDTO, livePeopleNum:false,
@@ -49,6 +49,7 @@ export struct CardAdvVideoExComponent { @@ -49,6 +49,7 @@ export struct CardAdvVideoExComponent {
49 .borderRadius(4) 49 .borderRadius(4)
50 .borderWidth(0.5) 50 .borderWidth(0.5)
51 .borderColor($r('app.color.color_0D000000')) 51 .borderColor($r('app.color.color_0D000000'))
  52 + .borderStyle(BorderStyle.Solid)
52 .onClick(() => { 53 .onClick(() => {
53 ProcessUtils.openAdvDetail(this.compDTO.matInfo) 54 ProcessUtils.openAdvDetail(this.compDTO.matInfo)
54 55
@@ -122,6 +122,9 @@ export struct Card10Component { @@ -122,6 +122,9 @@ export struct Card10Component {
122 topLeft: $r('app.float.image_border_radius'), 122 topLeft: $r('app.float.image_border_radius'),
123 topRight: $r('app.float.image_border_radius') 123 topRight: $r('app.float.image_border_radius')
124 }) 124 })
  125 + .borderStyle(BorderStyle.Solid)
  126 + .borderWidth(0.5)
  127 + .borderColor($r('app.color.color_0D000000'))
125 .onClick((event: ClickEvent) => { 128 .onClick((event: ClickEvent) => {
126 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 129 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
127 ProcessUtils.processPage(this.contentDTO) 130 ProcessUtils.processPage(this.contentDTO)
@@ -246,13 +249,16 @@ export struct Card10ComponentTimelineItem { @@ -246,13 +249,16 @@ export struct Card10ComponentTimelineItem {
246 .backgroundColor(0xf5f5f5) 249 .backgroundColor(0xf5f5f5)
247 .width(117) 250 .width(117)
248 .height(78) 251 .height(78)
249 - .objectFit(ImageFit.Cover) 252 + .objectFit(ImageFit.Contain)
250 .borderRadius($r('app.float.image_border_radius')) 253 .borderRadius($r('app.float.image_border_radius'))
251 - .margin({ left: 12 }) 254 + .borderStyle(BorderStyle.Solid)
  255 + .borderWidth(0.5)
  256 + .borderColor($r('app.color.color_0D000000'))
252 CardMediaInfo({ 257 CardMediaInfo({
253 contentDTO: this.createMediaInfoContent(this.slideItem) 258 contentDTO: this.createMediaInfoContent(this.slideItem)
254 }) 259 })
255 } 260 }
  261 + .margin({ left: 12 })
256 .alignContent(Alignment.BottomEnd) 262 .alignContent(Alignment.BottomEnd)
257 .height(78) 263 .height(78)
258 } else { 264 } else {
@@ -78,13 +78,18 @@ export struct Card14Component { @@ -78,13 +78,18 @@ export struct Card14Component {
78 .fontFamily('PingFang SC-Regular') 78 .fontFamily('PingFang SC-Regular')
79 .textAlign(TextAlign.Start) 79 .textAlign(TextAlign.Start)
80 .margin({right: 12}) 80 .margin({right: 12})
81 - .width('64%') 81 + .width('calc(100% - 117vp - 12vp)')
82 82
83 Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '') 83 Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
84 - .backgroundColor(0xf5f5f5) 84 + .backgroundColor(0xf5f5f5)
85 .aspectRatio(3 / 2) 85 .aspectRatio(3 / 2)
86 .height(78) 86 .height(78)
87 .borderRadius($r('app.float.image_border_radius')) 87 .borderRadius($r('app.float.image_border_radius'))
  88 + .border({
  89 + width: 1,
  90 + color: '#0D000000'
  91 + })
  92 + .borderStyle(BorderStyle.Solid)
88 .backgroundImageSize(ImageSize.Auto) 93 .backgroundImageSize(ImageSize.Auto)
89 94
90 } 95 }
@@ -83,6 +83,9 @@ export struct Card15Component { @@ -83,6 +83,9 @@ export struct Card15Component {
83 Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '') 83 Image(this.loadImg ? this.contentDTO.fullColumnImgUrls?.[0]?.url || this.contentDTO.fullColumnImgUrls?.[0]?.fullUrl : '')
84 .backgroundColor(0xf5f5f5) 84 .backgroundColor(0xf5f5f5)
85 .borderRadius($r('app.float.image_border_radius')) 85 .borderRadius($r('app.float.image_border_radius'))
  86 + .borderStyle(BorderStyle.Solid)
  87 + .borderWidth(0.5)
  88 + .borderColor($r('app.color.color_0D000000'))
86 //播放状态+时长 89 //播放状态+时长
87 CardMediaInfo({ 90 CardMediaInfo({
88 contentDTO: this.contentDTO 91 contentDTO: this.contentDTO
@@ -101,13 +101,16 @@ export struct Card16Component { @@ -101,13 +101,16 @@ export struct Card16Component {
101 bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0, 101 bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
102 bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0, 102 bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
103 }) 103 })
  104 + .border({
  105 + width: 1,
  106 + color: '#0D000000'
  107 + })
104 } 108 }
105 } 109 }
106 }) 110 })
107 } 111 }
108 } 112 }
109 .width(CommonConstants.FULL_PARENT) 113 .width(CommonConstants.FULL_PARENT)
110 - .margin({ top: 8 })  
111 CardMediaInfo({ 114 CardMediaInfo({
112 contentDTO: this.contentDTO 115 contentDTO: this.contentDTO
113 }) 116 })
@@ -175,6 +178,10 @@ struct createImg { @@ -175,6 +178,10 @@ struct createImg {
175 .width(CommonConstants.FULL_WIDTH) 178 .width(CommonConstants.FULL_WIDTH)
176 .aspectRatio(16 / 9) 179 .aspectRatio(16 / 9)
177 .borderRadius($r('app.float.image_border_radius')) 180 .borderRadius($r('app.float.image_border_radius'))
  181 + .border({
  182 + width: 1,
  183 + color: '#0D000000'
  184 + })
178 CardMediaInfo({ contentDTO: this.contentDTO }) 185 CardMediaInfo({ contentDTO: this.contentDTO })
179 } 186 }
180 .align(Alignment.BottomEnd) 187 .align(Alignment.BottomEnd)
@@ -189,6 +196,10 @@ struct createImg { @@ -189,6 +196,10 @@ struct createImg {
189 .backgroundColor(0xf5f5f5) 196 .backgroundColor(0xf5f5f5)
190 .width(CommonConstants.FULL_WIDTH) 197 .width(CommonConstants.FULL_WIDTH)
191 .borderRadius($r('app.float.image_border_radius')) 198 .borderRadius($r('app.float.image_border_radius'))
  199 + .border({
  200 + width: 1,
  201 + color: '#0D000000'
  202 + })
192 CardMediaInfo({ contentDTO: this.contentDTO }) 203 CardMediaInfo({ contentDTO: this.contentDTO })
193 } 204 }
194 .align(Alignment.BottomEnd) 205 .align(Alignment.BottomEnd)
@@ -77,6 +77,9 @@ export struct Card17Component { @@ -77,6 +77,9 @@ export struct Card17Component {
77 topLeft: $r('app.float.image_border_radius'), 77 topLeft: $r('app.float.image_border_radius'),
78 bottomLeft: $r('app.float.image_border_radius'), 78 bottomLeft: $r('app.float.image_border_radius'),
79 }) 79 })
  80 + .borderStyle(BorderStyle.Solid)
  81 + .borderWidth(0.5)
  82 + .borderColor($r('app.color.color_0D000000'))
80 } 83 }
81 84
82 GridCol({ span: { xs: 4 } }) { 85 GridCol({ span: { xs: 4 } }) {
@@ -89,6 +92,9 @@ export struct Card17Component { @@ -89,6 +92,9 @@ export struct Card17Component {
89 .borderRadius({ 92 .borderRadius({
90 topRight: $r('app.float.image_border_radius'), 93 topRight: $r('app.float.image_border_radius'),
91 }) 94 })
  95 + .borderStyle(BorderStyle.Solid)
  96 + .borderWidth(0.5)
  97 + .borderColor($r('app.color.color_0D000000'))
92 } 98 }
93 } 99 }
94 100
@@ -106,6 +112,9 @@ export struct Card17Component { @@ -106,6 +112,9 @@ export struct Card17Component {
106 .borderRadius({ 112 .borderRadius({
107 bottomRight: $r('app.float.image_border_radius'), 113 bottomRight: $r('app.float.image_border_radius'),
108 }) 114 })
  115 + .borderStyle(BorderStyle.Solid)
  116 + .borderWidth(0.5)
  117 + .borderColor($r('app.color.color_0D000000'))
109 } 118 }
110 } 119 }
111 120
@@ -233,12 +233,18 @@ struct createImg { @@ -233,12 +233,18 @@ struct createImg {
233 .height(198) 233 .height(198)
234 .autoResize(true) 234 .autoResize(true)
235 .borderRadius(this.caclImageRadius(index)) 235 .borderRadius(this.caclImageRadius(index))
  236 + .borderStyle(BorderStyle.Solid)
  237 + .borderWidth(0.5)
  238 + .borderColor($r('app.color.color_0D000000'))
236 } else if (this.getPicType(item.weight, item.height) === 2) { 239 } else if (this.getPicType(item.weight, item.height) === 2) {
237 Image(this.loadImg ? item.url || item.fullUrl : '') 240 Image(this.loadImg ? item.url || item.fullUrl : '')
238 .width('100%') 241 .width('100%')
239 .height(305) 242 .height(305)
240 .autoResize(true) 243 .autoResize(true)
241 .borderRadius(this.caclImageRadius(index)) 244 .borderRadius(this.caclImageRadius(index))
  245 + .borderStyle(BorderStyle.Solid)
  246 + .borderWidth(0.5)
  247 + .borderColor($r('app.color.color_0D000000'))
242 } 248 }
243 this.longPicTip(item.weight, item.height) 249 this.longPicTip(item.weight, item.height)
244 250
@@ -257,6 +263,9 @@ struct createImg { @@ -257,6 +263,9 @@ struct createImg {
257 .autoResize(true) 263 .autoResize(true)
258 .aspectRatio(3/4) 264 .aspectRatio(3/4)
259 .borderRadius(this.caclImageRadius(index)) 265 .borderRadius(this.caclImageRadius(index))
  266 + .borderStyle(BorderStyle.Solid)
  267 + .borderWidth(0.5)
  268 + .borderColor($r('app.color.color_0D000000'))
260 .opacity(!item.weight && !item.height ? 0 : 1) 269 .opacity(!item.weight && !item.height ? 0 : 1)
261 .onComplete((event?) => { 270 .onComplete((event?) => {
262 this.onePicW = event?.width || 0; 271 this.onePicW = event?.width || 0;
@@ -277,6 +286,9 @@ struct createImg { @@ -277,6 +286,9 @@ struct createImg {
277 }) 286 })
278 .autoResize(true) 287 .autoResize(true)
279 .borderRadius(this.caclImageRadius(index)) 288 .borderRadius(this.caclImageRadius(index))
  289 + .borderStyle(BorderStyle.Solid)
  290 + .borderWidth(0.5)
  291 + .borderColor($r('app.color.color_0D000000'))
280 .opacity(!item.weight && !item.height ? 0 : 1) 292 .opacity(!item.weight && !item.height ? 0 : 1)
281 .onComplete((event?) => { 293 .onComplete((event?) => {
282 this.onePicW = event?.width || 0; 294 this.onePicW = event?.width || 0;
@@ -300,6 +312,9 @@ struct createImg { @@ -300,6 +312,9 @@ struct createImg {
300 .width('226lvp') 312 .width('226lvp')
301 .height('226lvp') 313 .height('226lvp')
302 .borderRadius(this.caclImageRadius(index)) 314 .borderRadius(this.caclImageRadius(index))
  315 + .borderStyle(BorderStyle.Solid)
  316 + .borderWidth(0.5)
  317 + .borderColor($r('app.color.color_0D000000'))
303 if(this.getPicType(item.weight, item.height) !== 3){ 318 if(this.getPicType(item.weight, item.height) !== 3){
304 this.longPicTip(item.weight, item.height) 319 this.longPicTip(item.weight, item.height)
305 } 320 }
@@ -314,6 +329,9 @@ struct createImg { @@ -314,6 +329,9 @@ struct createImg {
314 .backgroundColor(0xf5f5f5) 329 .backgroundColor(0xf5f5f5)
315 .aspectRatio(1) 330 .aspectRatio(1)
316 .borderRadius(this.caclImageRadius(index)) 331 .borderRadius(this.caclImageRadius(index))
  332 + .borderStyle(BorderStyle.Solid)
  333 + .borderWidth(0.5)
  334 + .borderColor($r('app.color.color_0D000000'))
317 .width('100%') 335 .width('100%')
318 .autoResize(true) 336 .autoResize(true)
319 if (this.getPicType(item.weight, item.height) !== 3) { 337 if (this.getPicType(item.weight, item.height) !== 3) {
@@ -74,7 +74,7 @@ export struct Card21Component { @@ -74,7 +74,7 @@ export struct Card21Component {
74 .maxLines(4) 74 .maxLines(4)
75 .textOverflow({ overflow: TextOverflow.Ellipsis }) 75 .textOverflow({ overflow: TextOverflow.Ellipsis })
76 .padding({ right: 12 }) 76 .padding({ right: 12 })
77 - .lineHeight(22) 77 + .lineHeight(25)
78 } 78 }
79 79
80 GridItem() { 80 GridItem() {
@@ -83,6 +83,9 @@ export struct Card21Component { @@ -83,6 +83,9 @@ export struct Card21Component {
83 .backgroundColor(0xf5f5f5) 83 .backgroundColor(0xf5f5f5)
84 .width(CommonConstants.FULL_WIDTH) 84 .width(CommonConstants.FULL_WIDTH)
85 .borderRadius($r('app.float.image_border_radius')) 85 .borderRadius($r('app.float.image_border_radius'))
  86 + .borderStyle(BorderStyle.Solid)
  87 + .borderWidth(0.5)
  88 + .borderColor($r('app.color.color_0D000000'))
86 CardMediaInfo({ contentDTO: this.contentDTO }) 89 CardMediaInfo({ contentDTO: this.contentDTO })
87 } 90 }
88 .alignContent(Alignment.BottomEnd) 91 .alignContent(Alignment.BottomEnd)
@@ -107,6 +107,9 @@ export struct Card2Component { @@ -107,6 +107,9 @@ export struct Card2Component {
107 .width(CommonConstants.FULL_WIDTH) 107 .width(CommonConstants.FULL_WIDTH)
108 .aspectRatio(16 / 9) 108 .aspectRatio(16 / 9)
109 .borderRadius($r('app.float.image_border_radius')) 109 .borderRadius($r('app.float.image_border_radius'))
  110 + .borderStyle(BorderStyle.Solid)
  111 + .borderWidth(0.5)
  112 + .borderColor($r('app.color.color_0D000000'))
110 .backgroundColor(0xf5f5f5) 113 .backgroundColor(0xf5f5f5)
111 //播放状态+时长 114 //播放状态+时长
112 CardMediaInfo({ 115 CardMediaInfo({
@@ -110,6 +110,9 @@ export struct Card4Component { @@ -110,6 +110,9 @@ export struct Card4Component {
110 bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0, 110 bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
111 bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0, 111 bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
112 }) 112 })
  113 + .borderStyle(BorderStyle.Solid)
  114 + .borderWidth(0.5)
  115 + .borderColor($r('app.color.color_0D000000'))
113 } 116 }
114 } 117 }
115 }) 118 })
@@ -63,6 +63,9 @@ export struct Card5Component { @@ -63,6 +63,9 @@ export struct Card5Component {
63 bottomRight: $r('app.float.image_border_radius') 63 bottomRight: $r('app.float.image_border_radius')
64 } 64 }
65 ) 65 )
  66 + .borderStyle(BorderStyle.Solid)
  67 + .borderWidth(0.5)
  68 + .borderColor($r('app.color.color_0D000000'))
66 .height(this.loadImg ? '' : 114) 69 .height(this.loadImg ? '' : 114)
67 .autoResize(true) 70 .autoResize(true)
68 if (this.titleShowPolicy == 1) { 71 if (this.titleShowPolicy == 1) {
@@ -125,6 +125,7 @@ export struct Card6Component { @@ -125,6 +125,7 @@ export struct Card6Component {
125 .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4) 125 .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
126 .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 78 : 156) 126 .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 78 : 156)
127 .border({width: 1, color: 0xf5f5f5}) 127 .border({width: 1, color: 0xf5f5f5})
  128 + .borderStyle(BorderStyle.Solid)
128 CardMediaInfo({ contentDTO: this.contentDTO }) 129 CardMediaInfo({ contentDTO: this.contentDTO })
129 } 130 }
130 131
@@ -44,6 +44,7 @@ export struct LiveBigImage01Component { @@ -44,6 +44,7 @@ export struct LiveBigImage01Component {
44 topLeft: '4vp', 44 topLeft: '4vp',
45 topRight: '4vp' 45 topRight: '4vp'
46 }) 46 })
  47 + .borderStyle(BorderStyle.Solid)
47 this.LiveImage() 48 this.LiveImage()
48 49
49 50
@@ -127,7 +127,7 @@ export struct CommentComponent { @@ -127,7 +127,7 @@ export struct CommentComponent {
127 127
128 /*标题：全部评论*/ 128 /*标题：全部评论*/
129 @Builder 129 @Builder
130 - titleHeader(title: string = "最新评论", showGapLine: boolean = false) { 130 + titleHeader(title: string = "评论", showGapLine: boolean = false) {
131 131
132 Column() { 132 Column() {
133 if (showGapLine) { 133 if (showGapLine) {
@@ -87,88 +87,109 @@ export struct ZhCarouselLayout01 { @@ -87,88 +87,109 @@ export struct ZhCarouselLayout01 {
87 build() { 87 build() {
88 88
89 if (this.compDTO?.operDataList?.length) { 89 if (this.compDTO?.operDataList?.length) {
90 - Stack() {  
91 - Swiper() {  
92 - ForEach(this.compDTO?.operDataList, (item: ContentDTO, index: number) => {  
93 - CarouselLayout01CardView({  
94 - item: item,  
95 - length: this.compDTO.operDataList.length,  
96 - showPicBorderRadius: this.compDTO.operDataList.length == 1  
97 - })  
98 - .onClick((event: ClickEvent) => {  
99 - InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)  
100 - Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${index}`)  
101 - ProcessUtils.processPage(item) 90 + if (this.compDTO?.operDataList.length > 1) {
  91 + Stack() {
  92 + Swiper() {
  93 + ForEach(this.compDTO?.operDataList, (item: ContentDTO, index: number) => {
  94 + CarouselLayout01CardView({
  95 + item: item,
  96 + length: this.compDTO.operDataList.length,
  97 + showPicBorderRadius: this.compDTO.operDataList.length == 1
102 }) 98 })
  99 + .onClick((event: ClickEvent) => {
  100 + InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
  101 + Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${index}`)
  102 + ProcessUtils.processPage(item)
  103 + })
  104 + })
  105 + }
  106 + .borderRadius($r('app.float.image_border_radius'))
  107 + .displayCount(this.buildDisplayCount()) // 仅展示1个图片
  108 + .cachedCount(2)
  109 + .index(0) // The default index of Swiper.
  110 + .indicator(false)
  111 + .loop(true)
  112 + .vertical(false)
  113 + .curve(Curve.Linear)
  114 + .autoPlay(this.isAutoPlay())
  115 + .onAnimationStart((index: number, targetIndex: number) => {
  116 + // Logger.info(TAG, `Swiper onAnimationStart index : ${index}, targetIndex: ${targetIndex}`);
  117 + this.swiperIndex = targetIndex
103 }) 118 })
104 - }  
105 - .borderRadius($r('app.float.image_border_radius'))  
106 - .displayCount(this.buildDisplayCount()) // 仅展示1个图片  
107 - .cachedCount(2)  
108 - .index(0) // The default index of Swiper.  
109 - .indicator(false)  
110 - .loop(true)  
111 - .vertical(false)  
112 - .curve(Curve.Linear)  
113 - .autoPlay(this.isAutoPlay())  
114 - .onAnimationStart((index: number, targetIndex: number) => {  
115 - // Logger.info(TAG, `Swiper onAnimationStart index : ${index}, targetIndex: ${targetIndex}`);  
116 - this.swiperIndex = targetIndex  
117 - })  
118 - .onChange((index: number) => {  
119 - // Logger.info(TAG, `Swiper onChange index : ${index}`); 119 + .onChange((index: number) => {
  120 + // Logger.info(TAG, `Swiper onChange index : ${index}`);
120 121
121 - })  
122 - .onAnimationEnd((index: number, extraInfo: SwiperAnimationEvent) => {  
123 - this.firstWd = 12  
124 - setTimeout(() => {  
125 - this.SecondWd = 12  
126 - }, 2000)  
127 - // console.info("onAnimationEnd, index: " + index)  
128 - }) 122 + })
  123 + .onAnimationEnd((index: number, extraInfo: SwiperAnimationEvent) => {
  124 + this.firstWd = 12
  125 + setTimeout(() => {
  126 + this.SecondWd = 12
  127 + }, 2000)
  128 + // console.info("onAnimationEnd, index: " + index)
  129 + })
129 130
130 - if (this.compDTO?.operDataList.length > 1) {  
131 - // 自定义indicator  
132 - GridRow({  
133 - columns: this.data.totalCount(),  
134 - gutter: { x: 2 }  
135 - }) {  
136 - LazyForEach(this.data, (item: string, index: number) => {  
137 - GridCol() {  
138 - if (index === this.swiperIndex) {  
139 - indicatorAnimations({  
140 - index: index,  
141 - isAutoPlay: this.isAutoPlay()  
142 - })  
143 - } else {  
144 - Row() {  
145 - Image($r('app.media.swiper_indicator_gray'))  
146 - .width('100%')  
147 - .height(2) 131 + if (this.compDTO?.operDataList.length > 1) {
  132 + // 自定义indicator
  133 + GridRow({
  134 + columns: this.data.totalCount(),
  135 + gutter: { x: 2 }
  136 + }) {
  137 + LazyForEach(this.data, (item: string, index: number) => {
  138 + GridCol() {
  139 + if (index === this.swiperIndex) {
  140 + indicatorAnimations({
  141 + index: index,
  142 + isAutoPlay: this.isAutoPlay()
  143 + })
  144 + } else {
  145 + Row() {
  146 + Image($r('app.media.swiper_indicator_gray'))
  147 + .width('100%')
  148 + .height(2)
  149 + }
148 } 150 }
149 } 151 }
150 - }  
151 - }, (item: string) => item) 152 + }, (item: string) => item)
  153 + }
  154 + .width(CommonConstants.FULL_PARENT)
  155 + .padding({
  156 + left: 10,
  157 + right: 10,
  158 + top: 12,
  159 + bottom: 12
  160 + })
  161 + .alignItems(ItemAlign.End)
152 } 162 }
153 - .width(CommonConstants.FULL_PARENT) 163 + }
  164 + .alignContent(Alignment.BottomEnd)
  165 + .padding({
  166 + left: 10,
  167 + right: 10,
  168 + top: $r('app.float.card_comp_pagePadding_tb'),
  169 + bottom: $r('app.float.card_comp_pagePadding_tb')
  170 + })
  171 + .backgroundColor(0xffffff)
  172 + .width(CommonConstants.FULL_WIDTH)
  173 + } else {
  174 + CarouselLayout01CardView({
  175 + item: this.compDTO.operDataList[0],
  176 + length: 1,
  177 + showPicBorderRadius: this.compDTO.operDataList.length == 1
  178 + })
  179 + .onClick((event: ClickEvent) => {
  180 + InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
  181 + ProcessUtils.processPage(this.compDTO.operDataList[0])
  182 + })
154 .padding({ 183 .padding({
155 left: 10, 184 left: 10,
156 right: 10, 185 right: 10,
157 - top: 12,  
158 - bottom: 12 186 + top: $r('app.float.card_comp_pagePadding_tb'),
  187 + bottom: $r('app.float.card_comp_pagePadding_tb')
159 }) 188 })
160 - .alignItems(ItemAlign.End)  
161 - } 189 + .backgroundColor(0xffffff)
  190 + .width(CommonConstants.FULL_WIDTH)
  191 + .borderRadius($r('app.float.image_border_radius'))
162 } 192 }
163 - .alignContent(Alignment.BottomEnd)  
164 - .padding({  
165 - left: 10,  
166 - right: 10,  
167 - top: $r('app.float.card_comp_pagePadding_tb'),  
168 - bottom: $r('app.float.card_comp_pagePadding_tb')  
169 - })  
170 - .backgroundColor(0xffffff)  
171 - .width(CommonConstants.FULL_WIDTH)  
172 } else { 193 } else {
173 EmptyComponent({ emptyHeight: 200 }) 194 EmptyComponent({ emptyHeight: 200 })
174 } 195 }
@@ -204,6 +225,9 @@ struct CarouselLayout01CardView { @@ -204,6 +225,9 @@ struct CarouselLayout01CardView {
204 .objectFit(ImageFit.Cover) 225 .objectFit(ImageFit.Cover)
205 .backgroundColor(0xf5f5f5) 226 .backgroundColor(0xf5f5f5)
206 .borderRadius(this.showPicBorderRadius ? $r('app.float.image_border_radius') : 0) 227 .borderRadius(this.showPicBorderRadius ? $r('app.float.image_border_radius') : 0)
  228 + .borderStyle(BorderStyle.Solid)
  229 + .borderWidth(0.5)
  230 + .borderColor($r('app.color.color_0D000000'))
207 231
208 Stack() { 232 Stack() {
209 Row() 233 Row()
@@ -61,6 +61,7 @@ export struct ZhGridLayout02NewsContent { @@ -61,6 +61,7 @@ export struct ZhGridLayout02NewsContent {
61 .borderWidth(0.5) 61 .borderWidth(0.5)
62 .borderColor($r('app.color.color_0D000000')) 62 .borderColor($r('app.color.color_0D000000'))
63 .borderRadius(4) 63 .borderRadius(4)
  64 + .borderStyle(BorderStyle.Solid)
64 if (this.compDTO.operDataList[index].liveRoomDataBean != undefined 65 if (this.compDTO.operDataList[index].liveRoomDataBean != undefined
65 && this.compDTO.operDataList[index].liveRoomDataBean?.pv != undefined) { 66 && this.compDTO.operDataList[index].liveRoomDataBean?.pv != undefined) {
66 Text(this.computeShowNum(this.compDTO.operDataList[index].liveRoomDataBean)) 67 Text(this.computeShowNum(this.compDTO.operDataList[index].liveRoomDataBean))
@@ -61,9 +61,10 @@ export struct ZhGridLayout03 { @@ -61,9 +61,10 @@ export struct ZhGridLayout03 {
61 .backgroundColor(0xf5f5f5) 61 .backgroundColor(0xf5f5f5)
62 .width(44) 62 .width(44)
63 .aspectRatio(1 / 1) 63 .aspectRatio(1 / 1)
64 - // .margin({  
65 - // bottom: 16  
66 - // }) 64 + .borderStyle(BorderStyle.Solid)
  65 + .borderWidth(0.5)
  66 + .borderColor($r('app.color.color_0D000000'))
  67 +
67 Text(item.newsTitle) 68 Text(item.newsTitle)
68 .fontSize(13) 69 .fontSize(13)
69 .maxLines(1) 70 .maxLines(1)
@@ -186,6 +186,9 @@ export struct ZhSingleColumn09 { @@ -186,6 +186,9 @@ export struct ZhSingleColumn09 {
186 .width('100%') 186 .width('100%')
187 .height('100%') 187 .height('100%')
188 .borderRadius(3) 188 .borderRadius(3)
  189 + .borderStyle(BorderStyle.Solid)
  190 + .borderWidth(0.5)
  191 + .borderColor($r('app.color.color_0D000000'))
189 Row() { 192 Row() {
190 } 193 }
191 .width('100%') 194 .width('100%')
@@ -241,6 +241,9 @@ struct CreatorItem { @@ -241,6 +241,9 @@ struct CreatorItem {
241 .height(208) 241 .height(208)
242 .backgroundColor(0xf5f5f5) 242 .backgroundColor(0xf5f5f5)
243 .borderRadius(4) 243 .borderRadius(4)
  244 + .borderStyle(BorderStyle.Solid)
  245 + .borderWidth(0.5)
  246 + .borderColor($r('app.color.color_0D000000'))
244 247
245 Row() 248 Row()
246 .width(156) 249 .width(156)
@@ -220,6 +220,9 @@ export struct ZhSingleRow03 { @@ -220,6 +220,9 @@ export struct ZhSingleRow03 {
220 .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)}) 220 .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)})
221 } 221 }
222 } 222 }
  223 + .constraintSize({
  224 + minWidth: '100%'
  225 + })
223 } 226 }
224 .align(Alignment.Start) 227 .align(Alignment.Start)
225 .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None) 228 .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None)
@@ -259,7 +262,7 @@ export struct ZhSingleRow03 { @@ -259,7 +262,7 @@ export struct ZhSingleRow03 {
259 ItemCard(item: ContentDTO) { 262 ItemCard(item: ContentDTO) {
260 if (this.compDTO.operDataList.length >= 2) { 263 if (this.compDTO.operDataList.length >= 2) {
261 Column() { 264 Column() {
262 - Row() { 265 + Flex({alignContent: FlexAlign.Start}) {
263 Image(this.loadImg ? item.coverUrl : '') 266 Image(this.loadImg ? item.coverUrl : '')
264 .backgroundColor(0xf5f5f5) 267 .backgroundColor(0xf5f5f5)
265 .borderRadius(4) 268 .borderRadius(4)
@@ -268,16 +271,20 @@ export struct ZhSingleRow03 { @@ -268,16 +271,20 @@ export struct ZhSingleRow03 {
268 .border({ 271 .border({
269 width: 0.7, 272 width: 0.7,
270 color: '#EDEDED', 273 color: '#EDEDED',
  274 + style: BorderStyle.Solid
271 }) 275 })
  276 + .flexShrink(0)
272 277
273 278
274 Text(item.newsTitle) 279 Text(item.newsTitle)
275 - .width(154)  
276 - .height(60) 280 + .constraintSize({
  281 + maxHeight: 60
  282 + })
277 .maxLines(3) 283 .maxLines(3)
278 .fontSize(15) 284 .fontSize(15)
279 .textOverflow({overflow: TextOverflow.Ellipsis}) 285 .textOverflow({overflow: TextOverflow.Ellipsis})
280 .margin({left: 12}) 286 .margin({left: 12})
  287 + .flexShrink(1)
281 } 288 }
282 .margin({bottom: 16}) 289 .margin({bottom: 16})
283 290
@@ -348,7 +355,11 @@ export struct ZhSingleRow03 { @@ -348,7 +355,11 @@ export struct ZhSingleRow03 {
348 355
349 } 356 }
350 } 357 }
351 - .width(298) 358 + // .width(298)
  359 + .constraintSize({
  360 + minWidth: 298,
  361 + maxWidth: '60%'
  362 + })
352 .height(116) 363 .height(116)
353 .padding({top: 12, bottom: 12, left: 12, right: 12}) 364 .padding({top: 12, bottom: 12, left: 12, right: 12})
354 .backgroundColor(0xf9f9f9) 365 .backgroundColor(0xf9f9f9)
@@ -369,6 +380,7 @@ export struct ZhSingleRow03 { @@ -369,6 +380,7 @@ export struct ZhSingleRow03 {
369 .border({ 380 .border({
370 width: 0.7, 381 width: 0.7,
371 color: '#EDEDED', 382 color: '#EDEDED',
  383 + style: BorderStyle.Solid
372 }) 384 })
373 385
374 Text(item.newsTitle) 386 Text(item.newsTitle)
@@ -44,6 +44,9 @@ export struct AppointmentListChildComponent { @@ -44,6 +44,9 @@ export struct AppointmentListChildComponent {
44 .objectFit(ImageFit.Auto) 44 .objectFit(ImageFit.Auto)
45 .interpolation(ImageInterpolation.High) 45 .interpolation(ImageInterpolation.High)
46 .borderRadius(4) 46 .borderRadius(4)
  47 + .borderStyle(BorderStyle.Solid)
  48 + .borderWidth(0.5)
  49 + .borderColor($r('app.color.color_0D000000'))
47 50
48 51
49 if (this.item.status == "wait") { 52 if (this.item.status == "wait") {
@@ -91,6 +91,7 @@ export struct PeopleShipHomeArticleListComponent { @@ -91,6 +91,7 @@ export struct PeopleShipHomeArticleListComponent {
91 ListItem() { 91 ListItem() {
92 Column() { 92 Column() {
93 CardParser({compDTO:new CompDTO, contentDTO: item , isPeopleShipHome:true}) 93 CardParser({compDTO:new CompDTO, contentDTO: item , isPeopleShipHome:true})
  94 + .margin({left: 6, right: 6})
94 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 95 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
95 } 96 }
96 }.width("100%") 97 }.width("100%")
@@ -159,6 +159,9 @@ export struct LiveHorizontalCardComponent { @@ -159,6 +159,9 @@ export struct LiveHorizontalCardComponent {
159 .width(this.compDTO.operDataList.length == 2 ? 210 : 150) 159 .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
160 // .borderRadius(4) 160 // .borderRadius(4)
161 .objectFit(ImageFit.Contain) 161 .objectFit(ImageFit.Contain)
  162 + .borderStyle(BorderStyle.Solid)
  163 + .borderWidth(0.5)
  164 + .borderColor($r('app.color.color_0D000000'))
162 CardMediaInfo({ 165 CardMediaInfo({
163 livePeopleNum:false, 166 livePeopleNum:false,
164 contentDTO: item 167 contentDTO: item