Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

张旭
2 parents 1a3c609c 7dd344ae
Showing 8 changed files with 138 additions and 105 deletions
metaCode/Classes/Main/HomePage/View/CNHomePageBackgroupView.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineMessageViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineSubBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -113,7 +113,7 @@ class CNHomePageBackgroupView: UIView{
             let idModel:StandListModel = idArray[i]
             let navTitle:String = idModel.name!
             subView.setTitle(title: navTitle)
-            
+            subView.imageView.kf.indicatorType = .activity
             subView.imageView.kf.setImage(with: URL(string: idModel.backgroundImg),placeholder: UIImage(named: "homePage_backgroup_blue"))
             //更新双向链表
@@ -11,7 +11,7 @@ import JXPagingView
 import MJRefresh
 let kCNLiveSectionTitleHeight = 70//标题显示
-let kCNLiveSectionHeaderHeight = 200//头视图高度
+let kCNLiveSectionHeaderHeight = 140//头视图高度 加上说明200
 extension JXPagingListContainerView: JXSegmentedViewListContainer {}
@@ -27,6 +27,16 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
         return tableView
     }()
+    lazy var tipLabel: UILabel = {
+        let tipLabel = UILabel.init()
+        tipLabel.textColor = HexColor("#999999")
+        tipLabel.text = "请填写真实信息，提交完成后，不可更改!"
+        tipLabel.font = Font_11_Fit
+        tipLabel.isHidden = true
+        tipLabel.textAlignment = .center
+        return tipLabel
+    }()
+    
     lazy var sendButton: UIButton = {
         let sendButton = UIButton(type: .custom)
         sendButton.setTitle("添加身份", for: .normal)
@@ -64,6 +74,8 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
         loadStandInfoData()
+
+        
         view.addSubview(sendButton)
         sendButton.snp.makeConstraints { make in
             make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight() - 20)
@@ -71,13 +83,21 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
             make.right.equalToSuperview().offset(-10)
             make.height.equalTo(40)
         }
+        
+        view.addSubview(tipLabel)
+        tipLabel.snp.makeConstraints { make in
+            make.bottom.equalTo(sendButton.snp.top).offset(-10)
+            make.centerX.equalToSuperview()
+            make.left.right.equalToSuperview()
+        }
+        
         setupWithSendBtnStatue(statue: false)
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.top.equalTo(get_system_nav_height())
             make.left.right.equalToSuperview()
-            make.bottom.equalTo(sendButton.snp.top).offset(-10)
+            make.bottom.equalTo(tipLabel.snp.top).offset(-10)
         }
     }
@@ -89,6 +109,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
                 self?.tableView.reloadData()
                 if (self?.dataArray.count)! > 0 {
                     self?.sendButton.isHidden = false
+                    self?.tipLabel.isHidden = false
                     self?.tableView.tableHeaderView = self?.setupHeaderAndFooter(is_last: false)
                     self?.tableView.tableFooterView = self?.setupHeaderAndFooter(is_last: true)
                 }
