南鑫林 5 éve
szülő
commit
e288356d83

+ 1 - 1
RainbowPlanet/Podfile

@@ -58,7 +58,7 @@ target 'RainbowPlanet' do
   # 上下滚动的Label
   pod 'DPScrollNumberLabel'
   # TabBarController
-  pod 'ESTabBarController-swift'
+#  pod 'ESTabBarController-swift'
   # 日期选择器
   pod 'PGDatePicker'
   # 生成二维码

+ 1 - 5
RainbowPlanet/Podfile.lock

@@ -36,7 +36,6 @@ PODS:
     - EFQRCode/Core (= 5.1.3)
   - EFQRCode/Core (5.1.3):
     - EFFoundation (>= 1.1.1)
-  - ESTabBarController-swift (2.7)
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -120,7 +119,6 @@ DEPENDENCIES:
   - DeviceKit
   - DPScrollNumberLabel
   - EFQRCode
-  - ESTabBarController-swift
   - FMDB
   - FSPagerView
   - FWPopupView
@@ -177,7 +175,6 @@ SPEC REPOS:
     - DPScrollNumberLabel
     - EFFoundation
     - EFQRCode
-    - ESTabBarController-swift
     - FMDB
     - FSPagerView
     - FWPopupView
@@ -231,7 +228,6 @@ SPEC CHECKSUMS:
   DPScrollNumberLabel: 5124eaccf3029bb84116de391e1273cba676f4f5
   EFFoundation: 26a2731ace3e22cf5f7bb45d28c6afbc945959dd
   EFQRCode: 0979a5c181864085ca7f317b5b5c7b5bf496ad0e
-  ESTabBarController-swift: 4fb52ad03d94d0717ef97bc9eb09a5abfdded0a2
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   FSPagerView: 670405b2f18e2a87fa37f20b00de783e562c25a8
   FWPopupView: 94c091c5352cc557cc5e1bff127c02a027059e38
@@ -271,6 +267,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: f0a02f9818b61369c9e3279cb7c7cc3979ac8e3c
+PODFILE CHECKSUM: 04cf48f67a5c94b9e4d561732d82e9818fee09bb
 
 COCOAPODS: 1.8.4

+ 0 - 8
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -343,7 +343,6 @@
 		A784F2CC23547C9600E49140 /* CommunityCircleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A784F2CB23547C9600E49140 /* CommunityCircleModel.swift */; };
 		A78A5F7622FAA03800DD1764 /* share_iSpt.gif in Resources */ = {isa = PBXBuildFile; fileRef = A78A5F7522FAA03800DD1764 /* share_iSpt.gif */; };
 		A78A5F7822FAC7F000DD1764 /* SetGenderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A78A5F7722FAC7F000DD1764 /* SetGenderModel.swift */; };
-		A78CEE0A22E0864100C512A4 /* BaseLottieAnimateContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A78CEE0922E0864100C512A4 /* BaseLottieAnimateContentView.swift */; };
 		A79057022276C9770037F823 /* SetPasswordModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057012276C9770037F823 /* SetPasswordModel.swift */; };
 		A79057062276EA3D0037F823 /* OpenCityListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057052276EA3D0037F823 /* OpenCityListModel.swift */; };
 		A790705B22B9B680008CE279 /* ModifyDataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A790705A22B9B680008CE279 /* ModifyDataViewController.swift */; };
@@ -464,7 +463,6 @@
 		A7DAB33522D8D3AC005B964E /* RegisterLoginRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DAB33422D8D3AC005B964E /* RegisterLoginRouterModuleType.swift */; };
 		A7DAB33922DC2B83005B964E /* ShareRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DAB33822DC2B83005B964E /* ShareRouterModuleType.swift */; };
 		A7DC467F22783A47001F3EFC /* EditExpressAddressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DC467E22783A47001F3EFC /* EditExpressAddressTableViewCell.swift */; };
