From fe02f75ab7a593f33d60c15308ddf7a974962db4 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期五, 27 十二月 2024 17:32:44 +0800
Subject: [PATCH] 提交版本： 1.0.0
---
XQMuse/Root/Home/HomeVC.swift | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/XQMuse/Root/Home/HomeVC.swift b/XQMuse/Root/Home/HomeVC.swift
index 6865af1..ebd9a8e 100644
--- a/XQMuse/Root/Home/HomeVC.swift
+++ b/XQMuse/Root/Home/HomeVC.swift
@@ -69,7 +69,7 @@
}
- if AudioPlayer.getSharedInstance().bgmPlayer != nil{
+ if AudioPlayer.getSharedInstance().bgmPlayer != nil && PayMusicVC.getCurrentStatus() != .pause{
AudioPlayer.getSharedInstance().bgmPlayer?.play()
// AudioPlayer.getSharedInstance().masterPlayer?.play()
return
@@ -188,11 +188,11 @@
tableView = UITableView(frame: .zero, style: .plain)
tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 40, right: 0)
tableView.showsVerticalScrollIndicator = false
- DispatchQueue.main.async {
- let h = 119 + 20.5 + JQ_ScreenW * 0.913
- self.topMenuView.frame = CGRect(x: 0, y: 0, width: JQ_ScreenW, height: h)
- self.tableView.tableHeaderView = self.topMenuView
- }
+// DispatchQueue.main.async {
+// let h = 569.0
+// self.topMenuView.frame = CGRect(x: 0, y: 0, width: JQ_ScreenW, height: h)
+// self.tableView.tableHeaderView = self.topMenuView
+// }
tableView.tableHeaderView = topMenuView
@@ -261,7 +261,7 @@
}
self.viewModel.homeTopMenuItems = items
- let h = ceil(Double(items.count) / 4.0) * 119 + 20.5 + JQ_ScreenW * 0.913
+ let h = ceil(Double(items.count) / 4.0) * 119 + 20.5 + JQ_ScreenW * 1.0948
self.topMenuView.menu_height.constant = ceil(Double(items.count) / 4.0) * 119
self.tableView.tableHeaderView?.frame = CGRect(origin: .zero, size: CGSizeMake(JQ_ScreenW, h))
self.topMenuView.resetItems(items)
@@ -433,7 +433,22 @@
// 游客模式都能播放
Services.getMeditationDetail(id: detailId).subscribe(onNext: { [weak self] data in
guard let self = self, let m = data.data else { return }
-
+
+ if m.chargeType == .payment{
+ if UserViewModel.getLoginInfo()?.accessToken.isEmpty ?? true{
+ sceneDelegate?.needLogin();return
+ }else if m.isBuy == .no{
+ let vc = PaymentOrderVC(museItemModel: m, type: .muse, showType: DisplayType.horizontal)
+ jq_push(vc: vc);return
+ }
+ }
+
+ if m.chargeType == .vipFree && UserViewModel.getAvatarInfo().isVip != .yes{
+ let vipCenterVC = VIPCenterVC()
+ jq_push(vc: vipCenterVC)
+ return
+ }
+
if audioPlayer.meditationModel?.id == m.id && audioPlayer.bgmPlayer?.timeControlStatus == .playing {
return
}
@@ -458,8 +473,8 @@
if indexPath.section == 0 && indexPath.row == 0{
//每日疗愈
let cell = tableView.dequeueReusableCell(withIdentifier: "_Home_Style_1_TCell") as! Home_Style_1_TCell
- if viewModel.todyModel?.id != 0{
- cell.model = viewModel.todyModel
+ if let m = viewModel.todyModel,m.id != 0{
+ cell.setTodayMeditationModel(m)
cell.view_data.isHidden = false
}else{
cell.img_cover.image = UIImage(named: "bg_today")
--
Gitblit v1.7.1