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

@@ -115,6 +115,7 @@ export struct CompParser {
         }
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
         ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
+        Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
         ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
@@ -131,6 +132,7 @@ export struct CompParser {
 
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
+        Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
         ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
@@ -178,6 +180,7 @@ export struct CompParser {
         })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
         ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
+        Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
         // ZhSingleColumn05({ compDTO: compDTO })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
@@ -216,7 +219,8 @@ export struct CompParser {
           Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
         }
       } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
-        Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
+        // Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 })
+        Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
       } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
         // 大专题
         if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {

@@ -163,9 +163,9 @@ export struct MorningEveningPaperComponent {
           this.getAllContentInteractData(this.compListItem.operDataList)
         }
         console.log(TAG, 'compInfoBean?.compList[0].audioDataList', JSON.stringify(compInfoBean?.compList[0].audioDataList))
-        if (compInfoBean?.compList[0].audioDataList) {
-          this.audioPlayUrl = compInfoBean?.compList[0].audioDataList[0].audioUrl
-          this.audioTitle = compInfoBean?.compList[0].audioDataList[0].title
+        if (compInfoBean?.compList[0].audioDataList.length > 0) {
+          this.audioPlayUrl = compInfoBean?.compList[0].audioDataList[0]?.audioUrl
+          this.audioTitle = compInfoBean?.compList[0].audioDataList[0]?.title
           console.log(TAG, 'this.audioPlayUrl', this.audioPlayUrl)
         }
       }
@@ -216,6 +216,11 @@ export struct MorningEveningPaperComponent {
     // const pixelMap: image.PixelMap = await image2PixelMap(item.icon);
     console.log(TAG, "compInfoBean compStyle = " + imageUrl)
     
+    if (this.pageInfoBean.backgroundColor.length > 0){
+      this.mixedBgColor = this.pageInfoBean.backgroundColor
+      return
+    }
+
     if (imageUrl.length > 0 && this.pageInfoBean.topicInfo.frontFlag === 1) {
       const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
       this.pickColor(imageSource)

@@ -245,9 +245,9 @@ struct createImg {
                 // .aspectRatio(this.onePicW > this.onePicH ? 343 / 198 : 228 / 305)
                 .width('100%')
                 .autoResize(true)
-                .objectFit(ImageFit.Cover)
+                // .objectFit(ImageFit.Cover)
                 .autoResize(true)
-                .aspectRatio(3/4)
+                // .aspectRatio(3/4)
                 .borderRadius(this.caclImageRadius(index))
                 .opacity(!item.weight && !item.height ? 0 : 1)
                 .onComplete((event?) => {

@@ -69,7 +69,7 @@ export struct ZhGridLayout03 {
         .maxLines(1)
         .margin({
           top: 8,
-          bottom: 11
+          bottom: 8
         })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
 

@@ -253,10 +253,10 @@ struct MineHomePage {
                   Tabs({controller: this.controller}) {
                     TabContent() {
                       HomePageBottomCommentComponent({commentNum:$commentNum})
-                    }
+                    }.gesture(PanGesture(new PanGestureOptions({ direction: PanDirection.Right })))
                     TabContent() {
                       HomePageBottomFollowComponent()
-                    }
+                    }.gesture(PanGesture(new PanGestureOptions({ direction: PanDirection.Left })))
                   }
                   .backgroundColor($r('app.color.white'))
                   .animationDuration(0)

@@ -93,7 +93,7 @@ export struct VideoChannelPage {
       return this.navItem.channelChooseColor ? this.navItem.channelChooseColor : '#222222'
     } else {
       let ccolor = this.navItem.channelChooseCColor.replace('#', '#B3')
-      return this.navItem.channelChooseCColor ? ccolor : '#B3FFFFFF'
+      return this.navItem.channelChooseCColor ? ccolor : '#666666'
     }
 
   }