Merge remote-tracking branch 'origin/main'

@@ -253,6 +253,13 @@ export class HttpUrlUtils {
    * 早晚报获取PAGEID
    * */
   static readonly DAILY_PAPER_TOPIC: string = "/api/rmrb-bff-display-zh/display/zh/c/dailyPaperTopic";
+
+  /**
+   * app启动页 兴趣偏好
+   */
+  static readonly INTERESTS_HOTS_DATA_PATH: string = "/api/rmrb-user-center/user/zh/c/tag/queryTags";
+
+
   private static _hostUrl: string = HttpUrlUtils.HOST_PRODUCT;
   /**
    * 推荐列表
@@ -650,6 +657,12 @@ export class HttpUrlUtils {
     return url
   }
 
+  static getInterestsUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.INTERESTS_HOTS_DATA_PATH;
+    return url;
+
+  }
+
   static getLiveDetailsUrl() {
     let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_DETAILS_PATH
     return url

@@ -87,6 +87,9 @@ export class WDRouterPage {
   static launchAdvertisingPage = new WDRouterPage("phone", "ets/pages/launchPage/LaunchAdvertisingPage");
   //主页
   static mainPage = new WDRouterPage("phone", "ets/pages/MainPage");
+
+  static launchInterestsPage = new WDRouterPage("phone", "ets/pages/launchPage/LaunchInterestsHobbiesPage");
+
   // static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
 
   //播报页面

@@ -18,7 +18,7 @@ export class WDRouterRule {
     if (page) {
       if (params) {
         // router.pushUrl({   url: 'pages/routerpage2', , params: params })
-        console.log('page.url()==',page.url())
+        console.log('page.url()==',page.url(),JSON.stringify(params))
         router.pushUrl({ url: page.url(), params: params })
       } else {
         router.pushUrl({ url: page.url() }).catch((error:Error)=>{

@@ -14,7 +14,7 @@ export struct WdWebLocalComponent {
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   @Prop backVisibility: boolean = false
   @Prop webResource: Resource = {} as Resource
-  @State webHeight : string = '100%'
+  @State webHeight: string | number = '100%'
 
   build() {
     Column() {
@@ -39,7 +39,7 @@ export struct WdWebLocalComponent {
         .mixedMode(MixedMode.All)
         .onlineImageAccess(true)
         .enableNativeEmbedMode(true)
-        .height(this.webHeight === '100%' ? '100%' : Number(this.webHeight))
+        .height(this.webHeight)
         .onPageBegin((event) => {
           this.onPageBegin(event?.url);
         })
@@ -79,9 +79,16 @@ export struct WdWebLocalComponent {
 
   //webview 高度设置
   private setCurrentPageOperate: (data: Message) => void = (data) => {
-    console.log("setCurrentPageOperate",JSON.stringify(data))
+    console.log("setCurrentPageOperate", JSON.stringify(data))
     if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate) {
-      this.webHeight = data?.data?.webViewHeight || '100%'
+      if (typeof this.webHeight === 'number') {
+        if (Number(data?.data?.webViewHeight) > this.webHeight) {
+          this.webHeight = Number(data?.data?.webViewHeight)
+        }
+      }
+      {
+        this.webHeight = Number(data?.data?.webViewHeight) || '100%'
+      }
     }
   }
   /**

@@ -72,5 +72,6 @@ export interface ContentDTO {
   corner: string;
   rmhPlatform: number;
   newTags: string;
+  titleShow?: number;
   isSearch?: boolean; // 是否是搜索的结果，区分搜索和主页的数据
 }
\ No newline at end of file

@@ -58,9 +58,9 @@ export struct CardParser {
     }
     else {
       // todo:组件未实现 / Component Not Implemented
-      Text(contentDTO.appStyle)
-        .width(CommonConstants.FULL_PARENT)
-        .padding(10)
+      // Text(contentDTO.appStyle)
+      //   .width(CommonConstants.FULL_PARENT)
+      //   .padding(10)
       // .backgroundColor(Color.Brown) // 展示本页未实现的compStyle
     }
   }

@@ -66,9 +66,9 @@ export struct CompParser {
     }
     else {
       // todo:组件未实现 / Component Not Implemented
-      Text(compDTO.compStyle)
-        .width(CommonConstants.FULL_PARENT)
-        .padding(10)
+      // Text(compDTO.compStyle)
+      //   .width(CommonConstants.FULL_PARENT)
+      //   .padding(10)
       // .backgroundColor(Color.Brown) // 展示本页未实现的compStyle
     }
   }

@@ -20,12 +20,18 @@ export struct CardSourceInfo {
           .fontColor($r("app.color.color_B0B0B0"))
           .maxLines(1)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
+        Image($r("app.media.point"))
+          .width(16)
+          .height(16)
       } else if (this.contentDTO.source) {
         Text(`${this.contentDTO.source}`)
           .fontSize($r("app.float.font_size_12"))
           .fontColor($r("app.color.color_B0B0B0"))
           .maxLines(1)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
+        Image($r("app.media.point"))
+          .width(16)
+          .height(16)
       }
       // 新闻tab下的卡片，2天之前的不显示时间。但是如果是搜索情况下展示的卡片，显示时间
       if (this.contentDTO.isSearch || !this.contentDTO.isSearch && DateTimeUtils.getCommentTime
@@ -34,9 +40,6 @@ export struct CardSourceInfo {
           .contentDTO.publishTime))
         .indexOf
         ('-') === -1) {
-        Image($r("app.media.point"))
-          .width(16)
-          .height(16)
         Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
           .fontSize($r("app.float.font_size_12"))
           .fontColor($r("app.color.color_B0B0B0"))

@@ -17,7 +17,7 @@ export struct Card10Component {
   build() {
     Column() {
       // 顶部标题，最多两行
-      if (this.contentDTO.newsTitle) {
+      if (this.contentDTO.titleShow === 1 && this.contentDTO.newsTitle) {
         Text(this.contentDTO.newsTitle)
           .width(CommonConstants.FULL_WIDTH)
           .fontSize($r('app.float.font_size_17'))

@@ -42,16 +42,15 @@ export struct Card6Component {
       .alignItems(HorizontalAlign.Start)
       .justifyContent(FlexAlign.Start)
       .width('58%')
-      if (this.contentDTO.coverUrl) {
-        Stack() {
-          Image(this.contentDTO.coverUrl)
-            .borderRadius(5)
-            .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
-            .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 90 : 180)
-          CardMediaInfo({ contentDTO: this.contentDTO })
-        }
-        .alignContent(Alignment.BottomEnd)
+      Stack() {
+        Image(this.contentDTO.coverUrl)
+          .backgroundColor($r('app.color.color_B0B0B0'))
+          .borderRadius(5)
+          .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
+          .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 90 : 180)
+        CardMediaInfo({ contentDTO: this.contentDTO })
       }
+      .alignContent(Alignment.BottomEnd)
     }
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)

@@ -15,7 +15,7 @@ export struct Card9Component {
   build() {
     Column() {
       // 顶部标题，最多两行
-      if (this.contentDTO.newsTitle) {
+      if (this.contentDTO.titleShow === 1 && this.contentDTO.newsTitle) {
         Text(this.contentDTO.newsTitle)
           .width(CommonConstants.FULL_WIDTH)
           .fontSize($r('app.float.font_size_17'))

+import { CompDTO, ContentDTO, Params } from 'wdBean';
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { HttpUrlUtils } from 'wdNetwork/Index';
+import { postInteractAccentionOperateParams } from 'wdBean';
+import { PageRepository } from '../../repository/PageRepository';
+import { CommonConstants } from 'wdConstant/Index';
+
+/**
+ * 小视频横划卡
+ * Zh_Single_Row-02
+ */
+const TAG = 'Zh_Single_Row-02'
+
+@Entry
+@Component
+export struct ZhSingleRow02 {
+  @State compDTO: CompDTO = {
+    objectTitle: '大标题',
+    operDataList: [
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+    ]
+  } as CompDTO
+
+  build() {
+    Column() {
+      //顶部
+      this.CompHeader(this.compDTO)
+      Row(){
+        // 列表内容
+        List() {
+          ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
+            CreatorItem({
+              item
+            })
+              .margin({right: index === this.compDTO.operDataList.length - 1 ? $r('app.float.card_comp_pagePadding_lf') : 0})
+          })
+        }
+        .listDirection(Axis.Horizontal)
+      }
+      .width(CommonConstants.FULL_WIDTH)
+      .height(208)
+    }
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      // right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .backgroundColor($r('app.color.white'))
+    .margin({ bottom: 8 })
+  }
+
+  @Builder
+  CompHeader(item: CompDTO) {
+    Row() {
+      Row() {
+        Image($r("app.media.redLine"))
+          .width(3)
+          .height(16)
+          .margin({ right: 4 })
+        Text(item.objectTitle)
+          .fontSize($r("app.float.font_size_17"))
+          .fontColor($r("app.color.color_222222"))
+          .fontWeight(600)
+      }
+
+      Row() {
+        Text("更多")
+          .fontSize($r("app.float.font_size_14"))
+          .fontColor($r("app.color.color_999999"))
+          .margin({ right: 1 })
+        Image($r("app.media.more"))
+          .width(14)
+          .height(14)
+          .onClick(() => {
+            // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41
+            let params: Params = {
+              pageID: "1"
+            }
+            WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
+          })
+      }
+      .padding({
+        right: $r('app.float.card_comp_pagePadding_lf'),
+      })
+    }
+    .justifyContent(FlexAlign.SpaceBetween)
+    .margin({ top: 8, bottom: 8 })
+    .width('100%')
+  }
+}
+
+@Extend(Text)
+function textOverflowStyle(maxLine: number) {
+  .maxLines(maxLine)
+  .textOverflow({ overflow: TextOverflow.Ellipsis })
+}
+
+@Component
+struct CreatorItem {
+  @Prop item: ContentDTO
+  @State rmhIsAttention: number = 0
+  build() {
+    ListItem() {
+      Column() {
+        Stack({ alignContent: Alignment.Bottom }) {
+          Image('')
+            .width(156)
+            .height(208)
+          Row()
+            .width(156)
+            .height(80)
+            .linearGradient({
+              direction: GradientDirection.Bottom,
+              colors: [[0xffffff, 0.0], [0x000000, 1.0]]
+            })
+            .opacity(0.3)
+          Text('这里显示卡片标题这里显示卡片标题这里显示卡片标题这里显示卡片标题这里显示卡片标题')
+            .fontColor(0xffffff)
+            .fontSize(14)
+            .maxLines(2)
+            .textOverflow({overflow: TextOverflow.Ellipsis})
+            .width(140)
+            .height(40)
+            .margin({bottom: 8})
+        }
+
+      }
+      .width(156)
+      .height(208)
+      .margin({ right: 11 })
+      .borderWidth(1)
+      .borderColor($r('app.color.color_EDEDED'))
+      .borderRadius($r('app.float.image_border_radius'))
+    }
+    .onClick(() => {
+      console.log('跳转到rmh');
+    })
+  }
+
+  /**
+   * 关注号主 TODO 这里后面需要抽离
+   */
+  handleAccention(item: ContentDTO, status: number) {
+    this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
+    return
+    // 未登录，跳转登录
+    if (!HttpUrlUtils.getUserId()) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
+
+    const params: postInteractAccentionOperateParams = {
+      attentionUserType: item.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
+      attentionUserId: item.rmhInfo?.userId || '', // 被关注用户号主id
+      attentionCreatorId: item.rmhInfo?.rmhId || '', // 被关注用户号主id
+      // userType: 1,
+      // userId: '1', // TODO 用户id需要从本地获取
+      status: status,
+    }
+    PageRepository.postInteractAccentionOperate(params).then(res => {
+      console.log(TAG, '关注号主==', JSON.stringify(res.data))
+      if (status === 1) {
+        this.rmhIsAttention = 0
+      } else {
+        this.rmhIsAttention = 1
+      }
+    })
+  }
+}

