提交修改

liushiyu
1 parent 78239991
Showing 14 changed files with 374 additions and 113 deletions
Podfile
metaCode/Classes/Extensions/NSDate+CNLiveExtensions.swift
metaCode/Classes/Extensions/UIButton+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnListViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineQuestViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.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/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -37,6 +37,8 @@ target &#39;metaCode&#39; do
   pod 'SwiftGifOrigin', '~> 1.7.0'
   #数据库存储
   pod 'WCDB.swift'
+  #占位按钮
+  pod 'APButton'
   #分类滚动切换视图
   pod 'JXSegmentedView', :git => 'https://gitee.com/mirrors/JXSegmentedView.git'
   pod 'JXPagingView/Paging'
@@ -16,4 +16,16 @@ extension NSDate{
         return formatter.string(from: self as Date)
     }
+    //时间戳转成字符串
+    static func timeIntervalChangeToTimeStr(timeInterval: Double, _ dateFormat:String? = "yyyy-MM-dd") -> String {
+        let date:Date = Date.init(timeIntervalSince1970: timeInterval)
+        let formatter = DateFormatter.init()
+        if dateFormat == nil {
+            formatter.dateFormat = "yyyy-MM-dd"
+        }else{
+            formatter.dateFormat = dateFormat
+        }
+        return formatter.string(from: date as Date)
+    }
+    
 }
@@ -82,4 +82,6 @@ extension UIButton {
             self.imageEdgeInsets = UIEdgeInsets(top: ((selfHeight - totalHeight) / 2 + titleRect.size.height + padding - imageRect.origin.y), left: (selfWidth / 2 - imageRect.origin.x - imageRect.size.width / 2), bottom: -((selfHeight - totalHeight) / 2 + titleRect.size.height + padding - imageRect.origin.y), right: -(selfWidth / 2 - imageRect.origin.x - imageRect.size.width / 2))
         }
     }
+    
+    
 }
