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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  feat: 18447 横滑卡-选择跳转右滑至卡片结尾_查看更多交互效果与安卓不一致且不跳转到配置的页面
  feat: resetMoreTips
  fix(17493)：人民号冷启动卡-行间距过大、功能按钮位置偏下
  feat: 18447 横滑卡-选择跳转右滑至卡片结尾_查看更多交互效果与安卓不一致且不跳转到配置的页面
  fix(17493)：人民号冷启动卡-行间距过大、功能按钮位置偏下

@@ -321,6 +321,10 @@
       "value": "15vp"
       "value": "15vp"
     },
     },
     {
     {
+      "name": "vp_15_7",
+      "value": "15.7vp"
+    },
+    {
       "name": "vp_18",
       "name": "vp_18",
       "value": "18vp"
       "value": "18vp"
     },
     },

@@ -55,6 +55,7 @@ export struct ZhSingleRow02 {
     if (this.moreWidth > this.initMoreWidth) {
     if (this.moreWidth > this.initMoreWidth) {
       this.moreWidth = 16
       this.moreWidth = 16
     }
     }
+    this.resetMoreTips()
   }
   }
 
 
   toMore() {
   toMore() {

@@ -26,7 +26,7 @@ export struct PeopleShipRecommendComponent {
           .height('30vp')
           .height('30vp')
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
           .fontWeight(600)
           .fontWeight(600)
-          .fontSize($r('app.float.vp_18'))
+          .fontSize($r('app.float.vp_15_7'))
 
 
         Blank()
         Blank()
         Button({ type: ButtonType.Normal, stateEffect: false }) {
         Button({ type: ButtonType.Normal, stateEffect: false }) {
@@ -35,7 +35,7 @@ export struct PeopleShipRecommendComponent {
               .height('30vp')
               .height('30vp')
               .fontColor($r('app.color.color_999999'))
               .fontColor($r('app.color.color_999999'))
               .fontWeight(400)
               .fontWeight(400)
-              .fontSize($r('app.float.vp_14'))
+              .fontSize($r('app.float.vp_13'))
             Image($r('app.media.ic_refresh'))
             Image($r('app.media.ic_refresh'))
               .width('14vp')
               .width('14vp')
               .height('14vp')
               .height('14vp')
@@ -56,7 +56,7 @@ export struct PeopleShipRecommendComponent {
       .width('100%')
       .width('100%')
       .alignSelf(ItemAlign.Start)
       .alignSelf(ItemAlign.Start)
       .margin({
       .margin({
-        top: '10vp',
+        top: '-50vp',
         bottom: '10vp'
         bottom: '10vp'
       })
       })
 
 
@@ -75,7 +75,7 @@ export struct PeopleShipRecommendComponent {
       .columnsTemplate('1fr 1fr 1fr')
       .columnsTemplate('1fr 1fr 1fr')
       .columnsGap(20)
       .columnsGap(20)
       .rowsGap(16)
       .rowsGap(16)
-      .height(Math.ceil(this.rmhList.length / 3.0) * 132)
+      .height(Math.ceil(this.rmhList.length / 3.0) * 126)
       .backgroundColor(Color.Transparent)
       .backgroundColor(Color.Transparent)
       .margin({
       .margin({
         right: '20vp',
         right: '20vp',
@@ -94,7 +94,7 @@ export struct PeopleShipRecommendComponent {
         .borderRadius('3vp')
         .borderRadius('3vp')
         .fontColor($r('app.color.color_999999'))
         .fontColor($r('app.color.color_999999'))
         .fontWeight(500)
         .fontWeight(500)
-        .fontSize($r('app.float.vp_14'))
+        .fontSize($r('app.float.vp_13'))
         .fontColor(Color.White)
         .fontColor(Color.White)
         .onClick(() => {
         .onClick(() => {
           // 点击一键关注
           // 点击一键关注

@@ -11,8 +11,8 @@ export struct PeopleShipRecommendHeadComponent {
     Column(){
     Column(){
       Stack({ alignContent: Alignment.BottomEnd }) {
       Stack({ alignContent: Alignment.BottomEnd }) {
         Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'))
         Image(this.rmhInfo.headPhotoUrl.length > 0 ? this.rmhInfo.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'))
-          .width('44vp')
-          .height('44vp')
+          .width('40vp')
+          .height('40vp')
           .borderRadius('22vp')
           .borderRadius('22vp')
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
 
 
@@ -23,12 +23,12 @@ export struct PeopleShipRecommendHeadComponent {
           .margin({
           .margin({
             right: '-3vp'
             right: '-3vp'
           })
           })
-      }.margin({ top: 12, bottom: 8 })
+      }.margin({ top: 4, bottom: 8 })
 
 
       Row() {
       Row() {
         Text(this.rmhInfo.userName)
         Text(this.rmhInfo.userName)
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
-          .fontSize($r('app.float.vp_14'))
+          .fontSize($r('app.float.vp_13'))
           .fontWeight(600)
           .fontWeight(600)
           .maxLines(1)
           .maxLines(1)
           .textOverflow({overflow: TextOverflow.Ellipsis})
           .textOverflow({overflow: TextOverflow.Ellipsis})
@@ -49,14 +49,14 @@ export struct PeopleShipRecommendHeadComponent {
 
 
       Text(this.rmhInfo.introduction)
       Text(this.rmhInfo.introduction)
         .fontColor($r('app.color.color_B0B0B0'))
         .fontColor($r('app.color.color_B0B0B0'))
-        .fontSize($r('app.float.vp_12'))
-        .margin({ top: 8, bottom: 14 })
+        .fontSize($r('app.float.vp_11'))
+        .margin({ top: 6, bottom: 14 })
         .textOverflow({overflow: TextOverflow.Ellipsis})
         .textOverflow({overflow: TextOverflow.Ellipsis})
         .maxLines(2)
         .maxLines(2)
         .height(34)
         .height(34)
     }
     }
     .width('100%')
     .width('100%')
-    .height('116vp')
+    .height('110vp')
 
 
   }
   }
 
 

@@ -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)})
             }
             }
           }
           }
         }
         }
@@ -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();
             }
             }
           }
           }

@@ -321,6 +321,10 @@
       "value": "15vp"
       "value": "15vp"
     },
     },
     {
     {
+      "name": "vp_15_7",
+      "value": "15.7vp"
+    },
+    {
       "name": "vp_18",
       "name": "vp_18",
       "value": "18vp"
       "value": "18vp"
     },
     },