健康体检 屏蔽掉DoKit本身的页面

iOS/DoraemonKit/Src/Core/Plugin/Platform/Health/Function/DoraemonHealthManager.m

@@ -289,6 +289,9 @@
 }
 
 - (void)startEnterPage:(Class)vcClass{
+    if (!_start) {
+        return;
+    }
     if ([self blackList:vcClass]) {
         return;
     }
@@ -377,9 +380,9 @@
 }
 
 - (BOOL)blackList:(Class)vcClass{
-//    if ([vcClass isSubclassOfClass:[DoraemonBaseViewController class]]) {
-//        return YES;
-//    }
+    if ([vcClass isSubclassOfClass:[DoraemonBaseViewController class]]) {
+        return YES;
+    }
     if ([vcClass isSubclassOfClass:[UINavigationController class]] || [vcClass isSubclassOfClass:[UITabBarController class]]) {
         return YES;
     }

iOS/DoraemonKitDemo/DoraemonKitDemo.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		0A5399852349ED5B00C47CB3 /* DoraemonDemoMemoryLeakViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A5399842349ED5B00C47CB3 /* DoraemonDemoMemoryLeakViewController.m */; };
 		0A5399882349EE7E00C47CB3 /* DoraemonDemoMemoryLeakModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A5399872349EE7E00C47CB3 /* DoraemonDemoMemoryLeakModel.m */; };
 		0A53998B2349EE9500C47CB3 /* DoraemonDemoMemoryLeakView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A53998A2349EE9500C47CB3 /* DoraemonDemoMemoryLeakView.m */; };
+		0AA262E1240F8AC400BF144F /* DoraemonDemoBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AA262E0240F8AC400BF144F /* DoraemonDemoBaseViewController.m */; };
 		0AFBC55223BAE6F80099A8BD /* DoraemonDemoNetTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AFBC55023BAE6F80099A8BD /* DoraemonDemoNetTableViewCell.m */; };
 		B65C2263AF96F94C50A222DF /* libPods-DoraemonKitDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E964A2D92411C9DC5482EF /* libPods-DoraemonKitDemo.a */; };
 		DA0C6F331FDEBC2E00F43588 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA0C6F311FDEBC2E00F43588 /* LaunchScreen.storyboard */; };
