Merge remote-tracking branch 'origin/main'

 import { Action } from './Action';
 
+interface IImgItem {
+  pic: string
+  width: number
+  height: number
+}
+
+export interface IImgListData {
+  imgIndex: number
+  imgArr: IImgItem[]
+}
+
 interface dataObject {
   // dataSource:
   // 1、图文详情数据
@@ -13,7 +24,7 @@ interface dataObject {
   // 9、活动投稿 视频跳转
   // 10、活动投稿 动态跳转
   // 11、活动投稿 图集跳转
-  dataSource: number
+  dataSource: string
   operateType?: string
   webViewHeight?: string
   dataJson?: string
@@ -27,6 +38,7 @@ interface dataObject {
   positionLeft?: string
   positionTop?: string
   videoLandscape?: string
+  imgListData?: string
 }
 
 /**

@@ -124,4 +124,6 @@ export class WDRouterPage {
   static themeListPage = new WDRouterPage("wdComponent", "ets/components/page/ThemeListPage");
   // 栏目页面、频道详情
   static columnPage = new WDRouterPage("phone", "ets/pages/column/ColumnPage");
+  //展示头像
+  static showUserHeaderPage = new WDRouterPage("wdComponent", "ets/pages/ShowUserHeaderPage");
 }

 import HashMap from '@ohos.util.HashMap';
 import { Callback } from 'wdJsBridge';
-import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
+import { Message, IImgListData } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Logger } from 'wdKit';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5OperateType } from './H5OperateType';
@@ -8,7 +8,7 @@ import { ContentConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import router from '@ohos.router';
 import Url from '@ohos.url'
-import { ContentDTO } from 'wdBean/Index';
+import { ContentDTO, PhotoListBean } from 'wdBean';
 import { ResponseDTO, WDHttp, HttpUrlUtils } from 'wdNetwork';
 
 const TAG = 'JsBridgeBiz'
@@ -96,11 +96,25 @@ function getAppPublicInfo(): string {
 
 function handleJsCallReceiveH5Data(data: Message) {
   switch (data?.data?.dataSource) {
-    case 5:
-      if (data?.data?.dataSource === 5) {
-        ProcessUtils.processPage(JSON.parse(data?.data?.dataJson || '{}'))
+    case '3':
+      let imgListData: IImgListData = JSON.parse(data?.data?.imgListData || "{}")
+      let imgArr = imgListData?.imgArr || []
+      if (imgArr.length > 0) {
+        const photoList: PhotoListBean[] = imgArr.map(item => {
+          const photo: PhotoListBean = {
+            width: item.width,
+            height: item.height,
+            picPath: item.pic,
+            picDesc: ''
+          }
+          return photo
+        })
+        ProcessUtils.gotoMultiPictureListPage(photoList)
       }
       break;
+    case '5':
+      ProcessUtils.processPage(JSON.parse(data?.data?.dataJson || '{}'))
+      break;
     default:
       break;
   }

@@ -90,7 +90,7 @@ export struct ImageAndTextPageComponent {
                         .height(24)
                         .margin({ right: 5 })
                     }
-                    Text(`${this.interactData?.likeNum || 0}`)
+                    Text(`${this.interactData?.likeNum || 0 }`)
                       .fontSize(16)
                       .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999')
                       .fontWeight(500)
@@ -100,10 +100,10 @@ export struct ImageAndTextPageComponent {
                   .justifyContent(FlexAlign.Center)
                   .alignItems(VerticalAlign.Center)
                   .borderRadius(20)
-                  .border({
-                    width: 1,
-                    color: '#EDEDED',
-                  })
+                  // .border({
+                  //   width: 1,
+                  //   color: '#EDEDED',
+                  // })
                   .onClick(() => {
                     this.toggleLikeStatus()
                   })

-import { NetworkUtil, Logger, NetworkType, SPHelper, } from 'wdKit';
+import { NetworkUtil, Logger, NetworkType, SPHelper, WindowModel} from 'wdKit';
 import { ResponseDTO } from 'wdNetwork';
 import {
   ContentDetailDTO,
@@ -78,42 +78,19 @@ export struct MultiPictureDetailPageComponent {
 
   build() {
     RelativeContainer() {
-      if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
-        Swiper(this.swiperController) {
-          ForEach(this.contentDetailData.photoList, (item: PhotoListBean) => {
-            Swiper(this.swiperControllerItem) {
-              MultiPictureDetailItemComponent({ MultiPictureDetailItem: item })
+      this.init()
     }
     .width('100%')
     .height('100%')
-            .vertical(true)
-            .autoPlay(false)
-            .cachedCount(1)
-            .indicator(false)
-            .displayCount(1)
-            .onAnimationEnd(event => {
-              router.back()
-            })
-          })
+    .backgroundColor(Color.Black)
+    .id('e_picture_container')
+    // 设置顶部绘制延伸到状态栏
+    // 设置底部绘制延伸到导航条
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
   }
-        .index(this.swiperIndex)
-        .width('100%')
-        .height(px2vp(this.picHeight) + 32)
-        .vertical(false)
-        .autoPlay(false)
-        .cachedCount(3)
-        .indicator(false)
-        .displayCount(1)
-        .loop(false)
-        .id('e_swiper_content')
-        .alignRules({
-          center: { anchor: "__container__", align: VerticalAlign.Center },
-          middle: { anchor: "__container__", align: HorizontalAlign.Center }
-        })
-        .onChange((index: number) => {
-          this.swiperIndex = index
-        })
 
+  @Builder
+  init() {
     if (this.contentDetailData.rmhPlatform == 1) {
       Row() {
         Row({ space: 8 }) {
@@ -154,6 +131,7 @@ export struct MultiPictureDetailPageComponent {
                 .height(14)
                 .textOverflow({ overflow: TextOverflow.Ellipsis })
                 .margin(0)
+                .maxLines(1)
             }
           }
           .width('81%')
@@ -192,11 +170,47 @@ export struct MultiPictureDetailPageComponent {
       .width('100%')
       .height(44)
       .alignRules({
-            top: { anchor: "e_swiper_content", align: VerticalAlign.Top },
-            middle: { anchor: "e_swiper_content", align: HorizontalAlign.Center }
+        top: { anchor: "__container__", align: VerticalAlign.Top },
+        middle: { anchor: "__container__", align: HorizontalAlign.Center }
       })
       .id('e_attention')
     }
+    if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
+      Swiper(this.swiperController) {
+        ForEach(this.contentDetailData.photoList, (item: PhotoListBean) => {
+          Swiper(this.swiperControllerItem) {
+            MultiPictureDetailItemComponent({ MultiPictureDetailItem: item })
+          }
+          .width('100%')
+          .height('100%')
+          .vertical(true)
+          .autoPlay(false)
+          .cachedCount(1)
+          .indicator(false)
+          .displayCount(1)
+          .onAnimationEnd(event => {
+            router.back()
+          })
+        })
+      }
+      .index(this.swiperIndex)
+      .width('100%')
+      .height(px2vp(this.picHeight) + 32)
+      .vertical(false)
+      .autoPlay(false)
+      .cachedCount(3)
+      .indicator(false)
+      .displayCount(1)
+      .loop(false)
+      .id('e_swiper_content')
+      .alignRules({
+        center: { anchor: "__container__", align: VerticalAlign.Center },
+        middle: { anchor: "__container__", align: HorizontalAlign.Center }
+      })
+      .onChange((index: number) => {
+        this.swiperIndex = index
+      })
+
       Row() {
         Scroll(this.scroller) {
           Row() {
@@ -295,14 +309,6 @@ export struct MultiPictureDetailPageComponent {
       .border({ width: { top: 0.5 }, color: '#FFFFFF' })
       .id('e_oper_row')
   }
-    .width('100%')
-    .height('100%')
-    .backgroundColor(Color.Black)
-    .id('e_picture_container')
-    // 设置顶部绘制延伸到状态栏
-    // 设置底部绘制延伸到导航条
-    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
-  }
 
   getContentDetailData() {
     try {
@@ -318,6 +324,11 @@ export struct MultiPictureDetailPageComponent {
           }
           this.netStatus = undefined
           this.contentDetailData = resDTO.data?.[0];
+          if (this.contentDetailData.rmhPlatform == 1) {
+            WindowModel.shared.setWindowSystemBarProperties({
+              statusBarContentColor: '#ffffff',
+            })
+          }
           // this.contentDetailData.photoList = []
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {
             // 暂无内容

@@ -29,13 +29,11 @@ struct MineHomePage {
   registTime:number = 0//账号注册时间
   @State registerTimeForDay:number = 0
 
-  aboutToAppear(){
+  onPageShow(): void {
     this.getUserInfo()
     this.getUserLevel()
   }
 
-
-
   build() {
     Stack({ alignContent: Alignment.Top }){
       Image($r('app.media.title_bg'))
@@ -65,9 +63,8 @@ struct MineHomePage {
                   .height('130lpx')
                   .objectFit(ImageFit.Cover)
               }.onClick(()=>{
-                //TODO 显示头像
-                let params = {'userId': "531267787833221"} as Record<string, string>;
-                WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)
+                let params = {'headPhotoUrl': this.headPhotoUrl} as Record<string, string>;
+                WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
               }).width('135lpx')
               .height('135lpx')
 
@@ -370,6 +367,9 @@ struct MineHomePage {
         if(StringUtils.isNotEmpty(value.introduction)){
           this.desc = value.introduction
           this.isHasIntroduction = true
+        }else{
+          this.desc = "点击添加简介，让大家认识你"
+          this.isHasIntroduction = false
         }
         this.browseNum = value.browseNum
         this.commentNum = value.commentNum

+import { router } from '@kit.ArkUI';
+
+@Entry
+@Component
+struct ShowUserHeaderPage {
+  @State headPhotoUrl: string = '';
+  @State params:Record<string, string> =  router.getParams() as Record<string, string>;
+
+  onPageShow() {
+    this.headPhotoUrl = this.params?.['headPhotoUrl'];
+  }
+
+  build() {
+    Row() {
+      Image(this.headPhotoUrl)
+        .alt($r('app.media.default_head'))
+        .width('720lpx')
+        .height('720lpx')
+        .objectFit(ImageFit.Auto)
+        .clip(new Circle({ width: '720lpx', height: '720lpx' }))
+    }
+    .width('100%')
+    .height('100%')
+    .alignItems(VerticalAlign.Center)
+    .backgroundColor($r('app.color.color_000000'))
+    .onClick(()=>{
+      router.back()
+    })
+  }
+}
\ No newline at end of file

@@ -21,6 +21,7 @@
     "components/page/LiveMorePage",
     "components/page/ReserveMorePage",
     "pages/VideoPlayPage",
-    "components/page/ThemeListPage"
+    "components/page/ThemeListPage",
+    "pages/ShowUserHeaderPage"
   ]
 }
\ No newline at end of file

@@ -11,7 +11,7 @@ export struct ChartItemCompereComponent {
     ListItem() {
       Column() {
         Row() {
-          Image($r('app.media.icon_live_status_running'))
+          Image($r('app.media.default_head'))
             .borderRadius(10)
             .width(20)
             .height(20)
@@ -24,13 +24,15 @@ export struct ChartItemCompereComponent {
 
           Text(' 主持人 ')
             .fontSize(11)
-            .backgroundColor('808562')
+            .backgroundColor('#FFFFC63F')
             .fontColor('#FFFFFFFF')
             .padding({ top: 2, bottom: 2, left: 4, right: 4 })
             .borderRadius(4)
-        }.margin({ bottom: 8 })
+        }
+        .margin({ bottom: 8 })
+        .justifyContent(FlexAlign.Start)
 
-        Text(this.liveDetailsBean.newIntroduction).lineHeight(22)
+        Text(this.liveDetailsBean.newIntroduction).lineHeight(22).fontColor('#FFFFFFFF').fontSize(14)
       }
       .backgroundColor('#4D000000')
       .borderRadius(3)
@@ -41,6 +43,7 @@ export struct ChartItemCompereComponent {
         right: 8
       })
       .margin({ left: 16, bottom: 4 })
+      .alignItems(HorizontalAlign.Start)
     }
 
   }