Browse Source

no message

南鑫林 5 years ago
parent
commit
e6c9789530
18 changed files with 418 additions and 298 deletions
  1. 39 75
      RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift
  2. 54 42
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Action/CardContentActionTableViewCell.swift
  3. 6 2
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Comment/CardContentCommnetTableViewCell.swift
  4. 20 11
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift
  5. 8 11
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift
  6. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift
  7. 12 12
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift
  8. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift
  9. 61 22
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift
  10. 46 24
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendBottomCommentView.swift
  11. 80 44
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift
  12. 6 2
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoTopicView.swift
  13. 1 1
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/ViewController/RedemptionAreaViewController.swift
  14. 3 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/View/MobileLoginView.swift
  15. 23 10
      RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift
  16. 5 0
      RainbowPlanet/RainbowPlanet/Router/PublishRouterModuleType.swift
  17. 37 26
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift
  18. 15 14
      RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

+ 39 - 75
RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -10,73 +10,6 @@ import UIKit
 import Lottie
 import ESTabBarController_swift
 
-/*
-class BaseTabbarViewController: UITabBarController {
-    
-    static let shared : BaseTabbarViewController = BaseTabbarViewController()
-    
-    var lastClickTag : Int?
-    
-    /// 社区
-    let v1 = CommunityViewController()
-    /// 商城
-    let v2 = ShoppingMallViewController()
-    /// 兑换专区
-//    let v2 = RedemptionAreaViewController()
-    /// 发布
-    let v3 = BaseViewController()
-    /// 消息
-    let v4 = MessageMainViewController()
-    /// 我的
-    let v5 = UserPersonalCenterViewController()
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.tabBar.shadowImage = UIImage(named: "tab_top_line")
-        self.delegate = self
-        setViewControllers()
-        setTag()
-    }
-    
-    func setViewControllers() {
-        v1.tabBarItem = ESTabBarItem.init(BaseLottieAnimateContentView(jsonStr: "communityModuleTabbar"), title: "社区", image: UIImage(named: "tabbar_home")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-        v2.tabBarItem = ESTabBarItem.init(BaseLottieAnimateContentView(jsonStr: "shoppingMallModuleTabbar"), title: "商城", image: UIImage(named: "tabbar_shopping"), selectedImage: nil)
-        v3.tabBarItem = UITabBarItem(title: nil, image: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))
-        v3.tabBarItem.imageInsets =  UIEdgeInsets(top: 4, left: 0, bottom: -4, right: 0);
-        v4.tabBarItem = ESTabBarItem.init(BaseLottieAnimateContentView(jsonStr: "messageModuleTabbar"), title: "消息", image: UIImage(named: "tabbar_massage"), selectedImage: nil)
-        v5.tabBarItem = ESTabBarItem.init(BaseLottieAnimateContentView(jsonStr: "MineModuleTabbar"), title: "我的", image: UIImage(named: "tabbar_my"), selectedImage: nil)
-        
-        let n1 = BaseNavigationViewController.init(rootViewController: v1)
-        let n2 = BaseNavigationViewController.init(rootViewController: v2)
-        let n3 = BaseNavigationViewController.init(rootViewController: v3)
-        let n4 = BaseNavigationViewController.init(rootViewController: v4)
-        let n5 = BaseNavigationViewController.init(rootViewController: v5)
-        
-        self.viewControllers = [n1, n2, n3, n4, n5]
-    }
-    
-    func setTag() {
-        v1.tabBarItem.tag = 0
-        v2.tabBarItem.tag = 1
-        v3.tabBarItem.tag = 2
-        v4.tabBarItem.tag = 3
-        v5.tabBarItem.tag = 4
-    }
-    
-    func addBadge() {
-        if UpdateVersionModel.shared.object()?.upGradeModelType == .update ||  UpdateVersionModel.shared.object()?.upGradeModelType == .strongUpdate {
-            v5.tabBarItem.pp.moveBadge(x: -1, y: 3)
-            v5.tabBarItem.pp.addDot(color: kFE352BColor)
-        }else {
-            v5.tabBarItem.pp.hiddenBadge()
-        }
-        
-    }
-
-}
- */
-
-
 class BaseTabbarViewController: NSObject {
 
     static let shared : BaseTabbarViewController = BaseTabbarViewController()
@@ -118,14 +51,27 @@ class BaseTabbarViewController: NSObject {
         esTabBarController.tabBar.shadowImage = UIImage(named: "tab_top_line")
         esTabBarController.shouldHijackHandler = {
            [weak self] (tabbarController, viewController, index) in
-            if index == 2 {
-                self?.lastIndex = index
-                return true
+            
+            if UserModel.isTokenNil() {
+                if index == 2 || index == 3 || index == 4 {
+                    return true
+                }else {
+                    self?.reloadTabbar(index:index)
+                    self?.lastIndex = index
+                    return false
+                }
             }else {
-                self?.reloadTabbar(index:index)
-                self?.lastIndex = index
-                return false
+                if index == 2 {
+                    self?.lastIndex = index
+                    return true
+                }else {
+                    self?.reloadTabbar(index:index)
+                    self?.lastIndex = index
+                    return false
+                }
             }
+            
+            
         }
 
         esTabBarController.didHijackHandler = {
@@ -138,6 +84,7 @@ class BaseTabbarViewController: NSObject {
                     let pickVc = PublishViewController()
                     let nav = BaseNavigationViewController.init(rootViewController: pickVc)
                     tabbarController.present(nav, animated: true, completion: nil)
+                    
                 } else {
                     SwiftProgressHUD.shared().showText("内容上传中,请稍等", textAlignment: .center)
                 }
@@ -173,8 +120,18 @@ class BaseTabbarViewController: NSObject {
         v2.tabBarItem = ESTabBarItem.init(lottieAnimateContentView2, title: "商城", image: UIImage(named: "tabbar_shopping"), selectedImage: nil)
         v3.tabBarItem = UITabBarItem(title: nil, image: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))
         v3.tabBarItem.imageInsets =  UIEdgeInsets(top: 4, left: 0, bottom: -4, right: 0);
-        v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage"), selectedImage: nil)
-        v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my"), selectedImage: nil)
+        
+        if UserModel.isTokenNil() {
+            v4.tabBarItem = UITabBarItem(title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))
+            setTabBarItem(tabBarItem: v4.tabBarItem)
+            v5.tabBarItem = UITabBarItem(title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))
+            setTabBarItem(tabBarItem: v5.tabBarItem)
+
+        }else {
+            v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage"), selectedImage: nil)
+            v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my"), selectedImage: nil)
+        }
+        
 
         let n1 = BaseNavigationViewController.init(rootViewController: v1)
         let n2 = BaseNavigationViewController.init(rootViewController: v2)
@@ -265,4 +222,11 @@ class BaseTabbarViewController: NSObject {
             NotificationCenter.default.post(name: NSNotification.Name("MineModuleTop"), object: nil)
         }
     }
+    
+    //设置没有登录状态的tabbar
+    func setTabBarItem(tabBarItem:UITabBarItem) {
+        tabBarItem.setTitleTextAttributes([NSAttributedString.Key.foregroundColor:k666666Color], for: UIControl.State.normal)
+        tabBarItem.setTitleTextAttributes([NSAttributedString.Key.foregroundColor:k666666Color], for: UIControl.State.selected)
+
+    }
 }

