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

@@ -189,7 +189,7 @@ export class ProcessUtils {
     if (typeof type == "number") {
     if (typeof type == "number") {
       type = `${type}`
       type = `${type}`
     }
     }
-    // console.log(TAG, 'objectType', `${JSON.stringify(content)}`);
+    // Logger.debug(TAG, `objectType, ${JSON.stringify(content)}`);
     switch (type) {
     switch (type) {
       case ContentConstants.TYPE_NONE:
       case ContentConstants.TYPE_NONE:
         // Logger.debug(TAG, "processPage, do nothing");
         // Logger.debug(TAG, "processPage, do nothing");
@@ -432,7 +432,8 @@ export class ProcessUtils {
           commentId: content?.commentInfo?.commentId,
           commentId: content?.commentInfo?.commentId,
           title: content?.newsTitle
           title: content?.newsTitle
         } as ExtraDTO,
         } as ExtraDTO,
-        targetLayout: content.customParamTargetLayout
+        targetLayout: content.customParamTargetLayout,
+        clickComment: content.clickComment
       } as Params,
       } as Params,
     };
     };
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
@@ -454,7 +455,8 @@ export class ProcessUtils {
           sourcePage: '5',
           sourcePage: '5',
           commentId: content?.commentInfo?.commentId
           commentId: content?.commentInfo?.commentId
         } as ExtraDTO,
         } as ExtraDTO,
-        targetLayout: content.customParamTargetLayout
+        targetLayout: content.customParamTargetLayout,
+        clickComment: content.clickComment
       } as Params,
       } as Params,
     };
     };
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)

@@ -144,6 +144,7 @@ export class ContentDTO implements BaseDTO {
   isMourning?: boolean = false;
   isMourning?: boolean = false;
 
 
   author: string = ""; ///撰稿人
   author: string = ""; ///撰稿人
+  clickComment:boolean = false;
 
 
   static clone(old: ContentDTO): ContentDTO {
   static clone(old: ContentDTO): ContentDTO {
     let content = new ContentDTO();
     let content = new ContentDTO();

@@ -24,6 +24,6 @@ export interface Params {
   videoCoverUrl?: string;
   videoCoverUrl?: string;
   pageId?: string;
   pageId?: string;
   backVisibility?: boolean; //展示顶部返回栏
   backVisibility?: boolean; //展示顶部返回栏
-
+  clickComment?:boolean;//点击评论按钮进入稿件详情页定位到评论区
   targetLayout?: string;  // "comment" 表示进入对应页面后，跳转至评论区
   targetLayout?: string;  // "comment" 表示进入对应页面后，跳转至评论区
 }
 }

@@ -101,6 +101,7 @@ export struct CarderInteraction {
     }
     }
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
     .onClick(() => {
     .onClick(() => {
+      this.contentDTO.clickComment = true
       ProcessUtils.processPage(this.contentDTO);
       ProcessUtils.processPage(this.contentDTO);
     })
     })
   }
   }

@@ -52,7 +52,7 @@ export struct ImageAndTextPageComponent {
   @State recommendList: ContentDTO[] = []
   @State recommendList: ContentDTO[] = []
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
-  @State isPageEnd: boolean = false
+  // @State isPageEnd: boolean = false
   @State publishTime: string = ''
   @State publishTime: string = ''
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   // @State operationButtonList: string[] = ['comment', 'collect', 'share']
   // @State operationButtonList: string[] = ['comment', 'collect', 'share']
@@ -77,6 +77,7 @@ export struct ImageAndTextPageComponent {
   lastTimeoutId?: number
   lastTimeoutId?: number
   @State needAnimation: boolean = false;
   @State needAnimation: boolean = false;
 
 
+  @State @Watch("webPageIsPageEnd") isPageEnd: boolean = false
   @Consume @Watch('pageShowForUpdateData') pageShow :number
   @Consume @Watch('pageShowForUpdateData') pageShow :number
   @Consume @Watch('pageHideForUpdateData') pageHide :number
   @Consume @Watch('pageHideForUpdateData') pageHide :number
 
 
@@ -92,6 +93,15 @@ export struct ImageAndTextPageComponent {
     TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal,duration)
     TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal,duration)
   }
   }
 
 
