Merge remote-tracking branch 'origin/main'

@@ -56,7 +56,7 @@ export struct topicInfoView {
           contentDTO.linkUrl  =  this.frontLinkObject?.linkUrl
           ProcessUtils.processPage(contentDTO)
         }
-      })
+      }).width(80)
       .alignRules({
         left: { anchor: "__container__", align: HorizontalAlign.Start },
         bottom: { anchor: "__container__", align: VerticalAlign.Bottom }

@@ -411,7 +411,9 @@ export struct PaperSingleColumn999CardView {
       result = `${minutes}分钟前`;
     } else if (hours < 24) {
       result = `${hours}小时前`;
-    } else {
+    } else if(hours > 24 && hours <48){
+      result = '1天前';
+    }else {
       result = '';
     }
 
@@ -483,11 +485,15 @@ export struct PaperSingleColumn999CardView {
                 .fontSize(12)
                 .fontColor('#B0B0B0')
                 .margin({ left: 16 })
+
+              ///不显示时间或者不显示评论
+              if (this.getPublishTime().length > 0 || this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.collectNum) > 0) {
                 Image($r('app.media.point'))
                   .width(16)
                   .height(16)
                   .margin({ top: 10, bottom: 10 })
               }
+            }
 
             Text(this.getPublishTime())
               .fontSize(12)
@@ -497,7 +503,7 @@ export struct PaperSingleColumn999CardView {
               Text(this.interactData.commentNum + "评")
                 .fontSize(12)
                 .fontColor('#B0B0B0')
-                .margin({ left: 6 })
+                .margin({ left: this.getPublishTime().length >0? 6:0 })
             }
           }
           .justifyContent(FlexAlign.Start)

@@ -2,7 +2,7 @@ import { CommonConstants, ViewType } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
-import { autoRefresh, listTouchEvent } from '../../utils/PullDownRefresh';
+import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
 import LoadMoreLayout from './LoadMoreLayout';
 import { CompParser } from '../CompParser';
 import { CompDTO } from 'wdBean';
@@ -14,9 +14,6 @@ import PageNoMoreLayout from './PageNoMoreLayout';
 import { NoMoreBean } from './NoMoreBean';
 import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
 import RefreshLayout from '../refresh/RefreshLayout';
-import json from '@ohos.util.json';
-import { viewBlogInsightIntentShare, ActionMode } from '../../utils/InsightIntentShare'
-import { common } from '@kit.AbilityKit';
 const TAG = 'PageComponent';
 
 @Component
