Skip to content

G
galaxy-iOS
Commit fc27918e authored by David黄金龙's avatar David黄金龙
Browse files
Options

修改 活动详情 展示

parent ee4e0151
Show whitespace changes
Inline Side-by-side
Showing with 413 additions and 19 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ fc27918e
......@@ -365,7 +365,6 @@
04F957472C203033003C631C /* YHMyGoodFriendsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */; };
04F9574B2C2032D8003C631C /* YHMyFriendsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9574A2C2032D8003C631C /* YHMyFriendsCell.swift */; };
04F9574D2C20644E003C631C /* YHFriendsResponseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */; };
04FA6DF42C32939D00AB3BEA /* YHActivityDetailInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA6DF32C32939D00AB3BEA /* YHActivityDetailInfoCell.swift */; };
04FA8B2B2C06F59D00ABE43F /* YHAppleLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */; };
04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */; };
04FA8B302C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA8B2F2C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift */; };
......@@ -539,6 +538,9 @@
A5FD63C72B638CA000D1D9DA /* YHSubmintAllInfoSuccessTipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63C62B638CA000D1D9DA /* YHSubmintAllInfoSuccessTipView.swift */; };
A5FD63C92B63A35B00D1D9DA /* YHInformationFillTipsAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63C82B63A35B00D1D9DA /* YHInformationFillTipsAlertView.swift */; };
A5FD63CB2B63D6C300D1D9DA /* YHInformationFillTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63CA2B63D6C300D1D9DA /* YHInformationFillTipsCell.swift */; };
A5FF0F3A2C32F20A0069852B /* YHActivityDetailCell0.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FF0F392C32F20A0069852B /* YHActivityDetailCell0.swift */; };
A5FF0F3C2C32F2460069852B /* YHActivityDetailCell1.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FF0F3B2C32F2460069852B /* YHActivityDetailCell1.swift */; };
A5FF0F3E2C32F2590069852B /* YHActivityDetailCell2.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FF0F3D2C32F2590069852B /* YHActivityDetailCell2.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -933,7 +935,6 @@
04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyGoodFriendsVC.swift; sourceTree = "<group>"; };
04F9574A2C2032D8003C631C /* YHMyFriendsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFriendsCell.swift; sourceTree = "<group>"; };
04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendsResponseView.swift; sourceTree = "<group>"; };
04FA6DF32C32939D00AB3BEA /* YHActivityDetailInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailInfoCell.swift; sourceTree = "<group>"; };
04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAppleLoginManager.swift; sourceTree = "<group>"; };
04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
04FA8B2F2C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOneKeyLoginViewModel.swift; sourceTree = "<group>"; };
......@@ -1114,6 +1115,9 @@
A5FD63C62B638CA000D1D9DA /* YHSubmintAllInfoSuccessTipView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSubmintAllInfoSuccessTipView.swift; sourceTree = "<group>"; };
A5FD63C82B63A35B00D1D9DA /* YHInformationFillTipsAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationFillTipsAlertView.swift; sourceTree = "<group>"; };
A5FD63CA2B63D6C300D1D9DA /* YHInformationFillTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationFillTipsCell.swift; sourceTree = "<group>"; };
A5FF0F392C32F20A0069852B /* YHActivityDetailCell0.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailCell0.swift; sourceTree = "<group>"; };
A5FF0F3B2C32F2460069852B /* YHActivityDetailCell1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailCell1.swift; sourceTree = "<group>"; };
A5FF0F3D2C32F2590069852B /* YHActivityDetailCell2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailCell2.swift; sourceTree = "<group>"; };
B6BB01E4C5DB87B66F0ECE84 /* Pods-galaxy.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.release.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -2200,7 +2204,9 @@
children = (
04CE1AC92C2AD91F001CB80A /* YHActivityTravelCell.swift */,
04CE1AC82C2AD91F001CB80A /* YHActivityDetailCell.swift */,
04FA6DF32C32939D00AB3BEA /* YHActivityDetailInfoCell.swift */,
A5FF0F392C32F20A0069852B /* YHActivityDetailCell0.swift */,
A5FF0F3B2C32F2460069852B /* YHActivityDetailCell1.swift */,
A5FF0F3D2C32F2590069852B /* YHActivityDetailCell2.swift */,
04CE1ACA2C2AD91F001CB80A /* YHActivityListCell.swift */,
04CE1AC42C2AD91F001CB80A /* YHActivityDetailBottomView.swift */,
04CE1AC52C2AD91F001CB80A /* YHActivityTravelitemView.swift */,
......@@ -3172,6 +3178,7 @@
045EEEE52B9F171A0022A143 /* YHMySignatureDetailViewController.swift in Sources */,
A5ACE92F2B4564F7002C94D2 /* YHMyViewController.swift in Sources */,
A5ACE9332B4564F7002C94D2 /* NetBaseModel.swift in Sources */,
A5FF0F3A2C32F20A0069852B /* YHActivityDetailCell0.swift in Sources */,
045EEE9B2B9F171A0022A143 /* YHWorkExperienceViewModel.swift in Sources */,
04AD31772C22DE6600DF5655 /* YHEditInterestViewController.swift in Sources */,
045EEEC22B9F171A0022A143 /* YHOtherInfoFillViewController.swift in Sources */,
......@@ -3208,6 +3215,7 @@
A5ACE9452B4564F7002C94D2 /* YHHUDContainerView.swift in Sources */,
045EEEFD2B9F171A0022A143 /* YHSheetPickerViewType.swift in Sources */,
045EEEC72B9F171A0022A143 /* YHOtherYesOrNoItemView.swift in Sources */,
A5FF0F3E2C32F2590069852B /* YHActivityDetailCell2.swift in Sources */,
04FD85702C21646200BEF9C5 /* YHMyInterestTopicCell.swift in Sources */,
04A7BD172BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift in Sources */,
045EEEB32B9F171A0022A143 /* YHWorkFileSyncTableViewCell.swift in Sources */,
......@@ -3238,7 +3246,6 @@
A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */,
044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */,
04F9574D2C20644E003C631C /* YHFriendsResponseView.swift in Sources */,
04FA6DF42C32939D00AB3BEA /* YHActivityDetailInfoCell.swift in Sources */,
04F5F8702C1AC4C2004A463C /* YHHKEventWebViewController.swift in Sources */,
045EEE892B9F171A0022A143 /* YHPreviewBaseViewController.swift in Sources */,
045EEEA42B9F171A0022A143 /* YHImageResultViewController.swift in Sources */,
......@@ -3375,6 +3382,7 @@
0477E17E2BA4362A00436346 /* YHCustomNavigationBar.swift in Sources */,
045EEEC42B9F171A0022A143 /* YHOtherInfoFillCell.swift in Sources */,
045EEE9F2B9F171A0022A143 /* YHWorkExperienceModel.swift in Sources */,
A5FF0F3C2C32F2460069852B /* YHActivityDetailCell1.swift in Sources */,
045EEF232B9F171A0022A143 /* YHItemView.swift in Sources */,
04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */,
A5ACE9312B4564F7002C94D2 /* YHPersonalCenterCell.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
View file @ fc27918e
......@@ -25,7 +25,12 @@ class YHActivityDetailViewController: YHBaseViewController {
tableView.backgroundColor = UIColor.white
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHActivityDetailCell.self, forCellReuseIdentifier: YHActivityDetailCell.cellReuseIdentifier)
tableView.register(YHActivityDetailInfoCell.self, forCellReuseIdentifier: YHActivityDetailInfoCell.cellReuseIdentifier)
tableView.register(YHActivityDetailCell0.self, forCellReuseIdentifier: YHActivityDetailCell0.cellReuseIdentifier)
tableView.register(YHActivityDetailCell1.self, forCellReuseIdentifier: YHActivityDetailCell1.cellReuseIdentifier)
tableView.register(YHActivityDetailCell2.self, forCellReuseIdentifier: YHActivityDetailCell2.cellReuseIdentifier)
// tableView.register(YHActivityDetailInfoCell.self, forCellReuseIdentifier: YHActivityDetailInfoCell.cellReuseIdentifier)
tableView.tableHeaderView = nil
tableView.tableFooterView = nil
......@@ -236,7 +241,7 @@ extension YHActivityDetailViewController: UITableViewDelegate, UITableViewDataSo
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 1
return viewModel.arrActivityDetail.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
......@@ -244,10 +249,28 @@ extension YHActivityDetailViewController: UITableViewDelegate, UITableViewDataSo
let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailCell.cellReuseIdentifier, for: indexPath) as! YHActivityDetailCell
cell.dataModel = viewModel.activityDetailModel
if indexPath.row < viewModel.arrActivityDetail.count {
let model = viewModel.arrActivityDetail[indexPath.row]
if model.type == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailCell0.cellReuseIdentifier, for: indexPath) as! YHActivityDetailCell0
cell.dataModel = model.activityDetailModel ?? YHActivityDetailModel()
return cell
} else if model.type == 1 {
let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailCell1.cellReuseIdentifier, for: indexPath) as! YHActivityDetailCell1
cell.dataModel = model.activityDetailModel ?? YHActivityDetailModel()
return cell
// let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailInfoCell.cellReuseIdentifier, for: indexPath) as! YHActivityDetailInfoCell
// cell.dataModel = viewModel.activityDetailModel ?? YHActivityDetailModel()
} else if model.type == 2 {
let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailCell2.cellReuseIdentifier, for: indexPath) as! YHActivityDetailCell2
cell.dataModel = model.activityDetailModel ?? YHActivityDetailModel()
return cell
}
}
return cell
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHActivityDetailModel.swift
View file @ fc27918e
......@@ -32,7 +32,7 @@ class YHActivityDetailModel: YHActivityModel {
func getImageInfo() {
self.coverItems.removeAll()
coverItems.removeAll()
for (index, url) in self.posters.enumerated() {
for (_, url) in self.posters.enumerated() {
let item = YHActivityCoverItem()
item.url = url
coverItems.append(item)
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailCell0.swift 0 → 100644
View file @ fc27918e
//
// YHActivityDetailCell0.swift
// galaxy
//
// Created by davidhuangA on 2024/7/1.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHActivityDetailCell0: UITableViewCell {
static let cellReuseIdentifier = "YHActivityDetailCell0"
var dataModel : YHActivityDetailModel? {
didSet {
updateUI()
}
}
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
lazy var topImgV:UIImageView = {
let view = UIImageView()
view.image = UIImage(named: "global_default_image")
view.contentMode = .scaleAspectFill
view.clipsToBounds = true
return view
}()
//活动名称地址
lazy var acitivityTitle:YHActivityTitleItemView = {
let view = YHActivityTitleItemView()
return view
}()
// //活动详情
// lazy var acitivityDetail:YHActivityDetailItemView = {
// let view = YHActivityDetailItemView()
// return view
// }()
//
// //活动温馨提示
// lazy var acitivityTips:YHActivityTipsItemView = {
// let view = YHActivityTipsItemView()
// return view
// }()
//
//
// //活动温馨提示
// lazy var fakeView:UIView = {
// let view = UIView()
// view.backgroundColor = .clear
// return view
// }()
}
extension YHActivityDetailCell0 {
func updateUI() {
guard let model = dataModel else {
return
}
contentView.removeSubviews()
contentView.addSubview(topImgV)
contentView.addSubview(acitivityTitle)
// contentView.addSubview(acitivityDetail)
// contentView.addSubview(acitivityTips)
// contentView.addSubview(fakeView)
topImgV.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.height.equalTo(KScreenWidth)
}
if let url = URL(string: model.cover) {
topImgV.kf.setImage(with: url, placeholder: UIImage(named: "global_default_image"))
} else {
topImgV.image = UIImage(named: "global_default_image")
}
acitivityTitle.dataModel = model
acitivityTitle.snp.makeConstraints { make in
make.top.equalTo(topImgV.snp.bottom).offset(24)
make.left.equalTo(20)
make.right.equalTo(-20)
make.bottom.equalToSuperview().offset(-24)
}
// var lastView : UIView = acitivityTitle
//
//
//
// //acitivityDetail
// if model.introduce.isEmpty && model.posters.count < 1 {
// //隐藏
// acitivityDetail.isHidden = true
// } else {
// //展示
// acitivityDetail.isHidden = false
// acitivityDetail.dataModel = model
//
//
// acitivityDetail.snp.makeConstraints { make in
// make.top.equalTo(lastView.snp.bottom).offset(24)
// make.left.equalTo(20)
// make.right.equalTo(-20)
// }
//
// lastView = acitivityDetail
// }
//
// //acitivityTips
// if model.tips.isEmpty {
// acitivityTips.isHidden = true
// } else {
// acitivityTips.isHidden = false
// acitivityTips.dataModel = model
//
// acitivityTips.snp.makeConstraints { make in
// make.top.equalTo(lastView.snp.bottom).offset(24)
// make.left.equalTo(20)
// make.right.equalTo(-20)
// }
// lastView = acitivityTips
// }
//
// fakeView.snp.makeConstraints { make in
// make.top.equalTo(lastView.snp.bottom).offset(24)
// make.left.equalTo(20)
// make.right.equalTo(-20)
// make.height.equalTo(1)
// make.bottom.equalToSuperview().offset(-42)
// }
}
func setupUI() {
backgroundColor = .clear
contentView.backgroundColor = .pageBkgColor
selectionStyle = .none
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailInfoCell.swift → galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailCell1.swift
View file @ fc27918e
//
// YHActivityDetailInfoCell.swift
// YHActivityDetailCell1.swift
// galaxy
//
// Created by edy on 2024/7/1.
// Created by davidhuangA on 2024/7/1.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
......@@ -21,9 +21,9 @@ class YHActivityCoverItem {
}
class YHActivityDetailInfoCell: UITableViewCell {
class YHActivityDetailCell1: UITableViewCell {
static let cellReuseIdentifier = "YHActivityDetailInfoCell"
static let cellReuseIdentifier = "YHActivityDetailCell1"
var dataModel : YHActivityDetailModel = YHActivityDetailModel() {
didSet {
......@@ -75,7 +75,7 @@ class YHActivityDetailInfoCell: UITableViewCell {
}
extension YHActivityDetailInfoCell {
extension YHActivityDetailCell1 {
func updateUI() {
......@@ -116,6 +116,10 @@ extension YHActivityDetailInfoCell {
}
func setupUI() {
backgroundColor = .clear
contentView.backgroundColor = .pageBkgColor
selectionStyle = .none
self.contentView.addSubview(bottomLine)
self.contentView.addSubview(nameLabel)
self.contentView.addSubview(describeLable)
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailCell2.swift 0 → 100644
View file @ fc27918e
//
// YHActivityDetailCell2.swift
// galaxy
//
// Created by davidhuangA on 2024/7/1.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHActivityDetailCell2: UITableViewCell {
static let cellReuseIdentifier = "YHActivityDetailCell2"
var dataModel : YHActivityDetailModel? {
didSet {
updateUI()
}
}
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
// lazy var topImgV:UIImageView = {
// let view = UIImageView()
// view.image = UIImage(named: "global_default_image")
// view.contentMode = .scaleAspectFill
// view.clipsToBounds = true
// return view
// }()
//
//
// //活动名称地址
// lazy var acitivityTitle:YHActivityTitleItemView = {
// let view = YHActivityTitleItemView()
// return view
// }()
//
//
// //活动详情
// lazy var acitivityDetail:YHActivityDetailItemView = {
// let view = YHActivityDetailItemView()
// return view
// }()
//活动温馨提示
lazy var acitivityTips:YHActivityTipsItemView = {
let view = YHActivityTipsItemView()
return view
}()
//活动温馨提示
lazy var fakeView:UIView = {
let view = UIView()
view.backgroundColor = .clear
return view
}()
}
extension YHActivityDetailCell2 {
func updateUI() {
guard let model = dataModel else {
return
}
contentView.removeSubviews()
// contentView.addSubview(topImgV)
// contentView.addSubview(acitivityTitle)
// contentView.addSubview(acitivityDetail)
contentView.addSubview(acitivityTips)
contentView.addSubview(fakeView)
// topImgV.snp.makeConstraints { make in
// make.top.left.right.equalToSuperview()
// make.height.equalTo(KScreenWidth)
// }
//
// if let url = URL(string: model.cover) {
// topImgV.kf.setImage(with: url, placeholder: UIImage(named: "global_default_image"))
// } else {
// topImgV.image = UIImage(named: "global_default_image")
// }
//
// acitivityTitle.dataModel = model
// acitivityTitle.snp.makeConstraints { make in
// make.top.equalTo(topImgV.snp.bottom).offset(24)
// make.left.equalTo(20)
// make.right.equalTo(-20)
// }
//
//
// var lastView : UIView = acitivityTitle
//
//
//
// //acitivityDetail
// if model.introduce.isEmpty && model.posters.count < 1 {
// //隐藏
// acitivityDetail.isHidden = true
// } else {
// //展示
// acitivityDetail.isHidden = false
// acitivityDetail.dataModel = model
//
//
// acitivityDetail.snp.makeConstraints { make in
// make.top.equalTo(lastView.snp.bottom).offset(24)
// make.left.equalTo(20)
// make.right.equalTo(-20)
// }
//
// lastView = acitivityDetail
// }
//
// //acitivityTips
// if model.tips.isEmpty {
// acitivityTips.isHidden = true
// } else {
// acitivityTips.isHidden = false
// acitivityTips.dataModel = model
//
// acitivityTips.snp.makeConstraints { make in
// make.top.equalTo(lastView.snp.bottom).offset(24)
// make.left.equalTo(20)
// make.right.equalTo(-20)
// }
// lastView = acitivityTips
// }
acitivityTips.dataModel = model
acitivityTips.snp.makeConstraints { make in
make.top.equalToSuperview().offset(24)
make.left.equalTo(20)
make.right.equalTo(-20)
}
fakeView.snp.makeConstraints { make in
make.top.equalTo(acitivityTips.snp.bottom).offset(24)
make.left.equalTo(20)
make.right.equalTo(-20)
make.height.equalTo(1)
make.bottom.equalToSuperview().offset(-42)
}
}
func setupUI() {
backgroundColor = .clear
contentView.backgroundColor = .pageBkgColor
selectionStyle = .none
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift
View file @ fc27918e
......@@ -8,6 +8,14 @@
import UIKit
class YHActivityHelpModel: YHBaseModel {
var type : Int = 0 //0-详情头 1-详情内容 2-详情tips
//活动详情内容
var activityDetailModel : YHActivityDetailModel?
}
class YHActivityViewModel: YHBaseViewModel {
//1、活动列表 、 我的报名活动列表
var hasMoreForActivityList : Bool = true
......@@ -20,6 +28,7 @@ class YHActivityViewModel: YHBaseViewModel {
//2.活动详情
var activityDetailModel : YHActivityDetailModel?
var arrActivityDetail : [YHActivityHelpModel] = []
//3.活动报名
var travelModel : YHTravelModel?
......@@ -112,12 +121,12 @@ extension YHActivityViewModel {
self.travelModel = result
callBackBlock(true, nil)
} else {
self.activityDetailModel = nil
self.travelModel = nil
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
self.activityDetailModel = nil
self.travelModel = nil
callBackBlock(false,err)
}
}
......@@ -137,20 +146,47 @@ extension YHActivityViewModel {
if json.code == 200 {
let dic = json.data
guard let result = YHActivityDetailModel.deserialize(from: dic as? Dictionary) else {
self.activityDetailModel = nil
// self.activityDetailModel = nil
self.arrActivityDetail = []
callBackBlock(false,nil)
return
}
self.activityDetailModel = result
self.activityDetailModel?.getImageInfo()
self.arrActivityDetail.removeAll()
let model0 = YHActivityHelpModel()
model0.activityDetailModel = result
self.arrActivityDetail.append(model0)
if result.introduce.isEmpty && result.posters.count < 1 {
} else {
let model1 = YHActivityHelpModel()
model1.type = 1
model1.activityDetailModel = result
self.arrActivityDetail.append(model1)
}
if !result.tips.isEmpty {
let model2 = YHActivityHelpModel()
model2.type = 2
model2.activityDetailModel = result
self.arrActivityDetail.append(model2)
}
callBackBlock(true, nil)
} else {
self.activityDetailModel = nil
// self.activityDetailModel = nil
self.arrActivityDetail = []
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
self.activityDetailModel = nil
// self.activityDetailModel = nil
self.arrActivityDetail = []
callBackBlock(false,err)
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment