完成商品列表的显示、筛选功能的实现、场景模块接口对接成功-暂时无数据

Lighting/Class/Login/LoginViewController.m

@@ -83,8 +83,8 @@
 - (IBAction)LoginButtonClick:(UIButton *)sender {
 
     
-    [self SetTheRootViewController];
-    return;
+//    [self SetTheRootViewController];
+//    return;
     
     if (self.userName.text.length == 0) {
 

Lighting/Class/OrderdetailsViewController.m

@@ -13,6 +13,7 @@
 #import "CommodityListTableViewCell.h"
 #import "AllpriceTableViewCell.h"
 #import "AttachmentInformationTableViewCell.h"
+#import "SettlementViewController.h"
 
 @interface OrderdetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -87,6 +88,7 @@
     [payButton setTitle:@"支付" forState:UIControlStateNormal];
     payButton.titleLabel.font = [UIFont systemFontOfSize:12];
     [payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [payButton addTarget:self action:@selector(PayButtonClick) forControlEvents:UIControlEventTouchUpInside];
     payButton.backgroundColor = kMainBlueColor;
     payButton.layer.masksToBounds = YES;
     payButton.layer.cornerRadius = kCornerRadius;
@@ -95,6 +97,21 @@
 }
 
 
+
+
+#pragma mark -调出支付框
+- (void)PayButtonClick
+{
+    SettlementViewController *settlement = [[SettlementViewController alloc]init];
+    settlement.preferredContentSize = CGSizeMake(380, 500);
+    settlement.modalPresentationStyle = UIModalPresentationFormSheet;
+    UIPopoverPresentationController *pop = settlement.popoverPresentationController;
+    pop.sourceView = settlement.view;
+    pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
+    [self presentViewController:settlement animated:YES completion:nil];
+}
+
+
 #pragma mark - Table view data source
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     

Lighting/Class/SceneLibraryViewController.m

@@ -11,6 +11,17 @@
 
 @interface SceneLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
 
+
+
+/**
+ *  筛选数据源
+ */
+@property (nonatomic,strong)  SceneFilter *filter;
+
+/**
+ *  列表数据
+ */
+@property (nonatomic,strong) SceneResponse *response;
 @end
 
 @implementation SceneLibraryViewController
@@ -20,6 +31,8 @@
     // Do any additional setup after loading the view.
     
     [self uiConfigAction];
+    [self getdatasAction];
+    [self getSceneLibrarydatas];
 }
 
 #pragma mark -UI
@@ -38,12 +51,59 @@
 - (void)getdatasAction
 {
   
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/getSceneFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        [self RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+          self.filter = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
     
+        }
+        else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
         
+    } WithErrorCodeBlock:^(id errorCodeValue) {
         
+    } WithFailureBlock:^(id error) {
+        
+        [self RemoveMBProgressHUDLoding];
+    }];
 }
 
 
+#pragma mark -获取场景列表数据
+- (void)getSceneLibrarydatas
+{
+    
+    SceneCondition *condition = [[SceneCondition alloc]init];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = 0;
+    condition.page = page;
+    
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
+        
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            
+            NSLog(@"%@",returnValue);
+            self.response = [[SceneResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            
+        }
+        else
+        {
+            [self ErrorMBProgressView:returnValue[@"message"]];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+    } WithFailureBlock:^(id error) {
+        
+        
+    }];
+}
+
 
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath

Lighting/Class/ScreeningCollectionReusableView.m

@@ -24,16 +24,24 @@
 #pragma mark -UI
 - (void)uiCOnfigAction
 {
+    self.sectionLabe = [[UILabel alloc]init];
     self.sectionLabe.layer.masksToBounds = YES;
     self.sectionLabe.layer.cornerRadius = kCornerRadius;
-    self.sectionLabe.layer.borderWidth = 1;
-    self.sectionLabe.layer.borderColor = kMainBlueColor.CGColor;
-    self.sectionLabe = [[UILabel alloc]initWithFrame:self.bounds];
     self.sectionLabe.textColor = kMainBlueColor;
     self.sectionLabe.font = [UIFont systemFontOfSize:12];
-    self.sectionLabe.textAlignment = NSTextAlignmentCenter;
     [self addSubview:self.sectionLabe];
+    [self.sectionLabe mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.size.mas_equalTo(CGSizeMake((self.frame.size.width-120)/4, 35));
+        make.top.equalTo(self.mas_top).offset(20);
+        make.left.equalTo(self.mas_left).offset(20);
+        
+    }];
 }
 
 
