Showing
3 changed files
with
8 additions
and
7 deletions
| @@ -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 | ||
| @@ -66,12 +67,13 @@ export struct Card2Component { | @@ -66,12 +67,13 @@ 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.newTags?.length != 0 && this.contentDTO.newTags?.length) || |
| 73 | - this.contentDTO.objectType == '5' ? 30 : 0) | 74 | + this.contentDTO.objectType == '5' ? 35 : 0) |
| 74 | }.alignContent(Alignment.TopStart) | 75 | }.alignContent(Alignment.TopStart) |
| 76 | + | ||
| 75 | //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0) | 77 | //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0) |
| 76 | // } | 78 | // } |
| 77 | // .alignContent(Alignment.TopStart) | 79 | // .alignContent(Alignment.TopStart) |
| @@ -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 |
-
Please register or login to post a comment