caoyunxiao

Lighting/Class/ProductLibraryViewController.m

@@ -9,12 +9,28 @@
 #import "ProductLibraryViewController.h"
 #import "ProductCollectionViewCell.h"
 #import "ProductDetailsViewController.h"
+#import "ScreeningView.h"
+#import "screeningFirstView.h"
+#import "screeningSecondView.h"
 
 
+@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate>
 
+/**
+ *  筛选背景框View
+ */
+@property (nonatomic,strong) ScreeningView *screenView;
 
 
-@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
+/**
+ *  分类View
+ */
+@property (nonatomic,strong) screeningFirstView *screenFirstView;
+
+/**
+ *  筛选View
+ */
+@property (nonatomic,strong) screeningSecondView *screenSecondView;
 
 @end
 
@@ -66,6 +82,7 @@
     screeningbutton.titleLabel.font = [UIFont systemFontOfSize:15];
     [screeningbutton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     [screeningbutton setTitleColor:kMainBlueColor forState:UIControlStateSelected];
+    [screeningbutton addTarget:self action:@selector(ScreeningButtonClick) forControlEvents:UIControlEventTouchUpInside];
     screeningbutton.backgroundColor = kMainBlueColor;
     [self.view addSubview:screeningbutton];
     
@@ -75,6 +92,7 @@
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     ProductCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"productcell" forIndexPath:indexPath];
+    
     return cell;
 }
 
@@ -93,14 +111,108 @@
 
 
 
