Merge branch 'dev'

Author: CoderMikeHe

.gitignore

@@ -64,6 +64,9 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
+*.DS_Store
+
+.DS_Store
 
 *.DS_Store
 */.DS_Store

MHDevelopExample/MHDevelopExample.xcodeproj/project.pbxproj

@@ -203,6 +203,7 @@
 		DE24934121C54DD2007FE714 /* MHHorizontalMode0Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = DE24934021C54DD2007FE714 /* MHHorizontalMode0Controller.m */; };
 		DE24934621C54FAB007FE714 /* MHHorizontalGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = DE24934521C54FAB007FE714 /* MHHorizontalGroup.m */; };
 		DE24934921C5505E007FE714 /* MHHorizontal.m in Sources */ = {isa = PBXBuildFile; fileRef = DE24934821C5505E007FE714 /* MHHorizontal.m */; };
+		DEA1616024A21C8A0054E718 /* MHRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEA1615F24A21C8A0054E718 /* MHRootViewController.m */; };
 		DEFB0BDA21D5081400BF1561 /* MHHorizontalMode0LinkageController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFB0BD921D5081400BF1561 /* MHHorizontalMode0LinkageController.m */; };
 		DEFB0BDD21D508AB00BF1561 /* MHHorizontalMode1LinkageController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFB0BDC21D508AB00BF1561 /* MHHorizontalMode1LinkageController.m */; };
 		DEFB0BE021D5091F00BF1561 /* MHHorizontalMode2Linkage0Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFB0BDF21D5091F00BF1561 /* MHHorizontalMode2Linkage0Controller.m */; };
@@ -744,6 +745,8 @@
 		DE24934521C54FAB007FE714 /* MHHorizontalGroup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MHHorizontalGroup.m; sourceTree = "<group>"; };
 		DE24934721C5505E007FE714 /* MHHorizontal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MHHorizontal.h; sourceTree = "<group>"; };
 		DE24934821C5505E007FE714 /* MHHorizontal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MHHorizontal.m; sourceTree = "<group>"; };
+		DEA1615E24A21C8A0054E718 /* MHRootViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MHRootViewController.h; sourceTree = "<group>"; };
+		DEA1615F24A21C8A0054E718 /* MHRootViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MHRootViewController.m; sourceTree = "<group>"; };
 		DEFB0BD821D5081400BF1561 /* MHHorizontalMode0LinkageController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MHHorizontalMode0LinkageController.h; sourceTree = "<group>"; };
 		DEFB0BD921D5081400BF1561 /* MHHorizontalMode0LinkageController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MHHorizontalMode0LinkageController.m; sourceTree = "<group>"; };
 		DEFB0BDB21D508AB00BF1561 /* MHHorizontalMode1LinkageController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MHHorizontalMode1LinkageController.h; sourceTree = "<group>"; };
@@ -2362,8 +2365,8 @@
 			children = (
 				627A95191E4968E0004A1ED2 /* AppDelegate.h */,
 				627A951A1E4968E0004A1ED2 /* AppDelegate.m */,
-				627A951C1E4968E0004A1ED2 /* MHExampleController.h */,
-				627A951D1E4968E0004A1ED2 /* MHExampleController.m */,
+				DEA1615E24A21C8A0054E718 /* MHRootViewController.h */,
+				DEA1615F24A21C8A0054E718 /* MHRootViewController.m */,
 				627A95491E496C3F004A1ED2 /* Classes */,
 				E92CC2DB20B3EE96003938F7 /* Architecture */,
 				627A95621E497824004A1ED2 /* Assets.xcassets */,
@@ -2404,6 +2407,8 @@
 		627A95491E496C3F004A1ED2 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				627A951C1E4968E0004A1ED2 /* MHExampleController.h */,
+				627A951D1E4968E0004A1ED2 /* MHExampleController.m */,
 				DE24933C21C54B44007FE714 /* Horizontal */,
 				DE045E5321C1518000DC9032 /* BaseClass */,
 				260D8D6C1EED37CB00B47B3D /* MVC&MVVM */,
@@ -3903,6 +3908,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -4491,6 +4497,7 @@
 				627A951B1E4968E0004A1ED2 /* AppDelegate.m in Sources */,
 				260C2DFE1EF1315900378885 /* SULoginController1.m in Sources */,
 				E92F2FC420C794FD002070C3 /* CMHExample05ViewController.m in Sources */,
