Merge pull request #56 from meitu/feature/upgrade

upgrade 0.12.2

MTHawkeye.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MTHawkeye"
-  s.version      = "0.12.1"
+  s.version      = "0.12.2"
   s.summary      = "Profiling/Debugging assist tools for iOS."
 
   s.description  = <<-DESC
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   s.author       = { "Euan Chan" => "[email protected]" }
 
-  s.platform     = :ios, "8.0"
+  s.platform     = :ios, "9.0"
 
   s.source       = { :git => "https://github.com/meitu/MTHawkeye.git", :tag => "#{s.version}" }
 
@@ -409,7 +409,7 @@ Pod::Spec.new do |s|
   s.subspec 'FLEXExtension' do |flex|
       flex.public_header_files = 'MTHawkeye/FLEXExtension/**/*.{h}'
       flex.source_files = 'MTHawkeye/FLEXExtension/**/*.{h,m}'
-      flex.dependency 'FLEX', '3.0.0'
+      flex.dependency 'FLEX', '4.1.1'
       flex.dependency 'MTHawkeye/UISkeleton'
       flex.libraries = "sqlite3"
   end

MTHawkeye/NetworkPlugins/HawkeyeUI/MTHNetworkTransactionDetailTableViewController.m

@@ -715,7 +715,7 @@ + (UIViewController *)detailViewControllerForMIMEType:(NSString *)mimeType data:
 #pragma clang diagnostic pop
             }
         }
-        detailViewController = [[FLEXImagePreviewViewController alloc] initWithImage:image];
+        detailViewController = [FLEXImagePreviewViewController forImage:image];
     } else if ([mimeType isEqual:@"application/x-plist"]) {
         id propertyList = [NSPropertyListSerialization propertyListWithData:data options:0 format:NULL error:NULL];
         detailViewController = [[MTHawkeyeWebViewController alloc] initWithText:[propertyList description]];

MTHawkeye/NetworkPlugins/Monitor/HawkeyeCore/MTHNetworkRecordsStorage.m

@@ -62,7 +62,7 @@ - (MTAppenderFile *)networkRecordsFile {
 
 - (void)storeNetworkTransaction:(MTHNetworkTransaction *)transaction {
     NSDictionary *dict = [transaction dictionaryFromAllProperty];
-    if ([dict count] == 0) {
+    if ([dict count] == 0 || ![NSJSONSerialization isValidJSONObject:dict]) {
         return;
     }
 

MTHawkeye/StorageMonitorPlugins/DirectoryWatcher/HawkeyeUI/MTHDirectoryWatcherViewController.m

@@ -21,7 +21,7 @@
 #import "MTHawkeyeUserDefaults+DirectorWatcher.h"
 #import "UIViewController+MTHawkeyeLayoutSupport.h"
 
-#import "FLEXFileBrowserTableViewController.h"
+#import "FLEXFileBrowserController.h"
 #import "FLEXImagePreviewViewController.h"
 #import "FLEXTableListViewController.h"
 #import "FLEXUtility.h"
@@ -195,10 +195,10 @@ - (void)presentFlexFileBrowserWithPath:(NSString *)fullPath {
     NSString *pathExtension = [subpath pathExtension];
     UIViewController *vc = nil;
     if (isDir) {
-        vc = [[FLEXFileBrowserTableViewController alloc] initWithPath:fullPath];
-    } else if ([FLEXUtility isImagePathExtension:pathExtension]) {
+        vc = [[FLEXFileBrowserController alloc] initWithPath:fullPath];
+    } else if ([@[@"jpg", @"jpeg", @"png", @"gif", @"tiff", @"tif"] containsObject:pathExtension]) {
         UIImage *image = [UIImage imageWithContentsOfFile:fullPath];
-        vc = [[FLEXImagePreviewViewController alloc] initWithImage:image];
+        vc = [FLEXImagePreviewViewController forImage:image];
     } else {
         // Special case keyed archives, json, and plists to get more readable data.
         NSString *prettyString = nil;

MTHawkeye/Utils/MTHawkeyeInnerLogger.m

@@ -178,7 +178,7 @@ + (void)setupConsoleLoggerWithLevel:(DDLogLevel)logLevel {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         [self setup];
-        _ttyLogger = [[DDTTYLogger alloc] init];
+        _ttyLogger = [DDTTYLogger sharedInstance];
         _ttyLogger.logFormatter = [[MTHawkeyeInnerDDLogFormatter alloc] initWithType:MTHawkeyeInnerDDLogFormatterTypeConsole];
         [_mth_log addLogger:_ttyLogger withLevel:logLevel];
     });

MTHawkeyeDemo/MTHawkeyeDemo/NetworkDemo/MTNetworkTaskDemoViewController.m

@@ -106,7 +106,7 @@ - (void)fireRequestTask {
         manager.requestSerializer = [AFJSONRequestSerializer serializer];
         [manager.requestSerializer setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
         [manager.requestSerializer setValue:@"test-value" forHTTPHeaderField:@"custom-http-field"];
-        [manager GET:mockRequest[index] parameters:@{@"custom-key" : @"custom-value"} progress:nil success:nil failure:nil];
+        [manager GET:mockRequest[index] parameters:@{@"custom-key" : @"custom-value"} headers:nil progress:nil success:nil failure:nil];
 
         [self.log appendFormat:@">> %@ \n", radomRequestURL];
         dispatch_async(dispatch_get_main_queue(), ^(void) {

MTHawkeyeDemo/MTHawkeyeDemoTests/AFURLSessionManagerTests.m

@@ -73,10 +73,10 @@ - (void)setUp {
 - (void)tearDown {
     [super tearDown];
     [self.localManager.session.configuration.URLCache removeAllCachedResponses];
-    [self.localManager invalidateSessionCancelingTasks:YES];
+    [self.localManager invalidateSessionCancelingTasks:YES resetSession:NO];
     self.localManager = nil;
 
-    [self.backgroundManager invalidateSessionCancelingTasks:YES];
+    [self.backgroundManager invalidateSessionCancelingTasks:YES resetSession:NO];
     self.backgroundManager = nil;
 }