Fix warning.

HDB-Li · Oct 31, 2019 · c2798a6 · c2798a6
1 parent 83d7dd6
commit c2798a6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/LLDebugTool/Core/Component/Hierarchy/Function/NSObject+LL_Hierarchy.m b/LLDebugTool/Core/Component/Hierarchy/Function/NSObject+LL_Hierarchy.m
@@ -285,7 +285,7 @@ - (void)LL_replaceAttributeString:(NSString *)newString key:(NSString *)key {
         [LLTool log:[NSString stringWithFormat:@"KeyPath:%@ isn't a NSAttributedString or nil", key]];
         return;
     }
-    NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithAttributedString:string];
+    NSMutableAttributedString *attribute = string ? [[NSMutableAttributedString alloc] initWithAttributedString:string] : [[NSMutableAttributedString alloc] init];
     [attribute replaceCharactersInRange:NSMakeRange(0, string.length) withString:newString];
     [self setValue:string forKey:key];
 }
@@ -1223,13 +1223,16 @@ @implementation UIActivityIndicatorView (LL_Hierarchy)
     LLTitleCellModel *model1 = [[[LLTitleCellModel alloc] initWithTitle:@"Style" detailTitle:[LLEnumDescription activityIndicatorViewStyleDescription:self.activityIndicatorViewStyle]] noneInsets];
     model1.block = ^{
         [weakSelf LL_showActionSheetWithActions:[LLEnumDescription activityIndicatorViewStyles] currentAction:[LLEnumDescription activityIndicatorViewStyleDescription:weakSelf.activityIndicatorViewStyle] completion:^(NSInteger index) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             if (index <= UIActivityIndicatorViewStyleGray) {
                 weakSelf.activityIndicatorViewStyle = index;
             } else {
                 if (@available(iOS 13.0, *)) {
                     weakSelf.activityIndicatorViewStyle = index + (UIActivityIndicatorViewStyleMedium - UIActivityIndicatorViewStyleGray - 1);
                 }
             }
+#pragma clang diagnostic pop
         }];
     };
     [settings addObject:model1];

diff --git a/LLDebugTool/Core/Component/Html/UserInterface/LLHtmlConfigViewController.m b/LLDebugTool/Core/Component/Html/UserInterface/LLHtmlConfigViewController.m
@@ -42,6 +42,7 @@ - (void)viewDidLoad {
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
     if ([self.headerTextField isFirstResponder]) {
         [self.headerTextField resignFirstResponder];
     }

diff --git a/LLDebugTool/Core/Others/EnumDescription/LLEnumDescription.m b/LLDebugTool/Core/Others/EnumDescription/LLEnumDescription.m
@@ -521,12 +521,12 @@ + (NSString *)activityIndicatorViewStyleDescription:(UIActivityIndicatorViewStyl
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSArray *actions = @[@(UIActivityIndicatorViewStyleWhiteLarge),@(UIActivityIndicatorViewStyleWhite),@(UIActivityIndicatorViewStyleGray)];
-#pragma clang diagnostic pop
 #ifdef __IPHONE_13_0
     if (@available(iOS 13.0, *)) {
         actions = @[@(UIActivityIndicatorViewStyleMedium),@(UIActivityIndicatorViewStyleLarge),@(UIActivityIndicatorViewStyleWhiteLarge),@(UIActivityIndicatorViewStyleWhite),@(UIActivityIndicatorViewStyleGray)];
     }
 #endif
+#pragma clang diagnostic pop
     for (NSNumber *num in actions) {
         NSString *style = [self activityIndicatorViewStyleDescription:[num integerValue]];
         if (style) {
@@ -634,12 +634,15 @@ + (NSString *)tableViewCellSeparatorStyleDescription:(UITableViewCellSeparatorSt
 
 + (NSArray <NSString *>*)tableViewCellSeparatorStyles {
     NSMutableArray *styles = [[NSMutableArray alloc] init];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     for (UITableViewCellSeparatorStyle i = UITableViewCellSeparatorStyleNone; i <= UITableViewCellSeparatorStyleSingleLineEtched; i++) {
         NSString *style = [self tableViewCellSeparatorStyleDescription:i];
         if (style) {
             [styles addObject:style];
         }
     }
+#pragma clang diagnostic pop
     return [styles copy];
 }
 
@@ -758,12 +761,15 @@ + (NSString *)barStyleDescription:(UIBarStyle)style {
 
 + (NSArray <NSString *>*)barStyles {
     NSMutableArray *styles = [[NSMutableArray alloc] init];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     for (UIBarStyle i = UIBarStyleDefault; i <= UIBarStyleBlackTranslucent; i++) {
         NSString *style = [self barStyleDescription:i];
         if (style) {
             [styles addObject:style];
         }
     }
+#pragma clang diagnostic pop
     return [styles copy];
 }
 

diff --git a/LLDebugTool/Core/Others/Tool/LLTool.m b/LLDebugTool/Core/Others/Tool/LLTool.m
@@ -88,7 +88,10 @@ + (UIWindow *)topWindow {
 }
 
 + (UIWindow *)keyWindow {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     return [UIApplication sharedApplication].keyWindow;
+#pragma clang diagnostic pop
 }
 
 + (void)log:(NSString *)string {