developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yanlu
0418f8d6 2 parents a339a748 833e2972

Merge commit '833e2972'

Inline Side-by-side
Showing 6 changed files with 23 additions and 21 deletions
@@ -190,11 +190,11 @@ export struct ImageAndTextPageComponent { @@ -190,11 +190,11 @@ export struct ImageAndTextPageComponent {
190 .alignItems(VerticalAlign.Bottom) 190 .alignItems(VerticalAlign.Bottom)
191 191
192 Row() { 192 Row() {
193 - Image($r('app.media.line')) 193 + Image($r('app.media.ic_news_detail_division'))
194 .width('100%') 194 .width('100%')
195 - .height(7)  
196 - .objectFit(ImageFit.Cover) 195 + .height(6)
197 .margin({ top: 10 }) 196 .margin({ top: 10 })
  197 + .objectFit(ImageFit.Fill)
198 } 198 }
199 .padding({ left: 15, right: 15 }) 199 .padding({ left: 15, right: 15 })
200 .backgroundColor(Color.White) 200 .backgroundColor(Color.White)
@@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; @@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
  9 +
9 // import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 10 // import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
10 const TAG: string = 'Card2Component'; 11 const TAG: string = 'Card2Component';
11 12
@@ -48,9 +49,9 @@ export struct Card2Component { @@ -48,9 +49,9 @@ export struct Card2Component {
48 Stack() { 49 Stack() {
49 //新闻标题 50 //新闻标题
50 if (this.contentDTO.newTags) { 51 if (this.contentDTO.newTags) {
51 - Notes({ newTags: this.contentDTO.newTags }) 52 + Notes({ newTags: this.contentDTO.newTags })
52 } else if (this.contentDTO.objectType == '5') { 53 } else if (this.contentDTO.objectType == '5') {
53 - Notes({ objectType: this.contentDTO.objectType }) 54 + Notes({ objectType: this.contentDTO.objectType })
54 } 55 }
55 56
56 Text() { 57 Text() {
@@ -66,15 +67,16 @@ export struct Card2Component { @@ -66,15 +67,16 @@ export struct Card2Component {
66 .fontSize($r('app.float.font_size_18')) 67 .fontSize($r('app.float.font_size_18'))
67 .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222')) 68 .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
68 .maxLines(2) 69 .maxLines(2)
69 - .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。 70 + .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
70 .align(Alignment.Start) 71 .align(Alignment.Start)
71 .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 : 72 .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
72 - (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||  
73 - this.contentDTO.objectType == '5' ? 30 : 0)  
74 - }.alignContent(Alignment.TopStart)  
75 - //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)  
76 - // }  
77 - // .alignContent(Alignment.TopStart) 73 + (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
  74 + this.contentDTO.objectType == '5' ? 35 : 0)
  75 + }.alignContent(Alignment.TopStart)
  76 +
  77 + //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
  78 + // }
  79 + // .alignContent(Alignment.TopStart)
78 80
79 //大图 81 //大图
80 Stack() { 82 Stack() {
@@ -76,7 +76,7 @@ export struct Card6Component { @@ -76,7 +76,7 @@ export struct Card6Component {
76 .maxLines(3) 76 .maxLines(3)
77 .alignSelf(ItemAlign.Start) 77 .alignSelf(ItemAlign.Start)
78 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 78 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
79 - .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 : 79 + .textIndent(this.contentDTO?.newTags?.length < 5 && this.contentDTO?.newTags?.length > 2 ? 58 :
80 (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) || 80 (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
81 this.contentDTO.objectType == '5' ? 35 : 0) 81 this.contentDTO.objectType == '5' ? 35 : 0)
82 }.alignContent(Alignment.TopStart) 82 }.alignContent(Alignment.TopStart)
@@ -19,7 +19,7 @@ export struct channelSkeleton { @@ -19,7 +19,7 @@ export struct channelSkeleton {
19 textArea('40%', 12) 19 textArea('40%', 12)
20 } 20 }
21 .RightStyle() 21 .RightStyle()
22 - 22 +
23 Column() { 23 Column() {
24 textArea('35%', 78) 24 textArea('35%', 78)
25 } 25 }
@@ -30,7 +30,6 @@ export struct channelSkeleton { @@ -30,7 +30,6 @@ export struct channelSkeleton {
30 .SkeletonStyle() 30 .SkeletonStyle()
31 }) 31 })
32 32
33 - textArea('40%', 12)  
34 33
35 Column() { 34 Column() {
36 textArea('100%', 204) 35 textArea('100%', 204)
@@ -131,8 +131,7 @@ export struct EmptyComponent { @@ -131,8 +131,7 @@ export struct EmptyComponent {
131 // .height(this.EMPTY_IMAGE_HEIGHT) 131 // .height(this.EMPTY_IMAGE_HEIGHT)
132 132
133 Text(this.emptyType !== 8 ? this.buildNoDataTip() : `${this.buildNoDataTip()}(${this.timeNum}s)`) 133 Text(this.emptyType !== 8 ? this.buildNoDataTip() : `${this.buildNoDataTip()}(${this.timeNum}s)`)
134 - .fontSize($r('app.float.font_size_14'))  
135 - .fontColor('#FF999999') 134 + .fontSize($r('app.float.font_size_14'))// .fontColor('#FF999999')
136 .fontWeight(FontWeight.Normal) 135 .fontWeight(FontWeight.Normal)
137 .opacity(this.TEXT_OPACITY) 136 .opacity(this.TEXT_OPACITY)
138 .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP }) 137 .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
@@ -233,7 +232,7 @@ export struct EmptyComponent { @@ -233,7 +232,7 @@ export struct EmptyComponent {
233 imageString = $r('app.media.icon_no_message') 232 imageString = $r('app.media.icon_no_message')
234 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment || 233 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment ||
235 this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1) { 234 this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1) {
236 - imageString = $r('app.media.icon_no_comment') 235 + imageString = $r('app.media.icon_no_comment1')
237 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) { 236 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) {
238 imageString = $r('app.media.icon_no_result1') 237 imageString = $r('app.media.icon_no_result1')
239 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) { 238 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
@@ -251,7 +250,8 @@ export struct EmptyComponent { @@ -251,7 +250,8 @@ export struct EmptyComponent {
251 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) { 250 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) {
252 imageString = $r('app.media.icon_no_content') 251 imageString = $r('app.media.icon_no_content')
253 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent1 || 252 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent1 ||
254 - this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow || this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) { 253 + this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow ||
  254 + this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
255 imageString = $r('app.media.icon_no_appointmentMade1') 255 imageString = $r('app.media.icon_no_appointmentMade1')
256 } 256 }
257 return imageString 257 return imageString
@@ -294,13 +294,14 @@ export struct DetailPlayShortVideoPage { @@ -294,13 +294,14 @@ export struct DetailPlayShortVideoPage {
294 .margin({ left: 8, right: 4 }) 294 .margin({ left: 8, right: 4 })
295 Text("全屏观看") 295 Text("全屏观看")
296 .fontColor(Color.White) 296 .fontColor(Color.White)
  297 + .fontWeight(400)
297 .fontSize(12) 298 .fontSize(12)
298 .layoutWeight(1) 299 .layoutWeight(1)
299 } 300 }
300 .width(84) 301 .width(84)
301 .height(28) 302 .height(28)
302 - .backgroundColor('#0d0d0d')  
303 - .border({ width: 1, color: '#4DFFFFFF', radius: 2 }) 303 + .backgroundColor('#0DFFFFFF')
  304 + .border({ width: 1, color: '#4DFFFFFF', radius: 4 })
304 .alignItems(VerticalAlign.Center) 305 .alignItems(VerticalAlign.Center)
305 .justifyContent(FlexAlign.Center) 306 .justifyContent(FlexAlign.Center)
306 .align(Alignment.Bottom) 307 .align(Alignment.Bottom)