Merge remote-tracking branch 'origin/main'

@@ -53,7 +53,8 @@ export struct LiveHorizontalCardComponent {
 
   resetEdgeAnimation() {
     if (this.moreWidth > this.initMoreWidth) {
-      this.moreWidth = 16
+      this.moreWidth = this.moreWidth - 1
+      this.resetEdgeAnimation();
     }
     this.resetMoreTips()
   }
@@ -93,7 +94,7 @@ export struct LiveHorizontalCardComponent {
             .fontWeight(600)
         }
 
-        if (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') {
+        if (this.compDTO.dataSourceType === 'LIVE_HORIZONTAL_CARD' || this.compDTO.dataSourceType === 'LIVE_MONTHLY_RANKING' || this.compDTO.dataSourceType === 'OBJECT_POS') {
           Row() {
             Text("更多")
               .fontSize($r("app.float.font_size_14"))
@@ -164,14 +165,7 @@ export struct LiveHorizontalCardComponent {
                 })
               })
             }
-            if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
-              Row() {
-                Ellipse()
-                  .width(2* (this.moreWidth - this.initMoreWidth - 1))
-                  .height(this.compDTO.operDataList.length == 2 ? 180 : 146)
-                  .fill(0xf1f3f4)
-                  .position({ left: -(this.moreWidth - this.initMoreWidth - 3) * 0.8 })
-
+            if (this.compDTO.operDataList.length >= 2) {
               Column() {
                 if (this.moreWidth > this.initMoreWidth + 2) {
                   Text(this.moreTips)
@@ -182,12 +176,10 @@ export struct LiveHorizontalCardComponent {
               }
               .justifyContent(FlexAlign.Center)
               .align(Alignment.Center)
-                .height(this.compDTO.operDataList.length == 2 ? 180 : 146)
-                .width(this.initMoreWidth)
+              .width(this.moreWidth)
               .backgroundColor(0xf1f3f4)
               .borderRadius({ topLeft: 5, bottomLeft: 5 })
-              }
-              .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)})
+              .height(this.compDTO.operDataList.length == 2 ? 180 : 146)
             }
           }
         }