我的身份判断逻辑修复

张旭
1 parent 4e7a1997
Showing 3 changed files with 14 additions and 6 deletions
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNHomePageGuideView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -12,9 +12,12 @@ import CNLiveRequestBastKit
  
 let Width: CGFloat  = UIScreen.main.bounds.size.width
 let Height: CGFloat = UIScreen.main.bounds.size.height
-///主窗口宽度
-let MainViewW: CGFloat = Width-100
  
+///主窗口左右间距
+let LeftGap: CGFloat = UIScreen.main.bounds.size.width <= 375 ? 23 : 40
+
+///主窗口宽度
+let MainViewW: CGFloat = Width-LeftGap*2//Width-50
  
 ///存储是否第一次显示首页上滑引导
 let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideKey"
@@ -210,7 +213,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
  
         //提交身份审核后刷新
         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)
  
 //        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
  
@@ -340,6 +344,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                 self.pageFlowView.scrollView.isScrollEnabled = false
                 self.view.addSubview(self.downSlideGuideView)
                 self.view.addSubview(self.downSlideGifView)
+                self.tabBarController?.tabBar.isHidden = true
             }
  
         }else{
@@ -347,6 +352,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             self.pageFlowView.scrollView.isScrollEnabled = false
             self.view.addSubview(self.upSlideGuideView)
             self.view.addSubview(self.upSlideGifView)
+            self.tabBarController?.tabBar.isHidden = true
         }
     }
  
@@ -459,6 +465,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
  
         //移除上滑引导
         if(self.upSlideGuideView.superview != nil){
+            self.tabBarController?.tabBar.isHidden = false
             self.upSlideGuideView.removeFromSuperview()
             self.upSlideGifView.removeFromSuperview()
             UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
@@ -466,6 +473,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
  
         //移除下滑引导
         if (self.downSlideGuideView.superview != nil) {
+            self.tabBarController?.tabBar.isHidden = false
             self.downSlideGuideView.removeFromSuperview()
             self.downSlideGifView.removeFromSuperview()
             UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
@@ -58,9 +58,9 @@ class CNHomePageGuideView: UIView{
         let path:UIBezierPath = UIBezierPath.init(rect: UIScreen.main.bounds)
  
         //rect 首页被镂空的区域
-        let W = KSreenWidth-50
+        let W = MainViewW//KSreenWidth-50 
         let H = W*1.5
-        let rect = CGRectMake(25, KSreenHeight*0.16,W, H)
+        let rect = CGRectMake(LeftGap, KSreenHeight*0.16,W, H)
  
         let appendPath: UIBezierPath = UIBezierPath.init(roundedRect: rect, cornerRadius: 20)
         path.append(appendPath.reversing())
@@ -321,7 +321,7 @@ class CNLiveMineViewModel: NSObject {
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
-                if (errorCode == "0" && resp["data"] is NSNull) {
+                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)