Merge remote-tracking branch 'origin/main'

@@ -12,6 +12,7 @@
     "wdJsBridge": "file:../wdJsBridge",
     "wdJsBridge": "file:../wdJsBridge",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
     "wdRouter": "file:../wdRouter",
     "wdRouter": "file:../wdRouter",
-    "wdNetwork": "file:../wdNetwork"
+    "wdNetwork": "file:../wdNetwork",
+    "wdPlayer": "file:../../features/wdPlayer"
   }
   }
 }
 }

@@ -7,6 +7,8 @@ import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { DateTimeUtils,EmitterUtils,EmitterEventId } from 'wdKit'
 import { DateTimeUtils,EmitterUtils,EmitterEventId } from 'wdKit'
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
 import { NativeCallH5Type,NativeCallH5Event,eventParams } from './NativeCallH5Type';
 import { NativeCallH5Type,NativeCallH5Event,eventParams } from './NativeCallH5Type';
+import { AudioSuspensionModel } from '../viewmodel/AudioSuspensionModel'
+import { BusinessError } from '@kit.BasicServicesKit';
 
 
 const TAG = 'WdWebLocalComponent';
 const TAG = 'WdWebLocalComponent';
 
 
@@ -44,6 +46,8 @@ export struct WdWebLocalComponent {
   @Consume @Watch('pageShowForUpdateData') pageShow :number
   @Consume @Watch('pageShowForUpdateData') pageShow :number
   @Consume @Watch('pageHideForUpdateData') pageHide :number
   @Consume @Watch('pageHideForUpdateData') pageHide :number
 
 
+  private AudioSuspension = new AudioSuspensionModel()
+
   currentChanged(){
   currentChanged(){
     ///折叠屏转换 暂停播放器
     ///折叠屏转换 暂停播放器
     this.controller.pause()
     this.controller.pause()
@@ -186,6 +190,19 @@ export struct WdWebLocalComponent {
       }
       }
     }
     }
   }
   }