+ 54 - 42
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Action/CardContentActionTableViewCell.swift

@@ -116,14 +116,17 @@ class CardContentActionTableViewCell: UITableViewCell {
         shareButton.setImage(kImage(name: "btn_share_gray"), for: .normal)
         shareButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if self?.communityRecommendDataModel != nil {
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityRecommendShare"), object: self?.communityRecommendDataModel)
-            }
-            
-            if self?.communityFollowDataModel != nil {
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityFollowShare"), object: self?.communityFollowDataModel)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if self?.communityRecommendDataModel != nil {
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityRecommendShare"), object: self?.communityRecommendDataModel)
+                }
+                
+                if self?.communityFollowDataModel != nil {
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityFollowShare"), object: self?.communityFollowDataModel)
+                }
             }
-
         }).disposed(by: disposeBag)
         return shareButton
     }()
@@ -139,26 +142,31 @@ class CardContentActionTableViewCell: UITableViewCell {
         collectButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             
-            if self?.communityRecommendDataModel != nil {
-                if self?.communityRecommendDataModel?.isCollect == 0 {
-                    self?.collectAnimationView.isHidden = false
-                    self?.collectAnimationView.play(completion: { (_) in
-                        self?.collectAnimationView.isHidden = true
-                    })
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if self?.communityRecommendDataModel != nil {
+                    if self?.communityRecommendDataModel?.isCollect == 0 {
+                        self?.collectAnimationView.isHidden = false
+                        self?.collectAnimationView.play(completion: { (_) in
+                            self?.collectAnimationView.isHidden = true
+                        })
+                    }
                 }
-            }
-            
-            if  self?.communityFollowDataModel != nil {
-                if self?.communityFollowDataModel?.relateData?.isCollect == 0 {
-                    self?.collectAnimationView.isHidden = false
-                    self?.collectAnimationView.play(completion: { (_) in
-                        self?.collectAnimationView.isHidden = true
-                    })
+                
+                if  self?.communityFollowDataModel != nil {
+                    if self?.communityFollowDataModel?.relateData?.isCollect == 0 {
+                        self?.collectAnimationView.isHidden = false
+                        self?.collectAnimationView.play(completion: { (_) in
+                            self?.collectAnimationView.isHidden = true
+                        })
+                    }
+                }
+                if let collectClosureName = self?.collectClosureName {
+                    collectClosureName(collectButton)
                 }
             }
-            if let collectClosureName = self?.collectClosureName {
-                 collectClosureName(collectButton)
-            }
+            
         }).disposed(by: disposeBag)
         return collectButton
     }()
