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

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

 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
 import { Callback } from 'wdJsBridge';
 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 { Logger } from 'wdKit';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5OperateType } from './H5OperateType';
 import { H5OperateType } from './H5OperateType';
@@ -8,7 +8,7 @@ import { ContentConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import Url from '@ohos.url'
 import Url from '@ohos.url'
-import { ContentDTO } from 'wdBean/Index';
+import { ContentDTO, PhotoListBean } from 'wdBean';
 import { ResponseDTO, WDHttp, HttpUrlUtils } from 'wdNetwork';
 import { ResponseDTO, WDHttp, HttpUrlUtils } from 'wdNetwork';
 
 
 const TAG = 'JsBridgeBiz'
 const TAG = 'JsBridgeBiz'
@@ -96,11 +96,25 @@ function getAppPublicInfo(): string {
 
 
 function handleJsCallReceiveH5Data(data: Message) {
 function handleJsCallReceiveH5Data(data: Message) {
   switch (data?.data?.dataSource) {
   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;
       break;
+    case '5':
+      ProcessUtils.processPage(JSON.parse(data?.data?.dataJson || '{}'))
+      break;
     default:
     default:
       break;
       break;
   }
   }

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

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