From aad7ea65994d33014308fd24dadc4308b35053e6 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期三, 30 十月 2024 14:59:30 +0800
Subject: [PATCH] fix
---
XQMuse/Root/PayMusicView/PayMusicVC.swift | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/XQMuse/Root/PayMusicView/PayMusicVC.swift b/XQMuse/Root/PayMusicView/PayMusicVC.swift
index 5ee28c6..bf0d700 100644
--- a/XQMuse/Root/PayMusicView/PayMusicVC.swift
+++ b/XQMuse/Root/PayMusicView/PayMusicVC.swift
@@ -11,6 +11,9 @@
import MediaPlayer
import RxRelay
+
+let ChangeMasterVoice_Noti = Notification.Name.init(rawValue: "ChangeMasterVoice_Noti")
+
@objc enum PlayMusicState:Int{
case playing = 1
case paurse = 2
@@ -169,6 +172,7 @@
}else{
self.audioPlayer.bgmPlayer?.play()
self.audioPlayer.masterPlayer?.play()
+ self.audioPlayer.masterPlayer?.volume = Float(UserDefaultSettingViewModel.getSetting()?.masterVolume ?? 0.5)
self.startRunloopAni()
}
}
@@ -212,7 +216,15 @@
return instance
}
- private init() {} // 私有化init方法
+ private init() {
+
+ NotificationCenter.default.addObserver(forName: ChangeMasterVoice_Noti, object: nil, queue: .main) { noti in
+ if let value = noti.object as? Float{
+ print("--->进入")
+ self.masterPlayer?.volume = value
+ }
+ }
+ } // 私有化init方法
//销毁单例对象
class func destroy() {
@@ -233,14 +245,14 @@
self.meditationModel = model
let urls = model.meditationMusicList.map { url in
- return URL(string: url)!
+ return URL(string: url.jq_urlEncoded())!
}
if urls.count == 0{
alertError(msg: "数据获取失败");return
}
- let masterUrl = URL(string: model.tutorAudioUrl)
+ let masterUrl = URL(string: model.tutorAudioUrl.jq_urlEncoded())
autoreleasepool{[unowned self] () in
for url in urls {
@@ -254,6 +266,7 @@
if masterUrl != nil{
self.masterPlayer = AVPlayer(url: masterUrl!)
+ self.masterPlayer?.volume = Float(UserDefaultSettingViewModel.getSetting()?.masterVolume ?? 0.5)
self.masterPlayer?.play()
}
}
@@ -354,20 +367,6 @@
bgmPlayer?.replaceCurrentItem(with: AVPlayerItem(url: urls[index]))
bgmPlayer?.play()
}
-
-// @objc private func playbackEnd(){
-// if bgmPlayer?.actionAtItemEnd == AVPlayer.ActionAtItemEnd.pause && playIndex <= urls.count - 1{
-// next()
-// self.delegate?.playState(.next)
-// }else{
-// print("背景音乐播放完毕")
-// self.delegate?.playState(.end)
-// }
-//
-// if masterPlayer?.actionAtItemEnd == AVPlayer.ActionAtItemEnd.pause{
-// print("导师播放完毕")
-// }
-// }
@objc private func playBGMbackEnd(){
self.scenePlayer?.seek(to: CMTimeMake(value: 0, timescale: 1))
--
Gitblit v1.7.1