+  webPageIsPageEnd() {
+    if (this.action.params?.clickComment) {
+      setTimeout(()=>{
+        this.pageScrollToCommonent()
+      },
+        900)
+    }
+  }
+
   build() {
   build() {
     Stack({ alignContent: Alignment.Top }) {
     Stack({ alignContent: Alignment.Top }) {
       Stack({ alignContent: Alignment.Bottom }) {
       Stack({ alignContent: Alignment.Bottom }) {
@@ -198,8 +208,8 @@ export struct ImageAndTextPageComponent {
 
 
                   .onAreaChange((oldValue: Area, newValue: Area) => {
                   .onAreaChange((oldValue: Area, newValue: Area) => {
                     this.info = newValue
                     this.info = newValue
-                    console.log(TAG, "总页面滑动偏移量", this.scroller.currentOffset().yOffset)
-                    console.log(TAG, "总页面滑动偏移量111", newValue.globalPosition.y as number)
+                    // console.log(TAG, "总页面滑动偏移量", this.scroller.currentOffset().yOffset)
+                    // console.log(TAG, "总页面滑动偏移量111", newValue.globalPosition.y as number)
                     this.checkToScrollCommentArea()
                     this.checkToScrollCommentArea()
                   })
                   })
                 // .onMeasureSize()
                 // .onMeasureSize()
@@ -245,30 +255,7 @@ export struct ImageAndTextPageComponent {
           showMainText:this.showMainText,
           showMainText:this.showMainText,
           styleType: 1,
           styleType: 1,
           onCommentIconClick: () => {
           onCommentIconClick: () => {
-            const info = componentUtils.getRectangleById('comment');
-            console.log(TAG, "点击滑动页面", JSON.stringify(info))
-
-            //评论区当前位置
-            let currentCommonentOffSetY = this.info?.globalPosition.y as number
-            let offSetY = 0
-            if (currentCommonentOffSetY >= (this.screenHeight-this.bottomHeight) ) {
-              offSetY = currentCommonentOffSetY-200
-            }
-
-            // if (!this.offsetY) {
-            //   this.offsetY = componentUtils.getRectangleById('comment').windowOffset.y
-            // }
-            //   定位到评论区域
-            if (this.isScrollTop) {
-              this.scroller.scrollTo({
-                xOffset: 0,
-                yOffset: offSetY,
-                animation: { duration: 1000, curve: Curve.Ease }
-              })
-            } else {
-              this.scroller.scrollEdge(Edge.Top)
-            }
-            this.isScrollTop = !this.isScrollTop
+            this.pageScrollToCommonent()
           }
           }
         })
         })
       }
       }
@@ -288,6 +275,7 @@ export struct ImageAndTextPageComponent {
             Text(this.publishTime)
             Text(this.publishTime)
               .fontColor($r('app.color.color_B0B0B0'))
               .fontColor($r('app.color.color_B0B0B0'))
               .fontSize(13)
               .fontSize(13)
+              .height(20)
           }
           }
         }
         }
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
@@ -514,6 +502,29 @@ export struct ImageAndTextPageComponent {
     }
     }
   }
   }
 
 
+  private pageScrollToCommonent() {
+    const info = componentUtils.getRectangleById('comment');
+    console.log(TAG, "点击滑动页面", JSON.stringify(info))
+    //评论区当前位置
+    let currentCommonentOffSetY = this.info?.globalPosition.y as number
+    let offSetY = 0
+    if (currentCommonentOffSetY >= (this.screenHeight-this.bottomHeight) ) {
+      offSetY = currentCommonentOffSetY-200
+    }
+
+    //   定位到评论区域
+    if (this.isScrollTop) {
+      this.scroller.scrollTo({
+        xOffset: 0,
+        yOffset: offSetY,
+        animation: { duration: 1000, curve: Curve.Ease }
+      })
+    } else {
+      this.scroller.scrollEdge(Edge.Top)
+    }
+    this.isScrollTop = !this.isScrollTop
+  }
+
   aboutToAppear() {
   aboutToAppear() {
     Logger.debug(TAG, '文章详情页 aboutToAppear，开始请求接口数据');
     Logger.debug(TAG, '文章详情页 aboutToAppear，开始请求接口数据');
     this.getDetail()
     this.getDetail()

@@ -327,7 +327,7 @@ export struct MorningEveningPaperComponent {
                 compListItem: this.compListItem,
                 compListItem: this.compListItem,
               })
               })
                 .margin({
                 .margin({
-                  top: this.isHasTopView || this.audioPlayUrl.length > 0 ? 10 : 44+this.topSafeHeight
+                  top: this.isHasTopView || this.audioPlayUrl.length > 0 ? 0 : 44+this.topSafeHeight
                 })
                 })
             }
             }
           }
           }

