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

Conflicts: Lighting/Lighting.xcodeproj/project.pbxproj

Merge branch 'master' of https://git.oschina.net/gomore/Opple-iOS
Conflicts: Lighting/Lighting.xcodeproj/project.pbxproj
0c96ada1 · zhu · 18cb3456 · d15e5991 · 0c96ada1 · 0c96ada1
Commit 0c96ada1 authored May 03, 2016 by zhu
13 changed files
--- a/Lighting/Class/ClientDetailsTableViewCell.h
+++ b/Lighting/Class/ClientDetailsTableViewCell.h
+//
+//  ClientDetailsTableViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/3.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+@interface ClientDetailsTableViewCell : UITableViewCell
+/**
+ *  商品图片
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *goodsImageview;
+/**
+ *  产品名称
+ */
+@property (weak, nonatomic) IBOutlet UILabel *goodsName;
+/**
+ *  产品吊牌价
+ */
+@property (weak, nonatomic) IBOutlet UILabel *goodsCraneQuotation;
+/**
+ *  产品规格
+ */
+@property (weak, nonatomic) IBOutlet UILabel *goodsSpecifications;
+/**
+ *  产品数量
+ */
+@property (weak, nonatomic) IBOutlet UILabel *goodsNumber;
+/**
+ *  小计
+ */
+@property (weak, nonatomic) IBOutlet UILabel *goodsPrice;
+@end
--- a/Lighting/Class/ClientDetailsTableViewCell.m
+++ b/Lighting/Class/ClientDetailsTableViewCell.m
+//
+//  ClientDetailsTableViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/3.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+#import "ClientDetailsTableViewCell.h"
+@implementation ClientDetailsTableViewCell
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+    // Configure the view for the selected state
+}
+@end
--- a/Lighting/Class/ClientViewController.m
+++ b/Lighting/Class/ClientViewController.m
@@ -8,6 +8,7 @@
 #import "ClientViewController.h"
 #import "InformationTableViewCell.h"
+#import "ClientdetailsViewController.h"
 @interface ClientViewController ()<UITableViewDelegate,UITableViewDataSource>
 @end
@@ -25,14 +26,13 @@
 - (void)uiConfigAction
 {
    self.informationTableview.delegate = self;
-    self.informationTableview.dataSource = self;
+    self.informationTableview.dataSource = self;    
-    self.informationTableview.tableFooterView = [UIView new];
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
    InformationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"information" forIndexPath:indexPath];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
    return cell;
 }
@@ -47,6 +47,13 @@
 }
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
+    [self.navigationController pushViewController:clientdetails animated:YES];
+}