+#pragma mark -筛选
+- (void)ScreeningButtonClick
+{
+    self.screenView = [[[NSBundle mainBundle] loadNibNamed:@"ScreeningView" owner:self options:nil]firstObject];
+    self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
+    self.screenView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
+    
+    //点击手势
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(DismissScreenView)];
+    tap.delegate = self;
+    tap.cancelsTouchesInView = NO;
+    [self.screenView addGestureRecognizer:tap];
+    self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
+    [self.view.window addSubview:self.screenView];
+    self.screenView.alpha = 0;
+    
+    //监听Segmented菜单
+    [self.screenView.sortingSegmented addTarget:self action:@selector(sortingSegmentedClick:) forControlEvents:UIControlEventValueChanged];
+    
+    [self CreateClassificationView];
+    
+    [UIView animateWithDuration:0.2 animations:^{
+        
+        self.screenView.alpha = 1;
+        
+    }];
+}
+
+
+
+
 
 
+#pragma mark -分类、筛选view切换
+- (void)sortingSegmentedClick:(UISegmentedControl *)sender {
+    
+    switch (sender.selectedSegmentIndex) {
+        case 0://分类
+        {
+            NSLog(@"分类");
+            [self.screenSecondView removeFromSuperview];
+            [self CreateClassificationView];
+        }
+            break;
+        case 1://筛选
+        {
+            NSLog(@"筛选");
+            [self.screenFirstView removeFromSuperview];
+            [self CreateScreenSubView];
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+
 
 
 
+#pragma mark -创建分类View
+- (void)CreateClassificationView
+{
+    //分类View
+    self.screenFirstView = [[[NSBundle mainBundle] loadNibNamed:@"screeningFirstView" owner:self options:nil] firstObject];
+    self.screenFirstView.frame = CGRectMake(0, 50, 470, 310);
+    [self.screenView.backgroundView addSubview:self.screenFirstView];
+}
+
 
+#pragma mark -创建筛选选项View
+- (void)CreateScreenSubView
+{
+    self.screenSecondView = [[[NSBundle mainBundle] loadNibNamed:@"screeningSecondView" owner:self options:nil] firstObject];
+    self.screenSecondView.frame = CGRectMake(0, 50, 470, 310);
+    [self.screenView.backgroundView addSubview:self.screenSecondView];
+}
 
+#pragma mark -移除筛选框
+- (void)DismissScreenView
+{
+    [UIView animateWithDuration:0.2 animations:^{
+        
+        self.screenView.alpha = 0;
+        
+    }completion:^(BOOL finished) {
+        
+        [self.screenView removeFromSuperview];
+        
+    }];
+}
 
+#pragma mark -UIGestureRecognizerDelegate代理方法
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
+{
+    //取消子视图的的时间穿透，否则子视图的点击无效，会被传递到父视图响应
+    if (CGRectContainsPoint(self.screenView.backgroundView.frame, [touch locationInView:self.screenView])) {
+        
+        return NO;
+    }
+    return YES;
+}
 
 
 - (void)didReceiveMemoryWarning {

Lighting/Class/ScreeningFirstCollectionViewCell.h

+//
+//  ScreeningFirstCollectionViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/8.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ScreeningFirstCollectionViewCell : UICollectionViewCell
+
+
+
+/**
+ *  显示的labe
+ */
+@property (nonatomic,strong) UILabel *titleLabe;
+
+
+@end

Lighting/Class/ScreeningFirstCollectionViewCell.m

+//
+//  ScreeningFirstCollectionViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/8.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "ScreeningFirstCollectionViewCell.h"
+
+@implementation ScreeningFirstCollectionViewCell
+
+
+- (instancetype )initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        
+        [self uiConfigAction];
+    }
+    return self;
+}
+
+
+#pragma mark -布局
+- (void)uiConfigAction
+{
+    self.contentView.layer.masksToBounds = YES;
+    self.contentView.layer.cornerRadius = kCornerRadius;
+    self.contentView.layer.borderWidth = 1;
+    self.contentView.layer.borderColor = kMainBlueColor.CGColor;
+    self.titleLabe = [[UILabel alloc]initWithFrame:self.contentView.bounds];
+    self.titleLabe.textColor = kMainBlueColor;
+    self.titleLabe.textAlignment = NSTextAlignmentCenter;
+    [self.contentView addSubview:self.titleLabe];
+    
+    
+}
+
+
+@end

Lighting/Class/ScreeningView.h

@@ -10,4 +10,63 @@
 
 @interface ScreeningView : UIView
 
+
+/**
+ *  风格按钮
+ */
+@property (weak, nonatomic) IBOutlet UIButton *styleButton;
+
+/**
+ *  类型按钮
+ */
+@property (weak, nonatomic) IBOutlet UIButton *typeButton;
+
+/**
+ *  空间按钮
+ */
+@property (weak, nonatomic) IBOutlet UIButton *spaceButton;
+
+/**
+ *  材质按钮
+ */
+@property (weak, nonatomic) IBOutlet UIButton *materialButton;
+
+
+/**
+ *  价格按钮
+ */
+@property (weak, nonatomic) IBOutlet UIButton *spriceButton;
+
+
+/**
+ *  背景View
+ */
+@property (weak, nonatomic) IBOutlet UIView *backgroundView;
+
+/**
+ *  筛选、分类切换
+ */
+@property (weak, nonatomic) IBOutlet UISegmentedControl *sortingSegmented;
+
+/**
+ *  阴影View
+ */
+@property (weak, nonatomic) IBOutlet UIView *shadowView;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 @end

Lighting/Class/ScreeningView.m

@@ -18,4 +18,104 @@
 }
 */
 
+
+- (void)awakeFromNib
+{
+    [self uiConfigAction];
+}
+
+
+#pragma mark -UI
+- (void)uiConfigAction
+{
+    self.styleButton.layer.masksToBounds = YES;
+    self.styleButton.layer.cornerRadius = kSelectedCornerRadius;
+    self.typeButton.layer.masksToBounds = YES;
+    self.typeButton.layer.cornerRadius = kSelectedCornerRadius;
+    self.spaceButton.layer.masksToBounds = YES;
+    self.spaceButton.layer.cornerRadius = kSelectedCornerRadius;
+    self.materialButton.layer.masksToBounds = YES;
+    self.materialButton.layer.cornerRadius = kSelectedCornerRadius;
+    self.spriceButton.layer.masksToBounds = YES;
+    self.spriceButton.layer.cornerRadius = kSelectedCornerRadius;
+    
+    //默认选中风格按钮
+    self.styleButton.selected = YES;
+    self.styleButton.backgroundColor = kMainBlueColor;
+    
+//    //添加阴影
+//    self.shadowView.layer.shadowColor = [UIColor blackColor].CGColor;
+//    self.shadowView.layer.shadowRadius = 4;
+//    self.shadowView.layer.shadowOpacity = 0.8;
+}
+
+
+#pragma mark -筛选按钮(风格、类型、空间、材质、价格)
+- (IBAction)screeningButtonClick:(UIButton *)sender {
+    
+    switch (sender.tag) {
+        case 100://风格
+        {
+            
+        }
+            break;
+        case 101://类型
+        {
+            
+        }
+            break;
+        case 102://空间
+        {
+            
+        }
+            break;
+        case 103://材质
+        {
+            
+        }
+            break;
+        case 104://价格
+        {
+            
+        }
+            break;
+            
+        default:
+            break;
+    }
+    
+    [self RemoveAllButtonisSelected];
+    sender.selected = YES;
+    sender.backgroundColor = kMainBlueColor;
+}
+
+
+#pragma mark -取消所有筛选条件按钮的选中
+- (void)RemoveAllButtonisSelected
+{
+    for (UIView *view in self.backgroundView.subviews) {
+        
+        if ([view isKindOfClass:[UIButton class]]) {
+            
+            UIButton *button = (UIButton *)view;
+            button.selected = NO;
+            button.backgroundColor = [UIColor whiteColor];
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 @end

Lighting/Class/Shoppingcart/GenerateOrdersViewController.m

@@ -261,6 +261,7 @@
 #pragma mark -城市选择器
 - (void)SelectedCityButtonClick
 {
+
     self.citySelecteview.frame = CGRectMake(0, self.addressView.popupView.frame.size.height, self.addressView.popupView.frame.size.width, 160);
     [self.addressView.popupView addSubview:self.citySelecteview];
     [self.citySelecteview.selectedCityButton addTarget:self action:@selector(CompleteButton) forControlEvents:UIControlEventTouchUpInside];

Lighting/Class/Tabbar/Toolview.m

@@ -40,9 +40,10 @@
 {
     //阴影
     self.layer.shadowColor = [UIColor blackColor].CGColor;
-    self.layer.shadowRadius = 6;
+    self.layer.shadowRadius = 4;
     self.layer.shadowOpacity = 0.8;
-    
+    self.layer.shadowOffset = CGSizeMake(0,0);
+
     //图标
     UIImageView *iconImage = [[UIImageView alloc]initWithFrame:CGRectMake(50, 10, 100, 45)];
     iconImage.image = TCImage(@"weibo");

Lighting/Class/screeningFirstView.h

+//
+//  screeningFirstView.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/8.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface screeningFirstView : UIView<UICollectionViewDelegate,UICollectionViewDataSource>
+
+
+/**
+ *  分类collectionView
+ */
+@property (weak, nonatomic) IBOutlet UICollectionView *classificationCollectionView;
+
+/**
+ *  分类layout
+ */
+@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *classificationLayout;
+
+
+@end

Lighting/Class/screeningFirstView.m

+//
+//  screeningFirstView.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/8.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "screeningFirstView.h"
+#import "ScreeningFirstCollectionViewCell.h"
+
+#define WIDTH self.frame.size.width
+
+@implementation screeningFirstView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+
+
+- (void)awakeFromNib
+{
+    [self uiConfigAction];
+}
+
+#pragma mark -UI
+- (void)uiConfigAction
+{
+    
+    self.classificationLayout.itemSize = CGSizeMake((WIDTH-120)/4, 35);
+    self.classificationLayout.minimumLineSpacing = 30;
+    self.classificationLayout.minimumInteritemSpacing = 10;
+    self.classificationLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
+    [self.classificationCollectionView registerClass:[ScreeningFirstCollectionViewCell class] forCellWithReuseIdentifier:@"cell"];
+    self.classificationCollectionView.dataSource = self;
+    self.classificationCollectionView.delegate = self;
+    
+}
+
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    ScreeningFirstCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
+    cell.titleLabe.text = @"壁灯";
+    return cell;
+    
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return 20;
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    NSLog(@"%ld",indexPath.item);
+}
+
+
+
+
+@end

Lighting/Class/screeningFirstView.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="CYc-bC-tUy" customClass="screeningFirstView">
+            <rect key="frame" x="0.0" y="0.0" width="470" height="310"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="JPM-oq-YgX">
+                    <rect key="frame" x="0.0" y="0.0" width="470" height="310"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Ges-me-ldn">
+                        <size key="itemSize" width="50" height="50"/>
+                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                    </collectionViewFlowLayout>
+                </collectionView>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="classificationCollectionView" destination="JPM-oq-YgX" id="E1x-TZ-PG8"/>
+                <outlet property="classificationLayout" destination="Ges-me-ldn" id="eiB-Jy-RKc"/>
+            </connections>
+            <point key="canvasLocation" x="225" y="1089"/>
+        </view>
+    </objects>
+</document>

Lighting/Class/screeningSecondView.h

+//
+//  screeningSecondView.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/8.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface screeningSecondView : UIView<UITableViewDelegate,UITableViewDataSource,UICollectionViewDelegate,UICollectionViewDataSource>
+
+
+
+
+
+/**
+ *  筛选tableview
+ */
+@property (weak, nonatomic) IBOutlet UITableView *screeningTableview;
+
+
+/**
+ *  筛选collectionView
+ */
+@property (weak, nonatomic) IBOutlet UICollectionView *screeningCollectionView;
+
+
+/**
+ *  筛选layout
+ */
+@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *screeningLayout;
+
+@end

Lighting/Class/screeningSecondView.m

+//
+//  screeningSecondView.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/8.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "screeningSecondView.h"
+#import "ScreeningFirstCollectionViewCell.h"
+
+#define WIDTH self.screeningCollectionView.frame.size.width
+
+@implementation screeningSecondView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+
+
+
+- (void)awakeFromNib
+{
+    [self uiConfigAction];
+}
+
+
+
+#pragma mark - 布局
+- (void)uiConfigAction
+{
+    self.screeningTableview.delegate = self;
+    self.screeningTableview.dataSource = self;
+    self.screeningTableview.backgroundColor = [UIColor lightGrayColor];
+    [self.screeningTableview registerClass:[UITableViewCell class] forCellReuseIdentifier:@"tableviewcell"];
+    
+    self.screeningLayout.itemSize = CGSizeMake((WIDTH-127)/3, 35);
+    self.screeningLayout.minimumLineSpacing = 30;
+    self.screeningLayout.minimumInteritemSpacing = 10;
+    self.screeningLayout.sectionInset = UIEdgeInsetsMake(20, 30, 20, 30);
+    [self.screeningCollectionView registerClass:[ScreeningFirstCollectionViewCell class] forCellWithReuseIdentifier:@"cell"];
+    self.screeningCollectionView.dataSource = self;
+    self.screeningCollectionView.delegate = self;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"tableviewcell" forIndexPath:indexPath];
+    cell.textLabel.text = @"全部";
+    cell.backgroundColor = [UIColor clearColor];
+    cell.textLabel.textAlignment = NSTextAlignmentCenter;
+    return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 5;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 70;
+}
+
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    ScreeningFirstCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
+    cell.titleLabe.text = @"壁灯";
+    return cell;
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return 20;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@end

Lighting/Class/screeningSecondView.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="screeningSecondView">
+            <rect key="frame" x="0.0" y="0.0" width="470" height="310"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="0kR-UB-h2z">
+                    <rect key="frame" x="390" y="0.0" width="80" height="310"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                </tableView>
+                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsVerticalScrollIndicator="NO" dataMode="none" id="M9i-37-c6i">
+                    <rect key="frame" x="0.0" y="0.0" width="390" height="310"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="8xy-wK-EQd">
+                        <size key="itemSize" width="50" height="50"/>
+                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                    </collectionViewFlowLayout>
+                </collectionView>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="screeningCollectionView" destination="M9i-37-c6i" id="wpH-q5-dxp"/>
+                <outlet property="screeningLayout" destination="8xy-wK-EQd" id="e2b-GV-sFe"/>
+                <outlet property="screeningTableview" destination="0kR-UB-h2z" id="c5h-EF-OgK"/>
+            </connections>
+            <point key="canvasLocation" x="484" y="256"/>
+        </view>
+    </objects>
+</document>

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -38,6 +38,11 @@
 		29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; };
 		29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29807C611CD20C2A00F111B8 /* Images.xcassets */; };
 		29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */; };
+		29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EB31CDF1EAA001A484F /* screeningSecondView.m */; };
+		29834EB61CDF1EB6001A484F /* screeningSecondView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29834EB51CDF1EB6001A484F /* screeningSecondView.xib */; };
+		29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EB81CDF1FB3001A484F /* screeningFirstView.m */; };
+		29834EBB1CDF1FBC001A484F /* screeningFirstView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29834EBA1CDF1FBC001A484F /* screeningFirstView.xib */; };
+		29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EBF1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m */; };
 		299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */; };
 		2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */; };
 		2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */; };