@@ -107,7 +128,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     @objc func sendInfoActionMothod() {
         setupWithContentUploadImage { [self] url in
-            self.tempCell._infoModel?.value = url
+            if (self?.tempCell) self.tempCell._infoModel?.value = url
             CNLiveMineViewModel.requestsPOSTAuthInfo(identityId: "\(_listModel.id)", infos: self.dataArray) { [self] result, respStatue in
                 if respStatue == .success {
                     showMessage(message: "上传成功")
@@ -63,9 +63,9 @@ extension CNLiveMineMessageViewController {
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 100 + _listModel.textHeight
+        return 60 + _listModel.textHeight //100
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        showMessage(message: "跳转H5详情界面")
+//        showMessage(message: "跳转H5详情界面")
     }
 }
@@ -87,6 +87,7 @@ class MineBodyOneListViewCell : UITableViewCell {
         iconView.clipsToBounds = true
         iconView.contentMode = .scaleToFill
         iconView.backgroundColor = .white
+        iconView.kf.indicatorType = .activity
         iconView.kf.setImage(with: URL(string: authModel.icon ?? ""), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 40, height: 40)))
         mainView.addSubview(iconView)
         iconView.snp.makeConstraints { make in
@@ -279,6 +280,7 @@ class MineBodyTwoListViewCell : UITableViewCell {
         }
         if (dict.keys.contains("avatar") && (dict["avatar"] as! String).count > 0) {
             avatarView.isHidden = false
+            avatarView.kf.indicatorType = .activity
             avatarView.kf.setImage(with: URL(string: "\(dict["avatar"] ?? "")"), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
         }
         nameLabel.text = "\(dict["name"] ?? "")"
@@ -558,7 +560,7 @@ class MineBodyFourViewCell: UITableViewCell {
     }
     func setupWithData(listModel: MineTaskCheckListModel) {
-        
+        iconView.kf.indicatorType = .activity
         iconView.kf.setImage(with: URL(string: listModel.icon ?? "") , placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSizeMake(50, 50)))
         nameLabel.text = listModel.title ?? ""
         descLabel.text = "积分值+\(listModel.score ?? "")"
@@ -317,7 +317,7 @@ class MineQuestHeaderView: UIView {
     }()
 //    lazy var pointView: UIImageView = {
-//        
+//
 //        return <#value#>
 //    }()
@@ -496,37 +496,37 @@ class MineEarnHeaderView: UIView {
         return right_Label
     }()
-    lazy var exChangeBtn : UIButton = {
-        let exChangeBtn = UIButton.init(type: .custom)
-        exChangeBtn.size = CGSize(width: 50, height: 20)
-        exChangeBtn.backgroundColor = .clear
-        exChangeBtn.titleLabel?.font = Font_12
-        exChangeBtn.setTitleColor(.white, for: .normal)
-        exChangeBtn.setTitle("去兑换", for: .normal)
-        exChangeBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
-        exChangeBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
-        exChangeBtn.sizeToFit()
-        exChangeBtn.addTarget(self, action: #selector(pushExChangeMethod), for: .touchUpInside)
-        return exChangeBtn
-    }()
-    
-    lazy var tipView: UIView = {
-        let tipView = UIView.init()
-        tipView.backgroundColor = HexColor("#F7F8FA")
-        tipView.layer.cornerRadius = 5
-        tipView.layer.masksToBounds = true
-        return tipView
-    }()
-    
-    lazy var tipLabel: UILabel = {
-        let tipLabel = UILabel.init()
-        tipLabel.text = "兑换比例：10000积分=1元码余额 \n 积分到账可能会有延迟"
-        tipLabel.textColor = HexColor("#999999")
-        tipLabel.font = Font_13_Fit
-        tipLabel.numberOfLines = 2
-        tipLabel.lineBreakMode = .byCharWrapping
-        return tipLabel
-    }()
+//    lazy var exChangeBtn : UIButton = {
+//        let exChangeBtn = UIButton.init(type: .custom)
+//        exChangeBtn.size = CGSize(width: 50, height: 20)
+//        exChangeBtn.backgroundColor = .clear
+//        exChangeBtn.titleLabel?.font = Font_12
+//        exChangeBtn.setTitleColor(.white, for: .normal)
+//        exChangeBtn.setTitle("去兑换", for: .normal)
+//        exChangeBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
+//        exChangeBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
+//        exChangeBtn.sizeToFit()
+//        exChangeBtn.addTarget(self, action: #selector(pushExChangeMethod), for: .touchUpInside)
+//        return exChangeBtn
+//    }()
+//
+//    lazy var tipView: UIView = {
+//        let tipView = UIView.init()
+//        tipView.backgroundColor = HexColor("#F7F8FA")
+//        tipView.layer.cornerRadius = 5
+//        tipView.layer.masksToBounds = true
+//        return tipView
+//    }()
+//
+//    lazy var tipLabel: UILabel = {
+//        let tipLabel = UILabel.init()
+//        tipLabel.text = "兑换比例：10000积分=1元码余额 \n 积分到账可能会有延迟"
+//        tipLabel.textColor = HexColor("#999999")
+//        tipLabel.font = Font_13_Fit
+//        tipLabel.numberOfLines = 2
+//        tipLabel.lineBreakMode = .byCharWrapping
+//        return tipLabel
+//    }()
     var _checkModel: MinePointCheckInModel!
     init(frame: CGRect, checkModel: MinePointCheckInModel) {
@@ -537,13 +537,13 @@ class MineEarnHeaderView: UIView {
         mainView.addSubview(exrChangeView)
         exlChangeView.addSubview(left_Label)
         exlChangeView.addSubview(left_tipLabel)
-        exlChangeView.addSubview(exChangeBtn)
+//        exlChangeView.addSubview(exChangeBtn)
         exrChangeView.addSubview(right_Label)
         exrChangeView.addSubview(right_tipLabel)
-        mainView.addSubview(tipView)
-        tipView.addSubview(tipLabel)
+//        mainView.addSubview(tipView)
+//        tipView.addSubview(tipLabel)
         left_Label.text = checkModel.integral
         right_Label.text = checkModel.money
@@ -559,31 +559,33 @@ class MineEarnHeaderView: UIView {
             make.right.equalToSuperview().offset(-20)
         }
-        tipView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.left.equalToSuperview().offset(10)
-            make.right.bottom.equalToSuperview().offset(-10)
-            make.height.equalTo(50)
-        }
-        
-        tipLabel.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(2.5)
-            make.left.equalToSuperview().offset(10)
-            make.right.equalToSuperview().offset(-10)
-            make.bottom.equalToSuperview().offset(-2.5)
-        }
+//        tipView.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.left.equalToSuperview().offset(10)
+//            make.right.bottom.equalToSuperview().offset(-10)
+//            make.height.equalTo(50)
+//        }
+//
+//        tipLabel.snp.makeConstraints { make in
+//            make.top.equalToSuperview().offset(2.5)
+//            make.left.equalToSuperview().offset(10)
+//            make.right.equalToSuperview().offset(-10)
+//            make.bottom.equalToSuperview().offset(-2.5)
+//        }
         exlChangeView.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(10)
             make.width.equalTo((KSreenWidth - 70)*0.56)
-            make.bottom.equalTo(tipView.snp.top).offset(-10)
+            make.bottom.equalToSuperview().offset(-10)
+//            make.bottom.equalTo(tipView.snp.top).offset(-10)
         }
         exrChangeView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(10)
             make.right.equalToSuperview().offset(-10)
             make.width.equalTo((KSreenWidth - 70)*0.44)
-            make.bottom.equalTo(tipView.snp.top).offset(-10)
+            make.bottom.equalToSuperview().offset(-10)
+//            make.bottom.equalTo(tipView.snp.top).offset(-10)
         }
         left_tipLabel.snp.makeConstraints { make in
@@ -595,12 +597,12 @@ class MineEarnHeaderView: UIView {
             make.bottom.equalToSuperview().offset(-20)
         }
-        exChangeBtn.snp.makeConstraints { make in
-            make.centerY.equalTo(left_tipLabel)
-            make.right.equalToSuperview().offset(-10)
-            make.left.equalTo(left_tipLabel.snp.right).offset(5)
-            make.width.equalTo(50)
-        }
+//        exChangeBtn.snp.makeConstraints { make in
+//            make.centerY.equalTo(left_tipLabel)
+//            make.right.equalToSuperview().offset(-10)
+//            make.left.equalTo(left_tipLabel.snp.right).offset(5)
+//            make.width.equalTo(50)
+//        }
         right_tipLabel.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(10)
@@ -155,6 +155,7 @@ class MineStandInfoTableViewCell: UITableViewCell {
     }()
     public func setupWithAuthDataSource(icon: String, name: String,number: String) {
+        iconView.kf.indicatorType = .activity
         iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 50, height: 50)))
         titleLabel.text = name
         numberLabel.text = "编号:\(number)"
@@ -162,6 +163,7 @@ class MineStandInfoTableViewCell: UITableViewCell {
     public func setupWithMessageDataSource(icon: String, name: String,number: String, time: String) {
         if !icon.isEmpty {
+            iconView.kf.indicatorType = .activity
             iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 40, height: 40)))
         } else {
             iconView.image = UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 40, height: 40))
