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

@@ -25,6 +25,9 @@ import { BusinessError } from '@ohos.base';
 import { CommonConstants, SpConstants } from 'wdConstant/Index';
 import { CardMediaInfo } from '../components/cardCommon/CardMediaInfo'
 import router from '@ohos.router';
+import { publishCommentModel } from './comment/model/PublishCommentModel';
+import { CommentComponent } from './comment/view/CommentComponent';
+
 const TAG = 'DynamicDetailComponent'
 @Preview
 @Component
@@ -50,6 +53,8 @@ export struct DynamicDetailComponent {
   //跳转
   private  mJumpInfo: ContentDTO = {} as ContentDTO;
 
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+
   async aboutToAppear() {
     await this.getContentDetailData()
   }
@@ -355,8 +360,14 @@ export struct DynamicDetailComponent {
                 //点赞操作
                 this.toggleLikeStatus()
               })
+              // 评论
+              if (this.contentDetailData?.openComment) {
+                Divider().strokeWidth(6).color('#f5f5f5')
+                CommentComponent({
+                  publishCommentModel: this.publishCommentModel
+                })
+              }
               Blank().layoutWeight(1)
-              //fixme 评论组件
             }
           }
           .width(CommonConstants.FULL_WIDTH)
@@ -365,7 +376,11 @@ export struct DynamicDetailComponent {
           .scrollBar(BarState.Off)
           .alignSelf(ItemAlign.Start)
           //底部交互区
-          OperRowListView({ contentDetailData: this.contentDetailData,interactData:this.interactDataDTO,newsStatusOfUser:this.newsStatusOfUser })
+          OperRowListView({ contentDetailData: this.contentDetailData
+          ,interactData:this.interactDataDTO
+          ,newsStatusOfUser:this.newsStatusOfUser
+          ,publishCommentModel: this.publishCommentModel
+          ,needLike:false})
         }
       }
       .alignSelf(ItemAlign.Start)
@@ -384,6 +399,17 @@ export struct DynamicDetailComponent {
     } catch (exception) {
     console.log('请求失败',JSON.stringify(exception))
     }
+    if (this.contentDetailData.openComment) {
+      this.publishCommentModel = {
+        targetId: String(this.contentDetailData?.newsId || ''),
+        targetRelId: this.contentDetailData?.reLInfo?.relId,
+        targetTitle: this.contentDetailData?.newsTitle,
+        targetRelType: this.contentDetailData?.reLInfo?.relType,
+        targetRelObjectId: String(this.contentDetailData?.reLInfo?.relObjectId),
+        keyArticle: String(this.contentDetailData?.keyArticle),
+        targetType: String(this.contentDetailData?.newsType),
+      } as publishCommentModel
+    }
     this.getBatchAttentionStatus()
     this.getInteractDataStatus()
     this.makeJumpInfo()

@@ -184,15 +184,13 @@ export struct ImageAndTextPageComponent {
           this.queryContentInteractCount()
         }
         if (this.contentDetailData[0]?.openComment) {
-          this.publishCommentModel = {
-            targetId: String(this.contentDetailData[0]?.newsId || ''),
-            targetRelId: this.contentDetailData[0]?.reLInfo?.relId,
-            targetTitle: this.contentDetailData[0]?.newsTitle,
-            targetRelType: this.contentDetailData[0]?.reLInfo?.relType,
-            targetRelObjectId: String(this.contentDetailData[0]?.reLInfo?.relObjectId),
-            keyArticle: String(this.contentDetailData[0]?.keyArticle),
-            targetType: String(this.contentDetailData[0]?.newsType),
-          } as publishCommentModel
+            this.publishCommentModel.targetId = String(this.contentDetailData[0]?.newsId || '')
+            this.publishCommentModel.targetRelId = String(this.contentDetailData[0]?.reLInfo?.relId)
+            this.publishCommentModel.targetTitle = this.contentDetailData[0]?.newsTitle
+            this.publishCommentModel.targetRelType = String(this.contentDetailData[0]?.reLInfo?.relType)
+            this.publishCommentModel.targetRelObjectId = String(this.contentDetailData[0]?.reLInfo?.relObjectId)
+            this.publishCommentModel.keyArticle = String(this.contentDetailData[0]?.keyArticle)
+            this.publishCommentModel.targetType = String(this.contentDetailData[0]?.newsType)
         }
       }
     }

