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

@@ -399,22 +399,6 @@ export class ProcessUtils {
       return
       return
     }
     }
     ProcessUtils.processPage(contentBean)
     ProcessUtils.processPage(contentBean)
-    // let taskAction: Action = {
-    //   type: 'JUMP_INNER_NEW_PAGE',
-    //   params: {
-    //     contentID: content?.newsId,
-    //     url:content?.linkUrl,
-    //     pageID: 'IMAGE_TEXT_DETAIL',
-    //     extra: {
-    //       relType: content?.relType,
-    //       relId: content?.relId,
-    //       sourcePage: '5',
-    //       commentId: content?.commentId
-    //     } as ExtraDTO
-    //   } as Params,
-    // };
-    // WDRouterRule.jumpWithAction(taskAction)
-    // Logger.debug(TAG, `commentGotoWeb, ${content.newsId}`);
   }
   }
 
 
   public static gotoH5NewsWeb(content: ContentDTO) {
   public static gotoH5NewsWeb(content: ContentDTO) {
@@ -433,7 +417,6 @@ export class ProcessUtils {
           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)
@@ -456,7 +439,6 @@ export class ProcessUtils {
           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,7 +144,6 @@ export class ContentDTO implements BaseDTO {
   isMourning?: boolean = false;
   isMourning?: boolean = false;
 
 
   author: string = ""; ///撰稿人
   author: string = ""; ///撰稿人
-  clickComment:boolean = false;
 
 
   // 号主页评论列表点击跳转到视频详情判断评论弹框是否展开
   // 号主页评论列表点击跳转到视频详情判断评论弹框是否展开
   showComment?:boolean = false;
   showComment?:boolean = false;

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

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

@@ -93,12 +93,7 @@ export struct ImageAndTextPageComponent {
   }
   }
 
 
   webPageIsPageEnd() {
   webPageIsPageEnd() {
-    if (this.action.params?.clickComment) {
-      setTimeout(()=>{
-        this.pageScrollToCommonent()
-      },
-        800)
-    }
+   this.checkToScrollCommentArea()
   }
   }
 
 
   build() {
   build() {
@@ -255,7 +250,7 @@ export struct ImageAndTextPageComponent {
           showMainText:this.showMainText,
           showMainText:this.showMainText,
           styleType: 1,
           styleType: 1,
           onCommentIconClick: () => {
           onCommentIconClick: () => {
-            this.pageScrollToCommonent()
+            this.toggleScrollToCommonentOrTop()
           }
           }
         })
         })
       }
       }
@@ -502,28 +497,6 @@ export struct ImageAndTextPageComponent {
     }
     }
   }
   }
 
 
-  private pageScrollToCommonent() {
-    const info = componentUtils.getRectangleById('comment');
-    //评论区当前位置
-    let currentCommonentOffSetY = this.info?.globalPosition.y as number - 70
-    // 当前页面滚动位置
-    let currentScrollOffSetY = this.scroller.currentOffset().yOffset
-    let offSetY = 0
-    if (currentCommonentOffSetY >= (this.screenHeight-this.bottomHeight) ) {
-      offSetY = currentScrollOffSetY + (currentCommonentOffSetY - this.screenHeight+this.bottomHeight) + 400
-    }
-    //   定位到评论区域
-    if (!this.showMainText) {
-      this.scroller.scrollTo({
-        xOffset: 0,
-        yOffset: offSetY,
-        animation: { duration: 1000, curve: Curve.Ease }
-      })
-    } else {
-      this.scroller.scrollEdge(Edge.Top)
-    }
-  }
-
   aboutToAppear() {
   aboutToAppear() {
     // Logger.debug(TAG, '文章详情页 aboutToAppear，开始请求接口数据');
     // Logger.debug(TAG, '文章详情页 aboutToAppear，开始请求接口数据');
     this.getDetail()
     this.getDetail()
@@ -582,19 +555,37 @@ export struct ImageAndTextPageComponent {
       this.showMainText = true
       this.showMainText = true
     }
     }
 
 
-    if (this.action.params?.targetLayout && this.action.params.targetLayout == "comment") {
+    if (!this.showMainText && this.action.params?.targetLayout == "comment") {
       if (this.lastTimeoutId) {
       if (this.lastTimeoutId) {
         clearTimeout(this.lastTimeoutId)
         clearTimeout(this.lastTimeoutId)
       }
       }
       this.lastTimeoutId = setTimeout(() => {
       this.lastTimeoutId = setTimeout(() => {
-        //头部距离48
-        this.scroller.scrollTo({
-          yOffset: offSetY,
-          xOffset: 0,
-          animation: { duration: 1000, curve: Curve.Ease }
-        })
+        this.toggleScrollToCommonentOrTop(true)
         this.action.params!.targetLayout = undefined
         this.action.params!.targetLayout = undefined
       }, 600)
       }, 600)
     }
     }
   }
   }