@@ -195,26 +203,30 @@ class CardContentActionTableViewCell: UITableViewCell {
         praiseButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             
-            if self?.communityRecommendDataModel != nil {
-                if self?.communityRecommendDataModel?.isLike == 0 {
-                    self?.praiseAnimationView.isHidden = false
-                    self?.praiseAnimationView.play(completion: { (_) in
-                        self?.praiseAnimationView.isHidden = true
-                    })
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if self?.communityRecommendDataModel != nil {
+                    if self?.communityRecommendDataModel?.isLike == 0 {
+                        self?.praiseAnimationView.isHidden = false
+                        self?.praiseAnimationView.play(completion: { (_) in
+                            self?.praiseAnimationView.isHidden = true
+                        })
+                    }
                 }
-            }
-            
-            if  self?.communityFollowDataModel != nil {
-                if self?.communityFollowDataModel?.relateData?.isLike == 0 {
-                    self?.praiseAnimationView.isHidden = false
-                    self?.praiseAnimationView.play(completion: { (_) in
-                        self?.praiseAnimationView.isHidden = true
-                    })
+                
+                if  self?.communityFollowDataModel != nil {
+                    if self?.communityFollowDataModel?.relateData?.isLike == 0 {
+                        self?.praiseAnimationView.isHidden = false
+                        self?.praiseAnimationView.play(completion: { (_) in
+                            self?.praiseAnimationView.isHidden = true
+                        })
+                    }
+                }
+                
+                if let praiseClosureName = self?.praiseClosureName {
+                    praiseClosureName(praiseButton)
                 }
-            }
-            
-            if let praiseClosureName = self?.praiseClosureName {
-               praiseClosureName(praiseButton)
             }
         }).disposed(by: disposeBag)
         return praiseButton

+ 6 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Comment/CardContentCommnetTableViewCell.swift

@@ -73,8 +73,12 @@ class CardContentCommnetTableViewCell: UITableViewCell {
         addCommnetButton.titleLabel?.font = kRegularFont14
         addCommnetButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if let addCommnetClosureName = self?.addCommnetClosureName {
-                addCommnetClosureName()
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let addCommnetClosureName = self?.addCommnetClosureName {
+                    addCommnetClosureName()
+                }
             }
         }).disposed(by: disposeBag)
         return addCommnetButton

+ 20 - 11
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift

@@ -138,12 +138,17 @@ class CardContentUserTableViewCell: UITableViewCell {
         setButton.setImage(kImage(name: "btn_more"), for: UIControl.State.normal)
         setButton.titleLabel?.font = kMediumFont13
         setButton.rx.tap.subscribe(onNext: {[weak self] (data) in
-            let window = kAppDelegate.window
-            let rect = setButton.convert(setButton.bounds, from: window)
-            let y = CGFloat(abs(rect.origin.y))
-            if let likeClosure = self?.likeClosure {
-                likeClosure(y)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                let window = kAppDelegate.window
+                let rect = setButton.convert(setButton.bounds, from: window)
+                let y = CGFloat(abs(rect.origin.y))
+                if let likeClosure = self?.likeClosure {
+                    likeClosure(y)
+                }
             }
+
         }).disposed(by: disposeBag)
         return setButton
     }()
@@ -216,12 +221,16 @@ class CardContentUserTableViewCell: UITableViewCell {
     }
     
     func pushCommunityUser() {
-        if communityRecommendDataModel != nil {
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityUser"), object: communityRecommendDataModel?.uid)
-        }
-        if communityFollowDataModel != nil {
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityUser"), object: communityFollowDataModel?.relateData?.uid)
-            
+        if UserModel.isTokenNil()  {
+            kAppDelegate.setLogin()
+        }else {
+            if communityRecommendDataModel != nil {
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityUser"), object: communityRecommendDataModel?.uid)
+            }
+            if communityFollowDataModel != nil {
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityUser"), object: communityFollowDataModel?.relateData?.uid)
+                
+            }
         }
     }
 

+ 8 - 11
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -10,6 +10,7 @@ import UIKit
 import DPScrollNumberLabel
 import RxSwift
 import Lottie
+import SwiftyMediator
 
 class CommunityNavigationBarView: BaseView {
     
@@ -94,21 +95,17 @@ class CommunityNavigationBarView: BaseView {
         leftButton.setImage(kImage(name: "nav_btn_publish"), for: UIControl.State.normal)
         leftButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            let pickVc = PublishViewController()
-            let nav = BaseNavigationViewController.init(rootViewController: pickVc)
-            self?.findViewController().present(nav, animated: true, completion: nil)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                let pickVc = PublishViewController()
+                let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+                BaseTabbarViewController.shared.esTabBarController.present(nav, animated: true, completion: nil)
+            }
         }).disposed(by: disposeBag)
         return leftButton
     }()
     
