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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 搜索-0807话题专题，搜索结果中话题专题卡片未展示标签和专题名称

@@ -59,6 +59,7 @@ export struct CardParser {
     Column() {
     Column() {
       // Text('CardParser')
       // Text('CardParser')
       // Text(JSON.stringify(this.contentDTO.appStyle))
       // Text(JSON.stringify(this.contentDTO.appStyle))
+      // Text(this.contentDTO.newsTitle)
       this.contentBuilder(this.contentDTO);
       this.contentBuilder(this.contentDTO);
     }
     }
   }
   }

@@ -28,7 +28,9 @@ export struct Card5Component {
   @State textArr: textItem[] = []
   @State textArr: textItem[] = []
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
-    console.log('Card2Component', JSON.stringify(this.compDTO),this.contentDTO.titleShow)
+    // console.log(TAG, JSON.stringify(this.compDTO),this.contentDTO.titleShow)
+    // console.log(TAG, 'this.contentDTO.title', this.contentDTO.title)
+    // console.log(TAG, 'this.contentDTO.newsTitle', this.contentDTO.newsTitle)
     const curRouter = router.getState().name;
     const curRouter = router.getState().name;
     this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
     this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
     this.loadImg = await onlyWifiLoadImg();
     this.loadImg = await onlyWifiLoadImg();
@@ -68,7 +70,7 @@ export struct Card5Component {
         .borderColor($r('app.color.color_0D000000'))
         .borderColor($r('app.color.color_0D000000'))
         .height(this.loadImg ? '' : 114)
         .height(this.loadImg ? '' : 114)
         .autoResize(true)
         .autoResize(true)
-      if (this.titleShowPolicy == 1) {
+      if (this.contentDTO.titleShow == 1) {
         Row()
         Row()
           .borderRadius(
           .borderRadius(
             {
             {
@@ -87,7 +89,7 @@ export struct Card5Component {
           })
           })
 
 
         Row() {
         Row() {
-          if (this.titleShowPolicy == 1 && this.contentDTO.newsTitle) {
+          if (this.contentDTO.titleShow == 1 && this.contentDTO.newsTitle) {
             Stack() {
             Stack() {
               if(this.contentDTO.objectType == '5'){
               if(this.contentDTO.objectType == '5'){
                 Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(20).align(Alignment.Center)
                 Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(20).align(Alignment.Center)

@@ -48,7 +48,7 @@ export struct VideoChannelPage {
   async aboutToAppear() {
   async aboutToAppear() {
     // 背景图高度
     // 背景图高度
     this.backgroundImageH = px2vp(this.topSafeHeight) + 44
     this.backgroundImageH = px2vp(this.topSafeHeight) + 44
-    console.info(`cj2024 backgroundImageH = ${this.backgroundImageH} this.topSafeHeight = ${this.topSafeHeight}`)
+    // console.info(`cj2024 backgroundImageH = ${this.backgroundImageH} this.topSafeHeight = ${this.topSafeHeight}`)
     this.setBarBackgroundColor()
     this.setBarBackgroundColor()
   }
   }
 
 
@@ -89,7 +89,7 @@ export struct VideoChannelPage {
    * @returns
    * @returns
    */
    */
   tabSelectedColor(selected: boolean): string {
   tabSelectedColor(selected: boolean): string {
-    console.info(`cj2024 selected this.navItem.channelChooseColor=${this.navItem.channelChooseColor} selected = ${selected}`)
+    // console.info(`cj2024 selected this.navItem.channelChooseColor=${this.navItem.channelChooseColor} selected = ${selected}`)
     if (selected) {
     if (selected) {
       return this.navItem.channelChooseColor ? this.navItem.channelChooseColor : '#222222'
       return this.navItem.channelChooseColor ? this.navItem.channelChooseColor : '#222222'
     } else {
     } else {