+  // 暂停音频悬浮窗
+  pauseAudioCom() {
+    // 判断当前窗口是否已显示，使用callback异步回调。
+    this.AudioSuspension.floatWindowClass.get().isShowing((err: BusinessError, data) => {
+      const errCode: number = err.code;
+      if (errCode) {
+        return;
+      }
+      if(data) {
+        this.AudioSuspension.playerController.get()?.pause();
+      }
+    });
+  }
   //播放视频
   //播放视频
   private setCurrentPageOperate9: (data: Message) => void = (data) => {
   private setCurrentPageOperate9: (data: Message) => void = (data) => {
     if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate && data?.data?.operateType === '9') {
     if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate && data?.data?.operateType === '9') {
@@ -235,6 +252,7 @@ export struct WdWebLocalComponent {
     this.cancelProgressTimer()
     this.cancelProgressTimer()
     this.controller.start()
     this.controller.start()
     this.startProgressTimer()
     this.startProgressTimer()
+    this.pauseAudioCom()
   }
   }
 
 
   startProgressTimer() {
   startProgressTimer() {

+import window from '@ohos.window';
+import { Logger } from 'wdKit';
+import { BackgroundAudioController, WDPlayerController } from 'wdPlayer';
+import { BusinessError } from '@ohos.base';
+import { EmitterEventId, EmitterUtils } from 'wdKit/Index'
+
+const TAG = 'AudioSuspensionModel'
+
+/**
+ * 音频悬浮窗公共方法类
+ */
+export class AudioSuspensionModel {
+  public playerController: SubscribedAbstractProperty<WDPlayerController> =  AppStorage.link<WDPlayerController>('playerController')
+  public floatWindowClass: SubscribedAbstractProperty<window.Window> =  AppStorage.link<window.Window>('floatWindowClass')
+  public srcTitle: string = ''
+  private url: string = ''
+  // 窗口是否最小化
+  private isMinimize: SubscribedAbstractProperty<boolean> = AppStorage.link<boolean>('isMinimize')
+  constructor() {
+    this.initPlayerController()
+  }
+  /**
+   * 判断音频实例是否已存在，不存在则创建
+   */
+  private initPlayerController() {
+    if(this.playerController === undefined) {
+      // Logger.info(TAG, 'playerController undefined')
+      AppStorage.setOrCreate('playerController', new WDPlayerController({loop: false}));
+      this.playerController = AppStorage.link<WDPlayerController>('playerController')
+      // Logger.info(TAG, 'playerController create success')
+      this.playerController.get().onStatusChange = (status: number) => {
+        // console.info(TAG, 'this.currentStatus Model', status)
+        EmitterUtils.sendEvent(EmitterEventId.AUDIO_CHANGE_STATUS, status)
+      }
+    } else {
+      // Logger.info(TAG, 'playerController already exit')
+    }
+  }
+  /**
+   * 配置音频地址
+   */
+  public async setPlayerUrl(url: string, srcTitle: string, srcContentId?: string, srcSource?: string) {
+    /*console.log(TAG,'this.url', this.url)
+    console.log(TAG,'url', url)*/
+    this.playerController.get().keepOnBackground = true
+    BackgroundAudioController.sharedController().avplayerController = this.playerController.get()
+    await BackgroundAudioController.sharedController().createSession()
+    // BackgroundAudioController.sharedController().startContinuousTask()
+    BackgroundAudioController.sharedController().listenPlayEvents()
+    await BackgroundAudioController.sharedController().setSessionMetaData(srcContentId ?? "", srcTitle, $r("app.media.system_audio_icon_bk_center"), srcSource ?? "")
+    BackgroundAudioController.sharedController().stopUseFeatures()
+
+    if (this.url === url) {
+      this.isMinimize = AppStorage.link<boolean>('isMinimize')
+      // console.log(TAG, 'this.isMinimize', this.isMinimize?.get())
+      if (this.isMinimize?.get()) {
+        EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_EXPAND, 1)
+        AppStorage.setOrCreate('isMinimize', false);
+        this.playerController.get().resetPlay()
+      } else {
+        this.playerController.get().switchPlayOrPause()
+      }
+    } else {
+      this.url = url
+      this.playerController.get().firstPlay(url)
+      this.playerController.get().onCanplay = () => {
+        this.playerController.get().play()
+      }
+      this.srcTitle = srcTitle
+      EmitterUtils.sendEvent(EmitterEventId.AUDIO_CHANGE_TITLe, this.srcTitle)
+      EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_EXPAND, 1)
+    }
+    this.showWindow()
+  }
+  // 显示悬浮窗。
+  public showWindow() {
+    // 判断当前窗口是否已显示，使用callback异步回调。
+    this.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 === false) {
+        // 显示当前窗口，使用callback异步回调。
+        this.floatWindowClass.get().showWindow((err: BusinessError) => {
+          let errCode: number = err.code;
+          if (errCode) {
+            // console.error(TAG, 'floatWindowClass Failed to show the window. Cause: ' + JSON.stringify(err));
+            return;
+          }
+          // console.info(TAG, 'floatWindowClass Succeeded in showing the window.');
+        });
+      }
+    });
+  }
+
+  // 设置悬浮窗尺寸
+  public resizeWindow(width: number, height: number) {
+    this.floatWindowClass.get().resize(width, height, (err: BusinessError) => {
+      let errCode: number = err.code;
+      if (errCode) {
+        // console.error(TAG, 'floatWindowClass Failed to change the window size. Cause:' + JSON.stringify(err));
+        return;
+      }
+      // console.info(TAG, 'floatWindowClass Succeeded in changing the window size.');
+    });
+  }
+
+  // 隐藏悬浮窗
+  public minimize() {
+    this.floatWindowClass.get().minimize((err: BusinessError) => {
+      const errCode: number = err.code;
+      if (errCode) {
+        // console.error(TAG, 'Failed to minimize the window. Cause: ' + JSON.stringify(err));
+        return;
+      }
+      AppStorage.setOrCreate('isMinimize', true);
+      // console.info(TAG, 'Succeeded in minimizing the window.');
+    });
+  }
+
+
+
+}