Merge remote-tracking branch 'origin/main'

@@ -547,7 +547,7 @@ export struct DynamicDetailComponent {
             }
             .width(CommonConstants.FULL_WIDTH)
             .height(CommonConstants.FULL_HEIGHT)
-            .padding({ bottom: 76 })
+            .padding({ bottom: 100 })
             .scrollBar(BarState.Off)
             .alignSelf(ItemAlign.Start)
           }
@@ -559,7 +559,7 @@ export struct DynamicDetailComponent {
           operationButtonList: this.operationButtonList,
           styleType: 1,
         })
-
+          .height(100)
       }
     }
     .alignSelf(ItemAlign.Start)

@@ -37,7 +37,9 @@ import { componentUtils, window } from '@kit.ArkUI';
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 
 const TAG: string = 'ImageAndTextPageComponent'
-
+/**
+ * 图文详情页
+ * */
 @Component
 export struct ImageAndTextPageComponent {
   scroller: Scroller = new Scroller();

 import { CompDTO, ContentDTO } from 'wdBean'
 import { CommonConstants } from 'wdConstant/Index';
 import { DateTimeUtils } from 'wdKit/Index';
+import { JSON } from '@kit.ArkTS';
+import router from '@ohos.router'
 
 @Component
 export struct CardSourceInfo {
   @State contentDTO: ContentDTO = new ContentDTO();
   @ObjectLink compDTO: CompDTO
 
+  handleTimeStr() {
+    return DateTimeUtils.getCommentTime(
+      this.contentDTO.publishTime.includes(' ')
+        ? Number.parseFloat(new Date(this.contentDTO.publishTime).getTime().toString())
+        : Number.parseFloat(this.contentDTO.publishTime)
+    )
+  }
+
+  showTime() {
+    console.log('curRouter', this.contentDTO.publishTime)
+    const curRouter = router.getState().name;
+    const publishTime = this.contentDTO.publishTime.includes(' ')
+      ? new Date(this.contentDTO.publishTime).getTime().toString()
+      : this.contentDTO.publishTime
+    let flag: boolean = false;
+    if (curRouter === 'MainPage') {
+      if (this.isTwoDaysAgo(publishTime)) {
+        console.log('curRouter 01')
+        flag = false
+      } else {
+        console.log('curRouter 02')
+        flag = true;
+      }
+    } else {
+      console.log('curRouter 03')
+      flag = true;
+    }
+    return flag;
+  }
+
+  isTwoDaysAgo(date: string) {
+    const twoDaysAgo = new Date();
+    twoDaysAgo.setDate(twoDaysAgo.getDate() - 2);
+    console.log('curRouter', date)
+    return parseInt(date) < twoDaysAgo.getTime()
+  }
+
   build() {
     Flex({ alignItems: ItemAlign.Center }) {
       if (this.contentDTO.corner) {
@@ -52,11 +91,12 @@ export struct CardSourceInfo {
       //     .fontColor($r("app.color.color_B0B0B0"))
       //     .flexShrink(0);
       // }
-      if (this.contentDTO.source) {
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(new Date(this.contentDTO.publishTime).getTime().toString())))
+      if (this.contentDTO.source && this.showTime()) {
+        Text(this.handleTimeStr())
           .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
-          .flexShrink(0);
+          .flexShrink(0)
+          .margin({right: 4})
       }
 
       if (this.getContentDtoBean()?.interactData?.commentNum && this.contentDTO.source) {
@@ -64,7 +104,6 @@ export struct CardSourceInfo {
           .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .flexShrink(0)
-          .margin({ left: 6 })
           .visibility(Number(this.getContentDtoBean()?.interactData?.commentNum) === 0 ? Visibility.None :
           Visibility.Visible)
       }

@@ -75,7 +75,7 @@ export struct Card4Component {
               ForEach(this.contentDTO.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
                 if (index < 3) {
                   GridCol({ span: { xs: 4 } }) {
-                    Image(this.loadImg ? item.url : '')
+                    Image(this.loadImg ? item.url || item.fullUrl : '')
                       .backgroundColor(0xf5f5f5)
                       .width('100%')
                       .aspectRatio(113 / 75)

@@ -154,7 +154,12 @@ export struct FollowListDetailUI {
             } else {
               fansNumString = fansNum + ""
             }
-            this.data.push(new FollowListDetailItem(value.attentionHeadPhotoUrl, value.attentionUserName, fansNumString, value.introduction, value.attentionCreatorId, "1", value.attentionUserId, value.attentionUserType, value.attentionUserId, value.mainControl, value.banControl, value.authIcon))
+            let introduction = value.introduction
+            if(value.introduction.indexOf("\n") != -1){
+              let regex:RegExp = new RegExp('\n','g')
+              introduction = value.introduction.replace(regex,'')
+            }
+            this.data.push(new FollowListDetailItem(value.attentionHeadPhotoUrl, value.attentionUserName, fansNumString, introduction, value.attentionCreatorId, "1", value.attentionUserId, value.attentionUserType, value.attentionUserId, value.mainControl, value.banControl, value.authIcon))
           })
           this.data.notifyDataReload()
           this.count = this.data.totalCount()
@@ -272,7 +277,12 @@ export struct FollowListDetailUI {
       })
 
       result.forEach((item) => {
-        this.data.push(new FollowListDetailItem(item.headPhotoUrl, item.cnUserName, item.cnFansNum, item.introduction, item.creatorId, item.status, item.attentionUserId, item.cnUserType, item.cnUserId, item.mainControl, item.banControl, item.authIcon))
+        let introduction = item.introduction
+        if(item.introduction.indexOf("\n") != -1){
+          let regex:RegExp = new RegExp('\n','g')
+          introduction = item.introduction.replace(regex,'')
+        }
+        this.data.push(new FollowListDetailItem(item.headPhotoUrl, item.cnUserName, item.cnFansNum, introduction, item.creatorId, item.status, item.attentionUserId, item.cnUserType, item.cnUserId, item.mainControl, item.banControl, item.authIcon))
       })
 
       this.data.notifyDataReload()

@@ -81,7 +81,6 @@ export struct SubscribeMessageComponent{
           }
         })
           .width('100%')
-          .margin({bottom:px2vp(this.bottomSafeHeight)})
       }
     }
     .backgroundColor($r('app.color.color_F9F9F9'))
@@ -113,12 +112,12 @@ export struct SubscribeMessageComponent{
       if (!this.hasMore) {
         ListItem() {
           ListHasNoMoreDataUI()
-        }
+        }.padding({bottom:px2vp(this.bottomSafeHeight) + 10})
       }
     }.width('100%')
+    .edgeEffect(EdgeEffect.None)
     .height("100%")
     .scrollBar(BarState.Off)
-    .layoutWeight(1)
   }
 
   getNewPageData() {

@@ -63,14 +63,23 @@ export struct PeopleShipMainComponent {
     if (this.viewType == ViewType.LOADING) {
       this.LoadingLayout()
     } else if (this.viewType == ViewType.ERROR) {
-      ErrorComponent()
-        .onTouch(() => {
-          if (this.viewType === ViewType.ERROR) {
-            this.getData()
-          }
+      //缺省页
+      EmptyComponent({
+        emptyType: this.pageModel.emptyType,
+        emptyButton: true,
+        retry: () => {
+          this.getData()
+        }
       })
     } else if (this.viewType == ViewType.EMPTY) {
-      EmptyComponent()
+      //缺省页
+      EmptyComponent({
+        emptyType: this.pageModel.emptyType,
+        emptyButton: true,
+        retry: () => {
+          this.getData()
+        }
+      })
     } else {
       if (this.followList.length == 0) {
         CustomPullToRefresh({

@@ -52,9 +52,9 @@ class MineSettingDatasModel{
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch"))
      let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch"))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
+    // this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清理缓存', '32MB', 0, false,"clear_cache"))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,""))
+    // this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,""))
 
     return this.mainSettingData
   }

@@ -289,12 +289,10 @@ struct LoginPage {
       }.width('100%')
 
       Row() {
-        Row() {
+        /*Row() {
           Image($r('app.media.login_wx'))
             .width(20).height(20).onClick(()=>{
-            Logger.debug("测试",'开始'+Logger.isDebug)
             ErrorToastUtils.ErrorToast.showToast(ErrorToastUtils.ErrorType.NET_CORE_NO_NETWORK)
-            Logger.debug("测试",'开始2'+Logger.isDebug)
           })
         }.backgroundImage($r('app.media.login_other_left'), ImageRepeat.NoRepeat)
         .otherStyle()
@@ -307,25 +305,36 @@ struct LoginPage {
         Row() {
           Image($r('app.media.login_wb')).size({ width: 20, height: 20 })
         }.backgroundImage($r('app.media.login_other_middle'), ImageRepeat.NoRepeat)
-        .otherStyle()
+        .otherStyle()*/
 
         Row() {
           Image(this.checkCodePage ? $r('app.media.login_qt') : $r('app.media.login_other_password'))
-            .size({ width: 20, height: 20 })
-        }.backgroundImage($r('app.media.login_other_right'), ImageRepeat.NoRepeat)
-        .otherStyle().onClick(() => {
+            .size({ width: "35lpx", height: "35lpx" })
+            .margin({right:"8lpx"})
+            .height("38lpx")
+            .width("38lpx")
+          Text(this.checkCodePage ? "密码登录" : "手机号登录")
+            .fontWeight(400)
+            .fontColor("#3D3D3D")
+            .fontSize("23lpx")
+            .lineHeight("38lpx")
+        }
+        .onClick(() => {
           this.updateAccount()
           this.checkCodePage = !this.checkCodePage;
           this.passwordSwitch = true
           this.isSubmit = false
-        })
+        }).width('100%')
+        .alignItems(VerticalAlign.Center)
+        .justifyContent(FlexAlign.Center)
 
       }.height(36)
       .width('100%')
       .padding({ left: 25, right: 25 })
-      // .justifyContent(FlexAlign.SpaceEvenly)
-      .margin({ top: 24 })
-    }.width('100%').margin({ bottom: 40 })
+      .margin({ top: "46lpx" })
+    }
+    .width('100%')
+    .margin({ bottom: 40 })
   }
 
   updateAccount(){