-//    lazy var rightButton: UIButton = {
-//        let rightButton = UIButton(type: UIButton.ButtonType.custom)
-//        rightButton.setImage(kImage(name: "navbar_bean_org"), for: UIControl.State.normal)
-//        rightButton.setTitleColor(kFFA42FColor, for: UIControl.State.normal)
-//        rightButton.titleLabel?.font = kMediumFont16
-//        return rightButton
-//    }()
-    
     lazy var rightButton: AnimationView = {
         let rightButton = AnimationView()
         let animation = Animation.named("Skittles")

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -146,7 +146,7 @@ class CommunityFollowViewController: UIViewController {
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModuleFollowTop"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
             if self?.tableView.contentOffset == CGPoint(x: 0, y: 0) {
-                self?.loadData(page:1)
+                self?.tableView.mj_header.beginRefreshing()
             }else {
                 self?.tableView.scrollToTop()
             }

+ 12 - 12
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -73,24 +73,25 @@ class CommunityViewController: BaseViewController {
     }
     
     override func setupData() {
-        //发布
-        communityNavigationBarView.leftButton.rx.tap.subscribe(onNext: { (data) in
-            
-        }).disposed(by: disposeBag)
         //搜索
         communityNavigationBarView.searchClosure = {
             [weak self] in
-            let vc = SearchViewController()
-            vc.searchType = .content
-            self?.navigationController?.pushViewController(vc, animated: true)
-
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                let vc = SearchViewController()
+                vc.searchType = .content
+                self?.navigationController?.pushViewController(vc, animated: true)
+            }
         }
         //彩虹豆
         communityNavigationBarView.rightButtonClosure = {
             [weak self] in
-            self?.reloadSegmentedStarView()
-
-            
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                self?.reloadSegmentedStarView()
+            }
         }
         
         // 找朋友 查看全部推荐关注
@@ -153,7 +154,6 @@ class CommunityViewController: BaseViewController {
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityUser"), object: nil, queue: OperationQueue.main) {
             [weak self] (notification) in
             let uid = notification.object as? Int
-            
             if uid != UserModel.shared().getModel()?.uid {
                 let vc = OtherPersonalCenterViewController()
                 vc.uid = uid ?? 0

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -121,7 +121,7 @@ class CommunityRecommnendViewController: UIViewController {
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModuleRecommendTop"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
             if self?.tableView.contentOffset == CGPoint(x: 0, y: 0) {
-                self?.communityPostSuggestApi(page:1)
+                self?.tableView.mj_header.beginRefreshing()
             }else {
                 self?.tableView.scrollToTop()
             }

+ 61 - 22
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -173,31 +173,57 @@ class CommunityRecommendController: BaseViewController {
     override func setupData() {
         //头像
         avatarButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if self?.communityPostDetailModel?.uid != UserModel.shared().getModel()?.uid {
-                let vc = OtherPersonalCenterViewController()
-                vc.uid = self?.communityPostDetailModel?.uid ?? 0
-                self?.navigationController?.pushViewController(vc, animated: true)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if self?.communityPostDetailModel?.uid != UserModel.shared().getModel()?.uid {
+                    let vc = OtherPersonalCenterViewController()
+                    vc.uid = self?.communityPostDetailModel?.uid ?? 0
+                    self?.navigationController?.pushViewController(vc, animated: true)
+                }
             }
+
         }).disposed(by: disposeBag)
         //用户昵称
         nameButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if self?.communityPostDetailModel?.uid != UserModel.shared().getModel()?.uid {
-                let vc = OtherPersonalCenterViewController()
-                vc.uid = self?.communityPostDetailModel?.uid ?? 0
-                self?.navigationController?.pushViewController(vc, animated: true)
+            
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if self?.communityPostDetailModel?.uid != UserModel.shared().getModel()?.uid {
+                    let vc = OtherPersonalCenterViewController()
+                    vc.uid = self?.communityPostDetailModel?.uid ?? 0
+                    self?.navigationController?.pushViewController(vc, animated: true)
+                }
             }
+
         }).disposed(by: disposeBag)
         // 关注
         followButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            CommunityFollowUserViewModel.shared.follow(communityPostDetailModel: (self?.communityPostDetailModel)!, button: (self?.followButton)!)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                CommunityFollowUserViewModel.shared.follow(communityPostDetailModel: (self?.communityPostDetailModel)!, button: (self?.followButton)!)
+
+            }
         }).disposed(by: disposeBag)
         //分享
         navigationBar.onClickRightButton = {
             [weak self]  in
-            self?.share()
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                self?.share()
+
+            }
         }
         sharedButton.rx.tap.subscribe(onNext: { [weak self] _ in
-            self?.share()
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                self?.share()
+                
+            }
         }).disposed(by: disposeBag)
         tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