@@ -320,27 +322,27 @@ class MessageDescTableViewCell: UITableViewCell {
         return contentLabel
     }()
-    lazy var lineLabel: UILabel = {
-        let lineLabel = UILabel.init()
-        lineLabel.backgroundColor = HexColor("#EAEAEA")
-        return lineLabel
-    }()
-    
-    lazy var textButton: UIButton = {
-        let textButton = UIButton.init(type: .custom)
-        textButton.setTitle("查看详情", for: .normal)
-        textButton.setTitleColor(HexColor("#609BFF"), for: .normal)
-        textButton.titleLabel?.font = Font_13
-        return textButton
-    }()
-    
-    lazy var textView: UIImageView = {
-        let textView = UIImageView.init()
-        textView.image = UIImage(named: "mine_header_message_blue_more")
-        textView.contentMode = .scaleToFill
-        textView.backgroundColor = .white
-        return textView
-    }()
+//    lazy var lineLabel: UILabel = {
+//        let lineLabel = UILabel.init()
+//        lineLabel.backgroundColor = HexColor("#EAEAEA")
+//        return lineLabel
+//    }()
+    
+//    lazy var textButton: UIButton = {
+//        let textButton = UIButton.init(type: .custom)
+//        textButton.setTitle("查看详情", for: .normal)
+//        textButton.setTitleColor(HexColor("#609BFF"), for: .normal)
+//        textButton.titleLabel?.font = Font_13
+//        return textButton
+//    }()
+    
+//    lazy var textView: UIImageView = {
+//        let textView = UIImageView.init()
+//        textView.image = UIImage(named: "mine_header_message_blue_more")
+//        textView.contentMode = .scaleToFill
+//        textView.backgroundColor = .white
+//        return textView
+//    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -352,9 +354,9 @@ class MessageDescTableViewCell: UITableViewCell {
         addSubview(iconView)
         addSubview(cView)
         cView.addSubview(contentLabel)
