1.6.5

Author: man.li

CocoaDebug.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = "CocoaDebug"
-  s.version             = "1.6.4"
+  s.version             = "1.6.5"
   s.summary             = "iOS Debug Tool"
   s.homepage            = "https://github.com/CocoaDebug/CocoaDebug"
   s.author              = {"CocoaDebug" => "[email protected]"}

Sources/App/AboutViewController.swift

@@ -28,7 +28,7 @@ class AboutViewController: UITableViewController {
         naviItem.titleView = naviItemTitleLabel
 
 
-        let version = "1.6.4"
+        let version = "1.6.5"
 
         self.versionLabel.text = "CocoaDebug Version ".appending(version)
 

Sources/Core/CocoaDebug+Extensions.swift

@@ -306,9 +306,9 @@ extension CocoaDebug {
     ///init
     static func initializationMethod(serverURL: String? = nil, ignoredURLs: [String]? = nil, onlyURLs: [String]? = nil, ignoredPrefixLogs: [String]? = nil, onlyPrefixLogs: [String]? = nil, additionalViewController: UIViewController? = nil, emailToRecipients: [String]? = nil, emailCcRecipients: [String]? = nil, mainColor: String? = nil, protobufTransferMap: [String: [String]]? = nil)
     {
-        if CocoaDebugSettings.shared.isRunning == true {return}
+//        if CocoaDebugSettings.shared.isRunning == true {return}
 
-        CocoaDebugSettings.shared.isRunning = true
+//        CocoaDebugSettings.shared.isRunning = true
 
         //        let enableWKWebViewMonitoring = UserDefaults.standard.bool(forKey: "enableWKWebViewMonitoring_CocoaDebug")
         //        let enableCrashRecording = UserDefaults.standard.bool(forKey: "enableCrashRecording_CocoaDebug")
@@ -395,7 +395,7 @@ extension CocoaDebug {
 
     ///deinit
     static func deinitializationMethod() {
-        CocoaDebugSettings.shared.isRunning = false
+//        CocoaDebugSettings.shared.isRunning = false
         WindowHelper.shared.disable()
         _NetworkHelper.shared().disable()
         _SwiftLogHelper.shared.enable = false

Sources/Core/CocoaDebug.h

@@ -35,46 +35,3 @@
 #import "_QNSURLSessionDemux.h"
 #import "_FilePreviewController.h"
 #import "_DirectoryContentsTableViewController.h"
-
-
-//--- Protocol buffers ---
-//#import "Any.pbobjc.h"
-//#import "Api.pbobjc.h"
-//#import "Duration.pbobjc.h"
-//#import "Empty.pbobjc.h"
-//#import "FieldMask.pbobjc.h"
-//#import "SourceContext.pbobjc.h"
-//#import "Struct.pbobjc.h"
-//#import "Timestamp.pbobjc.h"
-//#import "Type.pbobjc.h"
-//#import "Wrappers.pbobjc.h"
-//
-//#import "GPBArray.h"
-//#import "GPBArray_PackagePrivate.h"
-//#import "GPBBootstrap.h"
-//#import "GPBCodedInputStream.h"
-//#import "GPBCodedInputStream_PackagePrivate.h"
-//#import "GPBCodedOutputStream.h"
-//#import "GPBCodedOutputStream_PackagePrivate.h"
-//#import "GPBDescriptor.h"
-//#import "GPBDescriptor_PackagePrivate.h"
-//#import "GPBDictionary.h"
-//#import "GPBDictionary_PackagePrivate.h"
-//#import "GPBExtensionInternals.h"
-//#import "GPBExtensionRegistry.h"
-//#import "GPBMessage+CocoaDebug.h"
-//#import "GPBMessage.h"
-//#import "GPBMessage_PackagePrivate.h"
-//#import "GPBProtocolBuffers.h"
-//#import "GPBProtocolBuffers_RuntimeSupport.h"
-//#import "GPBRootObject.h"
-//#import "GPBRootObject_PackagePrivate.h"
-//#import "GPBRuntimeTypes.h"
-//#import "GPBUnknownField.h"
-//#import "GPBUnknownField_PackagePrivate.h"
-//#import "GPBUnknownFieldSet.h"
-//#import "GPBUnknownFieldSet_PackagePrivate.h"
-//#import "GPBUtilities.h"
-//#import "GPBUtilities_PackagePrivate.h"
-//#import "GPBWellKnownTypes.h"
-//#import "GPBWireFormat.h"

Sources/Core/CocoaDebugSettings.swift

@@ -12,7 +12,7 @@ import Foundation
 
     @objc public static let shared = CocoaDebugSettings()
 
-    @objc public var isRunning: Bool = false
+//    @objc public var isRunning: Bool = false
 
     @objc public var slowAnimations: Bool = false {
         didSet {            

Sources/Network/_NetworkHelper.m

@@ -38,14 +38,18 @@ - (id)init {
     return self;
 }
 
-- (void)enable
-{
+- (void)enable {
+    if (self.isNetworkEnable) {
+        return;
+    }
     self.isNetworkEnable = YES;
     [NSURLProtocol registerClass:[_CustomHTTPProtocol class]];
 }
 
-- (void)disable
-{
+- (void)disable {
+    if (!self.isNetworkEnable) {
+        return;
+    }
     self.isNetworkEnable = NO;
     [NSURLProtocol unregisterClass:[_CustomHTTPProtocol class]];
 }

Sources/Window/WindowHelper.swift

@@ -13,7 +13,7 @@ public class WindowHelper: NSObject {
 
     var window: CocoaDebugWindow
     var displayedList = false
-    lazy var vc = CocoaDebugViewController() //必须使用lazy, 否则崩溃
+    lazy var vc = CocoaDebugViewController() //must lazy init, otherwise crash
 
     //FPS
     fileprivate var fpsCounter = FPSCounter()
@@ -31,13 +31,15 @@ public class WindowHelper: NSObject {
 
 
     public func enable() {
-        if window.rootViewController != vc {
-            window.rootViewController = vc
-            window.delegate = self
-            window.isHidden = false
-            startFpsMonitoring()
+        if window.rootViewController == vc {
+            return
         }
 
+        window.rootViewController = vc
+        window.delegate = self
+        window.isHidden = false
+        startFpsMonitoring()
+        
         if #available(iOS 13.0, *) {
             var success: Bool = false
 
@@ -58,12 +60,13 @@ public class WindowHelper: NSObject {
 
 
     public func disable() {
-        if window.rootViewController != nil {
-            window.rootViewController = nil
-            window.delegate = nil
-            window.isHidden = true
-            stopFpsMonitoring()
+        if window.rootViewController == nil {
+            return
         }
+        window.rootViewController = nil
+        window.delegate = nil
+        window.isHidden = true
+        stopFpsMonitoring()
     }
 
     public func startFpsMonitoring() {
@@ -72,7 +75,6 @@ public class WindowHelper: NSObject {
 
     public func stopFpsMonitoring() {
         fpsCounter.stopMonitoring()
-
     }
 }