@@ -599,15 +625,24 @@ extension CommunityRecommendController: UITableViewDataSource, UITableViewDelega
                 cell.communityPostDetailModel = communityPostDetailModel
                 cell.commentClosure = {
                     [weak self] in
-                    self?.showKeyBoardCommentView(placeholder: "添加评论...")
+                    if UserModel.isTokenNil() {
+                        kAppDelegate.setLogin()
+                    }else {
+                        self?.showKeyBoardCommentView(placeholder: "添加评论...")
+                    }
                 }
                 cell.userClosure = {
                     [weak self] in
-                    if self?.communityPostDetailModel?.uid != UserModel.shared().getModel()?.uid {
-                        let vc = OtherPersonalCenterViewController()
-                        vc.uid = self?.communityPostDetailModel?.uid ?? 0
-                        self?.navigationController?.pushViewController(vc, animated: true)
+                    if UserModel.isTokenNil() {
+                        kAppDelegate.setLogin()
+                    }else {
+                        if self?.communityPostDetailModel?.uid != UserModel.shared().getModel()?.uid {
+                            let vc = OtherPersonalCenterViewController()
+                            vc.uid = self?.communityPostDetailModel?.uid ?? 0
+                            self?.navigationController?.pushViewController(vc, animated: true)
+                        }
                     }
+
                 }
                 return cell
             }else {
@@ -646,12 +681,16 @@ extension CommunityRecommendController: UITableViewDataSource, UITableViewDelega
             if communityPostCommentModels.isEmpty {
                 break
             }else {
-                communityPostCommentModel = self.communityPostCommentModels[indexPath.row]
-                self.indexPath = indexPath
-                AlertSheetView.sheetCommentReplyView(userName: communityPostCommentModel?.username ?? "", content: communityPostCommentModel?.content ?? "") {
-                    [weak self] in
-                    self?.communityPostCommentModel = self?.communityPostCommentModels[indexPath.row]
-                    self?.showKeyBoardCommentView(placeholder: "回复:@\(self?.communityPostCommentModel?.username ?? "")")
+                if UserModel.isTokenNil() {
+                    kAppDelegate.setLogin()
+                }else {
+                    communityPostCommentModel = self.communityPostCommentModels[indexPath.row]
+                    self.indexPath = indexPath
+                    AlertSheetView.sheetCommentReplyView(userName: communityPostCommentModel?.username ?? "", content: communityPostCommentModel?.content ?? "") {
+                        [weak self] in
+                        self?.communityPostCommentModel = self?.communityPostCommentModels[indexPath.row]
+                        self?.showKeyBoardCommentView(placeholder: "回复:@\(self?.communityPostCommentModel?.username ?? "")")
+                    }
                 }
                 break
             }

+ 46 - 24
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendBottomCommentView.swift

@@ -108,9 +108,14 @@ class RecommendBottomCommentView: BaseView {
     private lazy var textBtn: UIButton = {
         let textBtn = UIButton(type: UIButton.ButtonType.custom)
         textBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let bottomClickClosure = self?.bottomClickClosure {
-                bottomClickClosure(BottomClickType.typeComment)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let bottomClickClosure = self?.bottomClickClosure {
+                    bottomClickClosure(BottomClickType.typeComment)
+                }
             }
+
         }).disposed(by: disposeBag)
         return textBtn
     }()
@@ -142,17 +147,24 @@ class RecommendBottomCommentView: BaseView {
         likeBtn.setImage(kImage(name: "btn_praise_pre"), for: UIControl.State.selected)
         likeBtn.titleLabel?.font = kRegularFont14
         likeBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            likeBtn.isSelected = !likeBtn.isSelected
-            if self?.communityPostDetailModel?.isLike == 0 {
-                self?.praiseAnimationView.isHidden = false
-                self?.praiseAnimationView.play(completion: {
-                    [weak self] (_) in
-                    self?.praiseAnimationView.isHidden = true
-                })
-            }
-            if let bottomClickClosure = self?.bottomClickClosure {
-                bottomClickClosure(BottomClickType.typeLike)
+            
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                likeBtn.isSelected = !likeBtn.isSelected
+                if self?.communityPostDetailModel?.isLike == 0 {
+                    self?.praiseAnimationView.isHidden = false
+                    self?.praiseAnimationView.play(completion: {
+                        [weak self] (_) in
+                        self?.praiseAnimationView.isHidden = true
+                    })
+                }
+                if let bottomClickClosure = self?.bottomClickClosure {
+                    bottomClickClosure(BottomClickType.typeLike)
+                }
             }
+            
+           
         }).disposed(by: disposeBag)
         return likeBtn
     }()
@@ -164,17 +176,23 @@ class RecommendBottomCommentView: BaseView {
         collectBtn.setImage(kImage(name: "btn_collect_pre"), for: .selected)
         collectBtn.titleLabel?.font = kRegularFont14
         collectBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            collectBtn.isSelected = !collectBtn.isSelected
-            if self?.communityPostDetailModel?.isCollect == 0 {
-                self?.collectAnimationView.isHidden = false
-                self?.collectAnimationView.play(completion: {
-                    [weak self] (_) in
-                    self?.collectAnimationView.isHidden = true
-                })
-            }
-            if let bottomClickClosure = self?.bottomClickClosure {
-                bottomClickClosure(BottomClickType.typeCollect)
+            
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                collectBtn.isSelected = !collectBtn.isSelected
+                if self?.communityPostDetailModel?.isCollect == 0 {
+                    self?.collectAnimationView.isHidden = false
+                    self?.collectAnimationView.play(completion: {
+                        [weak self] (_) in
+                        self?.collectAnimationView.isHidden = true
+                    })
+                }
+                if let bottomClickClosure = self?.bottomClickClosure {
+                    bottomClickClosure(BottomClickType.typeCollect)
+                }
             }
+            
         }).disposed(by: disposeBag)
         return collectBtn
     }()
@@ -185,8 +203,12 @@ class RecommendBottomCommentView: BaseView {
         commentBtn.setImage(kImage(name: "btn_note_black"), for: UIControl.State.normal)
         commentBtn.titleLabel?.font = kRegularFont14
         commentBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let bottomClickClosure = self?.bottomClickClosure {
-                bottomClickClosure(BottomClickType.typeComment)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let bottomClickClosure = self?.bottomClickClosure {
+                    bottomClickClosure(BottomClickType.typeComment)
+                }
             }
         }).disposed(by: disposeBag)
         return commentBtn