@@ -303,6 +303,10 @@ extension CNLiveMineAddInfoViewController {
         }
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if _show_type == .message {
+            let listModel = listArray[indexPath.row]
+            return 76 + listModel.textHeight
+        }
         return 100
     }
     func tableView(_ tableView: UITableView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
@@ -8,6 +8,7 @@
 import Foundation
 import JXPagingView
 import MJRefresh
+import EmptyDataSet_Swift
 enum MineEarnShowType {
     case record //积分记录
@@ -15,7 +16,7 @@ enum MineEarnShowType {
 }
 typealias CallBack = (_ scrollView: UIScrollView) -> Void
-class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewListViewDelegate, UITableViewDelegate, UITableViewDataSource {
+class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewListViewDelegate, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate{
     let kMIneBodyFiveViewCellIdentifier = "kMIneBodyFiveViewCellIdentifier"
@@ -23,6 +24,8 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
         let tableView = UITableView.init(frame: .zero, style: .plain)
         tableView.delegate = self
         tableView.dataSource = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.showsVerticalScrollIndicator = false
@@ -44,34 +47,65 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
     var pageNum: NSInteger!
     var _callBack: CallBack!
     var _show_type : MineEarnShowType!
+    var network_type: CNLiveMineResponseType!
     init(show_type: MineEarnShowType) {
         pageNum = 1
         super.init(nibName: nil, bundle: nil)
         _show_type = show_type
     }
-    func loadDataWithTradRecord(page: NSInteger) {
-        
+    func loadDataWithTradRecord(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
+        if page == 1 {
+            self.pageNum = 1
+        }
         if _show_type == .balance {
-            CNLiveMineViewModel.requestWithTradRecord(page: page) {result, respStatue in
+            CNLiveMineViewModel.requestWithTradRecord(page: page) { result, respStatue in
                 if respStatue == .success {
+                    let listModel = result as! MineTradingRecordBaseModel
+                    self.network_type = .success
                     self.dataArray.removeAllObjects()
-                    self.dataArray.addObjects(from: result as! [MineTradingRecordModel])
+                    self.dataArray.addObjects(from: listModel.list)
                     self.tableView.reloadData()
                     self.tableView.mj_header?.endRefreshing()
                     self.tableView.mj_footer?.endRefreshing()
+                    if self.dataArray.count > 0 {
+                        self.addRefreshView()
+                    }
+                }else if (respStatue == .noNetwork) {
+                    self.network_type = .noNetwork
+                    self.tableView.reloadEmptyDataSet()
+                } else {
+                    self.network_type = .failed
+                    self.tableView.reloadEmptyDataSet()
                 }
+                resultBlock(result, respStatue)
             }
         }
         if _show_type == .record {
             CNLiveMineViewModel.requestWithIntegralRecord(page: page) { result, respStatue in
                 if respStatue == .success {
+                    let listModel = result as! MineIntegralRecordModel
+                    self.network_type = .success
                     self.dataArray.removeAllObjects()
-                    self.dataArray.addObjects(from: (result as! MineIntegralRecordModel).integralList)
+                    self.dataArray.addObjects(from: listModel.integralList)
                     self.tableView.reloadData()
                     self.tableView.mj_header?.endRefreshing()
                     self.tableView.mj_footer?.endRefreshing()
+                    if self.dataArray.count > 0 {
+                        self.addRefreshView()
+                    }
+                    if !listModel.hasNext {
+                        self.tableView.mj_footer?.endRefreshing()
+                        self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    }
+                }else if (respStatue == .noNetwork) {
+                    self.network_type = .noNetwork
+                    self.tableView.reloadEmptyDataSet()
+                } else {
+                    self.network_type = .failed
+                    self.tableView.reloadEmptyDataSet()
                 }
+                resultBlock(result, respStatue)
             }
         }
     }
@@ -83,22 +117,23 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
     override func viewDidLoad() {
         super.viewDidLoad()
-        loadDataWithTradRecord(page: self.pageNum)
+        loadDataWithTradRecord(page: self.pageNum) {result,respStatue in }
+        
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.top.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
         }
-        
-        addRefreshView()
     }
     private func addRefreshView() {
-        tableView.mj_footer = MJRefreshFooter.init(refreshingBlock: {[weak self] in
+        let footerView = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
             self!.pageNum += 1
-            self!.loadDataWithTradRecord(page: self!.pageNum)
+            self!.loadDataWithTradRecord(page: self!.pageNum) {result,respStatue in }
         })
+        footerView.setTitle("123456", for: .noMoreData)
+        tableView.mj_footer = footerView
     }
 }
 extension CNLiveMineEarnListViewController {
@@ -135,6 +170,51 @@ extension CNLiveMineEarnListViewController {
 extension CNLiveMineEarnListViewController {
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 && network_type == .success{
+            defult_string = "暂无记录～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if (network_type == .failed || network_type == .noNetwork) {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷新", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func backgroundColor(forEmptyDataSet scrollView: UIScrollView) -> UIColor? {
+        return UIColor.white
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        pageNum = 1
+        loadDataWithTradRecord(page: 1) {result,respStatue in }
+    }
+}
+
+extension CNLiveMineEarnListViewController {
+    
     func listView() -> UIView {
         return view
     }
@@ -120,6 +120,7 @@ class CNLiveMineEarnViewController: CNLiveBaseViewController, JXPagingViewDelega
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         categoryView.selectItemAt(index: _index)
+        pagingView.listContainerView.didClickSelectedItem(at: _index)
     }
     override func viewDidLoad() {
@@ -128,12 +129,13 @@ class CNLiveMineEarnViewController: CNLiveBaseViewController, JXPagingViewDelega
         titleName = "我的收益"
         view.addSubview(pagingView)
-        pagingView.listContainerView.didClickSelectedItem(at: _index)
+        
         pagingView.mainTableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: { [self] in
-            pagingView.mainTableView.mj_header?.endRefreshing()
-//            self!.pageNum = 1
-//            self!.loadDataWithTradRecord(page: self!.pageNum)
+            let vc = viewControllers[pagingView.listContainerView.currentIndex] as! CNLiveMineEarnListViewController
+            vc.loadDataWithTradRecord(page: 1) { [self] result, respStatue in
+                pagingView.mainTableView.mj_header?.endRefreshing()
+            }
         })
     }
 }
@@ -12,7 +12,7 @@ import HXPHPicker
 typealias resultUploadImageBlock = (_ url: String) -> Void
 class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate, PhotoPickerControllerDelegate{
-    let kMineBodyInputAuthCellIdentifier = "kMineBodyInputAuthCellIdentifier"
+    static let kMineBodyInputAuthCellIdentifier = "kMineBodyInputAuthCellIdentifier"
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.delegate = self
@@ -23,7 +23,6 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
         tableView.tableFooterView = UIView.init()
         tableView.contentInsetAdjustmentBehavior = .scrollableAxes
         tableView.separatorStyle = .none
-        tableView.register(MineBodyInputAuthCell.self, forCellReuseIdentifier: kMineBodyInputAuthCellIdentifier)
         return tableView
     }()
@@ -106,13 +105,16 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
         CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate) {[weak self] result, respStatue in
             if respStatue == .success {
                 self?.dataArray.addObjects(from: result as! [Any])
-                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)
+                    for i in 0..<(self?.dataArray.count)! {
+                        self?.tableView.register(MineBodyInputAuthCell.self, forCellReuseIdentifier: CNLiveMineInputViewController.kMineBodyInputAuthCellIdentifier+"\(i)")
+                    }
                 }
+                self?.tableView.reloadData()
             }
         }
     }
@@ -183,7 +185,7 @@ extension CNLiveMineInputViewController {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: kMineBodyInputAuthCellIdentifier) as! MineBodyInputAuthCell
+        let cell = tableView.dequeueReusableCell(withIdentifier: CNLiveMineInputViewController.kMineBodyInputAuthCellIdentifier+"\(indexPath.row)") as! MineBodyInputAuthCell
         cell.setListModel(infoModel: self.dataArray[indexPath.row] as! MineStandInfoModel, is_last: indexPath.row == self.dataArray.count - 1) {[weak self] type in
             if type == .end {
                 let is_result = self?.inspectResult()
@@ -6,14 +6,17 @@
 //
 import Foundation
+import EmptyDataSet_Swift
-class CNLiveMineQuestViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource {
+class CNLiveMineQuestViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
     let kMineBodyFourViewCellIdentifier = "kMineBodyFourViewCellIdentifier"
     lazy var tableView: UITableView = {
         let tableView = UITableView.init(frame: .zero, style: .plain)
         tableView.delegate = self
         tableView.dataSource = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.register(MineBodyFourViewCell.self, forCellReuseIdentifier: kMineBodyFourViewCellIdentifier)
@@ -61,6 +64,7 @@ class CNLiveMineQuestViewController: CNLiveBaseViewController, UITableViewDelega
     }()
     var _checkModel: MinePointCheckInModel!
+    var network_type: CNLiveMineResponseType!
     init(checkModel:MinePointCheckInModel) {
        super.init(nibName:nil, bundle:nil)
         _checkModel = checkModel
@@ -89,14 +93,65 @@ class CNLiveMineQuestViewController: CNLiveBaseViewController, UITableViewDelega
     func loadDataWithTaskList() {
         CNLiveMineViewModel.requestWithTaskList { result, respStatue in
             if respStatue == .success {
+                self.network_type = .success
                 self.dataArray.addObjects(from: result as! [MineTaskCheckListModel])
                 self.tableView.reloadData()
+            }else if (respStatue == .noNetwork) {
+                self.network_type = .noNetwork
+                self.tableView.reloadEmptyDataSet()
+            } else {
+                self.network_type = .failed
+                self.tableView.reloadEmptyDataSet()
             }
         }
     }
 }
 extension CNLiveMineQuestViewController {
+    
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 && network_type == .success{
+            defult_string = "暂无任务～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if (network_type == .failed || network_type == .noNetwork) {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷新", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func backgroundColor(forEmptyDataSet scrollView: UIScrollView) -> UIColor? {
+        return UIColor.white
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        loadDataWithTaskList() 
+    }
+}
+
+extension CNLiveMineQuestViewController {
     func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
@@ -135,9 +135,9 @@ extension CNLiveMineViewController {
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if indexPath.section == 0 {
-            self.navigationController?.pushViewController(CNLiveMineQuestViewController.init(checkModel: checkModel), animated: true)
-        }
+//        if indexPath.section == 0 {
+//            self.navigationController?.pushViewController(CNLiveMineQuestViewController.init(checkModel: checkModel), animated: true)
+//        }
         if indexPath.section == 1 {
             self.navigationController?.pushViewController(CNLiveMineAddInfoViewController.init(show_type: .info), animated: true)
         }
@@ -7,6 +7,7 @@
 import Foundation
 import Kingfisher
+import APButton
 class MineBodyOneListViewCell : UITableViewCell {
@@ -59,6 +60,7 @@ class MineBodyOneListViewCell : UITableViewCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         self.backgroundColor = .clear
+        contentView.backgroundColor = .clear
         addSubview(mainView)
         mainView.addSubview(headerView)
@@ -194,6 +196,7 @@ class MineBodyTwoListViewCell : UITableViewCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         self.backgroundColor = .clear
+        contentView.backgroundColor = .clear
         addSubview(mainView)
         mainView.addSubview(headerView)
@@ -298,6 +301,7 @@ class MineBodyThreeViewCell: UITableViewCell {
         let mainView = UIImageView.init()
         mainView.backgroundColor = .clear
         mainView.contentMode = .scaleToFill
+        mainView.isUserInteractionEnabled = true
         mainView.image = UIImage(named: "mine_header_point_back")
         return mainView
     }()
@@ -313,11 +317,12 @@ class MineBodyThreeViewCell: UITableViewCell {
     lazy var pointButton: UIButton = {
         let pointButton  = UIButton.init(type: .custom)
         pointButton.backgroundColor = .clear
-        pointButton.setTitle(" 去赚积分", for: .normal)
+        pointButton.setTitle("  去赚积分", for: .normal)
         pointButton.titleLabel?.font = Font_12
         pointButton.imageView?.contentMode = .scaleToFill
         pointButton.setTitleColor(HexColor("#FFE4C4"), for: .normal)
         pointButton.setImage(UIImage(named: "mine_header_point_gold_coin"), for: .normal)
+        pointButton.addTarget(self, action: #selector(pushMineQuestView), for: .touchUpInside)
         return pointButton
     }()
@@ -350,16 +355,7 @@ class MineBodyThreeViewCell: UITableViewCell {
         balanceLabel.textAlignment = .left
         return balanceLabel
     }()
-    
-    lazy var balanceNumberLabel: UILabel = {
-        let balanceNumberLabel = UILabel.init()
-        balanceNumberLabel.text = "0"
-        balanceNumberLabel.font = BoldFont_19_Fit
-        balanceNumberLabel.textAlignment = .left
-        balanceNumberLabel.textColor = HexColor("#FFE4C4")
-        return balanceNumberLabel
-    }()
-    
+
     lazy var pointLabel: UILabel = {
         let pointLabel = UILabel.init()
         pointLabel.text = "积分"
@@ -369,13 +365,24 @@ class MineBodyThreeViewCell: UITableViewCell {
         return pointLabel
     }()
-    lazy var pointNumberLabel: UILabel = {
-        let pointNumberLabel = UILabel.init()
-        pointNumberLabel.font = BoldFont_19_Fit
-        pointNumberLabel.text = "0"
-        pointNumberLabel.textAlignment = .left
-        pointNumberLabel.textColor = HexColor("#FFE4C4")
-        return pointNumberLabel
+    lazy var balanceNumberButton: APButton = {
+        let balanceNumberButton = APButton()
+        balanceNumberButton.setTitle("0", for: .normal)
+        balanceNumberButton.activityIndicator.color = .white
+        balanceNumberButton.titleLabel?.font = BoldFont_19_Fit
+        balanceNumberButton.setTitleColor(HexColor("#FFE4C4"), for: .normal)
+        balanceNumberButton.addTarget(self, action: #selector(pushBalanceMothed), for: .touchUpInside)
+        return balanceNumberButton
+    }()
+    
+    lazy var pointNumberButton: APButton = {
+        let pointNumberButton = APButton()
+        pointNumberButton.activityIndicator.color = .white
+        pointNumberButton.titleLabel?.font = BoldFont_19_Fit
+        pointNumberButton.setTitle("0", for: .normal)
+        pointNumberButton.setTitleColor(HexColor("#FFE4C4"), for: .normal)
+        pointNumberButton.addTarget(self, action: #selector(pushPointsMothed), for: .touchUpInside)
+        return pointNumberButton
     }()
     var _checkModel : MinePointCheckInModel?
@@ -385,8 +392,10 @@ class MineBodyThreeViewCell: UITableViewCell {
         }
         set{
             _checkModel = newValue
-            balanceNumberLabel.text = newValue?.money
-            pointNumberLabel.text = newValue?.integral
+            balanceNumberButton.stopAnimating()
+            pointNumberButton.stopAnimating()
+            balanceNumberButton.setTitle(newValue?.money, for: .normal)
+            pointNumberButton.setTitle(newValue?.integral, for: .normal)
         }
     }
@@ -394,6 +403,7 @@ class MineBodyThreeViewCell: UITableViewCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         self.backgroundColor = .clear
+        contentView.backgroundColor = .clear
         addSubview(mainView)
         mainView.addSubview(moreView)
@@ -402,12 +412,14 @@ class MineBodyThreeViewCell: UITableViewCell {
         mainView.addSubview(line_left_label)
         mainView.addSubview(balanceLabel)
-        mainView.addSubview(balanceNumberLabel)
+        mainView.addSubview(balanceNumberButton)
         mainView.addSubview(line_right_label)
         mainView.addSubview(pointLabel)
-        mainView.addSubview(pointNumberLabel)
+        mainView.addSubview(pointNumberButton)
+        pointNumberButton.startAnimating()
+        balanceNumberButton.startAnimating()
         setupConstraints()
     }
@@ -426,7 +438,7 @@ class MineBodyThreeViewCell: UITableViewCell {
         }
         moreView.snp.makeConstraints { make in
             make.centerY.equalTo(pointButton)
-            make.left.equalTo(pointButton.snp.right)
+            make.left.equalTo(pointButton.snp.right).offset(-5)
         }
         questLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(10)
@@ -444,7 +456,7 @@ class MineBodyThreeViewCell: UITableViewCell {
             make.left.equalTo(line_left_label.snp.right).offset(10)
             make.top.equalToSuperview().offset(15)
         }
-        balanceNumberLabel.snp.makeConstraints { make in
+        balanceNumberButton.snp.makeConstraints { make in
             make.left.equalTo(line_left_label.snp.right).offset(10)
             make.centerY.equalToSuperview().offset(10)
         }
@@ -459,12 +471,24 @@ class MineBodyThreeViewCell: UITableViewCell {
             make.centerY.equalTo(balanceLabel)
             make.left.equalTo(line_right_label.snp.right).offset(10)
         }
-        pointNumberLabel.snp.makeConstraints { make in
-            make.centerY.equalTo(balanceNumberLabel)
+        pointNumberButton.snp.makeConstraints { make in
+            make.centerY.equalTo(balanceNumberButton)
             make.left.equalTo(line_right_label.snp.right).offset(10)
         }
     }
+    
+    @objc func pushBalanceMothed(sender: APButton) {
+        currentViewController()?.navigationController?.pushViewController(CNLiveMineEarnViewController.init(index: 1, checkModel: _checkModel!), animated: true)
+    }
+    
+    @objc func pushPointsMothed(sender: APButton) {
+        currentViewController()?.navigationController?.pushViewController(CNLiveMineEarnViewController.init(index: 0, checkModel: _checkModel!), animated: true)
+    }
+    
+    @objc func pushMineQuestView() {
+        currentViewController()?.navigationController?.pushViewController(CNLiveMineQuestViewController.init(checkModel: _checkModel!), animated: true)
+    }
     required init?(coder: NSCoder) {
@@ -478,6 +502,7 @@ class MineBodyFourViewCell: UITableViewCell {
     lazy var mainView: UIView = {
         let mainView = UIView.init()
         mainView.backgroundColor = .white
+        mainView.isUserInteractionEnabled = true
         return mainView
     }()
@@ -505,16 +530,18 @@ class MineBodyFourViewCell: UITableViewCell {
         return descLabel
     }()
-    lazy var shareBtn: UIButton = {
-        let shareBtn = UIButton.init(type: .custom)
+    lazy var shareBtn: APButton = {
+        let shareBtn = APButton()
         shareBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 30)
         shareBtn.setTitleColor(.white, for: .normal)
         shareBtn.titleLabel?.font = Font_12
         shareBtn.layer.cornerRadius = 15
         shareBtn.layer.masksToBounds = true
+        shareBtn.activityIndicator.color = UIColor.white
         shareBtn.setTitle("去完成", for: .normal)
         shareBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
         shareBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
+        shareBtn.addTarget(self, action: #selector(checkInAction), for: .touchUpInside)
         return shareBtn
     }()
@@ -522,6 +549,7 @@ class MineBodyFourViewCell: UITableViewCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         self.backgroundColor = .clear
+        contentView.backgroundColor = .clear
         addSubview(mainView)
         mainView.addSubview(iconView)
@@ -565,7 +593,17 @@ class MineBodyFourViewCell: UITableViewCell {
         nameLabel.text = listModel.title ?? ""
         descLabel.text = "积分值+\(listModel.score ?? "")"
         if listModel.taskId!.contains("check_in") {
-            shareBtn.setTitle("去签到", for: .normal)
+            if listModel.status!.contains("false") {
+                shareBtn.setTitle("去签到", for: .normal)
+            }else{
+                shareBtn.titleEdgeInsets = UIEdgeInsets.zero
+                shareBtn.imageEdgeInsets = UIEdgeInsets.zero
+                shareBtn.setTitleColor(HexColor("#999999"), for: .normal)
+                shareBtn.setTitle("已完成", for: .normal)
+                shareBtn.setImage(nil, for: .normal)
+                shareBtn.isUserInteractionEnabled = false
+                shareBtn.setGradient(colors: [HexColor("#f9f9f9")!,HexColor("#f9f9f9")!], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+            }
         }
     }
@@ -573,6 +611,20 @@ class MineBodyFourViewCell: UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
+    @objc func checkInAction(sender: APButton) {
+        sender.startAnimating()
+        showLoading(message: "")
+        CNLiveMineViewModel.requestWithCheckInAction { [self] result, respStatue in
+            sender.stopAnimating()
+            showMessage(message: "签到成功")
+            shareBtn.titleEdgeInsets = UIEdgeInsets.zero
+            shareBtn.imageEdgeInsets = UIEdgeInsets.zero
+            shareBtn.setTitleColor(HexColor("#999999"), for: .normal)
+            shareBtn.setTitle("已完成", for: .normal)
+            shareBtn.setImage(UIImage(), for: .normal)
+            shareBtn.setGradient(colors: [HexColor("#f9f9f9")!,HexColor("#f9f9f9")!], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        }
+    }
 }
 class MIneBodyFiveViewCell: UITableViewCell {
@@ -617,6 +669,7 @@ class MIneBodyFiveViewCell: UITableViewCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         selectionStyle = .none
         backgroundColor = .clear
+        contentView.backgroundColor = .clear
         addSubview(mainView)
         mainView.addSubview(nameLabel)
@@ -685,6 +738,7 @@ enum CNLiveBodyInputAuthShowType {
 typealias resultInputBlock = (_ type: CNLiveBodyInputAuthShowType) -> Void
 class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
+    var identifier = false
     lazy var mainView: UIView = {
         let mainView = UIView.init(frame: CGRect.zero)
         mainView.backgroundColor = .white
@@ -837,6 +891,12 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
     }
     func textFieldShouldEndEditing(_ textField: UITextField) -> Bool {
+        if textField == contentField {
+            if contentField.text!.count > _infoModel!.length {
+                showMessage(message: "\(_infoModel!.name ?? "")最大限制\(_infoModel!.length)个字")
+                return false
+            }
+        }
         return contentField.resignFirstResponder()
     }
@@ -312,44 +312,39 @@ class MineQuestHeaderView: UIView {
         pointBtn.setTitleColor(.white, for: .normal)
         pointBtn.titleLabel?.font = Font_15
         pointBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
-        pointBtn.addTarget(self, action: #selector(pushEarnRecordAction), for: .touchUpInside)
         return pointBtn
     }()
-//    lazy var pointView: UIImageView = {
-//
-//        return <#value#>
-//    }()
-    
     lazy var balanceBtn: UIButton = {
         let balanceBtn = UIButton(type: .custom)
         balanceBtn.size = CGSize(width: 102, height: 20)
         balanceBtn.backgroundColor = .clear
         balanceBtn.setTitle("元码余额收益", for: .normal)
         balanceBtn.setTitleColor(.white, for: .normal)
-        balanceBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
+//        balanceBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
         balanceBtn.titleLabel?.font = Font_15
-        balanceBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
-        balanceBtn.addTarget(self, action: #selector(pushEarnBalanceAction), for: .touchUpInside)
+//        balanceBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
         return balanceBtn
     }()
-    lazy var pointLabel: UILabel = {
-        let pointLabel = UILabel.init()
-        pointLabel.text = "0"
-        pointLabel.textColor = .white
-        pointLabel.backgroundColor = .clear
-        pointLabel.font = BoldFont_25_Fit
-        return pointLabel
+    lazy var pointDescButton: UIButton = {
+        let pointDescButton = UIButton.init(type: .custom)
+        pointDescButton.setTitle("0", for: .normal)
+        pointDescButton.setTitleColor(.white, for: .normal)
+        pointDescButton.backgroundColor = .clear
+        pointDescButton.titleLabel?.font = BoldFont_25_Fit
+        pointDescButton.addTarget(self, action: #selector(pushEarnRecordAction), for: .touchUpInside)
+        return pointDescButton
     }()
-    lazy var balanceLabel: UILabel = {
-        let balanceLabel = UILabel.init()
-        balanceLabel.text = "0"
-        balanceLabel.textColor = .white
-        balanceLabel.backgroundColor = .clear
-        balanceLabel.font = BoldFont_25_Fit
-        return balanceLabel
+    lazy var balanceDescButton: UIButton = {
+        let balanceDescButton = UIButton.init(type: .custom)
+        balanceDescButton.setTitle("0", for: .normal)
+        balanceDescButton.setTitleColor(.white, for: .normal)
+        balanceDescButton.backgroundColor = .clear
+        balanceDescButton.titleLabel?.font = BoldFont_25_Fit
+        balanceDescButton.addTarget(self, action: #selector(pushEarnBalanceAction), for: .touchUpInside)
+        return balanceDescButton
     }()
     lazy var descBtn: UIButton = {
@@ -371,12 +366,12 @@ class MineQuestHeaderView: UIView {
         addSubview(mainView)
         mainView.addSubview(pointBtn)
         mainView.addSubview(balanceBtn)
-        mainView.addSubview(pointLabel)
-        mainView.addSubview(balanceLabel)
+        mainView.addSubview(pointDescButton)
+        mainView.addSubview(balanceDescButton)
         mainView.addSubview(descBtn)
-        balanceLabel.text = checkModel.money
-        pointLabel.text = checkModel.integral
+        balanceDescButton.setTitle(checkModel.money, for: .normal)
+        pointDescButton.setTitle(checkModel.integral, for: .normal)
         setupConstraints()
     }
@@ -397,11 +392,11 @@ class MineQuestHeaderView: UIView {
             make.centerX.equalToSuperview().offset(50)
             make.top.equalToSuperview().offset(15)
         }
-        pointLabel.snp.makeConstraints { make in
+        pointDescButton.snp.makeConstraints { make in
             make.left.equalTo(pointBtn.snp.left)
             make.top.equalTo(pointBtn.snp.bottom).offset(10)
         }
-        balanceLabel.snp.makeConstraints { make in
+        balanceDescButton.snp.makeConstraints { make in
             make.left.equalTo(balanceBtn.snp.left)
             make.top.equalTo(balanceBtn.snp.bottom).offset(10)
         }
@@ -32,6 +32,7 @@ class MineInfoLListTableViewCell : UITableViewCell {
         titleLabel.backgroundColor = .clear
         titleLabel.textColor = .black
         titleLabel.font = BoldFont_18_Fit
+        titleLabel.adjustsFontSizeToFitWidth=true
         titleLabel.minimumScaleFactor = 14*FontFit
         return titleLabel
     }()
@@ -133,6 +134,9 @@ class MineStandInfoTableViewCell: UITableViewCell {
         let titleLabel = UILabel.init()
         titleLabel.backgroundColor = .clear
         titleLabel.textColor = .black
+        titleLabel.numberOfLines = 0
+        titleLabel.adjustsFontSizeToFitWidth=true
+        titleLabel.lineBreakMode = .byWordWrapping
         titleLabel.font = BoldFont_18_Fit
         return titleLabel
     }()
@@ -200,19 +204,19 @@ class MineStandInfoTableViewCell: UITableViewCell {
             make.left.equalToSuperview().offset(15)
             make.size.equalTo(50)
         }
+        timeLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-10)
+        }
         titleLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview().offset(-15)
             make.left.equalTo(iconView.snp.right).offset(10)
-            make.right.equalToSuperview().offset(-10)
+            make.right.equalToSuperview().offset(-30)
         }
         numberLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview().offset(15)
             make.left.equalTo(iconView.snp.right).offset(10)
         }
-        timeLabel.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.right.equalToSuperview().offset(-10)
-        }
     }
     required init?(coder: NSCoder) {
@@ -313,7 +317,7 @@ class MessageDescTableViewCell: UITableViewCell {
     }()
     lazy var contentLabel: UILabel = {
-        let contentLabel = UILabel.init()
+        let contentLabel = UILabel.init(frame: CGRect.zero)
         contentLabel.backgroundColor = .white
         contentLabel.textColor = HexColor("#666666")
         contentLabel.lineBreakMode = .byCharWrapping
@@ -394,12 +398,13 @@ class MessageDescTableViewCell: UITableViewCell {
 //            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)
-            make.width.equalTo(KSreenWidth - 110)
-            make.height.equalTo(0)
-        }
+        
+//        contentLabel.snp.makeConstraints { make in
+//            make.left.top.equalToSuperview().offset(10)
+//            make.right.equalToSuperview().offset(-10)
+//            make.width.equalTo(KSreenWidth - 110)
+//            make.height.equalTo(0)
+//        }
     }
     public func setupWithDataSource(listModel: NewsListModel) {
@@ -416,14 +421,15 @@ class MessageDescTableViewCell: UITableViewCell {
             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)
+            make.height.equalTo(listModel.textHeight + 30) //20
         }
+//        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)
+//        }
+        contentLabel.frame = CGRectMake(10, 15, KSreenWidth - 110, listModel.textHeight)
     }
     required init?(coder: NSCoder) {
@@ -302,6 +302,7 @@ class MinePointCheckInModel: BaseModel {
 class MineTaskCheckListModel: BaseModel {
     var icon: String? = ""
     var score: String? = ""
+    /**1 为第一次签到显示签到弹框,其他不显示*/
     var status: String? = ""
     var taskId: String? = ""
     var taskType: String? = ""
@@ -311,6 +312,14 @@ class MineTaskCheckListModel: BaseModel {
     var url: String? = ""
 }
 // !!!: /Daren/transaction/getTransactionRecord.action 余额交易记录
+
+class MineTradingRecordBaseModel: BaseModel {
+    var defray: String? = ""
+    var lasePage: Bool = false
+    var income: String? = ""
+    var list = [MineTradingRecordModel]()
+}
+
 class MineTradingRecordModel: BaseModel {
     var disburseRecord: String? = ""//支出
@@ -433,7 +433,7 @@ class CNLiveMineViewModel: NSObject {
     ///   - resultBlock: 返回
     static func requestsStandInfo(identityId: String, type: CNLiveMineGetWriteType, resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
-        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")//UserInfoManager.shared.userInfo.uid //10458139
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue(identityId, forKey: "identityId")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -673,8 +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("\((timeStamp * 1000) - 30*24*60*60)", forKey: "startTime")//"1600569015000"
+        param.setValue("\((timeStamp * 1000))", forKey: "endTime")//"1603074615000"
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "pageNo")
         let custom_param = NSMutableDictionary()
@@ -690,14 +690,8 @@ class CNLiveMineViewModel: NSObject {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
-                    let dict = resp["data"] as! NSDictionary
-                    let array = dict["list"] as! NSArray
-                    let tempArray = NSMutableArray()
-                    for item in array {
-                        let listModel = dictionaryToModel(item as! [String : Any], MineTradingRecordModel.self,"") as! MineTradingRecordModel
-                        tempArray.add(listModel)
-                    }
-                    resultBlock(tempArray,.success)
+                    let listModel = dictionaryToModel(resp as! [String : Any], MineTradingRecordBaseModel.self,"data") as! MineTradingRecordBaseModel
+                    resultBlock(listModel,.success)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
                     resultBlock(NSNull(),.failed)
@@ -719,10 +713,12 @@ class CNLiveMineViewModel: NSObject {
     ///   - page: 页数
     ///   - resultBlock: 返回
     static func requestWithIntegralRecord(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
+        let startTime = NSDate.timeIntervalChangeToTimeStr(timeInterval: Double((timeStamp * 1000) - 30*24*60*60))
+        let endTime = NSDate.timeIntervalChangeToTimeStr(timeInterval: Double(timeStamp * 1000))
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-        param.setValue("2022-08-21", forKey: "startTime")//开始时间
-        param.setValue("2022-09-20", forKey: "endTime")//开始时间
+        param.setValue(startTime, forKey: "startTime")//开始时间  "2022-08-21"
+        param.setValue(endTime, forKey: "endTime")//开始时间 "2022-09-20"
         param.setValue("0", forKey: "type")//0全部(默认) 1收入 2支出
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "pageNo")
@@ -757,6 +753,42 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    /// 签到功能
+    /// - Parameters:
+    ///   - resultBlock: 返回
+    static func requestWithCheckInAction(resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/integral/checkIn.action", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    resultBlock(resp,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "签到失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
     /// 获取十位时间戳
     static var timeStamp: Int {
         let timeInterval: TimeInterval = NSDate().timeIntervalSince1970