+
+
+
+
 @end

Lighting/Class/ScreeningSecondCollectionReusableView.h

@@ -13,9 +13,15 @@
 
 
 /**
- *  区头按钮
+ *  区头按钮(全部)
  */
 @property (nonatomic,strong) UIButton *alltitleButton;
 
 
+/**
+ *  副标题按钮
+ */
+@property (nonatomic,strong) UIButton *subTitleButton;
+
+
 @end

Lighting/Class/ScreeningSecondCollectionReusableView.m

@@ -43,6 +43,19 @@
     }];
     
     
+    //副标题按钮
+    self.subTitleButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    [self.subTitleButton setTitle:@"副标题" forState:UIControlStateNormal];
+    [self addSubview:self.subTitleButton];
+    self.subTitleButton.titleLabel.font = [UIFont systemFontOfSize:12];
+    [self.subTitleButton setTitleColor:kMainBlueColor forState:UIControlStateNormal];
+    [self.subTitleButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.size.mas_equalTo(CGSizeMake((WIDTH-127)/3, 35));
+        make.right.equalTo(self.mas_right).offset(-30);
+        make.top.equalTo(self.mas_top).offset(75);
+    }];
+    
     
 }
 

Lighting/Class/SettlementViewController.h

+//
+//  SettlementViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/11.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface SettlementViewController : BaseViewController
+
+
+
+
+/**
+ *  
+ */
+
+
+@end

Lighting/Class/SettlementViewController.m

+//
+//  SettlementViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 16/5/11.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "SettlementViewController.h"
+
+@interface SettlementViewController ()
+
+@end
+
+@implementation SettlementViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+}
+
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    self.view.superview.layer.cornerRadius = 0;
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

Lighting/Class/Shoppingcart/AddressViewController.xib

@@ -54,25 +54,25 @@
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="收货人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Yb-LU-Kjn">
                             <rect key="frame" x="28" y="78" width="50" height="21"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="手机号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j1Y-ze-xvQ">
                             <rect key="frame" x="28" y="123" width="50" height="21"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="地址选择：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6K-Vq-zSy">
                             <rect key="frame" x="28" y="168" width="70" height="18"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="详细地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZxP-Pp-hw9">
                             <rect key="frame" x="28" y="212" width="65" height="21"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>

Lighting/Class/screeningFirstView.h

@@ -8,6 +8,19 @@
 
 #import <UIKit/UIKit.h>
 
+
+/**
+ *  选中item
+ */
+@protocol SelectedCollectionItemDelegate <NSObject>
+
+//传回code
+- (void)selectedItem:(NSString *)typecode;
+
+@end
+
+
+
 @interface screeningFirstView : UIView<UICollectionViewDelegate,UICollectionViewDataSource>
 
 
@@ -31,4 +44,25 @@
  */
 @property (nonatomic) NSInteger selectedIndex;
 
+
+/**
+ *  代理
+ */
+@property (nonatomic,assign) id<SelectedCollectionItemDelegate>delegate;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 @end

Lighting/Class/screeningFirstView.m

@@ -61,16 +61,26 @@
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     ScreeningFirstCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
-    cell.titleLabe.text = [self.datasArray objectAtIndex_opple:indexPath.row];
-    return cell;
+    if (self.selectedIndex == 1) {
+        
+        cell.titleLabe.text = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] name];
+    }
+    else
+    {
+        cell.titleLabe.text = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
+    }
     
+    return cell;
 }
 
+
+
+
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
     if (self.selectedIndex == 1) {
         
-//        return [[self.datasArray objectAtIndex_opple:section][@"children"] count];
+        return [[[self.datasArray objectAtIndex_opple:section] children] count];
         
     }
     return self.datasArray.count;
@@ -78,7 +88,18 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    NSLog(@"选中%ld",indexPath.item);
+    if ([self.delegate respondsToSelector:@selector(selectedItem:)]) {
+        
+        if (self.selectedIndex == 1 ) {
+            
+            [self.delegate selectedItem:[[[self.datasArray objectAtIndex_opple:indexPath.section] children][indexPath.row] fid]];
+            
+        }else
+        {
+            [self.delegate selectedItem:[[self.datasArray objectAtIndex_opple:indexPath.row] typecode]];
+        }
+        
+    }
 }
 
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
@@ -94,7 +115,7 @@
     
     if (self.selectedIndex == 1) {
         
-       return CGSizeMake(200, 40);
+       return CGSizeMake(200, 75);
     }
     return CGSizeMake(0, 0);
 }
