| XQMuse/Root/Home/HomeVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| XQMuse/Root/Home/VC/BackgroundVoiceVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| XQMuse/Root/Home/VC/HomeItemDetailVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| XQMuse/Root/Me/MeVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| XQMuse/Root/Me/VC/WalletVC.xib | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| XQMuse/Root/PayMusicView/PayMusicVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| XQMuse/Root/Plans/PlanGuideVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
XQMuse/Root/Home/HomeVC.swift
@@ -69,9 +69,9 @@ } if AudioPlayer.getSharedInstance().bgmPlayer != nil && AudioPlayer.getSharedInstance().masterPlayer != nil{ if AudioPlayer.getSharedInstance().bgmPlayer != nil{ AudioPlayer.getSharedInstance().bgmPlayer?.play() AudioPlayer.getSharedInstance().masterPlayer?.play() // AudioPlayer.getSharedInstance().masterPlayer?.play() return } @@ -417,12 +417,12 @@ if isSameMeditation { if isPaused { audioPlayer.bgmPlayer?.play() audioPlayer.masterPlayer?.play() // audioPlayer.masterPlayer?.play() PayMusicVC.updateStatus(.playing) viewModel.todyModel?.playAtMe = true } else { audioPlayer.bgmPlayer?.pause() audioPlayer.masterPlayer?.pause() // audioPlayer.masterPlayer?.pause() PayMusicVC.updateStatus(.pause) viewModel.todyModel?.playAtMe = false } XQMuse/Root/Home/VC/BackgroundVoiceVC.swift
@@ -37,7 +37,7 @@ super.viewDidAppear(animated) audioPlayer.pauseScene() if audioPlayer.meditationModel != nil{ audioPlayer.masterPlayer?.pause() // audioPlayer.masterPlayer?.pause() audioPlayer.bgmPlayer?.pause() PayMusicVC.updateStatus(.pause) } XQMuse/Root/Home/VC/HomeItemDetailVC.swift
@@ -195,7 +195,7 @@ PayMusicVC.updateStatus(.playing) }else{ audioPlayer.bgmPlayer?.play() audioPlayer.masterPlayer?.play() // audioPlayer.masterPlayer?.play() PayMusicVC.updateStatus(.playing) } }else{ @@ -204,7 +204,7 @@ } }else{ audioPlayer.bgmPlayer?.pause() audioPlayer.masterPlayer?.pause() // audioPlayer.masterPlayer?.pause() PayMusicVC.updateStatus(.pause) } } XQMuse/Root/Me/MeVC.swift
@@ -55,8 +55,8 @@ let loginNav = LoginNav(rootViewController: LoginVC()) loginNav.modalPresentationStyle = .fullScreen JQ_currentViewController().present(loginNav, animated: true) needLaunch = false } needLaunch = false } override func setUI() { XQMuse/Root/Me/VC/WalletVC.xib
@@ -83,7 +83,7 @@ <rect key="frame" x="28" y="189" width="337" height="49"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1fa-be-bVw"> <rect key="frame" x="0.0" y="0.0" width="162.33333333333334" height="49"/> <rect key="frame" x="0.0" y="0.0" width="337" height="49"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> @@ -100,8 +100,8 @@ <action selector="withdrawAction:" destination="-1" eventType="touchUpInside" id="Tk2-iT-wdF"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HHE-qz-hlk"> <rect key="frame" x="175" y="0.0" width="162" height="49"/> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HHE-qz-hlk"> <rect key="frame" x="0.0" y="0.0" width="0.0" height="49"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> XQMuse/Root/PayMusicView/PayMusicVC.swift
@@ -229,7 +229,7 @@ if btn.isSelected{ self.audioPlayer.bgmPlayer?.pause() self.audioPlayer.masterPlayer?.pause() // self.audioPlayer.masterPlayer?.pause() self.stopRunloopAni() PayMusicVC.updateStatus(.pause) }else{ @@ -239,8 +239,8 @@ } self.audioPlayer.bgmPlayer?.play() self.audioPlayer.masterPlayer?.play() self.audioPlayer.masterPlayer?.volume = Float(UserDefaultSettingViewModel.getSetting()?.masterVolume ?? 0.5) // self.audioPlayer.masterPlayer?.play() // self.audioPlayer.masterPlayer?.volume = Float(UserDefaultSettingViewModel.getSetting()?.masterVolume ?? 0.5) self.startRunloopAni() PayMusicVC.updateStatus(.playing) } @@ -278,7 +278,7 @@ class AudioPlayer { private(set) var bgmPlayer:AVPlayer? // 背景音 private(set) var scenePlayer:AVPlayer? //场景音 private(set) var masterPlayer:AVPlayer? //大师音 // private(set) var masterPlayer:AVPlayer? //大师音 private(set) var playIndex:Int = 0 //播放的角标 private var cacheDirectory:URL! private let session = URLSession.shared @@ -310,7 +310,7 @@ NotificationCenter.default.addObserver(forName: ChangeMasterVoice_Noti, object: nil, queue: .main) { noti in if let value = noti.object as? Float{ print("--->进入") self.masterPlayer?.volume = value // self.masterPlayer?.volume = value self.bgmPlayer?.volume = value } } @@ -320,12 +320,12 @@ let notifiUrl = ((data.object as? AVPlayerItem)?.asset as? AVURLAsset) let sceneItem = (self?.scenePlayer?.currentItem?.asset as? AVURLAsset) let bgmItem = (self?.bgmPlayer?.currentItem?.asset as? AVURLAsset) let masterItem = (self?.masterPlayer?.currentItem?.asset as? AVURLAsset) // let masterItem = (self?.masterPlayer?.currentItem?.asset as? AVURLAsset) if masterItem?.url == notifiUrl?.url{ weakSelf.masterPlayer = nil } // if masterItem?.url == notifiUrl?.url{ // weakSelf.masterPlayer = nil // } if bgmItem?.url == notifiUrl?.url{ @@ -363,9 +363,9 @@ func clean(){ self.bgmPlayer?.pause() self.masterPlayer?.pause() // self.masterPlayer?.pause() self.meditationModel = nil self.masterPlayer = nil // self.masterPlayer = nil self.bgmPlayer = nil self.timer = nil AudioPlayer.destroy() @@ -373,9 +373,9 @@ func cleanMuse(){ self.bgmPlayer?.pause() self.masterPlayer?.pause() // self.masterPlayer?.pause() self.meditationModel = nil self.masterPlayer = nil // self.masterPlayer = nil self.timer = nil self.lisenMuseTime = 0 } @@ -384,9 +384,9 @@ //清除之前的 self.urls.removeAll() self.masterPlayer?.pause() // self.masterPlayer?.pause() self.bgmPlayer?.pause() self.masterPlayer = nil // self.masterPlayer = nil self.bgmPlayer = nil self.delegate = delegate @@ -411,10 +411,10 @@ } self.bgmPlayer = AVPlayer(url: self.urls[firstPlayIndex]) if masterUrl != nil{ self.masterPlayer = AVPlayer(url: masterUrl!) self.masterPlayer?.volume = Float(UserDefaultSettingViewModel.getSetting()?.masterVolume ?? 0.5) } // if masterUrl != nil{ // self.masterPlayer = AVPlayer(url: masterUrl!) // self.masterPlayer?.volume = Float(UserDefaultSettingViewModel.getSetting()?.masterVolume ?? 0.5) // } } self.bgmPlayer?.addPeriodicTimeObserver(forInterval: CMTimeMake(value: 1, timescale: 1), queue: DispatchQueue.main) { [weak self](time) in @@ -466,23 +466,23 @@ self.bgmPlayer?.currentItem?.rx.observe(AVPlayerItem.Status.self,"status").subscribe(onNext: { _ in print("---MasterStatus1: \(self.masterPlayer?.status.rawValue ?? 0)") // print("---MasterStatus1: \(self.masterPlayer?.status.rawValue ?? 0)") print("---bgmStatus1: \(self.bgmPlayer?.status.rawValue ?? 0)") if self.bgmPlayer?.status == .readyToPlay && self.masterPlayer?.status == .readyToPlay{ if self.bgmPlayer?.status == .readyToPlay{ self.bgmPlayer?.play() self.masterPlayer?.play() // self.masterPlayer?.play() } }).disposed(by: disposeBag) self.masterPlayer?.currentItem?.rx.observe(AVPlayerItem.Status.self,"status").subscribe(onNext: { _ in print("---MasterStatus: \(self.masterPlayer?.status.rawValue ?? 0)") print("---bgmStatus: \(self.bgmPlayer?.status.rawValue ?? 0)") if self.bgmPlayer?.status == .readyToPlay && self.masterPlayer?.status == .readyToPlay{ self.bgmPlayer?.play() self.masterPlayer?.play() } }).disposed(by: disposeBag) // self.masterPlayer?.currentItem?.rx.observe(AVPlayerItem.Status.self,"status").subscribe(onNext: { _ in // print("---MasterStatus: \(self.masterPlayer?.status.rawValue ?? 0)") // print("---bgmStatus: \(self.bgmPlayer?.status.rawValue ?? 0)") // if self.bgmPlayer?.status == .readyToPlay && self.masterPlayer?.status == .readyToPlay{ // self.bgmPlayer?.play() // self.masterPlayer?.play() // } // }).disposed(by: disposeBag) setLockScreen() @@ -573,7 +573,7 @@ // 播放 center.playCommand.addTarget {[weak self] event in self?.bgmPlayer?.play() self?.masterPlayer?.play() // self?.masterPlayer?.play() PayMusicVC.updateStatus(.playing) return .success } @@ -581,7 +581,7 @@ // 暂停 center.pauseCommand.addTarget {[weak self] event in self?.bgmPlayer?.pause() self?.masterPlayer?.pause() // self?.masterPlayer?.pause() PayMusicVC.updateStatus(.pause) return .success } @@ -611,7 +611,7 @@ weakSelf.times.accept(nil) weakSelf.stopTimer() weakSelf.bgmPlayer?.pause() weakSelf.masterPlayer?.pause() // weakSelf.masterPlayer?.pause() weakSelf.scenePlayer?.pause() MPNowPlayingInfoCenter.default().nowPlayingInfo = nil AudioPlayer.destroy() XQMuse/Root/Plans/PlanGuideVC.swift
@@ -66,7 +66,7 @@ PayMusicVC.updateStatus(.pause) AudioPlayer.getSharedInstance().bgmPlayer?.pause() AudioPlayer.getSharedInstance().masterPlayer?.pause() // AudioPlayer.getSharedInstance().masterPlayer?.pause() AudioPlayer.getSharedInstance().scenePlayer?.pause() } @@ -86,7 +86,7 @@ if AudioPlayer.getSharedInstance().meditationModel != nil{ AudioPlayer.getSharedInstance().bgmPlayer?.play() AudioPlayer.getSharedInstance().masterPlayer?.play() // AudioPlayer.getSharedInstance().masterPlayer?.play() PayMusicVC.updateStatus(.playing) }else if UserDefaultSettingViewModel.getSetting()?.bgm != nil && !(JQ_currentNavigationController().viewControllers.first is PlanGuideVC){ AudioPlayer.getSharedInstance().playSceneAt(UserDefaultSettingViewModel.getSetting()!.bgm!.audioFile)
