活动细节联调

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift

@@ -51,7 +51,12 @@ class YHActivityDetailViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-        
+//        loadData()
+    }
+    
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         loadData()
     }
 }
@@ -69,6 +74,9 @@ extension YHActivityDetailViewController {
                 showApplyUI()
             case .applied:
                 printLog("已报名")
+                let vc = YHActivityTravelViewController()
+                vc.travelId = viewModel.activityDetailModel?.checkId ?? ""
+                navigationController?.pushViewController(vc)
             case .canceled:
 //                printLog("已取消报名")
                 showApplyUI()
@@ -172,6 +180,7 @@ extension YHActivityDetailViewController {
                 self.loadData()
                 DispatchQueue.main.async {
                     let vc = YHApplyActivityResultViewController()
+                    vc.isSuccessFlag = true
                     vc.activityTravelId = String(self.viewModel.activityTravelModel?.id ?? 0)
                     self.navigationController?.pushViewController(vc)
                 }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -21,7 +21,7 @@ enum YHActivityStatus: Int {
     case canceled = 4 // 已取消报名
     
     
-    var activityTitle : String {
+    var titleForList : String {
         switch self {
         case .notApply:
             return "立即报名"
@@ -30,7 +30,39 @@ enum YHActivityStatus: Int {
         case .end:
             return "活动结束"
         case .canceled:
-            return "已取消报名"
+            return "立即报名"
+        default:
+            return ""
+        }
+    }
+    
+    
+    var titleForMyApplyList : String {
+        switch self {
+        case .notApply:
+            return "立即报名"
+        case .applied:
+            return "已报名"
+        case .end:
+            return "活动结束"
+        case .canceled:
+            return "已取消"
+        default:
+            return ""
+        }
+    }
+    
+    
+    var titleForDetail : String {
+        switch self {
+        case .notApply:
+            return "立即报名"
+        case .applied:
+            return "查看行程单"
+        case .end:
+            return "活动结束"
+        case .canceled:
+            return "立即报名"
         default:
             return ""
         }
@@ -126,7 +158,11 @@ class YHActivityListViewController: YHBaseViewController {
         }
         
         emptyDataTipsView.isHidden = viewModel.arrActivityListData.count > 0 ? true : false
-        
+    }
+    
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         loadFirstData()
     }
 }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift

@@ -63,6 +63,12 @@ class YHActivityTravelViewController: YHBaseViewController {
         setupUI()
         loadData()
     }
+    
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        loadData()
+    }
 }
 
 extension YHActivityTravelViewController {
@@ -108,6 +114,73 @@ extension YHActivityTravelViewController {
             navigationController?.popViewController()
         }
     }
+    
+    func cancelActivityApply() {
+        viewModel.cancelActivityTravel(travelId:travelId) { [weak self] (success, error) in
+            if success {
+                YHHUD.flash(message: "已取消报名")
+                self?.loadData()
+            } else {
+                let msg = error?.errorMsg ?? "取消失败"
+                YHHUD.flash(message: msg)
+            }
+        }
+    }
+    
+    func clickBottomButton() {
+        if self.viewModel.activityTravelModel?.status.int == 2 {
+            //取消
+            YHCommonAlertView.show("", "是否取消报名?", "是", "否",fullGuestureEnable: false) {
+                self.cancelActivityApply()
+            } callBack: {
+            }
+            
+        } else if self.viewModel.activityTravelModel?.status.int == 4 {
+            //报名
+            self.showApplyUI()
+        }
+    }
+    
+    
+    func showApplyUI() {
+        YHApplyActivityAlert.showApplyActivityAlertView { (tag,name,number,phone) in
+            if tag {
+                printLog(tag)
+                printLog(name)
+                printLog(number)
+                printLog(phone)
+                if tag {
+                    if let model = self.viewModel.activityTravelModel,model.id > 0 {
+                        let param = ["id" : model.id,
+                                     "name":name,
+                                     "mobile":phone,
+                                     "number":number]
+                        self.applyActivity(param: param)
+                    }
+                }
+            }
+        }
+    }
+    
+    
+    func applyActivity(param : [String : Any]) {
+        
+        viewModel.applyActivity(param: param) { success, error in
+            if success {
+                YHHUD.flash(message: "报名成功")
+//                self.loadData()
+//                DispatchQueue.main.async {
+//                    let vc = YHApplyActivityResultViewController()
+//                    vc.activityTravelId = String(self.viewModel.activityTravelModel?.id ?? 0)
+//                    self.navigationController?.pushViewController(vc)
+//                }
+                self.navigationController?.popToRootViewController(animated: true)
+            } else {
+                let msg = error?.errorMsg ?? "报名失败,请重试"
+                YHHUD.flash(message: msg)
+            }
+        }
+    }
 }
 
 extension YHActivityTravelViewController: UITableViewDelegate, UITableViewDataSource {
@@ -122,6 +195,9 @@ extension YHActivityTravelViewController: UITableViewDelegate, UITableViewDataSo
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityTravelCell.cellReuseIdentifier, for: indexPath) as! YHActivityTravelCell
         cell.dataModel = viewModel.activityTravelModel
+        cell.block = {[weak self] in
+            self?.clickBottomButton()
+        }
         return cell
     }
     

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailBottomView.swift