@@ -104,7 +125,7 @@
 {
     
     ScreeningCollectionReusableView *sectionView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"Sectioncell" forIndexPath:indexPath];
-    sectionView.backgroundColor = [UIColor redColor];
+    sectionView.sectionLabe.text = [[self.datasArray objectAtIndex_opple:indexPath.section] name];
     return sectionView;
 }
 

Lighting/Class/screeningSecondView.h

@@ -14,8 +14,17 @@
  */
 @protocol TableviewSelectedIndexdelegate <NSObject>
 
+
+//UITableview
 - (void)tableSelectedindex:(NSInteger)index;
 
+
+//UICollectionView选中后返回所有被选中的类型
+- (void)collectionSelectedindexWithStyleCode:(NSString *)styleCode withCategories:(NSString *)categoriesCode withSpace:(NSString *)spaceCode withMaterial:(NSString *)materialCode withPrice:(NSString *)priceTitle;
+
+//显示筛选结果
+- (void)ShowScreeningResponse;
+
 @end
 
 
@@ -61,10 +70,22 @@
 @property (nonatomic,assign) id<TableviewSelectedIndexdelegate>delegate;
 
 
+/**
+ *  筛选按钮选中的index
+ */
+@property (nonatomic) NSInteger selectedIndex;
 
 
 
+/**
+ *  通过复选搜索到的总条数
+ */
+@property (nonatomic,assign) NSInteger totalNumber;
 
 
+/**
+ *  默认数据源
+ */
+@property (nonatomic,strong) NSMutableArray *defaultDatasArray;
 
 @end

Lighting/Class/screeningSecondView.m

@@ -29,6 +29,13 @@
 - (void)awakeFromNib
 {
 //    [self uiConfigAction];
+    self.defaultDatasArray = [NSMutableArray array];
+    for (int i=0; i<5; i++) {
+        
+        NSDictionary *defaultDict = @{@"typecode":@" ",@"typename":@"全部"};
+        [self.defaultDatasArray addObject:defaultDict];
+    }
+    [self uiConfigAction];
 }
 
 
@@ -36,8 +43,6 @@
 - (void)setDatasArray:(NSArray *)datasArray
 {
     _datasArray = datasArray;
-    [self uiConfigAction];
-    [self.screeningTableview reloadData];
     [self.screeningCollectionView reloadData];
 }
 
@@ -45,15 +50,17 @@
 #pragma mark - 布局
 - (void)uiConfigAction
 {
-    
     self.screeningTableview.delegate = self;
     self.screeningTableview.dataSource = self;
+    self.screeningTableview.tableFooterView = [UIView new];
     self.screeningTableview.backgroundColor = [UIColor grayColor];
     [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.screeningResultButton.layer.masksToBounds = YES;
+    self.screeningResultButton.layer.cornerRadius = kCornerRadius;
     [self.screeningCollectionView registerClass:[ScreeningFirstCollectionViewCell class] forCellWithReuseIdentifier:@"cell"];
     [self.screeningCollectionView registerClass:[ScreeningSecondCollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"screeningcell"];
     self.screeningCollectionView.dataSource = self;
@@ -65,7 +72,8 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"tableviewcell" forIndexPath:indexPath];
-    cell.textLabel.text = @"全部";
+    cell.textLabel.text = [self.defaultDatasArray objectAtIndex_opple:indexPath.row][@"typename"];
+    cell.textLabel.font = [UIFont systemFontOfSize:10];
     cell.selectedBackgroundView.backgroundColor = [UIColor whiteColor];
     cell.backgroundColor = [UIColor grayColor];
     cell.textLabel.textAlignment = NSTextAlignmentCenter;
@@ -74,7 +82,7 @@
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 5;
+    return self.defaultDatasArray.count;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -94,12 +102,24 @@
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     ScreeningFirstCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
-    cell.titleLabe.text = [self.datasArray objectAtIndex_opple:indexPath.item];
+    if (self.selectedIndex == 1) {
+        
+        cell.titleLabe.text = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] name];
+    }
+    else
+    {
+        cell.titleLabe.text = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
+    }
     return cell;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
+    if (self.selectedIndex == 1) {
+        
+        return [[[self.datasArray objectAtIndex_opple:section] children] count];
+        
+    }
     return self.datasArray.count;
 }
 
@@ -108,29 +128,98 @@
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
     ScreeningSecondCollectionReusableView *cell = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"screeningcell" forIndexPath:indexPath];
