Merge branch 'feature/1.0.2' into feature/RongCloudIM

# Conflicts:
#	RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj
#	RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift
#	RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift
#	RainbowPlanet/RainbowPlanet/Manager/AppStoreManager/AppStoreManager.swift
#	RainbowPlanet/RainbowPlanet/Manager/UpdateVersionManager/ViewModel/UpdateVersionManager.swift
#	RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -2809,7 +2809,6 @@
 		A77F2C8F2231FC65001BD3F6 /* Base */ = {
 			isa = PBXGroup;
 			children = (
-				A7BA18FB230D5B4D00E3B969 /* RootViewController */,
 				A77F2C902231FC75001BD3F6 /* BaseTabbarViewController */,
 				A77F2C912231FC85001BD3F6 /* BaseNavigationController */,
 				A77F2C942231FCD2001BD3F6 /* BaseWebViewController */,
@@ -3345,13 +3344,6 @@
 			path = CMSModel;
 			sourceTree = "<group>";
 		};
-		A7BA18FB230D5B4D00E3B969 /* RootViewController */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = RootViewController;
-			sourceTree = "<group>";
-		};
 		A7BA1903230EA80800E3B969 /* CaculateNumberTool */ = {
 			isa = PBXGroup;
 			children = (
@@ -5994,7 +5986,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;
@@ -6019,7 +6011,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;
@@ -6166,7 +6158,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;
@@ -6421,7 +6413,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,7 +10,6 @@ import UIKit
 import SwiftyMediator
 import Kingfisher
 
-
 extension AppDelegate {
 
     func initWindow(didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) {
@@ -18,6 +17,10 @@ extension AppDelegate {
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = UIColor.white
         window?.makeKeyAndVisible()
+
+        if #available(iOS 13.0, *) {
+            window?.overrideUserInterfaceStyle = .light
+        }
         // 设置Tabbar
         kAppDelegate.setTabbarController()
         //  引导页

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -41,14 +41,20 @@ class BaseTabbarViewController: NSObject {
     /// 我的
     var lottieAnimateContentView5 : BaseLottieAnimateContentView!
     
-    
-    
     var lastIndex : Int = 0
 
     func tabBarViewController() -> ESTabBarController {
         esTabBarController = ESTabBarController()
         
-        esTabBarController.tabBar.shadowImage = UIImage(named: "navbar_shadow_pic_down")
+        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")
+            esTabBarController.tabBar.standardAppearance.shadowColor = UIColor.yellow
+        } else {
+            esTabBarController.tabBar.shadowImage = UIImage(named: "navbar_shadow_pic_down")
+        }
+        
         esTabBarController.shouldHijackHandler = {
            [weak self] (tabbarController, viewController, index) in
             AudioServicesPlaySystemSound(1519)

RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebViewController.swift

@@ -64,7 +64,7 @@ class BaseJSWebViewController: BaseViewController {
     
     lazy var wkWebView: WKWebView = {
         /// 创建webveiew
-        let wkWebView = WKWebView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-48-kNavBarTotalHeight-kTabBarTotalHeight))
+        let wkWebView = WKWebView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-44-kNavBarTotalHeight-kTabBarTotalHeight))
         // 监听支持KVO的属性
         wkWebView.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
         return wkWebView

RainbowPlanet/RainbowPlanet/Manager/AppStoreManager/AppStoreManager.swift

@@ -21,21 +21,23 @@ class AppStoreManager: NSObject {
     
     /// 跳转到AppStore
     func appStore() {
-        let kAppStoreURL = URL(string: kAppStore)
-        if #available(iOS 10, *) {
-            UIApplication.shared.open(kAppStoreURL!, options: [:], completionHandler: nil)
-        } else {
-            UIApplication.shared.openURL(kAppStoreURL!)
+        if let appStoreURL:URL = URL(string: kAppStore) {
+            if #available(iOS 10, *) {
+                UIApplication.shared.open(appStoreURL, options: [:], completionHandler: nil)
+            } else {
+                UIApplication.shared.openURL(appStoreURL)
+            }
         }
     }
     
     /// 跳转到AppStore评论
     func appStoreReview() {
-        let kAppStoreReviewURL = URL(string: kAppStore)
-        if #available(iOS 10, *) {
-            UIApplication.shared.open(kAppStoreReviewURL!, options: [:], completionHandler: nil)
-        } else {
-            UIApplication.shared.openURL(kAppStoreReviewURL!)
+        if let appStoreReviewURL:URL = URL(string: kAppStoreReview) {
+            if #available(iOS 10, *) {
+                UIApplication.shared.open(appStoreReviewURL, options: [:], completionHandler: nil)
+            } else {
+                UIApplication.shared.openURL(appStoreReviewURL)
+            }
         }
     }
     
@@ -55,6 +57,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

@@ -23,34 +23,34 @@ class UpdateVersionManager: NSObject {
     
     /// 初始化升级
     func initUpdateVersionManager() {
-           //启动程序
-           observe = NotificationCenter.default.addObserver(forName: UIApplication.didFinishLaunchingNotification, object: nil, queue: OperationQueue.main, using: {
-               [weak self] (notification) in
-               self?.configUpGrade()
-               
-           })
-           //程序进入后台
-           observe = NotificationCenter.default.addObserver(forName: UIApplication.didEnterBackgroundNotification, object: nil, queue: OperationQueue.main, using: {
-               [weak self] (notification) in
-               if self?.updateVersionView != nil {
-                   self?.updateVersionView?.hide()
-               }
-           })
-           //将要进入前台的时候
-           observe = NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: OperationQueue.main, using: {
-               [weak self] (notification) in
-               self?.configUpGrade()
-               //基础配置
-               SwiftMoyaNetWorkServiceConfig.shared().configApi(completion: {(data) -> (Void) in}){_ in}
-           })
-           //程序即将退出
-           observe = NotificationCenter.default.addObserver(forName: UIApplication.willTerminateNotification, object: nil, queue: OperationQueue.main, using: {
-               [weak self] (notification) in
-               if self?.updateVersionView != nil {
-                   self?.updateVersionView?.hide()
-               }
-           })
-       }
+       //启动程序
+       observe = NotificationCenter.default.addObserver(forName: UIApplication.didFinishLaunchingNotification, object: nil, queue: OperationQueue.main, using: {
+           [weak self] (notification) in
+           self?.configUpGrade()
+           
+       })
+       //程序进入后台
+       observe = NotificationCenter.default.addObserver(forName: UIApplication.didEnterBackgroundNotification, object: nil, queue: OperationQueue.main, using: {
+           [weak self] (notification) in
+           if self?.updateVersionView != nil {
+               self?.updateVersionView?.hide()
+           }
+       })
+       //将要进入前台的时候
+       observe = NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: OperationQueue.main, using: {
+           [weak self] (notification) in
+           self?.configUpGrade()
+           //基础配置
+           SwiftMoyaNetWorkServiceConfig.shared().configApi(completion: {(data) -> (Void) in}){_ in}
+       })
+       //程序即将退出
+       observe = NotificationCenter.default.addObserver(forName: UIApplication.willTerminateNotification, object: nil, queue: OperationQueue.main, using: {
+           [weak self] (notification) in
+           if self?.updateVersionView != nil {
+               self?.updateVersionView?.hide()
+           }
+       })
+    }
 
     // 用于判断当前系统版本是否低于指定版本
     func systemVersion(below aVersionString: String) -> Bool

RainbowPlanet/RainbowPlanet/Model/WVJBModel/WVJBModel.swift

@@ -32,7 +32,7 @@ class WVJBModel:NSObject,Mappable{
     var modelType : WVJBModelType?
     var type : String? {
         didSet {
-           modelType = WVJBModelType(rawValue: type ?? "") ?? .none
+            modelType = WVJBModelType(rawValue: type ?? "") ?? WVJBModelType.none
         }
     }
     var params : WVJBParamsModel?
@@ -98,7 +98,7 @@ class WVJBParamsModel:NSObject,Mappable {
     var paramsModelType : WVJBParamsModelType?
     var type : String? {
         didSet {
-            paramsModelType = WVJBParamsModelType(rawValue: type ?? "") ?? .none
+            paramsModelType = WVJBParamsModelType(rawValue: type ?? "") ?? WVJBParamsModelType.none
             
         }
     }
@@ -106,7 +106,7 @@ class WVJBParamsModel:NSObject,Mappable {
     var paramsModelPage : WVJBParamsModelPage?
     var page :String? {
         didSet {
-            paramsModelPage = WVJBParamsModelPage(rawValue: page ?? "") ?? .none
+            paramsModelPage = WVJBParamsModelPage(rawValue: page ?? "") ?? WVJBParamsModelPage.none
         }
     }
     

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/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -47,7 +47,7 @@ class CommunityFollowViewController: BaseViewController {
     override func setupLayouts() {
         tableView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
-            make.height.equalTo(kScreenHeight-48-kNavBarTotalHeight-kTabBarTotalHeight)
+            make.height.equalTo(kScreenHeight-44-kNavBarTotalHeight-kTabBarTotalHeight)
         }
     }
     
@@ -749,7 +749,7 @@ extension CommunityFollowViewController {
                 NotificationCenter.default.post(name: NSNotification.Name("CommunityViewControllerScrollView"), object: true)
 
                 tableView.snp.updateConstraints { (make) in
-                    make.height.equalTo(kScreenHeight-48-kSafeStatusBarHeight-kTabBarTotalHeight)
+                    make.height.equalTo(kScreenHeight-44-kSafeStatusBarHeight-kTabBarTotalHeight)
                 }
                 self.view.layoutIfNeeded()
                 self.navigationBarIsHidden = true
@@ -760,7 +760,7 @@ extension CommunityFollowViewController {
             if communityNavigationBarIsHidden && communityIndex != 2 {
                 NotificationCenter.default.post(name: NSNotification.Name("CommunityViewControllerScrollView"), object: false)
                 tableView.snp.updateConstraints { (make) in
-                    make.height.equalTo(kScreenHeight-48-kNavBarTotalHeight-kTabBarTotalHeight)
+                    make.height.equalTo(kScreenHeight-44-kNavBarTotalHeight-kTabBarTotalHeight)
                 }
                 self.view.layoutIfNeeded()
                 communityNavigationBarIsHidden = false

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

@@ -95,7 +95,11 @@ extension CommunityPlanetViewController : WKNavigationDelegate {
                 decisionHandler(.cancel);
                 //用openURL 这个API打电话
                 if let mobileURL:URL = URL(string: requestURL) {
-                    UIApplication.shared.openURL(mobileURL)
+                    if #available(iOS 10, *) {
+                        UIApplication.shared.open(mobileURL, options: [:], completionHandler: nil)
+                    } else {
+                        UIApplication.shared.openURL(mobileURL)
+                    }
                 }
             }
             

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

@@ -49,7 +49,7 @@ class CommunityRecommnendViewController: UIViewController {
     func setupLayouts() {
         tableView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
-            make.height.equalTo(kScreenHeight-48-kNavBarTotalHeight-kTabBarTotalHeight-48)
+            make.height.equalTo(kScreenHeight-44-kNavBarTotalHeight-kTabBarTotalHeight-40)
         }
         tableView.reloadData()
     }

RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift

@@ -95,7 +95,11 @@ extension H5CommonViewController : WKNavigationDelegate  {
                 decisionHandler(.cancel);
                 //用openURL 这个API打电话
                 if let mobileURL:URL = URL(string: requestURL) {
-                    UIApplication.shared.openURL(mobileURL)
+                    if #available(iOS 10, *) {
+                        UIApplication.shared.open(mobileURL, options: [:], completionHandler: nil)
+                    } else {
+                        UIApplication.shared.openURL(mobileURL)
+                    }
                 }
             }
             

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/RegisterLoginModule/BindPhoneNumber/ViewController/BindPhoneNumberViewController.swift

@@ -65,12 +65,12 @@ class BindPhoneNumberViewController: BaseViewController {
             switch self?.bindPhoneNumberVCType {
             case .weixinlogin?:
                 SwiftMoyaNetWorkServiceUser.shared().userBindMobileApi(mobile: phoneNumber, smsCode: sms, unionId: self?.userModel?.bindWeixinUserModel?.unionId ?? "", openId: self?.userModel?.bindWeixinUserModel?.openId ?? "", invitationCode: invitationCode, completion: { [weak self] (data) -> (Void) in
-                    RegisterLoginManager.registerLoginSuccessApi(vc: self!)
+                    RegisterLoginManager.registerLoginSuccessApi(vc: self)
                 })
                 break
             case .qqLogin?:
                 SwiftMoyaNetWorkServiceUser.shared().userBindMobileApi(mobile: phoneNumber, smsCode: sms, unionId: self?.userModel?.bindQQUserModel?.unionId ?? "", openId: self?.userModel?.bindQQUserModel?.openId ?? "", invitationCode: invitationCode, completion: { [weak self] (data) -> (Void) in
-                    RegisterLoginManager.registerLoginSuccessApi(vc: self!)
+                    RegisterLoginManager.registerLoginSuccessApi(vc: self)
                 })
                 break
             case .accountSecurityBindMobile?:

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/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -44,7 +44,6 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         
         SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userWeiXinRegister(parameters: parameters)), completion: { (userModel) in
             UserModel.shared().setModel(model: userModel as! UserModel)
-            VirusViewModel.registeredVirueRecordAddApi(completion: {})
             let userModel = userModel as! UserModel
             
             completion(userModel as Any)
@@ -157,7 +156,8 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindMobile(parameters: parameters)), completion: { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
-                
+                VirusViewModel.registeredVirueRecordAddApi(completion: {})
+
                 completion("")
             }) {
                 (loadingStatus) in

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)
         }

RainbowPlanet/RainbowPlanet/Tools/WKWebView/WebView.swift

@@ -228,7 +228,11 @@ extension WebView: WKNavigationDelegate{
                 decisionHandler(.cancel);
                 //用openURL 这个API打电话
                 if let mobileURL:URL = URL(string: requestURL) {
-                    UIApplication.shared.openURL(mobileURL)
+                    if #available(iOS 10, *) {
+                        UIApplication.shared.open(mobileURL, options: [:], completionHandler: nil)
+                    } else {
+                        UIApplication.shared.openURL(mobileURL)
+                    }
                 }
             }