@@ -55,8 +55,8 @@ export default struct MinePageUserSimpleInfoUI {
 
 
         if(StringUtils.isNotEmpty(this.levelHead)){
         if(StringUtils.isNotEmpty(this.levelHead)){
           Image(this.levelHead)
           Image(this.levelHead)
-            .width(72.86)
-            .height(72.86)
+            .width(75.86)
+            .height(75.86)
             .objectFit(ImageFit.Cover)
             .objectFit(ImageFit.Cover)
             .borderRadius(50)
             .borderRadius(50)
         }
         }
@@ -101,7 +101,7 @@ export default struct MinePageUserSimpleInfoUI {
               .fontFamily('PingFang SC-Semibold')
               .fontFamily('PingFang SC-Semibold')
               .fontSize(10)
               .fontSize(10)
               .fontWeight(600)
               .fontWeight(600)
-              .margin({ left: 6 })
+              .margin({ left: 0,top:8 })
               .backgroundImage($r("app.media.mine_grade_bg"))
               .backgroundImage($r("app.media.mine_grade_bg"))
               .backgroundImageSize(ImageSize.FILL)
               .backgroundImageSize(ImageSize.FILL)
               .padding({left: 6,right: 6})
               .padding({left: 6,right: 6})

@@ -37,7 +37,7 @@ export struct HomePageBottomCommentComponent {
       if (this.isGetRequest == true) {
       if (this.isGetRequest == true) {
         Text().backgroundColor($r('app.color.color_EDEDED'))
         Text().backgroundColor($r('app.color.color_EDEDED'))
           .width('100%')
           .width('100%')
-          .height(2)
+          .height(1)
       }
       }
       if (this.count === 0) {
       if (this.count === 0) {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {

@@ -69,9 +69,9 @@ export struct HomePageBottomFollowComponent {
 
 
     Column() {
     Column() {
       if (this.isGetRequest == true) {
       if (this.isGetRequest == true) {
-        Text().backgroundColor($r('app.color.color_EDEDED'))
+        Text().backgroundColor(Color.Red)
           .width('100%')
           .width('100%')
-          .height(2)
+          .height(1)
       }
       }
 
 
       if (this.count === 0) {
       if (this.count === 0) {

@@ -31,6 +31,10 @@ export struct PeopleShipHomePageHeadComponent {
               .height(this.iconDiameter)
               .height(this.iconDiameter)
               .borderRadius(this.iconDiameter/2)
               .borderRadius(this.iconDiameter/2)
               .objectFit(ImageFit.Cover)
               .objectFit(ImageFit.Cover)
+              .margin({
+                right: '0vp',
+                bottom:'0vp'
+              })
           }
           }
       }
       }
   }
   }

@@ -54,7 +54,6 @@ export struct PeopleShipHomePageTopComponent {
             WDRouterRule.jumpWithPage(WDRouterPage.showHomePageHeaderPage, params)
             WDRouterRule.jumpWithPage(WDRouterPage.showHomePageHeaderPage, params)
           })
           })
 
 
-
           // 文字
           // 文字
           Text(this.detailModel.userName)
           Text(this.detailModel.userName)
             .height('50vp')
             .height('50vp')

@@ -122,11 +122,12 @@ struct MineHomePage {
                     Row() {
                     Row() {
                       Text(`${this.userName}`)
                       Text(`${this.userName}`)
                         .fontColor($r('app.color.white'))
                         .fontColor($r('app.color.white'))
-                        .maxLines(1)
+                        .maxLines(2)
                         .textOverflow({ overflow: TextOverflow.Ellipsis })
                         .textOverflow({ overflow: TextOverflow.Ellipsis })
                         .fontSize(20)
                         .fontSize(20)
                         .lineHeight(26)
                         .lineHeight(26)
                         .fontWeight(500)
                         .fontWeight(500)
+                        .constraintSize({maxWidth:180})
                         .onClick(()=>{
                         .onClick(()=>{
                           let params: editModelParams = {
                           let params: editModelParams = {
                             editContent: this.userName
                             editContent: this.userName
@@ -206,7 +207,7 @@ struct MineHomePage {
                 .backgroundColor($r('app.color.color_transparent'))
                 .backgroundColor($r('app.color.color_transparent'))
                 .height(86)
                 .height(86)
                 .width('100%')
                 .width('100%')
-                .padding({ left: 16 })
+                .padding({ left: 10 })
 
 
 
 
                 Column(){
                 Column(){

@@ -39,6 +39,7 @@ export class WDShare {
         desc: program.shareInfo.shareSummary,
         desc: program.shareInfo.shareSummary,
         link: program.shareInfo.shareUrl,
         link: program.shareInfo.shareUrl,
         deeplink:AppInnerLinkGenerator.generateDeepLinkWithProgram(program),
         deeplink:AppInnerLinkGenerator.generateDeepLinkWithProgram(program),
+        posterImg:$r("app.media.test_share_poster")
       }
       }
     })
     })
   }
   }