@@ -48,7 +48,7 @@ private extension YHActivityDetailBottomView {
         
         if let status = Int(model.status) {
             isHidden = false
-            saveButton.setTitle(YHActivityStatus.init(rawValue: status)?.activityTitle, for: .normal)
+            saveButton.setTitle(YHActivityStatus.init(rawValue: status)?.titleForDetail, for: .normal)
             saveButton.backgroundColor = YHActivityStatus.init(rawValue: status)?.activityColor
         } else {
             isHidden = true

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityListCell.swift

@@ -134,15 +134,12 @@ extension YHActivityListCell {
         //
         detailLabel.text = model.place
         
-        
         if let status = Int(model.status) {
-            
-            statusLabel.text = YHActivityStatus.init(rawValue: status)?.activityTitle
+            statusLabel.text = YHActivityStatus.init(rawValue: status)?.titleForList
             statusLabel.textColor = YHActivityStatus.init(rawValue: status)?.activityColor
         } else {
             statusLabel.text = ""
         }
-        
     }
     
     func setupUI() {

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelCell.swift

@@ -20,7 +20,9 @@ class YHActivityTravelCell: UITableViewCell {
         }
     }
     
-   
+    typealias Block = () -> ()
+    var block: Block?
+    
     
     required init?(coder: NSCoder) {
         super.init(coder: coder)
@@ -84,43 +86,44 @@ extension YHActivityTravelCell {
             return
         }
         
+        if model.status.int == 2 {
+            cancelButton.isHidden = false
+            cancelButton.setTitle("取消报名", for: .normal)
+            cancelButton.setTitle("取消报名", for: .highlighted)
+            
+            cancelButton.setTitleColor(UIColor.mainTextColor, for: .normal)
+            cancelButton.setTitleColor(UIColor.mainTextColor, for: .highlighted)
+            
+            
+            cancelButton.backgroundColor = .white
+            cancelButton.layer.borderWidth = 1
+            cancelButton.layer.borderColor = UIColor.mainTextColor50.cgColor
+            
+        } else if model.status.int == 4 {
+            cancelButton.isHidden = false
+            
+            cancelButton.setTitle("重新报名", for: .normal)
+            cancelButton.setTitle("重新报名", for: .highlighted)
+            
+            cancelButton.setTitleColor(UIColor.white, for: .normal)
+            cancelButton.setTitleColor(UIColor.white, for: .highlighted)
+            
+            
+            cancelButton.backgroundColor = .brandMainColor
+            cancelButton.layer.borderWidth = 0
+            cancelButton.layer.borderColor = UIColor.clear.cgColor
+            
+        } else {
+            cancelButton.isHidden = true
+        }
+        
         
         
         
-//        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
-//        
-//        //acitivityDetail
-//        if model.introduce.isEmpty && model.posters.count < 1 {
-//            //隐藏
-//            acitivityDetail.isHidden = true
-//        } else {
-//            //展示
-//            acitivityDetail.isHidden = false
-//            acitivityDetail.dataModel = model
-//        }
-//        
-//        //acitivityTips
-//        if model.tips.isEmpty {
-//            acitivityTips.isHidden = true
-//        } else {
-//            acitivityTips.isHidden = false
-//            acitivityTips.dataModel = model
-//        }
-//        layoutIfNeeded()
     }
     
     @objc func clickCancelBtn() {
-        YHCommonAlertView.show("", "是否取消报名?", "是", "否",fullGuestureEnable: false) {
-            self.isApplyFlag = false
-            self.updateRightBtnUI()
-        } callBack: {
-        }
+        self.block?()
     }
     
     func updateRightBtnUI() {

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift

@@ -34,6 +34,37 @@ class YHActivityViewModel: YHBaseViewModel {
 
 extension YHActivityViewModel {
     
+    /*
+     *取消活动报名
+     */
+    func cancelActivityTravel(travelId : String ,callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Activity.cancelApi
+        let param = ["id":travelId]
+        let _ = YHNetRequest.putRequest(url: strUrl,params: param) { [weak self] json, code in
+            guard self != nil else { return }
+            
+            //1. json字符串 转 对象
+            if json.code == 200 {
+//                let dic = json.data
+//                guard let result = YHActivityTravelModel.deserialize(from: dic as? Dictionary) else {
+//                    self.activityTravelModel = nil
+//                    callBackBlock(false,nil)
+//                    return
+//                }
+//                self.activityTravelModel = result
+                callBackBlock(true, nil)
+            } else {
+//                self.activityTravelModel = nil
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+//            self.activityTravelModel = nil
+            callBackBlock(false,err)
+        }
+    }
+    
+    
     /*
      *活动行程单
      */

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -20,9 +20,11 @@ class YHAllApiName {
         //活动报名
         static let applyApi = "super-app/activity/join"
         
-        
         //活动行程单
         static let travelApi = "super-app/activity/check-list"
+        
+        //取消活动报名
+        static let cancelApi = "super-app/activity/cancel"
     }
     
     

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -392,6 +392,14 @@ extension YHNetRequest {
         return YHNetRequest().businessCode(businessCode).url(url).requestType(.post).params(params).success(successBlock).failed(failBlock).startRequest()
     }
     
+    
+    class func putRequest(url:String, params:[String:Any] = [:], _ businessCode: String = "4001001", successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
+        printLog("\n发起请求的URL是===> url = \(url)")
+        printLog("\n发起请求的参数是===> url = \(params)")
+        
+        return YHNetRequest().businessCode(businessCode).url(url).requestType(.put).params(params).success(successBlock).failed(failBlock).startRequest()
+    }
+    
     class func uplaodRequest(url:String, headers:HTTPHeaders, image: UIImage, _ businessCode: String = "4001001", successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
         printLog("\n发起请求的URL是===> url = \(url)")
         return YHNetRequest().businessCode(businessCode).url(url).success(successBlock).failed(failBlock).uploadRequest(headers, image)