Merge branch 'master' of https://git.oschina.net/gomore/Opple-iOS

Lighting/Class/Login/LoginViewController.m

@@ -33,6 +33,7 @@
     [self.drawerController setMaximumRightDrawerWidth:RightWidth];
     [self.drawerController setOpenDrawerGestureModeMask:MMOpenDrawerGestureModeAll];
     [self.drawerController setCloseDrawerGestureModeMask:MMCloseDrawerGestureModeAll];
+    SHARED_APPDELEGATE.mmdrawer = self.drawerController;
     SHARED_APPDELEGATE.window.rootViewController = self.drawerController;
 }
 

Lighting/Class/Tabbar/CustomTabbarController.m

@@ -9,6 +9,7 @@
 
 #import "CustomTabbarController.h"
 #import "Toolview.h"
+#import "AppDelegate.h"
 
 @interface CustomTabbarController ()<TabbarButtonClickdelegate>
 
@@ -78,13 +79,31 @@
 #pragma amrk -TabbarButtonClickdelegate代理
 - (void)ButtonClickAction:(NSInteger)Buttontag
 {
-    if (Buttontag == 101) {
-        
-        self.selectedIndex = 0;
-        
-    }else if (Buttontag == 102){
-     
-        self.selectedIndex = 1;
+    
+    switch (Buttontag) {
+            
+            //
+        case 100:
+            
+            [SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:nil];
+            
+            break;
+        case 101:
+            
+            break;
+        case 102:
+            
+            self.selectedIndex = 0;
+            
+            break;
+        case 103:
+            
+             self.selectedIndex = 1;
+            
+            break;
+            
+        default:
+            break;
     }
 }
 

Lighting/Class/Tabbar/Toolview.m

@@ -75,7 +75,7 @@
         
         [self addSubview:button];
         //创建下划线
-        if (i == 2) {
+        if (i == 3) {
             
             self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(button.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+9, 50, 1)];
             _underlineView.backgroundColor = [UIColor redColor];

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -452,7 +452,6 @@
 				TargetAttributes = {
 					29706DA01CD082980003C412 = {
 						CreatedOnToolsVersion = 7.3;
-						DevelopmentTeam = 3AM4Q5VACM;
 					};
 				};
 			};

Lighting/Lighting/Base.lproj/Main.storyboard

@@ -12,6 +12,10 @@
                         <rect key="frame" x="0.0" y="0.0" width="507" height="768"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="CQr-RC-S14">
+                                <rect key="frame" x="0.0" y="0.0" width="507" height="768"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            </imageView>
                             <view contentMode="scaleToFill" id="4F7-r1-Ukj">
                                 <rect key="frame" x="79" y="228" width="350" height="311"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
@@ -59,10 +63,6 @@
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </view>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="CQr-RC-S14">
-                                <rect key="frame" x="0.0" y="0.0" width="507" height="768"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            </imageView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>

Lighting/Lighting/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.cntaiping.life.text</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>