Commit 8e76f5ac authored by zhu's avatar zhu

no message

parent c8c2a756
...@@ -10,9 +10,13 @@ ...@@ -10,9 +10,13 @@
#import "LeftSubView.h" #import "LeftSubView.h"
#import "RightSubView.h" #import "RightSubView.h"
#import "FootSubView.h" #import "FootSubView.h"
#import "SeceneLibraryView.h"
#import "ProductLibraryView.h"
@interface FollowHeartViewController : BaseViewController<leftViewBtnClickdelegate> @interface FollowHeartViewController : BaseViewController<LeftViewBtnClickdelegate,RightViewBtnClickdelegate,FootViewBtnClickdelegate,UIGestureRecognizerDelegate>
@property (nonatomic,strong) LeftSubView *leftSubView; @property (nonatomic,strong) LeftSubView *leftSubView;
@property (nonatomic,strong) RightSubView *rightSubView; @property (nonatomic,strong) RightSubView *rightSubView;
@property (nonatomic,strong) FootSubView *footSubView; @property (nonatomic,strong) FootSubView *footSubView;
@property (nonatomic,strong) SeceneLibraryView *seceneLibraryView;
@property (nonatomic,strong) ProductLibraryView *productLibraryView;
@end @end
...@@ -23,16 +23,24 @@ ...@@ -23,16 +23,24 @@
-(void)configSubView -(void)configSubView
{ {
UIImageView* imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"backView.png"]]; UIImageView* imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"backView.png"]];
imageView.frame=CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height); imageView.frame=CGRectMake(0, 0, ScreenWidth, ScreenHeight);
[self.view addSubview:imageView]; [self.view addSubview:imageView];
self.leftSubView=[[LeftSubView alloc]initWithFrame:CGRectMake(0, 0, 200, self.view.bounds.size.height-200)]; self.leftSubView=[[LeftSubView alloc]initWithFrame:CGRectMake(0, 0, 200, ScreenHeight-200)];
self.leftSubView.delegate=self; self.leftSubView.delegate=self;
[self.view addSubview:self.leftSubView]; [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.rightSubView=[[RightSubView alloc]initWithFrame:CGRectMake(ScreenWidth-200, 0, 200, ScreenHeight-200)];
self.rightSubView.delegate=self;
[self.view addSubview:self.rightSubView]; [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.footSubView=[[FootSubView alloc]initWithFrame:CGRectMake(0, ScreenHeight-200, ScreenWidth, 200)];
self.footSubView.delegate=self;
[self.view addSubview:self.footSubView]; [self.view addSubview:self.footSubView];
//点击手势
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(DismissScreenView:)];
tap.delegate = self;
tap.cancelsTouchesInView = NO;
[[UIApplication sharedApplication].keyWindow addGestureRecognizer:tap];
} }
...@@ -70,6 +78,16 @@ ...@@ -70,6 +78,16 @@
case 105: //帮助 case 105: //帮助
{ {
}
break;
case 200: //场景
{
[self addSceneLibraryView];
}
break;
case 300: //产品
{
[self addProductLibraryView];
} }
break; break;
...@@ -89,9 +107,9 @@ ...@@ -89,9 +107,9 @@
[UIView beginAnimations:nil context:nil]; [UIView beginAnimations:nil context:nil];
[UIView setAnimationDelegate:self]; [UIView setAnimationDelegate:self];
[UIView setAnimationDuration:1.0f]; [UIView setAnimationDuration:1.0f];
self.leftSubView.frame=CGRectMake(-200, 0, 200, self.view.bounds.size.height-200); self.leftSubView.frame=CGRectMake(-200, 0, 200, ScreenHeight-200);
self.rightSubView.frame=CGRectMake(self.view.bounds.size.width, 0, 200, self.view.bounds.size.height-200); self.rightSubView.frame=CGRectMake(ScreenWidth, 0, 200, ScreenHeight-200);
self.footSubView.frame=CGRectMake(0, self.view.bounds.size.height, self.view.bounds.size.width, 200); self.footSubView.frame=CGRectMake(0, ScreenHeight, ScreenWidth, 200);
btn.frame=CGRectMake(sender.frame.origin.x, 20, sender.frame.size.width, sender.frame.size.height); btn.frame=CGRectMake(sender.frame.origin.x, 20, sender.frame.size.width, sender.frame.size.height);
[UIView commitAnimations]; [UIView commitAnimations];
} }
...@@ -100,19 +118,45 @@ ...@@ -100,19 +118,45 @@
[UIView beginAnimations:nil context:nil]; [UIView beginAnimations:nil context:nil];
[UIView setAnimationDelegate:self]; [UIView setAnimationDelegate:self];
[UIView setAnimationDuration:1.0f]; [UIView setAnimationDuration:1.0f];
self.leftSubView.frame=CGRectMake(0, 0, 200, self.view.bounds.size.height-200); self.leftSubView.frame=CGRectMake(0, 0, 200, ScreenHeight-200);
self.rightSubView.frame=CGRectMake(self.view.bounds.size.width-200, 0, 200, self.view.bounds.size.height-200); self.rightSubView.frame=CGRectMake(ScreenWidth-200, 0, 200, ScreenHeight-200);
self.footSubView.frame=CGRectMake(0, self.view.bounds.size.height-200, self.view.bounds.size.width, 200); self.footSubView.frame=CGRectMake(0, ScreenHeight-200, ScreenWidth, 200);
sender.hidden=YES; sender.hidden=YES;
[UIView commitAnimations]; [UIView commitAnimations];
} }
//添加场景
-(void)addSceneLibraryView
{
self.seceneLibraryView=[[SeceneLibraryView alloc]initWithFrame:CGRectMake(100, 50, ScreenWidth-200, ScreenHeight-200)];
[self.view addSubview:self.seceneLibraryView];
}
//添加产品
-(void)addProductLibraryView
{
self.productLibraryView=[[ProductLibraryView alloc]initWithFrame:CGRectMake(100, 50, ScreenWidth-200, ScreenHeight-200)];
[self.view addSubview:self.productLibraryView];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
} }
-(void)DismissScreenView:(UITapGestureRecognizer*)sender{
CGPoint point = [sender locationInView:self.view];
if (point.x<100 || point.x >ScreenWidth-100||point.y<50||point.y>ScreenHeight-150) {
if (self.seceneLibraryView) {
[self.seceneLibraryView removeFromSuperview];
}
if (self.productLibraryView) {
[self.productLibraryView removeFromSuperview];
}
}
}
/* /*
#pragma mark - Navigation #pragma mark - Navigation
......
...@@ -7,7 +7,18 @@ ...@@ -7,7 +7,18 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@protocol FootViewBtnClickdelegate <NSObject>
@required
//回调
- (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button;
@end
@interface FootSubView : UIView @interface FootSubView : UIView
@property (nonatomic,assign) id<FootViewBtnClickdelegate> delegate;
@property (nonatomic,strong)UIScrollView *scrollView;
@property (nonatomic,strong)NSMutableArray *dataArray;
@end @end
...@@ -21,22 +21,40 @@ ...@@ -21,22 +21,40 @@
-(void)initdata -(void)initdata
{ {
self.dataArray=[[NSMutableArray alloc]initWithObjects:@"1",@"2",@"3",nil];
// 待接收 // 待接收
} }
-(void)initSubView -(void)initSubView
{ {
UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom];
button.frame=CGRectMake(30, 50, 100, 60); button.frame=CGRectMake(30, 50, 60, 60);
[button setTitle:@"场景" forState:UIControlStateNormal]; [button setBackgroundImage:[UIImage imageNamed:@"场景"] forState:UIControlStateNormal];
button.tag=200;
[button addTarget:self action:@selector(footBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside]; [button addTarget:self action:@selector(footBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button]; [self addSubview:button];
UIScrollView *scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(100, 0, self.frame.size.width-100, self.frame.size.height)]; self.scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(100, 0, self.frame.size.width-100, self.frame.size.height)];
[self addSubview:scrollView]; // contentSize的y值为0表示在垂直方向上不做滚动
self.scrollView.contentSize = CGSizeMake((self.dataArray.count+1) * (100+10), 0);
for (int i=0; i<self.dataArray.count; i++) {
UIImageView *imageView = [[UIImageView alloc] init];
// 定义图片名,通过循环把所有的图片添加到scrollView中
NSString *imageName = [NSString stringWithFormat:@"backView" ];
imageView.frame = CGRectMake(i*(100+10), 30, 100, 100);
imageView.image = [UIImage imageNamed:imageName];
[self.scrollView addSubview:imageView];
}
// 禁用滚动条,只设置水平方向的滚动条即可,竖直方向的滚动范围是0,所以没必要设置
self.scrollView.showsHorizontalScrollIndicator = NO;
[self addSubview:self.scrollView];
} }
-(void)footBtnDidSelected:(UIButton *)sender -(void)footBtnDidSelected:(UIButton *)sender
{ {
if ([self.delegate respondsToSelector:@selector(buttonClick:withButton:)]) {
[self.delegate buttonClick:sender.tag withButton:sender];
}
} }
/* /*
// Only override drawRect: if you perform custom drawing. // Only override drawRect: if you perform custom drawing.
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@protocol leftViewBtnClickdelegate <NSObject> @protocol LeftViewBtnClickdelegate <NSObject>
@required @required
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
@end @end
@interface LeftSubView : UIView @interface LeftSubView : UIView
@property (nonatomic,assign) id<leftViewBtnClickdelegate> delegate; @property (nonatomic,assign) id<LeftViewBtnClickdelegate> delegate;
@property (nonatomic,strong)NSMutableArray *dataArray; @property (nonatomic,strong)NSMutableArray *dataArray;
@end @end
//
// ProductLibraryView.h
// Lighting
//
// Created by mac on 16/5/11.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ProductLibraryView : UIView
@end
//
// ProductLibraryView.m
// Lighting
//
// Created by mac on 16/5/11.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ProductLibraryView.h"
@implementation ProductLibraryView
- (instancetype)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame:frame]) {
self.backgroundColor=[UIColor redColor];
// [self initdata];
// [self initSubView];
}
return self;
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
...@@ -7,7 +7,16 @@ ...@@ -7,7 +7,16 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@protocol RightViewBtnClickdelegate <NSObject>
@required
@interface RightSubView : UIView //回调
- (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button;
@end
@interface RightSubView : UIView
@property (nonatomic,assign) id<RightViewBtnClickdelegate> delegate;
@property (nonatomic,strong)NSMutableArray *dataArray;
@property (nonatomic,strong)UIScrollView *scrollView;
@end @end
...@@ -20,22 +20,41 @@ ...@@ -20,22 +20,41 @@
} }
-(void)initdata -(void)initdata
{ {
self.dataArray=[[NSMutableArray alloc]initWithObjects:@"1",@"2",@"3",nil];
// 待接收 // 待接收
} }
-(void)initSubView -(void)initSubView
{ {
UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom];
button.frame=CGRectMake(self.frame.size.width-150, self.frame.size.height-100, 100, 60); button.frame=CGRectMake(self.frame.size.width-100, self.frame.size.height-100, 60, 60);
[button setTitle:@"产品" forState:UIControlStateNormal]; button.tag=300;
[button setBackgroundImage:[UIImage imageNamed:@"产品"] forState:UIControlStateNormal];
[button addTarget:self action:@selector(rightBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside]; [button addTarget:self action:@selector(rightBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button]; [self addSubview:button];
UIScrollView *scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height-100)]; self.scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height-100)];
[self addSubview:scrollView]; // contentSize的y值为0表示在垂直方向上不做滚动
self.scrollView.contentSize = CGSizeMake(0, (self.dataArray.count+1) * (100+10));
for (int i=0; i<self.dataArray.count; i++) {
UIImageView *imageView = [[UIImageView alloc] init];
// 定义图片名,通过循环把所有的图片添加到scrollView中
NSString *imageName = [NSString stringWithFormat:@"05产品库-详情_03" ];
imageView.frame = CGRectMake(80, 20+i*(100+10), 100, 100);
imageView.image = [UIImage imageNamed:imageName];
[self.scrollView addSubview:imageView];
}
// 禁用滚动条,只设置水平方向的滚动条即可,竖直方向的滚动范围是0,所以没必要设置
self.scrollView.showsVerticalScrollIndicator = NO;
[self addSubview:self.scrollView];
} }
-(void)rightBtnDidSelected:(UIButton *)sender -(void)rightBtnDidSelected:(UIButton *)sender
{ {
if ([self.delegate respondsToSelector:@selector(buttonClick:withButton:)]) {
[self.delegate buttonClick:sender.tag withButton:sender];
}
} }
/* /*
// Only override drawRect: if you perform custom drawing. // Only override drawRect: if you perform custom drawing.
......
//
// SeceneLibraryView.h
// Lighting
//
// Created by mac on 16/5/11.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface SeceneLibraryView : UIView
@end
//
// SeceneLibraryView.m
// Lighting
//
// Created by mac on 16/5/11.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SeceneLibraryView.h"
@implementation SeceneLibraryView
- (instancetype)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame:frame]) {
self.backgroundColor=[UIColor redColor];
// [self initdata];
[self initSubView];
}
return self;
}
-(void)initSubView
{
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
/* 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 */; }; 0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0470D6101CE2936000647F0F /* SeceneLibraryView.m */; };
0470D6141CE2938000647F0F /* ProductLibraryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0470D6131CE2938000647F0F /* ProductLibraryView.m */; };
04A14A251CE0FC3A00DAD5F3 /* LeftSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A241CE0FC3A00DAD5F3 /* LeftSubView.m */; }; 04A14A251CE0FC3A00DAD5F3 /* LeftSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A241CE0FC3A00DAD5F3 /* LeftSubView.m */; };
04A14A281CE0FC5600DAD5F3 /* RightSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A271CE0FC5600DAD5F3 /* RightSubView.m */; }; 04A14A281CE0FC5600DAD5F3 /* RightSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A271CE0FC5600DAD5F3 /* RightSubView.m */; };
04A14A2B1CE0FC7F00DAD5F3 /* FootSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */; }; 04A14A2B1CE0FC7F00DAD5F3 /* FootSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */; };
...@@ -101,7 +102,10 @@ ...@@ -101,7 +102,10 @@
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>"; }; 0470D60F1CE2936000647F0F /* SeceneLibraryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeceneLibraryView.h; sourceTree = "<group>"; };
0470D6101CE2936000647F0F /* SeceneLibraryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SeceneLibraryView.m; sourceTree = "<group>"; };
0470D6121CE2938000647F0F /* ProductLibraryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductLibraryView.h; sourceTree = "<group>"; };
0470D6131CE2938000647F0F /* ProductLibraryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductLibraryView.m; sourceTree = "<group>"; };
04A14A231CE0FC3A00DAD5F3 /* LeftSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LeftSubView.h; 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>"; }; 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>"; }; 04A14A261CE0FC5600DAD5F3 /* RightSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightSubView.h; sourceTree = "<group>"; };
...@@ -309,7 +313,18 @@ ...@@ -309,7 +313,18 @@
path = Login; path = Login;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
04A14A221CE0FB8400DAD5F3 /* view */ = { 0470D60E1CE292EF00647F0F /* subView */ = {
isa = PBXGroup;
children = (
0470D60F1CE2936000647F0F /* SeceneLibraryView.h */,
0470D6101CE2936000647F0F /* SeceneLibraryView.m */,
0470D6121CE2938000647F0F /* ProductLibraryView.h */,
0470D6131CE2938000647F0F /* ProductLibraryView.m */,
);
name = subView;
sourceTree = "<group>";
};
04A14A221CE0FB8400DAD5F3 /* views */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
04A14A231CE0FC3A00DAD5F3 /* LeftSubView.h */, 04A14A231CE0FC3A00DAD5F3 /* LeftSubView.h */,
...@@ -319,7 +334,7 @@ ...@@ -319,7 +334,7 @@
04A14A291CE0FC7F00DAD5F3 /* FootSubView.h */, 04A14A291CE0FC7F00DAD5F3 /* FootSubView.h */,
04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */, 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */,
); );
name = view; name = views;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
2906B5D31CD8920F000849B4 /* Controller */ = { 2906B5D31CD8920F000849B4 /* Controller */ = {
...@@ -594,7 +609,6 @@ ...@@ -594,7 +609,6 @@
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;
...@@ -715,7 +729,8 @@ ...@@ -715,7 +729,8 @@
29BB27691CD9DDF3009A0813 /* FollowHeartVC */ = { 29BB27691CD9DDF3009A0813 /* FollowHeartVC */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
04A14A221CE0FB8400DAD5F3 /* view */, 0470D60E1CE292EF00647F0F /* subView */,
04A14A221CE0FB8400DAD5F3 /* views */,
29BB276A1CD9DE74009A0813 /* FollowHeartViewController.h */, 29BB276A1CD9DE74009A0813 /* FollowHeartViewController.h */,
29BB276B1CD9DE74009A0813 /* FollowHeartViewController.m */, 29BB276B1CD9DE74009A0813 /* FollowHeartViewController.m */,
); );
...@@ -986,7 +1001,6 @@ ...@@ -986,7 +1001,6 @@
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 */,
...@@ -1070,6 +1084,7 @@ ...@@ -1070,6 +1084,7 @@
299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */, 299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */,
29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */, 29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */,
2928F8381CD09E730036D761 /* CustomButton.m in Sources */, 2928F8381CD09E730036D761 /* CustomButton.m in Sources */,
0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */,
2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */, 2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */,
293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */, 293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */,
29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */, 29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */,
...@@ -1119,6 +1134,7 @@ ...@@ -1119,6 +1134,7 @@
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */, 0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */,
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */, 2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */, 29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */,
0470D6141CE2938000647F0F /* ProductLibraryView.m in Sources */,
044708611CD7C1E800555827 /* MainSetViewController.m in Sources */, 044708611CD7C1E800555827 /* MainSetViewController.m in Sources */,
29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */, 29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */,
299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */, 299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */,
......
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "backView.png",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "10-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "10-副本@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "Folder.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Folder@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "Friends-Circle.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Friends-Circle@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "Trash.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Trash@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "bg.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bg@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "box.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "box@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "wechat.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "wechat@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "weibo.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "weibo@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "1.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "1@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "10.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "10@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "2.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "2@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "4.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "4@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "5.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "5@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "d.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "d@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "产品.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "产品@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "场景.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "场景@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "1-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "1-副本@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "10.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "10@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "4.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "4@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "5.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "5@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "d.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "d@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "产品.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "产品@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "场景.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "场景@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
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