+ 80 - 44
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -436,9 +436,14 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         shareBtnRight.setImage(kImage(name: "nav_share_white"), for: UIControl.State.normal)
         shareBtnRight.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if let shareClosure = self?.shareClosure {
-                shareClosure(self!.videoItemMdl!)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let shareClosure = self?.shareClosure {
+                    shareClosure(self!.videoItemMdl!)
+                }
             }
+
         }).disposed(by: disposeBag)
         return shareBtnRight
     }()
@@ -448,9 +453,14 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         shareBtnLeft.setImage(kImage(name: "nav_share_poster"), for: UIControl.State.normal)
         shareBtnLeft.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if let shareClosure = self?.shareClosure {
-                shareClosure(self!.videoItemMdl!)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let shareClosure = self?.shareClosure {
+                    shareClosure(self!.videoItemMdl!)
+                }
             }
+
         }).disposed(by: disposeBag)
         return shareBtnLeft
     }()
@@ -475,9 +485,14 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         commentBtn.setImage(kImage(name: "video_btn_note_white"), for: UIControl.State.normal)
         commentBtn.titleLabel?.font = kRegularFont14
         commentBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let buttonClickClosure = self?.buttonClickClosure {
-                buttonClickClosure(videoBtnClickType.typeComment, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let buttonClickClosure = self?.buttonClickClosure {
+                    buttonClickClosure(videoBtnClickType.typeComment, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+                }
             }
+
         }).disposed(by: disposeBag)
         return commentBtn
     }()
@@ -509,24 +524,30 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         collectBtn.setImage(kImage(name: "btn_collect_pre"), for: UIControl.State.selected)        
         collectBtn.titleLabel?.font = kRegularFont14
         collectBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            collectBtn.isSelected = !collectBtn.isSelected
-            // 本地修改收藏数据
-            var collectCount = self?.videoItemMdl?.collectCount ?? 0
-            if self?.videoItemMdl?.isCollect == 0 {
-                collectBtn.setTitle("\(collectCount)", for: .normal)
-                collectBtn.setTitle("\(collectCount+1)", for: .selected)
-                self?.collectAnimationView.isHidden = false
-                self?.collectAnimationView.play(completion: { (_) in
-                    self?.collectAnimationView.isHidden = true
-                })
-            } else {
-                collectBtn.setTitle("\(collectCount)", for: .selected)
-                collectBtn.setTitle("\(collectCount-1)", for: .normal)
-            }
-            // 点击回调
-            if let buttonClickClosure = self?.buttonClickClosure {
-                buttonClickClosure(videoBtnClickType.typeCollect, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+            
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                collectBtn.isSelected = !collectBtn.isSelected
+                // 本地修改收藏数据
+                var collectCount = self?.videoItemMdl?.collectCount ?? 0
+                if self?.videoItemMdl?.isCollect == 0 {
+                    collectBtn.setTitle("\(collectCount)", for: .normal)
+                    collectBtn.setTitle("\(collectCount+1)", for: .selected)
+                    self?.collectAnimationView.isHidden = false
+                    self?.collectAnimationView.play(completion: { (_) in
+                        self?.collectAnimationView.isHidden = true
+                    })
+                } else {
+                    collectBtn.setTitle("\(collectCount)", for: .selected)
+                    collectBtn.setTitle("\(collectCount-1)", for: .normal)
+                }
+                // 点击回调
+                if let buttonClickClosure = self?.buttonClickClosure {
+                    buttonClickClosure(videoBtnClickType.typeCollect, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+                }
             }
+            
         }).disposed(by: disposeBag)
         return collectBtn
     }()
@@ -538,24 +559,30 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         likeBtn.setImage(kImage(name: "btn_praise_pre_36px"), for: UIControl.State.selected)
         likeBtn.titleLabel?.font = kRegularFont14
         likeBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            likeBtn.isSelected = !likeBtn.isSelected
-            // 本地修改点赞数据
-            var praiseCount = self?.videoItemMdl?.praiseCount ?? 0
-            if self?.videoItemMdl?.isLike == 0 {
-                likeBtn.setTitle("\(praiseCount)", for: .normal)
-                likeBtn.setTitle("\(praiseCount+1)", for: .selected)
-                self?.praiseAnimationView.isHidden = false
-                self?.praiseAnimationView.play(completion: { (_) in
-                    self?.praiseAnimationView.isHidden = true
-                })
-            } else {
-                likeBtn.setTitle("\(praiseCount)", for: .selected)
-                likeBtn.setTitle("\(praiseCount-1)", for: .normal)
-            }
-            // 点击回调
-            if let buttonClickClosure = self?.buttonClickClosure {
-                buttonClickClosure(videoBtnClickType.typeLike, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+            
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                likeBtn.isSelected = !likeBtn.isSelected
+                // 本地修改点赞数据
+                var praiseCount = self?.videoItemMdl?.praiseCount ?? 0
+                if self?.videoItemMdl?.isLike == 0 {
+                    likeBtn.setTitle("\(praiseCount)", for: .normal)
+                    likeBtn.setTitle("\(praiseCount+1)", for: .selected)
+                    self?.praiseAnimationView.isHidden = false
+                    self?.praiseAnimationView.play(completion: { (_) in
+                        self?.praiseAnimationView.isHidden = true
+                    })
+                } else {
+                    likeBtn.setTitle("\(praiseCount)", for: .selected)
+                    likeBtn.setTitle("\(praiseCount-1)", for: .normal)
+                }
+                // 点击回调
+                if let buttonClickClosure = self?.buttonClickClosure {
+                    buttonClickClosure(videoBtnClickType.typeLike, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+                }
             }
+            
         }).disposed(by: disposeBag)
         return likeBtn
     }()
