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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 19925 3:2横划卡-后台配置2个运营位，客户端无法向右滑动查看完整横划卡
  fix: 三图卡视频，标签与稿件名称未对齐
  fix: 视频偶发弹网络提示

@@ -50,16 +50,16 @@ export struct Card4Component {
       Column() {
       Column() {
         Stack() {
         Stack() {
           if(this.contentDTO.objectType == '5'){
           if(this.contentDTO.objectType == '5'){
-            Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(19).align(Alignment.Center)
+            Notes({ objectType: this.contentDTO.objectType,objectLevel:this.contentDTO.objectLevel }).height(28).align(Alignment.Center)
           } else {
           } else {
             if (this.contentDTO.seoTags) {
             if (this.contentDTO.seoTags) {
-              Notes({ newTags: this.contentDTO.seoTags }).height(19).align(Alignment.Center)
+              Notes({ newTags: this.contentDTO.seoTags }).height(28).align(Alignment.Center)
             }
             }
             if (this.contentDTO.newTags) {
             if (this.contentDTO.newTags) {
-              Notes({ newTags: this.contentDTO.newTags }).height(19).align(Alignment.Center)
+              Notes({ newTags: this.contentDTO.newTags }).height(28).align(Alignment.Center)
             }
             }
             if (this.contentDTO.top === 1) {
             if (this.contentDTO.top === 1) {
-              Notes({ newTags: '置顶' }).height(20).align(Alignment.Center)
+              Notes({ newTags: '置顶' }).height(28).align(Alignment.Center)
             }
             }
           }
           }
           Text() {
           Text() {

@@ -120,9 +120,9 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
                   .textAlign(TextAlign.Start)
                   .textAlign(TextAlign.Start)
                   .margin({ top: 8 })
                   .margin({ top: 8 })
                   .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
                   .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
-                  .lineHeight(21)
+                  .lineHeight(19)
               }
               }
-              .height(this.compDTO.operDataList.length == 2 ? 180 : 148)
+              .height(this.compDTO.operDataList.length == 2 ? 190 : 148)
               .padding({ right: 16 })
               .padding({ right: 16 })
               // .offset({x:16})
               // .offset({x:16})
               .onClick(() => {
               .onClick(() => {
@@ -160,7 +160,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
         }
         }
       }
       }
       .align(Alignment.Start)
       .align(Alignment.Start)
-      .scrollable(this.compDTO.operDataList.length > 2 ? ScrollDirection.Horizontal : ScrollDirection.None)
+      .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None)
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
       .edgeEffect(EdgeEffect.None)
       .edgeEffect(EdgeEffect.None)
       .onReachEnd(() => {
       .onReachEnd(() => {

@@ -76,6 +76,10 @@ export struct PlayerProgressView {
     // .markAnchor({ x: 0, y: '100%' })
     // .markAnchor({ x: 0, y: '100%' })
   }
   }
 
 
+  aboutToDisappear(): void {
+    clearTimeout(this.timer)
+  }
+
   build() {
   build() {
     Stack() {
     Stack() {
       this.playerLoadingBuilder()
       this.playerLoadingBuilder()