@@ -130,6 +135,14 @@
 		29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		29807C611CD20C2A00F111B8 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; };
+		29834EB21CDF1EAA001A484F /* screeningSecondView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screeningSecondView.h; sourceTree = "<group>"; };
+		29834EB31CDF1EAA001A484F /* screeningSecondView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screeningSecondView.m; sourceTree = "<group>"; };
+		29834EB51CDF1EB6001A484F /* screeningSecondView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = screeningSecondView.xib; sourceTree = "<group>"; };
+		29834EB71CDF1FB3001A484F /* screeningFirstView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screeningFirstView.h; sourceTree = "<group>"; };
+		29834EB81CDF1FB3001A484F /* screeningFirstView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screeningFirstView.m; sourceTree = "<group>"; };
+		29834EBA1CDF1FBC001A484F /* screeningFirstView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = screeningFirstView.xib; sourceTree = "<group>"; };
+		29834EBE1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningFirstCollectionViewCell.h; sourceTree = "<group>"; };
+		29834EBF1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningFirstCollectionViewCell.m; sourceTree = "<group>"; };
 		299249351CDB3C6500786B1E /* GenerateOrdersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersViewController.h; sourceTree = "<group>"; };
 		299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersViewController.m; sourceTree = "<group>"; };
 		299249381CDB3E4500786B1E /* GenerateOrdersTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersTableViewCell.h; sourceTree = "<group>"; };
@@ -538,6 +551,28 @@
 			name = Controller;
 			sourceTree = "<group>";
 		};
+		29834EBC1CDF21D8001A484F /* screeningSecondView */ = {
+			isa = PBXGroup;
+			children = (
+				29834EB21CDF1EAA001A484F /* screeningSecondView.h */,
+				29834EB31CDF1EAA001A484F /* screeningSecondView.m */,
+				29834EB51CDF1EB6001A484F /* screeningSecondView.xib */,
+			);
+			name = screeningSecondView;
+			sourceTree = "<group>";
+		};
+		29834EBD1CDF21EF001A484F /* screeningFirstView */ = {
+			isa = PBXGroup;
+			children = (
+				29834EB71CDF1FB3001A484F /* screeningFirstView.h */,
+				29834EB81CDF1FB3001A484F /* screeningFirstView.m */,
+				29834EBA1CDF1FBC001A484F /* screeningFirstView.xib */,
+				29834EBE1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.h */,
+				29834EBF1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m */,
+			);
+			name = screeningFirstView;
+			sourceTree = "<group>";
+		};
 		299249411CDB517A00786B1E /* ModifytheShippingAddressView */ = {
 			isa = PBXGroup;
 			children = (
@@ -666,6 +701,8 @@
 				29360C2D1CDDC47E002A5D89 /* ScreeningView.h */,
 				29360C2E1CDDC47E002A5D89 /* ScreeningView.m */,
 				29360C301CDDC487002A5D89 /* ScreeningView.xib */,
+				29834EBD1CDF21EF001A484F /* screeningFirstView */,
+				29834EBC1CDF21D8001A484F /* screeningSecondView */,
 			);
 			name = view;
 			sourceTree = "<group>";
@@ -835,7 +872,9 @@
 				29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
 				29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */,
 				29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
+				29834EB61CDF1EB6001A484F /* screeningSecondView.xib in Resources */,
 				299249461CDB51C800786B1E /* ModifyShippingAddressView.xib in Resources */,
+				29834EBB1CDF1FBC001A484F /* screeningFirstView.xib in Resources */,
 				29EAAEAC1CDCA28300C4DBA2 /* city.json in Resources */,
 				2949BAC41CD3086F0049385A /* weibo.png in Resources */,
 				29EAAE971CDC4B2900C4DBA2 /* The Swift Programming Language 中文版 - v1.2.pdf in Resources */,
@@ -930,6 +969,7 @@
 				2962D0711CD1A58B0058829D /* RightViewController.m in Sources */,
 				29EAAEA51CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m in Sources */,
 				29706DA91CD082990003C412 /* AppDelegate.m in Sources */,
+				29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */,
 				29706DA61CD082990003C412 /* main.m in Sources */,
 				29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */,
 				299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */,
@@ -937,6 +977,7 @@
 				299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */,
 				2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */,
 				29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
+				29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */,
 				299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */,
 				299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */,
 				2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */,
@@ -949,6 +990,7 @@
 				299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */,
 				2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */,
 				29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */,
+				29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */,
 				29BB277D1CD9DFCB009A0813 /* CustomerManagementViewController.m in Sources */,
 				2962D06D1CD1A43A0058829D /* ClientViewController.m in Sources */,
 				29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */,

Lighting/Tools/BaseViewController.m

@@ -65,10 +65,10 @@
     {
         ShowText = @"加载中";
     }
-    self.TCHud.labelText = ShowText;
     self.TCHud.animationType = MBProgressHUDAnimationZoom;
     self.TCHud.mode = MBProgressHUDModeIndeterminate;
-    self.TCHud.activityIndicatorColor = [UIColor redColor];
+    self.TCHud.color = [UIColor clearColor];
+    self.TCHud.activityIndicatorColor = kMainBlueColor;
     self.TCHud.removeFromSuperViewOnHide = YES;
 }
 

Lighting/Tools/PrefixHeader.pch

@@ -111,6 +111,10 @@
 #define kMainGrayColor [UIColor colorWithRed:241/255.0 green:241/255.0 blue:241/255.0 alpha:1.0]
 
 
+/**
+ *  筛选框复选按钮圆角尺寸
+ */
+#define kSelectedCornerRadius 20