+    
+    self.selectedIndex == 1?(cell.subTitleButton.hidden = NO):(cell.subTitleButton.hidden = YES);
+    [cell.alltitleButton addTarget:self action:@selector(AllButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    
+    if (self.selectedIndex == 1) {
+       
+        NSString *subTitle = [[self.datasArray objectAtIndex_opple:indexPath.section] name];
+        [cell.subTitleButton setTitle:subTitle forState:UIControlStateNormal];
+    }
+
     return cell;
 }
 
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
 
+    if (self.selectedIndex == 1 && section == 0) {
+        
+        return CGSizeMake(self.screeningCollectionView.frame.size.width, 130);
+    }
     return CGSizeMake(self.screeningCollectionView.frame.size.width, 75);
 }
 
 
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    //选中后的tableview赋值，并传递typecode筛选商品
+    UITableViewCell *cell = [self.screeningTableview cellForRowAtIndexPath:[NSIndexPath indexPathForRow:self.selectedIndex inSection:0]];
     
+    //选中类型的文本
+    NSString *selectedTitle = nil;
+    //选中的key
+    NSString *selectedTypecode = nil;
+    if (self.selectedIndex == 1) {
+        
+        selectedTitle = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] name];
+        selectedTypecode = [[[[self.datasArray objectAtIndex_opple:indexPath.section] children] objectAtIndex_opple:indexPath.row] fid];
+    }
+    else
+    {
+        selectedTitle = [[self.datasArray objectAtIndex_opple:indexPath.row] typename];
+        selectedTypecode = [[self.datasArray objectAtIndex_opple:indexPath.row] typecode];
+    }
+    
+    NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:selectedTitle,@"typename",selectedTypecode,@"typecode", nil];
+    [self.defaultDatasArray replaceObjectAtIndex:self.selectedIndex withObject:dict];
+    cell.textLabel.text = selectedTitle;
+    [self JudgeDelegateIsPerformWithPassParamater];
+}
+
+
+#pragma mark -区头的全部按钮点击
+- (void)AllButtonClick:(UIButton *)button
+{
+    UITableViewCell *cell = [self.screeningTableview cellForRowAtIndexPath:[NSIndexPath indexPathForRow:self.selectedIndex inSection:0]];
+    cell.textLabel.text = @"全部";
+    NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:button.currentTitle,@"typename", nil];
+    [self.defaultDatasArray replaceObjectAtIndex:self.selectedIndex withObject:dict];
+    [self JudgeDelegateIsPerformWithPassParamater];
+
+}
+
+
+#pragma mark -判断代理是否被执行，并传递复选的参数
+- (void)JudgeDelegateIsPerformWithPassParamater
+{
+    if ([self.delegate respondsToSelector:@selector(collectionSelectedindexWithStyleCode:withCategories:withSpace:withMaterial:withPrice:)]) {
+        
+        //传回选中的所有条件
+        [self.delegate collectionSelectedindexWithStyleCode:[self.defaultDatasArray objectAtIndex_opple:0][@"typecode"] withCategories:[self.defaultDatasArray objectAtIndex_opple:1][@"typecode"] withSpace:[self.defaultDatasArray objectAtIndex_opple:2][@"typecode"] withMaterial:[self.defaultDatasArray objectAtIndex_opple:3][@"typecode"] withPrice:[self.defaultDatasArray objectAtIndex_opple:4][@"typename"]];
+    }
+}
 
 
 #pragma mark -筛选结果点击
 - (IBAction)ScreeningResultButtonClick:(UIButton *)sender {
     
+    if ([self.delegate respondsToSelector:@selector(ShowScreeningResponse)]) {
         
+        [self.delegate ShowScreeningResponse];
+    }
 }
 
 
 
+#pragma mark -传入满足搜索条件的个数
+- (void)setTotalNumber:(NSInteger)totalNumber
+{
+    _totalNumber = totalNumber;
+    [self.screeningResultButton setTitle:[NSString stringWithFormat:@"筛选结果共%ld件商品",totalNumber] forState:UIControlStateNormal];
      
-
+}
 
 
 

Lighting/Class/screeningSecondView.xib

@@ -31,7 +31,7 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                    <state key="normal" title="筛选结果共122件商品">
+                    <state key="normal" title="筛选结果共0件商品">
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                     <connections>

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -35,6 +35,8 @@
 		2962D0791CD1CBC60058829D /* NetworkRequestClassManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2962D0781CD1CBC60058829D /* NetworkRequestClassManager.m */; };
 		2962D07D1CD1E4490058829D /* NSArray+Objectwithindex.m in Sources */ = {isa = PBXBuildFile; fileRef = 2962D07C1CD1E4490058829D /* NSArray+Objectwithindex.m */; };
 		2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = 2962D0801CD1E6010058829D /* UIView+Frame.m */; };