-        cView.addSubview(lineLabel)
-        cView.addSubview(textButton)
-        cView.addSubview(textView)
+//        cView.addSubview(lineLabel)
+//        cView.addSubview(textButton)
+//        cView.addSubview(textView)
         setConstraints()
     }
@@ -375,23 +377,23 @@ class MessageDescTableViewCell: UITableViewCell {
             make.right.equalToSuperview().offset(-30)
             make.height.equalTo(0)
         }
-        textButton.snp.makeConstraints { make in
-            make.bottom.equalToSuperview().offset(-10)
-            make.right.equalToSuperview().offset(-20)
-            make.height.equalTo(20)
-        }
-        textView.snp.makeConstraints { make in
-            make.centerY.equalTo(textButton)
-            make.height.equalTo(10)
-            make.right.equalToSuperview().offset(-10)
-            make.width.equalTo(5)
-        }
-        lineLabel.snp.makeConstraints { make in
-            make.bottom.equalTo(textButton.snp.top).offset(-10)
-            make.left.equalToSuperview().offset(10)
-            make.right.equalToSuperview().offset(-10)
-            make.height.equalTo(1)
-        }
+//        textButton.snp.makeConstraints { make in
+//            make.bottom.equalToSuperview().offset(-10)
+//            make.right.equalToSuperview().offset(-20)
+//            make.height.equalTo(20)
+//        }
+//        textView.snp.makeConstraints { make in
+//            make.centerY.equalTo(textButton)
+//            make.height.equalTo(10)
+//            make.right.equalToSuperview().offset(-10)
+//            make.width.equalTo(5)
+//        }
+//        lineLabel.snp.makeConstraints { make in
+//            make.bottom.equalTo(textButton.snp.top).offset(-10)
+//            make.left.equalToSuperview().offset(10)
+//            make.right.equalToSuperview().offset(-10)
+//            make.height.equalTo(1)
+//        }
         contentLabel.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(10)
             make.right.equalToSuperview().offset(-10)
@@ -410,12 +412,16 @@ class MessageDescTableViewCell: UITableViewCell {
         if listModel.poster.isEmpty {
             iconView.image = UIImage.imageWithColor(color: .red, size: CGSizeMake(40, 40))
         } else {
+            iconView.kf.indicatorType = .activity
             iconView.kf.setImage(with: URL(string: listModel.poster), placeholder: UIImage.imageWithColor(color: .red, size: CGSizeMake(40, 40)))
         }
         cView.snp.updateConstraints { make in
             make.height.equalTo(listModel.textHeight + 60)
         }
         contentLabel.snp.updateConstraints { make in
+            make.left.top.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.width.equalTo(KSreenWidth - 110)
             make.height.equalTo(listModel.textHeight)
         }
     }
@@ -673,6 +673,8 @@ class CNLiveMineViewModel: NSObject {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "targetId")
         param.setValue("0", forKey: "type")//0全部(默认) 1收入 2支出
+        param.setValue("1692610120000", forKey: "startTime")
+        param.setValue("1695202120000", forKey: "endTime")
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "pageNo")
         let custom_param = NSMutableDictionary()
@@ -721,7 +723,7 @@ class CNLiveMineViewModel: NSObject {
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("2022-08-21", forKey: "startTime")//开始时间
         param.setValue("2022-09-20", forKey: "endTime")//开始时间
-        param.setValue("1", forKey: "type")
+        param.setValue("0", forKey: "type")//0全部(默认) 1收入 2支出
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "pageNo")
         let custom_param = NSMutableDictionary()