+				DEA1616024A21C8A0054E718 /* MHRootViewController.m in Sources */,
 				E929D85420CA8753001F833E /* CMHExample11ViewController.m in Sources */,
 				DE049DAF21D27BA600B812C8 /* MHHorizontalMode2Cell0.m in Sources */,
 				E9263E8B20CEC245003C8C69 /* XLCard.m in Sources */,

MHDevelopExample/MHDevelopExample/AppDelegate.m

@@ -10,15 +10,12 @@
 #import "MHNavigationController.h"
 #import "MHExampleController.h"
 #import "CMHHomePageViewController.h"
+#import "MHRootViewController.h"
 
 #if defined(DEBUG)||defined(_DEBUG)
 #import "JPFPSStatus.h"
 #endif
 
-/// 1 -- 进入基于MVC设计模式的基类设计
-/// 0 -- 进入常用的开发Demo
-#define CMHDEBUG 0
-
 @interface AppDelegate ()
 /// 用户数据 只读
 @property (nonatomic, readwrite, strong) MHAccount *account;
@@ -43,19 +40,18 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     /// 初始化UI之前配置
     [self _configureApplication:application initialParamsBeforeInitUI:launchOptions];
-
+    
 
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor = [UIColor whiteColor];
 
-#if CMHDEBUG
-    self.window.rootViewController = [[CMHHomePageViewController alloc] initWithParams:nil];
-#else
-    self.window.rootViewController = [[MHNavigationController alloc] initWithRootViewController:[[MHExampleController alloc] init]];
-#endif
+    self.window.rootViewController = [[MHNavigationController alloc] initWithRootViewController:[[MHRootViewController alloc] init]];
 
     [self.window makeKeyAndVisible];
-
+    
+    /// 初始化UI后配置
+    [self _configureApplication:application initialParamsAfterInitUI:launchOptions];
+    
 #if defined(DEBUG)||defined(_DEBUG)
     [self _configDebugModelTools];
 #endif
