From: liangzhenying <867174124@qq.com> Date: Mon, 29 Sep 2025 10:19:31 +0000 (+0800) Subject: 睡眠接口调试 X-Git-Tag: 1.0.2~93 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=708110fa9d19f871a4c297d81379e3e4a63b1435;p=mirrors%2FShenYin.git 睡眠接口调试 --- diff --git a/ShenYin/ShenYin/Api/HttpClient2.swift b/ShenYin/ShenYin/Api/HttpClient2.swift index 02d1827..6719e79 100644 --- a/ShenYin/ShenYin/Api/HttpClient2.swift +++ b/ShenYin/ShenYin/Api/HttpClient2.swift @@ -20,15 +20,32 @@ enum RequestMethod{ // 相关api enum CommomApi { + /// 获取验证码 case sms(phone:String,type:SmsType) + /// 获取国家 case countryList case list(pageNO: Int = 1, pageSize: Int = 10) + /// 注册 case register(param:[String:Any]) + /// 验证码登录 case smsLogin(param:[String:Any]) + /// 登录 case login(param:[String:Any]) + /// 注销 case deactivate + /// 更新密码 case updatePwd(param:[String:Any]) + /// 检查令牌 case token + + /// 更新用户信息 + case updateUserInfo(param:[String:Any]) + /// 获取用户存储空间 + case storageSize + /// 获取音乐分类 + case musicCategory + /// 获取音乐列表 + case muiscCategoryList(categoryId:String,page:Int) } // 实现TargetType协议 @@ -67,6 +84,15 @@ extension CommomApi{ return "/uc/reset" case .token: return "/uc/token" + case .updateUserInfo(_): + return "/uc/userinfo" + case .storageSize: + return "/res/voice-file/storage-size" + case .musicCategory: + return "/res/music-category/list" + case .muiscCategoryList(let categoryId,let page): + return "/res/sleep-music/list/\(page)?categoryId=\(categoryId)" + } } @@ -74,7 +100,7 @@ extension CommomApi{ switch self { case .register(_),.smsLogin(_),.login(_): return .post - case .updatePwd(_): + case .updatePwd(_),.updateUserInfo(_): return .put default: return .get @@ -90,7 +116,7 @@ extension CommomApi{ // let idfv = UIDevice.current.identifierForVendor?.uuidString var param: [String:Any] { // 公共参数 - // var params: [String: Any] = ["token": "Gz1qYLXeBW8MZuUfDlr9wsAYuVS1cZFMJY9BbaF842L2gRps747o4w=="] + //var params: [String: Any] = ["token": "Gz1qYLXeBW8MZuUfDlr9wsAYuVS1cZFMJY9BbaF842L2gRps747o4w=="] var params: [String: Any] = [:] // 收集参数 @@ -112,6 +138,9 @@ extension CommomApi{ case let .updatePwd(para): params += para break + case let .updateUserInfo(para): + params += para + break default: break } diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/SelecteCell.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/SelecteCell.swift index f849162..d68b423 100644 --- a/ShenYin/ShenYin/UI/Home/HistoryRecord/SelecteCell.swift +++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/SelecteCell.swift @@ -41,12 +41,25 @@ enum ShareType:Int{ enum GenderType:Int{ case man case female + case unnkown var title:String{ switch self { case .man: return "男" case .female: return "女" + case .unnkown: + return "保密" + } + } + var value:Int{ + switch self { + case .man: + return 1 + case .female: + return 0 + default: + return 2 } } } diff --git a/ShenYin/ShenYin/UI/Mine/Login/Controller/ForgetVC.swift b/ShenYin/ShenYin/UI/Mine/Login/Controller/ForgetVC.swift index 275adcb..4322ec1 100644 --- a/ShenYin/ShenYin/UI/Mine/Login/Controller/ForgetVC.swift +++ b/ShenYin/ShenYin/UI/Mine/Login/Controller/ForgetVC.swift @@ -47,7 +47,7 @@ class ForgetVC:BaseVC{ v.textColor = .hexString("#121212") } phoneView.do { v in - v.textField.text = "13480939445" +// v.textField.text = "13480939445" } codeView.do { v in v.codeButton.addTarget(self, action: #selector(codeButtonAction), for: .touchUpInside) diff --git a/ShenYin/ShenYin/UI/Mine/Login/Controller/RegisterVC.swift b/ShenYin/ShenYin/UI/Mine/Login/Controller/RegisterVC.swift index 98eef3b..feca6a1 100644 --- a/ShenYin/ShenYin/UI/Mine/Login/Controller/RegisterVC.swift +++ b/ShenYin/ShenYin/UI/Mine/Login/Controller/RegisterVC.swift @@ -62,7 +62,7 @@ class RegisterVC:BaseVC{ v.region = CountryModel.chinese() } phoneView.do { v in - v.textField.text = "19276672101" +// v.textField.text = "19276672101" } registerBtn.set(title: "注册",style: .theme1, target: self, action: #selector(registerAction)) view.addSubviews([tipsLabel,bgView]) diff --git a/ShenYin/ShenYin/UI/Mine/Login/Controller/SmsLoginVC.swift b/ShenYin/ShenYin/UI/Mine/Login/Controller/SmsLoginVC.swift index 940af6f..d0068ca 100644 --- a/ShenYin/ShenYin/UI/Mine/Login/Controller/SmsLoginVC.swift +++ b/ShenYin/ShenYin/UI/Mine/Login/Controller/SmsLoginVC.swift @@ -60,7 +60,7 @@ class SmsLoginVC:BaseVC{ v.region = CountryModel.chinese() } phoneView.do { v in - v.textField.text = "13480939445" +// v.textField.text = "13480939445" } loginBtn.set(title: "登录",style: .theme1, target: self, action: #selector(loginAction)) pwdBtn.set(title: "密码登录", style: .theme2,target: self, action: #selector(pwdAction)) diff --git a/ShenYin/ShenYin/UI/Mine/Login/ViewModel/UserInfo.swift b/ShenYin/ShenYin/UI/Mine/Login/ViewModel/UserInfo.swift new file mode 100644 index 0000000..232b13f --- /dev/null +++ b/ShenYin/ShenYin/UI/Mine/Login/ViewModel/UserInfo.swift @@ -0,0 +1,34 @@ +// +// Untitled.swift +// ShenYin +// +// Created by liangshi on 2025/9/29. +// +class UserInfoRoot:ResponseBaseModel { + var data = UserInfo() +} + +class UserInfo:ResponseBaseModel { + var id = "" + var avatar = "" + var userName = "" + var createTime = "" + var phone = "" + var state = "1" + var gender = 1 + var verify = false + var countryName = "" + var countryId = "" + + var genderText:String{ + if gender == 1 { + return "男" + } + else if gender == 0 { + return "女" + } + else{ + return "保密" + } + } +} diff --git a/ShenYin/ShenYin/UI/Mine/Login/ViewModel/UserModel.swift b/ShenYin/ShenYin/UI/Mine/Login/ViewModel/UserModel.swift index c580355..e7e9d08 100644 --- a/ShenYin/ShenYin/UI/Mine/Login/ViewModel/UserModel.swift +++ b/ShenYin/ShenYin/UI/Mine/Login/ViewModel/UserModel.swift @@ -4,6 +4,9 @@ // // Created by liangshi on 2025/7/30. // +class StorageSizeModel:ResponseBaseModel { + var data:Int = 0 +} class UserModel { @@ -21,7 +24,26 @@ class UserModel { if self.token != nil { } } + + var storageSize = 0 + var info = UserInfo() +} + +extension UserModel{ + func getStorageSize(completion:@escaping (_ result:StorageSizeModel) ->Void){ + HttpClient.request(.storageSize) { [weak self](result:StorageSizeModel,res) in + guard let self = self else{return} + if result.isSuccess{ + storageSize = result.data + } + completion(result) + } + } } + + + + extension UserModel{ private func getToken()->String?{ if let value = UserDefaults.standard.value(forKey: UserModel.cacheKey),let token = value as? String{ diff --git a/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift b/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift index 327bb8c..df169bb 100644 --- a/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift +++ b/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift @@ -6,6 +6,7 @@ // import UIKit +import Kingfisher class MineHeaderView: BaseView { let userInfo = MineUserInfoView() let banner = MineBannerView() @@ -48,12 +49,12 @@ class MineUserInfoView: BaseView { v.image = UIImage(named: "head") v.yc.setCornerRadius(40) v.backgroundColor = .white + } titleLabel.do { (v) in v.textColor = .rgb(0x121212) v.font = .regular(26) v.textAlignment = .left - v.text = "Juliaxxxx" } deviceLabel.do { (v) in @@ -87,6 +88,11 @@ class MineUserInfoView: BaseView { m.top.equalToSuperview().inset(10) } } + func updateUI(){ + titleLabel.text = CacheManager.shared.user.info.userName + icon.kf.setImage(with:CacheManager.shared.user.info.avatar.yc.asUrl ) + + } @objc func tapAction(){ App.shared.goToPage(UserInfoVC()) } diff --git a/ShenYin/ShenYin/UI/Mine/Root/MineVC.swift b/ShenYin/ShenYin/UI/Mine/Root/MineVC.swift index ea16b54..1025bb4 100644 --- a/ShenYin/ShenYin/UI/Mine/Root/MineVC.swift +++ b/ShenYin/ShenYin/UI/Mine/Root/MineVC.swift @@ -8,6 +8,7 @@ import UIKit class MineVC: BaseVC{ let tableView = UITableView(frame: .zero, style: .plain) let list:[MineCellType] = [.instructions,.update,.more,.feeback,.about] + let headerView = MineHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenWid, height: 266)) override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,7 @@ class MineVC: BaseVC{ v.sectionHeaderHeight = 52 v.separatorStyle = .none v.register(MineCell.self, forCellReuseIdentifier: MineCell.reuseID) - v.tableHeaderView = MineHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenWid, height: 266)) + v.tableHeaderView = headerView } @@ -35,6 +36,16 @@ class MineVC: BaseVC{ make.top.equalTo(kNavBtm) } } + override func setupData() { + + CacheManager.shared.user.getStorageSize { result in + + } + } + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + headerView.userInfo.updateUI() + } } extension MineVC:UITableViewDelegate,UITableViewDataSource { diff --git a/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell1.swift b/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell1.swift index ca53909..dca19e1 100644 --- a/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell1.swift +++ b/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell1.swift @@ -84,7 +84,17 @@ class CustomCell1: BaseTableViewCell { else{ valueLabel.isHidden = true } - valueLabel.text = "123" + let info = CacheManager.shared.user.info + if type == .nickName { + valueLabel.text = info.userName + } + else if type == .gender { + //1表示男,0表示女,2表示保密 + valueLabel.text = info.genderText + } + else if type == .area { + valueLabel.text = info.countryName + } } } diff --git a/ShenYin/ShenYin/UI/Mine/UserInfo/GenderVC.swift b/ShenYin/ShenYin/UI/Mine/UserInfo/GenderVC.swift index 6f6b64a..c30924d 100644 --- a/ShenYin/ShenYin/UI/Mine/UserInfo/GenderVC.swift +++ b/ShenYin/ShenYin/UI/Mine/UserInfo/GenderVC.swift @@ -10,6 +10,7 @@ class GenderVC: BaseVC{ let tableView = UITableView(frame: .zero, style: .plain) var list:[GenderType] = [.man,.female,] var currentType = GenderType.man + var didSelected:((GenderType)->Void)? override func viewDidLoad() { super.viewDidLoad() @@ -64,5 +65,8 @@ extension GenderVC:UITableViewDelegate,UITableViewDataSource { let data = list[indexPath.row] currentType = data tableView.reloadData() + didSelected?(currentType) + navigationController?.popViewController(animated: true) + } } diff --git a/ShenYin/ShenYin/UI/Mine/UserInfo/UserInfoVC.swift b/ShenYin/ShenYin/UI/Mine/UserInfo/UserInfoVC.swift index 1905a35..0ea304f 100644 --- a/ShenYin/ShenYin/UI/Mine/UserInfo/UserInfoVC.swift +++ b/ShenYin/ShenYin/UI/Mine/UserInfo/UserInfoVC.swift @@ -64,9 +64,9 @@ class UserInfoVC: BaseVC{ case .nickName: App.shared.goToPage(NickNameVC()) case .gender: - App.shared.goToPage(GenderVC()) + genderAction() case .area: - App.shared.goToPage(AreaVC()) + areaAction() break default: break @@ -76,6 +76,48 @@ class UserInfoVC: BaseVC{ extension UserInfoVC{ + func genderAction(){ + let vc = GenderVC() + vc.didSelected = {[weak self] model in + guard let self = self else{return} + CacheManager.shared.user.info.gender = model.value + tableView.reloadData() + + var params:[String:Any] = [:] + params["gender"] = CacheManager.shared.user.info.gender + + HttpClient.request(.updateUserInfo(param: params)) { (model:ResponseBaseModel,res) in + if model.isSuccess{ + + } + } + } + App.shared.goToPage(vc) + } + func areaAction(){ + let vc = ContryListVC() + vc.didSelected = {[weak self] model in + guard let self = self else{return} + CacheManager.shared.user.info.countryName = model.name + CacheManager.shared.user.info.countryId = model.id + tableView.reloadData() + + var params:[String:Any] = [:] + params["countryId"] = model.id + + HttpClient.request(.updateUserInfo(param: params)) { (model:ResponseBaseModel,res) in + if model.isSuccess{ + + } + } + } + App.shared.goToPage(vc) + } + + + + + @objc func pickImageAction() -> Void { imgPicker.showImagePicker(from: App.shared.topVC()) {[weak self] image in guard let self = self else { return } diff --git a/ShenYin/ShenYin/UI/Sleep/MusicCategory.swift b/ShenYin/ShenYin/UI/Sleep/MusicCategory.swift new file mode 100644 index 0000000..e0e5640 --- /dev/null +++ b/ShenYin/ShenYin/UI/Sleep/MusicCategory.swift @@ -0,0 +1,19 @@ +// +// MusicCategoryModel.swift +// ShenYin +// +// Created by liangshi on 2025/9/29. +// +import HandyJSON + +class MusicCategoryRoot:ResponseBaseModel { + var data = [MusicCategory]() +} + +class MusicCategory:HandyJSON { + var id = "" + var name = "" + var ord = "" + var enable = "" + required public init() { } +} diff --git a/ShenYin/ShenYin/UI/Sleep/SleepVC.swift b/ShenYin/ShenYin/UI/Sleep/SleepVC.swift index 542e816..64083a9 100644 --- a/ShenYin/ShenYin/UI/Sleep/SleepVC.swift +++ b/ShenYin/ShenYin/UI/Sleep/SleepVC.swift @@ -1,87 +1,9 @@ -// -// Untitled.swift -// ShenYin -// -// Created by liangshi on 2025/8/5. -// -//import UIKit -//import TabPageViewController -// -//class SleepVC:TabPageViewController{ -// override init() { -// super.init() -// tabItems = [(SleepPageVC(), "First"), -// (SleepPageVC(), "Second1"), -// (SleepPageVC(), "Second2"), -// (SleepPageVC(), "Second3"), -// (SleepPageVC(), "Second411111111"), -// (SleepPageVC(), "Second5"), -// (SleepPageVC(), "Second6"), -// ] -// -// -// // 初始化配置 -// var option = TabPageOption() -//// option.tabWidth = view.frame.width / CGFloat(tabItems.count) -// option.currentColor = .red -// option.currentBarHeight = 5 -// // 标签文字大小 -// option.fontSize = 16 -// -// // 当前选中标签的颜色 -// option.currentColor = .systemBlue -// -// // 未选中标签的颜色 -// option.defaultColor = .darkGray -// -// // 标签栏高度 -// option.tabHeight = 44 -// -// // 标签项间距 -// option.tabMargin = 16 -// -// // 标签栏背景色 -// option.tabBackgroundColor = .white -// -// // 页面背景色 -// option.pageBackgoundColor = .yellow -// -// // 是否透明(影响导航栏) -// option.isTranslucent = true -// -// -// // 滑动时是否隐藏标签栏 -// option.hidesTopViewOnSwipeType = .all // .none / .tabBar / .navigationBar / .all -// -// // 应用配置 -// self.option = option -// } -// -// @MainActor required init?(coder aDecoder: NSCoder) { -// fatalError("init(coder:) has not been implemented") -// } -// -// override func viewDidLoad() { -// super.viewDidLoad() -//// self.navBar.title = "睡眠" -// view.backgroundColor = .color(.bgColor) -// -// -// -// } -//// override func setupViews() { -//// -//// } -//// override func setupLayout() { -//// -//// } -//} import Foundation import JXSegmentedView class SleepVC: BaseVC { - private var titles = ["专注","旋律","自然","都市","冥想"] +// private var titles = ["专注","旋律","自然","都市","冥想"] private let segmentedDataSource = JXSegmentedTitleDataSource() private let segmentedView = JXSegmentedView() private lazy var listContainerView: JXSegmentedListContainerView! = { @@ -89,6 +11,7 @@ class SleepVC: BaseVC { return view }() + let vm = SleepVM() override func viewDidLoad() { super.viewDidLoad() @@ -124,7 +47,7 @@ class SleepVC: BaseVC { segmentedDataSource.isItemSpacingAverageEnabled = true segmentedDataSource.isTitleColorGradientEnabled = true // segmentedDataSource.titles = titles.map{"\($0.name)"} - segmentedDataSource.titles = titles + segmentedDataSource.titles = vm.catogory.map{"\($0.name)"} segmentedView.backgroundColor = .clear //配置指示器 @@ -139,6 +62,19 @@ class SleepVC: BaseVC { } // self.tz_addPopGesture(to: listContainerView.scrollView) } + + override func setupData() { + vm.getCagory { [weak self ]model in + guard let self = self else{return} + + segmentedDataSource.titles = vm.catogory.map{"\($0.name)"} + segmentedView.dataSource = segmentedDataSource + + listContainerView.reloadData() + segmentedView.reloadData() + + } + } } extension SleepVC: JXSegmentedListContainerViewListDelegate { diff --git a/ShenYin/ShenYin/UI/Sleep/SleepVM.swift b/ShenYin/ShenYin/UI/Sleep/SleepVM.swift new file mode 100644 index 0000000..4776958 --- /dev/null +++ b/ShenYin/ShenYin/UI/Sleep/SleepVM.swift @@ -0,0 +1,31 @@ +// +// SleepVM.swift +// ShenYin +// +// Created by liangshi on 2025/9/29. +// + +class SleepVM:BaseVM{ + var catogory = [MusicCategory]() + + public func getCagory( completion:@escaping (_ result:MusicCategoryRoot) ->Void) { + let api = CommomApi.musicCategory + HttpClient.request(api) {[weak self] (model:MusicCategoryRoot,res) in + guard let self = self else {return} + if model.isSuccess{ + catogory = model.data + } + completion(model) + } + } + + public func getCagoryList(categoryId:String,page:Int, completion:@escaping (_ result:ResponseBaseModel) ->Void) { + let api = CommomApi.muiscCategoryList(categoryId: categoryId, page: 1) + HttpClient.request(api) {[weak self] (model:ResponseBaseModel,res) in + guard let self = self else {return} + if model.isSuccess{ + } + completion(model) + } + } +} diff --git a/ShenYin/ShenYin/UI/common/Cache/CacheManager.swift b/ShenYin/ShenYin/UI/common/Cache/CacheManager.swift index 788934d..bf70458 100644 --- a/ShenYin/ShenYin/UI/common/Cache/CacheManager.swift +++ b/ShenYin/ShenYin/UI/common/Cache/CacheManager.swift @@ -35,10 +35,10 @@ extension CacheManager{ App.shared.goToLogin() } func tokenIsValid(){ - HttpClient.request(CommomApi.token) { [weak self](model:ResponseBaseModel,res) in + HttpClient.request(CommomApi.token) { [weak self](model:UserInfoRoot,res) in guard let self = self else{return} if model.isSuccess{ - + user.info = model.data } else{ logout()