--- a/Lighting/Class/ClientdetailsViewController.h
+++ b/Lighting/Class/ClientdetailsViewController.h
+//
+//  ClientdetailsViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/3.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+#import "BaseViewController.h"
+@interface ClientdetailsViewController : BaseViewController
+/**
+ *  购物袋
+ */
+@property (weak, nonatomic) IBOutlet UIButton *shoppingBagButton;
+/**
+ *  订单记录
+ */
+@property (weak, nonatomic) IBOutlet UIButton *orderRecordButton;
+/**
+ *  客户头像
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *customerHeader;
+/**
+ *  客户名称
+ */
+@property (weak, nonatomic) IBOutlet UILabel *customerName;
+/**
+ *  公司名称
+ */
+@property (weak, nonatomic) IBOutlet UILabel *companyName;
+/**
+ *  客户地址
+ */
+@property (weak, nonatomic) IBOutlet UILabel *customerLocation;
+/**
+ *  手机号码
+ */
+@property (weak, nonatomic) IBOutlet UILabel *customerPhoneNumber;
+/**
+ *  设为当前客户
+ */
+@property (weak, nonatomic) IBOutlet UIButton *setupButton;
+/**
+ *  购物袋、订单记录背景
+ */
+@property (weak, nonatomic) IBOutlet UIView *shoppingAndRecordBackview;
+@end
--- a/Lighting/Class/ClientdetailsViewController.m
+++ b/Lighting/Class/ClientdetailsViewController.m
+//
+//  ClientdetailsViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/3.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+#import "ClientdetailsViewController.h"
+#import "ClientDetailsTableViewCell.h"
+@interface ClientdetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
+/**
+ *  客户详情
+ */
+@property (weak, nonatomic) IBOutlet UITableView *ClientdetailsTableview;
+@end
+@implementation ClientdetailsViewController
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    [self uiConfigAction];
+}
+#pragma mark -UI
+- (void)uiConfigAction
+{
+    self.ClientdetailsTableview.delegate = self;
+    self.ClientdetailsTableview.dataSource = self;
+    //圆角
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    ClientDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ClientDetails" forIndexPath:indexPath];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    return cell;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 20;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 100;
+}
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+#pragma mark -设为当前的客户
+- (IBAction)SetupcurrentUserButtonClick:(UIButton *)sender {
+}
+#pragma mark -购物袋
+- (IBAction)ShoppingbagButtonClick:(UIButton *)sender {
+    sender.selected = !sender.selected;
+    sender.layer.masksToBounds = YES;
+    sender.layer.cornerRadius = 3;
+    sender.backgroundColor = [UIColor whiteColor];
+}
+#pragma mark -订单记录
+- (IBAction)OrderrecordButtonClick:(UIButton *)sender {
+    sender.selected = !sender.selected;
+    sender.backgroundColor = [UIColor whiteColor];
+}
+/*
+#pragma mark - Navigation
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+@end
--- a/Lighting/Class/Login/LoginViewController.m
+++ b/Lighting/Class/Login/LoginViewController.m
@@ -35,6 +35,7 @@
    [self.drawerController setCloseDrawerGestureModeMask:MMCloseDrawerGestureModeAll];
    SHARED_APPDELEGATE.mmdrawer = self.drawerController;
    SHARED_APPDELEGATE.window.rootViewController = self.drawerController;
 }

--- a/Lighting/Class/RightViewController.m
+++ b/Lighting/Class/RightViewController.m
@@ -7,7 +7,7 @@
 //
 #import "RightViewController.h"
+#import "AppDelegate.h"
 @interface RightViewController ()<UITableViewDataSource,UITableViewDelegate>
 @property (nonatomic,strong) UITableView *rightTableview;
@@ -76,6 +76,8 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
+    //收起右侧控制器
+    [SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:nil];
    switch (indexPath.row) {
        case 0:  //随心配

--- a/Lighting/Class/Tabbar/CustomTabbarController.m
+++ b/Lighting/Class/Tabbar/CustomTabbarController.m
@@ -71,7 +71,9 @@
    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
    ShoppingViewController *shoppingVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray firstObject]];
    ClientViewController *clientVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:1]];
-    NSArray *vcArray = [NSArray arrayWithObjects:clientVC,shoppingVC, nil];
+    UINavigationController *shoppingNav = [[UINavigationController alloc]initWithRootViewController:shoppingVC];
+    UINavigationController *clientNav = [[UINavigationController alloc]initWithRootViewController:clientVC];
+    NSArray *vcArray = [NSArray arrayWithObjects:clientNav,shoppingNav, nil];
    self.viewControllers = vcArray;
 }
@@ -82,20 +84,26 @@
    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;

--- a/Lighting/Class/Tabbar/Toolview.m
+++ b/Lighting/Class/Tabbar/Toolview.m
@@ -65,42 +65,43 @@
        [button setTitle:[titleArray objectAtIndex_opple:i-1] forState:UIControlStateNormal];
        button.tag = 100+i-1;
        [button addTarget:self action:@selector(ButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-        button.instructionsNumber = i;
+        if (i == 4) {
+          button.instructionsNumber = i;
+        }
        if (i==1) {
            [button setImage:TCImage(@"business") forState:UIControlStateNormal];
        }else
        {
            [button setImage:TCImage(@"qq") forState:UIControlStateNormal];
        }
        [self addSubview:button];
-        //创建下划线
-        if (i == 3) {
-            self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(button.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+9, 50, 1)];
-            _underlineView.backgroundColor = [UIColor redColor];
-            [self addSubview:self.underlineView];
-        }
    }
+//    //创建下划线
+//    CustomButton *button = (CustomButton *)[self viewWithTag:102];
+//    self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(button.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+9, 50, 1)];
+//    _underlineView.backgroundColor = [UIColor redColor];
+//    [self addSubview:self.underlineView];
 }
 #pragma mark -按钮事件响应
 - (void)ButtonClick:(UIButton *)button
 {
-    //下划线动画
+//    //下划线动画
-    [UIView animateWithDuration:0.2 animations:^{
+//    [UIView animateWithDuration:0.2 animations:^{
+//        
-        self.underlineView.frame = CGRectMake(button.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+9, 50, 1);
+//        CGRect frame = self.underlineView.frame;
+//        frame.origin.x = button.frame.origin.x+(ButtonWIDTH-50)/2;
-    }];
+//        self.underlineView.frame = frame;
+//    }];
    //点击代理
    if ([self.delegate respondsToSelector:@selector(ButtonClickAction:)]) {
-      [self.delegate ButtonClickAction:button.tag];
+        [self.delegate ButtonClickAction:button.tag];
    }
 }

--- a/Lighting/Lighting.xcodeproj/project.pbxproj
+++ b/Lighting/Lighting.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0447085D1CD7C06B00555827 /* LoginViewController.m */; };
 		044708611CD7C1E800555827 /* MainSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 044708601CD7C1E800555827 /* MainSetViewController.m */; };
