iOS 13 适配

Author: Lojii

NIO1901.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -3647,8 +3647,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = NIO1901/NIO1901.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 73QYWNHB5F;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3663,7 +3663,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = Lojii.NIO1901;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "NIO2019发布描述文件";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ENABLE_BATCH_MODE = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "NIO1901/NIO1901-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -3726,11 +3726,11 @@
 			baseConfigurationReference = 7BA4F9D1F9BD7E1C68E596AC /* Pods-TunnelServices.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 73QYWNHB5F;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -3760,11 +3760,11 @@
 			baseConfigurationReference = 460FB976DF65AC5945AAF052 /* Pods-TunnelServices.release.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 73QYWNHB5F;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";

NIO1901/AppDelegate.swift

@@ -10,7 +10,7 @@ import UIKit
 import AVFoundation
 import TunnelServices
 import YYWebImage
-import Bugly
+//import Bugly
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -20,14 +20,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
-        Bugly.start(withAppId: "0519d95ff6")
-        Bugly.setUserValue("Main", forKey: "App")
+//        Bugly.start(withAppId: "0519d95ff6")
+//        Bugly.setUserValue("Main", forKey: "App")
 
         ASConfigration.setDefaultDB(path: MitmService.getDBPath(), name: "Session")
         ASConfigration.logLevel = .error
         // Default Rule
         if UserDefaults.standard.string(forKey: "first") == nil {
-            Bugly.setUserValue("true", forKey: "IsFirst")
+//            Bugly.setUserValue("true", forKey: "IsFirst")
             let defaultRule = Rule.defaultRule()
             try? defaultRule.saveToDB()
             UserDefaults.standard.set("\(defaultRule.id ?? -1)", forKey: CurrentRuleId)

NIO1901/Lib/IDSegmentedControl/IDSegmentedControl.swift

@@ -17,7 +17,7 @@ public class IDSegmentedView: UISegmentedControl {
         setBackgroundImage(selectedColorImage, for: .selected, barMetrics: .default)
 
         let segAttributesNormal = [NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.font: textFont]
-        let segAttributesSeleted = [NSAttributedString.Key.foregroundColor: UIColor.white,NSAttributedString.Key.font: textFont]
+        let segAttributesSeleted = [NSAttributedString.Key.foregroundColor: UIColor.black,NSAttributedString.Key.font: textFont]
         // 文字在两种状态下的颜色
         setTitleTextAttributes(segAttributesNormal, for: UIControl.State.normal)
         setTitleTextAttributes((segAttributesSeleted), for: UIControl.State.selected)
@@ -46,3 +46,4 @@ fileprivate extension UIImage{
 //        return img ?? UIImage()
 //    }
 }
+

NIO1901/Modules/Home/Controller/MainViewController.swift

@@ -186,8 +186,8 @@ class MainViewController: BaseViewController {
     }
 
     override func rightBtnClick() {
-        checkPermissions()
-        return
+//        checkPermissions()
+//        return
 
         let vc = SettingViewController()
         vc.currentNet = netStr
@@ -288,6 +288,7 @@ class MainViewController: BaseViewController {
     @objc func showLog(){
         let directory = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: GROUPNAME)
         let fileBrowser = FileBrowser(initialPath: directory, allowEditing: true, showCancelButton: true)
+        fileBrowser.modalPresentationStyle = .fullScreen
         present(fileBrowser, animated: true, completion: nil)
     }
     // MARK:VPN

NIO1901/Modules/RuleList/Controller/RuleListViewController.swift

@@ -77,6 +77,7 @@ class RuleListViewController: BaseViewController,PopupContentViewController {
         PopViewController.show(titles: ["Create an empty configuration".localized,"Download the configuration from the URL".localized], viewController: self.parent ?? self) { (index) in
             if index == 0 {
                 let vc = RuleDetailViewController(rule: nil)
+                vc.modalPresentationStyle = .fullScreen
                 if let homeVC = self.parent?.parent {
                     homeVC.present(vc, animated: true, completion: nil)
                 }
@@ -160,6 +161,7 @@ extension RuleListViewController:UITableViewDelegate,UITableViewDataSource {
                 r?.configParse()
                 if index == 0 {
                     let vc = RuleDetailViewController(rule: r ?? Rule())
+                    vc.modalPresentationStyle = .fullScreen
                     if let homeVC = self.parent?.parent {
                         homeVC.present(vc, animated: true, completion: nil)
                     }

NIO1901/Modules/RuleList/Controller/RuleOverViewController.swift

@@ -101,6 +101,7 @@ class RuleOverViewController: UIViewController {
         offY = textEditItem.frame.maxY
         textEditItem.contentDidClickHandle = {
             let container = RuleTextViewController(rule: self.rule)
+            container.modalPresentationStyle = .fullScreen
             self.present(container, animated: true, completion: nil)
         }
         scrollView.addSubview(textEditItem)

NIO1901/Modules/Setting/SettingViewController.swift

@@ -63,6 +63,7 @@ class SettingViewController: BaseViewController {
             mail.setToRecipients([CONNECTEMAIL])
             mail.setMessageBody(describe + info, isHTML: false)
             mail.setSubject(subject)
+            mail.modalPresentationStyle = .fullScreen
             present(mail, animated: true)
         } else {
             let alertController = UIAlertController(title: "Send e-mail".localized, message: "Send email to".localized + CONNECTEMAIL, preferredStyle: .alert)

PacketTunnel/PacketTunnelProvider.swift

@@ -10,7 +10,7 @@ import NetworkExtension
 import TunnelServices
 //import AxLogger
 import Reachability
-import Bugly
+//import Bugly
 
 class PacketTunnelProvider: NEPacketTunnelProvider {
 
@@ -32,8 +32,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
     override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
 
         pendingStartCompletion = completionHandler
-        Bugly.start(withAppId: "0519d95ff6")
-        Bugly.setUserValue("NetworkExtension", forKey: "App")
+//        Bugly.start(withAppId: "0519d95ff6")
+//        Bugly.setUserValue("NetworkExtension", forKey: "App")
 //        // 正常启动
         if StartInExtension {
             guard let server = MitmService.prepare() else {

Podfile

@@ -14,12 +14,12 @@ target 'NIO1901' do
     pod 'FileBrowser'
     pod 'CocoaAsyncSocket'
     pod 'ReachabilitySwift'
-    pod 'Bugly'
+    # pod 'Bugly'
 end
 
 target 'PacketTunnel' do
     pod 'ReachabilitySwift'
-    pod 'Bugly'
+    # pod 'Bugly'
 end
 
 target 'TunnelServices' do