+		29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */; };
+		29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29698D601CE2C11500D72CE7 /* SettlementViewController.xib */; };
 		29706DA61CD082990003C412 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA51CD082990003C412 /* main.m */; };
 		29706DA91CD082990003C412 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA81CD082990003C412 /* AppDelegate.m */; };
 		29706DAF1CD082990003C412 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DAD1CD082990003C412 /* Main.storyboard */; };
@@ -152,6 +154,9 @@
 		2962D07C1CD1E4490058829D /* NSArray+Objectwithindex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Objectwithindex.m"; sourceTree = "<group>"; };
 		2962D07F1CD1E6010058829D /* UIView+Frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Frame.h"; sourceTree = "<group>"; };
 		2962D0801CD1E6010058829D /* UIView+Frame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Frame.m"; sourceTree = "<group>"; };
+		29698D5E1CE2C11500D72CE7 /* SettlementViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettlementViewController.h; sourceTree = "<group>"; };
+		29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettlementViewController.m; sourceTree = "<group>"; };
+		29698D601CE2C11500D72CE7 /* SettlementViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettlementViewController.xib; sourceTree = "<group>"; };
 		29706DA11CD082990003C412 /* Lighting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lighting.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		29706DA51CD082990003C412 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		29706DA71CD082990003C412 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -694,6 +699,9 @@
 			children = (
 				299876401CD99E4000C90D0A /* OrderdetailsViewController.h */,
 				299876411CD99E4000C90D0A /* OrderdetailsViewController.m */,
+				29698D5E1CE2C11500D72CE7 /* SettlementViewController.h */,
+				29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */,
+				29698D601CE2C11500D72CE7 /* SettlementViewController.xib */,
 			);
 			name = controller;
 			sourceTree = "<group>";
@@ -1006,6 +1014,7 @@
 				29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */,
 				29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
 				29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */,
+				29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */,
 				29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
 				29834EB61CDF1EB6001A484F /* screeningSecondView.xib in Resources */,
 				299249461CDB51C800786B1E /* ModifyShippingAddressView.xib in Resources */,
@@ -1093,6 +1102,7 @@
 				2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
 				29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */,
 				2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
+				29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
 				299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
 				2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */,
 				299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */,
@@ -1267,7 +1277,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
 				COMPRESS_PNG_FILES = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch";
@@ -1303,9 +1313,9 @@
 					"-framework",
 					"\"UIKit\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.opple;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
+				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
@@ -1318,8 +1328,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
 				COMPRESS_PNG_FILES = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch";
@@ -1355,9 +1365,9 @@
 					"-framework",
 					"\"UIKit\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.opple;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
+				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};

Lighting/Lighting/Images.xcassets/0510体验中心图标/backView.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "backView.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/10-副本.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "10-副本@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/Folder.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "Folder@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/Friends-Circle.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "Friends-Circle@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/Trash.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "Trash@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/bg.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "bg@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/box.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "box@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/wechat.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "wechat@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/weibo.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "weibo@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/1.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "1@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/10.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "10@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/2.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "2@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/4.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "4@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/5.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "5@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/d.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "d@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/产品.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "产品@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/场景.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "场景@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/1-副本.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "1-副本@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/10.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "10@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/4.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "4@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/5.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "5@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/d.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "d@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/产品.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "产品@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/场景.imageset/Contents.json

@@ -9,6 +9,10 @@
       "idiom" : "universal",
       "filename" : "场景@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Lighting/Lighting/Images.xcassets/1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "1.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "1@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/10-副本-3.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "10-副本-3.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "10-副本-3@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/2.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "2@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/7.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "7.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "7@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/Cog.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Cog.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Cog@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/Trash.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Trash.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Trash@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/View.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "View.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "View@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/View1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "View1.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "View1@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/ablum-副本.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ablum-副本.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ablum-副本@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/ablum.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ablum.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ablum@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/bg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "bg.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bg@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/box-副本.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "box-副本.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "box-副本@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/data-1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "data.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "data@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/dial.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "dial.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dial@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/icon-1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/icon-2.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/icon-副本.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon-副本.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon-副本@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/icon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/jia.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "jia.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "jia@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/line.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "line.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "line@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file