Merge remote-tracking branch 'origin/main'

@@ -146,7 +146,7 @@ export struct RmhTitle {
                   .height(16)
               }
             }
-            Text(this.rmhInfo?.rmhDesc)
+            Text(this.rmhInfo?.rmhDesc.replaceAll('\n', ''))
               .fontSize($r("app.float.font_size_12"))
               .fontColor($r("app.color.color_B0B0B0"))
               .maxLines(1)

@@ -401,7 +401,7 @@ export struct ZhSingleRow03 {
           .fontWeight(600)
       }
 
-      if (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') {
+      if (!(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
         Row() {
           Text("更多")
             .fontSize($r("app.float.font_size_14"))

@@ -50,6 +50,16 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
 
   toMore() {
     if (this.moreWidth > this.initMoreWidth * 2) {
+      this.liveToMore();
+    }
+  }
+
+  liveToMore() {
+    if (!!this.compDTO.dataSourceType) {
+      if (this.compDTO.dataSourceType === 'OBJECT_POS') {
+        ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
+        return;
+      }
       if (this.compDTO.linkUrl) {
         let taskAction: Action = {
           type: 'JUMP_H5_BY_WEB_VIEW',
@@ -61,9 +71,24 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
       } else {
         this.jumpToLiveMorePage()
       }
+    } else {
+      if (this.compDTO?.objectType === '11') {
+      } else {
+        const contentDTO: ContentDTO = {
+          objectId: this.compDTO.objectId,
+          objectType: this.compDTO.objectType,
+          linkUrl: this.compDTO.linkUrl,
+          pageId: this.compDTO.pageId
+        } as ContentDTO
+        ProcessUtils.processPage(contentDTO)
+      }
     }
   }
 
+  showMore() {
+    return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
+  }
+
   build() {
     Column() {
       Row() {
@@ -87,19 +112,9 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
             .width(14)
             .height(14)
         }
-        .visibility(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '' ? Visibility.None : Visibility.Visible)
+        .visibility(this.showMore() ? Visibility.Visible : Visibility.None)
         .onClick(() => {
-          if (this.compDTO.linkUrl) {
-            let taskAction: Action = {
-              type: 'JUMP_H5_BY_WEB_VIEW',
-              params: {
-                url: this.compDTO.linkUrl
-              } as Params,
-            };
-            WDRouterRule.jumpWithAction(taskAction)
-          } else {
-            this.jumpToLiveMorePage()
-          }
+          this.liveToMore();
         })
 
       }.justifyContent(FlexAlign.SpaceBetween)
@@ -141,7 +156,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
             })
           }
 
-          if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+          if (this.compDTO.operDataList.length >= 2 && this.showMore()) {
             Row() {
               Ellipse()
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))

@@ -99,6 +99,10 @@ export struct LiveHorizontalCardComponent {
     this.loadImg = await onlyWifiLoadImg();
   }
 
+  showMore() {
+    return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
+  }
+
 
   build() {
     Column() {
@@ -114,7 +118,7 @@ export struct LiveHorizontalCardComponent {
             .fontWeight(600)
         }
 
-        if (this.compDTO.dataSourceType === 'LIVE_HORIZONTAL_CARD' || this.compDTO.dataSourceType === 'LIVE_MONTHLY_RANKING' || this.compDTO.dataSourceType === 'OBJECT_POS') {
+        if (this.showMore()) {
           Row() {
             Text("更多")
               .fontSize($r("app.float.font_size_14"))
@@ -175,7 +179,7 @@ export struct LiveHorizontalCardComponent {
                 })
               })
             }
-            if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+            if (this.compDTO.operDataList.length >= 2 && this.showMore()) {
               Row() {
                 Ellipse()
                   .width(2* (this.moreWidth - this.initMoreWidth - 1))