Commit be71aab5 authored by zhu's avatar zhu

no message

parent 4a04cccf
...@@ -7,7 +7,12 @@ ...@@ -7,7 +7,12 @@
// //
#import "BaseViewController.h" #import "BaseViewController.h"
#import "LeftSubView.h"
#import "RightSubView.h"
#import "FootSubView.h"
@interface FollowHeartViewController : BaseViewController @interface FollowHeartViewController : BaseViewController<leftViewBtnClickdelegate>
@property (nonatomic,strong) LeftSubView *leftSubView;
@property (nonatomic,strong) RightSubView *rightSubView;
@property (nonatomic,strong) FootSubView *footSubView;
@end @end
...@@ -17,9 +17,96 @@ ...@@ -17,9 +17,96 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
self.view.backgroundColor = [UIColor redColor]; [self configSubView];
}
-(void)configSubView
{
UIImageView* imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"backView.png"]];
imageView.frame=CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height);
[self.view addSubview:imageView];
self.leftSubView=[[LeftSubView alloc]initWithFrame:CGRectMake(0, 0, 200, self.view.bounds.size.height-200)];
self.leftSubView.delegate=self;
[self.view addSubview:self.leftSubView];
self.rightSubView=[[RightSubView alloc]initWithFrame:CGRectMake(self.view.bounds.size.width-200, 0, 200, self.view.bounds.size.height-200)];
[self.view addSubview:self.rightSubView];
self.footSubView=[[FootSubView alloc]initWithFrame:CGRectMake(0, self.view.bounds.size.height-200, self.view.bounds.size.width, 200)];
[self.view addSubview:self.footSubView];
} }
#pragma leftsubView delegate
- (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button
{
switch (btnTag) {
case 100: //返回
{
[self.view removeFromSuperview];
}
break;
case 101: //购物车
{
}
break;
case 102: //分享
{
}
break;
case 103: //自定义场景
{
}
break;
case 104: //全屏
{
[self setViewAnimations:button];
}
break;
case 105: //帮助
{
}
break;
default:
break;
}
}
-(void)setViewAnimations:(UIButton *)sender
{
UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom];
btn.frame=sender.frame;
[btn setTitle:@"缩小" forState:UIControlStateNormal];
[btn addTarget:self action:@selector(resetViewDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:btn];
[UIView beginAnimations:nil context:nil];
[UIView setAnimationDelegate:self];
[UIView setAnimationDuration:1.0f];
self.leftSubView.frame=CGRectMake(-200, 0, 200, self.view.bounds.size.height-200);
self.rightSubView.frame=CGRectMake(self.view.bounds.size.width, 0, 200, self.view.bounds.size.height-200);
self.footSubView.frame=CGRectMake(0, self.view.bounds.size.height, self.view.bounds.size.width, 200);
btn.frame=CGRectMake(sender.frame.origin.x, 20, sender.frame.size.width, sender.frame.size.height);
[UIView commitAnimations];
}
-(void)resetViewDidSelected:(UIButton *)sender
{
[UIView beginAnimations:nil context:nil];
[UIView setAnimationDelegate:self];
[UIView setAnimationDuration:1.0f];
self.leftSubView.frame=CGRectMake(0, 0, 200, self.view.bounds.size.height-200);
self.rightSubView.frame=CGRectMake(self.view.bounds.size.width-200, 0, 200, self.view.bounds.size.height-200);
self.footSubView.frame=CGRectMake(0, self.view.bounds.size.height-200, self.view.bounds.size.width, 200);
sender.hidden=YES;
[UIView commitAnimations];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
//
// FootSubView.h
// Lighting
//
// Created by mac on 16/5/10.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface FootSubView : UIView
@end
//
// FootSubView.m
// Lighting
//
// Created by mac on 16/5/10.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "FootSubView.h"
@implementation FootSubView
- (instancetype)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame:frame]) {
[self initdata];
[self initSubView];
}
return self;
}
-(void)initdata
{
// 待接收
}
-(void)initSubView
{
UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom];
button.frame=CGRectMake(30, 50, 100, 60);
[button setTitle:@"场景" forState:UIControlStateNormal];
[button addTarget:self action:@selector(footBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button];
UIScrollView *scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(100, 0, self.frame.size.width-100, self.frame.size.height)];
[self addSubview:scrollView];
}
-(void)footBtnDidSelected:(UIButton *)sender
{
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
//
// LeftSubView.h
// Lighting
//
// Created by mac on 16/5/10.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@protocol leftViewBtnClickdelegate <NSObject>
@required
//回调
- (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button;
@end
@interface LeftSubView : UIView
@property (nonatomic,assign) id<leftViewBtnClickdelegate> delegate;
@property (nonatomic,strong)NSMutableArray *dataArray;
@end
//
// LeftSubView.m
// Lighting
//
// Created by mac on 16/5/10.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "LeftSubView.h"
@implementation LeftSubView
- (instancetype)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame:frame]) {
[self initdata];
[self initSubView];
}
return self;
}
-(void)initdata
{
self.dataArray=[[NSMutableArray alloc]initWithObjects:@"返回",@"购物车",@"分享",@"自定义场景",@"全屏",@"帮助", nil];
}
-(void)initSubView
{
for (int i=0; i<self.dataArray.count; i++) {
UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom];
button.tag=100+i;
button.frame=CGRectMake(30, 30+(60 +15)*i, 100, 60);
[button setTitle:[self.dataArray objectAtIndex:i] forState:UIControlStateNormal];
[button addTarget:self action:@selector(leftBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button];
}
}
-(void)leftBtnDidSelected:(UIButton *)sender
{
if ([self.delegate respondsToSelector:@selector(buttonClick:withButton:)]) {
[self.delegate buttonClick:sender.tag withButton:sender];
}
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#import "CustomTabbarController.h" #import "CustomTabbarController.h"
#import "AppDelegate.h" #import "AppDelegate.h"
#import "authenticateView.h" #import "authenticateView.h"
#import "FollowHeartViewController.h"
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
@property (nonatomic,strong) MMDrawerController *drawerController; @property (nonatomic,strong) MMDrawerController *drawerController;
@property (nonatomic,strong) CustomTabbarController *customtabbar; @property (nonatomic,strong) CustomTabbarController *customtabbar;
@property (nonatomic,strong) FollowHeartViewController *followHeartView;
/** /**
* 验证身份View * 验证身份View
...@@ -70,9 +72,7 @@ ...@@ -70,9 +72,7 @@
self.userNameLoginView.layer.masksToBounds = YES; self.userNameLoginView.layer.masksToBounds = YES;
self.userNameLoginView.layer.cornerRadius = 10; self.userNameLoginView.layer.cornerRadius = 10;
self.forgotPasswordButton.titleLabel.font = [UIFont boldSystemFontOfSize:16]; self.forgotPasswordButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
self.followHeartView=[[FollowHeartViewController alloc]init];
self.userName.text = @"sh1"; self.userName.text = @"sh1";
self.passWord.text = @"123456"; self.passWord.text = @"123456";
...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
#pragma mark -登陆 #pragma mark -登陆
- (IBAction)LoginButtonClick:(UIButton *)sender { - (IBAction)LoginButtonClick:(UIButton *)sender {
// 报错屏蔽登陆 // 报错屏蔽登陆
[self SetTheRootViewController]; // [self SetTheRootViewController];
return; // return;
if (self.userName.text.length == 0) { if (self.userName.text.length == 0) {
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
[self.drawerController setCloseDrawerGestureModeMask:MMCloseDrawerGestureModeAll]; [self.drawerController setCloseDrawerGestureModeMask:MMCloseDrawerGestureModeAll];
SHARED_APPDELEGATE.mmdrawer = self.drawerController; SHARED_APPDELEGATE.mmdrawer = self.drawerController;
SHARED_APPDELEGATE.window.rootViewController = self.drawerController; SHARED_APPDELEGATE.window.rootViewController = self.drawerController;
} }
...@@ -153,10 +154,11 @@ ...@@ -153,10 +154,11 @@
#pragma mark -RightVCselectedDelegate 方法 #pragma mark -RightVCselectedDelegate 方法
- (void)SelectedControllerWithIndex:(NSString *)Name - (void)SelectedControllerWithIndex:(NSString *)Name
{ {
NSInteger selectedIndex; NSInteger selectedIndex;
if ([Name isEqualToString:@"体验中心"]) { if ([Name isEqualToString:@"体验中心"]) {
[SHARED_APPDELEGATE.window.rootViewController.view addSubview:self.followHeartView.view];
selectedIndex = 6; // selectedIndex = 6;
}else if ([Name isEqualToString:@"场景库"]) }else if ([Name isEqualToString:@"场景库"])
{ {
...@@ -261,7 +263,7 @@ ...@@ -261,7 +263,7 @@
return; return;
} }
number --; number --;
[self.identityView.SendButton setTitle:[NSString stringWithFormat:@"%ld",number] forState:UIControlStateNormal]; [self.identityView.SendButton setTitle:[NSString stringWithFormat:@"%d",number] forState:UIControlStateNormal];
} }
......
//
// RightSubView.h
// Lighting
//
// Created by mac on 16/5/10.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface RightSubView : UIView
@end
//
// RightSubView.m
// Lighting
//
// Created by mac on 16/5/10.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "RightSubView.h"
@implementation RightSubView
- (instancetype)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame:frame]) {
[self initdata];
[self initSubView];
}
return self;
}
-(void)initdata
{
// 待接收
}
-(void)initSubView
{
UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom];
button.frame=CGRectMake(self.frame.size.width-150, self.frame.size.height-100, 100, 60);
[button setTitle:@"产品" forState:UIControlStateNormal];
[button addTarget:self action:@selector(rightBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button];
UIScrollView *scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height-100)];
[self addSubview:scrollView];
}
-(void)rightBtnDidSelected:(UIButton *)sender
{
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
...@@ -105,12 +105,15 @@ ...@@ -105,12 +105,15 @@
} }
}else }else
{ {
if (![[self.dataArray objectAtIndex_opple:indexPath.row]isEqualToString:@"体验中心"]) {
//收起右侧控制器 //收起右侧控制器
[SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:^(BOOL finished) { [SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:^(BOOL finished) {
[self recoveryCell]; [self recoveryCell];
}]; }];
}
if ([self.delegate respondsToSelector:@selector(SelectedControllerWithIndex:)]) { if ([self.delegate respondsToSelector:@selector(SelectedControllerWithIndex:)]) {
[self.delegate SelectedControllerWithIndex:[self.dataArray objectAtIndex_opple:indexPath.row]]; [self.delegate SelectedControllerWithIndex:[self.dataArray objectAtIndex_opple:indexPath.row]];
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{ {
NSLog(@"%ld",indexPath.item); NSLog(@"%d",indexPath.item);
} }
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0447085D1CD7C06B00555827 /* LoginViewController.m */; }; 0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0447085D1CD7C06B00555827 /* LoginViewController.m */; };
044708611CD7C1E800555827 /* MainSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 044708601CD7C1E800555827 /* MainSetViewController.m */; }; 044708611CD7C1E800555827 /* MainSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 044708601CD7C1E800555827 /* MainSetViewController.m */; };
04A14A211CE0F36300DAD5F3 /* backView.png in Resources */ = {isa = PBXBuildFile; fileRef = 04A14A201CE0F36300DAD5F3 /* backView.png */; };
04A14A251CE0FC3A00DAD5F3 /* LeftSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A241CE0FC3A00DAD5F3 /* LeftSubView.m */; };
04A14A281CE0FC5600DAD5F3 /* RightSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A271CE0FC5600DAD5F3 /* RightSubView.m */; };
04A14A2B1CE0FC7F00DAD5F3 /* FootSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */; };
2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; }; 2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; };
2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; }; 2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; };
2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; }; 2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; };
...@@ -92,6 +96,13 @@ ...@@ -92,6 +96,13 @@
0447085D1CD7C06B00555827 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 044708601CD7C1E800555827 /* MainSetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainSetViewController.m; sourceTree = "<group>"; };
04A14A201CE0F36300DAD5F3 /* backView.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = backView.png; sourceTree = "<group>"; };
04A14A231CE0FC3A00DAD5F3 /* LeftSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LeftSubView.h; sourceTree = "<group>"; };
04A14A241CE0FC3A00DAD5F3 /* LeftSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LeftSubView.m; sourceTree = "<group>"; };
04A14A261CE0FC5600DAD5F3 /* RightSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightSubView.h; sourceTree = "<group>"; };
04A14A271CE0FC5600DAD5F3 /* RightSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RightSubView.m; sourceTree = "<group>"; };
04A14A291CE0FC7F00DAD5F3 /* FootSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FootSubView.h; sourceTree = "<group>"; };
04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FootSubView.m; sourceTree = "<group>"; };
18E6D8479D48A4650167EAF2 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 18E6D8479D48A4650167EAF2 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientDetailsTableViewCell.h; 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>"; }; 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientDetailsTableViewCell.m; sourceTree = "<group>"; };
...@@ -284,6 +295,19 @@ ...@@ -284,6 +295,19 @@
path = Login; path = Login;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
04A14A221CE0FB8400DAD5F3 /* view */ = {
isa = PBXGroup;
children = (
04A14A231CE0FC3A00DAD5F3 /* LeftSubView.h */,
04A14A241CE0FC3A00DAD5F3 /* LeftSubView.m */,
04A14A261CE0FC5600DAD5F3 /* RightSubView.h */,
04A14A271CE0FC5600DAD5F3 /* RightSubView.m */,
04A14A291CE0FC7F00DAD5F3 /* FootSubView.h */,
04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */,
);
name = view;
sourceTree = "<group>";
};
2906B5D31CD8920F000849B4 /* Controller */ = { 2906B5D31CD8920F000849B4 /* Controller */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -552,6 +576,7 @@ ...@@ -552,6 +576,7 @@
29706DB81CD082990003C412 /* Info.plist */, 29706DB81CD082990003C412 /* Info.plist */,
29706DB01CD082990003C412 /* Lighting.xcdatamodeld */, 29706DB01CD082990003C412 /* Lighting.xcdatamodeld */,
29807C611CD20C2A00F111B8 /* Images.xcassets */, 29807C611CD20C2A00F111B8 /* Images.xcassets */,
04A14A201CE0F36300DAD5F3 /* backView.png */,
29706DA41CD082990003C412 /* Supporting Files */, 29706DA41CD082990003C412 /* Supporting Files */,
); );
path = Lighting; path = Lighting;
...@@ -668,6 +693,7 @@ ...@@ -668,6 +693,7 @@
29BB27691CD9DDF3009A0813 /* FollowHeartVC */ = { 29BB27691CD9DDF3009A0813 /* FollowHeartVC */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
04A14A221CE0FB8400DAD5F3 /* view */,
29BB276A1CD9DE74009A0813 /* FollowHeartViewController.h */, 29BB276A1CD9DE74009A0813 /* FollowHeartViewController.h */,
29BB276B1CD9DE74009A0813 /* FollowHeartViewController.m */, 29BB276B1CD9DE74009A0813 /* FollowHeartViewController.m */,
); );
...@@ -929,6 +955,7 @@ ...@@ -929,6 +955,7 @@
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
04A14A211CE0F36300DAD5F3 /* backView.png in Resources */,
29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */, 29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */,
2942F8A81CDD80CE005B377E /* authenticateView.xib in Resources */, 2942F8A81CDD80CE005B377E /* authenticateView.xib in Resources */,
29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */, 29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */,
...@@ -1005,6 +1032,7 @@ ...@@ -1005,6 +1032,7 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
04A14A281CE0FC5600DAD5F3 /* RightSubView.m in Sources */,
29EC331F1CE02AFA005F0C13 /* PopoverViewController.m in Sources */, 29EC331F1CE02AFA005F0C13 /* PopoverViewController.m in Sources */,
29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */, 29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */,
2928F8381CD09E730036D761 /* CustomButton.m in Sources */, 2928F8381CD09E730036D761 /* CustomButton.m in Sources */,
...@@ -1029,6 +1057,7 @@ ...@@ -1029,6 +1057,7 @@
29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */, 29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */,
29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */, 29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */,
29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */, 29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
04A14A2B1CE0FC7F00DAD5F3 /* FootSubView.m in Sources */,
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */, 2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */, 29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */,
299876361CD997F100C90D0A /* PersonInformationTableViewCell.m in Sources */, 299876361CD997F100C90D0A /* PersonInformationTableViewCell.m in Sources */,
...@@ -1041,6 +1070,7 @@ ...@@ -1041,6 +1070,7 @@
299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */, 299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */,
29EC331A1CE023D5005F0C13 /* ChangePasswordViewController.m in Sources */, 29EC331A1CE023D5005F0C13 /* ChangePasswordViewController.m in Sources */,
2962D07D1CD1E4490058829D /* NSArray+Objectwithindex.m in Sources */, 2962D07D1CD1E4490058829D /* NSArray+Objectwithindex.m in Sources */,
04A14A251CE0FC3A00DAD5F3 /* LeftSubView.m in Sources */,
299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */, 299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */,
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */, 2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */,
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */, 29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
......
...@@ -2837,7 +2837,7 @@ ...@@ -2837,7 +2837,7 @@
<color key="backgroundColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
</view> </view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="263" sectionHeaderHeight="28" sectionFooterHeight="28" id="SiR-rm-chD"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="263" sectionHeaderHeight="28" sectionFooterHeight="28" id="SiR-rm-chD">
<rect key="frame" x="23" y="128" width="721" height="876"/> <rect key="frame" x="6" y="128" width="721" height="876"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="0.0" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="0.0" colorSpace="calibratedRGB"/>
<prototypes> <prototypes>
......
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) = void (^completionHandler)(UIPrintInteractionController *, BOOL, NSError *) =
^(UIPrintInteractionController *pic, BOOL completed, NSError *error) { ^(UIPrintInteractionController *pic, BOOL completed, NSError *error) {
if (!completed && error) if (!completed && error)
NSLog(@"FAILED! due to error in domain %@ with error code %ld", NSLog(@"FAILED! due to error in domain %@ with error code %d",
error.domain, error.code); error.domain, error.code);
}; };
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
- (void)setInstructionsNumber:(NSInteger)instructionsNumber - (void)setInstructionsNumber:(NSInteger)instructionsNumber
{ {
_instructionsNumber = instructionsNumber; _instructionsNumber = instructionsNumber;
self.text = [NSString stringWithFormat:@"%ld",_instructionsNumber]; self.text = [NSString stringWithFormat:@"%d",_instructionsNumber];
} }
@end @end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment