Browse Source

兼容了iOS13的导航栏高度,修改了ZZDialogViewController

zzb 4 years ago
parent
commit
f99dfb237e

+ 10 - 1
ZZUIKit/Classes/Tools/ZZFrame.m

@@ -25,12 +25,21 @@ bool is_X_like(void){
     return isBangsScreen;
 }
 
+
 CGFloat NAV_BAR_H(void){
     return 44;
 };
 
 CGFloat STATUS_BAR_H(void){
-    return is_X_like() ? 44 : 20;
+    CGFloat height;
+    if (@available(iOS 13.0, *)) {
+        height = [UIApplication sharedApplication].delegate.window.windowScene.statusBarManager.statusBarFrame.size.height;
+    }else{
+        height = [UIApplication sharedApplication].statusBarFrame.size.height;
+//        return is_X_like() ? 44 : 20;
+    }
+    return height;
+    
 };
 
 CGFloat NAV_STATUS_BAR_H(void){

+ 1 - 1
ZZUIKit/Classes/ZZDialog/ZZDialogViewController.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface ZZDialogViewController : ZZViewController<ZZDialogDelegate,ZZDialogHandleDelegate>
+@interface ZZDialogViewController : ZZViewController
 @property(nonatomic,strong,readonly) ZZDialog *dialog;
 @property(nonatomic,weak,nullable) id<ZZDialogDelegate> dialogDelegate;
 @property(nonatomic,weak,nullable) id<ZZDialogHandleDelegate> handleDelegate;

+ 0 - 2
ZZUIKit/Classes/ZZDialog/ZZDialogViewController.m

@@ -39,8 +39,6 @@
     self.maskView.zz_tapAction(^(UIView *v){
       [weakSelf.dialog dismiss];
     });
-    self.dialogDelegate = self;
-    self.handleDelegate = self;
 }
 
 - (void)awakeFromNib{