+
+  private toggleScrollToCommonentOrTop(forceToComment?: boolean) {
+
+    //   定位到评论区域
+    if ((forceToComment == undefined || forceToComment == false) && this.showMainText) {
+      this.scroller.scrollEdge(Edge.Top)
+      return
+    }
+
+    //评论区当前位置
+    let currentCommonentOffSetY = this.info?.globalPosition.y as number - 70
+    // 当前页面滚动位置
+    let currentScrollOffSetY = this.scroller.currentOffset().yOffset
+    let offSetY = 0
+    if (currentCommonentOffSetY >= (this.screenHeight-this.bottomHeight) ) {
+      offSetY = currentScrollOffSetY + (currentCommonentOffSetY - this.screenHeight+this.bottomHeight) + 400
+    }
+    this.scroller.scrollTo({
+      xOffset: 0,
+      yOffset: offSetY,
+      animation: { duration: 1000, curve: Curve.Ease }
+    })
+  }
 }
 }

@@ -27,8 +27,7 @@ import { common } from '@kit.AbilityKit';
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent';
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent';
 import { EmitterEventId, EmitterUtils } from 'wdKit/Index'
 import { EmitterEventId, EmitterUtils } from 'wdKit/Index'
 import { ColorUtils } from '../../utils/ColorUtils';
 import { ColorUtils } from '../../utils/ColorUtils';
-import { SpConstants } from 'wdConstant';
-
+import DailyPaperTopicModel from '../../model/DailyPaperTopicModel';
 
 
 const TAG = 'MorningEveningPaperComponent';
 const TAG = 'MorningEveningPaperComponent';
 
 
