修改部分问题

liushiyu
1 parent 209cfcb3
Showing 10 changed files with 86 additions and 31 deletions
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineNickViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_sub_quest_addd_image.imageset/mine_sub_quest_addd_image@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_sub_quest_addd_image.imageset/mine_sub_quest_addd_image@3x.png
@@ -39,9 +39,6 @@ class CNLiveBaseTabBarViewController: UITabBarController
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-       
-        
-        self.selectedIndex = 1
     }
     override func viewDidAppear(_ animated: Bool) {
@@ -54,7 +54,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
     lazy var loginButton: UIButton = {
         let loginButton = UIButton(type: .custom)
-        loginButton.setTitle("登  陆", for: .normal)
+        loginButton.setTitle("登  录", for: .normal)
         loginButton.setTitleColor(.white, for: .normal)
         loginButton.titleLabel?.font = BoldFont_16_Fit
         loginButton.layer.cornerRadius = 20
@@ -86,7 +86,11 @@ class CNLiveMineNickViewController: CNLiveBaseViewController, UITextFieldDelegat
     @objc func clickSaveAction() {
-        print("保存")
+        CNLiveMineViewModel.requestUpdateUserInfoAction(type: .nickName, value: nickField.text ?? "", resultBlock: { [self] in
+            let userInfo = UserInfoManager.shared.userInfo
+            userInfo.nickName = nickField.text ?? ""
+            UserInfoManager.shared.cacheUserInfo(userInfo: userInfo)
+        })
     }
     func textFieldDidBeginEditing(_ textField: UITextField) {
@@ -111,6 +111,15 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
         return tipLabel
     }()
+    func updateWithDataSource() {
+        dataArray.removeAllObjects()
+        dataArray.add(["icon":"","name":"头像","more":"","avatar":UserInfoManager.shared.userInfo.bigFaceUrl])
+        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":""])
+        tableView.reloadData()
+    }
+    
     var _show_type:ListShowType!
     init(show_type:ListShowType) {
        super.init(nibName:nil, bundle:nil)
@@ -123,11 +132,14 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
     override func viewWillAppear(_ animated: Bool) {
-        navigationBarHidden = false
+        if _show_type == .info {
+            updateWithDataSource()
+        }
     }
     override func viewDidLoad() {
         super.viewDidLoad()
+        navigationBarHidden = false
         switch _show_type {
         case .feedback:
             titleName = "反馈类型"
@@ -175,7 +187,7 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
     @objc func logoutAction() -> Void {
         AlertTool.systemActionSheet(title: nil, message: nil, actionTitles: ["退出登录"]) { index in
             if index == 1 {
-                
+                UserInfoManager.shared.clearUserInfo()
                 let window = UIApplication.shared.delegate?.window
                 window??.rootViewController = CNLiveLoginViewController.init()
             }
@@ -275,14 +287,14 @@ extension CNLiveTypeFeedBackViewController {
             }
             if indexPath.section == 2 {
                 let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
-                MineInfoAlertView.showSelectView(showType: .gender) { text in
-                    cell.moreLabel.text = text
+                MineInfoAlertView.showSelectView(showType: .gender) { [self] text in
+                    updateWithDataSource()
                 }
             }
             if indexPath.section == 3 {
                 let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
-                MineInfoAlertView.showSelectView(showType: .birthday) { text in
-                    cell.moreLabel.text = text
+                MineInfoAlertView.showSelectView(showType: .birthday) { [self] text in
+                    updateWithDataSource()
                 }
             }
         }
@@ -242,7 +242,14 @@ class MineBodyTwoListViewCell : UITableViewCell {
             if show_type == .info {
                 moreLabel.font = Font_15_Fit
             }
-            moreLabel.text =  "\(dict["more"] ?? "")"
+            var more = "\(dict["more"] ?? "")"
+            if (more == "m") {
+                more = "男"
+            }
+            if (more == "f") {
+                more = "女"
+            }
+            moreLabel.text = more
         }
         if (dict.keys.contains("avatar") && (dict["avatar"] as! String).count > 0) {
             avatarView.isHidden = false
@@ -15,8 +15,6 @@ class MineHeaderView : UIView {
         let iconView = UIImageView.init()
         iconView.image = UIImage(named: "mine_header_icon_defult_ava")
-        iconView.kf.indicatorType = .activity
-        iconView.kf.setImage(with: URL(string: UserInfoManager.shared.userInfo.bigFaceUrl), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
         iconView.backgroundColor = .clear
         iconView.layer.cornerRadius = 30
         iconView.layer.masksToBounds = true
@@ -29,7 +27,6 @@ class MineHeaderView : UIView {
     lazy var nameLabel: UILabel = {
         let nameLabel = UILabel.init()
-        nameLabel.text = UserInfoManager.shared.userInfo.nickName
         nameLabel.textColor = .white
         nameLabel.font = Font_16
         return nameLabel
@@ -65,6 +62,10 @@ class MineHeaderView : UIView {
             make.right.equalToSuperview().offset(-15)
             make.size.equalTo(30)
         }
+        
+        iconView.kf.indicatorType = .activity
+        iconView.kf.setImage(with: URL(string: UserInfoManager.shared.userInfo.bigFaceUrl), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
+        nameLabel.text = UserInfoManager.shared.userInfo.nickName
     }
     required init?(coder: NSCoder) {
@@ -7,10 +7,10 @@
 import Foundation
-enum CNLiveMineInfoAlertShowType {
-    case gender
-    case birthday
-}
+//enum CNLiveMineInfoAlertShowType {
+//    case gender
+//    case birthday
+//}
 typealias CloseGenderResultBlock = (_ text: String) ->Void
 class MineInfoAlertView: UIView {
@@ -147,8 +147,10 @@ class MineInfoAlertView: UIView {
         return closeButton
     }()
-    var gender: String?
+    var gender: String? = UserInfoManager.shared.userInfo.gender
+    var birthday: String? = UserInfoManager.shared.userInfo.birthday
     var result: CloseGenderResultBlock?
+    var type: CNLiveMineRequestType?
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -169,7 +171,7 @@ class MineInfoAlertView: UIView {
         wBtn.isSelected = UserInfoManager.shared.userInfo.gender == "男"
         mBtn.isSelected = UserInfoManager.shared.userInfo.gender == "女"
-        wView.isHidden = UserInfoManager.shared.userInfo.gender == "男"
+        mView.isHidden = UserInfoManager.shared.userInfo.gender == "男"
         wView.isHidden = UserInfoManager.shared.userInfo.gender == "女"
         setConstraints()
@@ -245,10 +247,10 @@ class MineInfoAlertView: UIView {
     }
-    static public func showSelectView(showType: CNLiveMineInfoAlertShowType, result: @escaping CloseGenderResultBlock){
+    static public func showSelectView(showType: CNLiveMineRequestType, result: @escaping CloseGenderResultBlock){
         let pickerView = MineInfoAlertView()
         pickerView.result = result
-        
+        pickerView.type = showType
         switch showType {
         case .gender:
             pickerView.nameLable.text = "设置性别"
@@ -258,6 +260,12 @@ class MineInfoAlertView: UIView {
             pickerView.nameLable.text = "选择生日"
             pickerView.contentView.isHidden = true
             pickerView.datePicker.isHidden = false
+        case .nickName:
+            break
+        case .email:
+            break
+        case .location:
+            break
         }
         let window = UIApplication.shared.windows.last
@@ -287,12 +295,35 @@ class MineInfoAlertView: UIView {
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd"
         print("\(formatter.string(from: datePicker.date))")
-        result!(formatter.string(from: datePicker.date))
+        birthday = formatter.string(from: datePicker.date)
     }
     @objc func setupDoneButtonAction() {
         print("进行更改\(gender ?? "")")
         removeFromSuperview()
+        var value = ""
+        if type == .birthday {
+            value = birthday ?? ""
+        }
+        if type == .gender {
+            value = gender ?? ""
+        }
+        CNLiveMineViewModel.requestUpdateUserInfoAction(type: type!, value: value) { [self] in
+            let userInfo = UserInfoManager.shared.userInfo
+            if type == .gender {
+                if (value == "m") {
+                    userInfo.gender = "男"
+                }
+                if (value == "f") {
+                    userInfo.gender = "女"
+                }
+            }
+            if type == .birthday {
+                userInfo.birthday = value
+            }
+            UserInfoManager.shared.cacheUserInfo(userInfo: userInfo)
+            result!(value)
+        }
     }
     @objc func setupCloseButtonAction() -> Void {
@@ -304,8 +335,7 @@ class MineInfoAlertView: UIView {
         wBtn.isSelected = !sender.isSelected
         mView.isHidden = !sender.isSelected
         wView.isHidden = sender.isSelected
-        gender = "m"
-        result!("女")
+        gender = "f"
     }
     @objc func wClickAction(sender: UIButton) {
@@ -313,7 +343,6 @@ class MineInfoAlertView: UIView {
         mBtn.isSelected = !sender.isSelected
         wView.isHidden = !sender.isSelected
         mView.isHidden = sender.isSelected
-        gender = "w"
-        result!("男")
+        gender = "m"
     }
 }
@@ -28,7 +28,7 @@ class CNLiveMineViewModel: NSObject {
     ///   - value: 对应的信息，性别，m：男、f：女、n：未知
     static func requestUpdateUserInfoAction(type: CNLiveMineRequestType,value: String, resultBlock: @escaping resultSuccessBlock) {
-        var param = NSMutableDictionary.init()
+        let param = NSMutableDictionary.init()
         if type == .nickName {
             param.setValue("nickName", forKey: "type")
             param.setValue(value, forKey: "value")
@@ -47,11 +47,16 @@ class CNLiveMineViewModel: NSObject {
             param.setValue(value, forKey: "value")
         }
         if type == .birthday {
-            param.setValue("nickName", forKey: "type")
+            param.setValue("birthday", forKey: "type")
             param.setValue(value, forKey: "value")
         }
-        
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        param.setValue(UserInfoManager.shared.userInfo.token, forKey: "token")
+        tip.showLoading(message: "")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/user/updateUserById", param: param as! [String : Any], cacheType: .networkOnly) { task, result, error in
+            tip.hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = resp["errorCode"]