适配iOS 13 启动页去除了刷新token

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -308,7 +308,6 @@
 		A7AD2795231365470099B3E0 /* QRCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7AD2794231365470099B3E0 /* QRCode.swift */; };
 		A7B4E7352281907A0012914A /* CMSModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B4E7342281907A0012914A /* CMSModel.swift */; };
 		A7B4E73A228192D20012914A /* CMSTemplateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B4E739228192D10012914A /* CMSTemplateModel.swift */; };
-		A7BA18FD230D5B6F00E3B969 /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BA18FC230D5B6F00E3B969 /* RootViewController.swift */; };
 		A7BA1902230EA80000E3B969 /* TGCaculateNumberTool.m in Sources */ = {isa = PBXBuildFile; fileRef = A7BA1901230EA80000E3B969 /* TGCaculateNumberTool.m */; };
 		A7BB684F2268DCEC00AB07A2 /* SelfRecommendationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB684D2268DCEC00AB07A2 /* SelfRecommendationViewController.swift */; };
 		A7BB68552268DE8600AB07A2 /* SelfRecommendationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB68542268DE8600AB07A2 /* SelfRecommendationView.swift */; };
@@ -971,7 +970,6 @@
 		A7AD2794231365470099B3E0 /* QRCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCode.swift; sourceTree = "<group>"; };
 		A7B4E7342281907A0012914A /* CMSModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CMSModel.swift; sourceTree = "<group>"; };
 		A7B4E739228192D10012914A /* CMSTemplateModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CMSTemplateModel.swift; sourceTree = "<group>"; };
-		A7BA18FC230D5B6F00E3B969 /* RootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = "<group>"; };
 		A7BA1900230EA80000E3B969 /* TGCaculateNumberTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TGCaculateNumberTool.h; sourceTree = "<group>"; };
 		A7BA1901230EA80000E3B969 /* TGCaculateNumberTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TGCaculateNumberTool.m; sourceTree = "<group>"; };
 		A7BB684D2268DCEC00AB07A2 /* SelfRecommendationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfRecommendationViewController.swift; sourceTree = "<group>"; };
@@ -2800,7 +2798,6 @@
 		A77F2C8F2231FC65001BD3F6 /* Base */ = {
 			isa = PBXGroup;
 			children = (
-				A7BA18FB230D5B4D00E3B969 /* RootViewController */,
 				A77F2C902231FC75001BD3F6 /* BaseTabbarViewController */,
 				A77F2C912231FC85001BD3F6 /* BaseNavigationController */,
 				A77F2C942231FCD2001BD3F6 /* BaseWebViewController */,
@@ -3334,14 +3331,6 @@
 			path = CMSModel;
 			sourceTree = "<group>";
 		};
-		A7BA18FB230D5B4D00E3B969 /* RootViewController */ = {
-			isa = PBXGroup;
-			children = (
-				A7BA18FC230D5B6F00E3B969 /* RootViewController.swift */,
-			);
-			path = RootViewController;
-			sourceTree = "<group>";
-		};
 		A7BA1903230EA80800E3B969 /* CaculateNumberTool */ = {
 			isa = PBXGroup;
 			children = (
@@ -5362,7 +5351,6 @@
 				A770E5DD22CEDF4F00CBD0A4 /* OpenAppModel.swift in Sources */,
 				A719EE6E22AF441F001AAC98 /* CommunityViewController.swift in Sources */,
 				BD13B6C622BA034D008BB323 /* PublishEditTitleCell.swift in Sources */,
-				A7BA18FD230D5B6F00E3B969 /* RootViewController.swift in Sources */,
 				A72A72C522321DE000B21995 /* WKWebViewConfig.swift in Sources */,
 				A72A72BB22321DE000B21995 /* Extension+UILabel.swift in Sources */,
 				BDAF83A822B343C50004BCC3 /* RecommendBottomCommentView.swift in Sources */,
@@ -5938,7 +5926,7 @@
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -5963,7 +5951,7 @@
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -6110,7 +6098,7 @@
 				CODE_SIGN_ENTITLEMENTS = "RainbowPlanet/Supporting Files/RainbowPlanet.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				ENABLE_BITCODE = NO;
@@ -6365,7 +6353,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				ENABLE_BITCODE = NO;

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -10,68 +10,68 @@ import UIKit
 import SwiftyMediator
 import Kingfisher
 
-
 extension AppDelegate {
 
     func initWindow(didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) {
+        
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = UIColor.white
-        //版本更新
-        _ = UpdateVersionManager.shared
-        let vc = RootViewController()
-        vc.launchOptions = launchOptions
-        window?.rootViewController = vc
         window?.makeKeyAndVisible()
-        //基础配置
-        DispatchQueue.global(qos: .default).async {
-            [weak self] in
-            /// 城市转换
-            self?.setBaiduToCityFactory()
-            /// 授权处理
-//            self?.setPermission()
-            /// 设置默认为快递
-            let deliveryMethodTypeModel = DeliveryMethodTypeModel.shared()
-            deliveryMethodTypeModel.deliveryMethodType = "2"
-            DeliveryMethodTypeModel.shared().setModel(model: deliveryMethodTypeModel)
-            //网络监听
-            //        AlamofireReachabilityManager.shared.reachability()
-
-            DispatchQueue.main.async {
-                /// 设置全局的tabbar
-                self?.setTabbarAppearence()
-                /// 设置全局的navigation
-                self?.setNavBarAppearence()
-                /// 设置全局的TableView
-                self?.setTableViewAppearance()
-                //键盘处理
-                IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
-            }
+        if #available(iOS 13.0, *) {
+            window?.overrideUserInterfaceStyle = .light
         }
+        // 设置Tabbar
+        kAppDelegate.setTabbarController()
+        //  引导页
+        kAppDelegate.setGuidePageView()
+        // 授权处理
+//        setPermission()
+        // 初始化百度地图
+        BaiduMapManager.shared.initBaiduMap()
+        // 百度开始定位
+        BaiduMapManager.shared.startLocation()
+        //友盟
+        UMManager.shared.initUM(launchOptions: launchOptions)
+        // 融云
+//        RongCloudIMManager.shared.initRCIM()
+        // 设置全局的tabbar
+        setTabbarAppearence()
+        // 设置全局的navigation
+        setNavBarAppearence()
+        // 设置全局的TableView
+        setTableViewAppearance()
+        // 键盘处理
+        IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
+        // 升级版本
+        UpdateVersionManager.shared.initUpdateVersionManager()
+        
     }
     
     /// 设置Tabbar
     func setTabbarController() {
         /// 判断初始化页面
         if (UserModel.shared().getModel()?.token) != nil { //是否已经登录
-            SwiftMoyaNetWorkServiceUser.shared().userRefreshApi {
-                [weak self] _ in
 
-                if(UserModel.shared().getModel()?.isFollowSuggestTopic == 0 || UserModel.shared().getModel()?.isFollowSuggestTopic == nil ) {//设置性别话题
-                    self?.setNoLoginOut()
-                }else {
-                    self?.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
-                    
-                    self?.setData()
-                }
+            if(UserModel.shared().getModel()?.isFollowSuggestTopic == 0 || UserModel.shared().getModel()?.isFollowSuggestTopic == nil ) {//设置性别话题
+                setNoLoginOut()
+            }else {
+                window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
+                setData()
             }
         }else {// 进入首页
             setNoLoginOut()
         }
     }
     
-    
     /// 设置登录时用的数据
     func setData() {
+        // 配置
+        SwiftMoyaNetWorkServiceConfig.shared().configApi(completion: {_ -> (Void) in }) { _ in }
+//        // 判断初始化页面
+//        if UserModel.shared().getModel()?.token != nil { //是否已经登录
+//            // 刷新token
+//            SwiftMoyaNetWorkServiceUser.shared().userRefreshApi { _ in}
+//        }
         //U米
         UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
         //获取消息的小红点
@@ -131,7 +131,6 @@ extension AppDelegate {
         UITableView.appearance().estimatedSectionFooterHeight = 0
     }
 
-    
     ///设置百度city转
     func setBaiduToCityFactory() {
         BaiduToCityFactory.shared.setSaveBaiduToCity()
@@ -142,7 +141,6 @@ extension AppDelegate {
         GuidePageView.guidePageView(images: ["guide_1","guide_2","guide_3","guide_4"])
     }
     
-    
     /// 授权
     func setPermission() {
         NXLPermission.request(NXLPermissionType.locationAlwaysAndWhenInUse) {}
@@ -152,6 +150,4 @@ extension AppDelegate {
         NXLPermission.request(NXLPermissionType.microphone) {}
     }
     
-
-    
 }

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -41,13 +41,12 @@ class BaseTabbarViewController: NSObject {
     /// 我的
     var lottieAnimateContentView5 : BaseLottieAnimateContentView!
     
-    
-    
     var lastIndex : Int = 0
 
     func tabBarViewController() -> ESTabBarController {
         esTabBarController = ESTabBarController()
         
+        esTabBarController.tabBar.backgroundImage = UIImage.imageWithColor(color: UIColor.white)
         esTabBarController.tabBar.shadowImage = UIImage(named: "navbar_shadow_pic_down")
         esTabBarController.shouldHijackHandler = {
            [weak self] (tabbarController, viewController, index) in
@@ -153,11 +152,23 @@ class BaseTabbarViewController: NSObject {
     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
@@ -166,6 +177,7 @@ class BaseTabbarViewController: NSObject {
             let pickVc = PublishViewController()
 //            let  pickVc = PublishNewViewController()
             let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+            nav.modalPresentationStyle = .fullScreen
             BaseTabbarViewController.shared.esTabBarController.present(nav, animated: true, completion: nil)
         } else {
             SwiftProgressHUD.shared().showText("内容上传中，请稍等", textAlignment: .center)
@@ -238,25 +250,6 @@ class BaseTabbarViewController: NSObject {
             NotificationCenter.default.post(name: NSNotification.Name("MineModuleTop"), object: nil)
         }
     }
-    
-//    func tabBarViewController() -> BaseTabbarViewController {
-//        let tabBarViewController = BaseTabbarViewController()
-//
-//        let v1 = ShoppingMallViewController()
-//        let v2 = ShoppingCartViewController()
-//        let v3 = MineViewController()
-//
-//        let n1 = BaseNavigationViewController.init(rootViewController: v1)
-//        let n2 = BaseNavigationViewController.init(rootViewController: v2)
-//        let n3 = BaseNavigationViewController.init(rootViewController: v3)
-//
-//        tabBarItemStyle(navc: n1, normalImg: "tabbar_home", selectorImg: "tabbar_home_pre", title: "首页")
-//        tabBarItemStyle(navc: n2, normalImg: "tabbar_shopping", selectorImg: "tabbar_shopping_pre", title: "购物车")
-//        tabBarItemStyle(navc: n3, normalImg: "tabbar_my", selectorImg: "tabbar_my_pre", title: "我的彩虹")
-//
-//        tabBarViewController.viewControllers = [n1, n2, n3]
-//        return tabBarViewController
-//    }
 
 
     private func tabBarItemStyle(navc : BaseViewController, normalImg : String, selectorImg : String, title : String){

RainbowPlanet/RainbowPlanet/Base/RootViewController/RootViewController.swift

@@ -1,87 +0,0 @@
-//
-//  RootViewController.swift
-//  RainbowPlanet
-//
-//  Created by 南鑫林 on 2019/8/21.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import SnapKit
-import SwiftyJSON
-
-class RootViewController: BaseViewController {
-    
-    var launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-    
-    deinit {
-        NXLLog("deinit")
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupViews()
-        setupLayouts()
-        setupData()
-    }
-    
-    override func setupViews() {
-        navigationBar.isHidden = true
-        view.backgroundColor = UIColor.clear
-        view.addSubview(iconImageView)
-        view.addSubview(imageView)
-    }
-    
-    override func setupLayouts() {
-        
-        iconImageView.snp.makeConstraints {(make) in
-            make.bottom.equalTo(-43.5)
-            make.width.equalTo(159)
-            make.height.equalTo(83)
-            make.centerX.equalToSuperview()
-        }
-        
-        imageView.snp.makeConstraints { (make) in
-            make.top.left.right.equalToSuperview()
-            make.bottom.equalTo(iconImageView.snp.top).offset(-40)
-        }
-    }
-    
-    override func setupData() {
-        SwiftMoyaNetWorkServiceConfig.shared().configApi(completion: {[weak self] (data) -> (Void) in
-            //初始化百度地图
-            BaiduMapManager.shared.initBaiduMap()
-            //百度开始定位
-            BaiduMapManager.shared.startLocation()
-            //初始化友盟
-            UMManager.shared.initUM(launchOptions: self?.launchOptions)
-            // Bugly
-            Bugly.start(withAppId: "4e2f8cf865")
-            //设置Tabbar
-            kAppDelegate.setTabbarController()
-            /// 引导页
-//            kAppDelegate.setGuidePageView()
-            self?.view?.ly_hideEmpty()
-        }) { [weak self] loadingStatus in
-            self?.iconImageView.isHidden = true
-            self?.iconImageView.isHidden = true
-            DIYEmptyView.emptyNoDataActionView(view: self?.view,imageStr: .five,detailStr: .five,btnTitleStr: .one, btnClickBlock: { [weak self] in
-                self?.setupData()
-            })
-        }
-    }
-    
-    lazy var iconImageView: UIImageView = {
-        let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "default_logo")
-        return iconImageView
-    }()
-    
-    lazy var imageView: UIImageView = {
-        let imageView = UIImageView()
-        imageView.image = kImage(name: "default_image")
-        imageView.contentMode = .scaleAspectFill
-        return imageView
-    }()
-
-}

RainbowPlanet/RainbowPlanet/Manager/AppStoreManager/AppStoreManager.swift

@@ -45,6 +45,7 @@ class AppStoreManager: NSObject {
         storeProductViewContorller.delegate = self
         storeProductViewContorller.loadProduct(withParameters: [SKStoreProductParameterITunesItemIdentifier:kAppStoreAppId]) { (result, error) in
             if result {
+                storeProductViewContorller.modalPresentationStyle = .fullScreen
                 viewController.present(storeProductViewContorller, animated: true, completion: {
                     
                 })

RainbowPlanet/RainbowPlanet/Manager/UpdateVersionManager/ViewModel/UpdateVersionManager.swift

@@ -21,8 +21,7 @@ class UpdateVersionManager: NSObject {
     
     static let shared : UpdateVersionManager = UpdateVersionManager()
 
-    override init() {
-        super.init()
+    func initUpdateVersionManager() {
         //启动程序
         observe = NotificationCenter.default.addObserver(forName: UIApplication.didFinishLaunchingNotification, object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
@@ -50,7 +49,6 @@ class UpdateVersionManager: NSObject {
                 self?.updateVersionView?.hide()
             }
         })
-
     }
     // 用于判断当前系统版本是否低于指定版本
     func systemVersion(below aVersionString: String) -> Bool

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Action/CardContentActionTableViewCell.swift

@@ -40,6 +40,7 @@ class CardContentActionTableViewCell: UITableViewCell {
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
+        backgroundColor = UIColor.white
         addSubview(skittlesBgView)
         skittlesBgView.addSubview(skittlesButton)
         addSubview(shareButton)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Comment/CardContentCommnetTableViewCell.swift

@@ -40,6 +40,7 @@ class CardContentCommnetTableViewCell: UITableViewCell {
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
+        backgroundColor = UIColor.white
         addSubview(avatarButton)
         addSubview(addCommnetButton)
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListTableViewCell.swift

@@ -39,6 +39,7 @@ class CardContentCommentListTableViewCell: UITableViewCell {
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
+        backgroundColor = UIColor.white
         addSubview(tableView)
     }
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoTableViewCell.swift

@@ -36,6 +36,7 @@ class CardContentPicVideoTableViewCell: UITableViewCell {
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
+        backgroundColor = UIColor.white
         addSubview(collectionView)
     }
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/TitleContent/CardContentTitleTableViewCell.swift

@@ -43,7 +43,7 @@ class CardContentTitleTableViewCell: UITableViewCell {
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
-        
+        backgroundColor = UIColor.white
         addSubview(titleLabel)
         addSubview(subtitleLabel)
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift

@@ -46,6 +46,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
+        backgroundColor = UIColor.white
         addSubview(avatarButton)
         addSubview(titleButton)
         addSubview(timeLabel)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift

@@ -41,6 +41,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     }
     //MRAK: - 设置View
     private func setupViews() {
+        backgroundColor = UIColor.white
         self.selectionStyle = .none
         addSubview(avatarButton)
         addSubview(titleButton)

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/ViewController/MessageListController.swift

@@ -100,6 +100,7 @@ extension MessageListController {
                     if BaseTabbarViewController.shared.v1.navigationBarbgView.isHidden {
                         let pickVc = PublishViewController()
                         let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+                        nav.modalPresentationStyle = .fullScreen
                         self?.tabBarController?.present(nav, animated: true, completion: {
                             self?.navigationController?.popToRootViewController(animated: false)
                         })

RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/ViewController/MyFollowAndFanViewController.swift

@@ -140,6 +140,7 @@ extension MyFollowAndFanViewController {
                 if BaseTabbarViewController.shared.v1.navigationBarbgView.isHidden {
                     let pickVc = PublishViewController()
                     let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+                    nav.modalPresentationStyle = .fullScreen
                     self?.tabBarController?.present(nav, animated: true, completion: {
                         [weak self] in
                         self?.navigationController?.popToRootViewController(animated: false)

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -162,6 +162,7 @@ class OtherPersonalCenterViewController: BaseViewController {
     //4.pagingView
     lazy var pagingView: JXPagingView = {
         let pagingView = JXPagingView(delegate: self)
+        pagingView.frame = self.view.frame
         return pagingView
     }()
     // 5.头部headerView

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

@@ -279,6 +279,7 @@ class UserPersonalCenterViewController: BaseViewController {
     //4.pagingView
     lazy var pagingView: JXPagingView = {
         let pagingView = JXPagingView(delegate: self)
+        pagingView.frame = self.view.frame
         return pagingView
     }()
     // 5.头部headerView

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/Controller/PublishEditController.swift

@@ -168,6 +168,7 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
                     self?.imageArr = (self?.imageArr ?? Array<UIImage>()) + imageArray
                     self?.tableView.reloadData()
                 }
+                vc.modalPresentationStyle = .fullScreen
                 self?.present(vc, animated: true, completion: nil)
             }
             picCell.delPicTransBlock = {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishTakePhotoController.swift

@@ -178,6 +178,7 @@ class PublishTakePhotoController: BaseViewController {
                 pubImgTransClosure(imageArray)
             }
         }
+        confirmVc.modalPresentationStyle = .fullScreen
         self.present(confirmVc, animated: true, completion: nil)
     }
     

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

@@ -99,6 +99,7 @@ class RegisterLoginViewController: BaseViewController {
     }
     
     override func setupData() {
+        
         player.play()
         
         if (UMSocialManager.default()?.isInstall(.wechatSession) ?? true)  { //验证
@@ -188,6 +189,9 @@ class RegisterLoginViewController: BaseViewController {
         oneBuiltLoginButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
         oneBuiltLoginButton.layer.cornerRadius = 24
         oneBuiltLoginButton.layer.masksToBounds = true
+        if #available(iOS 13.0, *) {
+            oneBuiltLoginButton.isHidden = true
+        }
         return oneBuiltLoginButton
     }()
     

RainbowPlanet/RainbowPlanet/Router/PublishRouterModuleType.swift

@@ -24,6 +24,7 @@ extension PublishRouterModuleType: MediatorSourceType {
         case .presentPublish:
             let vc = PublishViewController()
             let nav = BaseNavigationViewController.init(rootViewController: vc)
+            nav.modalPresentationStyle = .fullScreen
             return nav
         }
     }

RainbowPlanet/RainbowPlanet/Router/RegisterLoginRouterModuleType.swift

@@ -30,6 +30,7 @@ extension RegisterLoginRouterModuleType: MediatorSourceType {
         case .presentRegisterLogin:
             let vc = RegisterLoginViewController()
             let navc = BaseNavigationViewController(rootViewController: vc)
+            navc.modalPresentationStyle = .fullScreen
             return navc
         case .pushmobileLoginView:
             let vc = MobileLoginViewController()

RainbowPlanet/RainbowPlanet/Supporting Files/Info.plist

@@ -244,6 +244,8 @@
 	</array>
 	<key>UIRequiresFullScreen</key>
 	<true/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

RainbowPlanet/RainbowPlanet/Tools/HGImagePicker/HGImageCollectionViewController.swift

@@ -155,6 +155,7 @@ extension HGImageCollectionViewController:UICollectionViewDataSource
                 let cancelAction = UIAlertAction(title:"我知道了", style: .cancel,
                                                  handler:nil)
                 alertController.addAction(cancelAction)
+                alertController.modalPresentationStyle = .fullScreen
                 self.present(alertController, animated: true, completion: nil)
             }
             //如果不超过最大选择数

RainbowPlanet/RainbowPlanet/Tools/HGImagePicker/HGImagePickerController.swift

@@ -212,6 +212,7 @@ extension UIViewController {
             vc.maxSelected = maxSelected
             //将图片选择视图控制器外添加个导航控制器，并显示
             let nav = UINavigationController(rootViewController: vc)
+            nav.modalPresentationStyle = .fullScreen
             self.present(nav, animated: true, completion: nil)
             return vc
         }

RainbowPlanet/RainbowPlanet/Tools/PhotoAndCameraManager/PhotoAndCameraManager.swift

@@ -43,7 +43,8 @@ class PhotoAndCameraManager: NSObject {
                         picker.automaticallyAdjustsScrollViewInsets = true
                     }
                 }
-               UIViewController.topMost?.present(picker, animated: true, completion: nil)
+                picker.modalPresentationStyle = .fullScreen
+                UIViewController.topMost?.present(picker, animated: true, completion: nil)
             } else {
                 LBXPermissions.jumpToSystemPrivacySetting()
             }
@@ -68,6 +69,7 @@ class PhotoAndCameraManager: NSObject {
                         picker.automaticallyAdjustsScrollViewInsets = true
                     }
                 }
+                picker.modalPresentationStyle = .fullScreen
                 UIViewController.topMost?.present(picker, animated: true, completion: nil)
             } else {
                 LBXPermissions.jumpToSystemPrivacySetting()

RainbowPlanet/RainbowPlanet/Tools/SwiftScan/LBXScanViewController.swift

@@ -161,6 +161,7 @@ open class LBXScanViewController: UIViewController, UIImagePickerControllerDeleg
             picker.delegate = self
 
             picker.allowsEditing = true
+            picker.modalPresentationStyle = .fullScreen
 
             self?.present(picker, animated: true, completion: nil)
         }