Merge remote-tracking branch 'origin/main'

@@ -175,7 +175,14 @@ export struct LiveHorizontalCardComponent {
                 })
                 })
               })
               })
             }
             }
-            if (this.compDTO.operDataList.length >= 2) {
+            if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+              Row() {
+                Ellipse()
+                  .width(2* (this.moreWidth - this.initMoreWidth - 1))
+                  .height('100%')
+                  .fill(0xe9e9e9)
+                  .position({ left: -(this.moreWidth - this.initMoreWidth - 3) * 0.8 , top: 0 })
+
                 Column() {
                 Column() {
                   if (this.moreWidth > this.initMoreWidth + 2) {
                   if (this.moreWidth > this.initMoreWidth + 2) {
                     Text(this.moreTips)
                     Text(this.moreTips)
@@ -186,10 +193,12 @@ export struct LiveHorizontalCardComponent {
                 }
                 }
                 .justifyContent(FlexAlign.Center)
                 .justifyContent(FlexAlign.Center)
                 .align(Alignment.Center)
                 .align(Alignment.Center)
-              .width(this.moreWidth)
-              .backgroundColor(0xf1f3f4)
+                .height('100%')
+                .width(this.initMoreWidth)
+                .backgroundColor(0xe9e9e9)
                 .borderRadius({ topLeft: 5, bottomLeft: 5 })
                 .borderRadius({ topLeft: 5, bottomLeft: 5 })
-              .height(this.compDTO.operDataList.length == 2 ? 180 : 146)
+              }
+              .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)})
             }
             }
           }
           }
         }
         }
@@ -201,7 +210,7 @@ export struct LiveHorizontalCardComponent {
           this.edgeAnimation()
           this.edgeAnimation()
         })
         })
         .onScrollStop(() => {
         .onScrollStop(() => {
-          // this.resetEdgeAnimation();
+          this.resetEdgeAnimation();
         })
         })
         .onScroll((xOffset: number, yOffset: number) => {
         .onScroll((xOffset: number, yOffset: number) => {
           if (xOffset < 0) {
           if (xOffset < 0) {
@@ -211,6 +220,7 @@ export struct LiveHorizontalCardComponent {
         .onTouch((event?: TouchEvent) => {
         .onTouch((event?: TouchEvent) => {
           if(event) {
           if(event) {
             if (event.type === TouchType.Up) {
             if (event.type === TouchType.Up) {
+              this.toMore();
               this.resetEdgeAnimation();
               this.resetEdgeAnimation();
             }
             }
           }
           }