修改部分测试问题

liushiyu
1 parent ea2eecc4
Showing 10 changed files with 55 additions and 30 deletions
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInputFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineNickViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineSubBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -46,9 +46,12 @@ class CNLiveBaseTabBarViewController: UITabBarController
         super.viewDidAppear(animated)
         print("获取用户用户数据=====>\(UserInfoManager.shared.userInfo.uid)")
  
-        CNLiveMineViewModel.requestSystemNews { result, respStatue in
-            if respStatue == .success {
-                UpdataAlertView.showUpdataView(updataModel: result as! UpdateInfoModel)
+        //已经弹出过就不用再弹框了
+        if UserInfoManager.shared.userInfo.show_update != "1" {
+            CNLiveMineViewModel.requestSystemNews { result, respStatue in
+                if respStatue == .success {
+                    UpdataAlertView.showUpdataView(updataModel: result as! UpdateInfoModel)
+                }
             }
         }
     }
@@ -38,6 +38,7 @@ class UserInfoModel: BaseModel {
     var wxUid:String = ""
     var access_token:String = ""
     var expires_in:String = ""//过期时间
+    var show_update:String = ""//是否显示更新了
  
     override func mapping(mapper: HelpingMapper) {
  
@@ -212,7 +212,7 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     }
  
     @objc func sendInfoActionMothod() {
-        CNLiveMineViewModel.requestFeedBack(text: p_textView.text ?? "", contactWay: UserInfoManager.shared.userInfo.mobile, images: imageUrlArray) { result in
+        CNLiveMineViewModel.requestFeedBack(text: p_textView.text ?? "", contactWay: UserInfoManager.shared.userInfo.mobile, images: imageUrlArray) { type, result in
             if result {
                 showMessage(message: "内容提交成功")
                 self.navigationController?.popViewController(animated: true)
@@ -15,7 +15,8 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
     lazy var imageView: UIImageView = {
         let imageView = UIImageView.init()
         imageView.backgroundColor = .clear
-        imageView.contentMode = .scaleToFill
+        imageView.contentMode = .scaleAspectFill
+        imageView.clipsToBounds = true
         imageView.image = UIImage(named: "mine_header_icon_defult_ava")
         imageView.kf.indicatorType = .activity
         imageView.kf.setImage(with: URL(string: UserInfoManager.shared.userInfo.bigFaceUrl), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
@@ -123,7 +124,7 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
     }
  
     @objc func changeSendAction() {
-        CNLiveMineViewModel.requestUploadIconAction(_select_image) { [weak self] statue in
+        CNLiveMineViewModel.requestUploadIconAction(_select_image) { [weak self] type, statue in
             if statue {
                 //再这里进行图片上传
                 self!.reslut(self!._select_image)
@@ -86,7 +86,7 @@ class CNLiveMineNickViewController: CNLiveBaseViewController, UITextFieldDelegat
  
  
     @objc func clickSaveAction() {
-        CNLiveMineViewModel.requestUpdateUserInfoAction(type: .nickName, value: nickField.text ?? "", resultBlock: { [weak self] result in
+        CNLiveMineViewModel.requestUpdateUserInfoAction(type: .nickName, value: nickField.text ?? "", resultBlock: { [weak self] type, result in
             if result {
                 let userInfo = UserInfoManager.shared.userInfo
                 userInfo.nickName = self!.nickField.text ?? ""
@@ -294,6 +294,7 @@ extension CNLiveTypeFeedBackViewController {
             if indexPath.section == 3 {
                 MineInfoAlertView.showSelectView(showType: .birthday) { [weak self] text in
                     self!.updateWithDataSource()
+                    print("刷新之后的数据是=>\(UserInfoManager.shared.userInfo.birthday)")
                 }
             }
         }
@@ -18,7 +18,7 @@ class MineHeaderView : UIView {
         iconView.backgroundColor = .clear
         iconView.layer.cornerRadius = 30
         iconView.layer.masksToBounds = true
-        iconView.contentMode = .scaleToFill
+        iconView.contentMode = .scaleAspectFill
         iconView.isUserInteractionEnabled = true
         let tap = UITapGestureRecognizer.init(target: self, action: #selector(pushMineInfoAction))
         iconView.addGestureRecognizer(tap)
@@ -114,6 +114,13 @@ class MineInfoAlertView: UIView {
         } else {
             // Fallback on earlier versions
         }
+        if UserInfoManager.shared.userInfo.birthday.count > 0 {
+            let dateFomatter = DateFormatter()
+            dateFomatter.dateFormat = "yyyy-MM-dd"
+            dateFomatter.locale = Locale.init(identifier: "zh_CN")
+            let date = dateFomatter.date(from: UserInfoManager.shared.userInfo.birthday)
+            datePicker.setDate(date!, animated: true)
+        }
         datePicker.minimumDate = Date.init(timeIntervalSince1970: -60*60*24*365*60)
         datePicker.maximumDate = Date.init(timeInterval: 0, since: Date.init())
         datePicker.addTarget(self, action: #selector(dateChangeAction), for: .valueChanged)
@@ -267,12 +274,17 @@ class MineInfoAlertView: UIView {
             pickerView.nameLable.text = "选择生日"
             pickerView.contentView.isHidden = true
             pickerView.datePicker.isHidden = false
+            pickerView.birthday = UserInfoManager.shared.userInfo.birthday
         case .nickName:
             break
         case .email:
             break
         case .location:
             break
+        case .icon:
+            break
+        case .other:
+            break
         }
  
         let window = UIApplication.shared.windows.last
@@ -301,7 +313,6 @@ class MineInfoAlertView: UIView {
     @objc func dateChangeAction(sender: UIDatePicker) {
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd"
-        print("\(formatter.string(from: datePicker.date))")
         birthday = formatter.string(from: datePicker.date)
     }
  
@@ -315,17 +326,18 @@ class MineInfoAlertView: UIView {
         if type == .gender {
             value = gender ?? ""
         }
-        CNLiveMineViewModel.requestUpdateUserInfoAction(type: type!, value: value) { [weak self] statue in
+        CNLiveMineViewModel.requestUpdateUserInfoAction(type: type!, value: value) { [self] type, statue in
             if statue {
                 let userInfo = UserInfoManager.shared.userInfo
-                if self!.type == .gender {
+                if type == .gender {
                     userInfo.gender = (value  == "m" ? "男" : "女")
                 }
-                if self!.type == .birthday {
+                if type == .birthday {
                     userInfo.birthday = value
+                    print("存储到本地的数据是=>\(userInfo.birthday)")
                 }
                 UserInfoManager.cacheUserInfo(userInfo: userInfo)
-                self!.result!(value)
+                result!(value)
             }
         }
     }
@@ -523,10 +535,12 @@ class UpdataAlertView: UIView {
  
     @objc func sendLoginActionMothod() -> Void {
         print("跳转到appstore")
+        UserInfoManager.shared.userInfo.show_update = "1"
         showMessage(message: "跳转到AppStore")
     }
  
     @objc func setupCloseButtonAction() -> Void {
+        UserInfoManager.shared.userInfo.show_update = "1"
         removeFromSuperview()
     }
  
@@ -107,10 +107,11 @@ class MineStandInfoTableViewCell: UITableViewCell {
  
     lazy var iconView : UIImageView = {
         let iconView = UIImageView.init()
-        iconView.contentMode = .scaleToFill
+        iconView.contentMode = .scaleAspectFill
         iconView.backgroundColor = .clear
         iconView.layer.masksToBounds = true
         iconView.layer.cornerRadius = 25
+        iconView.clipsToBounds = true
         return iconView
     }()
  
@@ -410,5 +411,6 @@ class MessageDescTableViewCell: UITableViewCell {
  
     @objc func textButtonAction() {
         print("跳转H5详情界面")
+        showMessage(message: "跳转H5详情界面")
     }
 }
@@ -9,11 +9,13 @@ import Foundation
 import CNLiveRequestBastKit
  
 enum CNLiveMineRequestType {
+    case icon
     case nickName
     case gender
     case email
     case location
     case birthday
+    case other
 }
 enum CNLiveMineResponseType {
     case success
@@ -21,7 +23,7 @@ enum CNLiveMineResponseType {
     case noNetwork
     case unkonw
 }
-typealias resultBlock = (_ result: Bool) -> Void
+typealias resultBlock = (_ type: CNLiveMineRequestType,_ result: Bool) -> Void
 typealias resultNewsBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveMineViewModel: NSObject {
  
@@ -55,6 +57,7 @@ class CNLiveMineViewModel: NSObject {
         }
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
         param.setValue(UserInfoManager.shared.userInfo.token, forKey: "token")
+        print("给后台的数据是=>\(param)")
         showLoading(message: "")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -65,14 +68,14 @@ class CNLiveMineViewModel: NSObject {
                 let errorCode = resp["errorCode"]
                 if (errorCode as! String == "0") {
                     showMessage(message: "更改成功")
-                    resultBlock(true)
+                    resultBlock(type,true)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
-                    resultBlock(false)
+                    resultBlock(type,false)
                 }
             } else {
                 showMessage(message: "修改信息失败")
-                resultBlock(false)
+                resultBlock(type,false)
             }
         }
     }
@@ -84,7 +87,7 @@ class CNLiveMineViewModel: NSObject {
     ///   - resultBlock: 返回
     static func requestUploadIconAction(_ image: UIImage,resultBlock: @escaping resultBlock) {
  
-        CNLiveMineViewModel.requestAccessTokenAction() { result in
+        CNLiveMineViewModel.requestAccessTokenAction() {  type, result in
             if result {
                 let param = NSMutableDictionary.init()
                 param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
@@ -110,18 +113,18 @@ class CNLiveMineViewModel: NSObject {
                             userInfo.faceUrl = data["faceUrl"] as! String
                             userInfo.bigFaceUrl = data["bigFaceUrl"] as! String
                             UserInfoManager.cacheUserInfo(userInfo: userInfo)
-                            resultBlock(true)
+                            resultBlock(.icon,true)
                         } else {
                             showMessage(message: resp["errorMessage"] as! String)
-                            resultBlock(false)
+                            resultBlock(.icon,false)
                         }
                     } else {
                         showMessage(message: "头像更改成功")
-                        resultBlock(false)
+                        resultBlock(.icon,false)
                     }
                 }
             } else {
-                resultBlock(false)
+                resultBlock(.icon,false)
             }
         }
     }
@@ -149,18 +152,18 @@ class CNLiveMineViewModel: NSObject {
                         let expires_in = data["expires_in"] as! NSNumber
                         userInfo.expires_in = "\(expires_in.intValue+CNLiveMineViewModel.timeStamp)"
                         UserInfoManager.cacheUserInfo(userInfo: userInfo)
-                        resultBlock(true)
+                        resultBlock(.other,true)
                     } else {
                         showMessage(message: resp["errorMessage"] as! String)
-                        resultBlock(false)
+                        resultBlock(.other,false)
                     }
                 } else {
                     showMessage(message: "修改头像失败")
-                    resultBlock(false)
+                    resultBlock(.other,false)
                 }
             }
         } else {
-            resultBlock(false)
+            resultBlock(.other,true)
         }
     }
  
@@ -199,14 +202,14 @@ class CNLiveMineViewModel: NSObject {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
-                    resultBlock(true)
+                    resultBlock(.other,true)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
-                    resultBlock(false)
+                    resultBlock(.other,false)
                 }
             } else {
                 showMessage(message: "提交失败")
-                resultBlock(false)
+                resultBlock(.other,false)
             }
         }
     }