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

yuzhilin
Commit 9158bccf96197c6988fa72242db39aefb68fbeb9 9158bccf 2 parents cd5fbabb c991316f
Showing 2 changed files with 55 additions and 17 deletions
sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/view/PlayerRightView.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
View file @9158bcc
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/DynamicDetailComponent.ets
View file @9158bcc
-import { AccountManagerUtils, Logger, DateTimeUtils  } from 'wdKit';
+import { AccountManagerUtils, Logger, DateTimeUtils, SPHelper  } from 'wdKit';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
-import { ContentDetailDTO,batchLikeAndCollectResult,batchLikeAndCollectParams,postBatchAttentionStatusParams,
+import { ContentDetailDTO,postBatchAttentionStatusParams,
   PhotoListBean,
   ContentDTO,
   RmhInfoDTO, } from 'wdBean';
 import media from '@ohos.multimedia.media';
 import { OperRowListView } from './view/OperRowListView';
 import { WDPlayerController } from 'wdPlayer/Index';
+import {
+  batchLikeAndCollectParams,
+  batchLikeAndCollectResult,
+  ContentDetailRequest,
+  contentListParams,
+  postExecuteCollectRecordParams,
+  postExecuteLikeParams,
+  postInteractAccentionOperateParams
+} from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 import { ContentConstants } from '../constants/ContentConstants';
-import { ProcessUtils } from 'wdRouter';
+import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter';
 import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
 import display from '@ohos.display';
 import { BusinessError } from '@ohos.base';
-import { CommonConstants } from 'wdConstant/Index';
+import { CommonConstants, SpConstants } from 'wdConstant/Index';
 import { CardMediaInfo } from '../components/cardCommon/CardMediaInfo'
 import router from '@ohos.router';
 const TAG = 'DynamicDetailComponent'
@@ -24,20 +33,13 @@ export struct DynamicDetailComponent {
   private contentId: string = ''
   private relType: string = ''
   //出参 fixme 模拟数据用json转换
-  @State contentDetailData: ContentDetailDTO = {
-    publishTime: "2023年03月14日 08:16",
-    rmhInfo:{rmhHeadUrl:"",rmhName:"人民号名称",rmhDesc:"人民号描述单行展示"},
-    newsContent:"优先展示这个内容",
-    newsSummary:"其次展示这个内容",
-    newsTitle:"上面两个都没有再展示这个内容",
-    newsType:15
-  } as ContentDetailDTO
+  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   //变量
   scroller: Scroller = new Scroller();
   /**
    * 默认未关注 点击去关注
    */
-  private  followStatus: String = '0';
+  @State  followStatus: String = '0';
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   //跳转
@@ -130,7 +132,7 @@ export struct DynamicDetailComponent {
                     .backgroundColor($r('app.color.color_ED2800'))
                     .fontColor($r('app.color.color_fff'))
                     .onClick(() => {
-                      // this.handleAccention(this.item, 1)
+                      this.handleAccention()
                     })
                 } else {
                   Text('已关注')
@@ -143,7 +145,7 @@ export struct DynamicDetailComponent {
                     .borderColor($r('app.color.color_CCCCCC'))
                     .fontColor($r('app.color.color_CCCCCC'))
                     .onClick(() => {
-                      // this.handleAccention(this.item, 0)
+                      this.handleAccention()
                     })
                 }
               }
@@ -224,6 +226,9 @@ export struct DynamicDetailComponent {
                                 item.height = callback?.height || 0;
                               })
                           }
+                          .onClick((event: ClickEvent) => {
+                            ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList)
+                          })
                         }
                       } else if (this.contentDetailData.photoList.length === 4) {
                         GridCol({
@@ -233,6 +238,9 @@ export struct DynamicDetailComponent {
                             .aspectRatio(1)
                             .borderRadius(this.caclImageRadius(index))
                         }
+                        .onClick((event: ClickEvent) => {
+                          ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList)
+                        })
                       } else {
                         GridCol({
                           span: { sm: 4, lg: 3 }
@@ -241,6 +249,9 @@ export struct DynamicDetailComponent {
                             .aspectRatio(1)
                             .borderRadius(this.caclImageRadius(index))
                         }
+                        .onClick((event: ClickEvent) => {
+                          ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList)
+                        })
                       }
                     })
                   }
@@ -414,7 +425,7 @@ export struct DynamicDetailComponent {
       console.error(TAG, JSON.stringify(this.contentDetailData))
       let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
       console.error(TAG, '查询用户对作品点赞、收藏状态', JSON.stringify(data))
-      this.newsStatusOfUser = data[0];
+      // this.newsStatusOfUser = data[0];
       Logger.info(TAG, `newsStatusOfUser：${JSON.stringify(this.newsStatusOfUser)}`)
     } catch (exception) {
       console.error(TAG, JSON.stringify(exception))
@@ -486,6 +497,33 @@ export struct DynamicDetailComponent {
       return 3; //普通图
     }
   }
+
+  /**
+   * 关注号主
+   */
+  async handleAccention() {
+    // 未登录，跳转登录
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
+
+    const params2: postInteractAccentionOperateParams = {
+      attentionUserType: this.contentDetailData?.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
+      attentionUserId: this.contentDetailData?.rmhInfo?.userId || '', // 被关注用户号主id
+      attentionCreatorId: this.contentDetailData?.rmhInfo?.rmhId || '', // 被关注用户号主id
+      status: this.followStatus == '0'? 1:0,
+    }
+    ContentDetailRequest.postInteractAccentionOperate(params2).then(res => {
+      console.log('关注号主==', JSON.stringify(res.data))
+      if (this.followStatus == '1') {
+        this.followStatus = '0'
+      } else {
+        this.followStatus = '1'
+      }
+    })
+  }
 }
 interface radiusType {
--- a/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/view/PlayerRightView.ets
View file @9158bcc
+++ b/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/view/PlayerRightView.ets
View file @9158bcc
@@ -13,7 +13,7 @@ import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { SpConstants } from 'wdConstant/Index'
-
+//视频点播页右侧操作栏：点赞/收藏/评论/分享 竖着排列
 export interface OperationItem {
   icon: Resource;
   icon_check?: Resource;