Merge commit '833e2972'

@@ -190,11 +190,11 @@ export struct ImageAndTextPageComponent {
         .alignItems(VerticalAlign.Bottom)
 
         Row() {
-          Image($r('app.media.line'))
+          Image($r('app.media.ic_news_detail_division'))
             .width('100%')
-            .height(7)
-            .objectFit(ImageFit.Cover)
+            .height(6)
             .margin({ top: 10 })
+            .objectFit(ImageFit.Fill)
         }
         .padding({ left: 15, right: 15 })
         .backgroundColor(Color.White)

@@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
+
 // import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
 const TAG: string = 'Card2Component';
 
@@ -48,9 +49,9 @@ export struct Card2Component {
         Stack() {
           //新闻标题
           if (this.contentDTO.newTags) {
-              Notes({ newTags: this.contentDTO.newTags })
+            Notes({ newTags: this.contentDTO.newTags })
           } else if (this.contentDTO.objectType == '5') {
-              Notes({ objectType: this.contentDTO.objectType })
+            Notes({ objectType: this.contentDTO.objectType })
           }
 
           Text() {
@@ -66,15 +67,16 @@ export struct Card2Component {
           .fontSize($r('app.float.font_size_18'))
           .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
           .maxLines(2)
-          .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
+          .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
           .align(Alignment.Start)
           .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
-          (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
-            this.contentDTO.objectType == '5' ? 30 : 0)
-      }.alignContent(Alignment.TopStart)
-          //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
-       // }
-       // .alignContent(Alignment.TopStart)
+            (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
+              this.contentDTO.objectType == '5' ? 35 : 0)
+        }.alignContent(Alignment.TopStart)
+
+        //.textIndent(this.contentDTO.objectType == '5' ? 35 : 0)
+        // }
+        // .alignContent(Alignment.TopStart)
 
         //大图
         Stack() {

@@ -76,7 +76,7 @@ export struct Card6Component {
             .maxLines(3)
             .alignSelf(ItemAlign.Start)
             .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
-            .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 58 :
+            .textIndent(this.contentDTO?.newTags?.length < 5 && this.contentDTO?.newTags?.length > 2 ? 58 :
               (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
                 this.contentDTO.objectType == '5' ? 35 : 0)
           }.alignContent(Alignment.TopStart)

@@ -19,7 +19,7 @@ export struct channelSkeleton {
               textArea('40%', 12)
             }
             .RightStyle()
-            
+
             Column() {
               textArea('35%', 78)
             }
@@ -30,7 +30,6 @@ export struct channelSkeleton {
           .SkeletonStyle()
         })
 
-        textArea('40%', 12)
 
         Column() {
           textArea('100%', 204)

@@ -131,8 +131,7 @@ export struct EmptyComponent {
       // .height(this.EMPTY_IMAGE_HEIGHT)
 
       Text(this.emptyType !== 8 ? this.buildNoDataTip() : `${this.buildNoDataTip()}(${this.timeNum}s)`)
-        .fontSize($r('app.float.font_size_14'))
-        .fontColor('#FF999999')
+        .fontSize($r('app.float.font_size_14'))// .fontColor('#FF999999')
         .fontWeight(FontWeight.Normal)
         .opacity(this.TEXT_OPACITY)
         .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
@@ -233,7 +232,7 @@ export struct EmptyComponent {
       imageString = $r('app.media.icon_no_message')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment ||
       this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1) {
-      imageString = $r('app.media.icon_no_comment')
+      imageString = $r('app.media.icon_no_comment1')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) {
       imageString = $r('app.media.icon_no_result1')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
@@ -251,7 +250,8 @@ export struct EmptyComponent {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) {
       imageString = $r('app.media.icon_no_content')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent1 ||
-      this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow || this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
+      this.emptyType === WDViewDefaultType.WDViewDefaultType_NoFollow ||
+      this.emptyType === WDViewDefaultType.WDViewDefaultType_NoContent2) {
       imageString = $r('app.media.icon_no_appointmentMade1')
     }
     return imageString

@@ -294,13 +294,14 @@ export struct DetailPlayShortVideoPage {
         .margin({ left: 8, right: 4 })
       Text("全屏观看")
         .fontColor(Color.White)
+        .fontWeight(400)
         .fontSize(12)
         .layoutWeight(1)
     }
     .width(84)
     .height(28)
-    .backgroundColor('#0d0d0d')
-    .border({ width: 1, color: '#4DFFFFFF', radius: 2 })
+    .backgroundColor('#0DFFFFFF')
+    .border({ width: 1, color: '#4DFFFFFF', radius: 4 })
     .alignItems(VerticalAlign.Center)
     .justifyContent(FlexAlign.Center)
     .align(Alignment.Bottom)