@@ -579,9 +606,14 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
     private lazy var textBtn: UIButton = {
         let textBtn = UIButton(type: UIButton.ButtonType.custom)
         textBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let buttonClickClosure = self?.buttonClickClosure {
-                buttonClickClosure(videoBtnClickType.typeComment, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let buttonClickClosure = self?.buttonClickClosure {
+                    buttonClickClosure(videoBtnClickType.typeComment, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+                }
             }
+
         }).disposed(by: disposeBag)
         return textBtn
     }()
@@ -686,8 +718,12 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         avatarButton.masksToBounds = true
         avatarButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if let buttonClickClosure = self?.buttonClickClosure {
-                buttonClickClosure(videoBtnClickType.typePerson, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let buttonClickClosure = self?.buttonClickClosure {
+                    buttonClickClosure(videoBtnClickType.typePerson, self?.videoItemMdl?.uid ?? 0, self?.videoItemMdl?.id ?? 0)
+                }
             }
         }).disposed(by: disposeBag)
         return avatarButton

+ 6 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoTopicView.swift

@@ -77,8 +77,12 @@ extension CommunityVideoTopicView: UICollectionViewDelegateFlowLayout,UICollecti
     }
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        let topicMdl = topicArray?[indexPath.row]
-        Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: topicMdl?.id ?? 0))
+        if UserModel.isTokenNil() {
+            kAppDelegate.setLogin()
+        }else {
+            let topicMdl = topicArray?[indexPath.row]
+            Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: topicMdl?.id ?? 0))
+        }
     }
     
 }

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/ViewController/RedemptionAreaViewController.swift

@@ -59,7 +59,7 @@ class RedemptionAreaViewController: BaseViewController {
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("RedemptionAreaModuleTop"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
             if self?.tableView.contentOffset == CGPoint(x: 0, y: 0) {
-                self?.cmsTemplateExchangeApi()
+                self?.tableView.mj_header.beginRefreshing()
             }else {
                 self?.tableView.scrollToTop()
             }

+ 3 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/View/MobileLoginView.swift

@@ -12,6 +12,9 @@ import RxCocoa
 import SwiftyMediator
 
 class MobileLoginView: BaseView {
+    deinit {
+        NXLLog("deinit")
+    }
 
     /// 手机号
     var phoneNumber : String = ""

+ 23 - 10
RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift

@@ -130,9 +130,14 @@ class SearchContentListCollectionCell: UICollectionViewCell {
         avatarButton.masksToBounds = true
         avatarButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if let userClosure = self?.userClosure {
-                userClosure()
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let userClosure = self?.userClosure {
+                    userClosure()
+                }
             }
+
         }).disposed(by: disposeBag)
         return avatarButton
     }()
@@ -147,8 +152,12 @@ class SearchContentListCollectionCell: UICollectionViewCell {
         nameButton.titleLabel?.lineBreakMode = .byTruncatingTail
         nameButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if let userClosure = self?.userClosure {
-                userClosure()
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if let userClosure = self?.userClosure {
+                    userClosure()
+                }
             }
         }).disposed(by: disposeBag)
         return nameButton
@@ -161,13 +170,17 @@ class SearchContentListCollectionCell: UICollectionViewCell {
         likeBtn.setImage(kImage(name: "btn_praise_pre_36px"), for: UIControl.State.selected)
         likeBtn.titleLabel?.font = kRegularFont12
         likeBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if self?.communityPostDataModel?.isLike == 0 {
-                self?.praiseAnimationView.isHidden = false
-                self?.praiseAnimationView.play(completion: { (_) in
-                    self?.praiseAnimationView.isHidden = true
-                })
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                if self?.communityPostDataModel?.isLike == 0 {
+                    self?.praiseAnimationView.isHidden = false
+                    self?.praiseAnimationView.play(completion: { (_) in
+                        self?.praiseAnimationView.isHidden = true
+                    })
+                }
+                VirusViewModel.shared.likeVirueRecordAddApi(communityPostDataModel: (self?.communityPostDataModel!)!, cell: self!)
             }
-            VirusViewModel.shared.likeVirueRecordAddApi(communityPostDataModel: (self?.communityPostDataModel!)!, cell: self!)
         }).disposed(by: disposeBag)
         return likeBtn
     }()

+ 5 - 0
RainbowPlanet/RainbowPlanet/Router/PublishRouterModuleType.swift