@@ -90,7 +86,7 @@ - (void)_configureKeyboardManager {
 - (void)_configureYYWebImage {
     /// CoderMikeHe Fixed Bug : 解决 SDWebImage & YYWebImage 加载不出http://img3.imgtn.bdimg.com/it/u=965183317,1784857244&fm=27&gp=0.jpg的BUG
     NSMutableDictionary *header = [YYWebImageManager sharedManager].headers.mutableCopy;
-    header[@"User-Agent"] = @"iPhone"; 
+    header[@"User-Agent"] = @"iPhone";
     [YYWebImageManager sharedManager].headers = header;
 }
 
@@ -100,4 +96,38 @@ - (void)_configDebugModelTools{
     [[JPFPSStatus sharedInstance] open];
 
 }
+
+#pragma mark - 在初始化UI之后配置
+- (void)_configureApplication:(UIApplication *)application initialParamsAfterInitUI:(NSDictionary *)launchOptions
+{
+    @weakify(self);
+    /// 监听切换根控制器的通知
+    [[MHNotificationCenter rac_addObserverForName:MHSwitchRootViewControllerNotification object:nil] subscribeNext:^(NSNotification * note) {
+        /// 这里切换根控制器
+        @strongify(self);
+        MHSwitchToRootType type = [note.userInfo[MHSwitchRootViewControllerUserInfoKey] integerValue];
+        switch (type) {
+            case MHSwitchToRootTypeDefault:
+            {
+                /// 根控制器
+                self.window.rootViewController = [[MHNavigationController alloc] initWithRootViewController:[[MHRootViewController alloc] init]];
+            }
+                break;
+            case MHSwitchToRootTypeModule:
+            {
+                /// 切换到常用功能模块
+                self.window.rootViewController = [[MHNavigationController alloc] initWithRootViewController:[[MHExampleController alloc] init]];
+            }
+                break;
+            case MHSwitchToRootTypeArchitecture:
+            {
+                /// mvc 基本结构
+                self.window.rootViewController = [[CMHHomePageViewController alloc] initWithParams:nil];
+            }
+                break;
+            default:
+                break;
+        }
+    }];
+}
 @end

MHDevelopExample/MHDevelopExample/Architecture/BaseClass/ViewController/CMHNavigationController.m

@@ -79,17 +79,13 @@ + (void) _setupNavigationBarTheme{
     // 设置导航栏的样式
     [appearance setBarStyle:UIBarStyleDefault];
     //设置导航栏文字按钮的渲染色
-    [appearance setTintColor:[UIColor whiteColor]];
-    // 设置导航栏的背景渲染色
-    // 设置导航栏的背景渲染色
-    CGFloat rgb = 0.1;
-    [appearance setBarTintColor:[UIColor colorWithRed:rgb green:rgb blue:rgb alpha:0.65]];
+    [appearance setTintColor:MHColorFromHexString(@"#181818")];
     // 设置导航栏的背景渲染色或背景图片
     //    [appearance setBackgroundImage:[UIImage imageNamed:@"NavBackGround"] forBarMetrics:UIBarMetricsDefault];
     // 设置文字属性
     NSMutableDictionary *textAttrs = [NSMutableDictionary dictionary];
     textAttrs[NSFontAttributeName] = MHMediumFont(18);
-    textAttrs[NSForegroundColorAttributeName] = MHColorFromHexString(@"#FFFFFF");
+    textAttrs[NSForegroundColorAttributeName] = MHColorFromHexString(@"#181818");
 
     // UIOffsetZero是结构体, 只要包装成NSValue对象, 才能放进字典\数组中
     NSShadow *shadow = [[NSShadow alloc] init];
@@ -99,7 +95,6 @@ + (void) _setupNavigationBarTheme{
 
     /// 去掉导航栏的阴影图片
     [appearance setShadowImage:[UIImage new]];
-    
 }
 
 /**
@@ -115,7 +110,7 @@ + (void)_setupBarButtonItemTheme{
     /**设置文字属性**/
     // 设置普通状态的文字属性
     NSMutableDictionary *textAttrs = [NSMutableDictionary dictionary];
-    textAttrs[NSForegroundColorAttributeName] = MHColorFromHexString(@"#FFFFFF");
+    textAttrs[NSForegroundColorAttributeName] = MHColorFromHexString(@"#181818");
     textAttrs[NSFontAttributeName] = MHRegularFont(fontSize);
     NSShadow *shadow = [[NSShadow alloc] init];
     shadow.shadowOffset =  CGSizeZero;
@@ -125,12 +120,12 @@ + (void)_setupBarButtonItemTheme{
 
     // 设置高亮状态的文字属性
     NSMutableDictionary *highTextAttrs = [NSMutableDictionary dictionaryWithDictionary:textAttrs];
-    highTextAttrs[NSForegroundColorAttributeName] = [MHColorFromHexString(@"#FFFFFF") colorWithAlphaComponent:.5f];
+    highTextAttrs[NSForegroundColorAttributeName] = [MHColorFromHexString(@"#181818") colorWithAlphaComponent:.5f];
     [appearance setTitleTextAttributes:highTextAttrs forState:UIControlStateHighlighted];
 
     // 设置不可用状态(disable)的文字属性
     NSMutableDictionary *disableTextAttrs = [NSMutableDictionary dictionaryWithDictionary:textAttrs];
-    disableTextAttrs[NSForegroundColorAttributeName] = [MHColorFromHexString(@"#FFFFFF") colorWithAlphaComponent:.5f];
+    disableTextAttrs[NSForegroundColorAttributeName] = [MHColorFromHexString(@"#181818") colorWithAlphaComponent:.5f];
     [appearance setTitleTextAttributes:disableTextAttrs forState:UIControlStateDisabled];
 }
 
@@ -170,7 +165,8 @@ - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)ani
         [viewController.navigationItem setHidesBackButton:YES];
 
         // 4.这里可以设置导航栏的左右按钮 统一管理方法
-        viewController.navigationItem.leftBarButtonItem = [UIBarButtonItem mh_backItemWithTitle:@"返回" imageName:@"barbuttonicon_back_15x30" target:self action:@selector(_backItemDidClicked)];
+        UIBarButtonItem *backItem = [UIBarButtonItem mh_itemWithImageName:@"navigationButtonReturn" highImageName:@"navigationButtonReturnClick" target:self action:@selector(_backItemDidClicked)];
+        viewController.navigationItem.leftBarButtonItem = backItem;
     }
 
     // push

MHDevelopExample/MHDevelopExample/Architecture/BaseClass/ViewController/CMHViewController.m

