Merge remote-tracking branch 'origin/main'

# Conflicts:
#	sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets

 import { Action } from './Action';
 import { Action } from './Action';
 interface dataObject {
 interface dataObject {
+  dataSource: number
   operateType?: string
   operateType?: string
   webViewHeight?: string
   webViewHeight?: string
   dataJson?: string
   dataJson?: string

@@ -3,15 +3,15 @@
     {
     {
       "name": "shared_desc",
       "name": "shared_desc",
       "value": "全局工具包"
       "value": "全局工具包"
-    } ,
+    },
     {
     {
       "name": "net_core_no_network",
       "name": "net_core_no_network",
       "value": "当前无网络，请重试"
       "value": "当前无网络，请重试"
-    } ,
+    },
     {
     {
       "name": "net_core_weak_network",
       "name": "net_core_weak_network",
       "value": "当前无网络，请重试"
       "value": "当前无网络，请重试"
-    } ,
+    },
     {
     {
       "name": "net_core_page_error_network",
       "name": "net_core_page_error_network",
       "value": "网络出小差了，请检查下网络"
       "value": "网络出小差了，请检查下网络"
@@ -47,6 +47,10 @@
     {
     {
       "name": "auditing_core_error",
       "name": "auditing_core_error",
       "value": "内容已下线"
       "value": "内容已下线"
+    },
+    {
+      "name": "image_request_fail",
+      "value": "图片加载失败，请检查网络"
     }
     }
   ]
   ]
 }
 }

