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

张旭
2 parents adf6c574 c6cb41cb
Showing 6 changed files with 40 additions and 26 deletions
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Config/CNLiveConfigstant.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -139,7 +139,7 @@ class CNLiveBaseViewController: UIViewController {
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
-        topNavView.frame = CGRect(x: 0, y: get_system_statusBar_height(), width: view.width, height: topNavViewHeight +  get_system_statusBar_height())
+        topNavView.frame = CGRect(x: 0, y: 0, width: view.width, height: topNavViewHeight +  get_system_statusBar_height())
         let lrSpace = leftNavSpace > rightNavSpace ? leftNavSpace : rightNavSpace
         titleLabel.frame = CGRect(x: CGFloat(Int(lrSpace)) , y: topNavViewHeight - get_system_nav_ui_height() - topNavViewSubUIContentOffsetY, width: topNavView.width - (lrSpace * 2), height: get_system_nav_ui_height())
         leftNavBtns.forEach { currentBtn in
@@ -36,7 +36,7 @@ public func is_iPhoneX_series() -&gt; Bool {
     }
     let window = UIApplication.shared.delegate?.window!!
     if (window?.safeAreaInsets.bottom ?? 0.0 > 0.0) {
-        iPhoneXSeries = false;
+        iPhoneXSeries = true;
     }
     return iPhoneXSeries;
 }
@@ -63,6 +63,13 @@ public func get_system_nav_ui_height() -&gt; CGFloat {
 }
 /**
+ 获取iPhoneX顶部高度
+ */
+public func get_system_nav_top_height() -> CGFloat {
+    return is_iPhoneX_series() ? KStatusBarHeight - 64.0 : 0.0
+}
+
+/**
  获取系统tabbar高度
  */
 public func get_system_tabbar_height() -> CGFloat {
@@ -114,7 +114,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         navigationBarHidden = false
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
-            make.top.equalTo(get_system_nav_height()+get_system_statusBar_height())
+            make.top.equalTo(KNavigationHeight)
             make.left.right.bottom.equalToSuperview()
         }
     }
@@ -221,8 +221,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
     }
     @objc func StandAuthNotificationSuccessAction() {
-        self.pageNum = 1
-        loadData()
+        self.tableView.mj_header?.beginRefreshing()
     }
@@ -63,10 +63,6 @@ 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
     }()
@@ -190,6 +186,12 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
             tipSubView.addSubview(tipLabel)
             tableView.tableHeaderView = tipView
         }
+        if _show_type == .info {
+            tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"0")
+            tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"1")
+            tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"2")
+            tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier+"3")
+        }
     }
     @objc func logoutAction() -> Void {
@@ -286,6 +286,8 @@ class MineBodyTwoListViewCell : UITableViewCell {
             avatarView.isHidden = false
             avatarView.kf.indicatorType = .activity
             avatarView.kf.setImage(with: URL(string: "\(dict["avatar"] ?? "")"), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
+        }else{
+            avatarView.isHidden = true
         }
         nameLabel.text = "\(dict["name"] ?? "")"
     }
@@ -277,7 +277,7 @@ class CNLiveMineViewModel: NSObject {
                         listModel.pageNum = page
                         listModel.total = page
                         listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
-                        resultBlock(listModel,.failed)
+                        resultBlock(listModel,.success)
                     }else{
                         showMessage(message: resp["errorMessage"] as! String)
                         resultBlock(NSNull(),.failed)
@@ -290,7 +290,7 @@ class CNLiveMineViewModel: NSObject {
                     listModel.pageNum = page
                     listModel.total = page
                     listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
-                    resultBlock(listModel,.failed)
+                    resultBlock(listModel,.success)
                 }else{
                     if CNLiveNetworking.isNetworking() {
                         showMessage(message: "获取失败")
@@ -321,7 +321,7 @@ class CNLiveMineViewModel: NSObject {
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
-                if (errorCode == "0") {
+                if (errorCode == "0" && resp["data"] is NSNull) {
                     let listModel = dictionaryToModel(resp as! [String : Any], MineAuthListBaseModel.self,"data") as! MineAuthListBaseModel
                     if page == 1 && listModel.list.count > 0 {
                         CNLiveSaveAuthDB.shared.insertObjects(objects: listModel.list)
@@ -335,7 +335,7 @@ class CNLiveMineViewModel: NSObject {
                         listModel.pageNum = page
                         listModel.total = page
                         listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
-                        resultBlock(listModel,.failed)
+                        resultBlock(listModel,.success)
                     }else{
                         showMessage(message: resp["errorMessage"] as! String)
                         resultBlock(NSNull(),.failed)
@@ -348,7 +348,7 @@ class CNLiveMineViewModel: NSObject {
                     listModel.pageNum = page
                     listModel.total = page
                     listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
-                    resultBlock(listModel,.failed)
+                    resultBlock(listModel,.success)
                 }else{
                     if CNLiveNetworking.isNetworking() {
                         showMessage(message: "获取失败")
@@ -443,20 +443,24 @@ class CNLiveMineViewModel: NSObject {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
-                    let newsModel = dictionaryToModel(resp as! [String : Any], MineStandInfoBaseModel.self,"data") as! MineStandInfoBaseModel
-                    if type == .nodate {
-                        let tempArray = NSMutableArray()
-                        for authinfo in newsModel.authInfos {
-                            if authinfo.input {
-                                tempArray.add(authinfo)
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        let newsModel = dictionaryToModel(resp as! [String : Any], MineStandInfoBaseModel.self,"data") as! MineStandInfoBaseModel
+                        if type == .nodate {
+                            let tempArray = NSMutableArray()
+                            for authinfo in newsModel.authInfos {
+                                if authinfo.input {
+                                    tempArray.add(authinfo)
+                                }
                             }
+                            resultBlock(tempArray,.success)
+                        }else if (type == .effect) {
+                            resultBlock(newsModel,.success)
+                        }else {
+                            let tempArray = NSMutableArray.init(array: newsModel.authInfos)
+                            resultBlock(tempArray,.success)
                         }
-                        resultBlock(tempArray,.success)
-                    }else if (type == .effect) {
-                        resultBlock(newsModel,.success)
-                    }else {
-                        let tempArray = NSMutableArray.init(array: newsModel.authInfos)
-                        resultBlock(tempArray,.success)
                     }
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)