-		A7DC8EC122EF1C82004EEBE9 /* BaseTabBarItemContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DC8EC022EF1C82004EEBE9 /* BaseTabBarItemContentView.swift */; };
 		A7DE18CD2379100A00D9D72E /* PublishEditVideoCoverImageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DE18CC2379100A00D9D72E /* PublishEditVideoCoverImageTableViewCell.swift */; };
 		A7DE18D023793DFA00D9D72E /* PublishNewEditTopicViewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DE18CF23793DFA00D9D72E /* PublishNewEditTopicViewTableViewCell.swift */; };
 		A7DE18D423794DD000D9D72E /* PublishNewEditLocationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DE18D323794DD000D9D72E /* PublishNewEditLocationTableViewCell.swift */; };
@@ -1124,7 +1122,6 @@
 		A784F2CB23547C9600E49140 /* CommunityCircleModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommunityCircleModel.swift; sourceTree = "<group>"; };
 		A78A5F7522FAA03800DD1764 /* share_iSpt.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = share_iSpt.gif; sourceTree = "<group>"; };
 		A78A5F7722FAC7F000DD1764 /* SetGenderModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetGenderModel.swift; sourceTree = "<group>"; };
-		A78CEE0922E0864100C512A4 /* BaseLottieAnimateContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseLottieAnimateContentView.swift; sourceTree = "<group>"; };
 		A79057012276C9770037F823 /* SetPasswordModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetPasswordModel.swift; sourceTree = "<group>"; };
 		A79057052276EA3D0037F823 /* OpenCityListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenCityListModel.swift; sourceTree = "<group>"; };
 		A790705A22B9B680008CE279 /* ModifyDataViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModifyDataViewController.swift; sourceTree = "<group>"; };
@@ -1250,7 +1247,6 @@
 		A7DAB33422D8D3AC005B964E /* RegisterLoginRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterLoginRouterModuleType.swift; sourceTree = "<group>"; };
 		A7DAB33822DC2B83005B964E /* ShareRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareRouterModuleType.swift; sourceTree = "<group>"; };
 		A7DC467E22783A47001F3EFC /* EditExpressAddressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditExpressAddressTableViewCell.swift; sourceTree = "<group>"; };
-		A7DC8EC022EF1C82004EEBE9 /* BaseTabBarItemContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTabBarItemContentView.swift; sourceTree = "<group>"; };
 		A7DE18CC2379100A00D9D72E /* PublishEditVideoCoverImageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditVideoCoverImageTableViewCell.swift; sourceTree = "<group>"; };
 		A7DE18CF23793DFA00D9D72E /* PublishNewEditTopicViewTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNewEditTopicViewTableViewCell.swift; sourceTree = "<group>"; };
 		A7DE18D323794DD000D9D72E /* PublishNewEditLocationTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNewEditLocationTableViewCell.swift; sourceTree = "<group>"; };
@@ -3278,8 +3274,6 @@
 			isa = PBXGroup;
 			children = (
 				A77F2CC9223209F2001BD3F6 /* BaseTabbarViewController.swift */,
-				A78CEE0922E0864100C512A4 /* BaseLottieAnimateContentView.swift */,
-				A7DC8EC022EF1C82004EEBE9 /* BaseTabBarItemContentView.swift */,
 			);
 			path = BaseTabbarViewController;
 			sourceTree = "<group>";
@@ -6561,7 +6555,6 @@
 				A72A726822321DBD00B21995 /* UMManager.swift in Sources */,
 				A747D80C2359C2BE007F4E33 /* ConfigOSSStsModel.swift in Sources */,
 				A70DE55222E7E53F009E06BE /* KeyBoardInputView.swift in Sources */,
-				A78CEE0A22E0864100C512A4 /* BaseLottieAnimateContentView.swift in Sources */,
 				BD108C9322A60C2100837DAB /* HGImageCompleteButton.swift in Sources */,
 				A729B5AD2266FF45004AE098 /* BindPhoneNumberView.swift in Sources */,
 				BD12B67822B4ED9200AEB10B /* KSMediaPickerOutputModel.swift in Sources */,
@@ -7033,7 +7026,6 @@
 				A7D07CBF22B73EE600186014 /* UserPersonalCenterViewController.swift in Sources */,
 				BD27F0AD22CC5E4D00A6514D /* CommunityVideoListController.swift in Sources */,
 				A7CC753C2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift in Sources */,
