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

yuzhilin
Commit b6a4845df3ba9f4b064035a56203ce50f8b343f0 b6a4845d 2 parents e5057943 25c33979
Showing 1 changed file with 7 additions and 6 deletions
sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
View file @b6a4845
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
View file @b6a4845
-import { AccountManagerUtils, Logger, DateTimeUtils, SPHelper, NumberFormatterUtils  } from 'wdKit';
+import { AccountManagerUtils, Logger, DateTimeUtils, SPHelper, NumberFormatterUtils, DisplayUtils  } from 'wdKit';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { ContentDetailDTO,postBatchAttentionStatusParams,
   PhotoListBean,
@@ -275,8 +275,8 @@ export struct DynamicDetailComponent {
                           Image(this.contentDetailData.fullColumnImgUrls!= null && this.contentDetailData.fullColumnImgUrls.length>0&&!StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url)?
                           this.contentDetailData.fullColumnImgUrls[0].url:
                           this.contentDetailData.videoInfo[0].firstFrameImageUri)
-                            .width(CommonConstants.FULL_WIDTH)
-                            .aspectRatio(16 / 9)
+                            .width(DisplayUtils.getDeviceWidth()-32)
+                            .height((DisplayUtils.getDeviceWidth()-32)* 9 / 16)
                             .borderRadius($r('app.float.image_border_radius'))
                           CardMediaInfo({ contentDTO: this.mJumpInfo })
                         }
@@ -291,7 +291,8 @@ export struct DynamicDetailComponent {
                           Image(this.contentDetailData.fullColumnImgUrls!= null && this.contentDetailData.fullColumnImgUrls.length>0&&!StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url)?
                           this.contentDetailData.fullColumnImgUrls[0].url:
                           this.contentDetailData.videoInfo[0].firstFrameImageUri)
-                            .width(CommonConstants.FULL_WIDTH)
+                            .width(DisplayUtils.getDeviceWidth()/2)
+                            .height(DisplayUtils.getDeviceWidth()/2* 4 / 3)
                             .borderRadius($r('app.float.image_border_radius'))
                           CardMediaInfo({ contentDTO: this.mJumpInfo })
                         }
@@ -299,7 +300,7 @@ export struct DynamicDetailComponent {
                       }
                     }
                   }
-                  .margin({ left: $r('app.float.margin_16'),right: $r('app.float.margin_16'),top: $r('app.float.margin_8')})
+                  .margin({ left: $r('app.float.margin_16'),top: $r('app.float.margin_8')})
                   .onClick((event: ClickEvent) => {
                     ProcessUtils.processPage(this.mJumpInfo)
                   })
@@ -362,7 +363,7 @@ export struct DynamicDetailComponent {
               })
               // 评论
               if (this.contentDetailData?.openComment) {
-                Divider().strokeWidth(6).color('#f5f5f5')
+                Divider().strokeWidth(6).color('#f5f5f5').margin({top:$r('app.float.margin_24')})
                 CommentComponent({
                   publishCommentModel: {
                     targetId: String(this.contentDetailData?.newsId || ''),