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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  语音播报关闭后，重新开启语音播报鸿蒙版是续播安卓是重新播放
  语音播报后导致华为自带的返回功能无效
  音频悬浮窗相关问题
  fix(17088)： 功能缺陷-【生产环境】播放暂停按钮-未自动隐藏--暂停不隐藏，  播放是4秒隐藏
  fix: 18271 全域-规则_数字显示规则-展示交互问题
  fix(直播)： 非沉浸式直播暂停/播放，回放优化
  fix: 19210 UI还原问题-【生产】进入财经频道，视频卡，多显示了25评文案
  fix(17087)： UI还原问题-直播回顾-播放/暂停按钮位置偏左；全屏按钮偏右、回看参与人数偏左
  fix: 17931 UI还原问题-【uat】地区精选卡，上下两条线比android细
  fix: 19235 UI还原问题-【生产】进入法治频道，单图卡图片没有显示边框线
  fix: 19237 UI还原问题-【uat】进入北京频道，轮播图，进度没填满

@@ -208,14 +208,14 @@ export struct CompParser {
         if (this.compDTO.compStyle === this.nextCompDTO.compStyle) {
           Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
         } else {
-          Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 16, right: 16 })
+          Divider().strokeWidth(5).color('#f5f5f5')
         }
       } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
         // 大专题
         if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
           Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
         } else {
-          Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 16, right: 16 })
+          Divider().strokeWidth(5).color('#f5f5f5')
         }
       } else if (this.compDTO.compType === 'appStyle') {
         if (
@@ -225,7 +225,7 @@ export struct CompParser {
             this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_04 ||
             this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_06
         ) {
-          Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 16, right: 16 })
+          Divider().strokeWidth(5).color('#f5f5f5')
         } else {
           Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
         }

@@ -76,8 +76,15 @@ export struct CardSourceInfo {
       const num2: string = num.slice(-4, -3); // 千
       return num2 === '0' ? num1 + '万' : num1 + '.' + num2 + '万'
     } else if (Number.parseInt(num) > 99999999) {
-      const num1: string = num.slice(0, -8); // 亿
-      const num2: string = num.slice(-8, -7);
+      let num1: string = num.slice(0, -8); // 亿
+      let num2: string = num.slice(-8, -7);
+      const num3: string = `0.${num.slice(-7, -6)}`
+      if (Math.round(Number(num3)) > Number(num3)) {
+        if (`${Number(num2) + 1}`.length === 2) {
+          num1 = `${Number(num1) + 1}`
+          num2 = '0'
+        }
+      }
       return num2 === '0' ? num1 + '亿' : num1 + '.' + num2 + '亿'
     }
     return num
@@ -140,7 +147,7 @@ export struct CardSourceInfo {
       }
 
       // 评论数