@@ -203,7 +203,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {return U
 
 #pragma mark - Status bar
 - (BOOL)prefersStatusBarHidden { return NO; }
-- (UIStatusBarStyle)preferredStatusBarStyle { return UIStatusBarStyleLightContent; }
+- (UIStatusBarStyle)preferredStatusBarStyle { return UIStatusBarStyleDefault; }
 - (UIStatusBarAnimation)preferredStatusBarUpdateAnimation { return UIStatusBarAnimationFade; }
 
 

MHDevelopExample/MHDevelopExample/Architecture/BaseClass/ViewController/CMHWebViewController.m

@@ -452,7 +452,14 @@ - (UIProgressView *)progressView {
 
 - (UIBarButtonItem *)backItem{
     if (_backItem == nil) {
-        _backItem = [UIBarButtonItem mh_backItemWithTitle:@"返回" imageName:@"barbuttonicon_back_15x30" target:self action:@selector(_backItemDidClicked)];
+        /// 添加按钮
+        UIButton *button = [[UIButton alloc] init];
+        [button setImage:[UIImage imageNamed:@"navigationButtonReturn"] forState:UIControlStateNormal];
+        [button setImage:[UIImage imageNamed:@"navigationButtonReturnClick"] forState:UIControlStateHighlighted];
+        button.frame = CGRectMake(0, 0, 15, 44);
+        // 监听按钮点击
+        [button addTarget:self action:@selector(_backItemDidClicked) forControlEvents:UIControlEventTouchUpInside];
+        _backItem = [[UIBarButtonItem alloc] initWithCustomView:button];
     }
     return _backItem;
 }

MHDevelopExample/MHDevelopExample/Architecture/Contacts/FileUpload/Model/CMHSource.m

@@ -252,7 +252,6 @@ - (void)commitSource:(void (^)(BOOL))complete{
 
             /// 资源中的文件绑定文件ID
             file.fileId = fileId;
-            
             /// 文件块
             CMHFileBlock *fileBlcok = [[CMHFileBlock alloc] initFileBlcokAtPath:file.filePath fileId:fileId sourceId:self.sourceId];
             [fileBlocks addObject:fileBlcok];

MHDevelopExample/MHDevelopExample/Architecture/Macros/CMHConstEnum.h

@@ -17,4 +17,11 @@ typedef NS_ENUM(NSUInteger, CMHTabBarItemTagType) {
     CMHTabBarItemTagTypeProfile,          /// 我的
 };
 
+
+typedef NS_ENUM(NSUInteger, MHSwitchToRootType) {
+    MHSwitchToRootTypeDefault = 0,        /// 默认
+    MHSwitchToRootTypeModule,             /// 常用开发模块
+    MHSwitchToRootTypeArchitecture,       /// mvc基本架构
+};
+
 #endif /* CMHConstEnum_h */

MHDevelopExample/MHDevelopExample/Architecture/MainFrame/MainFrame/CMHMainFrameViewController.m

@@ -169,8 +169,9 @@ - (void)_profileBtnDidClciked:(UIButton *)sender{
 
 
 #pragma mark - 事件处理
-- (void)_addMore{
-
+- (void)_goHome{
+    /// 发通知
+    [MHNotificationCenter postNotificationName:MHSwitchRootViewControllerNotification object:nil userInfo:@{MHSwitchRootViewControllerUserInfoKey: @(MHSwitchToRootTypeDefault)}];
 }
 
 #pragma mark - UITableViewDelegate
@@ -236,7 +237,14 @@ - (void)_setupNavigationItem{
     self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:self.profileBtn];
 
     /// 添加按钮
-    self.navigationItem.rightBarButtonItem = [UIBarButtonItem mh_systemItemWithTitle:nil titleColor:nil imageName:@"barbuttonicon_add_30x30" target:self selector:@selector(_addMore) textType:NO];
+    UIButton *button = [[UIButton alloc] init];
+    [button setImage:[UIImage imageNamed:@"tabbar_home"] forState:UIControlStateNormal];
+    [button setImage:[UIImage imageNamed:@"tabbar_home_selected"] forState:UIControlStateHighlighted];
+    button.frame = CGRectMake(0, 0, 43, 44);
+    // 监听按钮点击
+    [button addTarget:self action:@selector(_goHome) forControlEvents:UIControlEventTouchUpInside];
+    UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithCustomView:button];
+    self.navigationItem.rightBarButtonItem = item;
 }
 
 #pragma mark - 设置子控件

MHDevelopExample/MHDevelopExample/Architecture/Profile/Profile/CMHProfileViewController.m

@@ -48,7 +48,7 @@ - (void)configure{
 
     /// PS: 这里笔者就 统一用 CMHWebViewController , 但是现实中，大多数是 CMHWebViewController 的子类，这里介绍 CMHWebViewController.h 提供的属性的场景
     /// 现实中，你只要组合笔者提供的属性，就会达到满足不同的开发场景，当然你有好的点子，也可以联系笔者哦
-    NSString *requestUrl = @"http://192.168.1.200:8080";//CMHMyBlogHomepageUrl;
+    NSString *requestUrl = CMHMyBlogHomepageUrl;
 
     @weakify(self);