+		2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; };
 		2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; };
 		2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; };
 		2928F8381CD09E730036D761 /* CustomButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8371CD09E730036D761 /* CustomButton.m */; };
@@ -40,6 +41,7 @@
 		29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; };
 		29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29807C611CD20C2A00F111B8 /* Images.xcassets */; };
 		29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */; };
+		29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */; };
 		745C665EA695DD3EC6271ADE /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC80D439AC474587DD59064 /* libPods.a */; };
 /* End PBXBuildFile section */
@@ -48,6 +50,8 @@
 		0447085D1CD7C06B00555827 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		0447085F1CD7C1E800555827 /* MainSetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainSetViewController.h; sourceTree = "<group>"; };
 		044708601CD7C1E800555827 /* MainSetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainSetViewController.m; sourceTree = "<group>"; };
+		2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientDetailsTableViewCell.h; sourceTree = "<group>"; };
+		2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientDetailsTableViewCell.m; sourceTree = "<group>"; };
 		2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
 		2928F7E51CD087FE0036D761 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
 		2928F7E61CD087FE0036D761 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
@@ -98,6 +102,8 @@
 		29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		29807C611CD20C2A00F111B8 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; };
+		29A8D3961CD85A58004D558F /* ClientdetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientdetailsViewController.h; sourceTree = "<group>"; };
+		29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientdetailsViewController.m; sourceTree = "<group>"; };
 		CA5ED00287EA4EE622158E3C /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		D537F80EFAB9298B3ADA241A /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 		DDC80D439AC474587DD59064 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -157,6 +163,24 @@
 			path = Login;
 			sourceTree = "<group>";
 		};
+		2906B5D31CD8920F000849B4 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				29A8D3961CD85A58004D558F /* ClientdetailsViewController.h */,
+				29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */,
+			);
+			name = Controller;
+			sourceTree = "<group>";
+		};
+		2906B5D41CD89220000849B4 /* view */ = {
+			isa = PBXGroup;
+			children = (
+				2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */,
+				2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */,
+			);
+			name = view;
+			sourceTree = "<group>";
+		};
 		2928F7DD1CD085430036D761 /* Class */ = {
 			isa = PBXGroup;
 			children = (
@@ -306,6 +330,7 @@
 		2962D06A1CD1A3FE0058829D /* MyClient */ = {
 			isa = PBXGroup;
 			children = (
+				29A8D3951CD85A3C004D558F /* Clientdetails */,
 				2949BABA1CD2EF800049385A /* view */,
 				29807C661CD20F3100F111B8 /* Controller */,
 			);
@@ -401,6 +426,15 @@
 			name = Controller;
 			sourceTree = "<group>";
 		};
+		29A8D3951CD85A3C004D558F /* Clientdetails */ = {
+			isa = PBXGroup;
+			children = (
+				2906B5D41CD89220000849B4 /* view */,
+				2906B5D31CD8920F000849B4 /* Controller */,
+			);
+			name = Clientdetails;
+			sourceTree = "<group>";
+		};
 		4333C4B25549A396FC0CD944 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -569,7 +603,9 @@
 				2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
 				293393591CD3563C000D997B /* CustomerdetailsController.m in Sources */,
 				044708611CD7C1E800555827 /* MainSetViewController.m in Sources */,
+				2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */,
 				2962D06D1CD1A43A0058829D /* ClientViewController.m in Sources */,
+				29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/Lighting/Lighting/StoryboardwithCYX.storyboard
+++ b/Lighting/Lighting/StoryboardwithCYX.storyboard
--- a/Lighting/Tools/CustomButton.m
+++ b/Lighting/Tools/CustomButton.m
@@ -63,7 +63,7 @@
 - (CGRect)titleRectForContentRect:(CGRect)contentRect
 {
-    return CGRectMake(2, 33, WIDTH, 20);
+    return CGRectMake(0, 33, WIDTH, 20);
 }

--- a/Lighting/Tools/PrefixHeader.pch
+++ b/Lighting/Tools/PrefixHeader.pch
@@ -91,7 +91,10 @@
 */
 #define BROKEN @"-1"
+/**
+ *  主题蓝色
+ */
+#define kMainColor [UIColor colorWithRed:89/255.0 green:172/255.0 blue:220/255.0 alpha:1.0]