-      if (!this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
+      if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && !this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
       this.showCommentNum()) {
         Text(`${this.handlerNum(this.getContentDtoBean()?.interactData?.commentNum.toString())}评`)
           .fontSize($r("app.float.font_size_11"))
@@ -148,7 +155,7 @@ export struct CardSourceInfo {
           .flexShrink(0)
       } else {
 
-        if (this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
+        if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
           Text(`${this.handlerNum(this.contentDTO.interactData?.commentNum.toString())}评`)
             .fontSize($r("app.float.font_size_11"))
             .fontColor($r("app.color.color_B0B0B0"))
@@ -159,7 +166,6 @@ export struct CardSourceInfo {
 
     }
     .width(CommonConstants.FULL_WIDTH)
-    .height(16)
     .margin({ top: this.viewShowData ? 8 : 0 })
   }
 
@@ -202,11 +208,11 @@ export struct CardSourceInfo {
     }
 
     // 评论数
-    if (!this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
+    if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && !this.isCompInnerSource && Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 &&
     this.showCommentNum()) {
       have = true
     } else {
-      if (this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
+      if ((this.contentDTO.rmhPlatform === 1 || this.contentDTO.source) && this.isCompInnerSource && this.contentDTO.interactData && this.contentDTO.interactData?.commentNum > 0) {
         have = true
       }
     }

@@ -121,6 +121,7 @@ export struct Card6Component {
           .borderRadius(5)
           .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
           .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 78 : 156)
+          .border({width: 1, color: 0xf5f5f5})
         CardMediaInfo({ contentDTO: this.contentDTO })
       }
 

@@ -300,7 +300,8 @@ struct indicatorAnimations {
         //   .height(2)
 
         Image($r('app.media.swiper_indicator_gray'))
-          .width('100%')
+          .objectFit(ImageFit.Contain)
+          .width('96%')
           .height(2)
         Image($r('app.media.swiper_indicator_white'))
           .width(this.leftW)
@@ -334,7 +335,8 @@ struct indicatorAnimations {
         //   .width('100%')
         //   .height(2)
         Image($r('app.media.swiper_indicator_gray'))
-          .width('100%')
+          .objectFit(ImageFit.Contain)
+          .width('96%')
           .height(2)
         Image($r('app.media.swiper_indicator_white'))
           .width(this.rightW)

@@ -14,9 +14,6 @@ export class AudioSuspensionModel {
   public floatWindowClass: SubscribedAbstractProperty<window.Window> =  AppStorage.link<window.Window>('floatWindowClass')
   public srcTitle: string = ''
   private url: string = ''
-  private expandWidth: number = vp2px(243)
-  private expandHeight: number = vp2px(60)
-  private initMoveX = vp2px(12)
   // 窗口是否最小化
   private isMinimize: SubscribedAbstractProperty<boolean> = AppStorage.link<boolean>('isMinimize')
   constructor() {
@@ -51,8 +48,10 @@ export class AudioSuspensionModel {
       if (this.isMinimize?.get()) {
         EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_EXPAND, 1)
         AppStorage.setOrCreate('isMinimize', false);
+        this.playerController.get().resetPlay()
+      } else {
+        this.playerController.get().switchPlayOrPause()
       }
-      this.playerController.get().switchPlayOrPause()
     } else {
       this.url = url
       this.playerController.get().firstPlay(url)
@@ -100,16 +99,6 @@ export class AudioSuspensionModel {
       console.info(TAG, 'floatWindowClass Succeeded in changing the window size.');
     });
   }
-    public moveWindow(y: number) {
-    this.floatWindowClass.get().moveWindowTo(this.initMoveX, vp2px(y), (err: BusinessError) => {
-      let errCode: number = err.code;
-      if (errCode) {
-        console.error('floatWindowClass Failed to move the window. Cause:' + JSON.stringify(err));
-        return;
-      }
-      console.info('floatWindowClass Succeeded in moving the window.');
-    });
-  }
 
   // 隐藏悬浮窗
   public minimize() {

@@ -7,12 +7,15 @@ import { ContentDetailDTO, LiveRoomDataBean } from 'wdBean/Index';
 import { DisplayDirection } from 'wdConstant/Index';
 import { LiveFollowComponent, LottieView } from 'wdComponent/Index';
 import { WDShare } from 'wdShare/Index';
+import { faceDetector } from '@kit.CoreVisionKit';
+
 //直播间播放器上层覆盖物
 @Component
 export struct PlayUIComponent {
   playerController?: WDAliPlayerController;
   //菜单键是否可见
   @State @Watch('onChangeMenuVisible') isMenuVisible: boolean = true
+  private ispause:boolean = false
   @Consume contentDetailData: ContentDetailDTO
   @Consume liveRoomDataBean: LiveRoomDataBean
   @State currentTime: string = ''
@@ -35,8 +38,11 @@ export struct PlayUIComponent {
     let time: number = 0
     if (this.isMenuVisible) {
       setTimeout(() => {
+        if(this.ispause){
+          return
+        }
         this.isMenuVisible = false
-      }, 5 * 1000)
+      }, 4 * 1000)
     } else {
       clearTimeout(time)
     }
@@ -46,6 +52,16 @@ export struct PlayUIComponent {
     this.onChangeMenuVisible()
 
     this.initPlayerSet()
+    if(this.playerController){
+      this.playerController.onStatusChangeForPlayUIComponent = (status: number) => {
+        if(1 == status){
+          this.ispause = false
+          this.isMenuVisible = false
+        }else if(2 == status){
+          this.ispause = true
+        }
+      }
+    }
   }
 
   aboutToDisappear(): void {
@@ -271,6 +287,9 @@ export struct PlayUIComponent {
         if (this.contentDetailData?.liveInfo?.liveState === 'wait') {
           return
         }
+        if(this.ispause){
+          return
+        }
         this.isMenuVisible = !this.isMenuVisible
       })
   }
@@ -290,7 +309,7 @@ export struct PlayUIComponent {
             .fontWeight(600)
             .fontSize('12fp')
             .margin({
-              left: 16
+              left: 20
             })
         }
 
@@ -308,7 +327,7 @@ export struct PlayUIComponent {
             .fontWeight(600)
             .fontSize('12fp')
             .margin({
-              right: 16
+              right: 20
             })
         }
 
@@ -376,7 +395,9 @@ export struct PlayUIComponent {
             this.playerController?.pause()
           } else {
             this.isPlayStatus = true
-            this.playerController?.firstPlay(this.liveUrl)
+            if (this.contentDetailData.liveInfo?.liveState == 'running') {
+              this.playerController?.firstPlay(this.liveUrl)
+            }
             this.playerController?.play()
           }
         })

@@ -10,6 +10,8 @@ import { window } from '@kit.ArkUI';
 import { EmptyComponent } from 'wdComponent/Index';
 import { DateTimeUtils } from 'wdKit/Index';
 import { TrackConstants, TrackingPageBrowse } from 'wdTracking/Index';
+import { AudioSuspensionModel } from 'wdComponent'
+import { BusinessError } from '@kit.BasicServicesKit';
 
 const storage = LocalStorage.getShared();
 const TAG = 'DetailVideoListPage'
@@ -42,6 +44,8 @@ export struct DetailVideoListPage {
   pageHideTime:number = 0;
   @Provide onlyWifiLoadVideo: boolean = false
   @Provide toastTextVisible: boolean = false
+  private AudioSuspension = new AudioSuspensionModel()
+  @State isShowAudioCom: boolean = false
 
   async aboutToAppear(): Promise<void> {
     // 注册监听网络连接
@@ -80,6 +84,21 @@ export struct DetailVideoListPage {
     this.openFullScreen()
 
     this.pageShowTime = DateTimeUtils.getTimeStamp()
+
+    // 判断当前窗口是否已显示，使用callback异步回调。
+    this.AudioSuspension.floatWindowClass.get().isShowing((err: BusinessError, data) => {
+      const errCode: number = err.code;
+      if (errCode) {
+        console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err));
+        return;
+      }
+      console.info(TAG, 'window is showing: ' + JSON.stringify(data));
+      if(data) {
+        this.isShowAudioCom = true
+        this.AudioSuspension.playerController.get()?.pause();
+        this.AudioSuspension.minimize()
+      }
+    });
   }
 
   onPageHide(): void {
@@ -91,6 +110,13 @@ export struct DetailVideoListPage {
     let duration = 0
     duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
     TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal,duration)
+
+    console.info(TAG, 'this.isShowAudioCom: ' + this.isShowAudioCom);
+    if (this.isShowAudioCom) {
+      this.AudioSuspension.showWindow()
+      this.AudioSuspension.playerController.get()?.play();
+      this.isShowAudioCom = false
+    }
   }
 
   /**

@@ -60,6 +60,7 @@ export class WDAliPlayerController {
   // 准备完成，决定是否播放回调。如果不实现，则自动播放
   public onCanplay?: () => void;
   public onStatusChange?: (status: number) => void;
+  public onStatusChangeForPlayUIComponent?: (status: number) => void;
   public onFirstFrameDisplay?: () => void
   // 埋点字段
   private creatStartTime: number = 0; //开始加载时间
@@ -513,6 +514,9 @@ export class WDAliPlayerController {
     if (this.onStatusChange) {
       this.onStatusChange(this.status)
     }
+    if(this.onStatusChangeForPlayUIComponent){
+      this.onStatusChangeForPlayUIComponent(this.status)
+    }
 
   }
 

@@ -360,6 +360,12 @@ export class WDPlayerController {
     // this.progressThis.progressVal = 0;
   }
 
+  resetPlay() {
+    this.duration = 0;
+    this.url = this.avPlayer?.url || '';
+    this.avPlayer?.reset();
+  }
+
   onVolumeActionStart(event: GestureEvent) {
     this.positionY = event.offsetY;
   }

@@ -107,8 +107,18 @@ export default class EntryAbility extends UIAbility {
         ;
       });
 
-      floatWindowClass.on('windowEvent', (data) => {
-        EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_TYPE, data)
+      floatWindowClass.setWindowFocusable(false, (err: BusinessError) => {
+        const errCode: number = err.code;
+        if (errCode) {
+          console.error(`Failed to set the window to be focusable. Cause code: ${err.code}, message: ${err.message}`);
+          return;
+        }
+        console.info('Succeeded in setting the window to be focusable.');
+      });
+
+      floatWindowClass.on('touchOutside', () => {
+        console.info('touchOutside');
+        EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_TYPE, 3)
       });
 
     });

@@ -7,6 +7,11 @@ import { LottieView } from 'wdComponent/Index'
 
 const TAG = 'AudioSuspensionModel'
 
+interface Position {
+  x: number,
+  y: number
+}
+
 @Entry
 @Component
 struct Index {
@@ -17,17 +22,21 @@ struct Index {
   @State progressVal: number = 0;
   @State currentStatus: number | string |undefined = 0;
   @State isExpand: boolean = true;
-  @State moveY: number = 604;
   private expandWidth: number = vp2px(243)
   private expandHeight: number = vp2px(60)
   private foldWidth: number = vp2px(60)
   private foldHeight: number = vp2px(60)
-  bottomSafeHeight: number = 720 // 悬浮窗底部滑动限制
-  topSafeHeight: number = 94 // 悬浮窗顶部滑动限制
+  bottomSafeHeight: number = vp2px(720) // 悬浮窗底部滑动限制
+  topSafeHeight: number = vp2px(94) // 悬浮窗顶部滑动限制
   @State name: string = 'audio_status_wait';
+  @State @Watch("moveWindow") windowPosition: Position = { x: vp2px(12), y: vp2px(576) };
+  private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.All });
+  private subWindow:window.Window | null = null
 
   async aboutToAppear() {
-    window.findWindow("subWindow").setWindowBackgroundColor("#00000000")
+    this.subWindow = window.findWindow("subWindow")
+    this.subWindow.setWindowBackgroundColor("#00000000")
+
     this.AudioSuspension.playerController.get().onTimeUpdate = (position, duration) => {
       this.currentTime = DateFormatUtil.convertMillisecondsToMinutesSeconds(position);
       this.totalTime = DateFormatUtil.convertMillisecondsToMinutesSeconds(duration);
@@ -69,6 +78,14 @@ struct Index {
 
   }
 
+  moveWindow() {
+    if (this.subWindow == null) {
+      console.info('Faild in destroying the window.');
+    } else {
+      this.subWindow.moveWindowTo(this.windowPosition.x, this.windowPosition.y);
+    }
+  }
+
   onPageHide() {
     // this.status = PlayerConstants.STATUS_PAUSE;
     this.AudioSuspension.playerController.get()?.pause();
@@ -126,8 +143,14 @@ struct Index {
             .height(3)
             .margin({ top: 7 })
         }
-        .width("100%")
-        .height("100%")
+        .padding({
+          top: 10,
+          bottom: 10,
+          left: 10,
+          right: 0
+        })
+        .width(243)
+        .height(60)
         .justifyContent(FlexAlign.Start)
 
         Row() {
@@ -183,21 +206,23 @@ struct Index {
             this.isExpand = true
             this.AudioSuspension.resizeWindow(this.expandWidth, this.expandHeight)
           }),
-        PanGesture({
-          fingers: 1,
-          direction: PanDirection.Vertical,
-          distance: 0
-        })
+        PanGesture(this.panOption)
+          //手势识别成功回调。
+          .onActionStart((event: GestureEvent) => {
+            console.info('Pan start');
+          })
+            // 手势移动过程中回调。发生拖拽时，获取到触摸点的位置，并将位置信息传递给windowPosition
           .onActionUpdate((event: GestureEvent) => {
-            let newY = Math.ceil(this.moveY + event.offsetY);
-            this.moveY = Math.min(Math.max(newY, this.topSafeHeight), this.bottomSafeHeight);
-            // console.log(TAG,'this.moveY', this.moveY)
-            this.AudioSuspension.moveWindow(this.moveY)
+            // this.windowPosition.x += event.offsetX;
+            let newY = this.windowPosition.y + event.offsetY;
+            this.windowPosition.y = Math.min(Math.max(newY, this.topSafeHeight), this.bottomSafeHeight);
+          })
+            //手势识别成功，手指抬起后触发回调。
+          .onActionEnd(() => {
+            console.info('Pan end');
           })
       )
     )
-    .width('100%')
-    .height('100%')
     .borderRadius(4)
     .padding({
       top: 10,

@@ -9,6 +9,8 @@ import { VideoChannelPage } from './VideoChannelPage';
 import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
 import { ALL, ImageKnifeComponent, ImageKnifeOption } from '@ohos/imageknife';
 import { ParamType, Tracking } from 'wdTracking/Index';
+import { AudioSuspensionModel } from 'wdComponent'
+import { BusinessError } from '@kit.BasicServicesKit';
 
 const TAG = 'BottomNavigationComponent';
 PersistentStorage.persistProp('channelIds', '');
@@ -52,6 +54,8 @@ export struct BottomNavigationComponent {
   @State assignChannel: AssignChannelParam = new AssignChannelParam()
   // 自动刷新触发（双击tab自动刷新）
   @State autoRefresh: number = 0
+  private AudioSuspension = new AudioSuspensionModel()
+  @State isShowAudioCom: boolean = false
 
 
   async aboutToAppear() {
@@ -143,6 +147,9 @@ export struct BottomNavigationComponent {
     .hoverEffect(HoverEffect.Highlight)
     .visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
     // .hitTestBehavior(HitTestMode.Block)
+    .onTouch(() => {
+      this.handleAudio(navItem)
+    })
     .onClick(() => {
       Logger.info(TAG, `onChange, index: ${index}`);
       Logger.info(TAG, `onChange, navItem: ${JSON.stringify(navItem)}`);
@@ -152,7 +159,6 @@ export struct BottomNavigationComponent {
         "pageId": navItem.id,
       }
       Tracking.event("bar_click", params)
-
       this.onBottomNavigationIndexChange(navItem, index)
     })
 
@@ -221,9 +227,37 @@ export struct BottomNavigationComponent {
     return isSelect ? $r('app.media.icon_tab_res1') : $r('app.media.icon_tab_res1_no')
   }
 
+  // 控制音频悬浮窗显隐
+  handleAudio(navItem: BottomNavDTO) {
+    if (navItem.name === '视频') {
+      // 判断当前窗口是否已显示，使用callback异步回调。
+      this.AudioSuspension.floatWindowClass.get().isShowing((err: BusinessError, data) => {
+        const errCode: number = err.code;
+        if (errCode) {
+          console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err));
+          return;
+        }
+        console.info(TAG, 'window is showing: ' + JSON.stringify(data));
+        if(data) {
+          this.isShowAudioCom = true
+          this.AudioSuspension.playerController.get()?.pause();
+          this.AudioSuspension.minimize()
+        }
+      });
+    } else {
+      console.info(TAG, 'this.isShowAudioCom: ' + this.isShowAudioCom);
+      if (this.isShowAudioCom) {
+        this.AudioSuspension.showWindow()
+        this.AudioSuspension.playerController.get()?.play();
+        this.isShowAudioCom = false
+      }
+    }
+  }
+
   // 底导切换函数
   async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) {
     Logger.info(TAG, `onBottomNavigationIndexChange this.currentNavIndex: ${this.currentNavIndex}`);
+
     if (navItem.name === '我的') {
       this.barBackgroundColor = Color.White
       this.currentBottomNavInfo = {} as BottomNavDTO
@@ -237,7 +271,6 @@ export struct BottomNavigationComponent {
       }
     }
     this.currentNavIndex = index;
-
     // 请求顶导数据(参数）：
   }