From 4fb1e7db45ddf4dfacd2bfb4dbfe0b9f269bedb7 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期二, 12 十一月 2024 18:29:28 +0800
Subject: [PATCH] fix bug.
---
XQMuse/Root/Home/HomeVC.swift | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/XQMuse/Root/Home/HomeVC.swift b/XQMuse/Root/Home/HomeVC.swift
index 0e2b562..7192b4d 100644
--- a/XQMuse/Root/Home/HomeVC.swift
+++ b/XQMuse/Root/Home/HomeVC.swift
@@ -65,6 +65,7 @@
if needPopToTree{
navigationController?.tabBarController?.selectedIndex = 2
+ needPopToTree = false
}
if AudioPlayer.getSharedInstance().scenePlayer?.timeControlStatus == .paused && UserDefaultSettingViewModel.getSetting()?.bgm != nil{
@@ -77,7 +78,7 @@
titleItems.removeAll()
- timer = Timer.scheduledTimer(timeInterval: 60, target: self, selector: #selector(autoUpdate), userInfo: nil, repeats: true)
+ timer = Timer.scheduledTimer(timeInterval: 30, target: self, selector: #selector(autoUpdate), userInfo: nil, repeats: true)
RunLoop.current.add(timer!, forMode: .default)
titleItems.append(TitleItem(title: "每日疗愈", subTitle: "Daily Meditation"))
@@ -271,10 +272,12 @@
}).disposed(by: disposeBag)
+
+ //BUDID:17184
let m = MeditationModel()
m.id = 0
self.viewModel.privateTodyModels = [m]
- if !(UserViewModel.getLoginInfo()?.accessToken.isEmpty ?? true){
+// if !(UserViewModel.getLoginInfo()?.accessToken.isEmpty ?? true){
Services.getPersonalityPlan().subscribe(onNext: { data in
if let m = data.data{
if m.count > 0{
@@ -283,9 +286,9 @@
self.tableView.reloadRows(at: [IndexPath(row: 1, section: 0)], with: .none)
}
}).disposed(by: disposeBag)
- }else{
- self.tableView.reloadData()
- }
+// }else{
+// self.tableView.reloadData()
+// }
Services.getMeditationAndCateList().subscribe(onNext: { data in
if let m = data.data{
@@ -333,11 +336,17 @@
@objc func autoUpdate(){
- print("--->")
- Services.getTopdayMedita().subscribe(onNext: { data in
- self.viewModel.todyModel = data.data
- self.tableView.reloadRows(at: [IndexPath(row: 0, section: 0)], with: .none)
- }).disposed(by: disposeBag)
+ guard !(viewModel.todyModel?.endPlayTime.isEmpty ?? true) else {return}
+
+ let todayEndDay = Date().jq_format("yyyy-MM-dd") + " \(viewModel.todyModel!.endPlayTime)"
+ let endDayInterval = Date.jq_StringToTimeInterval(todayEndDay,"yyyy-MM-dd HH:mm:ss")
+
+ if Date().timeIntervalSince1970 > endDayInterval{
+ Services.getTopdayMedita().subscribe(onNext: { data in
+ self.viewModel.todyModel = data.data
+ self.tableView.reloadRows(at: [IndexPath(row: 0, section: 0)], with: .none)
+ }).disposed(by: disposeBag)
+ }
}
@objc func searchAction(){
@@ -430,8 +439,6 @@
cell.img_cover.image = UIImage(named: "bg_today")
cell.view_data.isHidden = true
}
-
- print("--->\(cell)")
cell.setplaying()
return cell
--
Gitblit v1.7.1