Merge remote-tracking branch 'origin/main'

@@ -397,7 +397,8 @@ export class HttpUrlUtils {
     if (StringUtils.isNotEmpty(HttpUrlUtils.token)) {
       return HttpUrlUtils.token
     }
-    return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
+    // return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
+    return ''
   }
 
   static getRefreshToken() {

@@ -31,60 +31,58 @@ export struct CompParser {
   compIndex: number = 0;
 
   build() {
-    Column(){
+    Column() {
       this.componentBuilder(this.compDTO, this.compIndex);
-      Divider().strokeWidth(1).color('#f5f5f5').padding({left:16,right:16})
     }
   }
 
   @Builder
   componentBuilder(compDTO: CompDTO, compIndex: number) {
-    if (compDTO.compStyle === CompStyle.Label_03) {
-      LabelComponent({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
-      BannerComponent({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_01 && compDTO.imageScale === 2) {
-      LiveHorizontalCardComponent({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_01 && compDTO.imageScale === 3) {
-      if (compDTO.operDataList.length > 1) {
-        HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: compDTO })
-      } else {
-        HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: compDTO })
+    if (compDTO.objectType !== '3' && compDTO.objectType !== '13') { //暂时屏蔽活动和音频详情入口
+      if (compDTO.compStyle === CompStyle.Label_03) {
+        LabelComponent({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
+        BannerComponent({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_01 && compDTO.imageScale === 2) {
+        LiveHorizontalCardComponent({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_01 && compDTO.imageScale === 3) {
+        if (compDTO.operDataList.length > 1) {
+          HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: compDTO })
+        } else {
+          HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: compDTO })
+        }
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
+        ZhSingleRow02({ compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
+        LiveHorizontalReservationComponent({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) {
+        ZhGridLayout02({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
+        ZhGridLayout03({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
+        ZhSingleRow04({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
+        //头图卡 和comStyle 2相同，
+        Card5Component({ contentDTO: compDTO.operDataList[0] })
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
+        ZhSingleColumn04({ compDTO: compDTO })
+      } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
+        ZhSingleColumn05({ compDTO: compDTO })
+      } else if (!Number.isNaN(Number(compDTO.compStyle))) {
+        CardParser({ contentDTO: compDTO.operDataList[0] });
       }
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
-      ZhSingleRow02({ compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
-      LiveHorizontalReservationComponent({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) {
-      ZhGridLayout02({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
-      ZhGridLayout03({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
-      ZhSingleRow04({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
-      //头图卡 和comStyle 2相同，
-      Card5Component({ contentDTO: compDTO.operDataList[0] })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
-      ZhSingleColumn04({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
-      ZhSingleColumn05({ compDTO: compDTO })
-    } else if (!Number.isNaN(Number(compDTO.compStyle))) {
-      CardParser({ contentDTO: compDTO.operDataList[0] });
-    }
-    else {
-      // todo:组件未实现 / Component Not Implemented
-      Text(compDTO.compStyle)
-        .width(CommonConstants.FULL_PARENT)
-        .padding(10)
-        .onClick(()=>{
-          if (compDTO.compStyle === CompStyle.Zh_Single_Row_06) {//精选评论
-            WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)
-          }
-        })
-      // Text(compDTO.compStyle)
-      //   .width(CommonConstants.FULL_PARENT)
-      //   .padding(10)
-      // .backgroundColor(Color.Brown) // 展示本页未实现的compStyle
+      else {
+        // todo:组件未实现 / Component Not Implemented
+        Text(compDTO.compStyle)
+          .width(CommonConstants.FULL_PARENT)
+          .padding(10)
+          .onClick(() => {
+            if (compDTO.compStyle === CompStyle.Zh_Single_Row_06) { //精选评论
+              WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)
+            }
+          })
+      }
+      Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     }
   }
 }

-import { CommonConstants } from 'wdConstant';
-import { Logger } from 'wdKit';
-
-const TAG = 'EmptyComponent';
-
-/**
- * WDViewDefaultType 缺省页
- */
-export const enum WDViewDefaultType {
-  ///无网
-  WDViewDefaultType_NoNetwork,
-  ///网络失败 请稍后重试-倒计时
-  WDViewDefaultType_NetworkFailed,
-  ///内容获取失败
-  WDViewDefaultType_ContentFailed,
-}
-
-/**
- * 空数据/无数据
- */
-@Preview
-@Component
-export struct MultiPictureDetailEmptyComponent {
-  // private emptySize: SizeOptions = {};
-  @State emptyWidth: string | number = CommonConstants.FULL_PARENT;
-  @State emptyHeight: string | number = CommonConstants.FULL_PARENT;
-  @State emptyType: number = WDViewDefaultType.WDViewDefaultType_ContentFailed
-  /**
-   * The empty image width percentage setting.
-   */
-  readonly EMPTY_IMAGE_WIDTH: string = '15%';
-  /**
-   * The empty image height percentage setting.
-   */
-  readonly EMPTY_IMAGE_HEIGHT: string = '15%';
-  /**
-   * The empty data text component margin top.
-   */
-  readonly EMPTY_TIP_TEXT_MARGIN_TOP: string = '10';
-  /**
-   * The empty data text opacity.
-   */
-  readonly TEXT_OPACITY: number = 1;
-
-  build() {
-    this.noProgrammeData();
-  }
-
-  /**
-   * 无数据，空白view组件
-   */
-  @Builder
-  noProgrammeData() {
-    Column() {
-      Image(this.buildNoDataTipImage())
-        .width('this.EMPTY_IMAGE_WIDTH')
-        .height(this.EMPTY_IMAGE_HEIGHT)
-        .objectFit(ImageFit.Contain)
-      // .border({ width: 1, color: Color.Red, radius: 6 })
-
-      Text(this.buildNoDataTip())
-        .fontSize($r('app.float.font_size_14'))
-        .fontColor('#999999')
-        .fontWeight(FontWeight.Normal)
-        .opacity(this.TEXT_OPACITY)
-        .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
-        .onClick((event: ClickEvent) => {
-          Logger.info(TAG, `noProgrammeData onClick event?.source: ${event.source}`);
-        })
-      Button('点击重试', { type: ButtonType.Normal, stateEffect: true })
-        .borderRadius(4)
-        .margin(16)
-        .height(28)
-        .fontSize(12)
-        .fontColor('#CCCCCC')
-        .fontFamily('PingFang SC-Medium')
-        .border({ width: 1, color: '#545454' })
-        .backgroundColor(Color.Black)
-    }
-    .justifyContent(FlexAlign.Center)
-    .width(this.emptyWidth)
-    .height(this.emptyHeight)
-    .backgroundColor(Color.Black)
-  }
-
-  buildNoDataTip(): string {
-    Logger.info(TAG, "buildNoDataTip");
-    let contentString: string = '获取内容失败请重试'
-    if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
-      contentString = '网络出小差了，请检查网络后重试'
-    } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
-      contentString = '获取内容失败请重试'
-    }
-
-    return contentString
-  }
-
-  buildNoDataTipImage(): Resource | string {
-    Logger.info(TAG, "buildNoDataTip");
-    let imageString: Resource | string = $r('app.media.icon_no_content')
-    if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
-      imageString = $r('app.media.icon_no_net')
-    } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
-      imageString = $r('app.media.icon_no_content')
-    } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NetworkFailed) {
-      imageString = $r('app.media.icon_no_net')
-    }
-    return imageString
-  }
-}
\ No newline at end of file

@@ -12,7 +12,7 @@ import display from '@ohos.display';
 import font from '@ohos.font';
 import { OperRowListView } from './view/OperRowListView';
 import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
-import { MultiPictureDetailEmptyComponent } from './MultiPictureDetailEmptyComponent';
+import { EmptyComponent } from './view/EmptyComponent';
 import { DateTimeUtils } from 'wdKit/Index';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
@@ -37,7 +37,7 @@ export struct MultiPictureDetailPageComponent {
   @State swiperIndex: number = 0;
   @Provide followStatus: string = '0' // 关注状态
   private scroller: Scroller = new Scroller()
-  @State netStatus: number = 0 // 存储网络状态用来展示缺省图
+  @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
 
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
@@ -239,8 +239,8 @@ export struct MultiPictureDetailPageComponent {
         .height(px2vp(this.titleHeight) + 64)
 
       } else {
-        if (this.netStatus === 1) {
-          MultiPictureDetailEmptyComponent({ emptyType: 2})
+        if(this.netStatus !== undefined) {
+          EmptyComponent({ emptyType: this.netStatus})
             .id('e_empty_content')
             .alignRules({
               center: { anchor: "__container__", align: VerticalAlign.Center },
@@ -290,6 +290,9 @@ export struct MultiPictureDetailPageComponent {
           return
         }
         this.contentDetailData = resDTO.data?.[0];
+        if(this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {
+          this.netStatus = 0
+        }
         Logger.info(TAG, `contentDetailData：${JSON.stringify(this.contentDetailData)}`)
         if (HttpUrlUtils.getUserId()) {
           this.getInteractBrowsOperate()

@@ -19,7 +19,6 @@ export default struct MinePagePersonFunctionUI {
                 .interpolation(ImageInterpolation.High)
               Text(`${item.msg}`)
                 .margin({top:'8lpx'})
-                .width('50lpx')
                 .height('23lpx')
                 .fontColor($r('app.color.color_222222'))
                 .fontSize('23lpx')

 import { Params } from 'wdBean';
-import { DateTimeUtils, LazyDataSource, StringUtils, UserDataLocal } from 'wdKit';
-import { HttpUrlUtils } from 'wdNetwork';
+import { DateTimeUtils, LazyDataSource,UserDataLocal } from 'wdKit';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { CommentListItem } from '../../../viewmodel/CommentListItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem';
-import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { FollowChildComponent } from '../follow/FollowChildComponent';
 
@@ -22,6 +20,7 @@ export struct HomePageBottomComponent{
   @State count:number = 0;
   @State isMineAccount:boolean = true;
   @State userId:string = "";
+  @Link commentNum:number
 
   aboutToAppear(){
     this.getNewPageData()
@@ -36,30 +35,33 @@ export struct HomePageBottomComponent{
 
       if(this.count === 0){
         if(this.style === 1){
-          Row(){
-            Text("关注更多人民号")
-              .fontWeight('400lpx')
-              .fontColor($r('app.color.color_222222'))
-              .lineHeight('38lpx')
-              .fontSize('27lpx')
-              .textAlign(TextAlign.Center)
-              .margin({right:'4lpx'})
-            Image($r('app.media.arrow_icon_right'))
-              .objectFit(ImageFit.Auto)
-              .width('27lpx')
-              .height('27lpx')
-          }.height('69lpx')
-          .width('659lpx')
-          .alignItems(VerticalAlign.Center)
-          .justifyContent(FlexAlign.Center)
-          .backgroundColor($r('app.color.color_F5F5F5'))
-          .margin({top:'31lpx',bottom:'4lpx'})
-          .onClick(()=>{
-            let params: Params = {
-              pageID: "1"
-            }
-            WDRouterRule.jumpWithPage(WDRouterPage.followListPage,params)
-          })
+          Column(){
+            Row(){
+              Text("关注更多人民号")
+                .fontWeight('400lpx')
+                .fontColor($r('app.color.color_222222'))
+                .lineHeight('38lpx')
+                .fontSize('27lpx')
+                .textAlign(TextAlign.Center)
+                .margin({right:'4lpx'})
+              Image($r('app.media.arrow_icon_right'))
+                .objectFit(ImageFit.Auto)
+                .width('27lpx')
+                .height('27lpx')
+            }.height('69lpx')
+            .width('659lpx')
+            .alignItems(VerticalAlign.Center)
+            .justifyContent(FlexAlign.Center)
+            .backgroundColor($r('app.color.color_F5F5F5'))
+            .margin({top:'31lpx',bottom:'4lpx'})
+            .onClick(()=>{
+              let params: Params = {
+                pageID: "1"
+              }
+              WDRouterRule.jumpWithPage(WDRouterPage.followListPage,params)
+            })
+          }.layoutWeight(1)
+          .justifyContent(FlexAlign.Start)
         }else{
           ListHasNoMoreDataUI({style:2})
             .layoutWeight(1)
@@ -211,7 +213,8 @@ export struct HomePageBottomComponent{
             this.hasMore = false
           }else{
             value.list.forEach((value)=>{
-              this.data_comment.push(new CommentListItem(value.fromUserHeader,value.fromUserName,value.targetTitle,value.createTime,value.commentContent,value.likeNum,0,value.id,value.targetId,value.targetType))
+              let publishTime = DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(value.createTime,DateTimeUtils.PATTERN_DATE_TIME_HYPHEN))
+              this.data_comment.push(new CommentListItem(value.fromUserHeader,value.fromUserName,value.targetTitle,publishTime,value.commentContent,value.likeNum,0,value.id,value.targetId,value.targetType))
             })
             this.data_comment.notifyDataReload()
             this.count = this.data_comment.totalCount()
@@ -222,6 +225,7 @@ export struct HomePageBottomComponent{
             }
           }
           this.isLoading = false
+          this.commentNum = value.totalCount
         }).catch((err:Error)=>{
           console.log(TAG,"请求失败")
           this.isLoading = false

@@ -60,7 +60,7 @@ class MinePageDatasModel{
       return this.personalData
     }
     this.personalData.push(new MinePagePersonalFunctionsItem("评论",$r('app.media.mine_comment_icon')))
-    this.personalData.push(new MinePagePersonalFunctionsItem("关注",$r('app.media.mine_order_icon')))
+    this.personalData.push(new MinePagePersonalFunctionsItem("关注",$r('app.media.mine_follow_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("收藏",$r('app.media.mine_collect_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("历史",$r('app.media.mine_history_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("消息",$r('app.media.mine_msg_icon')))

@@ -185,10 +185,10 @@ struct MineHomePage {
             //tab 页面
             Tabs({controller: this.controller}) {
               TabContent() {
-                HomePageBottomComponent({style:0})
+                HomePageBottomComponent({style:0,commentNum:$commentNum})
               }.tabBar(this.TabBuilder(0,"评论"))
               TabContent() {
-                HomePageBottomComponent({style:1})
+                HomePageBottomComponent({style:1,commentNum:$commentNum})
               }.tabBar(this.TabBuilder(1,"关注"))
             }
             .backgroundColor($r('app.color.white'))

-import { PageDTO, CompDTO, PageInfoDTO } from 'wdBean';
+import { PageDTO, CompDTO, PageInfoDTO, ContentDTO } from 'wdBean';
 import { CompStyle, ViewType } from 'wdConstant/Index';
 import { CollectionUtils, DateTimeUtils, Logger } from 'wdKit';
 import { closeRefresh } from '../utils/PullDownRefresh';
@@ -58,7 +58,6 @@ export class PageHelper {
     if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
       pageModel.viewType = ViewType.LOADED;
       let sizeBefore: number = pageModel.compList.size();
-      pageModel.compList.push(...pageDto.compList)
       if (pageDto.compList.length === pageModel.pageSize) {
         pageModel.currentPage++;
         pageModel.hasMore = true;
@@ -66,6 +65,11 @@ export class PageHelper {
         pageModel.hasMore = false;
       }
 
+      //移除音频 和 活动
+      this.removeComp(pageModel,pageDto)
+
+      // pageModel.compList.push(...pageDto.compList)
+
       // TODO 暂时去掉互动数据，待优化。（主要是互动数据返回，如何渲染到ui上）
       // TODO updateItems(sizeBefore, data)，这里可能有时序问题，导致覆盖别的group数据，需要优化，考虑精准替换
       // 二次请求，批查互动数据
@@ -108,7 +112,11 @@ export class PageHelper {
             pageModel.hasMore = false;
           }
           let sizeBefore: number = pageModel.compList.size();
-          pageModel.compList.push(...data.compList)
+
+          //移除音频 和 活动
+          this.removeComp(pageModel,data)
+          //
+          // pageModel.compList.push(...data.compList)
           PageViewModel.getInteractData(data.compList).then((data: CompDTO[]) => {
             // 刷新，替换所有数据
             pageModel.compList.updateItems(sizeBefore, data)
@@ -119,6 +127,23 @@ export class PageHelper {
       promptAction.showToast({ message: err });
     })
   }
+
+  /**
+   * 移除comp
+   */
+  private removeComp(pageModel: PageModel, pageDto: PageDTO) {
+    let  datas = pageDto.compList
+    for (let index = 0; index < datas.length; index++) {
+      const element = datas[index];
+      let contentInfo: ContentDTO = CollectionUtils.getElement(element.operDataList, 0);
+      //移除音频 和 活动
+      if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
+        Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
+      }else {
+        pageModel.compList.push(element)
+      }
+    }
+  }
 }
 
 

@@ -4,9 +4,9 @@ import { WDRouterPage } from 'wdRouter';
 @Entry
 @Component
 struct GuidePages {
-  guideImage = [$r('app.media.guide_static1'), $r('app.media.guide_static2'), $r('app.media.guide_static3'), $r('app.media.guide_static4')]
-  guideTitle = [$r('app.media.guide_title1'), $r('app.media.guide_title2'), $r('app.media.guide_title3'), $r('app.media.guide_title4')]
-  guideIndex = [$r('app.media.guide_index1'), $r('app.media.guide_index2'), $r('app.media.guide_index3'), $r('app.media.guide_button')]
+  guideImage = [$r('app.media.guide_static1'), $r('app.media.guide_static2'), $r('app.media.guide_static3'), $r('app.media.guide_static4'),$r('app.media.guide_static5')]
+  guideTitle = [$r('app.media.guide_title1'), $r('app.media.guide_title2'), $r('app.media.guide_title3'), $r('app.media.guide_title4'),$r('app.media.guide_title5')]
+  guideIndex = [$r('app.media.guide_index1'), $r('app.media.guide_index2'), $r('app.media.guide_index3'),$r('app.media.guide_index4'), $r('app.media.guide_button')]
 
   build() {
     Column() {
@@ -57,7 +57,7 @@ struct GuidePages {
         .margin({ bottom: 85 })
         .height(40)
         .onClick(() => {
-          if (index == 3) {
+          if (index == 4) {
             // 跳转到首页
             //WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             //跳转到兴趣偏好选择页

@@ -3,6 +3,7 @@ import { WDRouterRule } from 'wdRouter';
 import { WDRouterPage } from 'wdRouter';
 import { SPHelper } from 'wdKit/Index';
 import { SpConstants } from 'wdConstant/Index';
+import { ButtonOptions, promptAction } from '@kit.ArkUI';
 
 @Entry
 @Component
@@ -79,6 +80,11 @@ struct LaunchInterestsHobbiesPage {
                     .margin({top:'2lpx',left:'19lpx'})
                     .width('100%')
                     .height('31lpx')
+                  Image(item.choose ? $r('app.media.interestsSelected') : $r('app.media.interestsSelectNot'))
+                    .height('32lpx')
+                    .width('32lpx')
+                    .margin({top:'80lpx',left:'110lpx'})
+
                 }.justifyContent(FlexAlign.Start)
               }
 
@@ -87,7 +93,7 @@ struct LaunchInterestsHobbiesPage {
                   .width('100%')
                   .height('100%')
                   .backgroundColor(Color.White)
-                  .opacity(item.choose?0:0.7)
+                  .opacity(item.choose?0:0.6)
                   .borderRadius(5)
               }
             }
@@ -122,7 +128,21 @@ struct LaunchInterestsHobbiesPage {
           .borderRadius('10lpx')
           .width('662lpx')
           .height('84lpx')
+        Image('')
+          .width('662lpx')
+          .height('84lpx')
+          .backgroundColor(Color.White)
+          .opacity(this.selectCount == 0 ? 0.6 : 0)
+          .borderRadius('10lpx')
           .onClick(()=>{
+            if (this.selectCount == 0) {
+              promptAction.showToast({
+                message : '请先选择您感兴趣的内容哦',
+                duration: 2000,
+                bottom: 50
+              })
+               return
+            }
             this.saveTagIds()
             //跳转首页
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)