@@ -48,6 +49,8 @@
 		0A5399872349EE7E00C47CB3 /* DoraemonDemoMemoryLeakModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DoraemonDemoMemoryLeakModel.m; sourceTree = "<group>"; };
 		0A5399892349EE9500C47CB3 /* DoraemonDemoMemoryLeakView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DoraemonDemoMemoryLeakView.h; sourceTree = "<group>"; };
 		0A53998A2349EE9500C47CB3 /* DoraemonDemoMemoryLeakView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DoraemonDemoMemoryLeakView.m; sourceTree = "<group>"; };
+		0AA262DF240F8AC400BF144F /* DoraemonDemoBaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DoraemonDemoBaseViewController.h; sourceTree = "<group>"; };
+		0AA262E0240F8AC400BF144F /* DoraemonDemoBaseViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DoraemonDemoBaseViewController.m; sourceTree = "<group>"; };
 		0AFBC55023BAE6F80099A8BD /* DoraemonDemoNetTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DoraemonDemoNetTableViewCell.m; sourceTree = "<group>"; };
 		0AFBC55123BAE6F80099A8BD /* DoraemonDemoNetTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoraemonDemoNetTableViewCell.h; sourceTree = "<group>"; };
 		29E964A2D92411C9DC5482EF /* libPods-DoraemonKitDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DoraemonKitDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -129,6 +132,15 @@
 			path = MemoryLeak;
 			sourceTree = "<group>";
 		};
+		0AA262DE240F8A7700BF144F /* Base */ = {
+			isa = PBXGroup;
+			children = (
+				0AA262DF240F8AC400BF144F /* DoraemonDemoBaseViewController.h */,
+				0AA262E0240F8AC400BF144F /* DoraemonDemoBaseViewController.m */,
+			);
+			path = Base;
+			sourceTree = "<group>";
+		};
 		0AFBC54F23BAE6F80099A8BD /* Cell */ = {
 			isa = PBXGroup;
 			children = (
@@ -248,6 +260,7 @@
 		DAFE050521BD4A4C00F97A59 /* DemoVC */ = {
 			isa = PBXGroup;
 			children = (
+				0AA262DE240F8A7700BF144F /* Base */,
 				0A5399822349ECF000C47CB3 /* MemoryLeak */,
 				DAFE050621BD4A4C00F97A59 /* UI */,
 				DAFE050921BD4A4C00F97A59 /* Home */,
@@ -305,8 +318,8 @@
 			isa = PBXGroup;
 			children = (
 				DAFE051321BD4A4C00F97A59 /* DoraemonDemoCrashViewController.h */,
-				DAFE051421BD4A4C00F97A59 /* DoraemonDemoCrashMRCView.h */,
 				DAFE051521BD4A4C00F97A59 /* DoraemonDemoCrashViewController.m */,
+				DAFE051421BD4A4C00F97A59 /* DoraemonDemoCrashMRCView.h */,
 				DAFE051621BD4A4C00F97A59 /* DoraemonDemoCrashMRCView.m */,
 			);
 			path = Crash;
@@ -333,9 +346,9 @@
 		DAFE051D21BD4A4C00F97A59 /* MockGPS */ = {
 			isa = PBXGroup;
 			children = (
+				DAFE052021BD4A4C00F97A59 /* DoraemonDemoMockGPSAnnotation.h */,
 				DAFE051E21BD4A4C00F97A59 /* DoraemonDemoMockGPSAnnotation.m */,
 				DAFE051F21BD4A4C00F97A59 /* DoraemonDemoMockGPSViewController.h */,
-				DAFE052021BD4A4C00F97A59 /* DoraemonDemoMockGPSAnnotation.h */,
 				DAFE052121BD4A4C00F97A59 /* DoraemonDemoMockGPSViewController.m */,
 			);
 			path = MockGPS;
@@ -344,8 +357,8 @@
 		DAFE052221BD4A4C00F97A59 /* Performance */ = {
 			isa = PBXGroup;
 			children = (
-				DAFE052321BD4A4C00F97A59 /* DoraemonDemoPerformanceViewController.m */,
 				DAFE052421BD4A4C00F97A59 /* DoraemonDemoPerformanceViewController.h */,
+				DAFE052321BD4A4C00F97A59 /* DoraemonDemoPerformanceViewController.m */,
 			);
 			path = Performance;
 			sourceTree = "<group>";
@@ -482,6 +495,7 @@
 				0A5399882349EE7E00C47CB3 /* DoraemonDemoMemoryLeakModel.m in Sources */,
 				DAFE052C21BD4A4D00F97A59 /* DoraemonDemoCommonViewController.m in Sources */,
 				0AFBC55223BAE6F80099A8BD /* DoraemonDemoNetTableViewCell.m in Sources */,
+				0AA262E1240F8AC400BF144F /* DoraemonDemoBaseViewController.m in Sources */,
 				DAFE052A21BD4A4D00F97A59 /* DoraemonDemoCrashMRCView.m in Sources */,
 				DAC3FA7622B8DD7400871E5C /* DoraemonDemoImageViewController.m in Sources */,
 				DAC3FA7922B8E0EE00871E5C /* DoraemonDemoImageShowViewController.m in Sources */,

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Base/DoraemonDemoBaseViewController.h

+//
+//  DoraemonDemoBaseViewController.h
+//  DoraemonKitDemo
+//
+//  Created by didi on 2020/3/4.
+//  Copyright © 2020 yixiang. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DoraemonDemoBaseViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Base/DoraemonDemoBaseViewController.m

+//
+//  DoraemonDemoBaseViewController.m
+//  DoraemonKitDemo
+//
+//  Created by didi on 2020/3/4.
+//  Copyright © 2020 yixiang. All rights reserved.
+//
+
+#import "DoraemonDemoBaseViewController.h"
+#import <DoraemonKit/DoraemonDefine.h>
+#import <DoraemonKit/DoraemonNavBarItemModel.h>
+
+@interface DoraemonDemoBaseViewController ()
+
+@property (nonatomic, strong) DoraemonNavBarItemModel *leftModel;
+
+@end
+
+@implementation DoraemonDemoBaseViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    UIImage *image = [UIImage doraemon_imageNamed:@"doraemon_back"];
+    self.leftModel = [[DoraemonNavBarItemModel alloc] initWithImage:image selector:@selector(leftNavBackClick:)];
+    [self setLeftNavBarItems:@[self.leftModel]];
+    
+}
+
+- (void)setLeftNavBarItems:(NSArray *)items{
+    NSArray *barItems = [self navigationItems:items];
+    if (barItems) {
+        self.navigationItem.leftBarButtonItems = barItems;
+    }
+}
+
+- (NSArray *)navigationItems:(NSArray *)items{
+    NSMutableArray *barItems = [NSMutableArray array];
+    //距离左右的间距
+    UIBarButtonItem *spacer = [self getSpacerByWidth:-10];
+    [barItems addObject:spacer];
+    
+    for (NSInteger i=0; i<items.count; i++) {
+        
+        DoraemonNavBarItemModel *model = items[i];
+        UIBarButtonItem *barItem;
+        if (model.type == DoraemonNavBarItemTypeText) {//文字按钮
+            barItem = [[UIBarButtonItem alloc] initWithTitle:model.text style:UIBarButtonItemStylePlain target:self action:model.selector];
+            barItem.tintColor = model.textColor;
+        }else if(model.type == DoraemonNavBarItemTypeImage){//图片按钮
+            UIImage *image = [model.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];//设置图片没有默认蓝色效果
+            //默认的间距太大
+//            barItem = [[UIBarButtonItem alloc] initWithImage:image style:UIBarButtonItemStylePlain target:self action:model.selector];
+            
+            UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+            [btn setImage:image forState:UIControlStateNormal];
+            [btn addTarget:self action:model.selector forControlEvents:UIControlEventTouchUpInside];
+            btn.frame = CGRectMake(0, 0, 30, 30);
+            btn.clipsToBounds = YES;
+            barItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
+        }else{
+            barItem = [[UIBarButtonItem alloc] init];
+        }
+        [barItems addObject:barItem];
+    }
+    return barItems;
+}
+
+- (UIBarButtonItem *)getSpacerByWidth : (CGFloat)width{
+    UIBarButtonItem *spacer = [[UIBarButtonItem alloc]
+                               initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace
+                               target:nil action:nil];
+    /**
+     *  width为负数时，相当于btn向右移动width数值个像素，由于按钮本身和边界间距为5pix，所以width设为-5时，间距正好调整
+     *  为0；width为正数时，正好相反，相当于往左移动width数值个像素
+     */
+    spacer.width = width;
+    return spacer;
+}
+
+- (void)leftNavBackClick:(id)clickView{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+@end

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Common/DoraemonDemoCommonViewController.h

@@ -6,9 +6,9 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import "DoraemonBaseViewController.h"
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoCommonViewController : DoraemonBaseViewController
+@interface DoraemonDemoCommonViewController : DoraemonDemoBaseViewController
 
 @end
 

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Crash/DoraemonDemoCrashViewController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2018 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import "DoraemonDemoBaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DoraemonDemoCrashViewController : DoraemonBaseViewController
+@interface DoraemonDemoCrashViewController : DoraemonDemoBaseViewController
 
 @end
 

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Home/DoraemonDemoHomeViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoHomeViewController : DoraemonBaseViewController
+@interface DoraemonDemoHomeViewController : DoraemonDemoBaseViewController
 
 @end

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Logger/DoraemonDemoLoggerViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoLoggerViewController : DoraemonBaseViewController
+@interface DoraemonDemoLoggerViewController : DoraemonDemoBaseViewController
 
 @end

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/MemoryLeak/DoraemonDemoMemoryLeakViewController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2019 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import "DoraemonDemoBaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DoraemonDemoMemoryLeakViewController : DoraemonBaseViewController
+@interface DoraemonDemoMemoryLeakViewController : DoraemonDemoBaseViewController
 
 @end
 

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/MockGPS/DoraemonDemoMockGPSViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoMockGPSViewController : DoraemonBaseViewController
+@interface DoraemonDemoMockGPSViewController : DoraemonDemoBaseViewController
 
 @end

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/DoraemonDemoNetViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonBaseViewController.h>
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoNetViewController : DoraemonBaseViewController
+@interface DoraemonDemoNetViewController : DoraemonDemoBaseViewController
 
 @end

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/Image/DoraemonDemoImageShowViewController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2019年 yixiang. All rights reserved.
 //
 
-#import "DoraemonBaseViewController.h"
+#import "DoraemonDemoBaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DoraemonDemoImageShowViewController : DoraemonBaseViewController
+@interface DoraemonDemoImageShowViewController : DoraemonDemoBaseViewController
 
 @property (nonatomic, strong) UIImage *image;
 

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/Image/DoraemonDemoImageViewController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2019年 yixiang. All rights reserved.
 //
 
-#import "DoraemonBaseViewController.h"
+#import "DoraemonDemoBaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DoraemonDemoImageViewController : DoraemonBaseViewController
+@interface DoraemonDemoImageViewController : DoraemonDemoBaseViewController
 
 @end
 

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonUIWebViewViewController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import "DoraemonBaseViewController.h"
+#import "DoraemonDemoBaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DoraemonUIWebViewViewController : DoraemonBaseViewController
+@interface DoraemonUIWebViewViewController : DoraemonDemoBaseViewController
 
 @end
 

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/WebView/DoraemonWKWebViewViewController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import "DoraemonBaseViewController.h"
+#import "DoraemonDemoBaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DoraemonWKWebViewViewController : DoraemonBaseViewController
+@interface DoraemonWKWebViewViewController : DoraemonDemoBaseViewController
 
 @end
 

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Performance/DoraemonDemoPerformanceViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoPerformanceViewController : DoraemonBaseViewController
+@interface DoraemonDemoPerformanceViewController : DoraemonDemoBaseViewController
 
 @end

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Sanbox/DoraemonDemoSanboxViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoSanboxViewController : DoraemonBaseViewController
+@interface DoraemonDemoSanboxViewController : DoraemonDemoBaseViewController
 
 @end

iOS/DoraemonKitDemo/DoraemonKitDemo/DemoVC/UI/DoraemonDemoUIViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonBaseViewController.h>
+#import "DoraemonDemoBaseViewController.h"
 
-@interface DoraemonDemoUIViewController : DoraemonBaseViewController
+@interface DoraemonDemoUIViewController : DoraemonDemoBaseViewController
 
 @end