From 6d9e4fd9c0d37d6177e28d2eb152e52a7dd709ba Mon Sep 17 00:00:00 2001 From: yixiangboy <919727170@qq.com> Date: Thu, 5 Mar 2020 18:17:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E7=BA=BF=E7=A8=8BUI=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E9=87=8D=E5=90=AFApp=E5=8D=B3?= =?UTF-8?q?=E5=8F=AF=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoraemonSubThreadUICheckViewController.m | 8 +------- .../Function/UIView+DoraemonSubThreadUICheck.m | 4 ++-- iOS/DoraemonKitDemo/Podfile | 1 + iOS/DoraemonKitDemo/Podfile.lock | 9 +++++++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/DoraemonSubThreadUICheckViewController.m b/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/DoraemonSubThreadUICheckViewController.m index f024aa19..dcd26f49 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/DoraemonSubThreadUICheckViewController.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/DoraemonSubThreadUICheckViewController.m @@ -47,13 +47,7 @@ #pragma mark -- DoraemonSwitchViewDelegate - (void)changeSwitchOn:(BOOL)on sender:(id)sender{ - __weak typeof(self) weakSelf = self; - [DoraemonAlertUtil handleAlertActionWithVC:self okBlock:^{ - [[DoraemonCacheManager sharedInstance] saveSubThreadUICheckSwitch:on]; - exit(0); - } cancleBlock:^{ - weakSelf.switchView.switchView.on = !on; - }]; + [[DoraemonCacheManager sharedInstance] saveSubThreadUICheckSwitch:on]; } #pragma mark -- DoraemonCellButtonDelegate diff --git a/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/Function/UIView+DoraemonSubThreadUICheck.m b/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/Function/UIView+DoraemonSubThreadUICheck.m index 97d4b8ed..78ff8c64 100644 --- a/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/Function/UIView+DoraemonSubThreadUICheck.m +++ b/iOS/DoraemonKit/Src/Core/Plugin/Performance/SubThreadUICheck/Function/UIView+DoraemonSubThreadUICheck.m @@ -39,8 +39,8 @@ } - (void)uiCheck{ - if([[DoraemonCacheManager sharedInstance] subThreadUICheckSwitch]){ - if(![NSThread isMainThread]){ + if(![NSThread isMainThread]){ + if ([[DoraemonCacheManager sharedInstance] subThreadUICheckSwitch]) { NSString *report = [BSBacktraceLogger bs_backtraceOfCurrentThread]; NSDictionary *dic = @{ @"title":[DoraemonUtil dateFormatNow], diff --git a/iOS/DoraemonKitDemo/Podfile b/iOS/DoraemonKitDemo/Podfile index 8de4fcb5..e67a8540 100644 --- a/iOS/DoraemonKitDemo/Podfile +++ b/iOS/DoraemonKitDemo/Podfile @@ -20,5 +20,6 @@ target :'DoraemonKitDemo' do pod 'AFNetworking','2.6.3' pod 'SDWebImage', '5.0.6' pod 'FBRetainCycleDetector', :git => 'git@github.com:facebook/FBRetainCycleDetector.git', :configurations => ['Debug'] + pod 'fishhook', :git => 'git@github.com:facebook/fishhook.git', :configurations => ['Debug'] #pod 'FBRetainCycleDetector' end diff --git a/iOS/DoraemonKitDemo/Podfile.lock b/iOS/DoraemonKitDemo/Podfile.lock index f6d3118d..e72336ed 100644 --- a/iOS/DoraemonKitDemo/Podfile.lock +++ b/iOS/DoraemonKitDemo/Podfile.lock @@ -59,13 +59,13 @@ DEPENDENCIES: - DoraemonKit/WithGPS (from `../../`) - DoraemonKit/WithMLeaksFinder (from `../../`) - "FBRetainCycleDetector (from `git@github.com:facebook/FBRetainCycleDetector.git`)" + - "fishhook (from `git@github.com:facebook/fishhook.git`)" - SDWebImage (= 5.0.6) SPEC REPOS: https://github.com/CocoaPods/Specs.git: - AFNetworking - BSBacktraceLogger - - fishhook - FMDB - GCDWebServer - SDWebImage @@ -76,11 +76,16 @@ EXTERNAL SOURCES: :path: "../../" FBRetainCycleDetector: :git: "git@github.com:facebook/FBRetainCycleDetector.git" + fishhook: + :git: "git@github.com:facebook/fishhook.git" CHECKOUT OPTIONS: FBRetainCycleDetector: :commit: 19fd284845b8454dbb75a648baa47d99b7708b74 :git: "git@github.com:facebook/FBRetainCycleDetector.git" + fishhook: + :commit: 66315a9c251edfe92f669ae2deeac0d75374c948 + :git: "git@github.com:facebook/fishhook.git" SPEC CHECKSUMS: AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60 @@ -93,6 +98,6 @@ SPEC CHECKSUMS: SDWebImage: 920f1a2ff1ca8296ad34f6e0510a1ef1d70ac965 YYDebugDatabase: c8be8bd85222cc2ced76e93ca06618bab87224d7 -PODFILE CHECKSUM: e3a8ed916535f347ac18202d838b851eea330ef8 +PODFILE CHECKSUM: 332fa75531721e86ff40fce343c54f259711b558 COCOAPODS: 1.8.4 -- GitLab