@@ -84,10 +84,10 @@ export struct PageComponent {
         // 加载更多
         ListItem() {
           if (this.pageModel.hasMore) {
-            LoadMoreLayout({
-              refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
-                this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
-            })
+            // LoadMoreLayout({
+            //   refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
+            //     this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
+            // })
           } else if (!this.pageModel.contentNeedScroll) {
             PageNoMoreLayout({ noMoreBean: new NoMoreBean(this.pageModel.pageInfo.baselineCopywriting) })
           }

-import { PeopleShipAttentionContentListTopComponent } from './PeopleShipAttentionContentListTopComponent'
-import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem';
-import { ContentDTO } from 'wdBean'
-import { CardParser } from '../CardParser'
-
-@Preview
-@Component
-export struct PeopleShipAttentionContentListComponent {
-
-  @Prop followList: FollowListDetailItem[]
-
-  @Prop attentionList: ContentDTO[]
-
-  build() {
-    List(){
-      // 头部关注列表
-      ListItem(){
-        PeopleShipAttentionContentListTopComponent({
-          followList: this.followList
-        })
-      }
-      ForEach(this.attentionList, (item: ContentDTO) => {
-        ListItem() {
-          CardParser({ contentDTO: item })
-        }.width("100%")
-        .backgroundColor(Color.Transparent)
-
-      }, (item: ContentDTO, index: number) =>  item.objectId + index.toString())
-    }
-    .scrollBar(BarState.Off)
-    .width('100%')
-    .height('100%')
-  }
-}
-

+import { PeopleShipHomePageHeadComponent } from '../peopleShipHomePage/PeopleShipHomePageHeadComponent'
+import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem';
+
+@Component
+export struct PeopleShipAttentionContentListHeadComponent {
+
+  @State index: number = 0
+  @ObjectLink item: FollowListDetailItem
+  build() {
+    Column(){
+      // 头像
+      PeopleShipHomePageHeadComponent({
+        diameter: 48,
+        iconDiameter: 16,
+        headPhotoUrl: this.index == 0 ? $r('app.media.attention_mine') :
+          ((this.item.attentionHeadPhotoUrl && this.item.attentionHeadPhotoUrl.length > 0) ?
+          this.item.attentionHeadPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon')),
+        authIcon: this.index == 0 ? '' : this.item.authIcon
+      }).margin({
+        bottom: '8vp'
+      })
+
+      Text(this.index == 0 ? '我的关注' : this.item.attentionUserName)
+        .fontColor($r('app.color.color_666666'))
+        .fontSize($r('app.float.vp_13'))
+        .fontWeight(400)
+        .height('18vp')
+        .lineHeight('18vp')
+        .maxLines(1)
+        .textOverflow({overflow: TextOverflow.Ellipsis})
+        .padding({
+          left: '2vp',
+          right: '2vp'
+        })
+    }
+    .alignItems(HorizontalAlign.Center)
+    .width('78vp')
+    .margin({
+      left: this.index == 0 ? '8vp' : '4vp',
+      top: '14vp',
+      bottom: '14vp'
+    })
+  }
+}
+

 import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { ProcessUtils } from 'wdRouter';
-import { PeopleShipHomePageHeadComponent } from '../peopleShipHomePage/PeopleShipHomePageHeadComponent'
-
+import { PeopleShipAttentionContentListHeadComponent } from './PeopleShipAttentionContentListHeadComponent'
 
 @Component
 export struct PeopleShipAttentionContentListTopComponent {
@@ -41,45 +40,3 @@ export struct PeopleShipAttentionContentListTopComponent {
     }
   }
 }
-
-@Component
-struct PeopleShipAttentionContentListHeadComponent {
-
-  @State index: number = 0
-  @ObjectLink item: FollowListDetailItem
-  build() {
-    Column(){
-      // 头像
-      PeopleShipHomePageHeadComponent({
-        diameter: 48,
-        iconDiameter: 16,
-        headPhotoUrl: this.index == 0 ? $r('app.media.attention_mine') :
-          ((this.item.attentionHeadPhotoUrl && this.item.attentionHeadPhotoUrl.length > 0) ?
-          this.item.attentionHeadPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon')),
-        authIcon: this.index == 0 ? '' : this.item.authIcon
-      }).margin({
-        bottom: '8vp'
-      })
-
-      Text(this.index == 0 ? '我的关注' : this.item.attentionUserName)
-        .fontColor($r('app.color.color_666666'))
-        .fontSize($r('app.float.vp_13'))
-        .fontWeight(400)
-        .height('18vp')
-        .lineHeight('18vp')
-        .maxLines(1)
-        .textOverflow({overflow: TextOverflow.Ellipsis})
-        .padding({
-          left: '2vp',
-          right: '2vp'
-        })
-    }
-    .alignItems(HorizontalAlign.Center)
-    .width('78vp')
-    .margin({
-      left: this.index == 0 ? '8vp' : '4vp',
-      top: '14vp',
-      bottom: '14vp'
-    })
-  }
-}
\ No newline at end of file

@@ -2,7 +2,14 @@ import { PeopleShipRecommendComponent } from './PeopleShipRecommendComponent';
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
 import {  HttpUtils } from 'wdNetwork/Index';
 import { Logger, DateTimeUtils, EmitterEventId, EmitterUtils } from 'wdKit';
-import { RmhRecommendDTO, ContentDTO, AttentionBatchDTO, CreatorDTO } from 'wdBean';
+import {
+  RmhRecommendDTO,
+  ContentDTO,
+  AttentionBatchDTO,
+  CreatorDTO,
+  contentListParams,
+  InteractDataDTO
+} from 'wdBean';
 import { ViewType } from 'wdConstant/src/main/ets/enum/ViewType';
 import { channelSkeleton } from '../skeleton/channelSkeleton'
 import { EmptyComponent } from '../view/EmptyComponent';
@@ -56,6 +63,13 @@ export struct PeopleShipMainComponent {
       this.LoadingLayout()
     } else if (this.viewType == ViewType.ERROR) {
       ErrorComponent()
+        .onTouch((event: TouchEvent | undefined) => {
+        if (event) {
+          if (this.viewType === ViewType.ERROR) {
+            this.getData()
+          }
+        }
+      })
     } else if (this.viewType == ViewType.EMPTY) {
       EmptyComponent()
     } else {
@@ -155,11 +169,6 @@ export struct PeopleShipMainComponent {
     .scrollBar(BarState.Off)
     .width('100%')
     .height('100%')
-
-    // PeopleShipAttentionContentListComponent({
-    //   followList: this.followList,
-    //   attentionList: this.attentionList
-    // })
   }
 
   aboutToAppear() {
@@ -259,14 +268,6 @@ export struct PeopleShipMainComponent {
       // 获取列表数据
       let listData = await PeopleShipMainViewModel.getAttentionContentListInfo(this.currentPage, 20, this.loadTime)
       Logger.debug('PeopleShipMainComponent', '获取页面信息' + `${JSON.stringify(listData)}`)
-
-      if (resolve ) {
-        if (this.currentPage == 1) {
-          resolve('已更新至最新')
-        }else  {
-          resolve('')
-        }
-      }
       if (listData && listData.list && listData.list.length > 0) {
         if (listData.list.length === 20) {
           this.hasMore = true;
@@ -276,14 +277,71 @@ export struct PeopleShipMainComponent {
         if (this.currentPage == 1) {
           this.attentionList = []
         }
-        this.attentionList.push(...listData.list)
+        //批量查询各类型内容动态数据接口
+        this.checkContentInteractData(listData.list, resolve)
+      } else  {
+        this.resolveEnd(true, resolve)
       }
-      this.viewType = ViewType.LOADED
-      this.isLoading = false
+
+    } catch (exception) {
+      this.resolveEnd(false, resolve)
+    }
+  }
+
+  //  批量查询各类型内容动态数据接口
+  private async checkContentInteractData(list: ContentDTO[], resolve?: (value: string | PromiseLike<string>) => void) {
+    // 批量查询内容当前用户点赞、收藏状态
+    try {
+      // 获取列表数据
+      const params: contentListParams = {
+        contentList: []
+      }
+      list.forEach((item: ContentDTO) => {
+        params.contentList.push({
+          contentId: item.objectId,
+          contentType: Number(item.objectType ?? '1')
+        })
+      })
+
+      let listData = await PeopleShipMainViewModel.getContentInteractInfo(params)
+      Logger.debug('PeopleShipMainComponent', '获取页面信息' + `${JSON.stringify(listData)}`)
+      this.resolveEnd(true, resolve)
+      list.forEach((element: ContentDTO) => {
+        // 获取 interactData 数据
+        if (listData &&  listData.length > 0) {
+          const objc = listData.find((interactModel: InteractDataDTO) => {
+            return element.objectId == interactModel.contentId
+          })
+          if (objc) {
+            element.interactData = objc
+          }
+        }
+        // 设置人民号都不可关注
+        if (element.rmhInfo) {
+          element.rmhInfo.cnIsAttention = 0
+        }
+        this.attentionList.push(element)
+      })
+
     } catch (exception) {
+      this.resolveEnd(false, resolve)
+    }
+  }
+
+  private resolveEnd(isTop: boolean, resolve?: (value: string | PromiseLike<string>) => void) {
+    if (resolve) {
+      if (this.currentPage == 1 && isTop) {
+        resolve('已更新至最新')
+      }else  {
+        resolve('')
+      }
+    }
+    if (this.currentPage == 1 && !isTop) {
       this.viewType = ViewType.ERROR
-      this.isLoading = false
+    } else {
+      this.viewType = ViewType.LOADED
     }
+    this.isLoading = false
   }
 
   // 说是首页必须要调用

@@ -40,11 +40,12 @@ const TAG = 'OperRowListView';
 export struct OperRowListView {
   @Prop contentDetailData: ContentDetailDTO // 稿件详情
   @State operationButtonList: string[] = ['comment', 'like', 'collect', 'share'] // 组件展示条件
-  @Prop publishCommentModel: publishCommentModel
+  @ObjectLink publishCommentModel: publishCommentModel
   // @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
+  needLike: boolean = true
 
   async aboutToAppear() {
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
@@ -90,7 +91,7 @@ export struct OperRowListView {
         ForEach(this.operationButtonList, (item: string, index: number) => {
           if (item == 'comment') {
             this.builderComment()
-          } else if (item == 'like') {
+          } else if (item == 'like' && this.needLike) {
             this.builderLike()
           } else if (item == 'collect') {
             this.builderCollect()
@@ -262,7 +263,8 @@ export struct OperRowListView {
         }
       }
       // console.log(TAG, '获取互动点赞等数据===', JSON.stringify(res))
-      console.log(TAG, 'this.interactData', JSON.stringify(this.interactData))
+      console.log(TAG, 'this.interactData44', JSON.stringify(this.interactData))
+      console.log(TAG, 'this.publishCommentModel', JSON.stringify(this.publishCommentModel))
     })
   }
 }
\ No newline at end of file

@@ -35,7 +35,7 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel,
         touchUpPullRefresh(pageModel, pageAdvModel);
       } else {
         // Fingers up, handle loading more.
-        touchUpLoadMore(pageModel);
+        // touchUpLoadMore(pageModel);
       }
       break;
     default:

@@ -4,13 +4,18 @@ import PageHelper from '../viewmodel/PageHelper';
 
 export function touchMoveLoadMore(model: PageModel, event: TouchEvent) {
   // list size +1
-  if (model.endIndex === model.compList.totalCount() || model.endIndex === model.compList.totalCount() + 1) {
-    model.offsetY = event.touches[0].y - model.downY;
-    if (Math.abs(model.offsetY) > vp2px(model.pullUpLoadHeight) / 2) {
+  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;
-      model.offsetY = -vp2px(model.pullUpLoadHeight) + model.offsetY * Const.Y_OFF_SET_COEFFICIENT;
-    }
+    touchUpLoadMore(model);
   }
 }
 

 import { Logger } from 'wdKit';
 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
-import HashMap from '@ohos.util.HashMap';
 import {
   RmhRecommendDTO,
   PeopleShipContentListDTO,
-  AttentionBatchDTO
+  AttentionBatchDTO,
+  contentListParams,
+  InteractDataDTO
 } from 'wdBean';
+import { PageRepository } from '../repository/PageRepository'
 
 const TAG = 'PeopleShipMainViewModel'
 
@@ -103,5 +105,24 @@ export class PeopleShipMainViewModel {
     })
   }
 
+  static async getContentInteractInfo(params: contentListParams): Promise<InteractDataDTO[]> {
+    return new Promise<InteractDataDTO[]>((success, error) => {
+      Logger.debug(TAG, `getContentInteractInfo pageInfo start`);
+      PageRepository.getContentInteract(params)
+        .then((resDTO) => {
+          if (!resDTO.data || resDTO.code != 0) {
+            error(resDTO.message)
+            return
+          }
+          Logger.debug(TAG, "getContentInteractInfo then,navResDTO.timestamp:" + resDTO.timestamp);
+          success(resDTO.data);
+        })
+        .catch((err: Error) => {
+          Logger.error(TAG, `getContentInteractInfo catch, error.name : ${err.name},  error.message:${err.message}`);
+          error(err);
+        })
+    })
+  }
+
 
 }
\ No newline at end of file

@@ -16,6 +16,7 @@ import {
 } from 'wdKit';
 import { HostEnum, HostManager, WDHttp } from 'wdNetwork';
 import { LoginModule } from 'wdLogin/src/main/ets/LoginModule';
+import { ConfigurationConstant } from '@kit.AbilityKit';
 
 export default class EntryAbility extends UIAbility {
   onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
@@ -29,7 +30,8 @@ export default class EntryAbility extends UIAbility {
     if (StringUtils.isNotEmpty(spHostUrl)) {
       HostManager.changeHost(spHostUrl as HostEnum)
     }
-
+    // 还没深色模式需求，暂直接不跟随系统。
+    this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_LIGHT);
     // 注册监听网络连接
     EmitterUtils.receiveEvent(EmitterEventId.NETWORK_CONNECTED, ((str?: string) => {
       let type: NetworkType | null = null