提交修改

liushiyu
1 parent ec3f1ac5
Showing 4 changed files with 32 additions and 12 deletions
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnListViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
@@ -189,7 +189,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
                 self!.pageNum = 1
                 self!.loadData()
             })
-            tableView.mj_footer = MJRefreshBackNormalFooter.init(refreshingBlock: {[weak self] in
+            tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
                 self!.pageNum += 1
                 self!.loadData()
             })
@@ -88,11 +88,13 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
             }
         }
         if _show_type == .record {
-            CNLiveMineViewModel.requestWithIntegralRecord(page: page) { result, respStatue in
+            CNLiveMineViewModel.requestWithIntegralRecord(page: page) { [self] result, respStatue in
                 if respStatue == .success {
                     let listModel = result as! MineIntegralRecordModel
                     self.network_type = .success
-                    self.dataArray.removeAllObjects()
+                    if pageNum == 1 {
+                        self.dataArray.removeAllObjects()
+                    }
                     self.dataArray.addObjects(from: listModel.integralList)
                     self.tableView.reloadData()
                     self.tableView.mj_header?.endRefreshing()
@@ -134,7 +136,7 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
     }
     private func addRefreshView() {
-        let footerView = MJRefreshBackNormalFooter.init(refreshingBlock: {[weak self] in
+        let footerView = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
             self!.pageNum += 1
             self!.loadDataWithTradRecord(page: self!.pageNum) {result,respStatue in }
         })
@@ -8,7 +8,7 @@
 import Foundation
 import HXPHPicker
 import Kingfisher
-
+import APButton
 typealias ClickInfoResultBlock = (_ image: UIImage) -> Void
 class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControllerDelegate {
@@ -34,14 +34,15 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
         return changeBtn
     }()
-    lazy var sendBtn: UIButton = {
-        let sendBtn = UIButton.init(type: .custom)
+    lazy var sendBtn: APButton = {
+        let sendBtn = APButton()
         sendBtn.setTitle("确认", for: .normal)
         sendBtn.setTitleColor(.white, for: .normal)
         sendBtn.titleLabel?.font = BoldFont_19_Fit
         sendBtn.layer.cornerRadius = 20
         sendBtn.layer.masksToBounds = true
         sendBtn.isHidden = true
+        sendBtn.activityIndicator.color = .white
         sendBtn.addTarget(self, action: #selector(changeSendAction), for: .touchUpInside)
         return sendBtn
     }()
@@ -124,8 +125,10 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
     }
     @objc func changeSendAction() {
+        sendBtn.startAnimating()
         CNLiveMineViewModel.requestUploadIconAction(_select_image) { [weak self] type, statue in
             if statue {
+                self?.sendBtn.stopAnimating()
                 //再这里进行图片上传
                 self!.reslut(self!._select_image)
                 self!.navigationController?.popViewController(animated: true)
@@ -6,7 +6,7 @@
 //
 import Foundation
-
+import APButton
 enum ListShowType {
     case feedback
@@ -29,7 +29,9 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
         tableView.tableHeaderView = UIView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 1))
         tableView.separatorStyle = .none
         tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
-        tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier)
+        if _show_type != .info {
+            tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier)
+        }
         return tableView
     }()
@@ -61,17 +63,22 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
             dataArray.add(["icon":"","name":"昵称","more":(UserInfoManager.shared.userInfo.nickName.count > 0 ? UserInfoManager.shared.userInfo.nickName : "请输入昵称"),"avatar":""])
             dataArray.add(["icon":"","name":"性别","more":UserInfoManager.shared.userInfo.gender,"avatar":""])
             dataArray.add(["icon":"","name":"生日","more":UserInfoManager.shared.userInfo.birthday,"avatar":""])
+            self.tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"0")
+            self.tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"1")
+            self.tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"2")
+            self.tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"3")
         }
         return dataArray
     }()
-    lazy var logoutButton: UIButton = {
-        let logoutButton = UIButton.init(type: .custom)
+    lazy var logoutButton: APButton = {
+        let logoutButton = APButton()
         logoutButton.setTitle("退出登录", for: .normal)
         logoutButton.backgroundColor = .white
         logoutButton.setTitleColor(HexColor("#609BFF"), for: .normal)
         logoutButton.layer.cornerRadius = 10
         logoutButton.layer.masksToBounds = true
+        logoutButton.activityIndicator.color = .white
         logoutButton.addTarget(self, action: #selector(logoutAction), for: .touchUpInside)
         return logoutButton
     }()
@@ -186,8 +193,10 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
     }
     @objc func logoutAction() -> Void {
-        AlertTool.systemActionSheet(title: nil, message: nil, actionTitles: ["退出登录"]) { index in
+        logoutButton.startAnimating()
+        AlertTool.systemActionSheet(title: nil, message: nil, actionTitles: ["退出登录"]) { [self] index in
             if index == 1 {
+                logoutButton.stopAnimating()
                 UserDefaults.standard.set(false,forKey: "is_login")
                 UserInfoManager.clearUserInfo()
                 let window = UIApplication.shared.delegate?.window
@@ -214,6 +223,12 @@ extension CNLiveTypeFeedBackViewController {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if _show_type == .info {
+            let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"\(indexPath.row)") as! MineBodyTwoListViewCell
+            let dict = dataArray[indexPath.section] as! NSDictionary
+            cell.setupWithDataSource(show_type: _show_type,dict: dict as! Dictionary<String, Any>)
+            return cell
+        }
         let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier) as! MineBodyTwoListViewCell
         let dict = dataArray[indexPath.section] as! NSDictionary
         cell.setupWithDataSource(show_type: _show_type,dict: dict as! Dictionary<String, Any>)