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

@@ -323,6 +323,7 @@ export struct WdWebLocalComponent {
     }else {
       Row() {
         Image(this.isPause ? $r('app.media.icon_play') : $r('app.media.icon_pause'))
+          .interpolation(ImageInterpolation.Medium)
           .width(24)
           .height(24)
           .onClick(() => {

@@ -121,7 +121,11 @@ export struct RmhTitle {
     const time1 = new Date().getTime(); // 今天日期的时间戳
     const time2 = new Date(date).getTime(); // 要比较日期的时间戳
     const diffDays = Math.round(Math.abs((time1 - time2) / oneDay)); // 两个日期时间戳差值除以一天的毫秒数得到天数，取绝对值并四舍五入
-    return Math.ceil(diffDays);
+    return diffDays;
+  }
+
+  showTime() {
+    return !(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)
   }
 
   build() {
@@ -158,7 +162,7 @@ export struct RmhTitle {
 
         // Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) {
           Row() {
-            if (!(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)) {
+            if (this.showTime()) {
               if (this.publishTime) {
                 Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime)))
                   .fontSize($r("app.float.font_size_12"))
@@ -182,16 +186,19 @@ export struct RmhTitle {
                 .textAlign(TextAlign.Start)
                 .height(14)
                 .lineHeight(14)
-                .constraintSize({maxWidth:(DisplayUtils.getDeviceWidth() - 32 - 36 - 18 - this.getTextWidth(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime))))})
+                .width('calc(100% - 54vp)')
+                // .constraintSize({maxWidth:(DisplayUtils.getDeviceWidth() - 32 - 36 - 18 - this.getTextWidth(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime))))})
             }
 
           }
           .height(14)
           .align(Alignment.Start)
+        .width('100%')
         // }
         // .width('calc(100% - 36vp - 8vp)')
       }
       .justifyContent(FlexAlign.SpaceBetween)
+      .width('100%')
 
       Blank()
       if (this.rmhInfo?.cnIsAttention) {
@@ -207,14 +214,17 @@ export struct RmhTitle {
               .fontSize($r('app.float.font_size_13'))
               .fontColor(Number(this.followStatus) === 0 ? $r('app.color.color_ED2800') : 0xc6c6c6)
           }.margin({top:4})
+          .height(36)
         }
         .flexShrink(0)
         .onClick(() => {
           this.handleAccention();
         })
+        .height(36)
       }
     }
     .width(CommonConstants.FULL_WIDTH)
+    .height(36)
     .margin({ bottom: 10 })
     .onClick(()=>{
       ///个人主页 动态头像不能跳转

@@ -58,7 +58,7 @@ export default struct MinePageUserSimpleInfoUI {
           .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))
           .width(63.21)
           .height(63.21)
-          .objectFit(ImageFit.Cover)
+          .objectFit(ImageFit.Fill)
           .borderRadius(50)
 
         if(StringUtils.isNotEmpty(this.levelHead)){

@@ -9,9 +9,8 @@ export struct SubscribeListChildComponent{
       Row(){
         Text(`${this.item.dealTime}`)
           .margin({top:16,bottom:12})
-          .fontWeight(400)
           .fontSize(12)
-          .lineHeight(17)
+          .lineHeight(16)
           .fontColor($r('app.color.color_999999'))
       }.width('100%')
       .backgroundColor($r('app.color.color_F5F5F5'))
@@ -45,7 +44,6 @@ export struct SubscribeListChildComponent{
           Text(`${this.item.desc}`)
             .fontSize(14)
             .lineHeight(20)
-            .fontWeight(400)
             .fontColor($r('app.color.color_222222'))
             .layoutWeight(1)
         }.alignItems(VerticalAlign.Center)

@@ -8,6 +8,7 @@ import { TrackConstants,
   TrackingContent, TrackingPageBrowse, TrackParamConvert } from 'wdTracking/Index';
 import { WDShare } from 'wdShare/Index';
 import { hasClicked, persistentStorage } from '../../utils/persistentStorage';
+import { LottieView } from '../lottie/LottieView';
 
 const TAG: string = 'CardView';
 
@@ -443,7 +444,7 @@ export struct PaperSingleColumn999CardView {
           Image(this.item?.coverUrl)
             .borderRadius(5)
             .objectFit(ImageFit.Cover)
-            .aspectRatio(319 / 179) ///图片设计比例
+            .aspectRatio(319 / 200) ///图片设计比例
             .padding({ top: 10 })
           //视频
           if (this.item?.videoInfo) {
@@ -481,6 +482,15 @@ export struct PaperSingleColumn999CardView {
                 .width(14)
                 .height(14)
                 .objectFit(ImageFit.Contain)
+              // LottieView({
+              //   name: 'MorningPaper_live_status',
+              //   path: "lottie/live_detail_living.json",
+              //   lottieWidth: 14,
+              //   lottieHeight: 14,
+              //   autoplay: true,
+              //   loop: true,
+              // })
+              
               Text(this.buildLiveStateString())
                 .fontColor(Color.White)
                 .fontSize($r('app.float.vp_12'))

@@ -5,8 +5,10 @@ export struct CustomTitleUI {
   imgBack:boolean = true
   titleName:ResourceStr = "默认标题"
   @Prop percent:number = 1
+  isShowBottomLine:boolean = false
 
   build() {
+    Column(){
       RelativeContainer() {
         //标题栏目
         if(this.imgBack){
@@ -43,6 +45,13 @@ export struct CustomTitleUI {
       .height(44)
       .width('100%')
       .backgroundColor($r('app.color.white'))
+
+      if(this.isShowBottomLine){
+        Text().backgroundColor($r('app.color.color_EDEDED'))
+          .width('100%')
+          .height(1)
+      }
+    }
   }
 
   calcHeight(value:number): number{

@@ -12,14 +12,14 @@ export struct detailedSkeleton {
       Column() {
         Column() {
           textArea('100%', 20)
-          textArea('50%', 20)
+          textArea('52.5%', 20)
         }
         .SkeletonStyle()
         .alignItems(HorizontalAlign.Start)
 
         Column() {
-          textArea('30%', 12)
-          textArea('30%', 12)
+          textArea('23%', 12)
+          textArea('23%', 12)
         }
         .SkeletonStyle()
         .alignItems(HorizontalAlign.Start)

@@ -26,7 +26,7 @@ export class MineSettingDatasModel {
     mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false,"private_setting"))
     let wifiState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_IMAGE_SWITCH,false) as boolean
     mainSettingData.push(new MineMainSettingFunctionItem(null, '仅wifi网络加载图片', null, 1, wifiState,"wifi_switch"))
-     let videoState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_VIDEO_SWITCH,false) as boolean
+     let videoState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_VIDEO_SWITCH,true) as boolean
     mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch"))
      let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean
     // mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch"))

@@ -14,10 +14,9 @@ struct ShowUserHeaderPage {
     Row() {
       Image(this.headPhotoUrl)
         .alt($r('app.media.default_head'))
-        .width('720lpx')
-        .height('720lpx')
+        .width('100%')
         .objectFit(ImageFit.Auto)
-        .clip(new Circle({ width: '720lpx', height: '720lpx' }))
+        // .clip(new Circle({ width: '720lpx', height: '720lpx' }))
     }
     .width('100%')
     .height('100%')

@@ -16,7 +16,7 @@ async function onlyWifiLoadImg(): Promise<boolean> {
 }
 
 async function onlyWifiLoadVideo(): Promise<boolean> {
-  let loadImageOnlyWifiSwitch = await SPHelper.default.get(SpConstants.SETTING_WIFI_VIDEO_SWITCH, '') || false;
+  let loadImageOnlyWifiSwitch = await SPHelper.default.get(SpConstants.SETTING_WIFI_VIDEO_SWITCH, true) || false;
   if (!loadImageOnlyWifiSwitch) {
     // 开关没开，直接让加载视频
     return true

@@ -143,7 +143,7 @@ export struct DetailPlayVLivePage {
 
     Stack({ alignContent: Alignment.Top }) {
       // 直播背景图，模糊处理
-      Image(this.liveDetailPageLogic.imgUrl)
+      Image(this.liveDetailPageLogic.getLiveCoverUrl())
         .height('100%')
         .width('100%')
         .blur(100)

@@ -84,4 +84,11 @@ export class LiveDetailPageLogic {
     }
 
   }
+
+  getLiveCoverUrl() {
+    if (this.contentDetailData.fullColumnImgUrls.length > 0) {
+      return this.contentDetailData.fullColumnImgUrls[0].url
+    }
+    return ''
+  }
 }
\ No newline at end of file

@@ -70,7 +70,12 @@ struct LoginProtocolWebview {
         }
         .alignItems(VerticalAlign.Center)
         .width('100%')
-        .height(44)
+        .height(43)
+
+        Text().backgroundColor("#EDEDED")
+          .width('100%')
+          .height(1)
+
         if(this.isConnectNetwork){
           Web({ src: this.webUrl, controller: this.webviewController })
             .backgroundColor(Color.White)