@@ -129,6 +128,19 @@ export struct MorningEveningPaperComponent {
   async aboutToAppear() {
   async aboutToAppear() {
     this.dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as string
     this.dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as string
 
 
+    if (this.dailyPaperTopicPageId.length > 0) {
+      this.fetchData()
+    } else {
+      const dailyPaperTopicBean = await DailyPaperTopicModel.getDailyPaperTopic()
+      if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) {
+        SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id + "");
+        this.dailyPaperTopicPageId = dailyPaperTopicBean.id + "";
+        this.fetchData()
+      }
+    }
+  }
+
+  async fetchData() {
     // console.info(TAG, `aboutToAppear = ` + this.dailyPaperTopicPageId)
     // console.info(TAG, `aboutToAppear = ` + this.dailyPaperTopicPageId)
     const currentTime = new Date().getTime()
     const currentTime = new Date().getTime()
     // console.log(TAG, "currentTime = " + currentTime)
     // console.log(TAG, "currentTime = " + currentTime)

@@ -57,12 +57,24 @@ export struct CardMediaInfo {
     if (Number.parseInt(num) <= 9999) {
     if (Number.parseInt(num) <= 9999) {
       return Number.parseInt(num).toString()
       return Number.parseInt(num).toString()
     } else if (Number.parseInt(num) > 9999 && Number.parseInt(num) <= 99999999) {
     } else if (Number.parseInt(num) > 9999 && Number.parseInt(num) <= 99999999) {
-      const num1: string = num.slice(0, -4); // 万
-      const num2: string = num.slice(-4, -3); // 千
+      let num1: string = num.slice(0, -4); // 万
+      let num2: string = num.slice(-4, -3); // 千
+      const num3: string = num.slice(-3, -2); // 百
+      if (Math.round(Number(`0.${num3}`)) === 1) num2 = `${Number(num2) + 1}`
+      if (Number(num2) === 10) {
+        num2 = '0';
+        num1 = `${Number(num1) + 1}`
+      }
       return num2 === '0' ? num1 +'万' : num1 + '.' + num2 + '万'
       return num2 === '0' ? num1 +'万' : num1 + '.' + num2 + '万'
     } else if (Number.parseInt(num) > 99999999) {
     } else if (Number.parseInt(num) > 99999999) {
-      const num1: string = num.slice(0, -8); // 亿
-      const num2: string = num.slice(-8, -7);
+      let num1: string = num.slice(0, -8); // 亿
+      let num2: string = num.slice(-8, -7);
+      const num3: string = num.slice(-3, -2); // 百
+      if (Math.round(Number(`0.${num3}`)) === 1) num2 = `${Number(num2) + 1}`
+      if (Number(num2) === 10) {
+        num2 = '0';
+        num1 = `${Number(num1) + 1}`
+      }
       return num2 === '0' ? num1 +'亿' : num1 + '.' + num2 + '亿'
       return num2 === '0' ? num1 +'亿' : num1 + '.' + num2 + '亿'
     }
     }
     return num
     return num
@@ -78,6 +90,7 @@ export struct CardMediaInfo {
     let liveIdList: string = this.contentDTO.objectId
     let liveIdList: string = this.contentDTO.objectId
     let data: joinPeopleNum[] = await LiveModel.getJoinPeopleNum(liveIdList)
     let data: joinPeopleNum[] = await LiveModel.getJoinPeopleNum(liveIdList)
     this.joinPeopleNum = data[0].pv;
     this.joinPeopleNum = data[0].pv;
+    console.log('getJoinPeopleNum ', this.joinPeopleNum)
   }
   }
 
 
   build() {
   build() {

@@ -494,10 +494,26 @@ struct ChildCommentItem {
         .onClick(() => {
         .onClick(() => {
           this.replyComment()
           this.replyComment()
         })
         })
+        .gesture(
+          LongPressGesture()
+            .onAction((event: GestureEvent|undefined)=>{
+              if (event) {
+                //TODO: 显示功能菜单
+              }
+            })
+        )
       if (this.item.commentPics.length > 0) {
       if (this.item.commentPics.length > 0) {
         Image(this.item.commentPics)
         Image(this.item.commentPics)
           .width(88).height(88)
           .width(88).height(88)
           .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: this.leftGap})
           .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: this.leftGap})
+          .gesture(
+            LongPressGesture()
+              .onAction((event: GestureEvent|undefined)=>{
+                if (event) {
+                  //TODO: 显示功能菜单
+                }
+              })
+          )
       }
       }
 
 
       commentFooterView({
       commentFooterView({
@@ -718,11 +734,27 @@ struct commentHeaderView {
         .onClick(() => {
         .onClick(() => {
           this.replyComment()
           this.replyComment()
         })
         })
+        .gesture(
+          LongPressGesture()
+            .onAction((event: GestureEvent|undefined)=>{
+              if (event) {
+                //TODO: 显示功能菜单
+              }
+            })
+        )
 
 
       if (this.item.commentPics.length > 0) {
       if (this.item.commentPics.length > 0) {
         Image(this.item.commentPics)
         Image(this.item.commentPics)
           .width(88).height(88)
           .width(88).height(88)
           .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: this.leftGap})
           .margin({top: 6 + (this.item.commentContent.length > 0 ? 0 : 15), left: this.leftGap})
+          .gesture(
+            LongPressGesture()
+              .onAction((event: GestureEvent|undefined)=>{
+                if (event) {
+                  //TODO: 显示功能菜单
+                }
+              })
+          )
       }
       }
 
 
       commentFooterView({
       commentFooterView({

@@ -711,7 +711,7 @@ export struct TopNavigationComponentNew {
     if (NetworkUtil.isNetConnected()) {
     if (NetworkUtil.isNetConnected()) {
       DailyPaperTopicModel.getDailyPaperTopic().then(dailyPaperTopicBean => {
       DailyPaperTopicModel.getDailyPaperTopic().then(dailyPaperTopicBean => {
         if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) {
         if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) {
-          SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id);
+          SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id + "");
           ProcessUtils.gotoMorningEveningPaper()
           ProcessUtils.gotoMorningEveningPaper()
         } else {
         } else {
           ToastUtils.showToast('暂无早晚报信息', 1000)
           ToastUtils.showToast('暂无早晚报信息', 1000)

@@ -5,7 +5,7 @@ import { PageRepository } from '../repository/PageRepository';
 
 
 const TAG = "SearcherAboutDataModel"
 const TAG = "SearcherAboutDataModel"
 
 
-class DailyPaperTopicModel {
+ class DailyPaperTopicModel {
   private static instance: DailyPaperTopicModel;
   private static instance: DailyPaperTopicModel;
 
 
   /**
   /**

@@ -43,7 +43,9 @@ export class NewspaperDataFetcher {
 
 
         let contents: ContentDTO[] = compInfo.compList[0].operDataList as ContentDTO[]
         let contents: ContentDTO[] = compInfo.compList[0].operDataList as ContentDTO[]
         if (contents && contents.length) {
         if (contents && contents.length) {
-          data.paperContents = contents.map((contentDTO) => {
+          data.paperContents = contents.filter((value, index) => {
+            return index < 4
+          }).map((contentDTO) => {
             let content : FormNewspaperPaperContent = {
             let content : FormNewspaperPaperContent = {
               title: contentDTO.newsTitle,
               title: contentDTO.newsTitle,
               coverUrl: contentDTO.coverUrl,
               coverUrl: contentDTO.coverUrl,

@@ -97,7 +97,7 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
             }
             }
             DailyPaperTopicModel.getDailyPaperTopic().then(dailyPaperTopicBean => {
             DailyPaperTopicModel.getDailyPaperTopic().then(dailyPaperTopicBean => {
               if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) {
               if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) {
-                SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id);
+                SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id + "");
                 ProcessUtils.gotoMorningEveningPaper() //跳转至早晚报页面
                 ProcessUtils.gotoMorningEveningPaper() //跳转至早晚报页面
               } else {
               } else {
                 ToastUtils.showToast('暂无早晚报信息', 1000)
                 ToastUtils.showToast('暂无早晚报信息', 1000)