diff --git a/Lighting/Class/Login/LoginViewController.m b/Lighting/Class/Login/LoginViewController.m
index 82b1f28abb338973c4d599e1a74450b284b39fdc..05d68b371e3f289a212bed5b11afd72e8d83e556 100644
--- a/Lighting/Class/Login/LoginViewController.m
+++ b/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;
}
diff --git a/Lighting/Class/Tabbar/CustomTabbarController.m b/Lighting/Class/Tabbar/CustomTabbarController.m
index 278b746be4561c79b7059ecdea65fe6759edc484..859b61c448b001ae64eee8c9eb1e3644070ce6d8 100644
--- a/Lighting/Class/Tabbar/CustomTabbarController.m
+++ b/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;
}
}
diff --git a/Lighting/Class/Tabbar/Toolview.m b/Lighting/Class/Tabbar/Toolview.m
index 907be62115d0e5971e09749376e59d14fc082d5b..372f590b69abdd5672b02a14a1d3c414d9271881 100644
--- a/Lighting/Class/Tabbar/Toolview.m
+++ b/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];
diff --git a/Lighting/Lighting.xcodeproj/project.pbxproj b/Lighting/Lighting.xcodeproj/project.pbxproj
index 93d61d3737f8069f8364cb886ce89708b6a938a5..9e1ef079c03260c3479b35a7f732fc3552f932df 100644
--- a/Lighting/Lighting.xcodeproj/project.pbxproj
+++ b/Lighting/Lighting.xcodeproj/project.pbxproj
@@ -452,7 +452,6 @@
TargetAttributes = {
29706DA01CD082980003C412 = {
CreatedOnToolsVersion = 7.3;
- DevelopmentTeam = 3AM4Q5VACM;
};
};
};
diff --git a/Lighting/Lighting/Base.lproj/Main.storyboard b/Lighting/Lighting/Base.lproj/Main.storyboard
index cbf6b59708834c63ebee0cc7e573f302bf420580..359e673f0ae967b84c19d793ee851fc146b40e25 100644
--- a/Lighting/Lighting/Base.lproj/Main.storyboard
+++ b/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>
diff --git a/Lighting/Lighting/Info.plist b/Lighting/Lighting/Info.plist
index ec12b6e54c120b21d1005f0c215cc7ae8c2f17f9..cfe35b3e63dddeeeed5e59b1c65ced0ee3050d71 100644
--- a/Lighting/Lighting/Info.plist
+++ b/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>
diff --git a/Lighting/Lighting/StoryboardwithCYX.storyboard b/Lighting/Lighting/StoryboardwithCYX.storyboard
index 49302be0c59d13d55b866bdfc242554860fd1a02..f5d5b663dee04ef92e1217b011d51bc1c764568e 100644
--- a/Lighting/Lighting/StoryboardwithCYX.storyboard
+++ b/Lighting/Lighting/StoryboardwithCYX.storyboard
@@ -22,10 +22,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="information" rowHeight="100" id="enD-yh-8KO" customClass="InformationTableViewCell">
- <rect key="frame" x="0.0" y="28" width="721" height="100"/>
+ <rect key="frame" x="0.0" y="92" width="721" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="enD-yh-8KO" id="NjH-im-dR0">
- <rect key="frame" x="0.0" y="0.0" width="721" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="721" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" id="1EH-hQ-lSU">
@@ -36,35 +36,35 @@
<rect key="frame" x="109" y="14" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="è”系电è¯:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="27w-yD-aSe">
<rect key="frame" x="109" y="40" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最近到访时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aVW-C6-c91">
<rect key="frame" x="109" y="68" width="90" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="æœåŠ¡å¯¼è´:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X1q-3T-uhp">
<rect key="frame" x="374" y="14" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户地å€:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pbo-bz-S5a">
<rect key="frame" x="374" y="40" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="Mhf-SN-2iQ">
@@ -140,21 +140,21 @@
<rect key="frame" x="136" y="17" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å…¬å¸å称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cBJ-A3-P3N">
<rect key="frame" x="136" y="55" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户地å€" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VOM-UB-gxi">
<rect key="frame" x="136" y="93" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="b7A-ZK-29E">
@@ -169,7 +169,7 @@
<rect key="frame" x="376" y="18" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="RkM-wZ-Ve3">
@@ -251,21 +251,21 @@
<rect key="frame" x="150" y="15" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å…¬å¸å称：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f6T-Ra-icS">
<rect key="frame" x="150" y="44" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户地å€ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UrF-fO-arP">
<rect key="frame" x="150" y="72" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="qXu-CL-F1I">
@@ -280,7 +280,7 @@
<rect key="frame" x="437" y="15" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4Qj-el-I8t">
@@ -393,7 +393,7 @@
<rect key="frame" x="0.0" y="28" width="717" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
- <rect key="frame" x="0.0" y="0.0" width="717" height="79"/>
+ <rect key="frame" x="0.0" y="0.0" width="717" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">