Merge remote-tracking branch 'origin/master'

Lighting/Class/RightViewController.m

@@ -79,11 +79,17 @@
 #pragma mark -头部视图
 - (void)createHeaderview
 {
-    UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, RightWidth, 200)];
-    UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 80, 80)];
-    imageView.center = CGPointMake(RightWidth/2, 100);
-    imageView.image = TCImage(@"weibo");
-    [headerView addSubview:imageView];
+    UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, RightWidth, NavigationHeight)];
+    //UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(10, 13, 115, 35)];
+    //imageView.center = CGPointMake(RightWidth/2, 100);
+    //imageView.image = TCImage(@"欧");
+    //[headerView addSubview:imageView];
+    headerView.backgroundColor = [UIColor colorWithRed:61.0f/255.0f green:171.0f/255.0f blue:225.0f/255.0f alpha:1];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(RightWidth/4, 13, 115, 35)];
+    label.text = @"功能菜单";
+    label.font = [UIFont fontWithName:@"Helvetica" size:20.0];
+    [label setTextColor:[UIColor whiteColor]];
+    [headerView addSubview:label];
     self.rightTableview.tableHeaderView = headerView;
 }
 

Lighting/Podfile.lock

@@ -14,7 +14,7 @@ PODS:
   - AFNetworking/Serialization (3.1.0)
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
-  - IQKeyboardManager (4.0.2)
+  - IQKeyboardManager (4.0.3)
   - JSONModel (1.2.0)
   - Masonry (0.6.4)
   - MBProgressHUD (0.9.2)
@@ -32,9 +32,9 @@ PODS:
     - MMDrawerController/Core
   - MMDrawerController/Subclass (0.6.0):
     - MMDrawerController/Core
-  - SDWebImage (3.7.5):
-    - SDWebImage/Core (= 3.7.5)
-  - SDWebImage/Core (3.7.5)
+  - SDWebImage (3.7.6):
+    - SDWebImage/Core (= 3.7.6)
+  - SDWebImage/Core (3.7.6)
   - SVProgressHUD (2.0.3)
 
 DEPENDENCIES:
@@ -51,14 +51,14 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  IQKeyboardManager: 2341089c4ae25fa2fa82ce356a259fcd267dc6b6
+  IQKeyboardManager: be9695ffc5a52077deb4847608f338771022d6d1
   JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
   Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
-  SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
+  SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
   SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4
 
 COCOAPODS: 0.39.0