-				A7DC8EC122EF1C82004EEBE9 /* BaseTabBarItemContentView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 0 - 72
RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseLottieAnimateContentView.swift

@@ -1,72 +0,0 @@
-//
-//  BaseLottieAnimateContentView.swift
-//  RainbowPlanet
-//
-//  Created by 南鑫林 on 2019/7/18.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import ESTabBarController_swift
-import Lottie
-
-
-class BaseLottieAnimateContentView: ESTabBarItemContentView {
-    
-    let animationView = AnimationView()
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        self.imageView.isHidden = true
-        
-    }
-    
-    init(jsonStr:String) {
-        self.init()
-        
-        textColor = k666666Color
-        iconColor = k333333Color
-        highlightTextColor = k333333Color
-
-        let animation = Animation.named(jsonStr)
-        animationView.animation = animation
-        animationView.contentMode = .scaleAspectFit
-        animationView.loopMode = .playOnce
-        animationView.animationSpeed = 1.5
-        addSubview(animationView)
-
-    }
-    
-    public required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    override func updateLayout() {
-        super.updateLayout()
-        animationView.frame = self.imageView.frame
-        if selected {
-            animationView.isHidden = false
-            self.imageView.isHidden = true
-            animationView.play()
-        }else {
-            animationView.isHidden = true
-            self.imageView.isHidden = false
-            animationView.stop()
-        }
-    }
-    
-    override func selectAnimation(animated: Bool, completion: (() -> ())?) {
-        super.selectAnimation(animated: animated, completion: nil)
-        animationView.isHidden = false
-        self.imageView.isHidden = true
-        animationView.play()
-    }
-    
-    override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
-        super.deselectAnimation(animated: animated, completion: nil)
-        animationView.isHidden = true
-        self.imageView.isHidden = false
-        
-        animationView.stop()
-    }
-    
-
-}

+ 0 - 28
RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabBarItemContentView.swift

@@ -1,28 +0,0 @@
-//
-//  File.swift
-//  RainbowPlanet
-//
-//  Created by 南鑫林 on 2019/7/29.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import Foundation
-
-import UIKit
-import ESTabBarController_swift
-
-
-class BaseTabBarItemContentView: ESTabBarItemContentView {
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        textColor = k666666Color
-        highlightTextColor = k333333Color
-//        iconColor = k333333Color
-    }
-    public required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    
-}

+ 0 - 304
RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -8,314 +8,10 @@
 
 import UIKit
 import Lottie
-import ESTabBarController_swift
 import PPBadgeViewSwift
 import SwiftyMediator
 import RongIMLib
 
-//class BaseTabbarViewController: NSObject {
-//
-//    static let shared : BaseTabbarViewController = BaseTabbarViewController()
-//
-//    var esTabBarController : ESTabBarController!
-//
-//    /// 社区
-//    var v1 : CommunityViewController!
-//    /// 商城
-////    var v2 = ShoppingMallViewController!
-//    /// 兑换专区
-//    var v2 : BackyardViewController!
-//    /// 发布
-//    var v3 : BaseViewController!
-//    /// 消息
-//    var v4 : MessageMainViewController!
-//
-//    /// 我的
-//    var v5 : UserPersonalCenterViewController!
-//
-//    /// 社区
-//    var lottieAnimateContentView1 : BaseLottieAnimateContentView!
-//
-//    /// 商城
-//    var lottieAnimateContentView2 : BaseLottieAnimateContentView!
-//
-//    /// 消息
-//    var lottieAnimateContentView4 : BaseLottieAnimateContentView!
-//
-//    /// 我的
-//    var lottieAnimateContentView5 : BaseLottieAnimateContentView!
-//
-//    var lastIndex : Int = 0
-//
-//    func tabBarViewController() -> ESTabBarController {
-//        esTabBarController = ESTabBarController()
-//
-//        if #available(iOS 13.0, *) {
-//            esTabBarController.tabBar.standardAppearance.configureWithOpaqueBackground()
-//            esTabBarController.tabBar.standardAppearance.backgroundImage = UIImage.imageWithColor(color: UIColor.white)
-//            esTabBarController.tabBar.standardAppearance.shadowImage = UIImage(named: "navbar_shadow_pic_down")
-//        } else {
-//            esTabBarController.tabBar.shadowImage = UIImage(named: "navbar_shadow_pic_down")
-//        }
-//
-//        esTabBarController.shouldHijackHandler = {
-//           [weak self] (tabbarController, viewController, index) in
-//            AudioServicesPlaySystemSound(1519)
-//
-//            if UserModel.isTokenNil() {
-//                if index == 2 || index == 3 || index == 4 {
-//                    return true
-//                }else {
-//                    self?.reloadTabbar(index:index)
-//                    self?.lastIndex = index
-//                    return false
-//                }
-//            }else {
-//                if index == 2 {
-//                    return true
-//                }else {
-//                    self?.reloadTabbar(index:index)
-//                    self?.lastIndex = index
-//                    return false
-//                }
-//            }
-//
-//
-//        }
-//
-//        esTabBarController.didHijackHandler = {
-//            [weak self] tabbarController, viewController, index in
-//            if UserModel.isTokenNil() {
-//                kAppDelegate.setLogin()
-//            }else {
-//                self?.pushPublishVC()
-//            }
-//        }
-//
-//        /// 社区
-//        v1 = CommunityViewController()
-//        /// 商城
-//        //    var v2 = ShoppingMallViewController!
-//        /// 兑换专区
-//        v2 = BackyardViewController()
-//        /// 发布
-//        v3 = BaseViewController()
-//        /// 消息
-//        v4 = MessageMainViewController()
-//        /// 我的
-//        v5 = UserPersonalCenterViewController()
-//
-//        /// 社区
-//        lottieAnimateContentView1 = BaseLottieAnimateContentView(jsonStr: "communityModuleTabbar")
-//
-//        /// 商城
-//        lottieAnimateContentView2 = BaseLottieAnimateContentView(jsonStr: "shoppingMallModuleTabbar")
-//
-//        /// 消息
-//        lottieAnimateContentView4 = BaseLottieAnimateContentView(jsonStr: "messageModuleTabbar")
-//
-//        /// 我的
-//        lottieAnimateContentView5 = BaseLottieAnimateContentView(jsonStr: "MineModuleTabbar")
-//
-////        v1.tabBarItem = ESTabBarItem.init(lottieAnimateContentView1, title: "社区", image: UIImage(named: "tabbar_home")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-////        v2.tabBarItem = ESTabBarItem.init(lottieAnimateContentView2, title: "福利", image: UIImage(named: "tabbar_shopping")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-//
-//        tabBarItemStyle(navc: v1, normalImg: "tabbar_home", selectorImg: "tabbar_home_pre", title: "社区")
-//        tabBarItemStyle(navc: v2, normalImg: "tabbar_shopping", selectorImg: "tabbar_shopping_pre", title: "后院")
-//        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);
-//        tabBarItemStyle(navc: v4, normalImg: "tabbar_massage", selectorImg: "tabbar_massage_pre", title: "消息")
-//        tabBarItemStyle(navc: v5, normalImg: "tabbar_my", selectorImg: "tabbar_my_pre", title: "我的")
-//
-////        if UserModel.isTokenNil() {
-////            setLoginOutTabBarItem()
-////        }else {
-////            setLoginTabBarItem()
-////        }
-//
-//        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)
-//
-//        esTabBarController.viewControllers = [n1, n2, n3, n4, n5]
-//        //将要进入前台的时候
-//        setBadge()
-//        NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: OperationQueue.main, using: {
-//            [weak self] (notification) in
-//            if !UserModel.isTokenNil() {
-//                //获取消息的小红点
-//                MessageModuleManager.shared.userMemberMessageIndexApi()
-//                self?.setBadge()
-//            }
-//
-//        })
-//        //监听消息
-//        NotificationCenter.default.addObserver(forName: NSNotification.Name("MessageMainViewController"), object: nil, queue: OperationQueue.main) {
-//            [weak self] notification in
-//            self?.setBadge()
-//        }
-//        return esTabBarController
-//    }
-//
-//    func setLoginTabBarItem() {
-////        v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-////        v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-//        tabBarItemStyle(navc: v1, normalImg: "tabbar_home", selectorImg: "tabbar_home_pre", title: "社区")
-//        tabBarItemStyle(navc: v2, normalImg: "tabbar_shopping", selectorImg: "tabbar_shopping_pre", title: "后院")
-//        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);
-//        tabBarItemStyle(navc: v4, normalImg: "tabbar_massage", selectorImg: "tabbar_massage_pre", title: "消息")
-//        tabBarItemStyle(navc: v5, normalImg: "tabbar_my", selectorImg: "tabbar_my_pre", title: "我的")
-//    }
-//
-//    func setLoginOutTabBarItem() {
-////        v4.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage:nil)
-////        v5.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage:nil)
-//        tabBarItemStyle(navc: v1, normalImg: "tabbar_home", selectorImg: "tabbar_home_pre", title: "社区")
-//        tabBarItemStyle(navc: v2, normalImg: "tabbar_shopping", selectorImg: "tabbar_shopping_pre", title: "后院")
-//        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);
-//        tabBarItemStyle(navc: v4, normalImg: "tabbar_massage", selectorImg: "tabbar_massage_pre", title: "消息")
-//        tabBarItemStyle(navc: v5, normalImg: "tabbar_my", selectorImg: "tabbar_my_pre", title: "我的")
-//    }
-//
-//    /// 跳转到VC
-//    func pushPublishVC() {
-//
-//        if !AliyunVodUpToyoPublishManager.shared.isUploading { // 是否正在上传中
-//            PublishNewPopView.show(imageStrs: ["publish_btn_picture","publish_btn_video","publish_btn_photo","publish_btn_article"], titles: ["相册","视频","拍照","文章"], columnCount: 4) { (index) in
-//                if index != 3 {
-//                    let pickVc = PublishViewController()
-//                    pickVc.index = index
-////                    let  pickVc = PublishNewViewController()
-////                    pickVc.index = index
-//                    let nav = BaseNavigationViewController.init(rootViewController: pickVc)
-//                    nav.modalPresentationStyle = .fullScreen
-//                    BaseTabbarViewController.shared.esTabBarController.present(nav, animated: true, completion: nil)
-//                }else {
-//                    Mediator.push(H5RouterModuleType.pushPostArticle)
-//                }
-//            }
-//        } else {
-//            SwiftProgressHUD.shared().showText("内容上传中,请稍等", textAlignment: .center)
-//        }
-//    }
-//
-//    // 设置Badge
-//    func setBadge() {
-//        if UserModel.isTokenNil() {
-//            v4.tabBarItem.pp.hiddenBadge()
-//            v5.tabBarItem.pp.hiddenBadge()
-//        }else {
-//            //消息
-//            let messageIndexModel = MessageIndexModel.shared.object()
-//            if messageIndexModel?.activity?.isYes == 1 || messageIndexModel?.follow?.isYes == 1 || messageIndexModel?.notification?.isYes == 1 || messageIndexModel?.praise?.isYes == 1 || messageIndexModel?.comment?.isYes == 1 || (RCIMClient.shared()?.getTotalUnreadCount())! > Int32(0) {
-//                v4.tabBarItem.pp.addDot(color:kFE352BColor)
-//                v4.tabBarItem.pp.moveBadge(x: -3,y: 3)
-//
-//                //            let tabBarItem = v4.tabBarItem as? ESTabBarItem
-//                //            tabBarItem?.contentView?.badgeColor = kFE352BColor
-//                //            tabBarItem?.contentView?.badgeValue = ""
-//                //            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
-//            }else {
-//                //            let tabBarItem = v4.tabBarItem as? ESTabBarItem
-//                //            tabBarItem?.contentView?.badgeValue = nil
-//                v4.tabBarItem.pp.hiddenBadge()
-//            }
-//
-//            //我的
-//            if UpdateVersionModel.shared.object()?.upGradeModelType == .update ||  UpdateVersionModel.shared.object()?.upGradeModelType == .strongUpdate {
-//
-//                //            let tabBarItem = v5.tabBarItem as? ESTabBarItem
-//                //            tabBarItem?.contentView?.badgeColor = kFE352BColor
-//                //            tabBarItem?.contentView?.badgeValue = ""
-//                //            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
-//                v5.tabBarItem.pp.addDot(color:kFE352BColor)
-//                v5.tabBarItem.pp.moveBadge(x: -3,y: 3)
-//            }else {
-//                //            let tabBarItem = v5.tabBarItem as? ESTabBarItem
-//                //            tabBarItem?.contentView?.badgeValue = nil
-//                v5.tabBarItem.pp.hiddenBadge()
-//            }
-//        }
-//    }
-//
-//    func reloadTabbar(index:Int) {
-//
-//        if index == 0 && lastIndex == 0  {
-////            self.lottieAnimateContentView1.animationView.stop()
-////            self.lottieAnimateContentView1.animationView.play()
-//
-//            if communityModuleTopType == .communityModuleFollowTop {
-//                NotificationCenter.default.post(name: NSNotification.Name("CommunityModuleFollowTop"), object: nil)
-//
-//            }
-//            if communityModuleTopType == .communityModuleRecommendTop {
-//                    NotificationCenter.default.post(name: NSNotification.Name("CommunityModuleRecommendTop"), object: nil)
-//
-//            }
-//
-//        }
-//        if index == 1 && lastIndex == 1  {
-////            self.lottieAnimateContentView2.animationView.stop()
-////            self.lottieAnimateContentView2.animationView.play()
-//            NotificationCenter.default.post(name: NSNotification.Name("BackyardViewModuleTop"), object: nil)
-//
-//        }
-//        if index == 3 && lastIndex == 3  {
-////            self.lottieAnimateContentView4.animationView.stop()
-////            self.lottieAnimateContentView4.animationView.play()
-//            NotificationCenter.default.post(name: NSNotification.Name("MessageModuleTop"), object: nil)
-//
-//        }
-//        if index == 4 && lastIndex == 4  {
-////            self.lottieAnimateContentView5.animationView.stop()
-////            self.lottieAnimateContentView5.animationView.play()
-//            NotificationCenter.default.post(name: NSNotification.Name("MineModuleTop"), object: nil)
-//        }
-//    }
-//
-//    private func tabBarItemStyle(navc : BaseViewController, normalImg : String, selectorImg : String, title : String){
-//        navc.tabBarItem = UITabBarItem.init(title: title, image: UIImage(named:normalImg), selectedImage: UIImage(named:selectorImg))
-//        navc.tabBarItem.setTitleTextAttributes([NSAttributedString.Key.foregroundColor:k333333Color], for: UIControl.State.normal)
-//        navc.tabBarItem.setTitleTextAttributes([NSAttributedString.Key.foregroundColor:k333333Color], for: UIControl.State.selected)
-//
-//    }
-//
-//}
-//
-//extension ESTabBar {
-//    open override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-//
-//        let view  = super.hitTest(point, with: event)
-//        if view == nil {
-//            if UserModel.isTokenNil() && LoginNowView.shared.loginNowView != nil
-//                && !(UIViewController.topMost is BrowsePicturesViewController)
-//                && !(UIViewController.topMost is H5CommonViewController)
-//                && !(UIViewController.topMost is CommunityFeaturedTopicsViewController) {
-//                for subView in subviews {
-//                    if !subView.subviews.isEmpty {
-//                        for subView in subView.subviews {
-//                            let myPoint = subView.convert(point, from: self)
-//                            if subView.bounds.contains(myPoint) {
-//                                return subView
-//                            }
-//                        }
-//                    }
-//                    let myPoint = subView.convert(point, from: self)
-//                    if subView.bounds.contains(myPoint) {
-//                        return subView
-//                    }
-//                }
-//            }
-//        }
-//        return view
-//    }
-//}
-
-
 class BaseTabbarViewController: UITabBarController {
     
     static let shared : BaseTabbarViewController = BaseTabbarViewController()

+ 0 - 1
RainbowPlanet/RainbowPlanet/Manager/RegisterLoginManager/RegisterLoginManager.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import ESTabBarController_swift
 
 class RegisterLoginManager: NSObject {
 

+ 0 - 1
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift

@@ -9,7 +9,6 @@
 import UIKit
 
 import Lottie
-import ESTabBarController_swift
 import Kingfisher
 import RongIMLib
 import SwiftyJSON

+ 0 - 1
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -11,7 +11,6 @@ import JXSegmentedView
 import JXPagingView
 import RxSwift
 import SwiftyMediator
-import ESTabBarController_swift
 import Kingfisher
 
 class UserPersonalCenterViewController: BaseViewController {

+ 0 - 1
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/LoginNow/LoginNowView.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import ESTabBarController_swift
 
 class LoginNowView: UIView {