Merge remote-tracking branch 'origin/main'

 /**
 /**
  *   More_Comp
  *   More_Comp
  */
  */
-import { ContentDTO , contentListParams, FullColumnImgUrlDTO,
+import { ContentDTO , contentListParams, FullColumnImgUrlDTO, CompDTO
 } from 'wdBean/Index';
 } from 'wdBean/Index';
 import MinePageDatasModel from '../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../model/MinePageDatasModel';
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel';
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel';
 import { SearchDescription } from '../../viewmodel/SearchResultContentItem';
 import { SearchDescription } from '../../viewmodel/SearchResultContentItem';
+import { CardParser } from '../CardParser'
 
 
 const TAG: string = 'More_Comp';
 const TAG: string = 'More_Comp';
 
 
@@ -13,26 +14,54 @@ const TAG: string = 'More_Comp';
 @Component
 @Component
 export struct MoreComponent {
 export struct MoreComponent {
   @State contentDTO: ContentDTO = new ContentDTO();
   @State contentDTO: ContentDTO = new ContentDTO();
+  @State showDetail: boolean = false;
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.dealSearchSameList()
     this.dealSearchSameList()
   }
   }
 
 
   build() {
   build() {
-    Row() {
-      Text('点击展开更多相似')
-        .fontSize(16)
-      Text(`(${this.contentDTO.sameContentListSize})`)
-        .fontSize(16)
-      Image($r('app.media.comment_unfold'))
-        .width(16)
-        .height(16)
+    if (this.showDetail) {
+      ForEach(this.contentDTO.sameContentList, (item: ContentDTO, index: number) => {
+        CardParser({compDTO:new CompDTO, contentDTO: item })
+      })
+    } else {
+      Column() {
+
+        Divider()
+          .width('100%')
+          .height(10)
+          .color($r('app.color.color_F5F5F5'))
+          .strokeWidth('1lpx')
+
+        Row() {
+          Text('点击展开更多相似')
+            .fontSize(16)
+          Text(`(${this.contentDTO.sameContentListSize})`)
+            .fontSize(16)
+          Image($r('app.media.comment_unfold'))
+            .width(16)
+            .height(16)
+        }
+        .justifyContent(FlexAlign.Center)
+        .width('100%')
+        .height(48)
+        .backgroundColor(0xffffff)
+        .onClick(() => {
+          this.showDetail = true;
+        })
+
+        Divider()
+          .width('100%')
+          .height(10)
+          .color($r('app.color.color_F5F5F5'))
+          .strokeWidth('1lpx')
 
 
+      }
     }
     }
-    .justifyContent(FlexAlign.Center)
-    .width('100%')
-    .height(48)
-    .backgroundColor(0xffffff)
+    
+    
+    
   }
   }
 
 
   dealSearchSameList() {
   dealSearchSameList() {
@@ -88,6 +117,8 @@ export struct MoreComponent {
             console.log("ycg","123")
             console.log("ycg","123")
           }
           }
         })
         })
+
+        console.log("MoreComponent", JSON.stringify(this.contentDTO.sameContentList))
       }).catch((err: Error) => {
       }).catch((err: Error) => {
         console.log(TAG, JSON.stringify(err))
         console.log(TAG, JSON.stringify(err))
       })
       })

@@ -176,6 +176,7 @@ export struct QualityCommentsComponent {
             .fontWeight(400)
             .fontWeight(400)
             .fontColor($r('app.color.color_222222'))
             .fontColor($r('app.color.color_222222'))
             .lineHeight('42lpx')
             .lineHeight('42lpx')
+            .visibility(this.tileOpacity < 0.8 ? 1 : 0)
         }
         }
         .height(44)
         .height(44)
         .width('100%')
         .width('100%')

@@ -37,10 +37,14 @@ export struct PlayerRightView {
   @Consume showCommentList: boolean
   @Consume showCommentList: boolean
   @Consume displayDirection: DisplayDirection
   @Consume displayDirection: DisplayDirection
   @Consume publishCommentModel: publishCommentModel
   @Consume publishCommentModel: publishCommentModel
-  @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
-
+  @State likesStyle: number | string = 1 // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+  @State openLikes: boolean = false // 是否可以点赞  1：可以 0：不可以
   aboutToAppear() {
   aboutToAppear() {
-
+    // 内容用 点赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
+    this.likesStyle = this.contentDetailData.likesStyle
+    this.openLikes = this.contentDetailData.openLikes == 1 ? true : false
+    // console.log(TAG, 'this.likesStyle', this.likesStyle)
+    // console.log(TAG, 'this.openLikes', this.openLikes)
   }
   }
 
 
   /**
   /**
@@ -299,7 +303,7 @@ export struct PlayerRightView {
         .margin({ top: 2 })
         .margin({ top: 2 })
     }
     }
     .margin({ bottom: 20 })
     .margin({ bottom: 20 })
-    .visibility(this.likesStyle !== 4 ? Visibility.Visible : Visibility.None)
+    .visibility(this.likesStyle == 4 || this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
     .onClick(() => {
     .onClick(() => {
       // TODO:点赞动画
       // TODO:点赞动画
       this.toggleLikeStatus()
       this.toggleLikeStatus()