+import { CompDTO, ContentDTO, Params } from 'wdBean';
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
+import { HttpUrlUtils } from 'wdNetwork/Index';
+import { postInteractAccentionOperateParams } from 'wdBean';
+import { PageRepository } from '../../repository/PageRepository';
+import { CommonConstants } from 'wdConstant/Index';
+
+/**
+ * 精选评论卡
+ * Zh_Single_Row-06
+ */
+const TAG = 'Zh_Single_Row-06'
+
+@Entry
+@Component
+export struct ZhSingleRow06 {
+  @State compDTO: CompDTO = {
+    objectTitle: '大标题',
+    operDataList: [
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+      {
+        rmhInfo: {
+          rmhId: '2489729',
+          rmhName: '陕西青年职业学院',
+          rmhDesc: '陕西青年职业学院陕西青年职业学院是经陕西省人民政陕西青年职业学院是经陕西省人民政是经陕西省人民政',
+          rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn//upload/ueditor/image/20210113/a_533807397399949312' +
+            '.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg'
+        }
+      },
+    ]
+  } as CompDTO
+
+  build() {
+    Column() {
+      //顶部
+      this.CompHeader(this.compDTO)
+      Row(){
+        // 列表内容
+        List() {
+          ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
+            CreatorItem({
+              item
+            })
+              .margin({right: index === this.compDTO.operDataList.length - 1 ? $r('app.float.card_comp_pagePadding_lf') : 0})
+          })
+        }
+        .listDirection(Axis.Horizontal)
+      }
+      .width(CommonConstants.FULL_WIDTH)
+      .height(208)
+    }
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      // right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+    .backgroundColor($r('app.color.white'))
+    .margin({ bottom: 8 })
+  }
+
+  @Builder
+  CompHeader(item: CompDTO) {
+    Row() {
+      Row() {
+        Image($r("app.media.icon_elite_comment"))
+          .width(24)
+          .height(24)
+          .margin({ right: 4 })
+        Text('精选评论')
+          .fontSize($r("app.float.font_size_17"))
+          .fontColor($r("app.color.color_222222"))
+          .fontWeight(600)
+      }
+
+      Row() {
+        Text("更多")
+          .fontSize($r("app.float.font_size_14"))
+          .fontColor($r("app.color.color_999999"))
+          .margin({ right: 1 })
+        Image($r("app.media.more"))
+          .width(14)
+          .height(14)
+          .onClick(() => {
+            // TODO 跳转的页面，定义的入参可能不合理。推荐id: 41
+            let params: Params = {
+              pageID: "1"
+            }
+            WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
+          })
+      }
+      .padding({
+        right: $r('app.float.card_comp_pagePadding_lf'),
+      })
+    }
+    .justifyContent(FlexAlign.SpaceBetween)
+    .margin({ top: 8, bottom: 8 })
+    .width('100%')
+  }
+}
+
+@Extend(Text)
+function textOverflowStyle(maxLine: number) {
+  .maxLines(maxLine)
+  .textOverflow({ overflow: TextOverflow.Ellipsis })
+}
+
+@Component
+struct CreatorItem {
+  @Prop item: ContentDTO
+  @State rmhIsAttention: number = 0
+  build() {
+    ListItem() {
+      Column() {
+        Flex({direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween}) {
+          Column() {
+            Row() {
+              Image('')
+                .width(20)
+                .height(20)
+                .margin({right: 4})
+                .border({width: 1, color: 0xcccccc, radius: 10})
+              Text('立志之间')
+                .fontColor(0x212228)
+                .fontSize(12)
+            }
+          }
+
+          Column() {
+            Row() {
+              Image($r('app.media.icon_like_no'))
+                .width(16)
+                .height(16)
+                .margin({right: 4})
+              Text('3835')
+                .fontSize(14)
+                .fontColor(0x999999)
+            }
+          }
+        }
+        .margin({top: 10, left: 10, right: 10, bottom: 8})
+
+        Text('就业不仅是民生问题，也是发展问题，就业不仅是民生问题，也是发展问题，就业不仅是民生问题，也是发展问题，')
+          .maxLines(2)
+          .textOverflow({overflow: TextOverflow.Ellipsis})
+          .margin({left: 10, right: 10, bottom: 8})
+          .fontSize(17)
+          .fontColor(0x212228)
+          .lineHeight(25)
+
+        Row() {
+          Image('')
+            .width(66)
+            .height(44)
+            .borderRadius({topLeft: 3, topRight: 0, bottomLeft: 3, bottomRight: 0})
+          Text('原文｜强化就业优先政策 健全就业促进机制原文｜强化就业优先政策 健全就业促进机制原文｜强化就业优先政策 健全就业促进机制')
+            .margin({left: 8})
+            .width(172)
+            .maxLines(2)
+            .textOverflow({overflow: TextOverflow.Ellipsis})
+        }
+        .linearGradient({
+          direction: GradientDirection.Right,
+          colors: [[0xffffff, 0.0],[0xffffff, 0.8], [0xf9f9f9, 1.0]]
+        })
+      }
+      .width(276)
+      .height(150)
+      .margin({ right: 10 })
+      .borderWidth(1)
+      .borderColor($r('app.color.color_EDEDED'))
+      .borderRadius($r('app.float.image_border_radius'))
+      .backgroundColor(0xf9f9f9)
+    }
+    .onClick(() => {
+      console.log('跳转到rmh');
+    })
+  }
+
+  /**
+   * 关注号主 TODO 这里后面需要抽离
+   */
+  handleAccention(item: ContentDTO, status: number) {
+    this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
+    return
+    // 未登录，跳转登录
+    if (!HttpUrlUtils.getUserId()) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
+
+    const params: postInteractAccentionOperateParams = {
+      attentionUserType: item.rmhInfo?.userType || '', //被关注用户类型（1 普通用户 2 视频号 3 矩阵号）
+      attentionUserId: item.rmhInfo?.userId || '', // 被关注用户号主id
+      attentionCreatorId: item.rmhInfo?.rmhId || '', // 被关注用户号主id
+      // userType: 1,
+      // userId: '1', // TODO 用户id需要从本地获取
+      status: status,
+    }
+    PageRepository.postInteractAccentionOperate(params).then(res => {
+      console.log(TAG, '关注号主==', JSON.stringify(res.data))
+      if (status === 1) {
+        this.rmhIsAttention = 0
+      } else {
+        this.rmhIsAttention = 1
+      }
+    })
+  }
+}

