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

liushiyu
2 parents 29699912 c89b1a43
Showing 4 changed files with 28 additions and 4 deletions
metaCode/Classes/Common/Base/CNLiveBaseNavigationController.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
@@ -29,7 +29,8 @@ class CNLiveBaseNavigationController : UINavigationController, UIGestureRecogniz
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
         return viewControllers.count > 1
     }
-    
+
+
     /// 重写push方法的目的 : 拦截所有push进来的子控制器
     override func pushViewController(_ viewController: UIViewController, animated: Bool) {
         if (self.children.count > 0 ) {
@@ -36,7 +36,7 @@ enum NetAPIStatus {
     case notNetwork
 }
-class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate{
+class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate,UIGestureRecognizerDelegate{
     ///NewPagedFlowView 开始滑动时的偏移量
@@ -184,12 +184,18 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.setupUI()
+        self.navigationController?.interactivePopGestureRecognizer?.delegate = self
+        
         /// 网络通知
         NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionNotReachable), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationNotReachable, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionUnknown), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationUnknown, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionReachableViaWWAN), name:Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWWAN, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionReachableViaWiFi), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWiFi, object: nil)
+        //提交身份审核后刷新
+        NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+        
+        
 //        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
     }
@@ -256,6 +262,13 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     @objc func networkStatusNotificationActionReachableViaWiFi(){
         self.getUserIdentityApi()
     }
+    
+    //身份审核后刷新接口
+    @objc func StandAuthNotificationSuccessAction(){
+        self.getUserIdentityApi()
+        print("StandAuthNotificationSuccessAction")
+    }
+    
     // MARK: -添加约束
     func makeConstraints(){
@@ -312,6 +325,17 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         }
     }
+    // MARK: -左滑手势代理
+    func gestureRecognizerShouldBegin(_ gestureRecognizer:UIGestureRecognizer) ->Bool{
+
+        if (gestureRecognizer == self.navigationController?.interactivePopGestureRecognizer) && (self.navigationController?.visibleViewController == self.navigationController?.viewControllers.first) {
+            ///解决执行了 push 之后，push不出界面的 bug，要在 rootvc 中实现这个方法 ,页面透明 , 只能用Debug view Hierarchy图层中看到
+            return false
+        }
+
+        return true
+    }
+    
     // MARK: - NewPagedFlowView代理
     func numberOfPages(in flowView: NewPagedFlowView!) -> Int {
@@ -255,7 +255,7 @@ class CNIDCardView: UIView{
     lazy var iDIconImgView:UIImageView = {
         let iDIconImgView:UIImageView = UIImageView(frame: CGRect(x: 20, y: 25, width: 60, height: 85))
-        iDIconImgView.backgroundColor = UIColor.red
+        iDIconImgView.backgroundColor = UIColor.clear
         return iDIconImgView
     }()
@@ -112,7 +112,6 @@ class CNFrontMainView : UIView{
             if(auth == true){
             //已认证身份
                 //显示证件View
-                print("已认证身份")
                 iDCardView.isHidden = false
                 iDCardView.idModel = newValue!
                 contentView.isHidden = true