@@ -31,6 +28,7 @@ export struct PageComponent {
   // 自动刷新通知
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   private listScroller: Scroller = new Scroller();
+  private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.Up | PanDirection.Down })
   needload: boolean = true;
   build() {
     Column() {
@@ -51,13 +49,26 @@ export struct PageComponent {
     }
     .width(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
-    .onTouch((event: TouchEvent | undefined) => {
-      if (event) {
-        if (this.pageModel.viewType === ViewType.LOADED) {
-          listTouchEvent(this.pageModel, this.pageAdvModel, event);
-        }
-      }
+    // .onTouch((event: TouchEvent | undefined) => {
+    //   if (event) {
+    //     if (this.pageModel.viewType === ViewType.LOADED) {
+    //       listTouchEvent(this.pageModel, this.pageAdvModel, event);
+    //     }
+    //   }
+    // })
+    // 对接新的下拉刷新手势，替换touch事件
+    .parallelGesture(
+      PanGesture(this.panOption)
+        .onActionStart((event?: GestureEvent) => {
+          onActionStart(this.pageModel, this.pageAdvModel, event)
+        })
+        .onActionUpdate((event?: GestureEvent) => {
+          onActionUpdate(this.pageModel, this.pageAdvModel, event)
+        })
+        .onActionEnd(() => {
+          onActionEnd(this.pageModel, this.pageAdvModel)
         })
+    )
 
   }
 

@@ -88,8 +88,7 @@ export struct OperRowListView {
   @State dialogController: CustomDialogController | null = null;
 
   async aboutToAppear() {
-    console.info(TAG, '22222----', this.styleType)
-    console.info(TAG, '3333----', this.needLike)
+    console.info(TAG, 'this.needLike', this.needLike)
     this.handleStyle()
     this.onDetailUpdated()
     EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (val: number | string | undefined) => {
@@ -108,7 +107,7 @@ export struct OperRowListView {
   }
 
   async onDetailUpdated() {
-    console.info(TAG, '111111----', this.styleType)
+    console.info(TAG, 'this.styleType', this.styleType)
     this.handleStyle()
     if (!this.contentDetailData) {
       return
@@ -380,7 +379,7 @@ export struct OperRowListView {
           {
             contentId: this.contentDetailData?.newsId + '',
             contentType: this.contentDetailData?.newsType + '',
-            contentRelId: this.contentDetailData?.reLInfo?.relId + '',
+            contentRelId: this.contentDetailData?.reLInfo?.relId || ''  + '',
           }
         ]
       }
@@ -397,7 +396,6 @@ export struct OperRowListView {
    * 收藏、取消收藏
    */
   async toggleCollectStatus() {
-    console.log(TAG, '收藏点击')
     // 未登录，跳转登录
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
     console.log(TAG, '收藏点击，登录', user_id)
@@ -411,15 +409,13 @@ export struct OperRowListView {
       contentList: [{
         contentId: this.contentDetailData?.newsId + '',
         contentType: this.contentDetailData?.newsType + '',
-        relType: this.contentDetailData?.reLInfo?.relType + '',
-        contentRelId: this.contentDetailData?.reLInfo?.relId + '',
+        relType: this.contentDetailData?.reLInfo?.relType || '' + '',
+        contentRelId: this.contentDetailData?.reLInfo?.relId || '' + '',
       }],
 
     }
-    // console.log(TAG, '收藏点击', JSON.stringify(params))
+    console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
-      console.log(TAG, '收藏点击 res', JSON.stringify(res))
-      console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
       if (this.newsStatusOfUser) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
         if (this.newsStatusOfUser.collectStatus === 1) {
@@ -427,6 +423,7 @@ export struct OperRowListView {
         }
         this.queryContentInteractCount()
       }
+      console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
     })
 
   }

@@ -4,7 +4,87 @@ import PageModel from '../viewmodel/PageModel';
 import PageHelper from '../viewmodel/PageHelper';
 import PageAdModel from '../viewmodel/PageAdvModel';
 import { LoadStatus } from '../components/refresh/RefreshLayoutBean';
+import { Logger } from 'wdKit/Index';
+
+/***********新的下拉、上拉手势 start **********/
+export function onActionStart(pageModel: PageModel, pageAdvModel: PageAdModel, event?: GestureEvent) {
+  if (event === undefined) {
+    return
+  }
+  pageModel.downY = event.offsetY;
+  pageModel.lastMoveY = event.offsetY;
+}
+
+export function onActionUpdate(pageModel: PageModel, pageAdvModel: PageAdModel, event?: GestureEvent) {
+  if (event === undefined) {
+    return
+  }
+  if ((pageModel.isRefreshing === true) || (pageModel.isLoading === true)) {
+    return;
+  }
+  let isDownPull = event.offsetY - pageModel.lastMoveY > 0;
+  if (((isDownPull === true) || (pageModel.isPullRefreshOperation === true)) &&
+    (pageModel.isCanLoadMore === false)) {
+    actionUpdatePullRefresh(pageModel, event);
+  } else {
+    actionUpdateLoadMore(pageModel, event);
+  }
+  pageModel.lastMoveY = event.offsetY;
+}
+
+export function onActionEnd(pageModel: PageModel, pageAdvModel: PageAdModel) {
+  if ((pageModel.isRefreshing === true) || (pageModel.isLoading === true)) {
+    return;
+  }
+  if ((pageModel.isPullRefreshOperation === true)) {
+    touchUpPullRefresh(pageModel, pageAdvModel);
+  } else {
+    // touchUpLoadMore(pageModel);
+  }
+}
+
+export function actionUpdatePullRefresh(pageModel: PageModel, event: GestureEvent) {
+  if (pageModel.startIndex === 0) {
+    pageModel.isPullRefreshOperation = true;
+    let height = vp2px(Const.CUSTOM_REFRESH_DECIDE_HEIGHT);
+    pageModel.offsetY = event.offsetY - pageModel.downY;
+    if (pageModel.offsetY >= height) {
+      pullRefreshState(pageModel, RefreshState.Release);
+      pageModel.offsetY = height + pageModel.offsetY * Const.Y_OFF_SET_COEFFICIENT;
+    } else {
+      pullRefreshState(pageModel, RefreshState.DropDown);
+    }
+    if (pageModel.offsetY < 0) {
+      pageModel.offsetY = 0;
+      pageModel.isPullRefreshOperation = false;
+    }
+  }
+}
+
+export function actionUpdateLoadMore(model: PageModel, event: GestureEvent) {
+  // list size +1
+  if (model.endIndex >= model.compList.totalCount() - 3 && model.endIndex <= model.compList.totalCount()) {
+    // model.offsetY = event.touches[0].y - model.downY;
+    // if (Math.abs(model.offsetY) > vp2px(model.pullUpLoadHeight) / 2) {
+    //   model.isCanLoadMore = true;
+    //   model.isVisiblePullUpLoad = true;
+    //   model.offsetY = -vp2px(model.pullUpLoadHeight) + model.offsetY * Const.Y_OFF_SET_COEFFICIENT;
+    // }
+
+    // 不用分页动画，直接预加载
+    model.isCanLoadMore = true;
+    model.isVisiblePullUpLoad = true;
+    touchUpLoadMore(model);
+  }
+}
+
+/***********新的下拉、上拉手势 end **********/
+
+
 //下拉刷新上拉加载更多组件
+/**
+ * @deprecated
+ */
 export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, event: TouchEvent) {
   switch (event.type) {
     case TouchType.Down:
@@ -16,7 +96,8 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel,
         return;
       }
       let isDownPull = event.touches[0].y - pageModel.lastMoveY > 0;
-      if (((isDownPull === true) || (pageModel.isPullRefreshOperation === true)) && (pageModel.isCanLoadMore === false)) {
+      if (((isDownPull === true) || (pageModel.isPullRefreshOperation === true)) &&
+        (pageModel.isCanLoadMore === false)) {
         // Finger movement, processing pull-down refresh.
         touchMovePullRefresh(pageModel, event);
       } else {
@@ -44,6 +125,9 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel,
   }
 }
 
+/**
+ * @deprecated
+ */
 export function touchMovePullRefresh(pageModel: PageModel, event: TouchEvent) {
   if (pageModel.startIndex === 0) {
     pageModel.isPullRefreshOperation = true;