界面显示异常修改

liushiyu
1 parent 3e3aedfd
Showing 9 changed files with 55 additions and 29 deletions
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveHelpFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthResultViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.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: 0, width: view.width, height: topNavViewHeight)
+        topNavView.frame = CGRect(x: 0, y: get_system_statusBar_height(), 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
@@ -299,8 +299,8 @@ extension CNLiveLoginViewController {
     }
     @objc func pushInfoActionMothod() {
-        self.present(CNLiveInfoShowViewController.init(show_type: .service, is_login: true), animated: true)
-//        navi.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy), animated: true)
+        self.present(CNLiveInfoShowViewController.init(show_type: .privacy, is_login: true), animated: true)
+//        navi.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy, is_login: true), animated: true)
     }
 }
@@ -41,12 +41,10 @@ class CNLiveHelpFeedBackViewController : CNLiveBaseViewController, UICollectionV
         view.addSubview(collectionView)
         collectionView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(get_system_nav_height())
+            make.top.equalToSuperview().offset(KNavigationHeight)
             make.left.bottom.right.equalToSuperview()
         }
-        
     }
-    
 }
 extension CNLiveHelpFeedBackViewController {
@@ -70,7 +70,7 @@ class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelega
         view.addSubview(webView)
         webView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(get_system_nav_height())
+            make.top.equalToSuperview().offset(KNavigationHeight)
             make.left.right.bottom.equalToSuperview()
         }
@@ -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())
+            make.top.equalTo(get_system_nav_height()+get_system_statusBar_height())
             make.left.right.bottom.equalToSuperview()
         }
     }
@@ -131,12 +131,16 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
                     if listBaseModel.pageNum == 1 {
                         self!.dataArray.removeAllObjects()
                         self!.dataArray.addObjects(from: (result as! StandListBaseModel).list)
-                        self!.tableView.reloadData()
-                        self!.tableView.mj_header?.endRefreshing()
-                        self!.tableView.mj_footer?.endRefreshing()
-                    }else{
-                        
                     }
+                    if listBaseModel.pageNum > 1 {
+                        self!.dataArray.addObjects(from: (result as! StandListBaseModel).list)
+                    }
+                    if self!.dataArray.count > 0 {
+                        self!.checkAlreadyAuthStatue()
+                    }
+                    self!.tableView.reloadData()
+                    self!.tableView.mj_header?.endRefreshing()
+                    self!.tableView.mj_footer?.endRefreshing()
                     if listBaseModel.total == listBaseModel.pageNum {
                         self!.tableView.mj_footer?.endRefreshing()
                         self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
@@ -197,13 +201,25 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
                 self!.pageNum = 1
                 self!.loadData()
             })
-            tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            
+            tableView.mj_footer = MJRefreshBackFooter.init(refreshingBlock: {[weak self] in
                 self!.pageNum += 1
                 self!.loadData()
             })
         }
     }
+    /// 判断是不是有已经有认证的情况
+    func checkAlreadyAuthStatue() {
+        for item in self.dataArray {
+            let authModel = item as! StandListModel
+            if authModel.auth {
+                is_sort = true
+                break
+            }
+        }
+    }
+    
     @objc func StandAuthNotificationSuccessAction() {
         self.pageNum = 1
         loadData()
@@ -146,6 +146,7 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
                 self?.tipDesc.text = listBaseModel.name!.count > 0 ? "您已是\(listBaseModel.name ?? "")!" : "恭喜您通过认证"
                 self?._status = .default
                 self?.setNeedsStatusBarAppearanceUpdate()
+                NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
             }else{
                 self?.iDCardView.isHidden = true
                 self?.mainView.image = UIImage(named: "mine_auth_result_header_failer")
@@ -70,6 +70,8 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         }
         NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
+        StandAuthNotificationSuccessAction()
     }
@@ -95,11 +97,16 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
     @objc func StandAuthNotificationSuccessAction() {
-        tableView.reloadData()
+        CNLiveMineViewModel.requestsGETAuthInfoList(page: 1) { [self] result, respStatue in
+            if respStatue == .success {
+                tableView.reloadData()
+            }
+        }
     }
     deinit {
         NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
     }
 }
@@ -168,7 +168,7 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(get_system_nav_height())
+            make.top.equalToSuperview().offset(KNavigationHeight)
             make.left.right.bottom.equalToSuperview()
         }
@@ -254,7 +254,7 @@ class CNLiveMineViewModel: NSObject {
     static func requestAuthStandList(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-        param.setValue("10", forKey: "pageSize")
+        param.setValue("30", forKey: "pageSize")
         param.setValue("\(page)", forKey: "page")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -313,7 +313,7 @@ class CNLiveMineViewModel: NSObject {
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("1", forKey: "type") //0正在审核  1已认证  -1审核失败
         param.setValue("\(page)", forKey: "page")
-        param.setValue("10", forKey: "pageSize")
+        param.setValue("30", forKey: "pageSize")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/myList", param: param as! [String: String], cacheType: .networkOnly) { task, result, error in
@@ -486,14 +486,18 @@ class CNLiveMineViewModel: NSObject {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0" && (resp["data"] != nil)) {
-                    let userInfoModel = dictionaryToModel(resp as! [String : Any], UpdateInfoModel.self,"data") as! UpdateInfoModel
-                    let ver1 = "\(userInfoModel.version.split(separator: "_").last ?? "0")"
-                    let ver2 = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
-                    print("获取的新版本号=>\(ver1),原来的版本号=>\(ver2)")
-                    if CNLiveMineViewModel.compare(v1: ver1, v2: ver2) {
-                        resultBlock(userInfoModel,.success)
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
                     } else {
-                       print("没有新版本")
+                        let userInfoModel = dictionaryToModel(resp as! [String : Any], UpdateInfoModel.self,"data") as! UpdateInfoModel
+                        let ver1 = "\(userInfoModel.version.split(separator: "_").last ?? "0")"
+                        let ver2 = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
+                        print("获取的新版本号=>\(ver1),原来的版本号=>\(ver2)")
+                        if CNLiveMineViewModel.compare(v1: ver1, v2: ver2) {
+                            resultBlock(userInfoModel,.success)
+                        } else {
+                           print("没有新版本")
+                        }
                     }
                 } else {
                     resultBlock(NSNull(),.failed)
@@ -672,10 +676,10 @@ class CNLiveMineViewModel: NSObject {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "targetId")
         param.setValue("0", forKey: "type")//0全部(默认) 1收入 2支出
-//        param.setValue("\((timeStamp * 1000) - 30*24*60*60)", forKey: "startTime")//"1600569015000"
-//        param.setValue("\((timeStamp * 1000))", forKey: "endTime")//"1603074615000"
-        param.setValue("1600569015000", forKey: "startTime")
-        param.setValue("1603074615000", forKey: "endTime")
+        param.setValue("\((timeStamp * 1000) - 30*24*60*60)", forKey: "startTime")//"1600569015000"
+        param.setValue("\((timeStamp * 1000))", forKey: "endTime")//"1603074615000"
+//        param.setValue("1600569015000", forKey: "startTime")
+//        param.setValue("1603074615000", forKey: "endTime")
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "pageNo")
         let custom_param = NSMutableDictionary()