no message

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 extension AppDelegate {
 
@@ -29,23 +30,19 @@ extension AppDelegate {
         SwiftMoyaNetWorkServiceConfig.shared().configApi {(data) -> (Void) in}
         /// 判断初始化页面
         if (UserModel.shared().getModel()?.token) != nil { //是否已经登录
-
-            if (UserModel.shared().getModel()?.gender == nil || UserModel.shared().getModel()?.gender == 0) {//设置性别
-                SwiftMoyaNetWorkServiceUser.shared().userRefreshApi {[weak self] _ in
+            SwiftMoyaNetWorkServiceUser.shared().userRefreshApi {
+                [weak self] _ in
+                if (UserModel.shared().getModel()?.gender == nil || UserModel.shared().getModel()?.gender == 0) {//设置性别
                     self?.setSexViewController()
-                }
-            }else if (UserModel.shared().getModel()?.gender == 1 || UserModel.shared().getModel()?.gender == 2) && UserModel.shared().getModel()?.isFollowSuggestTopic == 0  { //设置话题
-                SwiftMoyaNetWorkServiceUser.shared().userRefreshApi {[weak self] _ in
+                }else if (UserModel.shared().getModel()?.gender == 1 || UserModel.shared().getModel()?.gender == 2) && UserModel.shared().getModel()?.isFollowSuggestTopic == 0  { //设置话题
                     self?.setTopicViewController()
-                }
-            }else if (UserModel.shared().getModel()?.gender == 1 || UserModel.shared().getModel()?.gender == 2) && UserModel.shared().getModel()?.isFollowSuggestTopic == 1 { //设置首页
-
-                SwiftMoyaNetWorkServiceUser.shared().userRefreshApi {[weak self] _ in
+                }else {// 进入首页
                     self?.setTabbarController()
+                    //获取消息的小红点
+                    MessageModuleManager.shared.userMemberMessageIndexApi()
                 }
-            }else {// 进入首页
-                setTabbarController()
             }
+            
         }else {// 进入首页
             setTabbarController()
         }
@@ -57,19 +54,32 @@ extension AppDelegate {
     /// 设置Tabbar
     func setTabbarController() {
         self.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
-        //获取消息的小红点
-        MessageModuleManager.shared.userMemberMessageIndexApi()
     }
 
-    /// 设置Login
-    func setLoginController() {
+    /// 登录
+    func setLogin() {
+        Mediator.present(RegisterLoginRouterModuleType.presentRegisterLogin)
+    }
+    
+    /// 退出登录
+    func setLoginOut() {
         //移除友盟别名
         UMManager.shared.removeAlias()
         //移除本地用户信息
         UserModel.shared().removeLoginModel()
         //移除快递信息
         DeliveryMethodTypeModel.shared().removeLoginModel()
-        self.window?.rootViewController = BaseNavigationViewController.init(rootViewController: RegisterLoginViewController())
+        BaseTabbarViewController.shared.v1 = nil
+        BaseTabbarViewController.shared.v2 = nil
+        BaseTabbarViewController.shared.v3 = nil
+        BaseTabbarViewController.shared.v4 = nil
+        BaseTabbarViewController.shared.v5 = nil
+        BaseTabbarViewController.shared.lottieAnimateContentView1 = nil
+        BaseTabbarViewController.shared.lottieAnimateContentView2 = nil
+        BaseTabbarViewController.shared.lottieAnimateContentView4 = nil
+        BaseTabbarViewController.shared.lottieAnimateContentView5 = nil
+        //进入到首页
+        setTabbarController()
     }
     
     /// 设置性别页面

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -90,7 +90,7 @@ class BaseTabbarViewController: NSObject {
     /// 兑换专区
     var v2 : RedemptionAreaViewController!
     /// 发布
-    var v3 : UIViewController!
+    var v3 : BaseViewController!
     /// 消息
     var v4 : MessageMainViewController!
     /// 我的
@@ -147,7 +147,7 @@ class BaseTabbarViewController: NSObject {
         /// 兑换专区
         v2 = RedemptionAreaViewController()
         /// 发布
-        v3 = UIViewController()
+        v3 = BaseViewController()
         /// 消息
         v4 = MessageMainViewController()
         /// 我的

RainbowPlanet/RainbowPlanet/Base/BaseViewController/BaseViewController.swift

@@ -53,8 +53,7 @@ class BaseViewController: UIViewController {
         navigationBar.wr_setLeftButton(image: image)
         navigationBar.onClickLeftButton = {
             [weak self] in
-            guard let strongSelf = self else { return }
-            strongSelf.wr_toLastViewController(animated: true)
+            self?.wr_toLastViewController(animated: true)
         }
     }
 

RainbowPlanet/RainbowPlanet/Model/ConfigModel/SelfMentionAddressListModel.swift

@@ -206,4 +206,8 @@ class SelfMentionAddressModel : NSObject, NSCoding, Mappable{
         UserDefaults.standard.removeObject(forKey: "SelfMentionAddressModel")
     }
     
+    class func isToken() {
+        
+    }
+    
 }

RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -186,6 +186,16 @@ public class UserModel : NSObject, NSCoding, Mappable{
             return false
         }
     }
+    
+    class func isTokenNil() -> Bool {
+        if (UserModel.shared().getModel()?.token) == nil {
+            return true
+        }else {
+            return false
+        }
+    }
+    
+    
 
 }
 

RainbowPlanet/RainbowPlanet/Model/VirusModel/VirueRecordAddParameterModel.swift

@@ -23,7 +23,7 @@ class VirueRecordAddParameterModel: NSObject, Mappable{
     /// 应用标识
     var appIdentification : String = "app"
     /// 用户ID
-    var targetId : String = "\((UserModel.shared().getModel()?.uid)!)"
+    var targetId : String = "\((UserModel.shared().getModel()?.uid ?? 0))"
     /// 动作ID
     var actionId : String = ""
     /// 行为ID

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -12,6 +12,7 @@ import JXSegmentedView
 class CommunityFollowViewController: UIViewController {
     
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -20,7 +20,9 @@ var communityModuleTopType :CommunityModuleTopType?
 
 class CommunityViewController: BaseViewController {
     
+    
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }
@@ -399,13 +401,21 @@ extension CommunityViewController : JXSegmentedViewDelegate {
     //点击选中或者滚动选中都会调用该方法。适用于只关心选中事件，而不关心具体是点击还是滚动选中的情况。
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         if index == 0 {
-            communityModuleTopType = .communityModuleFollowTop
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                listContainerView.didClickSelectedItem(at: index)
+                communityModuleTopType = .communityModuleFollowTop
+            }
         }
         if index == 1 {
             communityModuleTopType = .communityModuleRecommendTop
+            listContainerView.didClickSelectedItem(at: index)
+
         }
         if index == 2 {
             communityModuleTopType = .communityModulePlanetTop
+            listContainerView.didClickSelectedItem(at: index)
         }
         
     }
@@ -413,7 +423,6 @@ extension CommunityViewController : JXSegmentedViewDelegate {
     // 点击选中的情况才会调用该方法
     func segmentedView(_ segmentedView: JXSegmentedView, didClickSelectedItemAt index: Int) {
         //传递didClickSelectedItemAt事件给listContainerView，必须调用！！！
-        listContainerView.didClickSelectedItem(at: index)
     }
     
     // 滚动选中的情况才会调用该方法
@@ -424,7 +433,6 @@ extension CommunityViewController : JXSegmentedViewDelegate {
     // 正在滚动中的回调
     func segmentedView(_ segmentedView: JXSegmentedView, scrollingFrom leftIndex: Int, to rightIndex: Int, percent: CGFloat) {
         //传递scrolling事件给listContainerView，必须调用！！！
-        listContainerView.segmentedViewScrolling(from: leftIndex, to: rightIndex, percent: percent, selectedIndex: segmentedView.selectedIndex)
     }
     
     /// 是否允许点击选中目标index的item

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Planet/CommunityPlanet/CommunityPlanetViewController.swift

@@ -16,6 +16,7 @@ import MJRefresh
 class CommunityPlanetViewController: BaseJSWebViewController {
     
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -12,6 +12,7 @@ import JXSegmentedView
 class CommunityRecommnendViewController: UIViewController {
     
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -11,6 +11,8 @@ import UIKit
 class CommunityRecommendController: BaseViewController {
     
     deinit {
+        NXLLog("deinit")
+        self.view = nil
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }
@@ -141,6 +143,7 @@ class CommunityRecommendController: BaseViewController {
     }()
     
     lazy var tableView: UITableView = {
+        [unowned self] in
         let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
         tableView.separatorStyle = .none
         tableView.backgroundColor = kf7f8faColor

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendMajorCommentCell.swift

@@ -89,9 +89,6 @@ class RecommendMajorCommentCell: UITableViewCell {
         iconButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
         iconButton.cornerRadius = 12
         iconButton.masksToBounds = true
-        iconButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            
-        }).disposed(by: disposeBag)
         return iconButton
     }()
     
@@ -121,6 +118,7 @@ class RecommendMajorCommentCell: UITableViewCell {
     }()
     
     lazy var tableView: UITableView = {
+        [unowned self] in
         let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
         tableView.separatorStyle = .none
         tableView.backgroundColor = kf7f8faColor

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendSubCommentTableViewCell.swift

@@ -84,9 +84,6 @@ class RecommendSubCommentTableViewCell: UITableViewCell {
         iconButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
         iconButton.cornerRadius = 12
         iconButton.masksToBounds = true
-        iconButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            
-        }).disposed(by: disposeBag)
         return iconButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityPostDetailTableViewHeaderView.swift

@@ -29,6 +29,7 @@ class CommunityPostDetailTableViewHeaderView: BaseView {
     }
     
     private lazy var pagerView: FSPagerView = {
+        [unowned self] in
         let pagerView = FSPagerView(frame: CGRect.zero)
         pagerView.backgroundColor = kf7f8faColor
         pagerView.delegate = self
@@ -103,8 +104,9 @@ extension CommunityPostDetailTableViewHeaderView:FSPagerViewDataSource,FSPagerVi
         let currentIndex = pagerView.currentIndex
         let cell = pagerView.cellForItem(at: currentIndex) as! CommunityPostDetailFSPagerViewCell
         UIView.animate(withDuration: 0.5) {
-            self.size = cell.size
-            self.tableView?.reloadData()
+            [weak self] in
+            self?.size = cell.size
+            self?.tableView?.reloadData()
         }
     }
     func pagerViewWillEndDragging(_ pagerView: FSPagerView, targetIndex: Int) {
@@ -112,8 +114,9 @@ extension CommunityPostDetailTableViewHeaderView:FSPagerViewDataSource,FSPagerVi
         self.numberLabel.text =  "  \(targetIndex+1)/" + "\(imgs.count)  "
         let cell = pagerView.cellForItem(at: currentIndex) as! CommunityPostDetailFSPagerViewCell
         UIView.animate(withDuration: 0.5) {
-            self.size = cell.size
-            self.tableView?.reloadData()
+            [weak self] in
+            self?.size = cell.size
+            self?.tableView?.reloadData()
         }
     }
     func pagerViewDidScroll(_ pagerView: FSPagerView) {
@@ -130,8 +133,9 @@ extension CommunityPostDetailTableViewHeaderView:FSPagerViewDataSource,FSPagerVi
         let currentIndex = pagerView.currentIndex
         let cell = pagerView.cellForItem(at: currentIndex) as! CommunityPostDetailFSPagerViewCell
         UIView.animate(withDuration: 0.5) {
-            self.size = cell.size
-            self.tableView?.reloadData()
+            [weak self] in
+            self?.size = cell.size
+            self?.tableView?.reloadData()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift

@@ -13,6 +13,7 @@ import SwiftyMediator
 class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
     
     deinit {
+        NXLLog("deinit")
         webView.scrollView.removeObserver(self, forKeyPath: "contentSize")
     }
 
@@ -186,6 +187,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
     }()
     
     private lazy var collectionView: UICollectionView = {
+        [unowned self] in
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
         collectionView.backgroundColor = kffffffColor
         collectionView.delegate = self

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendBottomCommentView.swift

@@ -145,7 +145,8 @@ class RecommendBottomCommentView: BaseView {
             likeBtn.isSelected = !likeBtn.isSelected
             if self?.communityPostDetailModel?.isLike == 0 {
                 self?.praiseAnimationView.isHidden = false
-                self?.praiseAnimationView.play(completion: { (_) in
+                self?.praiseAnimationView.play(completion: {
+                    [weak self] (_) in
                     self?.praiseAnimationView.isHidden = true
                 })
             }
@@ -166,7 +167,8 @@ class RecommendBottomCommentView: BaseView {
             collectBtn.isSelected = !collectBtn.isSelected
             if self?.communityPostDetailModel?.isCollect == 0 {
                 self?.collectAnimationView.isHidden = false
-                self?.collectAnimationView.play(completion: { (_) in
+                self?.collectAnimationView.play(completion: {
+                    [weak self] (_) in
                     self?.collectAnimationView.isHidden = true
                 })
             }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendSimilarCell.swift

@@ -51,6 +51,7 @@ class RecommendSimilarCell: UITableViewCell {
     }
     
     private lazy var collectionView: UICollectionView = {
+        [unowned self] in
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
         collectionView.backgroundColor = kf7f8faColor
         collectionView.delegate = self;
@@ -62,6 +63,7 @@ class RecommendSimilarCell: UITableViewCell {
         return collectionView
     }()
     private lazy var collectionViewLayout: WaterFallLayout = {
+        [unowned self] in
         let collectionViewLayout = WaterFallLayout()
         collectionViewLayout.delegate = self
         collectionViewLayout.scrollDirection = .horizontal

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/imageCell/RecommendDetailContentCell.swift

@@ -12,6 +12,10 @@ import SwiftyMediator
 
 class RecommendDetailContentCell: UITableViewCell {
     
+    deinit {
+        NXLLog("deinit")
+    }
+    
     class func cellWith(tableView:UITableView,indexPath:IndexPath) -> RecommendDetailContentCell {
         let ID = "RecommendDetailContentCell"
         tableView.register(RecommendDetailContentCell.self, forCellReuseIdentifier: ID)
@@ -166,6 +170,7 @@ class RecommendDetailContentCell: UITableViewCell {
     }()
     
     private lazy var collectionView: UICollectionView = {
+        [unowned self] in
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
         collectionView.backgroundColor = kffffffColor
         collectionView.delegate = self

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift

@@ -13,6 +13,7 @@ import ESTabBarController_swift
 class MessageMainViewController: BaseViewController {
     
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -15,6 +15,7 @@ import ESTabBarController_swift
 class UserPersonalCenterViewController: BaseViewController {
     
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/ViewController/RedemptionAreaViewController.swift

@@ -12,6 +12,7 @@ import SwiftyMediator
 class RedemptionAreaViewController: BaseViewController {
     
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift

@@ -14,11 +14,13 @@ class RegisterLoginViewController: BaseViewController {
         super.viewDidLoad()
         setupViews()
         setupLayouts()
+        setupData()
     }
 
     override func setupViews() {
+        navigationBar.wr_setRightButton(image: kImage(name: "common_order_close")!)
+        navigationBar.leftButton.isHidden = true
         view.backgroundColor = UIColor.white
-        navigationBar.isHidden = true
         view.addSubview(registerLoginView)
     }
 
@@ -27,9 +29,12 @@ class RegisterLoginViewController: BaseViewController {
             make.edges.equalToSuperview()
         }
     }
-
-    private lazy var registerLoginView: RegisterLoginView = {
-        let registerLoginView = RegisterLoginView()
+    
+    override func setupData() {
+        navigationBar.onClickRightButton = {
+            [weak self] in
+            self?.navigationController?.dismiss(animated: true, completion: nil)
+        }
         // 微信注册登录
         registerLoginView.weiXinLoginBlock = { [weak self] in
             UMManager.shared.loginGetUserInfo(platformType: UMSocialPlatformType.wechatSession) { (userModel) -> (Void) in
@@ -50,15 +55,15 @@ class RegisterLoginViewController: BaseViewController {
                             kAppDelegate.setTabbarController()
                         }
                     }else {
-                        var userModel1 = UserModel()
+                        let userModel1 = UserModel()
                         userModel1.token = userModel.token
                         userModel1.accessToken = userModel.accessToken
                         userModel1.openId = userModel.openId
                         userModel1.unionId = userModel.unionId
                         UserModel.shared().setModel(model: userModel1)
-                        Mediator.push(RegisterLoginRouterModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .weixinlogin))                        
+                        Mediator.push(RegisterLoginRouterModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .weixinlogin))
                     }
-
+                    
                 })
             }
         }
@@ -66,6 +71,10 @@ class RegisterLoginViewController: BaseViewController {
             [weak self] in
             self?.navigationController?.pushViewController(MobileLoginViewController(), animated: true)
         }
+    }
+
+    private lazy var registerLoginView: RegisterLoginView = {
+        let registerLoginView = RegisterLoginView()
         return registerLoginView
     }()
 

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/ViewController/ShoppingMallViewController.swift

@@ -11,6 +11,7 @@ import UIKit
 class ShoppingMallViewController: BaseViewController {
     
     deinit {
+        NXLLog("deinit")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }

RainbowPlanet/RainbowPlanet/Router/RegisterLoginRouterModuleType.swift

@@ -15,6 +15,7 @@ import SwiftyMediator
 /// - pushBindPhoneNumber: 绑定手机号
 public enum RegisterLoginRouterModuleType: MediatorTargetType {
     case pushBindPhoneNumber(bindPhoneNumberVCType:BindPhoneNumberVCType)
+    case presentRegisterLogin
 }
 
 extension RegisterLoginRouterModuleType: MediatorSourceType {
@@ -24,6 +25,10 @@ extension RegisterLoginRouterModuleType: MediatorSourceType {
             let vc = BindPhoneNumberViewController()
             vc.bindPhoneNumberVCType = bindPhoneNumberVCType
             return vc
+        case .presentRegisterLogin:
+            let vc = RegisterLoginViewController()
+            let navc = BaseNavigationViewController(rootViewController: vc)
+            return navc
         }
     }
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -128,7 +128,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         let parameters = Dictionary<String,Any>()
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceUserApi.userLogout(parameters: parameters))) { (data) in
             // 设置友盟别名
-            kAppDelegate.setLoginController()
+            kAppDelegate.setLoginOut()
         }
         SwiftMoyaNetWorkManager.shared.failCallback = {
             (loadingStatus) in

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -9,8 +9,8 @@
 import Foundation
 
 let kPersonalService = false
-let kDevelopSever = false
-let kBetaSever = true
+let kDevelopSever = true
+let kBetaSever = false
 let kProductSever = false
 
 // MARK: - 数据服务器
@@ -29,8 +29,8 @@ public func kApiDataPrefix() -> String {
 }
 
 let kVirusPersonalService = false
-let kVirusDevelopSever = false
-let kVirusBetaSever = true
+let kVirusDevelopSever = true
+let kVirusBetaSever = false
 let kVirusProductSever = false
 
 // MARK: - Virus
@@ -49,8 +49,8 @@ public func kApiVirusPrefix() -> String {
 }
 
 let kH5PersonalService = false
-let kH5DevelopSever = false
-let kH5BetaSever = true
+let kH5DevelopSever = true
+let kH5BetaSever = false
 let kH5ProductSever = false
 
 // MARK: - H5

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

@@ -268,7 +268,7 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                     return Single<RootModel?>.just(rootModel)
                 }else if response.statusCode == 401 {
                     self.log(response: response, json: json)
-                    kAppDelegate.setLoginController()
+                    kAppDelegate.setLoginOut()
                     return Single<RootModel?>.just(nil)
                 }else {
                     self.logError(response: response)
@@ -305,7 +305,7 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                     }
                 }else if response.statusCode == 401 {
                     self.log(response: response, json: json)
-                    kAppDelegate.setLoginController()
+                    kAppDelegate.setLoginOut()
                     return Single<Any?>.just(nil)
                 }else {
                     self.logError(response: response)
@@ -343,7 +343,7 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                     }
                 }else if response.statusCode == 401 {
                     self.log(response: response, json: json)
-                    kAppDelegate.setLoginController()
+                    kAppDelegate.setLoginOut()
                     return Single<[Any]?>.just(nil)
                 }else {
                     self.logError(response: response)
@@ -381,7 +381,7 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                     }
                 }else if response.statusCode == 401 {
                     self.log(response: response, json: json)
-                    kAppDelegate.setLoginController()
+                    kAppDelegate.setLoginOut()
                     return Single<T?>.just(nil)
                 }else {
                     self.logError(response: response)
@@ -418,7 +418,7 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                     }
                 }else if response.statusCode == 401 {
                     self.log(response: response, json: json)
-                    kAppDelegate.setLoginController()
+                    kAppDelegate.setLoginOut()
                     return Single<[T]?>.just(nil)
                 }else {
                     self.logError(response: response)