@@ -397,7 +397,8 @@ export class HttpUrlUtils {
     if (StringUtils.isNotEmpty(HttpUrlUtils.token)) {
     if (StringUtils.isNotEmpty(HttpUrlUtils.token)) {
       return HttpUrlUtils.token
       return HttpUrlUtils.token
     }
     }
-    return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
+    // return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
+    return ''
   }
   }
 
 
   static getRefreshToken() {
   static getRefreshToken() {
@@ -556,6 +557,24 @@ export class HttpUrlUtils {
     return url
     return url
   }
   }
 
 
+  /*评论状态*/
+  static getBatchCommentStatusUrl() {
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/batchCommentStatus"
+    return url
+  }
+
+  /*levleIcon*/
+  static getBatchUserUrl() {
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-point/auth/level/zh/c/batchUser"
+    return url
+  }
+
+  /*authIcon 20个一次上限*/
+  static getDetailListUrl() {
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-contact/contact/zh/c/master/detailList"
+    return url
+  }
+
 
 
   //账户注销
   //账户注销
   static accountLogoutUrl() {
   static accountLogoutUrl() {
@@ -756,6 +775,12 @@ export class HttpUrlUtils {
     return url
     return url
   }
   }
 
 
+  //点赞
+  static executeLike() {
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-interact/interact/zh/c/like/executeLike";
+    return url;
+  }
+
   // static getYcgCommonHeaders(): HashMap<string, string> {
   // static getYcgCommonHeaders(): HashMap<string, string> {
   //   let headers: HashMap<string, string> = new HashMap<string, string>()
   //   let headers: HashMap<string, string> = new HashMap<string, string>()
   //
   //

@@ -83,6 +83,8 @@ export class WDRouterPage {
   static privacySettingPage = new WDRouterPage("wdComponent", "ets/components/page/PrivacySettingPage");
   static privacySettingPage = new WDRouterPage("wdComponent", "ets/components/page/PrivacySettingPage");
   // 关于页
   // 关于页
   static aboutPage = new WDRouterPage("wdComponent", "ets/components/page/SettingAboutPage");
   static aboutPage = new WDRouterPage("wdComponent", "ets/components/page/SettingAboutPage");
+  // 精选评论页
+  static QualityCommentsPage = new WDRouterPage("wdComponent", "ets/components/page/QualityCommentsPage");
   // 设置页
   // 设置页
   static settingPage = new WDRouterPage("wdComponent", "ets/components/page/SettingPage");
   static settingPage = new WDRouterPage("wdComponent", "ets/components/page/SettingPage");
   // 设置页
   // 设置页

@@ -82,7 +82,6 @@ export struct WdWebLocalComponent {
 
 
   //webview 高度设置
   //webview 高度设置
   private setCurrentPageOperate: (data: Message) => void = (data) => {
   private setCurrentPageOperate: (data: Message) => void = (data) => {
-    console.log("setCurrentPageOperate", JSON.stringify(data))
     if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate && data?.data?.operateType === '8') {
     if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate && data?.data?.operateType === '8') {
       if (typeof this.webHeight === 'number') {
       if (typeof this.webHeight === 'number') {
         if (Number(data?.data?.webViewHeight) > this.webHeight) {
         if (Number(data?.data?.webViewHeight) > this.webHeight) {

@@ -19,7 +19,7 @@ export interface CompDTO {
   name: string;
   name: string;
   objectId: string; // 跳转页面id?
   objectId: string; // 跳转页面id?
   objectTitle: string; // comp标题
   objectTitle: string; // comp标题
-  // objectType?: any; // 跳转类型，枚举：
+  objectType?: string; // 跳转类型，枚举：
   operDataList: ContentDTO[]; // 运营数据列表【正常运营配置的强运营数据，部分推荐场景的配置（自动源兜底数据）】
   operDataList: ContentDTO[]; // 运营数据列表【正常运营配置的强运营数据，部分推荐场景的配置（自动源兜底数据）】
   // pageId?: any;
   // pageId?: any;
   posterSize: string;
   posterSize: string;

@@ -20,4 +20,5 @@ export interface Params {
   // 17.多图（图集）详情页
   // 17.多图（图集）详情页
   detailPageType?: number; // 详情页类型
   detailPageType?: number; // 详情页类型
   liveStyle?: number; // 直播类型：0横屏，1竖屏
   liveStyle?: number; // 直播类型：0横屏，1竖屏
+  creatorId?: string; //号主id
 }
 }

@@ -69,3 +69,5 @@ export { newsSkeleton } from "./src/main/ets/components/skeleton/newsSkeleton"
 
 
 export { LiveCommentComponent } from "./src/main/ets/components/comment/view/LiveCommentComponent"
 export { LiveCommentComponent } from "./src/main/ets/components/comment/view/LiveCommentComponent"
 
 
+export { WDViewDefaultType } from "./src/main/ets/components/view/EmptyComponent"
+

@@ -20,6 +20,7 @@ import { CardParser } from './CardParser';
 import { LiveHorizontalReservationComponent } from './view/LiveHorizontalReservationComponent';
 import { LiveHorizontalReservationComponent } from './view/LiveHorizontalReservationComponent';
 import { ZhGridLayout02 } from './compview/ZhGridLayout02';
 import { ZhGridLayout02 } from './compview/ZhGridLayout02';
 import { Card5Component } from './cardview/Card5Component'
 import { Card5Component } from './cardview/Card5Component'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 
 
 /**
 /**
  * comp适配器.
  * comp适配器.
@@ -32,8 +33,10 @@ export struct CompParser {
   compIndex: number = 0;
   compIndex: number = 0;
 
 
   build() {
   build() {
+    Column() {
       this.componentBuilder(this.compDTO, this.compIndex);
       this.componentBuilder(this.compDTO, this.compIndex);
     }
     }
+  }
 
 
   @Builder
   @Builder
   componentBuilder(compDTO: CompDTO, compIndex: number) {
   componentBuilder(compDTO: CompDTO, compIndex: number) {
@@ -53,8 +56,6 @@ export struct CompParser {
       ZhSingleRow02({ compDTO })
       ZhSingleRow02({ compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
       LiveHorizontalReservationComponent({ compDTO: compDTO })
       LiveHorizontalReservationComponent({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
-      ZhSingleRow06({ compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) {
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) {
       ZhGridLayout02({ compDTO: compDTO })
       ZhGridLayout02({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
     } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
@@ -68,8 +69,6 @@ export struct CompParser {
       ZhSingleColumn04({ compDTO: compDTO })
       ZhSingleColumn04({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
       ZhSingleColumn05({ compDTO: compDTO })
       ZhSingleColumn05({ compDTO: compDTO })
-    } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
-      ZhSingleColumn09({ compDTO: compDTO })
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
       CardParser({ contentDTO: compDTO.operDataList[0] });
       CardParser({ contentDTO: compDTO.operDataList[0] });
     }
     }

@@ -8,6 +8,7 @@ import { ENewspaperCalendarDialog } from '../dialog/ENewspaperCalendarDialog';
 import font from '@ohos.font';
 import font from '@ohos.font';
 import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog';
 import { ENewspaperPageDialog } from '../dialog/ENewspaperPageDialog';
 import { RMCalendarBean } from './calendar/RMCalendarBean';
 import { RMCalendarBean } from './calendar/RMCalendarBean';
+import { newsSkeleton } from './skeleton/newsSkeleton';
 
 
 @Component
 @Component
 export struct ENewspaperPageComponent {
 export struct ENewspaperPageComponent {
@@ -63,13 +64,15 @@ export struct ENewspaperPageComponent {
     customStyle: true,
     customStyle: true,
   })
   })
   //文字报纸弹框
   //文字报纸弹框
-  listDialogController: CustomDialogController = new CustomDialogController({
-    builder: ENewspaperListDialog({
-      newspaperListBean: this.newspaperListBean
-    }),
-    alignment: DialogAlignment.Bottom,
-    offset: { dx: 0, dy: 0 }
-  })
+  @State isOpenListDialog: boolean = false
+
+  // listDialogController: CustomDialogController = new CustomDialogController({
+  //   builder: ENewspaperListDialog({
+  //     newspaperListBean: this.newspaperListBean
+  //   }),
+  //   alignment: DialogAlignment.Bottom,
+  //   offset: { dx: 0, dy: 0 }
+  // })
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     //获取宽高尺寸
     //获取宽高尺寸
@@ -95,6 +98,7 @@ export struct ENewspaperPageComponent {
   }
   }
 
 
   build() {
   build() {
+    Stack() {
       RelativeContainer() {
       RelativeContainer() {
         RelativeContainer() {
         RelativeContainer() {
           Image($r('app.media.icon_arrow_down'))
           Image($r('app.media.icon_arrow_down'))
@@ -154,6 +158,18 @@ export struct ENewspaperPageComponent {
         })
         })
         .id('e_newspaper_top')
         .id('e_newspaper_top')
 
 
+        if (!this.newspaperListBean || !this.newspaperListBean.list || this.newspaperListBean.list.length == 0) {
+          newsSkeleton()
+            .alignRules({
+              top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },
+              middle: { anchor: "__container__", align: HorizontalAlign.Center }
+            })
+            .id('news_skeleton_id')
+            .width('100%')
+            .height(px2vp(this.picHeight) + 32)
+            .margin({ top: 35, left: 10, right: 10 })
+        }
+
         if (this.newspaperListBean && this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
         if (this.newspaperListBean && this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
           Swiper(this.swiperController) {
           Swiper(this.swiperController) {
             ForEach(this.newspaperListBean?.list, (item: NewspaperListItemBean, index: number) => {
             ForEach(this.newspaperListBean?.list, (item: NewspaperListItemBean, index: number) => {
@@ -266,13 +282,23 @@ export struct ENewspaperPageComponent {
         })
         })
         .id('e_newspaper_read')
         .id('e_newspaper_read')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
-        this.listDialogController.open()
+          this.isOpenListDialog = true
         })
         })
       }
       }
       .width('100%')
       .width('100%')
       .height('100%')
       .height('100%')
       .backgroundColor($r('app.color.color_80000000'))
       .backgroundColor($r('app.color.color_80000000'))
       .id('e_newspaper_container')
       .id('e_newspaper_container')
+
+      ENewspaperListDialog({
+        newspaperListBean: this.newspaperListBean,
+        closeDialog: () => {
+          this.isOpenListDialog = false
+        }
+      })
+        .visibility(this.isOpenListDialog ? Visibility.Visible : Visibility.None)
+    }
+
   }
   }
 
 
   private async getNewspaperTime() {
   private async getNewspaperTime() {

-import { Logger, NumberFormatterUtils } from 'wdKit';
+import { Logger, NumberFormatterUtils, DateTimeUtils } from 'wdKit';
 import {
 import {
   Action,
   Action,
   ContentDetailDTO,
   ContentDetailDTO,
@@ -14,15 +14,15 @@ import DetailViewModel from '../viewmodel/DetailViewModel';
 import { ImageAndTextWebComponent } from './ImageAndTextWebComponent';
 import { ImageAndTextWebComponent } from './ImageAndTextWebComponent';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { RecommendList } from '../components/view/RecommendList'
 import { RecommendList } from '../components/view/RecommendList'
-import { CommonConstants } from 'wdConstant'
+import { CommonConstants } from 'wdConstant';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { PageRepository } from '../repository/PageRepository';
 import { PageRepository } from '../repository/PageRepository';
-import { detailedSkeleton } from './skeleton/detailSkeleton'
+import { detailedSkeleton } from './skeleton/detailSkeleton';
+const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 
 
 const TAG = 'ImageAndTextPageComponent'
 const TAG = 'ImageAndTextPageComponent'
-
 @Component
 @Component
 export struct ImageAndTextPageComponent {
 export struct ImageAndTextPageComponent {
   scroller: Scroller = new Scroller();
   scroller: Scroller = new Scroller();
@@ -32,7 +32,7 @@ export struct ImageAndTextPageComponent {
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State isPageEnd: boolean = false
   @State isPageEnd: boolean = false
-
+  @State publishTime: string = ''
   build() {
   build() {
     Column() {
     Column() {
       if (!this.isPageEnd) {
       if (!this.isPageEnd) {
@@ -40,10 +40,10 @@ export struct ImageAndTextPageComponent {
       } else {
       } else {
         // 发布时间
         // 发布时间
         Row() {
         Row() {
-          Image($r('app.media.icon_ren_min_ri_bao'))
-            .width(70)
+          Image(this.contentDetailData[0]?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
+            .width(80)
             .height(28)
             .height(28)
-          Text(this.contentDetailData[0]?.publishTime)
+            Text(this.publishTime)
             .fontColor($r('app.color.color_B0B0B0'))
             .fontColor($r('app.color.color_B0B0B0'))
             .fontSize($r('app.float.font_size_13'))
             .fontSize($r('app.float.font_size_13'))
             .height('100%')
             .height('100%')
@@ -151,6 +151,8 @@ export struct ImageAndTextPageComponent {
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       if (detailBeans && detailBeans.length > 0) {
       if (detailBeans && detailBeans.length > 0) {
         this.contentDetailData = detailBeans;
         this.contentDetailData = detailBeans;
+        let dateTime = DateTimeUtils.parseDate(this.contentDetailData[0]?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
+        this.publishTime = DateTimeUtils.formatDate(dateTime,PATTERN_DATE_CN_RN)
         if (this.contentDetailData[0]?.recommendShow === 1) {
         if (this.contentDetailData[0]?.recommendShow === 1) {
           this.getRecommend()
           this.getRecommend()
         }
         }

+import { abilityAccessCtrl, common, Permissions } from '@kit.AbilityKit';
+import { http } from '@kit.NetworkKit';
+import { BusinessError } from '@kit.BasicServicesKit';
+import { promptAction } from '@kit.ArkUI';
+import { image } from '@kit.ImageKit';
+import { photoAccessHelper } from '@kit.MediaLibraryKit';
+import fs from '@ohos.file.fs';
+
+const PERMISSIONS: Array<Permissions> = [
+  'ohos.permission.READ_IMAGEVIDEO',
+  'ohos.permission.WRITE_IMAGEVIDEO'
+];
+
+/*
+ * saveButton参考文档
+ * https://developer.huawei.com/consumer/cn/doc/harmonyos-guides/savebutton-0000001820999677
+ * */
+@Component
+export struct ImageDownloadComponent {
+  @State image: PixelMap | undefined = undefined;
+  @State photoAccessHelper: photoAccessHelper.PhotoAccessHelper | undefined = undefined; // 相册模块管理实例
+  @State imageBuffer: ArrayBuffer | undefined = undefined; // 图片ArrayBuffer
+  url: string = ''
+
+  build() {
+    Column() {
+      SaveButton({ icon: SaveIconStyle.LINES })
+        .iconColor(Color.White)
+        .onClick(async () => {
+          console.info(`cj2024 onClick ${this.imageBuffer}`)
+          if (this.imageBuffer !== undefined) {
+            await this.saveImage(this.imageBuffer);
+            promptAction.showToast({
+              message: $r('app.string.image_request_success'),
+              duration: 2000
+            })
+          }
+        })
+    }
+
+  }
+
+  async aboutToAppear(): Promise<void> {
+    console.info(`cj2024 图片下载 ${this.url}`)
+    const context = getContext(this) as common.UIAbilityContext;
+    const atManager = abilityAccessCtrl.createAtManager();
+    await atManager.requestPermissionsFromUser(context, PERMISSIONS);
+    this.getPicture();
+  }
+
+  /**
+   * 通过http的request方法从网络下载图片资源
+   */
+  async getPicture() {
+    console.info(`cj2024 getPicture`)
+    http.createHttp()
+      .request(this.url,
+        (error: BusinessError, data: http.HttpResponse) => {
+          if (error) {
+            // 下载失败时弹窗提示检查网络，不执行后续逻辑
+            promptAction.showToast({
+              message: $r('app.string.image_request_fail'),
+              duration: 2000
+            })
+            return;
+          }
+          this.transcodePixelMap(data);
+          // 判断网络获取到的资源是否为ArrayBuffer类型
+          console.info(`cj2024 getPicture ${data.result}`)
+          if (data.result instanceof ArrayBuffer) {
+            console.info(`cj2024 getPicture 222`)
+            this.imageBuffer = data.result as ArrayBuffer;
+          }
+        }
+      )
+  }
+
+  /**
+   * 使用createPixelMap将ArrayBuffer类型的图片装换为PixelMap类型
+   * @param data：网络获取到的资源
+   */
+  transcodePixelMap(data: http.HttpResponse) {
+    console.info(`cj2024 transcodePixelMap ${data.responseCode}`)
+    if (http.ResponseCode.OK === data.responseCode) {
+      const imageData: ArrayBuffer = data.result as ArrayBuffer;
+      // 通过ArrayBuffer创建图片源实例。
+      const imageSource: image.ImageSource = image.createImageSource(imageData);
+      const options: image.InitializationOptions = {
+        'alphaType': 0, // 透明度
+        'editable': false, // 是否可编辑
+        'pixelFormat': 3, // 像素格式
+        'scaleMode': 1, // 缩略值
+        'size': { height: 100, width: 100 }
+      }; // 创建图片大小
+
+      // 通过属性创建PixelMap
+      imageSource.createPixelMap(options).then((pixelMap: PixelMap) => {
+        this.image = pixelMap;
+      });
+    }
+  }
+
+  /**
+   * 保存ArrayBuffer到图库
+   * @param buffer：图片ArrayBuffer
+   * @returns
+   */
+  async saveImage(buffer: ArrayBuffer | string): Promise<void> {
+    console.info(`cj2024 saveImage buffer ${buffer}`)
+    const context = getContext(this) as common.UIAbilityContext; // 获取getPhotoAccessHelper需要的context
+    const helper = photoAccessHelper.getPhotoAccessHelper(context); // 获取相册管理模块的实例
+    const uri = await helper.createAsset(photoAccessHelper.PhotoType.IMAGE, 'jpg'); // 指定待创建的文件类型、后缀和创建选项，创建图片或视频资源
+    console.info(`cj2024 saveImage uri ${uri}`)
+    const file = await fs.open(uri, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE);
+    await fs.write(file.fd, buffer);
+    await fs.close(file.fd);
+  }
+}

 import { PhotoListBean } from 'wdBean/Index';
 import { PhotoListBean } from 'wdBean/Index';
 import { Logger } from 'wdKit/Index';
 import { Logger } from 'wdKit/Index';
-import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
-import { display } from '@kit.ArkUI';
+import { display, router } from '@kit.ArkUI';
+import { ImageDownloadComponent } from './ImageDownloadComponent';
+import { ImageItemView } from './view/ImageItemView';
 
 
 const TAG = 'ImageSwiperComponent';
 const TAG = 'ImageSwiperComponent';
 
 
@@ -16,6 +17,9 @@ export struct ImageSwiperComponent {
   private screenWidth: number = 0
   private screenWidth: number = 0
   private picWidth: number = 0
   private picWidth: number = 0
   @State picHeight: number = 0
   @State picHeight: number = 0
+  @State isEnableSwipe: boolean = true;
+
+  // @Provide bgc: Color = Color.White;
 
 
   //watch监听页码回调
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
@@ -35,10 +39,25 @@ export struct ImageSwiperComponent {
 
 
   build() {
   build() {
     RelativeContainer() {
     RelativeContainer() {
+      Image($r('app.media.icon_arrow_left_white'))
+        .width(24)
+        .height(24)
+        .aspectRatio(1)
+        .interpolation(ImageInterpolation.High)
+        .alignRules({
+          top: { anchor: "__container__", align: VerticalAlign.Top },
+          left: { anchor: "__container__", align: HorizontalAlign.Start }
+        })
+        .onClick(() => {
+          router.back();
+        })
+        .id("backImg")
+
       if (this.photoList && this.photoList?.length > 0) {
       if (this.photoList && this.photoList?.length > 0) {
         Swiper(this.swiperController) {
         Swiper(this.swiperController) {
           ForEach(this.photoList, (item: PhotoListBean) => {
           ForEach(this.photoList, (item: PhotoListBean) => {
-            MultiPictureDetailItemComponent({ MultiPictureDetailItem: item })
+            // MultiPictureDetailItemComponent({ MultiPictureDetailItem: item })
+            ImageItemView({ MultiPictureDetailItem: item, isEnableSwipe: this.isEnableSwipe })
           })
           })
         }
         }
         .index(this.swiperIndex)
         .index(this.swiperIndex)
@@ -96,6 +115,19 @@ export struct ImageSwiperComponent {
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
           middle: { anchor: "__container__", align: HorizontalAlign.Center }
         })
         })
       }
       }
+
+      ImageDownloadComponent({ url: this.photoList[this.swiperIndex].picPath })
+        .alignRules({
+          bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
+          right: { anchor: "__container__", align: HorizontalAlign.End }
+        })
+        .margin({
+          top: 8,
+          left: 18,
+          bottom: 24,
+          right: 18
+        })
+        .id("downloadImg")
     }
     }
     .width('100%')
     .width('100%')
     .height('100%')
     .height('100%')

 import {  PhotoListBean } from 'wdBean';
 import {  PhotoListBean } from 'wdBean';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
+import router from '@ohos.router';
+import display from '@ohos.display';
 
 
 const TAG = 'MultiPictureDetailPageComponent';
 const TAG = 'MultiPictureDetailPageComponent';
 
 
 @Component
 @Component
 export struct MultiPictureDetailItemComponent {
 export struct MultiPictureDetailItemComponent {
   private MultiPictureDetailItem: PhotoListBean = {} as PhotoListBean
   private MultiPictureDetailItem: PhotoListBean = {} as PhotoListBean
+  //alt app.media.picture_loading 设计稿尺寸
+  @State imageWidth:string | number = 167
+  @State ratio:number = 167/60
+  private scroller: Scroller = new Scroller()
+  private displayTool = display.getDefaultDisplaySync()
+  @State picHeight: number = 0
 
 
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     Logger.info(TAG, 'pictures preview')
     Logger.info(TAG, 'pictures preview')
+    this.picHeight = this.displayTool.width * 578 / 375
   }
   }
 
 
   build() {
   build() {
-    Stack({ alignContent: Alignment.BottomStart }) {
     Row() {
     Row() {
       Image(this.MultiPictureDetailItem.picPath)
       Image(this.MultiPictureDetailItem.picPath)
         .alt($r('app.media.picture_loading'))
         .alt($r('app.media.picture_loading'))
-          .width('100%')
-          .aspectRatio(this.MultiPictureDetailItem.width / this.MultiPictureDetailItem.height)
+        .width(this.imageWidth)
+        .aspectRatio(this.ratio)
         .objectFit(ImageFit.Fill)
         .objectFit(ImageFit.Fill)
         .interpolation(ImageInterpolation.High)
         .interpolation(ImageInterpolation.High)
+        .onComplete(event => {
+          this.imageWidth = '100%'
+          this.ratio = this.MultiPictureDetailItem.width / this.MultiPictureDetailItem.height
+        })
+        /*.onDrop(event => {
+          router.back();
+        })
+        .draggable(true)*/
+      /*Scroll(this.scroller) {
+
+      }
+      .scrollable(ScrollDirection.Vertical)
+      .scrollBarWidth(0)
+      .height(px2vp(this.picHeight))*/
     }
     }
     .height('100%')
     .height('100%')
     .width('100%')
     .width('100%')
-
-    }
     .backgroundColor(Color.Black)
     .backgroundColor(Color.Black)
-    .width('100%')
+    .justifyContent(FlexAlign.Center)
   }
   }
 }
 }

-import { Logger } from 'wdKit';
+import { Logger, SPHelper } from 'wdKit';
+import { ResponseDTO } from 'wdNetwork';
 import {
 import {
   ContentDetailDTO,
   ContentDetailDTO,
   PhotoListBean,
   PhotoListBean,
@@ -11,10 +12,12 @@ import display from '@ohos.display';
 import font from '@ohos.font';
 import font from '@ohos.font';
 import { OperRowListView } from './view/OperRowListView';
 import { OperRowListView } from './view/OperRowListView';
 import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
 import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
+import { EmptyComponent } from './view/EmptyComponent';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { PageRepository } from '../repository/PageRepository';
 import { PageRepository } from '../repository/PageRepository';
+import { SpConstants } from 'wdConstant/Index';
 
 
 const TAG = 'MultiPictureDetailPageComponent';
 const TAG = 'MultiPictureDetailPageComponent';
 
 
@@ -34,6 +37,7 @@ export struct MultiPictureDetailPageComponent {
   @State swiperIndex: number = 0;
   @State swiperIndex: number = 0;
   @Provide followStatus: string = '0' // 关注状态
   @Provide followStatus: string = '0' // 关注状态
   private scroller: Scroller = new Scroller()
   private scroller: Scroller = new Scroller()
+  @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
 
 
   //watch监听页码回调
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
@@ -56,10 +60,6 @@ export struct MultiPictureDetailPageComponent {
       familySrc: $rawfile('font/BebasNeue_Regular.otf')
       familySrc: $rawfile('font/BebasNeue_Regular.otf')
     })
     })
     this.getContentDetailData()
     this.getContentDetailData()
-    if (HttpUrlUtils.getUserId()) {
-      this.getInteractBrowsOperate()
-      this.getBatchAttentionStatus()
-    }
   }
   }
 
 
   aboutToDisappear() {
   aboutToDisappear() {
@@ -238,6 +238,16 @@ export struct MultiPictureDetailPageComponent {
         })
         })
         .height(px2vp(this.titleHeight) + 64)
         .height(px2vp(this.titleHeight) + 64)
 
 
+      } else {
+        if(this.netStatus !== undefined) {
+          EmptyComponent({ emptyType: this.netStatus})
+            .id('e_empty_content')
+            .alignRules({
+              center: { anchor: "__container__", align: VerticalAlign.Center },
+              middle: { anchor: "__container__", align: HorizontalAlign.Center }
+            })
+        }
+      }
       OperRowListView({
       OperRowListView({
         contentDetailData: this.contentDetailData,
         contentDetailData: this.contentDetailData,
       })
       })
@@ -256,7 +266,6 @@ export struct MultiPictureDetailPageComponent {
         .border({ width: { top: 0.5 }, color: '#FFFFFF' })
         .border({ width: { top: 0.5 }, color: '#FFFFFF' })
         .id('e_oper_row')
         .id('e_oper_row')
     }
     }
-    }
     .width('100%')
     .width('100%')
     .height('100%')
     .height('100%')
     .backgroundColor(Color.Black)
     .backgroundColor(Color.Black)
@@ -266,11 +275,44 @@ export struct MultiPictureDetailPageComponent {
     .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
     .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
   }
   }
 
 
-  private async getContentDetailData() {
+  private getContentDetailData() {
     try {
     try {
-      let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
-      this.contentDetailData = data?.[0];
+      PageRepository.fetchDetailData(this.relId, this.contentId, this.relType).then((resDTO: ResponseDTO<ContentDetailDTO[]>) => {
+        // Logger.info(TAG, `fetchDetailData then,navResDTO.timestamp ${resDTO.timestamp}`);
+        // Logger.info(TAG, `fetchDetailData then,navResDTO: ${JSON.stringify(resDTO)}`);
+        // Logger.info(TAG, `fetchDetailData then,navResDTO.data: ${JSON.stringify(resDTO.data)}`);
+        if (!resDTO || !resDTO.data) {
+          Logger.error(TAG, 'fetchDetailData is empty');
+          return
+        }
+        if (resDTO.code != 0) {
+          Logger.error(TAG, `fetchDetailData then code:${resDTO.code}, message:${resDTO.message}`);
+          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)}`)
         Logger.info(TAG, `contentDetailData：${JSON.stringify(this.contentDetailData)}`)
+        if (HttpUrlUtils.getUserId()) {
+          this.getInteractBrowsOperate()
+          this.getBatchAttentionStatus()
+        }
+      }).catch((err: Error) => {
+        Logger.info(TAG, `fetchDetailData then,err: ${JSON.stringify(err)}`);
+        /*// 请求失败处理
+        if (err.response) {
+          // 请求已发出，但服务器响应的状态码不在2xx范围内
+          console.error('请求失败，状态码：', err.response.status);
+          console.error('响应数据：', err.response.data);
+        } else if (err.request) {
+          // 请求已发出，但无响应（例如：网络故障）
+          console.error('请求已发出，但无响应：', err.request);
+        } else {
+          // 发生了其他类型的错误（如配置错误或拒绝权限等）
+          console.error('请求发生错误：', err.message);
+        }*/
+      })
     } catch (exception) {
     } catch (exception) {
 
 
     }
     }
@@ -312,9 +354,10 @@ export struct MultiPictureDetailPageComponent {
   /**
   /**
    * 关注号主
    * 关注号主
    */
    */
-  handleAccention() {
+  async handleAccention() {
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

@@ -33,9 +33,17 @@ export class commentListModel extends PageModel{
   totalCount: number = 0
   totalCount: number = 0
   hasNext: number = 0
   hasNext: number = 0
   list: commentItemModel[] = []
   list: commentItemModel[] = []
+}
 
 
+export class commentStatusListModel extends PageModel{
+  pageNum: number = 0
+  pageSize: number = 0
+  totalCount: number = 0
+  hasNext: number = 0
+  list: commentStatusModel[] = []
 }
 }
 
 
+
 @Observed
 @Observed
 export class commentItemModel {
 export class commentItemModel {
   authorLike: string = ''
   authorLike: string = ''
@@ -94,9 +102,17 @@ export class commentItemModel {
   targetType:string = '';
   targetType:string = '';
   visitorComment:string = '';
   visitorComment:string = '';
   shareInfo:commentItemShareInfoModel = new commentItemShareInfoModel;
   shareInfo:commentItemShareInfoModel = new commentItemShareInfoModel;
-  // targetId:string = '';
-  // targetId:string = '';
-  // targetId:string = '';
+
+  api_commentId:string = '';
+  api_status:string = '';
+
+  api_level:string = '';
+  api_levelHead:string = 'http';
+  api_userId:string = '';
+
+  api_creatorId:string = '';
+  api_userType:string = '';
+  api_authIcon:string = '';
 
 
 }
 }
 
 
@@ -106,3 +122,18 @@ export class commentItemShareInfoModel {
   shareTitle: string = ''
   shareTitle: string = ''
   shareUrl: string = ''
   shareUrl: string = ''
 }
 }
+
+export class commentStatusModel {
+  commentId:string = '';
+  status:string = '';
+
+  level:string = '';
+  levelHead:string = '';
+  userId:string = '';
+
+
+  creatorId:string = '';
+  userType:string = '';
+  authIcon:string = '';
+
+}

@@ -6,6 +6,13 @@ import { commentItemModel, commentListModel, WDPublicUserType } from '../model/C
 import commentViewModel from '../viewmodel/CommentViewModel'
 import commentViewModel from '../viewmodel/CommentViewModel'
 import { CommentText } from './CommentText';
 import { CommentText } from './CommentText';
 import measure from '@ohos.measure'
 import measure from '@ohos.measure'
+import {CommentCustomDialog} from './CommentCustomDialog'
+
+const TAG = 'CommentComponent';
+
+
+
+
 
 
 @Entry
 @Entry
 @Preview
 @Preview
@@ -13,10 +20,19 @@ import measure from '@ohos.measure'
 export struct CommentComponent {
 export struct CommentComponent {
   @State private browSingModel: commentListModel = new commentListModel()
   @State private browSingModel: commentListModel = new commentListModel()
   isloading: boolean = false
   isloading: boolean = false
-  // @State allDatas :commentItemModel[] = [];
-
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
 
 
+  dialogController: CustomDialogController = new CustomDialogController({
+    builder: CommentCustomDialog(),
+    autoCancel: true,
+    alignment: DialogAlignment.Bottom,
+    customStyle: true,
+    offset: {
+      dx: 0,
+      dy: -20
+    }
+  })
+
   aboutToAppear() {
   aboutToAppear() {
     this.getData();
     this.getData();
     this.getData();
     this.getData();
@@ -59,7 +75,7 @@ export struct CommentComponent {
             .height('32')
             .height('32')
             .objectFit(ImageFit.Cover)
             .objectFit(ImageFit.Cover)
             .borderRadius(16)
             .borderRadius(16)
-          Image($r('app.media.icon_border_test'))
+          Image(item.api_levelHead)
             .width('48')
             .width('48')
             .height('48')
             .height('48')
             .objectFit(ImageFit.Cover)
             .objectFit(ImageFit.Cover)
@@ -167,7 +183,6 @@ export struct CommentComponent {
         // ///1天~2天：1天前
         // ///1天~2天：1天前
         // ///2天~：日期隐藏
         // ///2天~：日期隐藏
 
 
-
         Text(DateTimeUtils.getCommentTime(Number.parseFloat(item.createTime)))
         Text(DateTimeUtils.getCommentTime(Number.parseFloat(item.createTime)))
           .fontColor($r('app.color.color_B0B0B0'))
           .fontColor($r('app.color.color_B0B0B0'))
           .fontSize(12)
           .fontSize(12)
@@ -212,6 +227,10 @@ export struct CommentComponent {
 
 
       List() {
       List() {
         ListItemGroup({ header: this.titleHeader() })
         ListItemGroup({ header: this.titleHeader() })
+          .onClick(()=>{
+            console.log(TAG)
+            this.dialogController.open()
+          })
         LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
         LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
           if (item.hasMore) {
           if (item.hasMore) {
             ListItemGroup({ header: this.CommentHeaderItem(item), footer: this.GroupFooterView(item) }) {
             ListItemGroup({ header: this.CommentHeaderItem(item), footer: this.GroupFooterView(item) }) {
@@ -219,6 +238,9 @@ export struct CommentComponent {
                 ListItem() {
                 ListItem() {
                   ChildCommentItem();
                   ChildCommentItem();
                 }
                 }
+                .onClick(()=>{
+                  console.log(TAG)
+                })
               })
               })
             }
             }
           }else {
           }else {
@@ -227,6 +249,9 @@ export struct CommentComponent {
                 ListItem() {
                 ListItem() {
                   ChildCommentItem();
                   ChildCommentItem();
                 }
                 }
+                .onClick(()=>{
+                  console.log(TAG)
+                })
               })
               })
             }
             }
           }
           }

+@Preview
+@CustomDialog
+export struct CommentCustomDialog {
+  controller: CustomDialogController = new CustomDialogController({
+    builder: CommentCustomDialog(),
+    autoCancel: true,
+    alignment: DialogAlignment.Bottom,
+    customStyle: true,
+  })
+
+  build() {
+    Column() {
+      Row() {
+        TextArea({ placeholder: '优质评论会获得最佳评论人的称号' })
+          .height('100%')
+          .width('100%')
+          .backgroundColor($r('app.color.color_transparent'))
+      }
+      .backgroundColor('#F9F9F9')
+      // .width('100%')
+      .margin({ top: 12,right: 12, left: 12, bottom: 10 })
+      .height(80)
+      .borderRadius(4)
+
+      Row(){
+      Row() {
+        Row({ space: 12 }) {
+          //语音暂时不做，隐藏
+          // Image($r('app.media.WDInput_voice')).width(30).height(30)
+
+          Image($r('app.media.WDInput_keyboardImage')).width(30).height(30)
+        }
+        // Blank()
+
+        Row() {
+          Text('发布')
+            .backgroundColor('#F89381')
+            .width(80)
+            .height(30)
+            .fontSize(15)
+            .fontColor(Color.White)
+            .textAlign(TextAlign.Center)
+            .borderRadius(4)
+        }
+      }.justifyContent(FlexAlign.SpaceBetween)
+      .width('100%')
+      .height(60)
+      // .margin({ right: 12, left: 12 })
+      // .backgroundColor(Color.Red)
+      }.padding({left:12, right:12})
+    }.backgroundColor(Color.White)
+    .width('100%')
+    .offset({
+      y: 20
+    })
+  }
+}
+
+
+
+

@@ -11,7 +11,7 @@ export struct LiveCommentComponent {
 
 
   build() {
   build() {
     Row() {
     Row() {
-      Image($r('app.media.back_icon'))
+      Image($r('app.media.iv_back_left_black'))
         .width(24)
         .width(24)
         .height(24)
         .height(24)
         .margin({
         .margin({
@@ -71,7 +71,7 @@ export struct LiveCommentComponent {
             left: 6,
             left: 6,
             right: 2
             right: 2
           })
           })
-        Image(this.isLike ? $r('app.media.iv_live_comment_hert_light') : $r('app.media.comment_like_normal'))
+        Image(this.isLike ? $r('app.media.icon_like_selected_redheart') : $r('app.media.iv_live_heart_normal'))
           .width(24)
           .width(24)
           .height(24)
           .height(24)
           .margin({
           .margin({

@@ -2,7 +2,8 @@ import { ViewType } from 'wdConstant/Index'
 import { DateTimeUtils, LazyDataSource, WindowModel } from 'wdKit/Index'
 import { DateTimeUtils, LazyDataSource, WindowModel } from 'wdKit/Index'
 import { commentItemModel, commentListModel } from '../model/CommentModel'
 import { commentItemModel, commentListModel } from '../model/CommentModel'
 import commentViewModel from '../viewmodel/CommentViewModel'
 import commentViewModel from '../viewmodel/CommentViewModel'
-import { window } from '@kit.ArkUI'
+import { router, window } from '@kit.ArkUI'
+import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 
 
 const TAG = 'QualityCommentsComponent';
 const TAG = 'QualityCommentsComponent';
 
 
@@ -10,11 +11,14 @@ const TAG = 'QualityCommentsComponent';
 @Preview
 @Preview
 @Component
 @Component
 export struct QualityCommentsComponent {
 export struct QualityCommentsComponent {
+  @State tileOpacity: number = 0;
+  firstPositionY: number = 0;
   bottomSafeHeight: string = AppStorage.get<number>('bottomSafeHeight') + 'px';
   bottomSafeHeight: string = AppStorage.get<number>('bottomSafeHeight') + 'px';
+  topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
   @State private browSingModel: commentListModel = new commentListModel()
   @State private browSingModel: commentListModel = new commentListModel()
   isloading: boolean = false
   isloading: boolean = false
-  lastWindowColor:string = '#ffffff'
-  currentWindowColor:string = '#FF4202'
+  lastWindowColor: string = '#ffffff'
+  currentWindowColor: string = '#FF4202'
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
@@ -32,25 +36,25 @@ export struct QualityCommentsComponent {
     this.fullScreen();
     this.fullScreen();
 
 
 
 
-    commentViewModel.fetchQualityCommentListLocal(getContext()).then(commentListModel => {
-      this.allDatas.push(...commentListModel.list)
-    })
-
-    // commentViewModel.fetchQualityCommentList('1').then((commentListModel) => {
-    //   if (commentListModel && commentListModel.list && commentListModel.list.length > 0) {
-    //     // commentListModel.hasMore = true;
-    //     // this.browSingModel.viewType = ViewType.LOADED;
+    // commentViewModel.fetchQualityCommentListLocal(getContext()).then(commentListModel => {
     //   this.allDatas.push(...commentListModel.list)
     //   this.allDatas.push(...commentListModel.list)
-    //     // if (commentListModel.list.length === this.browSingModel.pageSize) {
-    //     //   this.browSingModel.currentPage++;
-    //     //   this.browSingModel.hasMore = true;
-    //     // } else {
-    //     //   this.browSingModel.hasMore = false;
-    //     // }
+    // })
+
+    commentViewModel.fetchQualityCommentList('1').then((commentListModel) => {
+      if (commentListModel && commentListModel.list && commentListModel.list.length > 0) {
+        // commentListModel.hasMore = true;
+        // this.browSingModel.viewType = ViewType.LOADED;
+        this.allDatas.push(...commentListModel.list)
+        // if (commentListModel.list.length === this.browSingModel.pageSize) {
+        //   this.browSingModel.currentPage++;
+        //   this.browSingModel.hasMore = true;
         // } else {
         // } else {
-    //     this.browSingModel.viewType = ViewType.EMPTY;
+        //   this.browSingModel.hasMore = false;
         // }
         // }
-    // })
+      } else {
+        this.browSingModel.viewType = ViewType.EMPTY;
+      }
+    })
   }
   }
 
 
   fullScreen() {
   fullScreen() {
@@ -69,30 +73,143 @@ export struct QualityCommentsComponent {
   @Builder
   @Builder
   titleHeader() {
   titleHeader() {
     Row() {
     Row() {
-      Image($r('app.media.comment_img_banner')).width('100%').aspectRatio(375 / 283);
+      Image($r('app.media.comment_img_banner')).width('100%')
+        .height(283)
+      // .aspectRatio(375 / 283);
+    }
+    .onAreaChange((oldValue: Area, newValue: Area) => {
+
+      let persent = Math.abs(Number(newValue.globalPosition.y)) / 150
+      if (persent > 1) {
+        persent = 1
+      }
+      this.tileOpacity = persent
+
+    })
+  }
+
+  /*透明导航栏*/
+  @Builder
+  TabbarTransparent() {
+    RelativeContainer() {
+      //标题栏目
+      Image($r('app.media.icon_arrow_left_white'))
+        .width(24)
+        .height(24)
+        .objectFit(ImageFit.Auto)
+        .id("back_icon")
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          left: { anchor: "__container__", align: HorizontalAlign.Start }
+        })
+        .offset({
+          y:  (this.topSafeHeight / 2) + 'px'
+        })
+        .margin({ left: 16 })
+        .onClick(() => {
+          router.back()
+        })
     }
     }
+    .visibility(this.tileOpacity > 0 ? 1 : 0)
+    .height(this.topSafeHeight + vp2px(44) + 'px')
+    .width('100%')
+    .backgroundColor($r('app.color.color_transparent'))
+  }
+
+  /*导航栏*/
+  @Builder
+  TabbarNormal() {
+    RelativeContainer() {
+      //标题栏目
+      Image($r('app.media.icon_arrow_left'))
+        .width(24)
+        .height(24)
+        .objectFit(ImageFit.Auto)
+        .id("back_icon")
+        .alignRules({
+          center: { anchor: "__container__", align: VerticalAlign.Center },
+          left: { anchor: "__container__", align: HorizontalAlign.Start }
+        })
+        .offset({
+          y:  (this.topSafeHeight / 2) + 'px'
+        })
+        .margin({ left: 16 })
+        .onClick(() => {
+          router.back()
+        })
+
+      Text('精选评论')
+        // .height('42lpx')
+        .maxLines(1)
+        .id("title")
+        .fontSize('35lpx')
+        .fontWeight(400)
+        .fontColor($r('app.color.color_222222'))
+        .lineHeight('42lpx')
+        .alignRules({
+          center: {anchor: "__container__", align: VerticalAlign.Center},
+          middle: {anchor: "__container__", align: HorizontalAlign.Center}
+        })
+        .offset({
+          y:  (this.topSafeHeight / 2) + 'px'
+        })
+    }
+    .visibility(this.tileOpacity > 0 ? 0 : 1)
+    .opacity(this.tileOpacity)
+    .height(this.topSafeHeight + vp2px(44) + 'px')
+    .width('100%')
+    .backgroundColor($r('app.color.white'))
   }
   }
 
 
   build() {
   build() {
     Column() {
     Column() {
-      // this.titleHeader()
-      List({ space: 28 }) {
-        ListItemGroup({ header: this.titleHeader() })
+      Stack({ alignContent: Alignment.Top }) {
+
+        Scroll() {
+          Column() {
+            Stack() {
+              this.titleHeader()
 
 
+              List({ space: 12 }) {
+                // ListItemGroup({ header: this.titleHeader() })
                 LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
                 LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
                   ListItem() {
                   ListItem() {
                     QualityCommentItem({ item: item }).margin({ left: 12, right: 12 })
                     QualityCommentItem({ item: item }).margin({ left: 12, right: 12 })
                   }
                   }
-          // .offset({
-          //   y:-87
-          // })
                 })
                 })
+                ListItem() {
+
+                }.height(this.bottomSafeHeight)
               }
               }
-      // .contentStartOffset(- 87)
+              .margin({ top: 196 })
+              .height("100%")
+              .width("100%")
               .edgeEffect(EdgeEffect.Spring)
               .edgeEffect(EdgeEffect.Spring)
-      .margin({bottom:this.bottomSafeHeight})
+              .nestedScroll({
+                scrollForward: NestedScrollMode.PARENT_FIRST,
+                scrollBackward: NestedScrollMode.SELF_FIRST
+              })
+
+              // .margin({ bottom: this.bottomSafeHeight })
+
               // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
               // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
-    }.backgroundColor(this.currentWindowColor).height('100%').width('100%')
+            }.alignContent(Alignment.Top)
+          }.backgroundColor(this.currentWindowColor).width('100%')
+        }
+        .friction(0.6)
+        .scrollBar(BarState.Off)
+        .edgeEffect(EdgeEffect.None)
+        .width('100%')
+        .height('100%')
+
+        this.TabbarTransparent()
+        this.TabbarNormal()
+
+
+      }
+
+    }
+
   }
   }
 }
 }
 
 
@@ -103,8 +220,11 @@ struct QualityCommentItem {
 
 
   build() {
   build() {
     Column() {
     Column() {
+      Column().height(16).width('100%').opacity(0)
+      Column() {
         /*头像以及昵称*/
         /*头像以及昵称*/
         RelativeContainer() {
         RelativeContainer() {
+
           Image(this.item.fromUserHeader)
           Image(this.item.fromUserHeader)
             .width(50)
             .width(50)
             .height(50)
             .height(50)
@@ -185,22 +305,35 @@ struct QualityCommentItem {
         /*时间   点赞评论*/
         /*时间   点赞评论*/
         Row() {
         Row() {
 
 
-        Text(DateTimeUtils.getCommentTime(DateTimeUtils.getDateTimestamp(this.item.createTime))).fontSize(14).fontColor('#999999')
+          Text(DateTimeUtils.getCommentTime(DateTimeUtils.getDateTimestamp(this.item.createTime)))
+            .fontSize(14)
+            .fontColor('#999999')
 
 
-        Row({space:16}){
-          Row(){
+          Row({ space: 16 }) {
+            Row() {
               Image($r('app.media.comment_icon_pinglun')).width(16).height(16)
               Image($r('app.media.comment_icon_pinglun')).width(16).height(16)
             }
             }
 
 
-          Row(){
+            Row() {
               //comment_like_select
               //comment_like_select
-            Image($r(this.item.likeNum?'app.media.comment_like_select':'app.media.comment_like_normal')).width(16).height(16)
-            if (this.item.likeNum){Text(this.item.likeNum).fontColor(this.item.isLike?'#ED2800':'#999999').fontSize(14).margin({left:3})}
+              Image($r(this.item.likeNum ? 'app.media.comment_like_select' : 'app.media.comment_like_normal'))
+                .width(16)
+                .height(16)
+              if (this.item.likeNum) {
+                Text(this.item.likeNum)
+                  .fontColor(this.item.isLike ? '#ED2800' : '#999999')
+                  .fontSize(14)
+                  .margin({ left: 3 })
+              }
             }
             }
           }
           }
         }.height(38).width('100%').justifyContent(FlexAlign.SpaceBetween)
         }.height(38).width('100%').justifyContent(FlexAlign.SpaceBetween)
 
 
       }.backgroundColor('#FFFFFF').padding({ top: 0, left: 16, right: 16 }).borderRadius(4)
       }.backgroundColor('#FFFFFF').padding({ top: 0, left: 16, right: 16 }).borderRadius(4)
+    }
 
 
   }
   }
 }
 }
+
+
+

 import { Logger, ResourcesUtils } from 'wdKit/Index';
 import { Logger, ResourcesUtils } from 'wdKit/Index';
-import { HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
+import { HttpBizUtil, HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
-import { commentItemModel, commentListModel } from '../model/CommentModel';
+import { commentItemModel, commentListModel, commentStatusListModel, commentStatusModel } from '../model/CommentModel';
 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
+import { ifaa } from '@kit.OnlineAuthenticationKit';
 
 
 const TAG = "CommentViewModel"
 const TAG = "CommentViewModel"
 
 
 class CommentViewModel {
 class CommentViewModel {
   private static instance: CommentViewModel
   private static instance: CommentViewModel
+
   /**
   /**
    * 单例模式
    * 单例模式
    * @returns
    * @returns
@@ -19,35 +21,34 @@ class CommentViewModel {
     return CommentViewModel.instance;
     return CommentViewModel.instance;
   }
   }
 
 
-
   /*获取本地mock数据*/
   /*获取本地mock数据*/
   async getCommentLocal(context: Context): Promise<commentListModel> {
   async getCommentLocal(context: Context): Promise<commentListModel> {
     Logger.info(TAG, `getBottomNavDataMock start`);
     Logger.info(TAG, `getBottomNavDataMock start`);
-    let compRes: ResponseDTO<commentListModel> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<commentListModel>>(context,'comment_local.json' );
+    let compRes: ResponseDTO<commentListModel> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<commentListModel>>(context, 'comment_local.json');
     if (!compRes || !compRes.data) {
     if (!compRes || !compRes.data) {
       Logger.info(TAG, `getAppointmentListDataLocal compRes  is empty`);
       Logger.info(TAG, `getAppointmentListDataLocal compRes  is empty`);
       return new commentListModel()
       return new commentListModel()
     }
     }
     Logger.info(TAG, `getAppointmentListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
     Logger.info(TAG, `getAppointmentListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
-    return compRes.data
+    return this.fetchCommentStatusAndConfigAuthIcon(compRes.data)
+    // this.fetchCommentStatusAndConfigAuthIcon(compRes.data)
+    // return compRes.data
   }
   }
 
 
-  /*获取本地mock数据*/
+  /*获取热门评论本地mock数据*/
   async fetchQualityCommentListLocal(context: Context): Promise<commentListModel> {
   async fetchQualityCommentListLocal(context: Context): Promise<commentListModel> {
     Logger.info(TAG, `getBottomNavDataMock start`);
     Logger.info(TAG, `getBottomNavDataMock start`);
-    let compRes: ResponseDTO<commentListModel> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<commentListModel>>(context,'qualityComment_local.json' );
+    let compRes: ResponseDTO<commentListModel> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<commentListModel>>(context, 'qualityComment_local.json');
     if (!compRes || !compRes.data) {
     if (!compRes || !compRes.data) {
       Logger.info(TAG, `getAppointmentListDataLocal compRes  is empty`);
       Logger.info(TAG, `getAppointmentListDataLocal compRes  is empty`);
       return new commentListModel()
       return new commentListModel()
     }
     }
     Logger.info(TAG, `getAppointmentListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
     Logger.info(TAG, `getAppointmentListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
-    return compRes.data
+    return this.fetchCommentStatusAndConfigAuthIcon(compRes.data)
   }
   }
 
 
-
-
-  //qualityComment_local.json
-  fetchQualityCommentList(pageNum: string) {
+  /*获取热门评论*/
+   fetchQualityCommentList(pageNum: string): Promise<commentListModel> {
     let url = HttpUrlUtils.getQualityCommentUrl() + `?&pageSize=${10}&pageNum=${pageNum}`
     let url = HttpUrlUtils.getQualityCommentUrl() + `?&pageSize=${10}&pageNum=${pageNum}`
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     return new Promise<commentListModel>((success, fail) => {
     return new Promise<commentListModel>((success, fail) => {
@@ -62,7 +63,15 @@ class CommentViewModel {
         }
         }
         let listData = data.data as commentListModel
         let listData = data.data as commentListModel
 
 
-        success(listData)
+        this.fetchCommentStatusAndConfigAuthIcon(listData).then((commentListModel) =>{
+          console.log(TAG, 'fetchCommentStatusAndConfigAuthIcon完成')
+          success(commentListModel)
+        })
+
+        // return this.fetchCommentStatusAndConfigAuthIcon(listData)
+
+        // this.fetchCommentStatusAndConfigAuthIcon(listData)
+        // success(listData)
       }, (error: Error) => {
       }, (error: Error) => {
         fail(error.message)
         fail(error.message)
         Logger.debug(TAG, error.toString())
         Logger.debug(TAG, error.toString())
@@ -70,35 +79,192 @@ class CommentViewModel {
     })
     })
   }
   }
 
 
+  /*多接口批查*/
+   fetchCommentStatusAndConfigAuthIcon(model: commentListModel): Promise<commentListModel> {
+
+    let commentIDs: string[] = [];
+
+    let fromUserIDs: string[] = [];
+
+    let creatorIDs: string[] = [];
+
+    //主评论
+    for (const element of model.list) {
+      if ((element.id + '').length > 0) {
+        commentIDs.push(element.id + '')
+      }
+      if ((element.fromUserId + '').length > 0) {
+        fromUserIDs.push(element.fromUserId)
+      }
+      if ((element.fromCreatorId + '').length > 0) {
+        creatorIDs.push(element.fromCreatorId)
+      }
+
+
+      //子评论
+      if (element.childComments) {
+        for (const obj2 of element.childComments) {
+          if ((obj2.id + '').length > 0) {
+            commentIDs.push(obj2.id + '')
+          }
+          if ((obj2.fromUserId + '').length > 0) {
+            fromUserIDs.push(obj2.fromUserId)
+          }
+          if ((obj2.fromCreatorId + '').length > 0) {
+            creatorIDs.push(obj2.fromCreatorId)
+          }
+        }
+      }
+    }
 
 
-  // BaseGetRequest(contentID:number,contentType:string,pageNum:string){
-  //   let url = HttpUrlUtils.getMyCollectionListDataUrl()+ `?type=${type}&operateTag=${1}&pageSize=${10}&pageNum=${pageNum}`
-  //   if (tagId.length > 0) {
-  //     url = url + `&tagId=${tagId}`
-  //   }
-  //   let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
-  //   return WDHttp.get<ResponseDTO<commentListModel>>(url, headers)
-  // }
-  //
-  //
-  // fetchCommentList(contentID:number,contentType:string,pageNum:string):Promise<commentListModel>{
-  //   return new Promise<commentListModel>((success,error) => {
-  //     this.BaseGetRequest(contentID,contentType,pageNum).then((navResDTO: ResponseDTO<commentListModel>) => {
-  //       if (!navResDTO || navResDTO.code != 0) {
-  //         // success(this.getAppointmentListDataLocal(context))
-  //         return
-  //       }
-  //       Logger.info(TAG, "getAppointmentList then,AppointmentResDTO.timeStamp:" + navResDTO.timestamp);
-  //       let listData =  navResDTO.data as commentListModel
-  //       success(listData)
-  //     }).catch((err: Error) => {
-  //       Logger.error(TAG, `fetchAppointmentListDataApi catch, error.name : ${err.name},  error.message:${err.message}`);
-  //       error("page data invalid");
-  //     })
-  //   })
-  // }
 
 
+    let promiseArray: Promise<commentStatusListModel | void>[] = [];
 
 
+    //TODO 未登录不用批查
+    if (commentIDs.length > 0) {
+      let promise1 = new Promise<void>((success) => {
+        // HttpRequest HttpBizUtil
+        let url = HttpUrlUtils.getBatchCommentStatusUrl();
+        let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+        let bean: Record<string, string[]> = {};
+        bean['commentIdList'] = commentIDs;
+        HttpRequest.post<ResponseDTO<commentStatusModel[]>>(url, bean, headers).then((data: ResponseDTO<commentStatusModel[]>) => {
+          if (!data || !data.data) {
+            success()
+            return
+          }
+          if (data.code != 0) {
+            success()
+            return
+          }
+          if (data.data.length == 0) {
+            success()
+            return
+          }
+          let listData = data.data as commentStatusModel[]
+
+          for (const element of listData) {
+            for (const commentModel of model.list) {
+              if (element.commentId == commentModel.id) {
+                commentModel.api_status = element.status
+              }
+              if (commentModel.childComments) {
+                for (const childCommentModel of commentModel.childComments) {
+                  if (element.commentId == childCommentModel.id) {
+                    childCommentModel.api_status = element.status
+                  }
+                }
+              }
+            }
+          }
+          success()
+        }, (error: Error) => {
+          success()
+          Logger.debug(TAG, error.toString())
+        })
+      })
+      promiseArray.push(promise1);
+    }
+
+    if (fromUserIDs.length > 0) {
+      let promise2 = new Promise<void>((success) => {
+        let url = HttpUrlUtils.getBatchUserUrl();
+        let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+        // HttpRequest HttpBizUtil
+        HttpRequest.post<ResponseDTO<commentStatusModel[]>>(url, fromUserIDs, headers).then((data: ResponseDTO<commentStatusModel[]>) => {
+          if (!data || !data.data) {
+            success()
+            return
+          }
+          if (data.code != 0) {
+            success()
+            return
+          }
+          if (data.data.length == 0) {
+            success()
+            return
+          }
+          let listData = data.data as commentStatusModel[]
+
+          for (const element of listData) {
+            for (const commentModel of model.list) {
+              if (element.userId == commentModel.fromUserId) {
+                commentModel.api_levelHead = element.levelHead
+              }
+              if (commentModel.childComments) {
+                for (const childCommentModel of commentModel.childComments) {
+                  if (element.userId == childCommentModel.fromUserId) {
+                    childCommentModel.api_levelHead = element.levelHead
+                  }
+                }
+              }
+            }
+          }
+          success()
+        }, (error: Error) => {
+          success()
+          Logger.debug(TAG, error.toString())
+        })
+      })
+      promiseArray.push(promise2);
+    }
+
+    //TODO 一次20个上限
+    if (creatorIDs.length > 0) {
+      let promise3 = new Promise<void>((success) => {
+        let url = HttpUrlUtils.getDetailListUrl();
+        let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+        let bean: Record<string, string[]> = {};
+        bean['creatorIdList'] = creatorIDs;
+        // HttpRequest HttpBizUtil
+        HttpRequest.post<ResponseDTO<commentStatusModel[]>>(url, bean, headers).then((data: ResponseDTO<commentStatusModel[]>) => {
+          if (!data || !data.data) {
+            success()
+            return
+          }
+          if (data.code != 0) {
+            success()
+            return
+          }
+          if (data.data.length == 0) {
+            success()
+            return
+          }
+          let listData = data.data as commentStatusModel[]
+
+          for (const element of listData) {
+            for (const commentModel of model.list) {
+              if (element.creatorId == commentModel.fromCreatorId) {
+                commentModel.api_authIcon = element.authIcon
+              }
+              if (commentModel.childComments) {
+                for (const childCommentModel of commentModel.childComments) {
+                  if (element.creatorId == childCommentModel.fromCreatorId) {
+                    childCommentModel.api_authIcon = element.authIcon
+                  }
+                }
+              }
+            }
+          }
+          success()
+        }, (error: Error) => {
+          success()
+          Logger.debug(TAG, error.toString())
+        })
+      })
+      promiseArray.push(promise3);
+    }
+
+    return new Promise<commentListModel>((success) => {
+      Promise.all(promiseArray).then(() => {
+        console.log(TAG, 'Promise.all');
+        success(model)
+      })
+
+    })
+
+
+  }
 }
 }
 
 
 
 

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

-import { StringUtils } from 'wdKit/Index'
+import { StringUtils, ToastUtils } from 'wdKit/Index'
 import { HttpUrlUtils } from 'wdNetwork/Index'
 import { HttpUrlUtils } from 'wdNetwork/Index'
+import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
 import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem'
 import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem'
@@ -12,14 +13,18 @@ export struct FollowChildComponent{
   build() {
   build() {
     if(this.type == 0 ){
     if(this.type == 0 ){
       Column(){
       Column(){
-        Blank().height('27lpx')
+        Column(){
 
 
           Row() {
           Row() {
+            Row(){
               Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
               Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
                 .objectFit(ImageFit.Auto)
                 .objectFit(ImageFit.Auto)
                 .width('92lpx')
                 .width('92lpx')
                 .height('92lpx')
                 .height('92lpx')
                 .margin({right:'15lpx'})
                 .margin({right:'15lpx'})
+                .borderRadius(50)
+                .borderWidth('1lpx')
+                .borderColor($r('app.color.color_0D000000'))
 
 
               Column(){
               Column(){
                 Text(this.data.cnUserName)
                 Text(this.data.cnUserName)
@@ -28,17 +33,30 @@ export struct FollowChildComponent{
                   .lineHeight('38lpx')
                   .lineHeight('38lpx')
                   .fontColor($r('app.color.color_222222'))
                   .fontColor($r('app.color.color_222222'))
                   .maxLines(1)
                   .maxLines(1)
+                  .margin({bottom:'8lpx'})
+
                 Text(`粉丝${this.data.cnFansNum}`)
                 Text(`粉丝${this.data.cnFansNum}`)
                   .fontColor($r('app.color.color_B0B0B0'))
                   .fontColor($r('app.color.color_B0B0B0'))
                   .fontSize('23lpx')
                   .fontSize('23lpx')
-              .maxLines(1)
+                  .fontWeight('400lpx')
+                  .lineHeight('31lpx')
+                  .margin({bottom:'8lpx'})
+
                 Text(`${this.data.introduction}`)
                 Text(`${this.data.introduction}`)
                   .fontColor($r('app.color.color_B0B0B0'))
                   .fontColor($r('app.color.color_B0B0B0'))
                   .fontSize('23lpx')
                   .fontSize('23lpx')
                   .maxLines(2)
                   .maxLines(2)
+                  .textAlign(TextAlign.Start)
                   .textOverflow({ overflow: TextOverflow.Ellipsis })
                   .textOverflow({ overflow: TextOverflow.Ellipsis })
-          }.layoutWeight(1)
+              }
+              .layoutWeight(1)
               .alignItems(HorizontalAlign.Start)
               .alignItems(HorizontalAlign.Start)
+              .justifyContent(FlexAlign.Start)
+            }.layoutWeight(1)
+            .alignItems(VerticalAlign.Top)
+            .onClick(()=>{
+              this.jumpCreatorHomePage()
+            })
 
 
             if(this.data.status == "1"){
             if(this.data.status == "1"){
               Row(){
               Row(){
@@ -47,18 +65,13 @@ export struct FollowChildComponent{
                   .fontSize('23lpx')
                   .fontSize('23lpx')
                   .fontWeight('500lpx')
                   .fontWeight('500lpx')
                   .lineHeight('35lpx')
                   .lineHeight('35lpx')
-            }.backgroundColor($r('app.color.color_F5F5F5'))
-            .borderRadius('6lpx')
-            .borderColor($r('app.color.color_F5F5F5'))
-            .borderWidth('2lpx')
+              }
               .justifyContent(FlexAlign.Center)
               .justifyContent(FlexAlign.Center)
               .width('100lpx')
               .width('100lpx')
               .height('46lpx')
               .height('46lpx')
-            .margin({left:'4lpx',top:'23lpx'})
               .onClick(()=>{
               .onClick(()=>{
                 this.followOperation()
                 this.followOperation()
-              // this.data.status = "0"
-            })
+              }).margin({top:'29lpx'})
             }else{
             }else{
               Row(){
               Row(){
                 Image($r('app.media.follow_icon'))
                 Image($r('app.media.follow_icon'))
@@ -76,27 +89,27 @@ export struct FollowChildComponent{
               .justifyContent(FlexAlign.Center)
               .justifyContent(FlexAlign.Center)
               .width('100lpx')
               .width('100lpx')
               .height('46lpx')
               .height('46lpx')
-            .margin({left:'4lpx',top:'23lpx'})
+              .margin({top:'29lpx'})
               .onClick(()=>{
               .onClick(()=>{
                 this.followOperation()
                 this.followOperation()
-              // this.data.status = "1"
               })
               })
             }
             }
-        }.alignItems(VerticalAlign.Top)
+          }
+          .padding({top:'27lpx'})
           .width('100%')
           .width('100%')
-        .layoutWeight(1)
+          .justifyContent(FlexAlign.SpaceBetween)
+          .alignItems(VerticalAlign.Top)
+
+        }.height('202lpx')
+        .justifyContent(FlexAlign.Start)
 
 
         Divider().width('100%')
         Divider().width('100%')
-          .height('2lpx')
+          .height('1lpx')
           .strokeWidth('1lpx')
           .strokeWidth('1lpx')
           .backgroundColor($r('app.color.color_EDEDED'))
           .backgroundColor($r('app.color.color_EDEDED'))
+      }.width('100%')
 
 
-      }.height('146lpx')
-      .justifyContent(FlexAlign.Center)
-      .onClick(()=>{
-        //跳转 人民号的 主页
-      })
-    }else if(this.type == 1 ){
+    }else {
       Column(){
       Column(){
         Column(){
         Column(){
 
 
@@ -140,7 +153,13 @@ export struct FollowChildComponent{
               .layoutWeight(1)
               .layoutWeight(1)
               .alignItems(HorizontalAlign.Start)
               .alignItems(HorizontalAlign.Start)
             }.layoutWeight(1)
             }.layoutWeight(1)
+            .onClick(()=>{
+              this.jumpCreatorHomePage()
+            })
 
 
+            if(this.type === 2){
+              Blank()
+            }else {
               if(this.data.status == "1"){
               if(this.data.status == "1"){
                 Row(){
                 Row(){
                   Text(`已关注`)
                   Text(`已关注`)
@@ -177,6 +196,7 @@ export struct FollowChildComponent{
                 })
                 })
               }
               }
             }
             }
+          }
           .width('100%')
           .width('100%')
           .height('92lpx')
           .height('92lpx')
           .justifyContent(FlexAlign.SpaceBetween)
           .justifyContent(FlexAlign.SpaceBetween)
@@ -206,4 +226,15 @@ export struct FollowChildComponent{
       }
       }
     })
     })
   }
   }
+
+  jumpCreatorHomePage() {
+    if(this.data.mainControl === 0){
+      ToastUtils.shortToast("无法查看此用户主页")
+    }else if(this.data.banControl === 1){
+      ToastUtils.shortToast("该账号已封禁，不予访问")
+    }else{
+      let params = {'creatorId': this.data.creatorId} as Record<string, string>;
+      WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
+    }
+  }
 }
 }

 import { LazyDataSource } from 'wdKit';
 import { LazyDataSource } from 'wdKit';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
+import SearcherAboutDataModel from '../../../model/SearcherAboutDataModel';
+import { CreatorDetailRequestItem } from '../../../viewmodel/CreatorDetailRequestItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
 import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem';
 import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem';
 import { FollowListStatusRequestItem } from '../../../viewmodel/FollowListStatusRequestItem';
 import { FollowListStatusRequestItem } from '../../../viewmodel/FollowListStatusRequestItem';
@@ -73,8 +75,7 @@ export struct FollowListDetailUI{
             this.hasMore = false
             this.hasMore = false
           }else{
           }else{
             value.list.forEach((value)=>{
             value.list.forEach((value)=>{
-
-              this.data.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId))
+              this.data.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId,value.mainControl,value.banControl))
             })
             })
             this.data.notifyDataReload()
             this.data.notifyDataReload()
             this.count = this.data.totalCount()
             this.count = this.data.totalCount()
@@ -109,31 +110,72 @@ export struct FollowListDetailUI{
     }
     }
   }
   }
 
 
-  getFollowListStatus(value:MineFollowListDetailItem){
+  getFollowListStatus(result:MineFollowListDetailItem){
+    let data_temp : FollowListDetailItem[] = []
+    result.list.forEach((item)=>{
+      data_temp.push(new FollowListDetailItem(item.headPhotoUrl,item.cnUserName,item.cnFansNum,item.introduction,item.creatorId,"0",item.attentionUserId,item.cnUserType,item.cnUserId,item.cnMainControl,-1))
+    })
+    let request = new CreatorDetailRequestItem()
+
+    data_temp.forEach((data)=>{
+      request.creatorIdList.push(data.creatorId)
+    })
+    SearcherAboutDataModel.getCreatorDetailListData(request).then((value)=>{
+      if(value!=null && value.length>0){
+        data_temp.forEach((data)=>{
+          value.forEach((item)=>{
+            if(data.creatorId == item.creatorId){
+              data.headPhotoUrl = item.headPhotoUrl
+              if(item.fansNum>10000){
+                let temp = (item.fansNum/10000)+""
+                let index = temp.indexOf('.')
+                if(index != -1){
+                  temp = temp.substring(0,index+2)
+                }else{
+                  temp = temp
+                }
+                data.cnFansNum = temp + "万"
+              }else{
+                data.cnFansNum = item.fansNum + ""
+              }
+              data.introduction = item.introduction
+              data.mainControl = item.mainControl
+              data.banControl = item.banControl
+            }
+          })
+        })
+        this.getFollowStatus(data_temp,result.totalCount)
+      }
+    }).catch((err:Error)=>{
+      console.log(TAG,JSON.stringify(err))
+      this.isLoading = false
+      this.count = this.count===-1?0:this.count
+    })
+  }
+
+  getFollowStatus(result : FollowListDetailItem[],totalCount:number){
     let status = new FollowListStatusRequestItem()
     let status = new FollowListStatusRequestItem()
-    let data : FollowListDetailItem[] = []
-    value.list.forEach((item)=>{
+    result.forEach((item)=>{
       status.creatorIds.push(new QueryListIsFollowedItem(item.creatorId))
       status.creatorIds.push(new QueryListIsFollowedItem(item.creatorId))
-      data.push(new FollowListDetailItem(item.headPhotoUrl,item.cnUserName,item.cnFansNum,item.introduction,item.creatorId,"0",item.attentionUserId,item.cnUserType,item.cnUserId))
     })
     })
 
 
     MinePageDatasModel.getFollowListStatusData(status,getContext(this)).then((newValue)=>{
     MinePageDatasModel.getFollowListStatusData(status,getContext(this)).then((newValue)=>{
       newValue.forEach((item)=>{
       newValue.forEach((item)=>{
-        data.forEach((list)=>{
+        result.forEach((list)=>{
           if (item.creatorId == list.creatorId) {
           if (item.creatorId == list.creatorId) {
             list.status = item.status
             list.status = item.status
           }
           }
         })
         })
       })
       })
 
 
-      data.forEach((item)=>{
-        this.data.push(new FollowListDetailItem(item.headPhotoUrl,item.cnUserName,item.cnFansNum,item.introduction,item.creatorId,item.status,item.attentionUserId,item.cnUserType,item.cnUserId))
+      result.forEach((item)=>{
+        this.data.push(new FollowListDetailItem(item.headPhotoUrl,item.cnUserName,item.cnFansNum,item.introduction,item.creatorId,item.status,item.attentionUserId,item.cnUserType,item.cnUserId,item.mainControl,item.banControl))
       })
       })
 
 
       this.data.notifyDataReload()
       this.data.notifyDataReload()
 
 
       this.count = this.data.totalCount()
       this.count = this.data.totalCount()
-      if (this.data.totalCount() < value.totalCount) {
+      if (this.data.totalCount() < totalCount) {
         this.curPageNum++
         this.curPageNum++
       }else {
       }else {
         this.hasMore = false
         this.hasMore = false

 import { Params } from 'wdBean';
 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 { WDRouterPage, WDRouterRule } from 'wdRouter';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { CommentListItem } from '../../../viewmodel/CommentListItem';
 import { CommentListItem } from '../../../viewmodel/CommentListItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem';
 import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem';
-import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
+import { FollowChildComponent } from '../follow/FollowChildComponent';
 
 
 const TAG = "HomePageBottomComponent"
 const TAG = "HomePageBottomComponent"
 @Component
 @Component
@@ -21,6 +20,7 @@ export struct HomePageBottomComponent{
   @State count:number = 0;
   @State count:number = 0;
   @State isMineAccount:boolean = true;
   @State isMineAccount:boolean = true;
   @State userId:string = "";
   @State userId:string = "";
+  @Link commentNum:number
 
 
   aboutToAppear(){
   aboutToAppear(){
     this.getNewPageData()
     this.getNewPageData()
@@ -35,6 +35,7 @@ export struct HomePageBottomComponent{
 
 
       if(this.count === 0){
       if(this.count === 0){
         if(this.style === 1){
         if(this.style === 1){
+          Column(){
             Row(){
             Row(){
               Text("关注更多人民号")
               Text("关注更多人民号")
                 .fontWeight('400lpx')
                 .fontWeight('400lpx')
@@ -59,6 +60,8 @@ export struct HomePageBottomComponent{
               }
               }
               WDRouterRule.jumpWithPage(WDRouterPage.followListPage,params)
               WDRouterRule.jumpWithPage(WDRouterPage.followListPage,params)
             })
             })
+          }.layoutWeight(1)
+          .justifyContent(FlexAlign.Start)
         }else{
         }else{
           ListHasNoMoreDataUI({style:2})
           ListHasNoMoreDataUI({style:2})
             .layoutWeight(1)
             .layoutWeight(1)
@@ -95,7 +98,7 @@ export struct HomePageBottomComponent{
 
 
             LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
             LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
               ListItem() {
               ListItem() {
-                ChildFollowComponent({data: item})
+                FollowChildComponent({data: item,type:1})
               }
               }
               .onClick(() => {
               .onClick(() => {
               })
               })
@@ -184,7 +187,7 @@ export struct HomePageBottomComponent{
             this.hasMore = false
             this.hasMore = false
           }else{
           }else{
             value.list.forEach((value)=>{
             value.list.forEach((value)=>{
-              this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId))
+              this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId,value.mainControl,value.banControl))
             })
             })
             this.data_follow.notifyDataReload()
             this.data_follow.notifyDataReload()
             this.count = this.data_follow.totalCount()
             this.count = this.data_follow.totalCount()
@@ -210,7 +213,8 @@ export struct HomePageBottomComponent{
             this.hasMore = false
             this.hasMore = false
           }else{
           }else{
             value.list.forEach((value)=>{
             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.data_comment.notifyDataReload()
             this.count = this.data_comment.totalCount()
             this.count = this.data_comment.totalCount()
@@ -221,6 +225,7 @@ export struct HomePageBottomComponent{
             }
             }
           }
           }
           this.isLoading = false
           this.isLoading = false
+          this.commentNum = value.totalCount
         }).catch((err:Error)=>{
         }).catch((err:Error)=>{
           console.log(TAG,"请求失败")
           console.log(TAG,"请求失败")
           this.isLoading = false
           this.isLoading = false
@@ -231,107 +236,6 @@ export struct HomePageBottomComponent{
 }
 }
 
 
 @Component
 @Component
-struct ChildFollowComponent {
-  @ObjectLink data: FollowListDetailItem
-
-  build() {
-    Column(){
-      Blank().height('27lpx')
-
-      Row() {
-        Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
-          .objectFit(ImageFit.Auto)
-          .width('92lpx')
-          .height('92lpx')
-          .margin({right:'15lpx'})
-
-        Column(){
-          Text(this.data.cnUserName)
-            .fontWeight('400lpx')
-            .fontSize('31lpx')
-            .lineHeight('38lpx')
-            .fontColor($r('app.color.color_222222'))
-          Text(`粉丝${this.data.cnFansNum}`)
-            .fontColor($r('app.color.color_B0B0B0'))
-            .fontSize('23lpx')
-            .maxLines(1)
-          Text(`${this.data.introduction}`)
-            .fontColor($r('app.color.color_B0B0B0'))
-            .fontSize('23lpx')
-            .maxLines(2)
-            .textOverflow({ overflow: TextOverflow.Ellipsis })
-        }.layoutWeight(1)
-        .alignItems(HorizontalAlign.Start)
-
-        if(this.data.status == "1"){
-          Row(){
-            Text(`已关注`)
-              .fontColor($r('app.color.color_CCCCCC'))
-              .fontSize('23lpx')
-              .fontWeight('500lpx')
-              .lineHeight('35lpx')
-          }.backgroundColor($r('app.color.color_F5F5F5'))
-          .borderRadius('6lpx')
-          .borderColor($r('app.color.color_F5F5F5'))
-          .borderWidth('2lpx')
-          .justifyContent(FlexAlign.Center)
-          .width('100lpx')
-          .height('46lpx')
-          .margin({left:'4lpx',top:'23lpx'})
-          .onClick(()=>{
-            // this.data.status = "0"
-            this.followOperation()
-          })
-        }else{
-          Row(){
-            Image($r('app.media.follow_icon'))
-              .margin({right:'4lpx'})
-              .width('23lpx')
-              .height('23lpx')
-            Text(`关注`)
-              .fontColor($r('app.color.color_ED2800'))
-              .fontSize('23lpx')
-              .fontWeight('500lpx')
-              .lineHeight('35lpx')
-          }.borderColor($r('app.color.color_1AED2800'))
-          .borderRadius('6lpx')
-          .borderWidth('2lpx')
-          .justifyContent(FlexAlign.Center)
-          .width('100lpx')
-          .height('46lpx')
-          .margin({left:'4lpx',top:'23lpx'})
-          .onClick(()=>{
-            // this.data.status = "1"
-            this.followOperation()
-          })
-        }
-      }.alignItems(VerticalAlign.Top)
-      .width('100%')
-      .layoutWeight(1)
-
-      Divider().width('100%')
-        .height('2lpx')
-        .strokeWidth('1lpx')
-        .backgroundColor($r('app.color.color_EDEDED'))
-
-    }.height('146lpx')
-    .justifyContent(FlexAlign.Center)
-  }
-
-  followOperation(){
-    let item = new FollowOperationRequestItem(this.data.cnUserType,this.data.cnUserId,this.data.creatorId,UserDataLocal.getUserType(),UserDataLocal.getUserId(),this.data.status==="0" ? 1:0)
-    MinePageDatasModel.getFollowOperation(item,getContext(this)).then((value)=>{
-      if(value!=null){
-        if (value.code === 0 || value.code.toString() === "0") {
-          this.data.status = this.data.status ==="0"?"1":"0"
-        }
-      }
-    })
-  }
-
-}
-
-@Component
 struct ChildCommentComponent {
 struct ChildCommentComponent {
   @ObjectLink data: CommentListItem
   @ObjectLink data: CommentListItem
   isLastItem: boolean = false
   isLastItem: boolean = false

@@ -5,6 +5,7 @@ import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { UserFollowListRequestItem } from '../../../viewmodel/UserFollowListRequestItem';
 import { UserFollowListRequestItem } from '../../../viewmodel/UserFollowListRequestItem';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
+import { FollowChildComponent } from '../follow/FollowChildComponent';
 
 
 const TAG = "HomePageBottomComponent"
 const TAG = "HomePageBottomComponent"
 @Component
 @Component
@@ -62,7 +63,7 @@ export struct OtherHomePageBottomFollowComponent{
 
 
           LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
           LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
             ListItem() {
             ListItem() {
-              ChildFollowComponent({data: item})
+              FollowChildComponent({data: item,type:2})
             }
             }
             .onClick(() => {
             .onClick(() => {
             })
             })
@@ -116,7 +117,7 @@ export struct OtherHomePageBottomFollowComponent{
           this.hasMore = false
           this.hasMore = false
         }else{
         }else{
           value.list.forEach((value)=>{
           value.list.forEach((value)=>{
-            this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.cnUserType,value.cnUserId))
+            this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.cnUserType,value.cnUserId,value.mainControl,value.banControl))
           })
           })
           this.data_follow.notifyDataReload()
           this.data_follow.notifyDataReload()
           this.count = this.data_follow.totalCount()
           this.count = this.data_follow.totalCount()
@@ -135,49 +136,3 @@ export struct OtherHomePageBottomFollowComponent{
     }
     }
   }
   }
 }
 }
-
-@Component
-struct ChildFollowComponent {
-  @ObjectLink data: FollowListDetailItem
-
-  build() {
-    Column(){
-      Blank().height('27lpx')
-
-      Row() {
-        Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
-          .objectFit(ImageFit.Auto)
-          .width('92lpx')
-          .height('92lpx')
-          .margin({right:'15lpx'})
-
-        Column(){
-          Text(this.data.cnUserName)
-            .fontWeight('400lpx')
-            .fontSize('31lpx')
-            .lineHeight('38lpx')
-            .fontColor($r('app.color.color_222222'))
-          Text(`粉丝${this.data.cnFansNum}`)
-            .fontColor($r('app.color.color_B0B0B0'))
-            .fontSize('23lpx')
-            .maxLines(1)
-          Text(`${this.data.introduction}`)
-            .fontColor($r('app.color.color_B0B0B0'))
-            .fontSize('23lpx')
-            .maxLines(2)
-            .textOverflow({ overflow: TextOverflow.Ellipsis })
-        }.layoutWeight(1)
-        .alignItems(HorizontalAlign.Start)
-      }.alignItems(VerticalAlign.Top)
-      .width('100%')
-      .layoutWeight(1)
-
-      Divider().width('100%')
-        .height('2lpx')
-        .strokeWidth('1lpx')
-        .backgroundColor($r('app.color.color_EDEDED'))
-
-    }.height('146lpx')
-    .justifyContent(FlexAlign.Center)
-  }
-}

@@ -18,12 +18,15 @@ export struct BottomNavigationComponent {
   @Provide bottomRectHeight: number = 0
   @Provide bottomRectHeight: number = 0
   @Provide topRectHeight: number = 0
   @Provide topRectHeight: number = 0
   @Provide isLayoutFullScreen: boolean = false
   @Provide isLayoutFullScreen: boolean = false
+  @Provide isImmersive: boolean = false // 是否开启沉浸式模式 http://192.168.1.3:3300/project/3802/interface/api/189229
+  @Provide isNight: boolean = false // 是否开启夜间模式
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   // 底导/顶导全部数据
   // 底导/顶导全部数据
   @State @Watch('onBottomNavigationDataUpdated') bottomNavList: BottomNavDTO[] = []
   @State @Watch('onBottomNavigationDataUpdated') bottomNavList: BottomNavDTO[] = []
   // 底导当前选中/焦点下标
   // 底导当前选中/焦点下标
   @State currentNavIndex: number = BottomNavi.NEWS;
   @State currentNavIndex: number = BottomNavi.NEWS;
+  // @State currentTopNavSelectedIndex: number = 0; //
   @State barBackgroundColor: Color = Color.Transparent
   @State barBackgroundColor: Color = Color.Transparent
   // 底导TabsController
   // 底导TabsController
   private navController: TabsController = new TabsController();
   private navController: TabsController = new TabsController();
@@ -42,6 +45,8 @@ export struct BottomNavigationComponent {
     let bottomNav = await PageViewModel.getBottomNavData(getContext(this))
     let bottomNav = await PageViewModel.getBottomNavData(getContext(this))
     if (bottomNav && bottomNav.bottomNavList != null) {
     if (bottomNav && bottomNav.bottomNavList != null) {
       Logger.info(TAG, `aboutToAppear, bottomNav.length: ${bottomNav.bottomNavList.length}`);
       Logger.info(TAG, `aboutToAppear, bottomNav.length: ${bottomNav.bottomNavList.length}`);
+      // 使用filter方法移除name为'服务'的项
+      bottomNav.bottomNavList = bottomNav.bottomNavList.filter(item => item.name !== '服务');
       this.bottomNavList = bottomNav.bottomNavList
       this.bottomNavList = bottomNav.bottomNavList
     }
     }
   }
   }
@@ -61,7 +66,7 @@ export struct BottomNavigationComponent {
             } else {
             } else {
               TopNavigationComponent({
               TopNavigationComponent({
                 groupId: navItem.id,
                 groupId: navItem.id,
-                topNavList: navItem.topNavChannelList,
+                topNavList: navItem.topNavChannelList.filter(item => item.channelId != 2073),
                 _currentNavIndex: this.currentNavIndex,
                 _currentNavIndex: this.currentNavIndex,
                 changeBarBackgroundColor: (color: Color) => {
                 changeBarBackgroundColor: (color: Color) => {
                   this.barBackgroundColor = color
                   this.barBackgroundColor = color

@@ -2,19 +2,20 @@ import { CustomTitleAndEditUI } from '../reusable/CustomTitleAndEditUI'
 import MyCollectionViewModel from '../../viewmodel/MyCollectionViewModel';
 import MyCollectionViewModel from '../../viewmodel/MyCollectionViewModel';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 import { CommonConstants, ViewType } from 'wdConstant'
 import { CommonConstants, ViewType } from 'wdConstant'
-import { EmptyComponent } from '../view/EmptyComponent'
+import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import RefreshLayout from './RefreshLayout'
 import RefreshLayout from './RefreshLayout'
 import { RefreshLayoutBean } from './RefreshLayoutBean';
 import { RefreshLayoutBean } from './RefreshLayoutBean';
 import { CompDTO, ContentDTO } from 'wdBean'
 import { CompDTO, ContentDTO } from 'wdBean'
 import LoadMoreLayout from './LoadMoreLayout'
 import LoadMoreLayout from './LoadMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
-import { CompParser } from '../CompParser'
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { BigPicCardComponent } from '../view/BigPicCardComponent';
 import { BigPicCardComponent } from '../view/BigPicCardComponent';
 
 
+import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
+
 @Entry
 @Entry
 @Component
 @Component
 struct BrowsingHistoryPage {
 struct BrowsingHistoryPage {
@@ -25,6 +26,8 @@ struct BrowsingHistoryPage {
   @State selectDatas :ContentDTO[] = [];
   @State selectDatas :ContentDTO[] = [];
   @Provide deleteNum :number = 0;
   @Provide deleteNum :number = 0;
   @Provide isAllSelect:boolean = false
   @Provide isAllSelect:boolean = false
+  private scroller: Scroller = new Scroller();
+
   aboutToAppear(){
   aboutToAppear(){
     this.getData()
     this.getData()
   }
   }
@@ -37,15 +40,30 @@ struct BrowsingHistoryPage {
         this.selectDatas = []
         this.selectDatas = []
         this.deleteNum = 0
         this.deleteNum = 0
       }})
       }})
-      if (this.browSingModel.viewType == ViewType.LOADING){
-        this.LoadingLayout()
-      }else if(this.browSingModel.viewType == ViewType.ERROR){
-        ErrorComponent()
-      }else if(this.browSingModel.viewType == ViewType.EMPTY){
-        EmptyComponent()
-      }else {
-        this.ListLayout()
-      }
+
+      // if (this.browSingModel.viewType == ViewType.LOADING){
+      //   this.LoadingLayout()
+      // }else if(this.browSingModel.viewType == ViewType.ERROR){
+      //   ErrorComponent()
+      // }else if(this.browSingModel.viewType == ViewType.EMPTY){
+        EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoHistory})
+      // }else {
+      //   CustomPullToRefresh({
+      //     alldata:this.allDatas,
+      //     scroller:this.scroller,
+      //     customList:()=>{
+      //       this.ListLayout()
+      //     },
+      //     onRefresh:(resolve)=>{
+      //       this.browSingModel.currentPage = 0
+      //       this.getData(resolve)
+      //     },
+      //     onLoadMore:(resolve)=> {
+      //       this.browSingModel.currentPage++
+      //       this.getData()
+      //     }
+      //   })
+      // }
 
 
       if (this.isEditState){
       if (this.isEditState){
         CustomBottomFuctionUI({
         CustomBottomFuctionUI({
@@ -64,34 +82,27 @@ struct BrowsingHistoryPage {
   }
   }
 
 
   @Builder ListLayout() {
   @Builder ListLayout() {
-    List() {
+    List({scroller: this.scroller}) {
       // 下拉刷新
       // 下拉刷新
-      ListItem() {
-        RefreshLayout({
-          refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullDown, this.browSingModel.pullDownRefreshImage,
-            this.browSingModel.pullDownRefreshText, this.browSingModel.pullDownRefreshHeight)
-        })
-      }
-
       ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
       ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
         ListItem() {
         ListItem() {
           this.newCompParser(compDTO,compIndex)
           this.newCompParser(compDTO,compIndex)
         }
         }
       })
       })
-
       // 加载更多
       // 加载更多
       ListItem() {
       ListItem() {
         if (this.browSingModel.hasMore) {
         if (this.browSingModel.hasMore) {
-          LoadMoreLayout({
-            refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullUpLoad, this.browSingModel.pullUpLoadImage,
-              this.browSingModel.pullUpLoadText, this.browSingModel.pullUpLoadHeight)
-          })
+          // LoadMoreLayout({
+          //   refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullUpLoad, this.browSingModel.pullUpLoadImage,
+          //     this.browSingModel.pullUpLoadText, this.browSingModel.pullUpLoadHeight)
+          // })
         } else {
         } else {
           NoMoreLayout()
           NoMoreLayout()
         }
         }
       }
       }
     }
     }
     .height(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
+    .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
   }
   }
 
 
   @Builder
   @Builder
@@ -117,9 +128,9 @@ struct BrowsingHistoryPage {
       $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.browSingModel.pullDownRefreshHeight) })
       $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.browSingModel.pullDownRefreshHeight) })
   }
   }
 
 
-  async getData() {
-    this.browSingModel.currentPage = 1
+  async getData(resolve?: (value: string | PromiseLike<string>) => void){
     MyCollectionViewModel.fetchMyCollectList(2,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => {
     MyCollectionViewModel.fetchMyCollectList(2,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => {
+      if(resolve) resolve('刷新成功')
       if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
       if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
         this.browSingModel.viewType = ViewType.LOADED;
         this.browSingModel.viewType = ViewType.LOADED;
         this.allDatas.push(...collectionItem.list)
         this.allDatas.push(...collectionItem.list)

@@ -287,16 +287,6 @@ struct ChannelDialog {
                 .height('100%')
                 .height('100%')
                 .justifyContent(FlexAlign.Center)
                 .justifyContent(FlexAlign.Center)
                 .backgroundColor(item.homeChannel === '1' || item.movePermitted === 0 ? '#F5F5F5' : '#ffffff')
                 .backgroundColor(item.homeChannel === '1' || item.movePermitted === 0 ? '#F5F5F5' : '#ffffff')
-                .onClick(() => {
-                   if (this.isEditIng) {
-                     if (item.delPermitted === 1) {
-                       this.delChannelItem(index)
-                     }
-                   } else {
-                     this.confirm(index)
-                     this.controller?.close()
-                   }
-                })
               }
               }
               .width('23%')
               .width('23%')
               .height(40)
               .height(40)
@@ -307,9 +297,19 @@ struct ChannelDialog {
               })
               })
               .zIndex(this.dragItem == item.num ? 1 : 0)
               .zIndex(this.dragItem == item.num ? 1 : 0)
               .translate(this.dragItem == item.num ? { x: this.offsetX, y: this.offsetY } : { x: 0, y: 0 })
               .translate(this.dragItem == item.num ? { x: this.offsetX, y: this.offsetY } : { x: 0, y: 0 })
-
               .gesture(
               .gesture(
-                GestureGroup(GestureMode.Sequence,
+                  GestureGroup(GestureMode.Parallel,
+                    TapGesture()
+                      .onAction((event?: GestureEvent) => {
+                        if (this.isEditIng) {
+                          if (item.delPermitted === 1) {
+                            this.delChannelItem(index)
+                          }
+                        } else {
+                          this.confirm(index)
+                          this.controller?.close()
+                        }
+                      }),
                     PanGesture({ fingers: 1, direction: null, distance: 0 })
                     PanGesture({ fingers: 1, direction: null, distance: 0 })
                       .onActionStart((event: GestureEvent) => {
                       .onActionStart((event: GestureEvent) => {
                         this.dragItem = item.num
                         this.dragItem = item.num
@@ -330,8 +330,7 @@ struct ChannelDialog {
                           this.dragRefOffsetY = 0
                           this.dragRefOffsetY = 0
                         })
                         })
                       })
                       })
-                )
-                  .onCancel(() => {
+                  ).onCancel(() => {
                     animateTo({ curve: curves.interpolatingSpring(0, 1, 400, 38) }, () => {
                     animateTo({ curve: curves.interpolatingSpring(0, 1, 400, 38) }, () => {
                       this.dragItem = -1
                       this.dragItem = -1
                       this.offsetX = 0
                       this.offsetX = 0
@@ -339,8 +338,8 @@ struct ChannelDialog {
                       this.dragRefOffsetX = 0
                       this.dragRefOffsetX = 0
                       this.dragRefOffsetY = 0
                       this.dragRefOffsetY = 0
                     })
                     })
-                  }))
-
+                  })
+              )
             }, (item: TopNavDTO) => JSON.stringify(item))
             }, (item: TopNavDTO) => JSON.stringify(item))
           }
           }
           .width('100%')
           .width('100%')

@@ -127,7 +127,8 @@ struct EditUserInfoPage {
           lunar:false,
           lunar:false,
           onAccept:(value:DatePickerResult) => {
           onAccept:(value:DatePickerResult) => {
             let mon = value.month as number + 1
             let mon = value.month as number + 1
-            this.currentUserInfo.userExtend.birthday = value.year+'-'+mon.toString()+'-'+value.day;
+            let monStr = mon < 10? '0'+mon.toString():mon.toString();
+            this.currentUserInfo.userExtend.birthday = value.year+'-'+monStr+'-'+value.day;
             this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_birthday
             this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_birthday
             this.updateEditModel()
             this.updateEditModel()
           }
           }
@@ -171,8 +172,10 @@ struct EditUserInfoPage {
 
 
   updateEditModel(){
   updateEditModel(){
     this.listData = []
     this.listData = []
-    this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
-    EditInfoViewModel.updateUserInfo(this.currentUserInfo)
+    // this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
+    EditInfoViewModel.updateUserInfo(this.currentUserInfo).then(()=>{
+      this.getAccountOwnerInfo()
+    })
   }
   }
   getAccountOwnerInfo(){
   getAccountOwnerInfo(){
     EditInfoViewModel.queryAccountOwnerInfo(1,getContext(this)).then((editModel) => {
     EditInfoViewModel.queryAccountOwnerInfo(1,getContext(this)).then((editModel) => {

@@ -4,17 +4,13 @@ import PageModel from '../../viewmodel/PageModel';
 import { CommonConstants, ViewType } from 'wdConstant'
 import { CommonConstants, ViewType } from 'wdConstant'
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
-import RefreshLayout from './RefreshLayout'
-import { RefreshLayoutBean } from './RefreshLayoutBean';
-import { CompDTO, ContentDTO } from 'wdBean'
-import LoadMoreLayout from './LoadMoreLayout'
+import { ContentDTO } from 'wdBean'
 import NoMoreLayout from './NoMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
-import { CompParser } from '../CompParser'
-import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { BigPicCardComponent } from '../view/BigPicCardComponent';
 import { BigPicCardComponent } from '../view/BigPicCardComponent';
 import { contentListItemParams } from '../../model/MyCollectionModel';
 import { contentListItemParams } from '../../model/MyCollectionModel';
+import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -26,6 +22,10 @@ struct MyCollectionListPage {
   @State selectDatas :ContentDTO[] = [];
   @State selectDatas :ContentDTO[] = [];
   @Provide deleteNum :number = 0;
   @Provide deleteNum :number = 0;
   @Provide isAllSelect:boolean = false
   @Provide isAllSelect:boolean = false
+
+  @State  currentPage: number = 1;
+  private scroller: Scroller = new Scroller();
+
   aboutToAppear(){
   aboutToAppear(){
     this.getData()
     this.getData()
   }
   }
@@ -38,17 +38,35 @@ struct MyCollectionListPage {
         this.selectDatas = []
         this.selectDatas = []
         this.deleteNum = 0
         this.deleteNum = 0
       }})
       }})
-      if (this.browSingModel.viewType == ViewType.LOADING){
-        this.LoadingLayout()
-      }else if(this.browSingModel.viewType == ViewType.ERROR){
+
+      if(this.browSingModel.viewType == ViewType.ERROR){
         ErrorComponent()
         ErrorComponent()
       }else if(this.browSingModel.viewType == ViewType.EMPTY){
       }else if(this.browSingModel.viewType == ViewType.EMPTY){
         EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoCollection})
         EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoCollection})
       }else {
       }else {
+        CustomPullToRefresh({
+          alldata:this.allDatas,
+          scroller:this.scroller,
+          customList:()=>{
             this.ListLayout()
             this.ListLayout()
+          },
+          onRefresh:(resolve)=>{
+            this.currentPage = 1
+            this.getData(resolve)
+          },
+          onLoadMore:(resolve)=> {
+            if (this.browSingModel.hasMore === false) {
+              if(resolve) resolve('')
+              return
+            }
+            this.currentPage++
+            this.getData(resolve)
+          }
+        })
       }
       }
 
 
       if (this.isEditState){
       if (this.isEditState){
+        Stack(){
           CustomBottomFuctionUI({
           CustomBottomFuctionUI({
             selectAllCallback:(isAllSelect)=>{
             selectAllCallback:(isAllSelect)=>{
               this.allSelectDatas(isAllSelect)
               this.allSelectDatas(isAllSelect)
@@ -57,7 +75,7 @@ struct MyCollectionListPage {
               this.deleteDatas()
               this.deleteDatas()
             }
             }
           })
           })
-          .position({y:'92%'})
+        }.position({y:'92%'})
       }
       }
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
@@ -65,34 +83,19 @@ struct MyCollectionListPage {
   }
   }
 
 
   @Builder ListLayout() {
   @Builder ListLayout() {
-    List() {
-      // 下拉刷新
-      ListItem() {
-        RefreshLayout({
-          refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullDown, this.browSingModel.pullDownRefreshImage,
-            this.browSingModel.pullDownRefreshText, this.browSingModel.pullDownRefreshHeight)
-        })
-      }
-
+    List({scroller: this.scroller}) {
       ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
       ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
         ListItem() {
         ListItem() {
           this.newCompParser(compDTO,compIndex)
           this.newCompParser(compDTO,compIndex)
         }
         }
       })
       })
-
       // 加载更多
       // 加载更多
       ListItem() {
       ListItem() {
-        if (this.browSingModel.hasMore) {
-          LoadMoreLayout({
-            refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullUpLoad, this.browSingModel.pullUpLoadImage,
-              this.browSingModel.pullUpLoadText, this.browSingModel.pullUpLoadHeight)
-          })
-        } else {
-          NoMoreLayout()
-        }
+        if (this.browSingModel.hasMore === false) NoMoreLayout()
       }
       }
     }
     }
     .height(CommonConstants.FULL_PARENT)
     .height(CommonConstants.FULL_PARENT)
+    .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
   }
   }
 
 
   @Builder
   @Builder
@@ -113,26 +116,26 @@ struct MyCollectionListPage {
     }
     }
   }
   }
 
 
-  @Builder LoadingLayout() {
-    CustomRefreshLoadLayout({ refreshBean: new RefreshLayoutBean(true,
-      $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.browSingModel.pullDownRefreshHeight) })
-  }
-
-  async getData() {
-    this.browSingModel.currentPage = 1
-    MyCollectionViewModel.fetchMyCollectList(1,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => {
+  async getData(resolve?: (value: string | PromiseLike<string>) => void) {
+    MyCollectionViewModel.fetchMyCollectList(1,'1',this.currentPage,getContext(this)).then(collectionItem => {
+      if(resolve) resolve('刷新成功')
       if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
       if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
-        this.browSingModel.viewType = ViewType.LOADED;
+        if (this.currentPage === 1) {
+          this.allDatas = []
           this.allDatas.push(...collectionItem.list)
           this.allDatas.push(...collectionItem.list)
-        if (collectionItem.list.length === this.browSingModel.pageSize) {
-          this.browSingModel.currentPage++;
-          this.browSingModel.hasMore = true;
-        } else {
+        }else {
+          this.allDatas = this.allDatas.concat(...collectionItem.list)
+        }
+        if (collectionItem.hasNext === 0) {
           this.browSingModel.hasMore = false;
           this.browSingModel.hasMore = false;
+        } else {
+          this.browSingModel.hasMore = true;
         }
         }
       } else {
       } else {
+        if (this.currentPage === 1) {
           this.browSingModel.viewType = ViewType.EMPTY;
           this.browSingModel.viewType = ViewType.EMPTY;
         }
         }
+      }
     })
     })
   }
   }
 
 

@@ -19,7 +19,6 @@ import {
 struct PeopleShipHomePage {
 struct PeopleShipHomePage {
   // Todo 传入数据  后续在修改
   // Todo 传入数据  后续在修改
   creatorId: string = (router.getParams() as Record<string, string>)['creatorId'];
   creatorId: string = (router.getParams() as Record<string, string>)['creatorId'];
-  @State arr: number[] = []
   // 页面详情数据
   // 页面详情数据
   @Provide detailModel: PeopleShipUserDetailData = {} as PeopleShipUserDetailData
   @Provide detailModel: PeopleShipUserDetailData = {} as PeopleShipUserDetailData
   // 每个分类数量
   // 每个分类数量
@@ -108,9 +107,12 @@ struct PeopleShipHomePage {
       Logger.debug('PeopleShipHomePage', '获取页面信息', `${JSON.stringify(this.detailModel)}`)
       Logger.debug('PeopleShipHomePage', '获取页面信息', `${JSON.stringify(this.detailModel)}`)
 
 
       // 获取关注
       // 获取关注
+      // 登录后获取，是否关注
+      if (HttpUrlUtils.getUserId()) {
         let followList: QueryListIsFollowedItem[] = await PeopleShipHomePageDataModel.getHomePageFollowListStatusData(this.creatorId)
         let followList: QueryListIsFollowedItem[] = await PeopleShipHomePageDataModel.getHomePageFollowListStatusData(this.creatorId)
         Logger.debug('PeopleShipHomePage', '获取关注信息', `${JSON.stringify(followList)}`)
         Logger.debug('PeopleShipHomePage', '获取关注信息', `${JSON.stringify(followList)}`)
         this.findFollowStata(followList)
         this.findFollowStata(followList)
+      }
 
 
     } catch (exception) {
     } catch (exception) {
 
 
@@ -128,14 +130,17 @@ struct PeopleShipHomePage {
   }
   }
 
 
   handleChangeAttentionStata() {
   handleChangeAttentionStata() {
+
     if (!this.isLoadingAttention) {
     if (!this.isLoadingAttention) {
       return
       return
     }
     }
     // 未登录，跳转登录
     // 未登录，跳转登录
     if (!HttpUrlUtils.getUserId()) {
     if (!HttpUrlUtils.getUserId()) {
+      this.isLoadingAttention = false
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }
+
     let status = 0
     let status = 0
     if (this.isAttention == '0') {
     if (this.isAttention == '0') {
       status = 1
       status = 1

+import { QualityCommentsComponent } from '../comment/view/QualityCommentsComponent';
+
+@Entry
+@Component
+struct QualityCommentsPage {
+  build() {
+    Column(){
+      QualityCommentsComponent();
+    }
+
+  }
+}

@@ -151,36 +151,25 @@ export struct TopNavigationComponent {
   }
   }
 
 
   indexChange() {
   indexChange() {
-    if (this._currentNavIndex === 2 && this.currentTopNavSelectedIndex === 0 && this.changeBarBackgroundColor) {
-      this.barBackgroundColor = Color.Black
-      this.changeBarBackgroundColor(this.barBackgroundColor)
-    } else {
-      this.barBackgroundColor = Color.Transparent
-      this.changeBarBackgroundColor(this.barBackgroundColor)
-    }
 
 
+    // 判断视频频道待处理
     if (this._currentNavIndex === 2 && this.currentTopNavSelectedIndex == 0) {
     if (this._currentNavIndex === 2 && this.currentTopNavSelectedIndex == 0) {
-      if (!this.isLayoutFullScreen) {
-        const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-        const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-        windowClass.setWindowLayoutFullScreen(true).then(() => {
+      this.barBackgroundColor = Color.Black
+      this.changeBarBackgroundColor && this.changeBarBackgroundColor(this.barBackgroundColor)
+      WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+      WindowModel.shared.setWindowLayoutFullScreen(true)
       this.isLayoutFullScreen = true
       this.isLayoutFullScreen = true
       this.bottomRectHeight = this.bottomSafeHeight
       this.bottomRectHeight = this.bottomSafeHeight
       this.topRectHeight = this.topSafeHeight
       this.topRectHeight = this.topSafeHeight
-        })
-      }
 
 
     } else {
     } else {
-      if (this.isLayoutFullScreen) {
-        const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-        const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-        windowClass.setWindowLayoutFullScreen(false).then(() => {
+      this.barBackgroundColor = Color.Transparent
+      this.changeBarBackgroundColor && this.changeBarBackgroundColor(this.barBackgroundColor)
+      WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+      WindowModel.shared.setWindowLayoutFullScreen(false)
       this.isLayoutFullScreen = false
       this.isLayoutFullScreen = false
       this.bottomRectHeight = 0
       this.bottomRectHeight = 0
       this.topRectHeight = 0
       this.topRectHeight = 0
-          console.error(' this.isLayoutFullScreen ', this.isLayoutFullScreen)
-        })
-      }
     }
     }
   }
   }
 
 

@@ -20,24 +20,26 @@ import { RefreshLayoutBean } from '../page/RefreshLayoutBean'
 import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
 import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
 import { ErrorComponent } from '../view/ErrorComponent';
 import { ErrorComponent } from '../view/ErrorComponent';
 import NoMoreLayout from '../page/NoMoreLayout';
 import NoMoreLayout from '../page/NoMoreLayout';
-import { LazyDataSource } from 'wdKit';
+// import { LazyDataSource } from 'wdKit';
+import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh'
 
 
 const TAG = 'PeopleShipHomeArticleListComponent';
 const TAG = 'PeopleShipHomeArticleListComponent';
 
 
 @Component
 @Component
 export struct PeopleShipHomeArticleListComponent {
 export struct PeopleShipHomeArticleListComponent {
-  // @State arr: ContentDTO[] = []
-  @State arr: LazyDataSource<ContentDTO> = new LazyDataSource();
+  @State arr: ContentDTO[] = []
+  // @State arr: LazyDataSource<ContentDTO> = new LazyDataSource();
   @State typeModel: ArticleTypeData = new ArticleTypeData()
   @State typeModel: ArticleTypeData = new ArticleTypeData()
   @State creatorId: string = ''
   @State creatorId: string = ''
   @Consume detailModel: PeopleShipUserDetailData
   @Consume detailModel: PeopleShipUserDetailData
-  @State private viewType: number = 1;
-  currentIndex: number = 0
+  @State private viewType: number = 1
+  currentIndex: number = 1
   @Link @Watch('onChange') currentTopSelectedIndex: number
   @Link @Watch('onChange') currentTopSelectedIndex: number
   @State private hasMore: boolean = true
   @State private hasMore: boolean = true
-  @State currentPage: number = 1
+  @State private currentPage: number = 1
   @State private isLoading: boolean = false
   @State private isLoading: boolean = false
   @Consume topHeight: number
   @Consume topHeight: number
+  private  scroller: Scroller = new Scroller()
 
 
   build() {
   build() {
     if (this.viewType == 1) {
     if (this.viewType == 1) {
@@ -46,7 +48,34 @@ export struct PeopleShipHomeArticleListComponent {
     } else if (this.viewType == 2) {
     } else if (this.viewType == 2) {
       ErrorComponent()
       ErrorComponent()
     }  else {
     }  else {
+      CustomPullToRefresh({
+        alldata:this.arr,
+        scroller:this.scroller,
+        hasMore: this.hasMore,
+        customList:()=>{
           this.ListLayout()
           this.ListLayout()
+        },
+        onRefresh:(resolve)=>{
+          this.currentPage = 1
+          this.getPeopleShipPageArticleList(resolve)
+        },
+        onLoadMore:(resolve)=> {
+          if (this.hasMore === false) {
+            if(resolve) {
+              resolve('')
+            }
+            return
+          }
+          if(!this.isLoading && this.hasMore){
+            //加载分页数据
+            this.getPeopleShipPageArticleList(resolve)
+          }else  {
+            if(resolve)  {
+              resolve('')
+            }
+          }
+        },
+      })
     }
     }
 
 
   }
   }
@@ -62,10 +91,10 @@ export struct PeopleShipHomeArticleListComponent {
   @Builder
   @Builder
   ListLayout() {
   ListLayout() {
 
 
-    List() {
+    List({scroller: this.scroller}) {
       // 下拉刷新
       // 下拉刷新
 
 
-        LazyForEach(this.arr, (item: ContentDTO) => {
+        ForEach(this.arr, (item: ContentDTO) => {
           ListItem() {
           ListItem() {
             CardParser({ contentDTO: item })
             CardParser({ contentDTO: item })
           }.width("100%")
           }.width("100%")
@@ -74,25 +103,25 @@ export struct PeopleShipHomeArticleListComponent {
 
 
         // 加载更多
         // 加载更多
         ListItem() {
         ListItem() {
-          if (!this.hasMore) {
+          if (!this.hasMore && !this.isLoading) {
             NoMoreLayout()
             NoMoreLayout()
           }
           }
         }
         }
     }
     }
     .width("100%")
     .width("100%")
     .height("100%")
     .height("100%")
-    .edgeEffect(EdgeEffect.Spring)
+    .edgeEffect(EdgeEffect.None)
     .nestedScroll({
     .nestedScroll({
       scrollForward: NestedScrollMode.PARENT_FIRST,
       scrollForward: NestedScrollMode.PARENT_FIRST,
       scrollBackward: NestedScrollMode.SELF_FIRST
       scrollBackward: NestedScrollMode.SELF_FIRST
     })
     })
 
 
-    .onReachEnd(() => {
-      if(!this.isLoading && this.hasMore){
-        //加载分页数据
-        this.getPeopleShipPageArticleList()
-      }
-    })
+    // .onReachEnd(() => {
+    //   if(!this.isLoading && this.hasMore){
+    //     //加载分页数据
+    //     this.getPeopleShipPageArticleList()
+    //   }
+    // })
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
@@ -109,16 +138,28 @@ export struct PeopleShipHomeArticleListComponent {
     }
     }
   }
   }
 
 
-  private async getPeopleShipPageArticleList() {
+
+  private async getPeopleShipPageArticleList(resolve?: (value: string | PromiseLike<string>) => void) {
     Logger.info(`获取页面信息PeopleShipHomeArticleListComponent${this.typeModel.type}`)
     Logger.info(`获取页面信息PeopleShipHomeArticleListComponent${this.typeModel.type}`)
     if (this.isLoading) {
     if (this.isLoading) {
+      if (resolve) {
+        resolve('')
+      }
       return
       return
     }
     }
     try {
     try {
       this.isLoading = true
       this.isLoading = true
       let listData: ArticleListData = await PeopleShipHomePageDataModel.getPeopleShipHomePageArticleListData(this.creatorId, this.currentPage, 20, this.typeModel.type)
       let listData: ArticleListData = await PeopleShipHomePageDataModel.getPeopleShipHomePageArticleListData(this.creatorId, this.currentPage, 20, this.typeModel.type)
       Logger.debug(TAG, `获取页面信息, ${listData.list.length}`);
       Logger.debug(TAG, `获取页面信息, ${listData.list.length}`);
+      Logger.debug(TAG, `已更新值最新, ${this.currentPage}`);
 
 
+      if (resolve ) {
+        if (this.currentPage == 1) {
+          resolve('已更新至最新')
+        }else  {
+          resolve('')
+        }
+      }
       if (listData && listData.list && listData.list.length > 0) {
       if (listData && listData.list && listData.list.length > 0) {
         this.viewType = 3;
         this.viewType = 3;
         if (listData.list.length === 20) {
         if (listData.list.length === 20) {
@@ -130,15 +171,18 @@ export struct PeopleShipHomeArticleListComponent {
       } else {
       } else {
         this.viewType = 1;
         this.viewType = 1;
       }
       }
+      this.isLoading = false
       this.queryArticleContentInteractCount(listData)
       this.queryArticleContentInteractCount(listData)
-      Logger.debug(TAG, '展示的总数', `${this.arr.totalCount()}`)
+      Logger.debug(TAG, '展示的总数', `${this.arr.length}`)
     }catch (exception) {
     }catch (exception) {
+      if (resolve) {
+        resolve('')
+      }
       this.isLoading = false
       this.isLoading = false
-      if (this.arr.totalCount() == 0) {
+      if (this.arr.length == 0) {
         this.viewType = 2
         this.viewType = 2
       }
       }
     }
     }
-
   }
   }
 
 
   /**
   /**

@@ -15,13 +15,13 @@ export struct PeopleShipHomePageHeadComponent {
           .borderWidth('1vp')
           .borderWidth('1vp')
           .borderStyle(BorderStyle.Solid)
           .borderStyle(BorderStyle.Solid)
           .borderColor(Color.White)
           .borderColor(Color.White)
-          .objectFit(ImageFit.Auto)
+          .objectFit(ImageFit.Cover)
           if(this.authIcon.length > 0 ) {
           if(this.authIcon.length > 0 ) {
             Image( this.authIcon )
             Image( this.authIcon )
               .width(this.iconDiameter)
               .width(this.iconDiameter)
               .height(this.iconDiameter)
               .height(this.iconDiameter)
               .borderRadius(this.iconDiameter/2)
               .borderRadius(this.iconDiameter/2)
-              .objectFit(ImageFit.Auto)
+              .objectFit(ImageFit.Cover)
               .margin({
               .margin({
                 right: '-3vp'
                 right: '-3vp'
               })
               })

+import { PullToRefresh, PullToRefreshConfigurator } from '@ohos/pulltorefresh';
+
+@Component
+export  struct CustomPullToRefresh {
+  @Link alldata: Object[];
+  scroller: Scroller = new Scroller();
+  @BuilderParam customList: () => void;
+  onRefresh: (resolve?: (value: string | PromiseLike<string>) => void) => void = () => {
+  }
+  onLoadMore: (resolve?: (value: string | PromiseLike<string>) => void) => void = () => {
+  }
+  ///是否存在上拉更多
+  @Prop hasMore: boolean = true
+  refreshConfigurator: PullToRefreshConfigurator = new PullToRefreshConfigurator().setHasLoadMore(this.hasMore);
+  build() {
+    Column(){
+      PullToRefresh({
+        data:this.alldata,
+        scroller:this.scroller,
+        refreshConfigurator:this.refreshConfigurator,
+        customList:()=>{
+           this.customList();
+        },
+        onRefresh:()=>{
+          return new Promise<string>((resolve, reject) => {
+            this.onRefresh(resolve)
+          });
+        },
+        onLoadMore:()=>{
+          return new Promise<string>((resolve, reject) => {
+            this.onLoadMore(resolve)
+          });
+        },
+        customLoad: null,
+        customRefresh: null,
+      })
+    }
+  }
+}

+import { ToastUtils } from 'wdKit/Index'
+import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
 import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
 import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
 
 
 @Component
 @Component
@@ -21,5 +23,19 @@ export struct SearchCreatorComponent{
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
     }.alignItems(HorizontalAlign.Center)
     }.alignItems(HorizontalAlign.Center)
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
+    .onClick(()=>{
+      this.jumpCreatorHomePage()
+    })
+  }
+
+  jumpCreatorHomePage() {
+    if(Number.parseInt(this.item.mainControl) === 0){
+      ToastUtils.shortToast("无法查看此用户主页")
+    }else if(Number.parseInt(this.item.banControl) === 1){
+      ToastUtils.shortToast("该账号已封禁，不予访问")
+    }else{
+      let params = {'creatorId': this.item.id} as Record<string, string>;
+      WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
+    }
   }
   }
 }
 }

@@ -72,6 +72,7 @@ export struct SearchResultContentComponent{
                   value.forEach((item)=>{
                   value.forEach((item)=>{
                     if(data.creatorId == item.creatorId){
                     if(data.creatorId == item.creatorId){
                       data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
                       data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
+                      data.mainControl = item.mainControl+""
                     }
                     }
                   })
                   })
                 })
                 })

 import { BottomNavi, CommonConstants, SpConstants } from 'wdConstant';
 import { BottomNavi, CommonConstants, SpConstants } from 'wdConstant';
-import { Logger, SPHelper } from 'wdKit';
+import { Logger, SPHelper, StringUtils } from 'wdKit';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import storageStatistics from "@ohos.file.storageStatistics";
 import storageStatistics from "@ohos.file.storageStatistics";
 import { BusinessError } from '@ohos.base';
 import { BusinessError } from '@ohos.base';
@@ -12,7 +12,7 @@ import { CustomCacheDialog } from './CustomCacheDialog';
 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
 import { MineMainSettingFunctionItem } from '../../viewmodel/MineMainSettingFunctionItem';
 import { MineMainSettingFunctionItem } from '../../viewmodel/MineMainSettingFunctionItem';
 import common from '@ohos.app.ability.common';
 import common from '@ohos.app.ability.common';
-
+import dataPreferences from '@ohos.data.preferences';
 
 
 @Component
 @Component
 export struct MineSettingComponent {
 export struct MineSettingComponent {
@@ -21,6 +21,7 @@ export struct MineSettingComponent {
   @State privacySwitch: boolean = false
   @State privacySwitch: boolean = false
   @State cacheSize: number = 0
   @State cacheSize: number = 0
   @State accountState:boolean=false
   @State accountState:boolean=false
+  preferences: dataPreferences.Preferences | null = null;
   dialogController: CustomDialogController = new CustomDialogController({
   dialogController: CustomDialogController = new CustomDialogController({
     builder: CustomCacheDialog({
     builder: CustomCacheDialog({
       cancel: () => {
       cancel: () => {
@@ -41,6 +42,8 @@ export struct MineSettingComponent {
 
 
     this.getAccountState()
     this.getAccountState()
 
 
+    this.addLoginStatusObserver()
+
   }
   }
 
 
   async getAccountState(){
   async getAccountState(){
@@ -304,4 +307,14 @@ export struct MineSettingComponent {
       }
       }
     });
     });
   }
   }
+
+  async addLoginStatusObserver(){
+    this.preferences = await SPHelper.default.getPreferences();
+    let observer = (key: string) => {
+      if(key == SpConstants.USER_ID){
+        this.getSettingPageData()
+      }
+    }
+    this.preferences.on('change', observer);
+  }
 }
 }

@@ -108,6 +108,8 @@ export struct EmptyComponent {
     let contentString: string = '暂无内容'
     let contentString: string = '暂无内容'
     if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCollection) {
     if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCollection) {
       contentString = '暂无收藏'
       contentString = '暂无收藏'
+    } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoHistory) {
+      contentString = '暂无浏览历史'
     }  else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoMessage) {
     }  else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoMessage) {
       contentString = '暂无消息'
       contentString = '暂无消息'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment) {
@@ -140,7 +142,7 @@ export struct EmptyComponent {
   buildNoDataTipImage(): Resource | string {
   buildNoDataTipImage(): Resource | string {
     Logger.info(TAG, "buildNoDataTip");
     Logger.info(TAG, "buildNoDataTip");
     let imageString: Resource | string = $r('app.media.icon_no_content')
     let imageString: Resource | string = $r('app.media.icon_no_content')
-    if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCollection) {
+    if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCollection||this.emptyType === WDViewDefaultType.WDViewDefaultType_NoHistory) {
       imageString = $r('app.media.icon_no_collection')
       imageString = $r('app.media.icon_no_collection')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoMessage) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoMessage) {
       imageString = $r('app.media.icon_no_message')
       imageString = $r('app.media.icon_no_message')

 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
-import { ContentDTO,CompDTO } from 'wdBean'
+import { ContentDTO, CompDTO } from 'wdBean'
+import { ProcessUtils } from '../../utils/ProcessUtils';
 
 
 @Component
 @Component
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
@@ -59,13 +60,12 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
           .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
           .padding({ left: (index == 0) ? 16 : 0, right: (index == this.compDTO.operDataList.length - 1) ? 16 : 0 })
           // .offset({x:16})
           // .offset({x:16})
           .onClick(() => {
           .onClick(() => {
-            if (item.objectType != '0') {
-              console.log(item.objectId)
-            }
+            ProcessUtils.processPage(item)
           })
           })
         })
         })
 
 
       }.listDirection(Axis.Horizontal)
       }.listDirection(Axis.Horizontal)
+      .scrollBar(BarState.Off)
       .width('100%')
       .width('100%')
 
 
       // .backgroundColor($r("app.color.color_FE4B05"))
       // .backgroundColor($r("app.color.color_FE4B05"))

@@ -2,10 +2,12 @@ import { Action, CompDTO, ContentDTO, Params } from 'wdBean'
 import { WDRouterRule } from 'wdRouter/Index'
 import { WDRouterRule } from 'wdRouter/Index'
 import { Logger } from 'wdKit/Index'
 import { Logger } from 'wdKit/Index'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
+import { LiveModel } from '../../viewmodel/LiveModel'
 
 
 @Component
 @Component
 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
+
   build() {
   build() {
     Column() {
     Column() {
       Row() {
       Row() {
@@ -30,7 +32,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
             .height(14)
             .height(14)
         }
         }
       }.justifyContent(FlexAlign.SpaceBetween)
       }.justifyContent(FlexAlign.SpaceBetween)
-      .margin({ top: 8 ,bottom: 8})
+      .margin({ top: 8, bottom: 8 })
       .width('100%')
       .width('100%')
 
 
 
 
@@ -45,12 +47,13 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
         .fontColor($r("app.color.color_212228"))
         .fontColor($r("app.color.color_212228"))
         .fontWeight(400)
         .fontWeight(400)
         .maxLines(1)
         .maxLines(1)
-        .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
+        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
         .textAlign(TextAlign.Start)
         .textAlign(TextAlign.Start)
         .margin({ top: 8 })
         .margin({ top: 8 })
         .width('100%')
         .width('100%')
 
 
-    }.width("100%")
+    }
+    .width("100%")
     .padding({
     .padding({
       top: 14,
       top: 14,
       left: 16,
       left: 16,
@@ -59,16 +62,26 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
     .margin({ bottom: 8 })
     .margin({ bottom: 8 })
-    .onClick(()=>{
+    .onClick(() => {
       this.gotoLive(this.compDTO?.operDataList[0])
       this.gotoLive(this.compDTO?.operDataList[0])
     })
     })
   }
   }
-  gotoLive(content: ContentDTO) {
+
+  async gotoLive(content: ContentDTO) {
+    const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
+    const liveStyle = liveDetail[0].liveInfo.liveStyle
+    const liveState = liveDetail[0].liveInfo.liveState
+
+
+    console.error('liveDetail===', liveDetail)
+
+
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
         detailPageType: 2,
         detailPageType: 2,
         contentID: content?.objectId,
         contentID: content?.objectId,
+        liveStyle: liveState === 'wait' ? 0 : liveStyle,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,
@@ -76,6 +89,6 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
       } as Params,
       } as Params,
     };
     };
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(`gotoLive, ${content.objectId}`);
+    // Logger.debug(TAG, `gotoLive, ${content.objectId}`);
   }
   }
 }
 }

+import { image } from '@kit.ImageKit';
+import { matrix4, promptAction, window } from '@kit.ArkUI';
+import { BusinessError } from '@kit.BasicServicesKit';
+import { ScaleModel } from '../../model/ScaleModel';
+import { OffsetModel } from '../../model/OffsetModel';
+import { windowSizeManager } from '../../utils/Managers';
+import { runWithAnimation } from '../../utils/FuncUtils';
+import { PhotoListBean } from 'wdBean/Index';
+import { http } from '@kit.NetworkKit';
+
+// TODO：知识点：组件复用
+@Reusable
+@Component
+export struct ImageItemView {
+  @Consume private bgc: Color;
+  @Link isEnableSwipe: boolean; // TODO：需求：多图切换
+  @State isEnableOffset: boolean = false;
+  @State imageScaleInfo: ScaleModel = new ScaleModel(1.0, 1.0, 1.5, 0.3);
+  @State imageOffsetInfo: OffsetModel = new OffsetModel(0, 0);
+  @State matrix: matrix4.Matrix4Transit = matrix4.identity().copy();
+  @State imagePixelMap: image.PixelMap | null = null; // 当前图片pixelMap，用于Image组件显示
+  @State fitWH: "width" | "height" | undefined = undefined; // 表示当前图片是根据宽度适配还是高度适配
+  @State imageDefaultSize: image.Size = { width: 0, height: 0 }; // 图片默认大小，即，与屏幕大小最适配的显示大小
+  imageUri: string = ""; // 当前图片uri
+  imageWHRatio: number = 0; // 图片原始宽高比
+  private MultiPictureDetailItem: PhotoListBean = {} as PhotoListBean
+  @State imageBuffer: ArrayBuffer | undefined = undefined; // 图片ArrayBuffer
+
+  aboutToAppear(): void {
+    this.imageUri = this.MultiPictureDetailItem.picPath
+    this.getPicture()
+  }
+
+  /**
+   * 通过http的request方法从网络下载图片资源
+   */
+  async getPicture() {
+    console.info(`cj2024 getPicture`)
+    http.createHttp()
+      .request(this.imageUri,
+        (error: BusinessError, data: http.HttpResponse) => {
+          if (error) {
+            // 下载失败时弹窗提示检查网络，不执行后续逻辑
+            promptAction.showToast({
+              message: $r('app.string.image_request_fail'),
+              duration: 2000
+            })
+            return;
+          }
+          this.transcodePixelMap(data);
+          // 判断网络获取到的资源是否为ArrayBuffer类型
+          console.info(`cj2024 getPicture ${data.result}`)
+          if (data.result instanceof ArrayBuffer) {
+            console.info(`cj2024 getPicture 222`)
+            this.imageBuffer = data.result as ArrayBuffer;
+          }
+        }
+      )
+  }
+
+  /**
+   * 使用createPixelMap将ArrayBuffer类型的图片装换为PixelMap类型
+   * @param data：网络获取到的资源
+   */
+  transcodePixelMap(data: http.HttpResponse) {
+    console.info(`cj2024 transcodePixelMap ${data.responseCode}`)
+    if (http.ResponseCode.OK === data.responseCode) {
+      const imageData: ArrayBuffer = data.result as ArrayBuffer;
+      // 通过ArrayBuffer创建图片源实例。
+      const imageSource: image.ImageSource = image.createImageSource(imageData);
+      this.initCurrentImageInfo(imageSource);
+    }
+  }
+
+  /**
+   * 根据图片宽高比及窗口大小计算图片的默认宽高，即，图片最适配屏幕的大小
+   * @param imageWHRatio：图片原始宽高比
+   * @param size：窗口大小{with:number,height:number}
+   * @returns image.Size
+   */
+  calcImageDefaultSize(imageWHRatio: number, size: window.Size): image.Size {
+    let width = 0
+    let height = 0;
+    if (imageWHRatio > size.width / size.height) {
+      // 图片宽高比大于屏幕宽高比，图片默认以屏幕宽度进行显示
+      width = size.width;
+      height = size.width / imageWHRatio;
+    } else {
+      height = size.height;
+      width = size.height * imageWHRatio;
+    }
+    return { width: width, height: height };
+  }
+
+  /**
+   * TODO：知识点：根据图片大小（宽高<=屏幕宽高）和屏幕大小计算图片放大适配屏幕进行显示的缩放倍率
+   * @param imageSize：图片当前大小
+   * @param windowSize：窗口大小
+   * @returns：缩放倍率
+   */
+  calcFitScaleRatio(imageSize: image.Size, windowSize: window.Size): number {
+    let ratio: number = 1.0;
+    if (windowSize.width > imageSize.width) {
+      ratio = windowSize.width / imageSize.width;
+    } else {
+      ratio = windowSize.height / imageSize.height;
+    }
+    return ratio;
+  }
+
+  /**
+   * 设置当前图片的相关信息：uri、whRatio、pixelMap、fitWH、defaultSize、maxScaleValue
+   * TODO：知识点：提前获取图片的信息，以进行Image组件的尺寸设置及后续的相关计算
+   */
+  initCurrentImageInfo(imageSource: image.ImageSource): void {
+    this.matrix = matrix4.identity().copy();
+    // const imageSource: image.ImageSource = image.createImageSource(this.imageUri);
+    imageSource.getImageInfo(0).then((data: image.ImageInfo) => {
+      this.imageWHRatio = data.size.width / data.size.height;
+      this.imageDefaultSize = this.calcImageDefaultSize(this.imageWHRatio, windowSizeManager.get());
+      if (this.imageDefaultSize.width === windowSizeManager.get().width) {
+        this.fitWH = "width";
+      } else {
+        this.fitWH = "height";
+      }
+      this.imageScaleInfo.maxScaleValue += this.fitWH === "width" ?
+        (windowSizeManager.get().height / this.imageDefaultSize.height) :
+        (windowSizeManager.get().width / this.imageDefaultSize.width);
+    }).catch((err: BusinessError) => {
+      console.error(`[error][getImageInfo]${err.message}`);
+    });
+    imageSource.createPixelMap().then((data: image.PixelMap) => {
+      this.imagePixelMap = data;
+    }).catch((err: BusinessError) => {
+      console.error(`[error][createPixelMap]${err.message}`);
+    });
+    this.isEnableOffset = false;
+    this.imageScaleInfo.reset();
+    this.imageOffsetInfo.reset();
+  }
+
+  /**
+   * 在图片消失时，将当前图片的信息设置为默认值
+   */
+  resetCurrentImageInfo(): void {
+    this.imageScaleInfo.reset();
+    this.imageOffsetInfo.reset();
+    this.matrix = matrix4.identity().copy();
+  }
+
+  /**
+   * TODO：需求：在偏移时评估是否到达边界，以便进行位移限制与图片的切换
+   * @returns：长度为4的boolean数组，表示上下左右是否到达边界
+   */
+  evaluateBound(): boolean[] {
+    return [false, false, false, false];
+  }
+
+  build() {
+    Stack() {
+      Image(this.imagePixelMap)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
+        .width(this.fitWH === "width" ? "100%" : undefined)
+        .height(this.fitWH === "height" ? "100%" : undefined)
+        .aspectRatio(this.imageWHRatio)
+        .objectFit(ImageFit.Cover)// TODO：知识点：保持宽高比进行缩放，可以超出父组件，以便实现多图切换的增强功能
+        .autoResize(false)
+        .transform(this.matrix)// TODO：知识点：通过matrix控制图片的缩放
+        .defaultFocus(true)
+        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+        .offset({
+          // TODO：知识点：通过offset控制图片的偏移
+          x: this.imageOffsetInfo.currentX,
+          y: this.imageOffsetInfo.currentY
+        })
+    }
+    .onBlur(() => {
+      this.resetCurrentImageInfo();
+    })
+    // .backgroundColor(this.bgc)
+    .alignContent(Alignment.Center)
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+    .width("100%")
+    .height("100%")
+    .gesture(
+      GestureGroup(
+        GestureMode.Exclusive,
+        // TODO：知识点：双击切换图片大小
+        TapGesture({ count: 2 })
+          .onAction(() => {
+            let fn: Function;
+            // 已经是放大状态下，双击缩小
+            if (this.imageScaleInfo.scaleValue > this.imageScaleInfo.defaultScaleValue) {
+              fn = () => {
+                this.isEnableSwipe = true;
+                this.imageScaleInfo.reset();
+                this.imageOffsetInfo.reset();
+                this.matrix = matrix4.identity().copy();
+              };
+            } else {
+              // 已经是缩小状态，双击放大
+              fn = () => {
+                this.isEnableSwipe = false;
+                const ratio: number = this.calcFitScaleRatio(this.imageDefaultSize, windowSizeManager.get());
+                this.imageScaleInfo.scaleValue = ratio;
+                this.imageOffsetInfo.reset();
+                this.matrix = matrix4.identity().scale({
+                  x: ratio,
+                  y: ratio,
+                }).copy();
+                this.imageScaleInfo.stash();
+              }
+            }
+            runWithAnimation(fn);
+          }),
+        // 单击切换背景色
+        // TapGesture({ count: 1 }).onAction(() => {
+        //   runWithAnimation(() => {
+        //     this.bgc = this.bgc === Color.White ? Color.Black : Color.White;
+        //   });
+        // }),
+        // TODO：知识点：双指捏合缩放图片
+        PinchGesture({ fingers: 2, distance: 1 })
+          .onActionUpdate((event: GestureEvent) => {
+            this.imageScaleInfo.scaleValue = this.imageScaleInfo.lastValue * event.scale;
+            // TODO：知识点：缩放时不允许大于最大缩放因子+额外缩放因子，不允许小于默认大小-额外缩放因子，额外缩放因子用于提升用户体验
+            if (this.imageScaleInfo.scaleValue > this.imageScaleInfo.maxScaleValue *
+              (1 + this.imageScaleInfo.extraScaleValue)
+            ) {
+              this.imageScaleInfo.scaleValue = this.imageScaleInfo.maxScaleValue *
+                (1 + this.imageScaleInfo.extraScaleValue);
+            }
+            if (this.imageScaleInfo.scaleValue < this.imageScaleInfo.defaultScaleValue *
+              (1 - this.imageScaleInfo.extraScaleValue)) {
+              this.imageScaleInfo.scaleValue = this.imageScaleInfo.defaultScaleValue *
+                (1 - this.imageScaleInfo.extraScaleValue);
+            }
+            // TODO：知识点：matrix默认缩放中心为组件中心
+            this.matrix = matrix4.identity().scale({
+              x: this.imageScaleInfo.scaleValue,
+              y: this.imageScaleInfo.scaleValue,
+            }).copy();
+            console.debug(this.imageScaleInfo.toString());
+          })
+          .onActionEnd((event: GestureEvent) => {
+            /**
+             * TODO：知识点：当小于默认大小时，恢复为默认大小
+             */
+            if (this.imageScaleInfo.scaleValue < this.imageScaleInfo.defaultScaleValue) {
+              runWithAnimation(() => {
+                this.imageScaleInfo.reset();
+                this.imageOffsetInfo.reset();
+                this.matrix = matrix4.identity().copy();
+              })
+            }
+            // TODO：知识点：当大于最大缩放因子时，恢复到最大
+            if (this.imageScaleInfo.scaleValue > this.imageScaleInfo.maxScaleValue) {
+              runWithAnimation(() => {
+                this.imageScaleInfo.scaleValue = this.imageScaleInfo.maxScaleValue;
+                this.matrix = matrix4.identity()
+                  .scale({
+                    x: this.imageScaleInfo.maxScaleValue,
+                    y: this.imageScaleInfo.maxScaleValue
+                  });
+              })
+            }
+            this.imageScaleInfo.stash();
+          }),
+        // // TODO：知识点：滑动图片
+        // PanGesture({ fingers: 1 })// TODO：需求：默认大小下左右滑动应当是切换图片
+        //   .onActionUpdate((event: GestureEvent) => {
+        //     if (this.imageScaleInfo.scaleValue === this.imageScaleInfo.defaultScaleValue) {
+        //       // 默认大小下不允许移动
+        //       return;
+        //     }
+        //     this.imageOffsetInfo.currentX = this.imageOffsetInfo.lastX + event.offsetX;
+        //     this.imageOffsetInfo.currentY = this.imageOffsetInfo.lastY + event.offsetY;
+        //   })
+        //   .onActionEnd((event: GestureEvent) => {
+        //     this.imageOffsetInfo.stash();
+        //   })
+      ),
+    )
+  }
+}

+import { Logger } from 'wdKit/Index'
+import { LikeViewModel } from '../../viewmodel/LikeViewModel'
+
+@Component
+export struct LikeComponent {
+  @State likeStatus: boolean = false
+  viewModel: LikeViewModel = new LikeViewModel()
+  @Prop data: Record<string, string>
+  enableBtn = true
+
+  //上层传值  样例
+  // this.data['contentId'] = '30035444649' //必须
+  // this.data['userName'] = '人民日报网友2kD2xW'
+  // this.data['contentType'] = '8'  //必须
+  // this.data['title'] = '开创两校交流先河！克罗地亚教育代表团访问同济大学'
+  // this.data['userHeaderUrl'] = ""
+  // this.data['channelId'] = "2059"  //必须
+  // this.data['status'] = "1"  //必须
+
+  aboutToAppear(): void {
+    if (this.data) {
+      Logger.debug("ddd: " + this.data['status'])
+      if (this.data['status'] == '1') {
+        this.likeStatus = true
+      } else {
+        this.likeStatus = false
+      }
+
+    }
+
+  }
+
+  build() {
+    Column() {
+      Image(this.likeStatus ? $r('app.media.icon_like_select') : $r('app.media.icon_like_default'))
+        .width(24)
+        .height(24)
+        .onClick(() => {
+          if (!this.enableBtn) {
+            return
+          }
+          if (this.likeStatus) {
+            //1
+            this.executeLike('1')
+          } else {
+            //0
+            this.executeLike('0')
+          }
+        })
+    }.width(24).height(24)
+  }
+
+  executeLike(status: string) {
+    this.data['status'] = status
+    this.viewModel.executeLike2(this.data).then(() => {
+      this.likeStatus = !this.likeStatus
+      this.enableBtn = true
+    }).catch(() => {
+      this.enableBtn = true
+    })
+  }
+}

@@ -6,6 +6,7 @@ import { WDRouterRule } from 'wdRouter/Index'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { Logger } from 'wdKit/Index'
 import { Logger } from 'wdKit/Index'
+import { LiveModel } from '../../viewmodel/LiveModel'
 
 
 @Component
 @Component
 export struct LiveHorizontalCardComponent {
 export struct LiveHorizontalCardComponent {
@@ -100,12 +101,22 @@ export struct LiveHorizontalCardComponent {
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
   }
   }
-  gotoLive(content: ContentDTO) {
+
+  async gotoLive(content: ContentDTO) {
+    const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
+    const liveStyle = liveDetail[0].liveInfo.liveStyle
+    const liveState = liveDetail[0].liveInfo.liveState
+
+
+    console.error('liveDetail===', liveDetail)
+
+
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
         detailPageType: 2,
         detailPageType: 2,
         contentID: content?.objectId,
         contentID: content?.objectId,
+        liveStyle: liveState === 'wait' ? 0 : liveStyle,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,
@@ -113,6 +124,6 @@ export struct LiveHorizontalCardComponent {
       } as Params,
       } as Params,
     };
     };
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(`gotoLive, ${content.objectId}`);
+    // Logger.debug(TAG, `gotoLive, ${content.objectId}`);
   }
   }
 }
 }

@@ -6,6 +6,7 @@ import { Logger, StringUtils } from 'wdKit/Index'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { WDRouterRule } from 'wdRouter/Index'
 import { WDRouterRule } from 'wdRouter/Index'
+import { LiveModel } from '../../viewmodel/LiveModel'
 
 
 @Component
 @Component
 export struct LiveHorizontalReservationComponent {
 export struct LiveHorizontalReservationComponent {
@@ -92,12 +93,21 @@ export struct LiveHorizontalReservationComponent {
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
   }
   }
 
 
-  gotoLive(content: ContentDTO) {
+  async gotoLive(content: ContentDTO) {
+    const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
+    const liveStyle = liveDetail[0].liveInfo.liveStyle
+    const liveState = liveDetail[0].liveInfo.liveState
+
+
+    console.error('liveDetail===', liveDetail)
+
+
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
         detailPageType: 2,
         detailPageType: 2,
         contentID: content?.objectId,
         contentID: content?.objectId,
+        liveStyle: liveState === 'wait' ? 0 : liveStyle,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,
@@ -105,6 +115,6 @@ export struct LiveHorizontalReservationComponent {
       } as Params,
       } as Params,
     };
     };
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(`gotoLive, ${content.objectId}`);
+    // Logger.debug(TAG, `gotoLive, ${content.objectId}`);
   }
   }
 }
 }

-import { ToastUtils, Logger, NumberFormatterUtils } from 'wdKit';
+import { ToastUtils, Logger, NumberFormatterUtils, SPHelper } from 'wdKit';
 import {
 import {
   InputMethodProperty,
   InputMethodProperty,
   batchLikeAndCollectResult,
   batchLikeAndCollectResult,
@@ -15,6 +15,7 @@ import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailV
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
+import { SpConstants } from 'wdConstant/Index';
 
 
 export interface OperationItem {
 export interface OperationItem {
   icon: Resource;
   icon: Resource;
@@ -53,8 +54,9 @@ export struct OperRowListView {
     }
     }
   ]
   ]
 
 
-  aboutToAppear() {
-    if (HttpUrlUtils.getUserId()) {
+  async aboutToAppear() {
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (user_id) {
       this.getInteractDataStatus()
       this.getInteractDataStatus()
     }
     }
     this.queryContentInteractCount()
     this.queryContentInteractCount()
@@ -338,9 +340,10 @@ export struct OperRowListView {
   /**
   /**
    * 点赞、取消点赞
    * 点赞、取消点赞
    */
    */
-  toggleLikeStatus() {
+  async toggleLikeStatus() {
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }
@@ -361,9 +364,10 @@ export struct OperRowListView {
   /**
   /**
    * 收藏、取消收藏
    * 收藏、取消收藏
    */
    */
-  toggleCollectStatus() {
+  async toggleCollectStatus() {
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
+    if (!user_id) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

@@ -30,10 +30,10 @@ export struct RecommendList {
       ForEach(this.recommendList, (item: ContentDTO, index: number) => {
       ForEach(this.recommendList, (item: ContentDTO, index: number) => {
         Row() {
         Row() {
           CardParser({ contentDTO: item });
           CardParser({ contentDTO: item });
-        }.border({
-          width: { bottom: this.recommendList.length === index + 1 ? 0 : 1 },
-          color: '#f5f5f5'
-        })
+        }
+        if (this.recommendList.length !== index + 1) {
+          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+        }
       }, (item: ContentDTO) => JSON.stringify(item))
       }, (item: ContentDTO) => JSON.stringify(item))
     }.width('100%')
     }.width('100%')
   }
   }

@@ -33,6 +33,7 @@ export   struct  SecondLevelComponent  {
   }
   }
 
 
   onFirstChange(){
   onFirstChange(){
+    this.select = 0
     if (!this.currentFirst) {
     if (!this.currentFirst) {
       this.mTip = '暂无数据';
       this.mTip = '暂无数据';
     } else {
     } else {

@@ -34,10 +34,11 @@ export   struct  ThirdLevelComponent  {
   }
   }
 
 
   onFirstChange(){
   onFirstChange(){
-
+    this.select = 0
   }
   }
 
 
   onSecondChange(){
   onSecondChange(){
+    this.select = 0
     if (!this.currentSecondBean) {
     if (!this.currentSecondBean) {
       this.mTip = '暂无数据';
       this.mTip = '暂无数据';
     } else {
     } else {

@@ -16,6 +16,12 @@ export class ContentConstants {
    * 5:专题详情
    * 5:专题详情
    */
    */
   static readonly TYPE_SPECIAL_TOPIC: string = "5";
   static readonly TYPE_SPECIAL_TOPIC: string = "5";
+
+  /**
+   * 6:链接
+   */
+  static readonly TYPE_LINK: string = "6";
+
   /**
   /**
    * 8:图文详情，这里是h5页面
    * 8:图文详情，这里是h5页面
    */
    */

+export class ImageViewerConstants {
+  // 缩放动画的持续时间
+  static readonly ANIMATE_DURATION: number = 300;
+  // swiper中缓存图片的数量
+  static readonly SWIPER_CACHE_COUNT: number = 2;
+}

@@ -12,7 +12,7 @@ export struct ENewspaperListDialog {
   @Consume @Watch('onCurrentPageNumUpdated') currentPageNum: string
   @Consume @Watch('onCurrentPageNumUpdated') currentPageNum: string
   @State pageDialogShow: boolean = false
   @State pageDialogShow: boolean = false
   @State scrollIndex: number = 0
   @State scrollIndex: number = 0
-  newspaperListBean: NewspaperListBean = {} as NewspaperListBean
+  @Prop newspaperListBean: NewspaperListBean = {} as NewspaperListBean
   private listScroller: Scroller = new Scroller();
   private listScroller: Scroller = new Scroller();
   //文字版选择弹框
   //文字版选择弹框
   pageListDialogController: CustomDialogController = new CustomDialogController({
   pageListDialogController: CustomDialogController = new CustomDialogController({
@@ -21,13 +21,14 @@ export struct ENewspaperListDialog {
       newspaperListBean: this.newspaperListBean,
       newspaperListBean: this.newspaperListBean,
     }),
     }),
     alignment: DialogAlignment.TopStart,
     alignment: DialogAlignment.TopStart,
-    offset: { dx: 0, dy: 214 },
+    offset: { dx: 0, dy: 224 },
     customStyle: true,
     customStyle: true,
   })
   })
   //页面半屏弹窗（实现在上个组件）若尝试在CustomDialog中传入多个其他的Controller，
   //页面半屏弹窗（实现在上个组件）若尝试在CustomDialog中传入多个其他的Controller，
   // 以实现在CustomDialog中打开另一个或另一些CustomDialog，
   // 以实现在CustomDialog中打开另一个或另一些CustomDialog，
   // 那么此处需要将指向自己的controller放在所有controller的后面
   // 那么此处需要将指向自己的controller放在所有controller的后面
-  listDialogController: CustomDialogController
+  // listDialogController: CustomDialogController
+  public closeDialog?: () => void
 
 
   //watch监听报纸页码回调
   //watch监听报纸页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
@@ -53,6 +54,7 @@ export struct ENewspaperListDialog {
   }
   }
 
 
   build() {
   build() {
+    Stack() {
       Column() {
       Column() {
         Row()
         Row()
           .width(43)
           .width(43)
@@ -62,6 +64,11 @@ export struct ENewspaperListDialog {
             top: 10,
             top: 10,
             bottom: 10
             bottom: 10
           })
           })
+          .onClick(() => {
+            if (this.closeDialog) {
+              this.closeDialog()
+            }
+          })
         Row() {
         Row() {
           Text(this.currentPageNum)
           Text(this.currentPageNum)
             .fontSize($r('app.float.font_size_36'))
             .fontSize($r('app.float.font_size_36'))
@@ -142,6 +149,7 @@ export struct ENewspaperListDialog {
                           .fontColor($r('app.color.color_999999'))
                           .fontColor($r('app.color.color_999999'))
                           .margin({ top: 15, bottom: 15 })
                           .margin({ top: 15, bottom: 15 })
                           .maxLines(5)
                           .maxLines(5)
+                          .textOverflow({ overflow: TextOverflow.Ellipsis })
                       }
                       }
                     }
                     }
                     .alignItems(HorizontalAlign.Start)
                     .alignItems(HorizontalAlign.Start)
@@ -159,9 +167,9 @@ export struct ENewspaperListDialog {
                         } as Params,
                         } as Params,
                       };
                       };
                       WDRouterRule.jumpWithAction(taskAction)
                       WDRouterRule.jumpWithAction(taskAction)
-                    if (this.listDialogController) {
-                      this.listDialogController.close()
-                    }
+                      // if (this.listDialogController) {
+                      //   this.listDialogController.close()
+                      // }
                     })
                     })
                   }
                   }
 
 
@@ -172,6 +180,9 @@ export struct ENewspaperListDialog {
         }
         }
         .width('100%')
         .width('100%')
         .padding({ left: 15, right: 15 })
         .padding({ left: 15, right: 15 })
+        .margin({
+          bottom: 85
+        })
         .scrollBar(BarState.Off)
         .scrollBar(BarState.Off)
         .divider({
         .divider({
           strokeWidth: 0.5,
           strokeWidth: 0.5,
@@ -191,9 +202,20 @@ export struct ENewspaperListDialog {
           console.info(`onScroll scrollState = ScrollState` + scrollState + `, scrollOffset = ` + scrollOffset)
           console.info(`onScroll scrollState = ScrollState` + scrollState + `, scrollOffset = ` + scrollOffset)
         })
         })
       }
       }
+      .margin({ top: 124 })
       .width('100%')
       .width('100%')
       .backgroundColor(Color.White)
       .backgroundColor(Color.White)
+      .onClick(() => {
 
 
+      })
+    }.width('100%')
+    .height('100%')
+    .backgroundColor('#80000000')
+    .onClick(() => {
+      if (this.closeDialog) {
+        this.closeDialog()
+      }
+    })
   }
   }
 
 
   updateCurrentPageNum(firstIndex: number): void {
   updateCurrentPageNum(firstIndex: number): void {

@@ -40,7 +40,7 @@ export class  EditInfoModel{
   //生日
   //生日
   birthday:string = ''
   birthday:string = ''
   //性别
   //性别
-  sex:number = 0
+  sex:number = 10
   
   
   airec:number = 0
   airec:number = 0
 
 

+import { HashMap } from '@kit.ArkTS';
+import { Logger } from 'wdKit/Index';
+import { HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
+import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
+
+export class LikeModel {
+  executeLike(data: Record<string, string>) {
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+
+    return new Promise<object>((success, fail) => {
+      HttpRequest.post<ResponseDTO<object>>(HttpUrlUtils.executeLike(), data, headers).then((data: ResponseDTO<object>) => {
+        if (data.code != 0) {
+          fail(data.message)
+          return
+        }
+        success(data)
+      }, (error: Error) => {
+        fail(error.message)
+        Logger.debug("LoginViewModel:error ", error.toString())
+      })
+    })
+  }
+}

@@ -60,7 +60,7 @@ class MinePageDatasModel{
       return this.personalData
       return this.personalData
     }
     }
     this.personalData.push(new MinePagePersonalFunctionsItem("评论",$r('app.media.mine_comment_icon')))
     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_collect_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("历史",$r('app.media.mine_history_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("历史",$r('app.media.mine_history_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("消息",$r('app.media.mine_msg_icon')))
     this.personalData.push(new MinePagePersonalFunctionsItem("消息",$r('app.media.mine_msg_icon')))

+@Observed
+export class OffsetModel {
+  public currentX: number;
+  public currentY: number;
+  public lastX: number = 0;
+  public lastY: number = 0;
+
+  constructor(currentX: number = 0, currentY: number = 0) {
+    this.currentX = currentX;
+    this.currentY = currentY;
+  }
+
+  reset(): void {
+    this.currentX = 0;
+    this.currentY = 0;
+    this.lastX = 0;
+    this.lastY = 0;
+  }
+
+  stash(): void {
+    this.lastX = this.currentX;
+    this.lastY = this.currentY;
+  }
+
+  toString(): string {
+    return `[currentX: ${this.currentX} currentY: ${this.currentY} lastX: ${this.lastX} lastY: ${this.lastY}]`;
+  }
+}

+@Observed
+export class ScaleModel {
+  /**
+   * scaleValue: 本次缩放因子，用于控制图片的大小显示
+   * lastValue：记录上次缩放完后的缩放因子
+   * defaultMaxScaleValue：默认的最大放大值
+   * defaultScaleValue：默认缩放值，1
+   */
+  public scaleValue: number;
+  public lastValue: number;
+  public maxScaleValue: number;
+  public extraScaleValue: number;
+  public readonly defaultScaleValue: number = 1;
+
+  constructor(scaleValue: number = 1.0, lastValue: number = 1.0,
+              maxScaleValue: number = 1.5, extraScaleValue: number = 0.2) {
+    this.scaleValue = scaleValue;
+    this.lastValue = lastValue;
+    this.maxScaleValue = maxScaleValue;
+    this.extraScaleValue = extraScaleValue;
+  }
+
+  reset(): void {
+    this.scaleValue = this.defaultScaleValue;
+    this.lastValue = this.scaleValue;
+  }
+
+  stash(): void {
+    this.lastValue = this.scaleValue;
+  }
+
+  toString(): string {
+    return `[scaleValue: ${this.scaleValue} lastValue: ${this.lastValue}]`;
+  }
+}

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

@@ -40,8 +40,9 @@ struct SearchCreatorPage {
           this.hasMore = false
           this.hasMore = false
           this.isLoading = false
           this.isLoading = false
         }else{
         }else{
+          this.data_temp = []
           result.list.forEach((data)=>{
           result.list.forEach((data)=>{
-            this.data_temp.push(new FollowListDetailItem("",data.data.creatorName,"0","",data.data.id,"0",data.data.userId,data.data.userType,data.data.userId))
+            this.data_temp.push(new FollowListDetailItem("",data.data.creatorName,"0","",data.data.id,"0",data.data.userId,data.data.userType,data.data.userId,Number.parseInt(data.data.mainControl),-1))
           })
           })
 
 
           let request = new CreatorDetailRequestItem()
           let request = new CreatorDetailRequestItem()
@@ -69,6 +70,8 @@ struct SearchCreatorPage {
                       data.cnFansNum = item.fansNum + ""
                       data.cnFansNum = item.fansNum + ""
                     }
                     }
                     data.introduction = item.introduction
                     data.introduction = item.introduction
+                    data.mainControl = item.mainControl
+                    data.banControl = item.banControl
                   }
                   }
                 })
                 })
               })
               })
@@ -104,7 +107,7 @@ struct SearchCreatorPage {
       })
       })
 
 
       this.data_temp.forEach((item)=>{
       this.data_temp.forEach((item)=>{
-        this.data.push(new FollowListDetailItem(item.headPhotoUrl,item.cnUserName,item.cnFansNum,item.introduction,item.creatorId,item.status,item.attentionUserId,item.cnUserType,item.cnUserId))
+        this.data.push(new FollowListDetailItem(item.headPhotoUrl,item.cnUserName,item.cnFansNum,item.introduction,item.creatorId,item.status,item.attentionUserId,item.cnUserType,item.cnUserId,item.mainControl,item.banControl))
       })
       })
 
 
       this.data.notifyDataReload()
       this.data.notifyDataReload()

+/**
+ * 给函数的执行加上动画
+ * @param fn：要在动画内执行的回调函数，通常fn里面会改变状态变量
+ * @param duration：动画持续时长
+ * @param curve：动画区线
+ */
+import { ImageViewerConstants } from '../constants/ImageViewerConstants';
+
+export function runWithAnimation(
+  fn: Function,
+  duration: number = ImageViewerConstants.ANIMATE_DURATION,
+  curve: Curve = Curve.Smooth): void {
+  animateTo({ duration: duration, curve: curve }, () => {
+    fn();
+  })
+}

+import { window } from '@kit.ArkUI';
+
+class WindowSizeManager {
+  private size: window.Size = { width: 0, height: 0 };
+
+  constructor() {
+    window.getLastWindow(getContext()).then((value: window.Window) => {
+      const rect: window.Rect = value.getWindowProperties().windowRect;
+      this.size.width = px2vp(rect.width);
+      this.size.height = px2vp(rect.height);
+      console.log(`[windowWidth]${this.size.width} [windowHeight]${this.size.height}`);
+    })
+  }
+
+  get(): window.Size {
+    return this.size;
+  }
+}
+
+export const windowSizeManager: WindowSizeManager = new WindowSizeManager();

@@ -43,6 +43,9 @@ export class ProcessUtils {
       // 图文详情，跳转h5
       // 图文详情，跳转h5
         ProcessUtils.gotoWeb(content);
         ProcessUtils.gotoWeb(content);
         break;
         break;
+      case ContentConstants.TYPE_LINK:
+        ProcessUtils.gotoDefaultWeb(content);
+        break;
     //图集详情页
     //图集详情页
       case ContentConstants.TYPE_NINE:
       case ContentConstants.TYPE_NINE:
         ProcessUtils.gotoAtlasDetailPage(content);
         ProcessUtils.gotoAtlasDetailPage(content);
@@ -53,6 +56,7 @@ export class ProcessUtils {
         break;
         break;
     //动态详情页（动态图文）
     //动态详情页（动态图文）
       case ContentConstants.TYPE_FOURTEEN:
       case ContentConstants.TYPE_FOURTEEN:
+        break;
     //动态详情页（动态视频）
     //动态详情页（动态视频）
       case ContentConstants.TYPE_FIFTEEN:
       case ContentConstants.TYPE_FIFTEEN:
         ProcessUtils.gotoDynamicDetailPage(content);
         ProcessUtils.gotoDynamicDetailPage(content);
@@ -113,6 +117,17 @@ export class ProcessUtils {
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
   }
   }
 
 
+  private static gotoDefaultWeb(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_H5_BY_WEB_VIEW',
+      params: {
+        url: content.linkUrl,
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoWeb, ${content.objectId}`);
+  }
+
   private static gotoWeb(content: ContentDTO) {
   private static gotoWeb(content: ContentDTO) {
     //  // topicId
     //  // topicId
     // content.channelId;
     // content.channelId;

@@ -34,7 +34,7 @@ export class RefreshConstants {
   /**
   /**
    * The refresh and load height.
    * The refresh and load height.
    */
    */
-  static readonly CUSTOM_LAYOUT_HEIGHT: number = 70;
+  static readonly CUSTOM_LAYOUT_HEIGHT: number = 90;
   /**
   /**
    * Full the width.
    * Full the width.
    */
    */

@@ -44,7 +44,7 @@ class EditInfoViewModel {
     new EditListInfo('简介',item&&item.userExtend.introduction?item.userExtend.introduction:'待完善'),
     new EditListInfo('简介',item&&item.userExtend.introduction?item.userExtend.introduction:'待完善'),
     new EditListInfo('地区',item&&item.userExtend.address?item.userExtend.address:'待完善'),
     new EditListInfo('地区',item&&item.userExtend.address?item.userExtend.address:'待完善'),
     new EditListInfo('生日',item&&item.userExtend.birthday?item.userExtend.birthday:'待完善'),
     new EditListInfo('生日',item&&item.userExtend.birthday?item.userExtend.birthday:'待完善'),
-    new EditListInfo('性别',item?(item.userExtend.sex === 1?'男':'女'):'待完善'),]
+    new EditListInfo('性别',item?(item.userExtend.sex === 10?'待完善':(item.userExtend.sex === 1?'男':'女')):'待完善'),]
     return this.editListData
     return this.editListData
   }
   }
 
 
@@ -129,6 +129,7 @@ class EditInfoViewModel {
         .then((navResDTO: ResponseDTO) => {
         .then((navResDTO: ResponseDTO) => {
           if (navResDTO.code == 0) {
           if (navResDTO.code == 0) {
             promptAction.showToast({ message: '修改成功' })
             promptAction.showToast({ message: '修改成功' })
+            success(navResDTO)
           }else {
           }else {
             promptAction.showToast({ message: navResDTO.message })
             promptAction.showToast({ message: navResDTO.message })
           }
           }

@@ -71,16 +71,20 @@ export class FollowListDetailItem{
 
 
   cnUserType:string = ""
   cnUserType:string = ""
   cnUserId:string = ""
   cnUserId:string = ""
+  mainControl:number = 0
 
 
+  cnMainControl:number = 0
   attentionCreatorId:string = ""
   attentionCreatorId:string = ""
   attentionUserType:string = ""
   attentionUserType:string = ""
 
 
   attentionHeadPhotoUrl:string = ""
   attentionHeadPhotoUrl:string = ""
   attentionUserName:string = ""
   attentionUserName:string = ""
   fansNum :number = 0
   fansNum :number = 0
+  banControl:number = -1
 
 
 
 
-  constructor(headPhotoUrl:string,cnUserName:string,cnFansNum:string,introduction:string,creatorId:string,status:string,attentionUserId:string,cnUserType:string,cnUserId:string) {
+
+  constructor(headPhotoUrl:string,cnUserName:string,cnFansNum:string,introduction:string,creatorId:string,status:string,attentionUserId:string,cnUserType:string,cnUserId:string,mainControl:number,banControl:number) {
     this.headPhotoUrl = headPhotoUrl
     this.headPhotoUrl = headPhotoUrl
     this.cnUserName = cnUserName
     this.cnUserName = cnUserName
     this.cnFansNum = cnFansNum
     this.cnFansNum = cnFansNum
@@ -90,5 +94,7 @@ export class FollowListDetailItem{
     this.attentionUserId = attentionUserId
     this.attentionUserId = attentionUserId
     this.cnUserType = cnUserType
     this.cnUserType = cnUserType
     this.cnUserId = cnUserId
     this.cnUserId = cnUserId
+    this.mainControl = mainControl
+    this.banControl = banControl
   }
   }
 }
 }

+import { LikeModel } from '../model/LikeModel'
+
+/**
+ * 点赞*/
+export class LikeViewModel {
+  likeModel: LikeModel
+
+  constructor() {
+    this.likeModel = new LikeModel();
+  }
+
+  executeLike(contentId: string, userName: string, contentType: string, title: string, userHeaderUrl: string, channelId: string, status: string) {
+    let bean: Record<string, string> = {}
+    bean['contentId'] = contentId
+    bean['userName'] = userName
+    bean['contentType'] = contentType
+    bean['title'] = title
+    bean['userHeaderUrl'] = userHeaderUrl
+    bean['channelId'] = channelId
+    bean['status'] = status
+    this.likeModel.executeLike(bean)
+  }
+
+  executeLike2(bean: Record<string, string>) {
+
+    return new Promise<object>((success, fail) => {
+      this.likeModel.executeLike(bean).then((data) => {
+        success(data)
+      }).catch((error: string) => {
+        fail(error)
+      })
+    })
+
+  }
+}

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

@@ -31,6 +31,22 @@
     {
     {
       "name": "refresh_fail_text",
       "name": "refresh_fail_text",
       "value": "刷新失败"
       "value": "刷新失败"
+    },
+    {
+      "name": "image_request_success",
+      "value": "图片下载到图库成功"
+    },
+    {
+      "name": "image_request_fail",
+      "value": "图片加载失败，请检查网络"
+    },
+    {
+      "name": "EntryAbility_desc",
+      "value": "$string:app_desc"
+    },
+    {
+      "name": "reason_read_write_media",
+      "value": "user_grant"
     }
     }
   ]
   ]
 }
 }

@@ -6,6 +6,7 @@
     "pages/MineHomePage",
     "pages/MineHomePage",
     "components/page/SettingPage",
     "components/page/SettingPage",
     "components/page/SettingAboutPage",
     "components/page/SettingAboutPage",
+    "components/page/QualityCommentsPage",
     "components/page/PrivacySettingPage",
     "components/page/PrivacySettingPage",
     "components/page/EditUserInfoPage",
     "components/page/EditUserInfoPage",
     "components/page/EditUserNikeNamePage",
     "components/page/EditUserNikeNamePage",

-import { TabComponent } from '../widgets/details/TabComponent';
-import { TopPlayComponent } from '../widgets/details/video/TopPlayComponet';
-
-
-@Component
-export struct DetailPlayHLivePage {
-  aboutToAppear(): void {
-
-  }
-
-  build() {
-    Column() {
-      TopPlayComponent()
-      TabComponent()
-    }
-    .height('100%')
-    .width('100%')
-  }
-
-  onPageShow(): void {
-
-  }
-
-  aboutToDisappear(): void {
-
-  }
-}

@@ -5,6 +5,7 @@ import { WindowModel } from 'wdKit/Index';
 import { PlayerComponent } from '../widgets/vertical/PlayerComponent';
 import { PlayerComponent } from '../widgets/vertical/PlayerComponent';
 import { PlayerInfoComponent } from '../widgets/vertical/PlayerInfoComponent';
 import { PlayerInfoComponent } from '../widgets/vertical/PlayerInfoComponent';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { WDPlayerController } from 'wdPlayer/Index';
+import { DisplayDirection } from 'wdConstant/Index';
 
 
 const storage = LocalStorage.getShared();
 const storage = LocalStorage.getShared();
 
 
@@ -19,7 +20,9 @@ export struct DetailPlayVLivePage {
   @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @Provide liveDetailsBean: LiveDetailsBean = {} as LiveDetailsBean
   @Provide liveDetailsBean: LiveDetailsBean = {} as LiveDetailsBean
   @Provide liveRoomDataBean: LiveRoomDataBean = {} as LiveRoomDataBean
   @Provide liveRoomDataBean: LiveRoomDataBean = {} as LiveRoomDataBean
-  @Provide isMenuVisible: boolean = false
+  @Provide isShowControl: boolean = false
+  @Provide liveState: string = ''
+  @Provide displayDirection: DisplayDirection = DisplayDirection.VERTICAL //横竖屏,默认竖屏
   @State relId: string = ''
   @State relId: string = ''
   @State contentId: string = ''
   @State contentId: string = ''
   @State relType: string = ''
   @State relType: string = ''
@@ -42,7 +45,6 @@ export struct DetailPlayVLivePage {
   aboutToDisappear(): void {
   aboutToDisappear(): void {
     WindowModel.shared.setWindowLayoutFullScreen(false)
     WindowModel.shared.setWindowLayoutFullScreen(false)
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
-
   }
   }
 
 
   build() {
   build() {
@@ -51,9 +53,6 @@ export struct DetailPlayVLivePage {
         PlayerComponent({
         PlayerComponent({
           playerController: this.playerController
           playerController: this.playerController
         })
         })
-          .onClick(() => {
-            this.isMenuVisible = !this.isMenuVisible
-          })
 
 
         PlayerInfoComponent({
         PlayerInfoComponent({
           playerController: this.playerController,
           playerController: this.playerController,
@@ -63,9 +62,11 @@ export struct DetailPlayVLivePage {
 
 
         Image($r('app.media.icon_live_more'))
         Image($r('app.media.icon_live_more'))
           .width(40)
           .width(40)
-          .aspectRatio(1)// .visibility(this.swiperIndex === 0 ? Visibility.Visible : Visibility.Hidden)
+          .aspectRatio(1)
+          .visibility(this.swiperIndex === 0 ? Visibility.Visible : Visibility.Hidden)
           .animation({ duration: 500 })
           .animation({ duration: 500 })
-          .position({ x: '95%', y: '95%' })
+          .position({ x: '100%', y: '100%' })
+          .markAnchor({ x: 56, y: 56 })
           .onClick(() => {
           .onClick(() => {
             this.swiperController.showNext()
             this.swiperController.showNext()
           })
           })
@@ -78,16 +79,13 @@ export struct DetailPlayVLivePage {
     .width('100%')
     .width('100%')
   }
   }
 
 
-  onPageShow(): void {
-
-  }
-
   getLiveDetails() {
   getLiveDetails() {
     this.liveViewModel.getLiveDetails(this.contentId, this.relId, this.relType)
     this.liveViewModel.getLiveDetails(this.contentId, this.relId, this.relType)
       .then(
       .then(
         (data) => {
         (data) => {
           if (data.length > 0) {
           if (data.length > 0) {
             this.liveDetailsBean = data[0]
             this.liveDetailsBean = data[0]
+            this.liveState = this.liveDetailsBean.liveInfo?.liveState
             console.error('liveDetailsBean===', JSON.stringify((this.liveDetailsBean)))
             console.error('liveDetailsBean===', JSON.stringify((this.liveDetailsBean)))
           }
           }
         },
         },

 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
-import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI } from 'wdComponent/Index'
+import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI,WDViewDefaultType } from 'wdComponent/Index'
 import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
 import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
 import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
 import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
 import RefreshLayout from 'wdComponent/src/main/ets/components/page/RefreshLayout'
 import RefreshLayout from 'wdComponent/src/main/ets/components/page/RefreshLayout'
@@ -79,7 +79,7 @@ export struct TabChatComponent {
   getLiveChatList() {
   getLiveChatList() {
     this.pageModel.currentPage = 1
     this.pageModel.currentPage = 1
     this.liveViewModel.getLiveChatList(
     this.liveViewModel.getLiveChatList(
-      1,
+      this.pageModel.currentPage,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.newsId,
       this.liveDetailsBean?.newsId,
       20,)
       20,)

 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
-import { ListHasNoMoreDataUI } from 'wdComponent/Index'
+import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI } from 'wdComponent/Index'
 import { StringUtils } from 'wdKit/Index'
 import { StringUtils } from 'wdKit/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { TabLiveItemComponent } from './TabLiveItemComponent'
 import { TabLiveItemComponent } from './TabLiveItemComponent'
+import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
+import { RefreshLayoutBean } from 'wdComponent/src/main/ets/components/page/RefreshLayoutBean'
+import PageModel from 'wdComponent/src/main/ets/viewmodel/PageModel'
+import { ViewType } from 'wdConstant/Index'
+import LoadMoreLayout from 'wdComponent/src/main/ets/components/page/LoadMoreLayout'
+import RefreshLayout from 'wdComponent/src/main/ets/components/page/RefreshLayout'
 
 
 @Component
 @Component
 export struct TabLiveComponent {
 export struct TabLiveComponent {
   liveViewModel: LiveViewModel = new LiveViewModel()
   liveViewModel: LiveViewModel = new LiveViewModel()
   @State liveList: Array<LiveRoomItemBean> = []
   @State liveList: Array<LiveRoomItemBean> = []
   @Consume @Watch('updateDate') liveDetailsBean: LiveDetailsBean
   @Consume @Watch('updateDate') liveDetailsBean: LiveDetailsBean
+  @State private pageModel: PageModel = new PageModel()
 
 
   updateDate() {
   updateDate() {
     this.getLiveList()
     this.getLiveList()
@@ -20,36 +27,70 @@ export struct TabLiveComponent {
 
 
   build() {
   build() {
     Stack() {
     Stack() {
-      if (this.liveList.length == 0) {
-        ListHasNoMoreDataUI({ style: 2 })
+      if (this.pageModel.viewType == ViewType.LOADING) {
+        this.LoadingLayout()
+      } else if (this.pageModel.viewType == ViewType.ERROR) {
+        ErrorComponent()
+      } else if (this.pageModel.viewType == ViewType.EMPTY) {
+        EmptyComponent()
       } else {
       } else {
+        this.ListLayout()
+      }
+    }
+    .alignContent(Alignment.Top)
+    .backgroundColor('#F5F5F5')
+    .height('100%')
+    .width('100%')
+  }
+
+  @Builder
+  ListLayout() {
     List() {
     List() {
+      ListItem() {
+        // 下拉刷新
+        RefreshLayout({
+          refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullDown, this.pageModel.pullDownRefreshImage,
+            this.pageModel.pullDownRefreshText, this.pageModel.pullDownRefreshHeight)
+        })
+      }
+
       ForEach(this.liveList, (item: LiveRoomItemBean) => {
       ForEach(this.liveList, (item: LiveRoomItemBean) => {
         ListItem() {
         ListItem() {
           TabLiveItemComponent({ item: item })
           TabLiveItemComponent({ item: item })
         }
         }
       })
       })
+      // 加载更多
       ListItem() {
       ListItem() {
+        if (this.pageModel.hasMore) {
+          LoadMoreLayout({
+            refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
+              this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
+          })
+        } else {
           ListHasNoMoreDataUI()
           ListHasNoMoreDataUI()
         }
         }
       }
       }
     }
     }
   }
   }
-    .alignContent(Alignment.Top)
-    .backgroundColor('#F5F5F5')
-    .height('100%')
-    .width('100%')
 
 
+  @Builder
+  LoadingLayout() {
+    CustomRefreshLoadLayout({
+      refreshBean: new RefreshLayoutBean(true,
+        $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.pageModel.pullDownRefreshHeight)
+    })
   }
   }
 
 
   getLiveList() {
   getLiveList() {
+    this.pageModel.currentPage = 1
     this.liveViewModel.getLiveList(
     this.liveViewModel.getLiveList(
-      1,
+      this.pageModel.currentPage,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
       this.liveDetailsBean?.newsId,
       this.liveDetailsBean?.newsId,
       20)
       20)
       .then(
       .then(
         (data) => {
         (data) => {
+          if (data.barrageResponses && data.barrageResponses.length > 0) {
             /**
             /**
              * 在直播聊天添加一条新内容逻辑：
              * 在直播聊天添加一条新内容逻辑：
              判断 oldNewsId：迁移id非空 且 直播状态不是预约："wait"
              判断 oldNewsId：迁移id非空 且 直播状态不是预约："wait"
@@ -58,13 +99,26 @@ export struct TabLiveComponent {
              2.名称固定：人民日报主持人
              2.名称固定：人民日报主持人
              3.内容：详情接口的简介，newIntroduction
              3.内容：详情接口的简介，newIntroduction
              */
              */
-          if (StringUtils.isNotEmpty(this.liveDetailsBean.oldNewsId) && this.liveDetailsBean && this.liveDetailsBean.liveInfo.liveState != 'wait') {
+            if (StringUtils.isNotEmpty(this.liveDetailsBean.oldNewsId)
+              && this.liveDetailsBean
+              && this.liveDetailsBean.liveInfo.liveState != 'wait'
+              && this.pageModel.currentPage == 1) {
               let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean
               let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean
               liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction
               liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction
               liveRoomItemBeanTemp.senderUserName = '人民日报主持人'
               liveRoomItemBeanTemp.senderUserName = '人民日报主持人'
               data.barrageResponses.push(liveRoomItemBeanTemp)
               data.barrageResponses.push(liveRoomItemBeanTemp)
             }
             }
-          this.liveList = data.barrageResponses
+            this.pageModel.viewType = ViewType.LOADED;
+            this.liveList.push(...data.barrageResponses)
+            if (data.barrageResponses.length === this.pageModel.pageSize) {
+              this.pageModel.currentPage++;
+              this.pageModel.hasMore = true;
+            } else {
+              this.pageModel.hasMore = false;
+            }
+          } else {
+            this.pageModel.viewType = ViewType.EMPTY;
+          }
         },
         },
         () => {
         () => {
 
 

-import { LiveRoomItemBean } from 'wdBean/Index'
+import { LiveRoomItemBean, PhotoListBean } from 'wdBean/Index'
 import { DateTimeUtils, StringUtils } from 'wdKit/Index'
 import { DateTimeUtils, StringUtils } from 'wdKit/Index'
 
 
 @Component
 @Component
 export struct TabLiveItemComponent {
 export struct TabLiveItemComponent {
   item: LiveRoomItemBean = {} as LiveRoomItemBean
   item: LiveRoomItemBean = {} as LiveRoomItemBean
+  photoList: PhotoListBean[] = []
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
@@ -86,8 +87,17 @@ export struct TabLiveItemComponent {
               .aspectRatio(310 / 174)
               .aspectRatio(310 / 174)
               .objectFit(ImageFit.Auto)
               .objectFit(ImageFit.Auto)
               .borderRadius(4)
               .borderRadius(4)
+          }.onClick(() => {
+            for (let item of this.item.pictureUrls) {
+              this.photoList.push({
+                width: 0,
+                height: 0,
+                picPath: item,
+                picDesc: ''
+              })
             }
             }
           })
           })
+        })
       }.margin({
       }.margin({
         left: 32,
         left: 32,
         top: 8
         top: 8

@@ -200,6 +200,8 @@ export struct PlayUIComponent {
       } else {
       } else {
         Blank()
         Blank()
       }
       }
+      if (this.liveDetailsBean?.liveInfo?.liveState == 'running'
+        || this.liveDetailsBean?.liveInfo?.liveState == 'end') {
         Image($r('app.media.icon_live_player_full_screen'))
         Image($r('app.media.icon_live_player_full_screen'))
           .width(24)
           .width(24)
           .height(24)
           .height(24)
@@ -213,6 +215,7 @@ export struct PlayUIComponent {
             window.Orientation.LANDSCAPE);
             window.Orientation.LANDSCAPE);
           })
           })
       }
       }
+    }
     .alignItems(VerticalAlign.Center)
     .alignItems(VerticalAlign.Center)
     .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] })
     .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] })
     .width('100%')
     .width('100%')

-import { window } from '@kit.ArkUI'
-import { NumberFormatterUtils, WindowModel } from 'wdKit/Index'
-
-import { devicePLSensorManager } from 'wdDetailPlayApi/Index'
-import { DateFormatUtil, WDPlayerController } from 'wdPlayer/Index'
-import { LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index'
-
-@Entry
-@Component
-export struct PlayVUIComponent {
-  playerController: WDPlayerController = new WDPlayerController();
-  //菜单键是否可见
-  @State isMenuVisible: boolean = true
-  @State isFullScreen: boolean = false
-  @Consume liveDetailsBean: LiveDetailsBean
-  @Consume liveRoomDataBean: LiveRoomDataBean
-  @State currentTime: string = ''
-  @State totalTime: string = ''
-  @State progressVal: number = 0;
-  //是否处于播放状态中
-  @State isPlayStatus: boolean = true
-
-  aboutToAppear(): void {
-    //播放进度监听
-    this.playerController.onTimeUpdate = (position: number, duration: number) => {
-      this.currentTime = DateFormatUtil.secondToTime(Math.floor(position / 1000));
-      this.totalTime = DateFormatUtil.secondToTime(Math.floor(duration / 1000));
-      this.progressVal = Math.floor(position * 100 / duration);
-    }
-  }
-
-  build() {
-    Column() {
-      this.getTopUIComponent()
-      this.getMiddleUIComponent()
-      this.getBottomUIComponent()
-    }
-    .width('100%')
-    .height('100%')
-    .alignItems(HorizontalAlign.Start)
-  }
-
-  @Builder
-  getTopUIComponent() {
-    Column() {
-      Row() {
-        Image($r('app.media.icon_arrow_left_white'))
-          .width(24)
-          .aspectRatio(1)
-          .visibility(Visibility.None)
-          .margin({
-            right: 10
-          })
-        if (this.liveDetailsBean.liveInfo?.liveState != 'wait') {
-          Text(this.liveDetailsBean.newsTitle)
-            .maxLines(1)
-            .textOverflow({ overflow: TextOverflow.Ellipsis })
-            .fontSize('16fp')
-            .fontWeight(500)
-            .fontColor(Color.White)
-            .textAlign(TextAlign.Start)
-            .layoutWeight(1)
-        } else {
-          Blank()
-        }
-        Image($r('app.media.icon_share'))
-          .width(24)
-          .aspectRatio(1)
-          .visibility(Visibility.None)
-      }
-      .width('100%')
-      .alignItems(VerticalAlign.Center)
-      .margin({
-        bottom: 10
-      })
-
-      this.getLiveStatusView()
-    }.width('100%')
-    .padding({
-      top: 20,
-      bottom: 6,
-      left: 10,
-      right: 10
-    })
-    .alignItems(HorizontalAlign.Start)
-    .visibility(this.isMenuVisible ? Visibility.Visible : Visibility.None)
-  }
-
-  @Builder
-  getLiveStatusView() {
-    // 直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
-    // 预约
-    if (this.liveDetailsBean.liveInfo?.liveState == 'wait') {
-      Row() {
-        Image($r('app.media.icon_live_status_wait'))
-          .width(22)
-          .height(18)
-        Text('预约')
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-      }
-      .backgroundColor('#4D000000')
-      .padding({
-        top: 1,
-        right: 4,
-        bottom: 1
-      })
-    }
-    // 直播中
-    else if (this.liveDetailsBean.liveInfo?.liveState == 'running') {
-      Row() {
-        Image($r('app.media.icon_live_status_running'))
-          .width(22)
-          .height(18)
-        Text('直播中')
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-        Image($r('app.media.icon_live_player_status_end'))
-          .width(12)
-          .height(12)
-        Text(`${NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean.pv)}人参与`)
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-      }
-      .backgroundColor('#4D000000')
-      .padding({
-        top: 1,
-        right: 4,
-        bottom: 1
-      })
-    }
-    //回看
-    else if (this.liveDetailsBean.liveInfo?.liveState == 'end') {
-      Row() {
-        Text('回看')
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-        Image($r('app.media.icon_live_player_status_end'))
-          .width(12)
-          .height(12)
-        Text(`${NumberFormatterUtils.formatNumberWithWan(this.liveRoomDataBean.pv)}人参与`)
-          .fontSize('11fp')
-          .fontWeight(400)
-          .fontColor(Color.White)
-      }
-      .backgroundColor('#4D000000')
-      .padding({
-        left: 4,
-        top: 1,
-        right: 4,
-        bottom: 1
-      })
-    }
-  }
-
-  @Builder
-  getMiddleUIComponent() {
-    Stack()
-      .layoutWeight(1)
-      .width('100%')
-      .onClick(() => {
-        this.isMenuVisible = !this.isMenuVisible
-      })
-  }
-
-  @Builder
-  getBottomUIComponent() {
-    Row() {
-      if (this.liveDetailsBean?.liveInfo?.liveState == 'end') {
-        this.playOrPauseBtn()
-        Text(this.currentTime)
-          .fontColor(Color.White)
-          .fontWeight(600)
-          .fontSize('12fp')
-          .margin({
-            left: 16
-          })
-
-        this.playProgressView()
-
-        Text(this.totalTime)
-          .fontColor(Color.White)
-          .fontWeight(600)
-          .fontSize('12fp')
-          .margin({
-            right: 16
-          })
-      } else {
-        Blank()
-      }
-      Image($r('app.media.icon_live_player_full_screen'))
-        .width(24)
-        .height(24)
-        .onClick(() => {
-          this.isFullScreen = !this.isFullScreen
-          WindowModel.shared.setPreferredOrientation(this.isFullScreen ? window.Orientation.LANDSCAPE : window.Orientation.PORTRAIT);
-          devicePLSensorManager.devicePLSensorOn(this.isFullScreen ? window.Orientation.LANDSCAPE : window.Orientation.PORTRAIT);
-        })
-    }
-    .alignItems(VerticalAlign.Center)
-    .linearGradient({ angle: 0, colors: [['#99000000', 0], ['#00000000', 1]] })
-    .width('100%')
-    .padding({
-      left: 10,
-      right: 10,
-      top: 15,
-      bottom: 15
-    })
-    .visibility(this.isMenuVisible ? Visibility.Visible : Visibility.None)
-  }
-
-  @Builder
-  playOrPauseBtn() {
-    //暂停、播放
-    Image(this.isPlayStatus ? $r('app.media.icon_live_player_pause') : $r('app.media.player_play_ic'))
-      .width(24)
-      .height(24)
-      .onClick(() => {
-        if (this.isPlayStatus) {
-          this.isPlayStatus = false
-          this.playerController.pause()
-        } else {
-          this.isPlayStatus = true
-          this.playerController.play()
-        }
-      })
-  }
-
-  @Builder
-  playProgressView() {
-    Slider({
-      value: this.progressVal,
-      step: 1,
-      style: SliderStyle.OutSet
-    })
-      .blockSize({
-        width: 18,
-        height: 12
-      })// .blockStyle({
-        //   type: SliderBlockType.IMAGE,
-        //   image: $r('app.media.ic_player_block')
-        // })
-      .blockColor(Color.White)
-      .trackColor('#4DFFFFFF')
-      .selectedColor('#FFED2800')
-      .height(14)
-      .trackThickness(1)
-      .layoutWeight(1)
-      .margin({
-        left: 8,
-        right: 8
-      })
-      .onChange((value: number, mode: SliderChangeMode) => {
-        this.playerController?.setSeekTime(value, mode);
-      })
-  }
-}

-import { LiveDetailsBean } from 'wdBean/Index';
-import { WDPlayerController, WDPlayerRenderView } from 'wdPlayer/Index';
-import { PlayUIComponent } from './PlayUIComponent';
-
-@Component
-export struct TopPlayVComponent {
-  @Consume @Watch('updateData') liveDetailsBean: LiveDetailsBean
-  playerController: WDPlayerController = new WDPlayerController();
-
-  aboutToAppear(): void {
-    this.playerController.onCanplay = () => {
-      this.playerController.play()
-    }
-  }
-
-  updateData() {
-    //直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
-    if (this.liveDetailsBean.liveInfo && this.liveDetailsBean.liveInfo.vlive.length > 0) {
-      let playUrl = ''
-      if (this.liveDetailsBean.liveInfo.liveState == 'running') {
-        playUrl = this.liveDetailsBean.liveInfo.vlive[0].liveUrl
-      } else if (this.liveDetailsBean.liveInfo.liveState == 'end') {
-        playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
-      }
-      this.playerController.firstPlay(playUrl);
-    }
-  }
-
-  build() {
-    Stack() {
-      // https://developer.huawei.com/consumer/cn/doc/harmonyos-references/ts-universal-attributes-image-effect-0000001862607345
-      Image(this.liveDetailsBean.fullColumnImgUrls[0].url)
-        .height('100%')
-        .width('100%')
-        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
-        .blur(100)
-
-      WDPlayerRenderView({
-        playerController: this.playerController,
-        onLoad: async () => {
-        }
-      })// .height('100%')
-        .width('100%')// 扩展至所有非安全区域
-        .onClick(() => {
-          this.playerController.play()
-        })
-      // PlayUIComponent({ playerController: this.playerController })
-    }
-    // .height('100%')
-    .width('100%')
-    // 扩展至所有非安全区域
-    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
-  }
-
-  aboutToDisappear(): void {
-    this.playerController.pause()
-  }
-}

+import { LiveDetailsBean } from 'wdBean/Index'
+
+@Component
+export struct ChartItemCompereComponent {
+  @Consume liveDetailsBean: LiveDetailsBean
+
+  aboutToAppear(): void {
+  }
+
+  build() {
+    ListItem() {
+      Column() {
+        Row() {
+          Image($r('app.media.icon_live_status_running'))
+            .borderRadius(10)
+            .width(20)
+            .height(20)
+            .margin({ right: 8 })
+
+          Text('人民日报')
+            .fontSize(14)
+            .fontColor('#FFFFFFFF')
+            .margin({ right: 8 })
+
+          Text(' 主持人 ')
+            .fontSize(11)
+            .backgroundColor('808562')
+            .fontColor('#FFFFFFFF')
+            .padding({ top: 2, bottom: 2, left: 4, right: 4 })
+            .borderRadius(4)
+        }.margin({ bottom: 8 })
+
+        Text(this.liveDetailsBean.newIntroduction).lineHeight(22)
+      }
+      .backgroundColor('#4D000000')
+      .borderRadius(3)
+      .padding({
+        top: 6,
+        bottom: 6,
+        left: 8,
+        right: 8
+      })
+      .margin({ left: 16, bottom: 4 })
+    }
+
+  }
+}

+import { LiveRoomItemBean } from 'wdBean/Index'
+
+@Component
+export struct ChatItemComponent {
+  item: LiveRoomItemBean = {} as LiveRoomItemBean
+
+  aboutToAppear(): void {
+  }
+
+  build() {
+    Row() {
+      Text() {
+        if (this.item.senderUserName) {
+          Span(' 主持人 ')
+            .fontSize(11)
+            .lineHeight(20)
+            .textBackgroundStyle({ color: '#808562', radius: 2 })
+          Span(' ')
+        }
+        Span(this.item.senderUserName + ': ')
+          .fontColor('#FFFFC63F')
+          .padding({ right: 118 })
+        //
+
+        Span(this.item.text)
+      }
+      .fontSize(14)
+      .fontColor('#FFFFFFFF')
+      .lineHeight(22)
+      .textShadow({ offsetX: 1, offsetY: 1, color: '#4D000000', radius: 1 })
+
+    }
+    .backgroundColor('#4D000000')
+    .borderRadius(3)
+    .padding({
+      top: 6,
+      bottom: 6,
+      left: 8,
+      right: 8
+    })
+    .margin({ left: 16, bottom: 4 })
+  }
+}

+import { LiveDetailsBean, LiveRoomDataBean, LiveRoomItemBean } from 'wdBean/Index'
+import { LiveCommentComponent } from 'wdComponent/Index'
+import PageModel from 'wdComponent/src/main/ets/viewmodel/PageModel'
+import { DisplayDirection, ViewType } from 'wdConstant/Index'
+import { LiveViewModel } from '../../viewModel/LiveViewModel'
+import { ChartItemCompereComponent } from './ChartItemCompereComponent'
+import { ChatItemComponent } from './ChartItemComponent'
+
+
 @Component
 @Component
 export struct PlayerCommentComponent {
 export struct PlayerCommentComponent {
+  liveViewModel: LiveViewModel = new LiveViewModel()
+  @Consume @Watch('liveDetailsBeanChange') liveDetailsBean: LiveDetailsBean
+  @Consume liveRoomDataBean: LiveRoomDataBean
+  @Consume displayDirection: DisplayDirection
+  @State private pageModel: PageModel = new PageModel()
+  @State liveChatList: Array<LiveRoomItemBean> = []
+
+  aboutToAppear(): void {
+    this.getLiveChatList()
+  }
+
+  liveDetailsBeanChange() {
+    this.getLiveChatList()
+  }
+
+  getLiveChatList() {
+    this.pageModel.currentPage = 1
+    this.liveViewModel.getLiveChatList(
+      1,
+      this.liveDetailsBean?.liveInfo?.mlive?.mliveId,
+      this.liveDetailsBean?.newsId,
+      20,)
+      .then(
+        (data) => {
+          if (data.barrageResponses && data.barrageResponses.length > 0) {
+
+            this.pageModel.viewType = ViewType.LOADED;
+            this.liveChatList.push(...data.barrageResponses)
+            console.log('liveChatList===', this.liveChatList)
+            if (data.barrageResponses.length === this.pageModel.pageSize) {
+              this.pageModel.currentPage++;
+              this.pageModel.hasMore = true;
+            } else {
+              this.pageModel.hasMore = false;
+            }
+          } else {
+            this.pageModel.viewType = ViewType.EMPTY;
+          }
+        },
+        () => {
+
+        })
+  }
+
   build() {
   build() {
+    Column() {
+      List() {
+        // 主持人
+        if (this.liveDetailsBean.oldNewsId) {
+          ChartItemCompereComponent()
+        }
+        ForEach(this.liveChatList, (item: LiveRoomItemBean) => {
+          ListItem() {
+            ChatItemComponent({ item: item })
+          }
+        })
+      }
+      .height(280)
+      .width('80%')
+      .scrollBar(BarState.Off)
+      .margin({ bottom: 20 })
+
+      LiveCommentComponent({ heartNum: this.liveRoomDataBean.likeNum })
+        .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
+        .backgroundColor(Color.Transparent)
+    }.alignItems(HorizontalAlign.Start)
+
   }
   }
 }
 }

@@ -13,6 +13,7 @@ export struct PlayerComponent {
   @State imgUrl: string = ''
   @State imgUrl: string = ''
   @State isWait: boolean = false
   @State isWait: boolean = false
   @State liveStreamType: number | null = -1
   @State liveStreamType: number | null = -1
+  @State playUrl: string = ''
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     if (this.playerController) {
     if (this.playerController) {
@@ -48,8 +49,10 @@ export struct PlayerComponent {
         playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
         playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
         liveStreamType = this.liveDetailsBean.liveInfo.vlive[0].liveStreamType
         liveStreamType = this.liveDetailsBean.liveInfo.vlive[0].liveStreamType
       }
       }
+
       this.liveStreamType = liveStreamType
       this.liveStreamType = liveStreamType
-      this.playerController?.firstPlay(playUrl);
+      this.playUrl = playUrl
+
     }
     }
   }
   }
 
 
@@ -60,12 +63,14 @@ export struct PlayerComponent {
           .height('100%')
           .height('100%')
           .width('100%')
           .width('100%')
           .blur(100)
           .blur(100)
+          .renderFit(RenderFit.RESIZE_COVER)
 
 
         // TODO:判断横竖屏，liveStreamType=1竖屏铺满屏幕，liveStreamType=0横屏正常展示
         // TODO:判断横竖屏，liveStreamType=1竖屏铺满屏幕，liveStreamType=0横屏正常展示
         if (this.liveStreamType == null) {
         if (this.liveStreamType == null) {
           WDPlayerRenderVLiveView({
           WDPlayerRenderVLiveView({
             playerController: this.playerController,
             playerController: this.playerController,
             onLoad: () => {
             onLoad: () => {
+              this.playerController?.firstPlay(this.playUrl);
             }
             }
           }).height('100%')
           }).height('100%')
             .width('100%')
             .width('100%')
@@ -73,8 +78,9 @@ export struct PlayerComponent {
           WDPlayerRenderView({
           WDPlayerRenderView({
             playerController: this.playerController,
             playerController: this.playerController,
             onLoad: () => {
             onLoad: () => {
+              this.playerController?.firstPlay(this.playUrl);
             }
             }
-          }).padding({ top: 195 })
+          }).margin({ top: 195 }).height(211)
         }
         }
       }
       }
       .height('100%')
       .height('100%')