Skip to content

O
Opple-iOS
Commit 7a9a4c75 authored by mei's avatar mei
Browse files
Options

各个界面优化 及购物车添加更改 商品更改 场景更改

parent 479abba0
Hide whitespace changes
Inline Side-by-side
Showing with 848 additions and 318 deletions
Lighting/Class/CameraView.h
View file @ 7a9a4c75
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
//回调 //回调
- (void)addCustomPictureImage:(UIImage *)image ; - (void)addCustomPictureImage:(UIImage *)image ;
- (void)restCamerBtnImage;
@end @end
......
Lighting/Class/CameraView.m
View file @ 7a9a4c75
...@@ -157,6 +157,9 @@ ...@@ -157,6 +157,9 @@
-(void)DismissScreenView -(void)DismissScreenView
{ {
if (self) { if (self) {
if ([self.delegate respondsToSelector:@selector(restCamerBtnImage)]) {
[self.delegate restCamerBtnImage];
}
[self.view removeFromSuperview]; [self.view removeFromSuperview];
} }
} }
...@@ -166,6 +169,9 @@ ...@@ -166,6 +169,9 @@
if (point.x<self.subView.frame.origin.x || point.x >self.subView.frame.origin.x+self.subView.frame.size.width||point.y<self.subView.frame.origin.y||point.y>self.subView.frame.origin.y+self.subView.frame.size.height) { if (point.x<self.subView.frame.origin.x || point.x >self.subView.frame.origin.x+self.subView.frame.size.width||point.y<self.subView.frame.origin.y||point.y>self.subView.frame.origin.y+self.subView.frame.size.height) {
if (self) { if (self) {
if ([self.delegate respondsToSelector:@selector(restCamerBtnImage)]) {
[self.delegate restCamerBtnImage];
}
[self.view removeFromSuperview]; [self.view removeFromSuperview];
} }
} }
......
Lighting/Class/FollowHeartViewController.h
View file @ 7a9a4c75
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#import "ShoppingView.h" #import "ShoppingView.h"
#import "ShareViewController.h" #import "ShareViewController.h"
#import "CameraView.h" #import "CameraView.h"
#import "HelpViewController.h"
@protocol FollowHeartViewAddpicturedelegate <NSObject> @protocol FollowHeartViewAddpicturedelegate <NSObject>
@required @required
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
@end @end
@interface FollowHeartViewController : BaseViewController<LeftViewBtnClickdelegate,RightViewBtnClickdelegate,FootViewBtnClickdelegate,UIGestureRecognizerDelegate,AddSecenePicturedelegate,AddProductPicturedelegate,SharePicturedelegate,AddCustomPicturedelegate> @interface FollowHeartViewController : BaseViewController<LeftViewBtnClickdelegate,RightViewBtnClickdelegate,FootViewBtnClickdelegate,UIGestureRecognizerDelegate,AddSecenePicturedelegate,AddProductPicturedelegate,SharePicturedelegate,AddCustomPicturedelegate,Shoppingdelegate>
@property (nonatomic,assign) id<FollowHeartViewAddpicturedelegate> delegate; @property (nonatomic,assign) id<FollowHeartViewAddpicturedelegate> delegate;
@property (nonatomic,strong) LeftSubView *leftSubView; @property (nonatomic,strong) LeftSubView *leftSubView;
@property (nonatomic,strong) RightSubView *rightSubView; @property (nonatomic,strong) RightSubView *rightSubView;
...@@ -33,6 +34,7 @@ ...@@ -33,6 +34,7 @@
@property (nonatomic,strong) ProductLibraryView *productLibraryView; @property (nonatomic,strong) ProductLibraryView *productLibraryView;
@property (nonatomic,strong) ShoppingView *shoppingView; @property (nonatomic,strong) ShoppingView *shoppingView;
@property (nonatomic,strong) CameraView *cameraView; @property (nonatomic,strong) CameraView *cameraView;
@property (nonatomic,strong) HelpViewController *helpView;
@property (nonatomic,strong) UIImageView *backGroundImageView; @property (nonatomic,strong) UIImageView *backGroundImageView;
@property (nonatomic,strong) UIButton *zoomButton; @property (nonatomic,strong) UIButton *zoomButton;
@property (nonatomic,strong) UIButton *temporaryBtn; @property (nonatomic,strong) UIButton *temporaryBtn;
......
Lighting/Class/FollowHeartViewController.m
View file @ 7a9a4c75
...@@ -74,16 +74,24 @@ ...@@ -74,16 +74,24 @@
break; break;
case 105: //帮助 case 105: //帮助
{ {
[self addHelpView:button];
} }
break; break;
case 200: //场景 case 200: //场景
{ {
if (!self.footSubView.isSelected) {
[self.footSubView.selectBtn setBackgroundImage:[UIImage imageNamed:@"场景1"] forState:UIControlStateNormal];
self.footSubView.isSelected=YES;
}
[self addSceneLibraryView]; [self addSceneLibraryView];
} }
break; break;
case 300: //产品 case 300: //产品
{ {
if (!self.rightSubView.isSelected) {
[self.rightSubView.selectBtn setBackgroundImage:[UIImage imageNamed:@"产品1"] forState:UIControlStateNormal];
self.rightSubView.isSelected=YES;
}
[self addProductLibraryView]; [self addProductLibraryView];
} }
break; break;
...@@ -95,6 +103,7 @@ ...@@ -95,6 +103,7 @@
} }
-(void)addShareView:(UIButton *)sender -(void)addShareView:(UIButton *)sender
{ {
[self.leftSubView.shareBtn setBackgroundImage:[UIImage imageNamed:@"selectShare"] forState:UIControlStateNormal];
ShareViewController *shareVC = [[ShareViewController alloc]init]; ShareViewController *shareVC = [[ShareViewController alloc]init];
shareVC.delegate = self; shareVC.delegate = self;
shareVC.preferredContentSize = CGSizeMake(280, 150); shareVC.preferredContentSize = CGSizeMake(280, 150);
...@@ -110,6 +119,7 @@ ...@@ -110,6 +119,7 @@
//添加自定义场景 //添加自定义场景
-(void)addCameraView:(UIButton *)sender -(void)addCameraView:(UIButton *)sender
{ {
[self.leftSubView.camerBtn setBackgroundImage:[UIImage imageNamed:@"selectCamer"] forState:UIControlStateNormal];
self.cameraView=[[CameraView alloc]init]; self.cameraView=[[CameraView alloc]init];
self.cameraView.view.backgroundColor=[UIColor clearColor]; self.cameraView.view.backgroundColor=[UIColor clearColor];
self.cameraView.delegate=self; self.cameraView.delegate=self;
...@@ -129,7 +139,8 @@ ...@@ -129,7 +139,8 @@
//添加产品图 //添加产品图
- (void)resetSubProductImage:(UIImage*)image productModel:(NSMutableArray *)productModel - (void)resetSubProductImage:(UIImage*)image productModel:(NSMutableArray *)productModel
{ {
ImageCropperView *cropper=[[ImageCropperView alloc]initWithFrame:CGRectMake(400, 300, 300, 300)]; self.productModelArray=productModel;
ImageCropperView *cropper=[[ImageCropperView alloc]initWithFrame:CGRectMake(400, 200, 300, 225)];
cropper.image = image; cropper.image = image;
[self.view addSubview:cropper]; [self.view addSubview:cropper];
} }
...@@ -152,7 +163,7 @@ ...@@ -152,7 +163,7 @@
//全屏 //全屏
-(void)setViewAnimations:(UIButton *)sender -(void)setViewAnimations:(UIButton *)sender
{ {
self.zoomButton=sender; self.zoomButton=self.leftSubView.fullViewBtn;
self.zoomButton.hidden=YES; self.zoomButton.hidden=YES;
self.temporaryBtn=[UIButton buttonWithType:UIButtonTypeCustom]; self.temporaryBtn=[UIButton buttonWithType:UIButtonTypeCustom];
self.temporaryBtn.frame=sender.frame; self.temporaryBtn.frame=sender.frame;
...@@ -169,6 +180,15 @@ ...@@ -169,6 +180,15 @@
self.temporaryBtn.frame=CGRectMake(sender.frame.origin.x, 20, sender.frame.size.width, sender.frame.size.height); self.temporaryBtn.frame=CGRectMake(sender.frame.origin.x, 20, sender.frame.size.width, sender.frame.size.height);
[UIView commitAnimations]; [UIView commitAnimations];
} }
-(void)addHelpView:(UIButton *)btn
{
self.helpView=[[HelpViewController alloc]init];
self.helpView.view.backgroundColor=[UIColor clearColor];
// self.helpView.delegate=self;
[self.view addSubview:self.helpView.view];
}
-(void)resetViewDidSelected:(UIButton *)sender -(void)resetViewDidSelected:(UIButton *)sender
{ {
[sender setBackgroundImage:[UIImage imageNamed:@"quanping"] forState:UIControlStateNormal]; [sender setBackgroundImage:[UIImage imageNamed:@"quanping"] forState:UIControlStateNormal];
...@@ -208,10 +228,11 @@ ...@@ -208,10 +228,11 @@
//添加购物车 //添加购物车
-(void)addShoppingView -(void)addShoppingView
{ {
[self.leftSubView.shoppingBtn setBackgroundImage:[UIImage imageNamed:@"selectshoping"] forState:UIControlStateNormal];
self.shoppingView=[[ShoppingView alloc]init]; self.shoppingView=[[ShoppingView alloc]init];
self.shoppingView.view.backgroundColor=[UIColor clearColor]; self.shoppingView.view.backgroundColor=[UIColor clearColor];
self.shoppingView.productModelArray=self.productModelArray; self.shoppingView.productModelArray=self.productModelArray;
// self.shoppingView.delegate=self; self.shoppingView.delegate=self;
[self.view addSubview:self.shoppingView.view]; [self.view addSubview:self.shoppingView.view];
} }
...@@ -220,6 +241,7 @@ ...@@ -220,6 +241,7 @@
-(void)savePhoto -(void)savePhoto
{ {
[self setViewAnimations:self.leftSubView.fullViewBtn];
UIImage * image = [self captureImageFromView:self.view]; UIImage * image = [self captureImageFromView:self.view];
[self saveImageToPhotos:image]; [self saveImageToPhotos:image];
...@@ -281,6 +303,35 @@ ...@@ -281,6 +303,35 @@
return image; return image;
} }
//重置场景图标
- (void)restSeceneBtnImage
{
if (self.footSubView.isSelected) {
[self.footSubView.selectBtn setBackgroundImage:[UIImage imageNamed:@"场景2"] forState:UIControlStateNormal];
self.footSubView.isSelected=NO;
}
[self.seceneLibraryView.view removeFromSuperview];
}
//重置产品图标
- (void)restProductBtnImage
{
if (self.rightSubView.isSelected) {
[self.rightSubView.selectBtn setBackgroundImage:[UIImage imageNamed:@"产品2"] forState:UIControlStateNormal];
self.rightSubView.isSelected=NO;
}
[self.productLibraryView.view removeFromSuperview];
}
//购物
- (void)restShoppingBtnImage
{
[self.leftSubView.shoppingBtn setBackgroundImage:[UIImage imageNamed:@"gouwuche"] forState:UIControlStateNormal];
}
//重置相机图片
- (void)restCamerBtnImage
{
[self.leftSubView.camerBtn setBackgroundImage:[UIImage imageNamed:@"customchangjing"] forState:UIControlStateNormal];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
...@@ -288,7 +339,6 @@ ...@@ -288,7 +339,6 @@
} }
/* /*
#pragma mark - Navigation #pragma mark - Navigation
......
Lighting/Class/FootSubView.h
View file @ 7a9a4c75
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
@property (nonatomic,assign) id<FootViewBtnClickdelegate> delegate; @property (nonatomic,assign) id<FootViewBtnClickdelegate> delegate;
@property (nonatomic,strong)UIScrollView *scrollView; @property (nonatomic,strong)UIScrollView *scrollView;
@property (nonatomic,strong)NSMutableArray *dataArray; @property (nonatomic,strong)NSMutableArray *dataArray;
@property (nonatomic,assign)BOOL isSelected;
@property (nonatomic,strong)UIButton *selectBtn;
-(void)addFootSubViewImage:(UIImage*)image; -(void)addFootSubViewImage:(UIImage*)image;
@end @end
Lighting/Class/FootSubView.m
View file @ 7a9a4c75
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
-(void)initdata -(void)initdata
{ {
NSString *imageName = [NSString stringWithFormat:@"backView" ]; // NSString *imageName = [NSString stringWithFormat:@"backView" ];
UIImage *image=[UIImage imageNamed:imageName]; // UIImage *image=[UIImage imageNamed:imageName];
self.dataArray=[[NSMutableArray alloc]initWithObjects:image,image,image,nil]; self.dataArray=[[NSMutableArray alloc]init];
// 待接收 // 待接收
} }
-(void)initSubView -(void)initSubView
{ {
UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom]; self.selectBtn=[UIButton buttonWithType:UIButtonTypeCustom];
button.frame=CGRectMake(30, 50, 60, 60); self.selectBtn.frame=CGRectMake(30, 50, 60, 60);
[button setBackgroundImage:[UIImage imageNamed:@"场景1"] forState:UIControlStateNormal]; [self.selectBtn setBackgroundImage:[UIImage imageNamed:@"场景2"] forState:UIControlStateNormal];
button.tag=200; self.selectBtn.tag=200;
[button addTarget:self action:@selector(footBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside]; [self.selectBtn addTarget:self action:@selector(footBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button]; [self addSubview:self.selectBtn];
self.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)];
// 禁用滚动条，只设置水平方向的滚动条即可，竖直方向的滚动范围是0，所以没必要设置 // 禁用滚动条，只设置水平方向的滚动条即可，竖直方向的滚动范围是0，所以没必要设置
self.scrollView.showsHorizontalScrollIndicator = NO; self.scrollView.showsHorizontalScrollIndicator = NO;
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
[self.scrollView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; [self.scrollView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
self.scrollView.contentSize = CGSizeMake((self.dataArray.count+1) * (100+10), 0); self.scrollView.contentSize = CGSizeMake((self.dataArray.count+1) * (100+10), 0);
for (int i=0; i<self.dataArray.count; i++) { for (int i=0; i<self.dataArray.count; i++) {
UIButton *button=[[UIButton alloc]initWithFrame:CGRectMake(i*(100+10), 30, 100, 100)]; UIButton *button=[[UIButton alloc]initWithFrame:CGRectMake(i*(125+10), 30, 125, 100)];
UIImage *image=[self.dataArray objectAtIndex:i]; UIImage *image=[self.dataArray objectAtIndex:i];
[button setImage:image forState:UIControlStateNormal]; [button setImage:image forState:UIControlStateNormal];
button.tag=100+i; button.tag=100+i;
......
Lighting/Class/HelpViewController.h 0 → 100644
View file @ 7a9a4c75
//
// HelpViewController.h
// Lighting
//
// Created by mac on 16/5/30.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface HelpViewController : BaseViewController<UIGestureRecognizerDelegate>
@end
Lighting/Class/HelpViewController.m 0 → 100644
View file @ 7a9a4c75
//
// HelpViewController.m
// Lighting
//
// Created by mac on 16/5/30.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "HelpViewController.h"
@interface HelpViewController ()
@end
@implementation HelpViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
[self initView];
}
-(void)initView
{
//点击手势
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(DismissScreenView:)];
tap.delegate = self;
tap.cancelsTouchesInView = NO;
[[UIApplication sharedApplication].keyWindow addGestureRecognizer:tap];
}
//取消当前页面点击手势
-(void)DismissScreenView:(UITapGestureRecognizer*)sender{
// CGPoint point = [sender locationInView:self.view];
if (self) {
[self.view removeFromSuperview];
}
}
@end
Lighting/Class/LeftSubView.h
View file @ 7a9a4c75
...@@ -19,4 +19,12 @@ ...@@ -19,4 +19,12 @@
@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;
@property (nonatomic,strong)NSMutableArray *helpArray;
@property (nonatomic,strong)UIButton *fanHuiBtn;//返回
@property (nonatomic,strong)UIButton *shoppingBtn;//购物车
@property (nonatomic,strong)UIButton *shareBtn;//分享
@property (nonatomic,strong)UIButton *camerBtn;//自定义场景
@property (nonatomic,strong)UIButton *fullViewBtn;//全屏
@property (nonatomic,strong)UIButton *helpBtn;//帮助
@end @end
Lighting/Class/LeftSubView.m
View file @ 7a9a4c75
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
-(void)initdata -(void)initdata
{ {
self.dataArray=[[NSMutableArray alloc]initWithObjects:@"返回",@"购物车",@"分享",@"自定义场景",@"全屏",@"帮助", nil]; self.dataArray=[[NSMutableArray alloc]initWithObjects:@"返回",@"购物车",@"分享",@"自定义场景",@"全屏",@"帮助", nil];
self.helpArray=[[NSMutableArray alloc]initWithObjects:@"返回",@"添加至购物袋",@"分享方案",@"自定义场景",@"全屏",@"帮助", nil];
} }
-(void)initSubView -(void)initSubView
{ {
...@@ -29,30 +30,42 @@ ...@@ -29,30 +30,42 @@
button.tag=100+i; button.tag=100+i;
button.frame=CGRectMake(30, 30+(60 +15)*i, 60, 60); button.frame=CGRectMake(30, 30+(60 +15)*i, 60, 60);
[button addTarget:self action:@selector(leftBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside]; [button addTarget:self action:@selector(leftBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
switch (i) { switch (i) {
case 0: case 0:
{
[button setBackgroundImage:[UIImage imageNamed:@"reBackBtn"] forState:UIControlStateNormal]; [button setBackgroundImage:[UIImage imageNamed:@"reBackBtn"] forState:UIControlStateNormal];
self.fanHuiBtn=button;//返回
// UIView *view=[[UIView alloc]initWithFrame:CGRectMake(100, 30+(60 +15)*i+10, 100, 40)];
// view.backgroundColor=[UIColor whiteColor];
// UILabel *lable=
// [self addSubview:view];
}
break; break;
case 1: case 1:
[button setBackgroundImage:[UIImage imageNamed:@"gouwuche"] forState:UIControlStateNormal]; [button setBackgroundImage:[UIImage imageNamed:@"gouwuche"] forState:UIControlStateNormal];
self.shoppingBtn=button;//购物车
break; break;
case 2: case 2:
[button setBackgroundImage:[UIImage imageNamed:@"fenxiang"] forState:UIControlStateNormal]; [button setBackgroundImage:[UIImage imageNamed:@"fenxiang"] forState:UIControlStateNormal];
self.shareBtn=button;//分享
break; break;
case 3: case 3:
[button setBackgroundImage:[UIImage imageNamed:@"customchangjing"] forState:UIControlStateNormal]; [button setBackgroundImage:[UIImage imageNamed:@"customchangjing"] forState:UIControlStateNormal];
self.camerBtn=button;//自定义场景
break; break;
case 4: case 4:
[button setBackgroundImage:[UIImage imageNamed:@"quanping"] forState:UIControlStateNormal]; [button setBackgroundImage:[UIImage imageNamed:@"quanping"] forState:UIControlStateNormal];
self.fullViewBtn=button;//全屏
break; break;
case 5: case 5:
[button setBackgroundImage:[UIImage imageNamed:@"bangzhu"] forState:UIControlStateNormal]; [button setBackgroundImage:[UIImage imageNamed:@"bangzhu"] forState:UIControlStateNormal];
self.helpBtn=button;//帮助
break; break;
default: default:
...@@ -68,6 +81,7 @@ ...@@ -68,6 +81,7 @@
[self.delegate buttonClick:sender.tag withButton:sender]; [self.delegate buttonClick:sender.tag withButton:sender];
} }
} }
/* /*
// Only override drawRect: if you perform custom drawing. // Only override drawRect: if you perform custom drawing.
......
Lighting/Class/ProductCollectionPictureCell.h
View file @ 7a9a4c75
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
@property (strong, nonatomic) UILabel *productDesce; @property (strong, nonatomic) UILabel *productDesce;
@property (strong, nonatomic) TOGoodsEntity *productModel; @property (strong, nonatomic) TOGoodsEntity *productModel;
@property (strong, nonatomic) UIView *subView;
......
Lighting/Class/ProductCollectionPictureCell.m
View file @ 7a9a4c75
...@@ -12,22 +12,33 @@ ...@@ -12,22 +12,33 @@
-(id)initWithFrame:(CGRect)frame{ -(id)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame]; self = [super initWithFrame:frame];
if (self) { if (self) {
self.backgroundColor=[UIColor whiteColor];
self.productImageView =[[UIImageView alloc]initWithFrame:CGRectMake(0, 0, frame.size.width, 2*frame.size.height/3)]; self.productImageView =[[UIImageView alloc]initWithFrame:CGRectMake(0, 0, frame.size.width, 2*frame.size.height/3)];
[self addSubview:self.productImageView]; [self addSubview:self.productImageView];
self.subView=[[UIView alloc]initWithFrame:CGRectMake(0, 2*frame.size.height/3, frame.size.width, frame.size.height/3)];
[self.subView setBackgroundColor:[UIColor whiteColor]];
[self addSubview:self.subView];
// 产品描述 // 产品描述
self.productDesce=[[UILabel alloc]initWithFrame:CGRectMake(0,2*frame.size.height/3, frame.size.width, frame.size.height/6)]; self.productDesce=[[UILabel alloc]initWithFrame:CGRectMake(0,0, frame.size.width, frame.size.height/9)];
self.productDesce.text=@"名称描述"; self.productDesce.text=@"名称描述";
self.productDesce.textColor=[UIColor grayColor];
self.productDesce.font=[UIFont systemFontOfSize:12];
self.productDesce.textAlignment=NSTextAlignmentCenter; self.productDesce.textAlignment=NSTextAlignmentCenter;
[self addSubview: self.productDesce]; [self.subView addSubview: self.productDesce];
// 产品参数 // 产品参数
self.productParameter=[[UILabel alloc]initWithFrame:CGRectMake(0, 2*frame.size.height/3+ frame.size.height/6, frame.size.width, frame.size.height/6)]; self.productParameter=[[UILabel alloc]initWithFrame:CGRectMake(0, frame.size.height/9, frame.size.width, frame.size.height/9)];
self.productParameter.textAlignment=NSTextAlignmentCenter; self.productParameter.textAlignment=NSTextAlignmentCenter;
[self addSubview: self.productParameter]; self.productParameter.textColor=[UIColor grayColor];
self.productParameter.font=[UIFont systemFontOfSize:12];
[self.subView addSubview: self.productParameter];
// 产品价格 // 产品价格
self.productPrice=[[UILabel alloc]initWithFrame:CGRectMake(0, 2*frame.size.height/3+ 2*frame.size.height/6, frame.size.width, frame.size.height/6)]; self.productPrice=[[UILabel alloc]initWithFrame:CGRectMake(0, 2*frame.size.height/9,frame.size.width, frame.size.height/9)];
self.productPrice.textColor=[UIColor grayColor];
self.productPrice.font=[UIFont systemFontOfSize:12];
self.productPrice.textAlignment=NSTextAlignmentCenter; self.productPrice.textAlignment=NSTextAlignmentCenter;
[self addSubview: self.productPrice]; [self.subView addSubview: self.productPrice];
self.productModel=[[TOGoodsEntity alloc]init]; self.productModel=[[TOGoodsEntity alloc]init];
} }
return self; return self;
......
Lighting/Class/ProductLibraryView.h
View file @ 7a9a4c75
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
//回调 //回调
- (void)addProductImage:(UIImage *)image productModel:(TOGoodsEntity*)productModel; - (void)addProductImage:(UIImage *)image productModel:(TOGoodsEntity*)productModel;
- (void)restProductBtnImage;
@end @end
...@@ -44,6 +45,23 @@ UICollectionViewDelegate,UICollectionViewDelegateFlowLayout> ...@@ -44,6 +45,23 @@ UICollectionViewDelegate,UICollectionViewDelegateFlowLayout>
@property (nonatomic,assign) int indexPage; @property (nonatomic,assign) int indexPage;
// 搜索code // 搜索code
@property (nonatomic,copy) NSString *selectedCode; @property (nonatomic,copy) NSString *selectedCode;
/**
* 筛选模型
*/
@property (nonatomic,strong) GoodsCondition *condtionModel;
/**
* 总页数
*/
@property (nonatomic,assign) int totalPages;
/**
* 当前筛选按钮选中状态
*/
@property (nonatomic,assign) NSInteger selectedIndex;
@property (nonatomic,strong) NSMutableArray * cellArray;
@property (nonatomic,strong) NSMutableArray * showSection;
@property (nonatomic,strong) NSMutableArray * typeBtnArray;
@property (nonatomic,strong) NSMutableArray * sectionBtnArray;
@property (nonatomic,strong) NSMutableArray * cellBtnArray;
@property (nonatomic,strong)UITextField * searchTextField;
@end @end
Lighting/Class/ProductLibraryView.m
View file @ 7a9a4c75
...@@ -32,11 +32,22 @@ ...@@ -32,11 +32,22 @@
} }
return _arrayData; return _arrayData;
} }
/**
* 初始化复选模型
*/
- (GoodsCondition *)condtionModel
{
if (!_condtionModel) {
_condtionModel = [[GoodsCondition alloc]init];
}
return _condtionModel;
}
- (void)viewDidLoad { - (void)viewDidLoad {
[self initdata]; [self initdata];
[self initSubView]; [self initSubView];
[self uiConfigAction];
} }
...@@ -44,86 +55,103 @@ ...@@ -44,86 +55,103 @@
{ {
self.arrayData=[[NSMutableArray alloc]init]; self.arrayData=[[NSMutableArray alloc]init];
self.nameData=[[NSMutableArray alloc]initWithObjects:@"风格",@"类型",@"空间",@"材质",@"价格",nil]; self.nameData=[[NSMutableArray alloc]initWithObjects:@"风格",@"类型",@"空间",@"材质",@"价格",nil];
self.indexPage = 0; self.cellArray=[[NSMutableArray alloc]init];
self.showSection=[[NSMutableArray alloc]init];
self.typeBtnArray=[[NSMutableArray alloc]init];
self.sectionBtnArray=[[NSMutableArray alloc]init];
self.cellBtnArray=[[NSMutableArray alloc]init];
self.indexPage = 1;
self.selectedIndex=100;
} }
- (void)uiConfigAction - (void)uiConfigAction
{ {
//下拉刷新 //下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
//默认数据
GoodsCondition *conditon = [[GoodsCondition alloc]init];
//分页数据 //分页数据
DataPage *Newpage = [[DataPage alloc]init]; DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = self.indexPage; Newpage.page = 1;
Newpage.rows = 10; Newpage.rows = KROWS;
conditon.page = Newpage; self.condtionModel.page = Newpage;
//搜索 self.indexPage = 1;
if (_selectedCode) { //搜索
conditon.categoryEquals = _selectedCode; if (self.selectedCode) {
conditon.nameLike = _selectedCode; switch (self.selectedIndex) {
} case 100://风格
[self getScreeningdatasisRemoveArray:YES]; {
[self getGoodsListDatasisRemove:YES Withobject:conditon]; self.condtionModel.styleEquals = self.selectedCode;
}
break;
case 101://类型
{
self.condtionModel.categoryEquals = self.selectedCode;
}
break;
case 102://空间
{
self.condtionModel.spaceEquals = self.selectedCode;
}
break;
case 103://材质
{
self.condtionModel.materialEqueals = self.selectedCode;
}
break;
case 104://价格
{
//价格字符串切割
NSArray *spacrArray = [self.selectedCode componentsSeparatedByString:@"到"];
self.condtionModel.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]];
self.condtionModel.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]];
self.condtionModel.categoryEquals = self.selectedCode;
}
break;
default:
break;
}
}
[self.collectionView.mj_footer resetNoMoreData];
[self getScreeningdatasisRemoveArray:YES];
[self getGoodsListDatasisRemove:YES Withobject:self.condtionModel];
}]; }];
headerRefresh.stateLabel.hidden = YES; headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES; headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.collectionView.mj_header = headerRefresh; self.collectionView.mj_header = headerRefresh;
[self.collectionView.mj_header beginRefreshing]; [self.collectionView.mj_header beginRefreshing];
//上拉加载 //上拉加载
self.collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
//默认数据
GoodsCondition *conditon = [[GoodsCondition alloc]init]; if (self.indexPage ++ > self.totalPages) {
//分页数据 [self.collectionView.mj_footer endRefreshingWithNoMoreData];
DataPage *Newpage = [[DataPage alloc]init]; }else
Newpage.page = self.indexPage ++; {
Newpage.rows = 10; //分页数据
conditon.page = Newpage; DataPage *Newpage = [[DataPage alloc]init];
//搜索 Newpage.page = self.indexPage ++;
if (_selectedCode) { Newpage.rows = KROWS;
conditon.categoryEquals = _selectedCode; self.condtionModel.page = Newpage;
conditon.nameLike = _selectedCode; //搜索
} if (self.selectedCode) {
[self getGoodsListDatasisRemove:YES Withobject:conditon]; self.condtionModel.categoryEquals = self.selectedCode;
}
[self getGoodsListDatasisRemove:NO Withobject:self.condtionModel];
}
}]; }];
} }
//#pragma mark -热门搜索
//- (void)setSelectedCode:(NSString *)selectedCode
//{
// _selectedCode = selectedCode;
// //默认数据
// GoodsCondition *conditon = [[GoodsCondition alloc]init];
// //分页数据
// DataPage *Newpage = [[DataPage alloc]init];
// Newpage.page = 0;
// conditon.page = Newpage;
// conditon.categoryEquals = _selectedCode;
//
// __weak typeof(self)weakSelf = self;
// [self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) {
//
// if (response.goodsEntity.count == 0) {
//
// [self ErrorMBProgressView:@"暂无数据"];
// }else
// {
// weakSelf.datasArray = response;
// [weakSelf.productCollectionView reloadData];
// }
// }];
//
//}
#pragma mark -获取商品列表数据 #pragma mark -获取商品列表数据
- (void)getGoodsListDatasisRemove:(BOOL)remove Withobject:(GoodsCondition *)conditon - (void)getGoodsListDatasisRemove:(BOOL)remove Withobject:(GoodsCondition *)conditon
{ {
__weak typeof(self)weakSelf = self;
[self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) { [self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) {
if (response.goodsEntity.count == 0) { if (response.goodsEntity.count == 0) {
...@@ -135,9 +163,10 @@ ...@@ -135,9 +163,10 @@
[self.datasArray removeAllObjects]; [self.datasArray removeAllObjects];
} }
for (TOGoodsEntity *model in response.goodsEntity) { for (TOGoodsEntity *model in response.goodsEntity) {
[weakSelf.datasArray addObject:model]; [self.datasArray addObject:model];
} }
[weakSelf.collectionView reloadData]; [self.collectionView reloadData];
[self.seceneTableView reloadData];
} }
}]; }];
} }
...@@ -156,7 +185,33 @@ ...@@ -156,7 +185,33 @@
GoodsFilter *goodsStyle = [[GoodsFilter alloc]initWithDictionary:returnValue[@"data"] error:nil]; GoodsFilter *goodsStyle = [[GoodsFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
self.goodsFilter=goodsStyle; self.goodsFilter=goodsStyle;
self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.styles]; switch (self.selectedIndex) {
case 100:
// 风格
self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.styles];
break;
case 101:
// 类型
self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.categories];
break;
case 102:
// 空间
self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.space];
break;
case 103:
// 材质
self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.material];
break;
case 104:
// 价格
self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.price];
break;
default:
break;
}
[self.seceneTableView reloadData]; [self.seceneTableView reloadData];
} }
else else
...@@ -201,37 +256,6 @@ ...@@ -201,37 +256,6 @@
[self RemoveMBProgressHUDLoding]; [self RemoveMBProgressHUDLoding];
}]; }];
} }
//#pragma mark -获取商品详情
//- (void)getGoodsListDetails
//
//{
// [self CreateMBProgressHUDLoding];
// NSString *url = [NSString stringWithFormat:@"%@%@%@",ServerAddress,@"/goods/getGoods/",_goodsID];
// [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
//
// [self RemoveMBProgressHUDLoding];
// if ([returnValue[@"code"] isEqualToNumber:@0]) {
//
// self.entity = [[TOGoodsEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
// [self HeaderViewAssignment];
// [self.productDetilsTableview reloadData];
// }
// else
// {
// [self ErrorMBProgressView:returnValue[@"message"]];
// }
//
//
//
// } WithErrorCodeBlock:^(id errorCodeValue) {
//
//
// } WithFailureBlock:^(id error) {
//
// [self RemoveMBProgressHUDLoding];
// NSLog(@"%@",error);
// }];
//}
-(void)initSubView -(void)initSubView
{ {
for (int i=0; i<self.nameData.count; i++) { for (int i=0; i<self.nameData.count; i++) {
...@@ -243,9 +267,18 @@ ...@@ -243,9 +267,18 @@
btn.contentEdgeInsets = UIEdgeInsetsMake(0, 40, 0, 0); btn.contentEdgeInsets = UIEdgeInsetsMake(0, 40, 0, 0);
[btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
[btn addTarget:self action:@selector(selectedType:) forControlEvents:UIControlEventTouchUpInside]; [btn addTarget:self action:@selector(selectedType:) forControlEvents:UIControlEventTouchUpInside];
if (i==0) {
btn.backgroundColor=RGB(79, 153, 217, 1);
[btn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
}else
{
btn.backgroundColor=RGB(225, 225, 225, 1);
[btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
}
btn.tag=100 +i; btn.tag=100 +i;
btn.layer.masksToBounds = YES; btn.layer.masksToBounds = YES;
btn.layer.cornerRadius = 25; btn.layer.cornerRadius = 20;
[self.typeBtnArray addObject:btn];
[self.view addSubview:btn]; [self.view addSubview:btn];
} }
...@@ -268,18 +301,42 @@ ...@@ -268,18 +301,42 @@
-(void)initSubViews -(void)initSubViews
{ {
self.headerView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, self.subView.frame.size.width-100, 50)]; self.headerView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, self.subView.frame.size.width-100, 50)];
self.headerView.backgroundColor=[UIColor grayColor]; self.headerView.backgroundColor=RGB(225, 225, 225, 1);
[self.subView addSubview:self.headerView]; [self.subView addSubview:self.headerView];
UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom];
btn.frame=CGRectMake(10, 10, 30, 30); btn.frame=CGRectMake(10, 10, 30, 30);
[btn setBackgroundImage:[UIImage imageNamed:@"changjingtubiao"] forState:UIControlStateNormal]; [btn setBackgroundImage:[UIImage imageNamed:@"Folder"] forState:UIControlStateNormal];
[self.headerView addSubview:btn]; [self.headerView addSubview:btn];
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(45, 10, 100, 30)]; UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(45, 10, 100, 30)];
lable.text=@"选择产品"; lable.text=@"选择产品";
[self.headerView addSubview:lable]; [self.headerView addSubview:lable];
//输入框背景
UIImageView *backView = [[UIImageView alloc]initWithFrame:CGRectMake(self.headerView.frame.size.width-300, 10,250, 30)];
backView.userInteractionEnabled=YES;
[backView setImage:[UIImage imageNamed:@"line"]];
[self.headerView addSubview:backView];
//搜索图标
UIButton *searchBtn = [[UIButton alloc]initWithFrame:CGRectMake(5, 0, 35, 25)];
searchBtn.backgroundColor=RGB(225, 225, 225, 1);
[searchBtn setBackgroundImage:[UIImage imageNamed:@"search"] forState:UIControlStateNormal] ;
[searchBtn addTarget:self action:@selector(searchProduct:) forControlEvents:UIControlEventTouchUpInside];
[backView addSubview:searchBtn];
//输入框
self.searchTextField = [[UITextField alloc]initWithFrame:CGRectMake(50, 0, backView.frame.size.width-50, 29)];
self.searchTextField.borderStyle = UITextBorderStyleNone;
self.searchTextField.placeholder = @" 请输入产品关键字";
self.searchTextField.font = [UIFont systemFontOfSize:12];
self.searchTextField.returnKeyType = UIReturnKeySearch;
[backView addSubview:self.searchTextField];
//
self.seceneTableView=[[UITableView alloc]initWithFrame:CGRectMake( self.headerView.frame.size.width, 0, 100, self.subView.frame.size.height)]; self.seceneTableView=[[UITableView alloc]initWithFrame:CGRectMake( self.headerView.frame.size.width, 0, 100, self.subView.frame.size.height)];
self.seceneTableView.delegate=self; self.seceneTableView.delegate=self;
self.seceneTableView.dataSource=self; self.seceneTableView.dataSource=self;
self.seceneTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
self.seceneTableView.tableHeaderView=nil;
[self.subView addSubview:self.seceneTableView]; [self.subView addSubview:self.seceneTableView];
...@@ -290,21 +347,30 @@ ...@@ -290,21 +347,30 @@
self.collectionView=[[UICollectionView alloc] initWithFrame:CGRectMake( 0, 50, self.headerView.frame.size.width, self.subView.frame.size.height-50) collectionViewLayout:flowLayout]; self.collectionView=[[UICollectionView alloc] initWithFrame:CGRectMake( 0, 50, self.headerView.frame.size.width, self.subView.frame.size.height-50) collectionViewLayout:flowLayout];
self.collectionView.dataSource=self; self.collectionView.dataSource=self;
self.collectionView.delegate=self; self.collectionView.delegate=self;
[self.collectionView setBackgroundColor:[UIColor clearColor]]; [self.collectionView setBackgroundColor:RGB(241, 241, 241, 1)];
//注册Cell，必须要有 //注册Cell，必须要有
[self.collectionView registerClass:[ProductCollectionPictureCell class] forCellWithReuseIdentifier:@"UICollectionViewCell"]; [self.collectionView registerClass:[ProductCollectionPictureCell class] forCellWithReuseIdentifier:@"UICollectionViewCell"];
[self.subView addSubview:self.collectionView]; [self.subView addSubview:self.collectionView];
[self uiConfigAction];
} }
-(void)selectedType:(UIButton *)sender -(void)selectedType:(UIButton *)sender
{ {
for (UIButton *btn in self.typeBtnArray) {
btn.backgroundColor=RGB(225, 225, 225, 1);
[btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
}
sender.backgroundColor=RGB(79, 153, 217, 1);
[sender setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
// btn.backgroundColor=RGB(79, 153, 217, 1);
// btn.backgroundColor=RGB(225, 225, 225, 1);
self.selectedIndex=sender.tag;
switch (sender.tag) { switch (sender.tag) {
case 100: case 100:
// 风格 // 风格
self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.styles]; self.arrayData=[NSMutableArray arrayWithArray:self.goodsFilter.styles];
break; break;
case 101: case 101:
// 类型 // 类型
...@@ -327,49 +393,87 @@ ...@@ -327,49 +393,87 @@
break; break;
} }
[self.seceneTableView reloadData]; [self.seceneTableView reloadData];
[self.collectionView.mj_header beginRefreshing];
} }
#pragma mark -- UICollectionViewDataSource -(void)didSelectSection:(UIButton *)sender
//定义展示的Section的个数
-(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
{ {
if (self.datasArray.count/3==0 && self.datasArray.count%3!=0 ) { [self.sectionBtnArray removeAllObjects];
return 1; [self.sectionBtnArray addObject:sender.titleLabel.text];
}else sender.backgroundColor=RGB(221, 221, 221, 1);
{
if (self.datasArray.count%3==0) { switch (self.selectedIndex) {
return self.datasArray.count/3; case 100://风格
}else{ {
return self.datasArray.count/3 +1; self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] typecode] ;
[self.collectionView.mj_header beginRefreshing];
} }
break;
case 101://类型
{
if ([[NSString stringWithFormat:@"%d",sender.tag-100 ]isEqualToString:[NSString stringWithFormat:@"%@",[self.showSection firstObject]]]) {
[self.cellArray removeAllObjects ];
[self.showSection removeAllObjects];
[self.seceneTableView reloadData];
}else
{
[self.cellArray removeAllObjects ];
[self.showSection removeAllObjects];
self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] fid] ;
[self.collectionView.mj_header beginRefreshing];
self.cellArray=[NSMutableArray arrayWithArray:[[self.arrayData objectAtIndex_opple:sender.tag-100] children]];
[self.showSection addObject:[NSString stringWithFormat:@"%d",sender.tag-100]];
[self.seceneTableView reloadData];
}
}
break;
case 102://空间
{
self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] typecode] ;
[self.collectionView.mj_header beginRefreshing];
}
break;
case 103://材质
{
self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] typecode] ;
[self.collectionView.mj_header beginRefreshing];
}
break;
case 104://价格
{
self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] typecode] ;
[self.collectionView.mj_header beginRefreshing];
}
break;
default:
break;
} }
} }
#pragma mark -- UICollectionViewDataSource
//定义展示的UICollectionViewCell的个数 //定义展示的UICollectionViewCell的个数
-(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{ {
if (self.datasArray.count<3) { return self.datasArray.count;
return self.datasArray.count;
}else
{
if (self.datasArray.count/section==0) {
return 3;
}else
{
return self.datasArray.count%section;
}
}
} }
//每个UICollectionView展示的内容 //每个UICollectionView展示的内容
-(UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath -(UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{ {
static NSString * CellIdentifier = @"UICollectionViewCell"; static NSString * CellIdentifier = @"UICollectionViewCell";
ProductCollectionPictureCell * cell = (ProductCollectionPictureCell*)[collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath]; ProductCollectionPictureCell * cell = (ProductCollectionPictureCell*)[collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
NSArray *imageArray = [[[self.datasArray objectAtIndex_opple:indexPath.item] pictures] componentsSeparatedByString:@","]; NSArray *imageArray = [[[self.datasArray objectAtIndex_opple:indexPath.item] pictures] componentsSeparatedByString:@","];
[cell.productImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray objectAtIndex:indexPath.row]] placeholderImage:REPLACEIMAGE]; [cell.productImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray firstObject]] placeholderImage:REPLACEIMAGE];
cell.productPrice.text = [NSString stringWithFormat:@"￥%@",[[[self.datasArray objectAtIndex_opple:indexPath.item] guidePrice] stringValue]]; [cell.productImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray firstObject]] placeholderImage:REPLACEIMAGE];
cell.productParameter.text=[NSString stringWithFormat:@"%@ %@ %@",[[self.datasArray objectAtIndex_opple:indexPath.item]keyword],[[self.datasArray objectAtIndex_opple:indexPath.item]productProfile],[[self.datasArray objectAtIndex_opple:indexPath.item]power]]; cell.productDesce.text=[[self.datasArray objectAtIndex_opple:indexPath.item] name];
TOGoodsEntity *model = [self.datasArray objectAtIndex_opple:indexPath.item];
cell.productPrice.text = [NSString stringWithFormat:@"￥%@",[[[self.datasArray objectAtIndex_opple:indexPath.item] tagPrice] stringValue]];
cell.productParameter.text=[NSString stringWithFormat:@"%@ %@ ",model.code,model.size];
cell.productModel=[self.datasArray objectAtIndex_opple:indexPath.item]; cell.productModel=[self.datasArray objectAtIndex_opple:indexPath.item];
return cell; return cell;
...@@ -384,7 +488,7 @@ ...@@ -384,7 +488,7 @@
//定义每个UICollectionView 的边距 //定义每个UICollectionView 的边距
-(UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section -(UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
{ {
return UIEdgeInsetsMake(10, 10, 0, 20); return UIEdgeInsetsMake(10, 10, 20, 20);
} }
//定义每个UICollectionView 的纵向间距 //定义每个UICollectionView 的纵向间距
-(CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{ -(CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
...@@ -411,17 +515,60 @@ ...@@ -411,17 +515,60 @@
} }
#pragma mark - 协议方法 #pragma mark - 协议方法
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
return 50;
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
return 1; return self.arrayData.count;;
} }
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{ if ([tableView isEqual:self.seceneTableView])
{
return self.arrayData.count;
}else
{ {
return 5; UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 50)];
view.backgroundColor = [UIColor whiteColor];
NSString *str=[[NSString alloc]init];
if (self.selectedIndex==101) {
str=[NSString stringWithFormat:@"%@",[[self.arrayData objectAtIndex_opple:section] name]];
}else
{
str=[NSString stringWithFormat:@"%@",[[self.arrayData objectAtIndex_opple:section] typename]];
}
UIButton *btn=[[ UIButton alloc]initWithFrame:CGRectMake(0, 0, view.frame.size.width, view.frame.size.height-1)];
[btn setTitle:str forState:UIControlStateNormal];
[btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
if ([str isEqualToString:[self.sectionBtnArray firstObject]]) {
btn.backgroundColor=RGB(221, 221, 221, 1);
[btn setTitleColor:RGB(79, 153, 217, 1) forState:UIControlStateNormal];
}else
{
btn.backgroundColor=[UIColor whiteColor];
[btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
}
btn.tag=section+100;
btn.titleLabel.font=[UIFont systemFontOfSize:15];
[btn addTarget:self action:@selector(didSelectSection:) forControlEvents:UIControlEventTouchUpInside];
[view addSubview:btn];
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(0, view.frame.size.height-1, view.frame.size.width, 1)];
lable.backgroundColor=[UIColor grayColor];
[view addSubview:lable];
return view;
} }
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
if (self.selectedIndex==101) {//类型
if ([self.showSection containsObject:[NSString stringWithFormat:@"%d",section]]) {
return self.cellArray.count;
}else
{
return 0;
}
}else
{
return 0;
}
} }
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
...@@ -444,40 +591,53 @@ ...@@ -444,40 +591,53 @@
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID]; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) { if (cell == nil) {
cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID]; cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
// cell.selectionStyle = UITableViewCellSelectionStyleNone;
} }
if ([[self.arrayData objectAtIndex_opple:indexPath.row]isKindOfClass:[GoodsCategory class]]) { cell.backgroundColor=[UIColor whiteColor];
cell.textLabel.text=[[self.arrayData objectAtIndex_opple:indexPath.row] name]; cell.textLabel.textColor=[UIColor blackColor];
}else
{//类型是多级的这里要改动
cell.textLabel.text=[[self.arrayData objectAtIndex_opple:indexPath.row] typename];
}
// 05产品库-详情_03 if ([[self.cellArray objectAtIndex_opple:indexPath.row]isKindOfClass:[GoodsCategory class]]) {
return cell; cell.textLabel.text=[[self.cellArray objectAtIndex_opple:indexPath.row] name];
if ([cell.textLabel.text isEqualToString:[self.cellBtnArray firstObject]]) {
cell.backgroundColor=RGB(221, 221, 221, 1);
cell.textLabel.textColor=RGB(79, 153, 217, 1);
}
cell.textLabel.textAlignment=NSTextAlignmentCenter;
}// 05产品库-详情_03
return cell;
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
self.indexPage=0; [self.cellBtnArray removeAllObjects];
//默认数据 self.selectedCode = [[self.cellArray objectAtIndex_opple:indexPath.row] fid] ;
GoodsCondition *conditon = [[GoodsCondition alloc]init]; [self.cellBtnArray addObject:[[self.cellArray objectAtIndex_opple:indexPath.row] name]];
//分页数据
DataPage *Newpage = [[DataPage alloc]init]; [self.collectionView.mj_header beginRefreshing];
Newpage.page = self.indexPage;
Newpage.rows = 0; }
conditon.page = Newpage; //产品搜索
[self getGoodsListDatasisRemove:YES Withobject:conditon]; -(void)searchProduct:(UIButton *)sender
{
if (self.searchTextField.text==nil||[self.searchTextField.text isEqualToString:@""]) {
[self SHOWPrompttext:@"请先输入搜索关键字"];
}else
{
[self SHOWPrompttext:@"接口文档地址打不开 待调试"];
}
} }
-(void)DismissScreenView:(UITapGestureRecognizer*)sender{ -(void)DismissScreenView:(UITapGestureRecognizer*)sender{
CGPoint point = [sender locationInView:self.view]; CGPoint point = [sender locationInView:self.view];
if (point.x<100 || point.x >ScreenWidth-150||point.y<50||point.y>ScreenHeight-150) { if (point.x<100 || point.x >ScreenWidth-150||point.y<50||point.y>ScreenHeight-150) {
if (self) { if (self) {
[self.view removeFromSuperview]; if ([self.delegate respondsToSelector:@selector(restProductBtnImage)]) {
[self.delegate restProductBtnImage];
}
} }
} }
} }
......
Lighting/Class/RightSubView.h
View file @ 7a9a4c75
...@@ -20,5 +20,7 @@ ...@@ -20,5 +20,7 @@
@property (nonatomic,strong)NSMutableArray *dataArray; @property (nonatomic,strong)NSMutableArray *dataArray;
@property (nonatomic,strong)NSMutableArray *productModelArray; @property (nonatomic,strong)NSMutableArray *productModelArray;
@property (nonatomic,strong)UIScrollView *scrollView; @property (nonatomic,strong)UIScrollView *scrollView;
@property (nonatomic,assign)BOOL isSelected;
@property (nonatomic,strong)UIButton *selectBtn;
-(void)addRightSubViewImage:(UIImage*)image productModel:(TOGoodsEntity *)productModel; -(void)addRightSubViewImage:(UIImage*)image productModel:(TOGoodsEntity *)productModel;
@end @end
Lighting/Class/RightSubView.m
View file @ 7a9a4c75
...@@ -22,19 +22,19 @@ ...@@ -22,19 +22,19 @@
{ {
NSString *imageName = [NSString stringWithFormat:@"05产品库-详情_03" ]; NSString *imageName = [NSString stringWithFormat:@"05产品库-详情_03" ];
UIImage *image= [UIImage imageNamed:imageName]; UIImage *image= [UIImage imageNamed:imageName];
self.dataArray=[[NSMutableArray alloc]initWithObjects:image,image,image,nil]; self.dataArray=[[NSMutableArray alloc]init];
self.productModelArray=[[NSMutableArray alloc]init]; self.productModelArray=[[NSMutableArray alloc]init];
// 待接收 // 待接收
} }
-(void)initSubView -(void)initSubView
{ {
UIButton *button=[UIButton buttonWithType:UIButtonTypeCustom]; self.selectBtn=[UIButton buttonWithType:UIButtonTypeCustom];
button.frame=CGRectMake(self.frame.size.width-100, self.frame.size.height-60, 60, 60); self.selectBtn.frame=CGRectMake(self.frame.size.width-100, self.frame.size.height-60, 60, 60);
button.tag=300; self.selectBtn.tag=300;
[button setBackgroundImage:[UIImage imageNamed:@"产品1"] forState:UIControlStateNormal]; [self.selectBtn setBackgroundImage:[UIImage imageNamed:@"产品2"] forState:UIControlStateNormal];
[button addTarget:self action:@selector(rightBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside]; [self.selectBtn addTarget:self action:@selector(rightBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button]; [self addSubview:self.selectBtn];
self.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)];
// 禁用滚动条，只设置水平方向的滚动条即可，竖直方向的滚动范围是0，所以没必要设置 // 禁用滚动条，只设置水平方向的滚动条即可，竖直方向的滚动范围是0，所以没必要设置
self.scrollView.showsVerticalScrollIndicator = NO; self.scrollView.showsVerticalScrollIndicator = NO;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
self.scrollView.contentSize = CGSizeMake(0, (self.dataArray.count+1) * (100+10)); self.scrollView.contentSize = CGSizeMake(0, (self.dataArray.count+1) * (100+10));
for (int i=0; i<self.dataArray.count; i++) { for (int i=0; i<self.dataArray.count; i++) {
UIButton *button=[[UIButton alloc]initWithFrame:CGRectMake(80, 20+i*(100+10), 100, 100)]; UIButton *button=[[UIButton alloc]initWithFrame:CGRectMake(80, 20+i*(100+10), 100, 75)];
UIImage *image=[self.dataArray objectAtIndex:i]; UIImage *image=[self.dataArray objectAtIndex:i];
[button setImage:image forState:UIControlStateNormal]; [button setImage:image forState:UIControlStateNormal];
button.tag=100+i; button.tag=100+i;
......
Lighting/Class/SecenTableViewCell.h 0 → 100644
View file @ 7a9a4c75
//
// SecenTableViewCell.h
// Lighting
//
// Created by mac on 16/5/30.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface SecenTableViewCell : UITableViewCell
@end
Lighting/Class/SecenTableViewCell.m 0 → 100644
View file @ 7a9a4c75
//
// SecenTableViewCell.m
// Lighting
//
// Created by mac on 16/5/30.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SecenTableViewCell.h"
@implementation SecenTableViewCell
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
if (self) {
[self bulidLayout];
}
return self;
}
- (void)bulidLayout
{
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(0, self.frame.size.height, self.frame.size.width, 1)];
lable.backgroundColor=[UIColor grayColor];
[self addSubview:lable];
}
@end
Lighting/Class/SeceneLibraryView.h
View file @ 7a9a4c75
...@@ -9,13 +9,14 @@ ...@@ -9,13 +9,14 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "SeceneCollectionPictureCell.h" #import "SeceneCollectionPictureCell.h"
#import "screeningButton.h" #import "screeningButton.h"
#import "SecenTableViewCell.h"
@protocol AddSecenePicturedelegate <NSObject> @protocol AddSecenePicturedelegate <NSObject>
@required @required
//回调 //回调
- (void)addSeceneImage:(UIImage *)image; - (void)addSeceneImage:(UIImage *)image;
- (void)restSeceneBtnImage;
@end @end
@interface SeceneLibraryView : BaseViewController<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource,UICollectionViewDataSource, @interface SeceneLibraryView : BaseViewController<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource,UICollectionViewDataSource,
...@@ -42,4 +43,14 @@ UICollectionViewDelegate,UICollectionViewDelegateFlowLayout> ...@@ -42,4 +43,14 @@ UICollectionViewDelegate,UICollectionViewDelegateFlowLayout>
* 当前页数 * 当前页数
*/ */
@property (nonatomic,assign) int indexPage; @property (nonatomic,assign) int indexPage;
/**
* 总页数
*/
@property (nonatomic,assign) int totalPages;
/**
* 搜索模型
*/
@property (nonatomic,strong) SceneCondition *conditionModel;
@property (nonatomic,strong) NSString *isSelectBtnType;
@property (nonatomic ,strong)NSString *isSelectCell;
@end @end
Lighting/Class/SeceneLibraryView.m
View file @ 7a9a4c75
...@@ -12,6 +12,17 @@ ...@@ -12,6 +12,17 @@
@end @end
@implementation SeceneLibraryView @implementation SeceneLibraryView
/**
* 上传模型
*/
- (SceneCondition *)conditionModel
{
if (!_conditionModel) {
_conditionModel = [[SceneCondition alloc]init];
}
return _conditionModel;
}
- (void)viewDidLoad { - (void)viewDidLoad {
...@@ -25,6 +36,7 @@ ...@@ -25,6 +36,7 @@
{ {
self.arrayData=[[NSMutableArray alloc]init]; self.arrayData=[[NSMutableArray alloc]init];
self.indexPage = 0; self.indexPage = 0;
self.isSelectBtnType=@"space";
} }
-(void)uiConfigAction -(void)uiConfigAction
...@@ -32,13 +44,16 @@ ...@@ -32,13 +44,16 @@
//下拉刷新 //下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
//默认数据 //默认数据
SceneCondition *condition = [[SceneCondition alloc]init]; self.indexPage = 1;
DataPage *page = [[DataPage alloc]init]; DataPage *page = [[DataPage alloc]init];
page.page = self.indexPage; page.page = self.indexPage;
page.rows = 10; page.rows = KROWS;
condition.page = page; self.conditionModel.page = page;
[self getSceneLibrarydatas:condition isRemove:YES];
[self.collectionView.mj_footer resetNoMoreData];
[self getSceneLibrarydatas:self.conditionModel isRemove:YES];
}]; }];
headerRefresh.stateLabel.hidden = YES; headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES; headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.collectionView.mj_header = headerRefresh; self.collectionView.mj_header = headerRefresh;
...@@ -46,27 +61,32 @@ ...@@ -46,27 +61,32 @@
//上拉加载 //上拉加载
self.collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
//默认数据 if (self.indexPage ++ > self.totalPages) {
SceneCondition *condition = [[SceneCondition alloc]init]; [self.collectionView.mj_footer endRefreshingWithNoMoreData];
DataPage *page = [[DataPage alloc]init]; }else
page.page = self.indexPage ++; {
page.rows = 10; //默认数据
condition.page = page; DataPage *Newpage = [[DataPage alloc]init];
[self getSceneLibrarydatas:condition isRemove:NO]; Newpage.page = self.indexPage ++;
Newpage.rows = KROWS;
self.conditionModel.page = Newpage;
[self getSceneLibrarydatas:self.conditionModel isRemove:NO];
}
}]; }];
}
}
#pragma mark -获取场景筛选数据 #pragma mark -获取场景筛选数据
- (void)getdatasAction - (void)getdatasAction
{ {
[self CreateMBProgressHUDLoding]; [self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/getSceneFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) { [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/getSceneFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding]; [self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
self.filter = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil]; self.filter = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
self.arrayData=[NSMutableArray arrayWithArray:self.filter.styles]; self.arrayData=[NSMutableArray arrayWithArray:self.filter.space];
[self.seceneTableView reloadData]; [self.seceneTableView reloadData];
} }
else else
...@@ -122,11 +142,13 @@ ...@@ -122,11 +142,13 @@
self.kongJianBtn.backgroundColor=[UIColor whiteColor]; self.kongJianBtn.backgroundColor=[UIColor whiteColor];
[self.kongJianBtn setTitle:@"空间 " forState:UIControlStateNormal]; [self.kongJianBtn setTitle:@"空间 " forState:UIControlStateNormal];
[self.kongJianBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; [self.kongJianBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
self.kongJianBtn.contentEdgeInsets = UIEdgeInsetsMake(0, 60, 0, 0); self.kongJianBtn.contentEdgeInsets = UIEdgeInsetsMake(0, 55, 0, 0);
self.kongJianBtn.backgroundColor=RGB(79, 153, 217, 1);
[self.kongJianBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[self.kongJianBtn addTarget:self action:@selector(selectedType:) forControlEvents:UIControlEventTouchUpInside]; [self.kongJianBtn addTarget:self action:@selector(selectedType:) forControlEvents:UIControlEventTouchUpInside];
self.kongJianBtn.tag=101; self.kongJianBtn.tag=101;
self.kongJianBtn.layer.masksToBounds = YES; self.kongJianBtn.layer.masksToBounds = YES;
self.kongJianBtn.layer.cornerRadius = 15; self.kongJianBtn.layer.cornerRadius = 20;
[self.view addSubview:self.kongJianBtn]; [self.view addSubview:self.kongJianBtn];
// 风格 // 风格
self.fengGeBtn=[UIButton buttonWithType:UIButtonTypeCustom]; self.fengGeBtn=[UIButton buttonWithType:UIButtonTypeCustom];
...@@ -135,7 +157,9 @@ ...@@ -135,7 +157,9 @@
[self.fengGeBtn setTitle:@"风格 " forState:UIControlStateNormal]; [self.fengGeBtn setTitle:@"风格 " forState:UIControlStateNormal];
[self.fengGeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; [self.fengGeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
self.fengGeBtn.contentEdgeInsets = UIEdgeInsetsMake(0, 60, 0, 0); self.fengGeBtn.contentEdgeInsets = UIEdgeInsetsMake(0, 55, 0, 0);
self.fengGeBtn.backgroundColor=RGB(225, 225, 225, 1);
[self.fengGeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
[self.fengGeBtn addTarget:self action:@selector(selectedType:) forControlEvents:UIControlEventTouchUpInside]; [self.fengGeBtn addTarget:self action:@selector(selectedType:) forControlEvents:UIControlEventTouchUpInside];
self.fengGeBtn.tag=102; self.fengGeBtn.tag=102;
self.fengGeBtn.layer.masksToBounds = YES; self.fengGeBtn.layer.masksToBounds = YES;
...@@ -158,16 +182,17 @@ ...@@ -158,16 +182,17 @@
-(void)initSubViews -(void)initSubViews
{ {
self.headerView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, self.subView.frame.size.width-100, 50)]; self.headerView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, self.subView.frame.size.width-100, 50)];
self.headerView.backgroundColor=[UIColor grayColor]; self.headerView.backgroundColor=RGB(225, 225, 225, 1);
[self.subView addSubview:self.headerView]; [self.subView addSubview:self.headerView];
UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom];
btn.frame=CGRectMake(10, 10, 30, 30); btn.frame=CGRectMake(10, 10, 30, 30);
[btn setBackgroundImage:[UIImage imageNamed:@"changjingtubiao"] forState:UIControlStateNormal]; [btn setBackgroundImage:[UIImage imageNamed:@"Folder"] forState:UIControlStateNormal];
[self.headerView addSubview:btn]; [self.headerView addSubview:btn];
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(45, 10, 100, 30)]; UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(45, 10, 100, 30)];
lable.text=@"选择场景"; lable.text=@"选择场景";
[self.headerView addSubview:lable]; [self.headerView addSubview:lable];
self.seceneTableView=[[UITableView alloc]initWithFrame:CGRectMake( self.headerView.frame.size.width, 0, 100, self.subView.frame.size.height)]; self.seceneTableView=[[UITableView alloc]initWithFrame:CGRectMake( self.headerView.frame.size.width, 0, 100, self.subView.frame.size.height)];
self.seceneTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
self.seceneTableView.delegate=self; self.seceneTableView.delegate=self;
self.seceneTableView.dataSource=self; self.seceneTableView.dataSource=self;
[self.subView addSubview:self.seceneTableView]; [self.subView addSubview:self.seceneTableView];
...@@ -188,14 +213,29 @@ ...@@ -188,14 +213,29 @@
} }
-(void)selectedType:(UIButton *)sender -(void)selectedType:(UIButton *)sender
{ {
if ([sender.titleLabel.text isEqualToString:self.fengGeBtn.titleLabel.text ]) {
self.fengGeBtn.backgroundColor=RGB(79, 153, 217, 1);
[self.fengGeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
self.kongJianBtn.backgroundColor=RGB(225, 225, 225, 1);
[self.kongJianBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
}else
{
self.fengGeBtn.backgroundColor=RGB(225, 225, 225, 1);
[self.fengGeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
self.kongJianBtn.backgroundColor=RGB(79, 153, 217, 1);
[self.kongJianBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
}
switch (sender.tag) { switch (sender.tag) {
case 101: case 101:
// 空间 // 空间
self.arrayData=[NSMutableArray arrayWithArray:self.filter.space]; self.arrayData=[NSMutableArray arrayWithArray:self.filter.space];
self.isSelectBtnType=@"space";
break; break;
case 102: case 102:
// 风格 // 风格
self.arrayData=[NSMutableArray arrayWithArray:self.filter.styles]; self.arrayData=[NSMutableArray arrayWithArray:self.filter.styles];
self.isSelectBtnType=@"style";
break; break;
case 103: case 103:
// 类型 // 类型
...@@ -207,36 +247,11 @@ ...@@ -207,36 +247,11 @@
[self.seceneTableView reloadData]; [self.seceneTableView reloadData];
} }
#pragma mark -- UICollectionViewDataSource #pragma mark -- UICollectionViewDataSource
//定义展示的Section的个数
-(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
{
if (self.response.list.count/3==0 && self.response.list.count%3!=0 ) {
return 1;
}else
{
if (self.response.list.count%3==0) {
return self.response.list.count/3;
}else{
return self.response.list.count/3 +1;
}
}
}
//定义展示的UICollectionViewCell的个数 //定义展示的UICollectionViewCell的个数
-(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{ {
// if (self.response.list.count<3) {
// return self.response.list.count; return self.response.list.count;
// }else
// {
// if (self.response.list.count/section==0) {
// return 3;
// }else
// {
// return self.response.list.count%section;
// }
// }
return 3;
} }
...@@ -302,12 +317,19 @@ ...@@ -302,12 +317,19 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
static NSString *cellID = @"ChooseTansferCell"; static NSString *cellID = @"ChooseTansferCell";
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID]; SecenTableViewCell *cell = (SecenTableViewCell*)[tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) { if (cell == nil) {
cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID]; cell = [[SecenTableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
// cell.selectionStyle = UITableViewCellSelectionStyleNone; // cell.selectionStyle = UITableViewCellSelectionStyleNone;
} }
if ([[[self.arrayData objectAtIndex_opple:indexPath.row] typename] isEqualToString:self.isSelectCell]) {
cell.contentView.backgroundColor=RGB(221, 221, 221, 1);
cell.textLabel.textColor=RGB(79, 153, 217, 1) ;
}else
{
cell.contentView.backgroundColor=[UIColor whiteColor];
cell.textLabel.textColor=[UIColor blackColor];
}
cell.textLabel.text=[[self.arrayData objectAtIndex_opple:indexPath.row] typename]; cell.textLabel.text=[[self.arrayData objectAtIndex_opple:indexPath.row] typename];
return cell; return cell;
...@@ -316,15 +338,17 @@ ...@@ -316,15 +338,17 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
self.indexPage=0; if ([self.isSelectBtnType isEqualToString:@"style"]) {
//默认数据 self.conditionModel.spaceEquals=nil;
SceneCondition *condition = [[SceneCondition alloc]init]; self.conditionModel.styleEquals=[[self.arrayData objectAtIndex_opple:indexPath.row] typecode];
DataPage *page = [[DataPage alloc]init]; }else
page.page = self.indexPage; {
page.rows = 10; self.conditionModel.styleEquals=nil;
condition.page = page; self.conditionModel.spaceEquals=[[self.arrayData objectAtIndex_opple:indexPath.row] typecode];
[self getSceneLibrarydatas:condition isRemove:NO]; }
self.isSelectCell=[[self.arrayData objectAtIndex_opple:indexPath.row] typename];
[self.seceneTableView reloadData];
[self.collectionView.mj_header beginRefreshing];
} }
...@@ -334,6 +358,10 @@ ...@@ -334,6 +358,10 @@
if (point.x<100 || point.x >ScreenWidth-150||point.y<50||point.y>ScreenHeight-150) { if (point.x<100 || point.x >ScreenWidth-150||point.y<50||point.y>ScreenHeight-150) {
if (self) { if (self) {
if ([self.delegate respondsToSelector:@selector(restSeceneBtnImage)]) {
[self.delegate restSeceneBtnImage];
}
[self.view removeFromSuperview]; [self.view removeFromSuperview];
} }
} }
......
Lighting/Class/ShoppingCell.h
View file @ 7a9a4c75
...@@ -61,6 +61,8 @@ ...@@ -61,6 +61,8 @@
*/ */
@property (nonatomic,strong) ShopcarModel *model; @property (nonatomic,strong) ShopcarModel *model;
@property (nonatomic,assign) int value;
/** /**
* 传入cel下标 * 传入cel下标
......
Lighting/Class/ShoppingCell.m
View file @ 7a9a4c75
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
// //
#import "ShoppingCell.h" #import "ShoppingCell.h"
#define Width 800 #define Width 760
#define Height self.frame.size.height #define Height 90
#define Gap 5 #define Gap 5
@implementation ShoppingCell @implementation ShoppingCell
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
if (self) { if (self) {
self.value=1;
[self bulidLayout]; [self bulidLayout];
} }
return self; return self;
...@@ -25,52 +25,95 @@ ...@@ -25,52 +25,95 @@
- (void)bulidLayout - (void)bulidLayout
{ {
// 选中 // 选中
self.selectedButton=[[UIButton alloc]initWithFrame:CGRectMake(10, 10, Width/15-20, Height-20)]; self.selectedButton=[[UIButton alloc]initWithFrame:CGRectMake(20, 25, Width/12-40, Height-50)];
[self.selectedButton setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal]; [self.selectedButton setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal];
// box-副本 // box-副本
[self.contentView addSubview:self.selectedButton]; [self.contentView addSubview:self.selectedButton];
// 商品图片 // 商品图片
self.goodsImageView=[[UIImageView alloc]initWithFrame:CGRectMake(Width/15, 0, 2*Width/15, Height)]; self.goodsImageView=[[UIImageView alloc]initWithFrame:CGRectMake(Width/12, 0, 2*Width/12, Height)];
self.goodsImageView.image=[UIImage imageNamed:@"05产品库-详情_03"]; self.goodsImageView.image=[UIImage imageNamed:@"05产品库-详情_03"];
//05产品库-详情_03 //05产品库-详情_03
[self.contentView addSubview:self.goodsImageView]; [self.contentView addSubview:self.goodsImageView];
// 商品信息 // 商品信息
self.goodsInformationLabe=[[UILabel alloc]initWithFrame:CGRectMake(3*Width/15, 0, 3*Width/15, Height)]; self.goodsInformationLabe=[[UILabel alloc]initWithFrame:CGRectMake(3*Width/12, 0, 4*Width/12, Height)];
self.goodsInformationLabe.text=@"吊灯jkdsfhkdhfkdsh\n2000133434"; self.goodsInformationLabe.text=@"吊灯jkdsfhkdhfkdsh\n2000133434";
self.goodsInformationLabe.textAlignment=NSTextAlignmentCenter;
self.goodsInformationLabe.numberOfLines=0; self.goodsInformationLabe.numberOfLines=0;
[self.contentView addSubview:self.goodsInformationLabe]; [self.contentView addSubview:self.goodsInformationLabe];
// 吊牌价格 // 吊牌价格
self.tagsPriceLabe=[[UILabel alloc]initWithFrame:CGRectMake(6*Width/15, 0,2*Width/15, Height)]; self.tagsPriceLabe=[[UILabel alloc]initWithFrame:CGRectMake(7*Width/12, 0,2*Width/12, Height)];
self.tagsPriceLabe.text=@"$5500"; self.tagsPriceLabe.text=@"￥5500";
self.tagsPriceLabe.textAlignment=NSTextAlignmentCenter;
[self.contentView addSubview:self.tagsPriceLabe]; [self.contentView addSubview:self.tagsPriceLabe];
// 成交价格 //// 成交价格
self.clinchTextfield=[[UITextField alloc]initWithFrame:CGRectMake(8*Width/15, 0, 2*Width/15, Height)]; // self.clinchTextfield=[[UITextField alloc]initWithFrame:CGRectMake(8*Width/15, 0, 2*Width/15, Height)];
self.clinchTextfield.text=@"$5500"; // self.clinchTextfield.text=@"$5500";
[self.contentView addSubview:self.clinchTextfield]; // [self.contentView addSubview:self.clinchTextfield];
// 数量减 // 数量减
self.reduceButton=[[UIButton alloc]initWithFrame:CGRectMake(10*Width/15, 0, Width/15, Height)]; self.reduceButton=[[UIButton alloc]initWithFrame:CGRectMake(9*Width/12, 20, Width/12-5, Height-40)];
[self.reduceButton setTitle:@"-" forState:UIControlStateNormal]; [self.reduceButton setTitle:@"-" forState:UIControlStateNormal];
self.reduceButton.titleLabel.font=[UIFont systemFontOfSize:18];
self.reduceButton.backgroundColor=RGB(249, 244, 241, 1);
[self.reduceButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; [self.reduceButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
self.reduceButton.titleLabel.font= [UIFont systemFontOfSize: 18.0]; self.reduceButton.titleLabel.font= [UIFont systemFontOfSize: 18.0];
self.reduceButton.tag=100;
[self.reduceButton addTarget:self action:@selector(resetVale:) forControlEvents:UIControlEventTouchUpInside];
[self.contentView addSubview:self.reduceButton]; [self.contentView addSubview:self.reduceButton];
// 商品数量 // 商品数量
self.goodsNumbersLabe=[[UILabel alloc]initWithFrame:CGRectMake(11*Width/15, 0, Width/15, Height)]; self.goodsNumbersLabe=[[UILabel alloc]initWithFrame:CGRectMake(10*Width/12, 20, Width/12, Height-40)];
self.goodsNumbersLabe.text=@"1"; self.goodsNumbersLabe.text=[NSString stringWithFormat:@"%d",self.value];
self.goodsNumbersLabe.layer.masksToBounds = YES;
self.goodsNumbersLabe.layer.cornerRadius=5;
self.goodsNumbersLabe.layer.borderWidth=1;
self.goodsNumbersLabe.layer.borderColor=[UIColor grayColor].CGColor;
self.goodsNumbersLabe.textAlignment=NSTextAlignmentCenter; self.goodsNumbersLabe.textAlignment=NSTextAlignmentCenter;
[self.contentView addSubview:self.goodsNumbersLabe]; [self.contentView addSubview:self.goodsNumbersLabe];
// 数量加 // 数量加
self.addButton=[[UIButton alloc]initWithFrame:CGRectMake(12*Width/15, 0, Width/15, Height)]; self.addButton=[[UIButton alloc]initWithFrame:CGRectMake(11*Width/12+5, 20, Width/12-5, Height-40)];
[self.addButton setTitle:@"+" forState:UIControlStateNormal]; [self.addButton setTitle:@"+" forState:UIControlStateNormal];
self.addButton.titleLabel.font=[UIFont systemFontOfSize:18];
self.addButton.backgroundColor=RGB(249, 244, 241, 1);
[self.addButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; [self.addButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
self.addButton.titleLabel.font= [UIFont systemFontOfSize: 18.0]; self.addButton.titleLabel.font= [UIFont systemFontOfSize: 18.0];
self.addButton.tag=200;
[self.addButton addTarget:self action:@selector(resetVale:) forControlEvents:UIControlEventTouchUpInside];
[self.contentView addSubview:self.addButton]; [self.contentView addSubview:self.addButton];
// 产品金额 UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(15, Height-1, Width-20, 1)];
self.productPriceLabe=[[UILabel alloc]initWithFrame:CGRectMake(13*Width/15, 0, 2*Width/15, Height)]; lable.backgroundColor=[UIColor grayColor];
self.productPriceLabe.text=@"$5500"; [self.contentView addSubview:lable];
self.productPriceLabe.textColor=[UIColor redColor]; //// 产品金额
[self.contentView addSubview:self.productPriceLabe]; // self.productPriceLabe=[[UILabel alloc]initWithFrame:CGRectMake(13*Width/15, 0, 2*Width/15, Height)];
// self.productPriceLabe.text=@"$5500";
// self.productPriceLabe.textColor=[UIColor redColor];
// [self.contentView addSubview:self.productPriceLabe];
}
-(void)resetVale:(UIButton *)sender
{
switch (sender.tag) {
case 100://减少
{
if (self.value<=1) {
return;
}else
{
self.value-=1;
}
}
break;
case 200://增加
{
self.value+=1;
}
break;
default:
break;
}
self.goodsNumbersLabe.text=[NSString stringWithFormat:@"%d",self.value];
} }
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
......
Lighting/Class/ShoppingView.h
View file @ 7a9a4c75
...@@ -8,8 +8,16 @@ ...@@ -8,8 +8,16 @@
#import "BaseViewController.h" #import "BaseViewController.h"
#import "ShoppingCell.h" #import "ShoppingCell.h"
//#import "TOGoodsEntity.h"
@protocol Shoppingdelegate <NSObject>
@required
- (void)restShoppingBtnImage;
@end
@interface ShoppingView : BaseViewController<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource> @interface ShoppingView : BaseViewController<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource>
@property (nonatomic,assign) id<Shoppingdelegate> delegate;
@property (nonatomic,strong) UIView *subView; @property (nonatomic,strong) UIView *subView;
@property (nonatomic,strong) UIView *headerView; @property (nonatomic,strong) UIView *headerView;
@property (nonatomic,strong) UIView *toolView; @property (nonatomic,strong) UIView *toolView;
...@@ -17,6 +25,9 @@ ...@@ -17,6 +25,9 @@
@property (nonatomic,strong) NSMutableArray *nameDataArray; @property (nonatomic,strong) NSMutableArray *nameDataArray;
@property (nonatomic,strong) NSMutableArray *productModelArray; @property (nonatomic,strong) NSMutableArray *productModelArray;
@property (nonatomic,strong) NSMutableArray *selectTagArray; @property (nonatomic,strong) NSMutableArray *selectTagArray;
@property (nonatomic,strong) NSMutableArray *AddArray;
@property (nonatomic,strong) UITableView *shoppingTableView; @property (nonatomic,strong) UITableView *shoppingTableView;
@property (nonatomic,assign) BOOL isAllSelected; @property (nonatomic,assign) BOOL isAllSelected;
@property (nonatomic,strong) UIButton*allSelectBtn;
@property (nonatomic,strong) UIButton *confirmAddBtn;
@end @end
\ No newline at end of file
Lighting/Class/ShoppingView.m
View file @ 7a9a4c75
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
-(void)initdata -(void)initdata
{ {
self.isAllSelected=NO; self.isAllSelected=NO;
self.nameDataArray=[[NSMutableArray alloc]initWithObjects:@"",@"图片",@"产品信息",@"吊牌价",@"成交价",@"",@"数量",@"",@"产品金额", nil]; self.nameDataArray=[[NSMutableArray alloc]initWithObjects:@"图片",@"产品信息",@"吊牌价",@"数量", nil];
self.productModelArray=[[NSMutableArray alloc]init]; self.productModelArray=[[NSMutableArray alloc]init];
self.AddArray=[[NSMutableArray alloc]init];
textArray=[[NSMutableArray alloc]initWithObjects:@"1",@"1",@"1",@"1",@"1", nil]; textArray=[[NSMutableArray alloc]initWithObjects:@"1",@"1",@"1",@"1",@"1", nil];
self.selectTagArray=[[NSMutableArray alloc]init]; self.selectTagArray=[[NSMutableArray alloc]init];
} }
...@@ -47,13 +48,14 @@ ...@@ -47,13 +48,14 @@
-(void)initSubViews -(void)initSubViews
{ {
self.headerView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, self.subView.frame.size.width, 50)]; self.headerView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, self.subView.frame.size.width, 50)];
self.headerView.backgroundColor=RGB(225, 225, 225, 1);
[self.subView addSubview:self.headerView]; [self.subView addSubview:self.headerView];
UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom];
btn.frame=CGRectMake(10, 10, 30, 30); btn.frame=CGRectMake(20, 10, 30, 30);
[btn setBackgroundImage:[UIImage imageNamed:@"addshopping"] forState:UIControlStateNormal]; [btn setBackgroundImage:[UIImage imageNamed:@"addshopping"] forState:UIControlStateNormal];
[self.headerView addSubview:btn]; [self.headerView addSubview:btn];
UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(45, 10, 100, 30)]; UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(65, 10, 150, 30)];
lable.text=@"待添加购物车"; lable.text=@"待添加至购物袋";
[self.headerView addSubview:lable]; [self.headerView addSubview:lable];
self.toolView=[[UIView alloc]initWithFrame:CGRectMake(0,50, self.subView.frame.size.width, 50)]; self.toolView=[[UIView alloc]initWithFrame:CGRectMake(0,50, self.subView.frame.size.width, 50)];
...@@ -61,21 +63,39 @@ ...@@ -61,21 +63,39 @@
[self.subView addSubview:self.toolView]; [self.subView addSubview:self.toolView];
for (int i=0; i<self.nameDataArray.count; i++) { for (int i=0; i<self.nameDataArray.count; i++) {
UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom];
btn.frame=CGRectMake(self.subView.frame.size.width/9*i, 10, self.subView.frame.size.width/9, 30); switch (i) {
case 0:
btn.frame=CGRectMake(self.subView.frame.size.width/8*(i+1), 10, self.subView.frame.size.width/9, 30);
break;
case 1:
btn.frame=CGRectMake(self.subView.frame.size.width/9*(i+3)-70, 10, self.subView.frame.size.width/9, 30);
break;
case 2:
btn.frame=CGRectMake(self.subView.frame.size.width/7*(i+2)+35, 10, self.subView.frame.size.width/9, 30);
break;
case 3:
btn.frame=CGRectMake(self.subView.frame.size.width/9*(i+4)+20, 10, self.subView.frame.size.width/9, 30);
break;
default:
break;
}
[btn setTitle:[self.nameDataArray objectAtIndex:i] forState:UIControlStateNormal]; [btn setTitle:[self.nameDataArray objectAtIndex:i] forState:UIControlStateNormal];
[self.toolView addSubview:btn]; [self.toolView addSubview:btn];
} }
self.shoppingTableView=[[UITableView alloc]initWithFrame:CGRectMake( 0,100, self.subView.frame.size.width, self.subView.frame.size.height-200)]; self.shoppingTableView=[[UITableView alloc]initWithFrame:CGRectMake( 0,100, self.subView.frame.size.width, self.subView.frame.size.height-200)];
self.shoppingTableView.delegate=self; self.shoppingTableView.delegate=self;
self.shoppingTableView.dataSource=self; self.shoppingTableView.dataSource=self;
self.shoppingTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[self.subView addSubview:self.shoppingTableView]; [self.subView addSubview:self.shoppingTableView];
self.footView=[[UIView alloc]initWithFrame:CGRectMake(0, self.subView.frame.size.height-100, self.subView.frame.size.width, 100)]; self.footView=[[UIView alloc]initWithFrame:CGRectMake(0, self.subView.frame.size.height-100, self.subView.frame.size.width, 100)];
[self.subView addSubview:self.footView]; [self.subView addSubview:self.footView];
UIButton *allSelectedBtn=[[UIButton alloc]initWithFrame:CGRectMake(20, 35, 30, 30)]; self.allSelectBtn=[[UIButton alloc]initWithFrame:CGRectMake(20, 35, 30, 30)];
[allSelectedBtn addTarget:self action:@selector(allSelected:) forControlEvents:UIControlEventTouchUpInside]; [self.allSelectBtn addTarget:self action:@selector(allSelected:) forControlEvents:UIControlEventTouchUpInside];
[allSelectedBtn setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal]; [self.allSelectBtn setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal];
[self.footView addSubview:allSelectedBtn]; [self.footView addSubview:self.allSelectBtn];
UILabel *allLable=[[UILabel alloc]initWithFrame:CGRectMake(70, 35, 50, 50)]; UILabel *allLable=[[UILabel alloc]initWithFrame:CGRectMake(70, 35, 50, 50)];
allLable.text=@"全选"; allLable.text=@"全选";
[self.footView addSubview:allLable]; [self.footView addSubview:allLable];
...@@ -86,18 +106,18 @@ ...@@ -86,18 +106,18 @@
UILabel *delegatelable=[[UILabel alloc]initWithFrame:CGRectMake(210, 35, 50, 50)]; UILabel *delegatelable=[[UILabel alloc]initWithFrame:CGRectMake(210, 35, 50, 50)];
delegatelable.text=@"删除"; delegatelable.text=@"删除";
[self.footView addSubview:delegatelable]; [self.footView addSubview:delegatelable];
UILabel *totalAmountName=[[UILabel alloc]initWithFrame:CGRectMake(self.footView.frame.size.width-320, 25, 75, 50)]; // UILabel *totalAmountName=[[UILabel alloc]initWithFrame:CGRectMake(self.footView.frame.size.width-320, 25, 75, 50)];
totalAmountName.text=@"合计金额"; // totalAmountName.text=@"合计金额";
[self.footView addSubview:totalAmountName]; // [self.footView addSubview:totalAmountName];
UILabel *totalAmountNum=[[UILabel alloc]initWithFrame:CGRectMake(self.footView.frame.size.width-240, 25, 75, 50)]; // UILabel *totalAmountNum=[[UILabel alloc]initWithFrame:CGRectMake(self.footView.frame.size.width-240, 25, 75, 50)];
totalAmountNum.text=@"$5500"; // totalAmountNum.text=@"$5500";
totalAmountNum.textColor=[UIColor redColor]; // totalAmountNum.textColor=[UIColor redColor];
[self.footView addSubview:totalAmountNum]; // [self.footView addSubview:totalAmountNum];
UIButton *confirmAddBtn=[[UIButton alloc]initWithFrame:CGRectMake(self.footView.frame.size.width-150, 15, 130, 60)]; self.confirmAddBtn=[[UIButton alloc]initWithFrame:CGRectMake(self.footView.frame.size.width-150, 15, 130, 60)];
[confirmAddBtn setTitle:@"确认添加（0）" forState:UIControlStateNormal]; [self.confirmAddBtn setTitle:@"确认添加（0）" forState:UIControlStateNormal];
[confirmAddBtn addTarget:self action:@selector(addProducts:) forControlEvents:UIControlEventTouchUpInside]; [self.confirmAddBtn addTarget:self action:@selector(addProducts:) forControlEvents:UIControlEventTouchUpInside];
[confirmAddBtn setBackgroundColor:[UIColor blueColor]]; [self.confirmAddBtn setBackgroundColor:RGB(78, 172, 217, 1)];
[self.footView addSubview:confirmAddBtn]; [self.footView addSubview:self.confirmAddBtn];
} }
//全选 //全选
...@@ -106,11 +126,19 @@ ...@@ -106,11 +126,19 @@
if (!self.isAllSelected) { if (!self.isAllSelected) {
[sender setBackgroundImage:[UIImage imageNamed:@"bg"] forState:UIControlStateNormal]; [sender setBackgroundImage:[UIImage imageNamed:@"bg"] forState:UIControlStateNormal];
[self.shoppingTableView reloadData]; [self.shoppingTableView reloadData];
for (int i=0; i<self.productModelArray.count; i++) {
[self.selectTagArray addObject:[NSString stringWithFormat:@"%d",i]];
[self.AddArray addObject:[self.productModelArray objectAtIndex:1]];
}
[self.confirmAddBtn setTitle:[NSString stringWithFormat:@"确认添加（%d）",self.selectTagArray.count] forState:UIControlStateNormal];
self.isAllSelected=YES; self.isAllSelected=YES;
}else }else
{ {
[sender setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal]; [sender setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal];
[self.shoppingTableView reloadData]; [self.shoppingTableView reloadData];
[self.selectTagArray removeAllObjects];
[self.AddArray removeAllObjects];
[self.confirmAddBtn setTitle:[NSString stringWithFormat:@"确认添加（0）"] forState:UIControlStateNormal];
self.isAllSelected=NO; self.isAllSelected=NO;
} }
...@@ -120,13 +148,19 @@ ...@@ -120,13 +148,19 @@
{ {
self.selectTagArray=[self sequenceProductList:self.selectTagArray]; self.selectTagArray=[self sequenceProductList:self.selectTagArray];
if (self.isAllSelected) { if (self.isAllSelected) {
[textArray removeAllObjects]; [self.productModelArray removeAllObjects];
[self.AddArray removeAllObjects];
[self.confirmAddBtn setTitle:[NSString stringWithFormat:@"确认添加（0）"] forState:UIControlStateNormal];
}else }else
{ {
for (NSString *str in self.selectTagArray) { for (int i=0; i<self.selectTagArray.count; i++) {
[textArray removeObjectAtIndex:[str integerValue]]; NSString *str=[self.selectTagArray objectAtIndex:i];
[self.AddArray removeObject:[self.productModelArray objectAtIndex:i]];
[self.productModelArray removeObjectAtIndex:[str integerValue]];
[self.selectTagArray removeObject:str];
} }
[self.confirmAddBtn setTitle:[NSString stringWithFormat:@"确认添加（%d）",self.selectTagArray.count] forState:UIControlStateNormal];
} }
[self.shoppingTableView reloadData]; [self.shoppingTableView reloadData];
} }
...@@ -136,13 +170,21 @@ ...@@ -136,13 +170,21 @@
if ([self.selectTagArray containsObject:[NSString stringWithFormat:@"%d",sender.tag]]) { if ([self.selectTagArray containsObject:[NSString stringWithFormat:@"%d",sender.tag]]) {
[sender setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal]; [sender setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal];
[self.selectTagArray removeObject:[NSString stringWithFormat:@"%d",sender.tag]]; [self.selectTagArray removeObject:[NSString stringWithFormat:@"%d",sender.tag]];
[self.AddArray removeObjectAtIndex:sender.tag];
if (self.isAllSelected) {
[ self.allSelectBtn setBackgroundImage:[UIImage imageNamed:@"box-副本"] forState:UIControlStateNormal];
self.isAllSelected=NO;
}
}else }else
{ {
[sender setBackgroundImage:[UIImage imageNamed:@"bg"] forState:UIControlStateNormal]; [sender setBackgroundImage:[UIImage imageNamed:@"bg"] forState:UIControlStateNormal];
[self.selectTagArray addObject:[NSString stringWithFormat:@"%d",sender.tag]]; [self.selectTagArray addObject:[NSString stringWithFormat:@"%d",sender.tag]];
[self.AddArray addObject:[self.productModelArray objectAtIndex:sender.tag]];
} }
[self.confirmAddBtn setTitle:[NSString stringWithFormat:@"确认添加（%d）",self.selectTagArray.count] forState:UIControlStateNormal];
} }
//第一种排序 倒序排列 //第一种排序 倒序排列
...@@ -178,10 +220,15 @@ ...@@ -178,10 +220,15 @@
[self ErrorMBProgressView:@"必须设置当前客户"]; [self ErrorMBProgressView:@"必须设置当前客户"];
return; return;
} }
TOGoodsEntity *model = [self.productModelArray objectAtIndex_opple:0]; for (int i=0; i<self.AddArray.count; i++) {
TOGoodsEntity *model = [self.AddArray objectAtIndex_opple:i];
[self addGoodsShoppingbags:model complate:^{ [self addGoodsShoppingbags:model complate:^{
NSLog(@"加入购物车完成"); NSLog(@"加入购物车完成");
[self SHOWPrompttext:@"加入购物车成功"];
}]; }];
}
...@@ -220,14 +267,14 @@ ...@@ -220,14 +267,14 @@
} }
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{ {
return textArray.count; return self.productModelArray.count;
} }
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
return 50; return 100;
} }
...@@ -237,10 +284,18 @@ ...@@ -237,10 +284,18 @@
ShoppingCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID]; ShoppingCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) { if (cell == nil) {
cell = [[ShoppingCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID]; cell = [[ShoppingCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
} }
cell.selectedButton.tag=indexPath.row; cell.selectedButton.tag=indexPath.row;
[cell.selectedButton addTarget:self action:@selector(selfctAtIndexpath:) forControlEvents:UIControlEventTouchUpInside]; [cell.selectedButton addTarget:self action:@selector(selfctAtIndexpath:) forControlEvents:UIControlEventTouchUpInside];
TOGoodsEntity *model=[self.productModelArray objectAtIndex:indexPath.row];
NSArray *imageArray = [[[self.productModelArray objectAtIndex_opple:indexPath.row] pictures] componentsSeparatedByString:@","];
[cell.goodsImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray firstObject]] placeholderImage:REPLACEIMAGE];
cell.goodsInformationLabe.text=[NSString stringWithFormat:@"%@\n%@\n%@ ",model.name,model.code,model.size];
cell.tagsPriceLabe.text = [NSString stringWithFormat:@"￥%@",model.tagPrice];
if (self.isAllSelected) { if (self.isAllSelected) {
[cell.selectedButton setBackgroundImage:[UIImage imageNamed:@"bg"] forState:UIControlStateNormal]; [cell.selectedButton setBackgroundImage:[UIImage imageNamed:@"bg"] forState:UIControlStateNormal];
}else }else
...@@ -263,6 +318,9 @@ ...@@ -263,6 +318,9 @@
if (point.x<100 || point.x >ScreenWidth-150||point.y<50||point.y>ScreenHeight-150) { if (point.x<100 || point.x >ScreenWidth-150||point.y<50||point.y>ScreenHeight-150) {
if (self) { if (self) {
if ([self.delegate respondsToSelector:@selector(restShoppingBtnImage)]) {
[self.delegate restShoppingBtnImage];
}
[self.view removeFromSuperview]; [self.view removeFromSuperview];
} }
} }
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 7a9a4c75
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
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 */; };
04F662141CFB700B00384248 /* SecenTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F662131CFB700B00384248 /* SecenTableViewCell.m */; };
04F662171CFB9F4A00384248 /* HelpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F662161CFB9F4A00384248 /* HelpViewController.m */; };
04F9EE181CF2235000BD729F /* ShoppingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F9EE171CF2235000BD729F /* ShoppingView.m */; }; 04F9EE181CF2235000BD729F /* ShoppingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F9EE171CF2235000BD729F /* ShoppingView.m */; };
04F9EE1B1CF22B5900BD729F /* ShoppingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F9EE1A1CF22B5900BD729F /* ShoppingCell.m */; }; 04F9EE1B1CF22B5900BD729F /* ShoppingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F9EE1A1CF22B5900BD729F /* ShoppingCell.m */; };
04F9EE1E1CF25F7300BD729F /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F9EE1D1CF25F7300BD729F /* ShareViewController.m */; }; 04F9EE1E1CF25F7300BD729F /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F9EE1D1CF25F7300BD729F /* ShareViewController.m */; };
...@@ -175,6 +177,10 @@ ...@@ -175,6 +177,10 @@
04A14A271CE0FC5600DAD5F3 /* RightSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RightSubView.m; 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>"; }; 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>"; }; 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FootSubView.m; sourceTree = "<group>"; };
04F662121CFB700B00384248 /* SecenTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecenTableViewCell.h; sourceTree = "<group>"; };
04F662131CFB700B00384248 /* SecenTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecenTableViewCell.m; sourceTree = "<group>"; };
04F662151CFB9F4A00384248 /* HelpViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpViewController.h; sourceTree = "<group>"; };
04F662161CFB9F4A00384248 /* HelpViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpViewController.m; sourceTree = "<group>"; };
04F9EE161CF2235000BD729F /* ShoppingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingView.h; sourceTree = "<group>"; }; 04F9EE161CF2235000BD729F /* ShoppingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingView.h; sourceTree = "<group>"; };
04F9EE171CF2235000BD729F /* ShoppingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingView.m; sourceTree = "<group>"; }; 04F9EE171CF2235000BD729F /* ShoppingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingView.m; sourceTree = "<group>"; };
04F9EE191CF22B5900BD729F /* ShoppingCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingCell.h; sourceTree = "<group>"; }; 04F9EE191CF22B5900BD729F /* ShoppingCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingCell.h; sourceTree = "<group>"; };
...@@ -474,6 +480,8 @@ ...@@ -474,6 +480,8 @@
04F9EE1D1CF25F7300BD729F /* ShareViewController.m */, 04F9EE1D1CF25F7300BD729F /* ShareViewController.m */,
041636BC1CF377F4008CE961 /* CameraView.h */, 041636BC1CF377F4008CE961 /* CameraView.h */,
041636BD1CF377F4008CE961 /* CameraView.m */, 041636BD1CF377F4008CE961 /* CameraView.m */,
04F662151CFB9F4A00384248 /* HelpViewController.h */,
04F662161CFB9F4A00384248 /* HelpViewController.m */,
); );
name = subView; name = subView;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -507,6 +515,8 @@ ...@@ -507,6 +515,8 @@
044CD6F01CEB81350004A715 /* ProductCollectionPictureCell.m */, 044CD6F01CEB81350004A715 /* ProductCollectionPictureCell.m */,
04F9EE191CF22B5900BD729F /* ShoppingCell.h */, 04F9EE191CF22B5900BD729F /* ShoppingCell.h */,
04F9EE1A1CF22B5900BD729F /* ShoppingCell.m */, 04F9EE1A1CF22B5900BD729F /* ShoppingCell.m */,
04F662121CFB700B00384248 /* SecenTableViewCell.h */,
04F662131CFB700B00384248 /* SecenTableViewCell.m */,
); );
name = customCell; name = customCell;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1471,6 +1481,7 @@ ...@@ -1471,6 +1481,7 @@
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */, 2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */, 29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */,
29E384D11CE9C65700888199 /* SearchViewController.m in Sources */, 29E384D11CE9C65700888199 /* SearchViewController.m in Sources */,
04F662171CFB9F4A00384248 /* HelpViewController.m in Sources */,
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */, 2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */, 29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */, 299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
...@@ -1486,6 +1497,7 @@ ...@@ -1486,6 +1497,7 @@
2928F8321CD09E320036D761 /* Toolview.m in Sources */, 2928F8321CD09E320036D761 /* Toolview.m in Sources */,
2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */, 2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */,
041636C21CF395B7008CE961 /* NSObject+UIImagePickerController.m in Sources */, 041636C21CF395B7008CE961 /* NSObject+UIImagePickerController.m in Sources */,
04F662141CFB700B00384248 /* SecenTableViewCell.m in Sources */,
044CD6F11CEB81350004A715 /* ProductCollectionPictureCell.m in Sources */, 044CD6F11CEB81350004A715 /* ProductCollectionPictureCell.m in Sources */,
29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */, 29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */,
29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */, 29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */,
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 7a9a4c75
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies> </dependencies>
...@@ -749,7 +749,7 @@ ...@@ -749,7 +749,7 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
<rect key="frame" x="0.0" y="114" width="1024" height="84"/> <rect key="frame" x="0.0" y="50" width="1024" height="84"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
<rect key="frame" x="0.0" y="0.0" width="1024" height="83"/> <rect key="frame" x="0.0" y="0.0" width="1024" height="83"/>
...@@ -822,7 +822,7 @@ ...@@ -822,7 +822,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="198" width="1024" height="110"/> <rect key="frame" x="0.0" y="134" width="1024" height="110"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
<rect key="frame" x="0.0" y="0.0" width="1024" height="109"/> <rect key="frame" x="0.0" y="0.0" width="1024" height="109"/>
...@@ -899,7 +899,7 @@ ...@@ -899,7 +899,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="90" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="90" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
<rect key="frame" x="0.0" y="308" width="1024" height="90"/> <rect key="frame" x="0.0" y="244" width="1024" height="90"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
<rect key="frame" x="0.0" y="0.0" width="1024" height="89"/> <rect key="frame" x="0.0" y="0.0" width="1024" height="89"/>
...@@ -956,7 +956,7 @@ ...@@ -956,7 +956,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="398" width="1024" height="80"/> <rect key="frame" x="0.0" y="334" width="1024" height="80"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
<rect key="frame" x="0.0" y="0.0" width="1024" height="79"/> <rect key="frame" x="0.0" y="0.0" width="1024" height="79"/>
...@@ -1028,7 +1028,7 @@ ...@@ -1028,7 +1028,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="478" width="1024" height="50"/> <rect key="frame" x="0.0" y="414" width="1024" height="50"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
<rect key="frame" x="0.0" y="0.0" width="1024" height="49"/> <rect key="frame" x="0.0" y="0.0" width="1024" height="49"/>
...@@ -1189,17 +1189,12 @@ ...@@ -1189,17 +1189,12 @@
</collectionViewFlowLayout> </collectionViewFlowLayout>
<cells> <cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell"> <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/> <rect key="frame" x="0.0" y="64" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/> <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="ouS-bk-kdM">
<rect key="frame" x="0.0" y="0.0" width="300" height="214"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.98431372549019602" green="0.96862745098039216" blue="0.92941176470588238" alpha="1" colorSpace="calibratedRGB"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KUt-Kl-mRA"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KUt-Kl-mRA">
<rect key="frame" x="18" y="222" width="226" height="18"/> <rect key="frame" x="18" y="222" width="226" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
...@@ -1229,6 +1224,11 @@ ...@@ -1229,6 +1224,11 @@
<action selector="AddShoppingcarButtonClick:" destination="J5m-0M-uqb" eventType="touchUpInside" id="qsE-nO-ZHl"/> <action selector="AddShoppingcarButtonClick:" destination="J5m-0M-uqb" eventType="touchUpInside" id="qsE-nO-ZHl"/>
</connections> </connections>
</button> </button>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="ouS-bk-kdM">
<rect key="frame" x="0.0" y="0.0" width="300" height="214"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.98431372549019602" green="0.96862745098039216" blue="0.92941176470588238" alpha="1" colorSpace="calibratedRGB"/>
</imageView>
</subviews> </subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view> </view>
......
Lighting/Tools/PrefixHeader.pch
View file @ 7a9a4c75
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
#define KROWS 10 #define KROWS 10
#define RGB(A, B, C, D) [UIColor colorWithRed:(A)/255.0 green:(B)/255.0 blue:(C)/255.0 alpha:(D)]
......
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