@@ -12,6 +12,7 @@ import SwiftyMediator
 /// 推荐音乐
 public enum PublishRouterModuleType: MediatorTargetType {
     case pushMucisChooseView
+    case presentPublish
 }
 
 extension PublishRouterModuleType: MediatorSourceType {
@@ -20,6 +21,10 @@ extension PublishRouterModuleType: MediatorSourceType {
         case .pushMucisChooseView:
             let vc = PublishRecommendMusicController()
             return vc
+        case .presentPublish:
+            let vc = PublishViewController()
+            let nav = BaseNavigationViewController.init(rootViewController: vc)
+            return nav
         }
     }
 }

+ 37 - 26
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -696,19 +696,26 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - completion: 回调
     func userFollowApi(followUid:Int,completion: @escaping successCallBack) {
     
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(followUid, forKey: "follow_uid")
-        
-        SwiftMoyaNetWorkManager.shared.requestObject(FollowStatusModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userFollow(parameters: parameters))) { (followStatusModel) in
-            let followStatusModel = followStatusModel as? FollowStatusModel
-            followStatusModel?.uid = followUid
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel)
-            SwiftProgressHUD.shared().showText("已关注")
-            completion(followStatusModel as Any)
-        }
-        SwiftMoyaNetWorkManager.shared.failCallback = {
-            (loadingStatus) in
+        if UserModel.isTokenNil() {
+            
+            kAppDelegate.setLogin()
+            
+        }else {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(followUid, forKey: "follow_uid")
+            
+            SwiftMoyaNetWorkManager.shared.requestObject(FollowStatusModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userFollow(parameters: parameters))) { (followStatusModel) in
+                let followStatusModel = followStatusModel as? FollowStatusModel
+                followStatusModel?.uid = followUid
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel)
+                SwiftProgressHUD.shared().showText("已关注")
+                completion(followStatusModel as Any)
+            }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
+
     }
     
     // MARK: - 取消关注
@@ -718,20 +725,24 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - followUid: 被取消关注人id
     ///   - completion: 回调
     func userCancelFollowApi(followUid:Int,completion: @escaping successCallBack) {
-        
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(followUid, forKey: "follow_uid")
-        
-        SwiftMoyaNetWorkManager.shared.requestObject(FollowStatusModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userCancelFollow(parameters: parameters))) { (followStatusModel) in
-            let followStatusModel = followStatusModel as? FollowStatusModel
-            followStatusModel?.uid = followUid
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel)
-            SwiftProgressHUD.shared().showText("已取消关注")
-            completion(followStatusModel as Any)
-        }
-        SwiftMoyaNetWorkManager.shared.failCallback = {
-            (loadingStatus) in
+        if UserModel.isTokenNil() {
+            kAppDelegate.setLogin()
+        }else {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(followUid, forKey: "follow_uid")
+            
+            SwiftMoyaNetWorkManager.shared.requestObject(FollowStatusModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userCancelFollow(parameters: parameters))) { (followStatusModel) in
+                let followStatusModel = followStatusModel as? FollowStatusModel
+                followStatusModel?.uid = followUid
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel)
+                SwiftProgressHUD.shared().showText("已取消关注")
+                completion(followStatusModel as Any)
+            }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
+
     }
     
     // MARK: - 用户消息消息首页
@@ -810,7 +821,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         }
     }
     
-    
+    // MARK: - 获取彩虹豆
     /// 获取彩虹豆
     ///
     /// - Parameter completion: 回调

+ 15 - 14
RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -776,20 +776,21 @@ extension VirusViewModel {
                                postType:String?,
                                postCover:String?,
                                actionId:String) {
-        let virueRecordAddParameterModel = VirueRecordAddParameterModel()
-        virueRecordAddParameterModel.behaviorId = (ConfigModel.shared.object()?.virus?.read ?? "")
-        virueRecordAddParameterModel.behaviorFlag = BehaviorFlagType.read.rawValue
-        virueRecordAddParameterModel.behaviorValue = 1
-
-        virueRecordAddParameterModel.postId = postId
-        virueRecordAddParameterModel.actionId = actionId
-        virueRecordAddParameterModel.postAuthorUid = postAuthorUid
-        virueRecordAddParameterModel.postDesc = "\(postDesc ?? "")"
-        virueRecordAddParameterModel.postType = postType
-        virueRecordAddParameterModel.postCover = postCover
-        SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {(data) -> (Void) in
-        })
-        
+        if !UserModel.isTokenNil() {
+            let virueRecordAddParameterModel = VirueRecordAddParameterModel()
+            virueRecordAddParameterModel.behaviorId = (ConfigModel.shared.object()?.virus?.read ?? "")
+            virueRecordAddParameterModel.behaviorFlag = BehaviorFlagType.read.rawValue
+            virueRecordAddParameterModel.behaviorValue = 1
+            
+            virueRecordAddParameterModel.postId = postId
+            virueRecordAddParameterModel.actionId = actionId
+            virueRecordAddParameterModel.postAuthorUid = postAuthorUid
+            virueRecordAddParameterModel.postDesc = "\(postDesc ?? "")"
+            virueRecordAddParameterModel.postType = postType
+            virueRecordAddParameterModel.postCover = postCover
+            SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {(data) -> (Void) in
+            })
+        }
     }
 }