@@ -447,5 +447,8 @@ export struct PaperSingleColumn999CardView {
     .backgroundColor(Color.White)
     .margin({ bottom: 5, left: 12, right: 12 })
     .borderRadius(4)
+    .onClick(()=>{
+      ProcessUtils.processPage(this.item)
+    })
   }
 }
\ No newline at end of file

@@ -59,7 +59,9 @@ struct GuidePages {
         .onClick(() => {
           if (index == 3) {
             // 跳转到首页
-            WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
+            //WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
+            //跳转到兴趣偏好选择页
+            WDRouterRule.jumpWithReplacePage(WDRouterPage.launchInterestsPage)
           }
         })
         .id('index')

+import {InterestsHobbiesModel, InterestsList} from '../viewModel/InterestsHobbiesModel'
+import { WDRouterRule } from 'wdRouter';
+import { WDRouterPage } from 'wdRouter';
+
+@Entry
+@Component
+struct LaunchInterestsHobbiesPage {
+  @State message: string = 'Hello World'
+  @State dataArray: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+  @State selectCount: number = 0
+  @State interestsArray: InterestsList[] = []
+
+
+  aboutToAppear(){
+    //请求接口，获取兴趣偏好数据
+    this.requestInterestsData()
+  }
+
+
+  build() {
+    Column() {
+      Row(){
+        Blank()
+        Text('跳过')
+          .fontSize('27lpx')
+          .fontColor('#333333')
+          .width('54lpx')
+          .height('35lpx')
+          .margin({top:'27lpx',right:'46lpx'})
+          .onClick(()=>{
+            //直接跳过到首页
+            //跳转首页
+            WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
+          })
+      }
+      .width('100%')
+      .justifyContent(FlexAlign.End)
+
+      Text('选择感兴趣的内容')
+        .fontSize('46lpx')
+        .fontWeight(FontWeight.Bold)
+        .textAlign(TextAlign.Center)
+        .fontColor('#333333')
+        .width('100%')
+        .height('61lpx')
+        .margin({top:'84lpx'})
+      Text('完善信息，将为您推荐个性化的内容')
+        .fontSize('27lpx')
+        .textAlign(TextAlign.Center)
+        .fontColor('#9E9E9E')
+        .width('100%')
+        .height('35lpx')
+        .margin({top:'12lpx'})
+
+      Grid( ){
+        ForEach(this.interestsArray,(item:InterestsList,index:number)=>{
+          GridItem(){
+            Stack({alignContent:Alignment.TopStart}){
+
+              Image(item.pic)
+                .width('100%')
+                .height('100%')
+                .backgroundColor(Color.White)
+                .borderRadius(5)
+              Stack(){
+                Column({}){
+                  Text(item.name)
+                    .fontSize('35lpx')
+                    .fontColor('#FFFFFF')
+                    .margin({top:'21lpx',left:'19lpx'})
+                    .width('100%')
+                    .height('46lpx')
+                    .fontWeight(FontWeight.Bold)
+                  Text(item.title)
+                    .fontSize('23lpx')
+                    .fontColor('#FFFFFF')
+                    .margin({top:'2lpx',left:'19lpx'})
+                    .width('100%')
+                    .height('31lpx')
+                }.justifyContent(FlexAlign.Start)
+              }
+
+              Stack(){
+                Image('')
+                  .width('100%')
+                  .height('100%')
+                  .backgroundColor(Color.White)
+                  .opacity(item.choose?0:0.7)
+                  .borderRadius(5)
+              }
+            }
+          }
+          .width('192lpx')
+          .height('230lpx')
+          .borderRadius('8lpx')
+          .onClick(()=>{
+            //选择后改变已选择属性
+            item.choose = !item.choose
+            this.interestsArray.splice(index,1,item)
+            this.selectCount = this.interestsArray.filter(item => item.choose).length
+          })
+
+        })
+
+      }
+      .width('90%')
+      .height('70%')
+      .margin({top:'61lpx'})
+      .columnsTemplate('1fr 1fr 1fr')
+      // .rowsTemplate('1fr 1fr 1fr 1fr')
+      .columnsGap('23lpx')
+      .rowsGap('23lpx')
+
+      Stack({alignContent:Alignment.Center}){
+        Button(this.selectCount == 0?'选好了':'选好了(' + this.selectCount + ')')
+          .fontSize('35lpx')
+          .fontColor('#FFFFFF')
+          .backgroundColor('#ED2800')
+          .type(ButtonType.Normal)
+          .borderRadius('10lpx')
+          .width('662lpx')
+          .height('84lpx')
+          .onClick(()=>{
+            //跳转首页
+            WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
+          })
+      }
+      .width('100%')
+      .height('108lpx')
+      // .position({y:})
+      // .margin({bottom:'1',top:'1'})
+      .backgroundColor('#FFFFFF')
+
+    }
+    .width('100%')
+    .height('100%')
+  }
+
+
+  requestInterestsData() {
+    //请求隐私协议接口
+    let interestsModel = new InterestsHobbiesModel()
+    interestsModel.getInterestsHobbiesData()
+      .then((value:InterestsList[])=>{
+        this.interestsArray = value
+      })
+      .catch((err:Error)=>{
+        console.log('获取兴趣偏好数据出错' + err)
+      })
+  }
+
+}
\ No newline at end of file

+import HashMap from '@ohos.util.HashMap';
+import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
+import { HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
+import { Logger, SPHelper } from 'wdKit/Index';
+import data from '@ohos.telephony.data';
+
+
+export interface InterestsBean {
+
+  // code : string
+  // message : string
+  // success : boolean
+  // timestamp : number
+  data : InterestsList[]
+
+}
+
+
+export interface InterestsList{
+
+  id : number
+  title : string
+  pic : string
+  name : string
+  choose : boolean
+
+}
+
+
+export class InterestsHobbiesModel {
+
+
+  getInterestsHobbiesData() {
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return new Promise<InterestsList[]>((success, fail) => {
+      HttpRequest.get<ResponseDTO<InterestsList[]>>(HttpUrlUtils.getInterestsUrl(), headers).then((data: ResponseDTO<InterestsList[]>) => {
+        if (!data || !data.data) {
+          fail("数据为空")
+          return
+        }
+        if (data.code != 0) {
+          fail(data.message)
+          return
+        }
+        Logger.debug("InterestsHobbiesModel兴趣偏好数据获取成功:success ", JSON.stringify(data))
+        success(data.data);
+
+
+        //保存数据
+        // for (let i = 0; i < data.data.length; i++) {
+        //   if (data.data[i].type == 1) {
+        //     SPHelper.default.save(SpConstants.USER_PROTOCOL, data.data[i].linkUrl)
+        //   } else if (data.data[i].type == 2) {
+        //     SPHelper.default.save(SpConstants.PRIVATE_PROTOCOL, data.data[i].linkUrl)
+        //   }
+        // }
+
+      }, (error: Error) => {
+        Logger.debug("InterestsHobbiesModel兴趣偏好数据获取失败:error ", error.toString())
+        fail(error.message)
+      })
+    })
+
+
+  }
+
+
+}
\ No newline at end of file

@@ -11,6 +11,7 @@
     "pages/launchPage/LaunchPage",
     "pages/launchPage/LaunchAdvertisingPage",
     "pages/broadcast/BroadcastPage",
+    "pages/launchPage/LaunchInterestsHobbiesPage",
     "pages/SpacialTopicPage"
   ]
-}
+}
\ No newline at end of file