Skip to content

O
Opple-iOS
Commit 330971f1 authored by 勾芒's avatar 勾芒
Browse files
Options

debug

parent 43d5bdfd
Hide whitespace changes
Inline Side-by-side
Showing with 1196 additions and 96 deletions
Lighting/Class/AllCustomerViewController.m
View file @ 330971f1
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
page.page = 1; page.page = 1;
page.rows = KROWS; page.rows = KROWS;
self.conditionModel.page = page; self.conditionModel.page = page;
[self.allCustomerTableview.mj_footer resetNoMoreData];
[self getShoppersAssociatedCustomer:self.conditionModel isRemove:YES]; [self getShoppersAssociatedCustomer:self.conditionModel isRemove:YES];
}]; }];
headerRefresh.stateLabel.hidden = YES; headerRefresh.stateLabel.hidden = YES;
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
//上拉加载 //上拉加载
self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if ( ++ self.indexPage > self.totalPages) {
[self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData]; [self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/ClientViewController.m
View file @ 330971f1
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
//上拉加载 //上拉加载
self.informationTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.informationTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if (++ self.indexPage > self.totalPages) {
[self.informationTableview.mj_footer endRefreshingWithNoMoreData]; [self.informationTableview.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/ClientdetailsViewController.m
View file @ 330971f1
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
[self.ClientdetailsTableview.mj_footer resetNoMoreData]; [self.ClientdetailsTableview.mj_footer resetNoMoreData];
//购物袋 //购物袋
if (self.shoppingBagButton.selected) { if (self.shoppingBagButton.selected) {
if (self.shoppingBagPage ++ > self.shoppingBagTotalPage) { if (++ self.shoppingBagPage > self.shoppingBagTotalPage) {
[self.ClientdetailsTableview.mj_footer endRefreshingWithNoMoreData]; [self.ClientdetailsTableview.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/CustomerOrderViewController.m
View file @ 330971f1
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
//上拉加载 //上拉加载
self.customerOrderTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.customerOrderTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if ( ++ self.indexPage > self.totalPages) {
[self.customerOrderTableView.mj_footer endRefreshingWithNoMoreData]; [self.customerOrderTableView.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Class/ProductLibraryViewController.m
View file @ 330971f1
...@@ -235,13 +235,14 @@ ...@@ -235,13 +235,14 @@
- (void)GetdatasAction - (void)GetdatasAction
{ {
__weak typeof(self) weakSelf = self;
//下拉刷新 //下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
//扫描二维码结果 //扫描二维码结果
if (self.barcode) { if (weakSelf.barcode) {
[self barCodeSearchRequest]; [weakSelf barCodeSearchRequest];
}else }else
{ {
...@@ -249,38 +250,38 @@ ...@@ -249,38 +250,38 @@
DataPage *Newpage = [[DataPage alloc]init]; DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = 1; Newpage.page = 1;
Newpage.rows = KROWS; Newpage.rows = KROWS;
self.condtionModel.page = Newpage; weakSelf.condtionModel.page = Newpage;
self.indexPage = 1; weakSelf.indexPage = 1;
//搜索 //搜索
if (_selectedCode) { if (_selectedCode) {
switch (self.selectedIndex) { switch (weakSelf.selectedIndex) {
case 0://风格 case 0://风格
{ {
self.condtionModel.styleEquals = self.selectedCode; weakSelf.condtionModel.styleEquals = weakSelf.selectedCode;
} }
break; break;
case 1://类型 case 1://类型
{ {
self.condtionModel.categoryEquals = self.selectedCode; weakSelf.condtionModel.categoryEquals = weakSelf.selectedCode;
} }
break; break;
case 2://空间 case 2://空间
{ {
self.condtionModel.spaceEquals = self.selectedCode; weakSelf.condtionModel.spaceEquals = weakSelf.selectedCode;
} }
break; break;
case 3://材质 case 3://材质
{ {
self.condtionModel.materialEqueals = self.selectedCode; weakSelf.condtionModel.materialEqueals = weakSelf.selectedCode;
} }
break; break;
case 4://价格 case 4://价格
{ {
//价格字符串切割 //价格字符串切割
NSArray *spacrArray = [self.selectedCode componentsSeparatedByString:@"到"]; NSArray *spacrArray = [weakSelf.selectedCode componentsSeparatedByString:@"到"];
self.condtionModel.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]]; weakSelf.condtionModel.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]];
self.condtionModel.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]]; weakSelf.condtionModel.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]];
self.condtionModel.categoryEquals = _selectedCode; weakSelf.condtionModel.categoryEquals = _selectedCode;
} }
break; break;
...@@ -289,9 +290,9 @@ ...@@ -289,9 +290,9 @@
} }
} }
[self.productCollectionView.mj_footer resetNoMoreData]; [weakSelf.productCollectionView.mj_footer resetNoMoreData];
[self getScreeningdatasisRemoveArray:YES]; [weakSelf getScreeningdatasisRemoveArray:YES];
[self getGoodsListDatasisRemove:YES Withobject:self.condtionModel]; [weakSelf getGoodsListDatasisRemove:YES Withobject:self.condtionModel];
} }
}]; }];
headerRefresh.stateLabel.hidden = YES; headerRefresh.stateLabel.hidden = YES;
...@@ -303,27 +304,26 @@ ...@@ -303,27 +304,26 @@
self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
//扫描二维码结果 //扫描二维码结果
if (self.barcode) { if (weakSelf.barcode) {
[self barCodeSearchRequest]; [weakSelf barCodeSearchRequest];
}else }else
{ {
if ( ++ weakSelf.indexPage > weakSelf.totalPages) {
if (self.indexPage ++ > self.totalPages) { [weakSelf.productCollectionView.mj_footer endRefreshingWithNoMoreData];
[self.productCollectionView.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
//分页数据 //分页数据
DataPage *Newpage = [[DataPage alloc]init]; DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = self.indexPage ++; Newpage.page = weakSelf.indexPage ++;
Newpage.rows = KROWS; Newpage.rows = KROWS;
self.condtionModel.page = Newpage; weakSelf.condtionModel.page = Newpage;
//搜索 //搜索
if (_selectedCode) { if (_selectedCode) {
self.condtionModel.categoryEquals = _selectedCode; weakSelf.condtionModel.categoryEquals = _selectedCode;
} }
[self getGoodsListDatasisRemove:NO Withobject:self.condtionModel]; [weakSelf getGoodsListDatasisRemove:NO Withobject:self.condtionModel];
} }
} }
}]; }];
......
Lighting/Class/SceneLibraryViewController.m
View file @ 330971f1
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
//上拉加载 //上拉加载
self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) { if ( ++ self.indexPage > self.totalPages) {
[self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData]; [self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 330971f1
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; }; 2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; };
2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; }; 2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; };
290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; }; 290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; };
291D6A581CFFD45F007891AE /* SceneSectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A571CFFD45F007891AE /* SceneSectionHeaderView.m */; };
291D6A5C1CFFDCCA007891AE /* SceneListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A5B1CFFDCCA007891AE /* SceneListModel.m */; };
291D6A621CFFE212007891AE /* DataDictModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A611CFFE212007891AE /* DataDictModel.m */; };
291D6A651D0002AF007891AE /* TOGoodsEntityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A641D0002AF007891AE /* TOGoodsEntityModel.m */; };
291D6A6B1D000A2A007891AE /* ProductScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A6A1D000A2A007891AE /* ProductScreeningCollectionViewCell.m */; };
291D6A6E1D0012AB007891AE /* GoodsCategoryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D6A6D1D0012AB007891AE /* GoodsCategoryModel.m */; };
2925D03D1CFEE5D7008879BC /* ScreeningTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */; }; 2925D03D1CFEE5D7008879BC /* ScreeningTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */; };
2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; }; 2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; };
2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; }; 2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; };
...@@ -216,6 +222,18 @@ ...@@ -216,6 +222,18 @@
2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectedViewController.xib; sourceTree = "<group>"; }; 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectedViewController.xib; sourceTree = "<group>"; };
290887111CE5DF16000B7097 /* ShopcarModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopcarModel.h; sourceTree = "<group>"; }; 290887111CE5DF16000B7097 /* ShopcarModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopcarModel.h; sourceTree = "<group>"; };
290887121CE5DF16000B7097 /* ShopcarModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopcarModel.m; sourceTree = "<group>"; }; 290887121CE5DF16000B7097 /* ShopcarModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopcarModel.m; sourceTree = "<group>"; };
291D6A561CFFD45F007891AE /* SceneSectionHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneSectionHeaderView.h; sourceTree = "<group>"; };
291D6A571CFFD45F007891AE /* SceneSectionHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneSectionHeaderView.m; sourceTree = "<group>"; };
291D6A5A1CFFDCCA007891AE /* SceneListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneListModel.h; sourceTree = "<group>"; };
291D6A5B1CFFDCCA007891AE /* SceneListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneListModel.m; sourceTree = "<group>"; };
291D6A601CFFE212007891AE /* DataDictModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDictModel.h; sourceTree = "<group>"; };
291D6A611CFFE212007891AE /* DataDictModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataDictModel.m; sourceTree = "<group>"; };
291D6A631D0002AF007891AE /* TOGoodsEntityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TOGoodsEntityModel.h; sourceTree = "<group>"; };
291D6A641D0002AF007891AE /* TOGoodsEntityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TOGoodsEntityModel.m; sourceTree = "<group>"; };
291D6A691D000A2A007891AE /* ProductScreeningCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductScreeningCollectionViewCell.h; sourceTree = "<group>"; };
291D6A6A1D000A2A007891AE /* ProductScreeningCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductScreeningCollectionViewCell.m; sourceTree = "<group>"; };
291D6A6C1D0012AB007891AE /* GoodsCategoryModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoodsCategoryModel.h; sourceTree = "<group>"; };
291D6A6D1D0012AB007891AE /* GoodsCategoryModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoodsCategoryModel.m; sourceTree = "<group>"; };
2925D03B1CFEE5D7008879BC /* ScreeningTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningTableViewCell.h; sourceTree = "<group>"; }; 2925D03B1CFEE5D7008879BC /* ScreeningTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningTableViewCell.h; sourceTree = "<group>"; };
2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningTableViewCell.m; sourceTree = "<group>"; }; 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningTableViewCell.m; sourceTree = "<group>"; };
2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; }; 2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
...@@ -613,6 +631,21 @@ ...@@ -613,6 +631,21 @@
name = shopCarmodel; name = shopCarmodel;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
291D6A591CFFDCB3007891AE /* model */ = {
isa = PBXGroup;
children = (
291D6A5A1CFFDCCA007891AE /* SceneListModel.h */,
291D6A5B1CFFDCCA007891AE /* SceneListModel.m */,
291D6A601CFFE212007891AE /* DataDictModel.h */,
291D6A611CFFE212007891AE /* DataDictModel.m */,
291D6A631D0002AF007891AE /* TOGoodsEntityModel.h */,
291D6A641D0002AF007891AE /* TOGoodsEntityModel.m */,
291D6A6C1D0012AB007891AE /* GoodsCategoryModel.h */,
291D6A6D1D0012AB007891AE /* GoodsCategoryModel.m */,
);
name = model;
sourceTree = "<group>";
};
2928F7DD1CD085430036D761 /* Class */ = { 2928F7DD1CD085430036D761 /* Class */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -924,6 +957,7 @@ ...@@ -924,6 +957,7 @@
29808A651CFED6E5001D1020 /* Scene */ = { 29808A651CFED6E5001D1020 /* Scene */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
291D6A591CFFDCB3007891AE /* model */,
29808A671CFED70A001D1020 /* View */, 29808A671CFED70A001D1020 /* View */,
29808A661CFED6FE001D1020 /* Controller */, 29808A661CFED6FE001D1020 /* Controller */,
); );
...@@ -946,6 +980,10 @@ ...@@ -946,6 +980,10 @@
2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */, 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */,
29CB35401CFF0FB60061A5F3 /* ScreeningCollectionViewCell.h */, 29CB35401CFF0FB60061A5F3 /* ScreeningCollectionViewCell.h */,
29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */, 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */,
291D6A561CFFD45F007891AE /* SceneSectionHeaderView.h */,
291D6A571CFFD45F007891AE /* SceneSectionHeaderView.m */,
291D6A691D000A2A007891AE /* ProductScreeningCollectionViewCell.h */,
291D6A6A1D000A2A007891AE /* ProductScreeningCollectionViewCell.m */,
); );
name = View; name = View;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1545,6 +1583,7 @@ ...@@ -1545,6 +1583,7 @@
29BFBD871CE428B200C238FB /* Customermanager.m in Sources */, 29BFBD871CE428B200C238FB /* Customermanager.m in Sources */,
299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */, 299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */,
29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */, 29BB276C1CD9DE74009A0813 /* FollowHeartViewController.m in Sources */,
291D6A651D0002AF007891AE /* TOGoodsEntityModel.m in Sources */,
041636C51CF3986F008CE961 /* CustomUIImagePickerController.m in Sources */, 041636C51CF3986F008CE961 /* CustomUIImagePickerController.m in Sources */,
2928F8381CD09E730036D761 /* CustomButton.m in Sources */, 2928F8381CD09E730036D761 /* CustomButton.m in Sources */,
0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */, 0470D6111CE2936000647F0F /* SeceneLibraryView.m in Sources */,
...@@ -1565,6 +1604,7 @@ ...@@ -1565,6 +1604,7 @@
04F662171CFB9F4A00384248 /* HelpViewController.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 */,
291D6A5C1CFFDCCA007891AE /* SceneListModel.m in Sources */,
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */, 299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */, 29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */,
2994C0151CFBE793005A80AF /* PayViewController.m in Sources */, 2994C0151CFBE793005A80AF /* PayViewController.m in Sources */,
...@@ -1582,6 +1622,7 @@ ...@@ -1582,6 +1622,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 */,
291D6A581CFFD45F007891AE /* SceneSectionHeaderView.m in Sources */,
04F662141CFB700B00384248 /* SecenTableViewCell.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 */,
...@@ -1611,7 +1652,9 @@ ...@@ -1611,7 +1652,9 @@
29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */, 29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */,
29706DA61CD082990003C412 /* main.m in Sources */, 29706DA61CD082990003C412 /* main.m in Sources */,
044CD6EE1CEB771C0004A715 /* SeceneCollectionPictureCell.m in Sources */, 044CD6EE1CEB771C0004A715 /* SeceneCollectionPictureCell.m in Sources */,
291D6A621CFFE212007891AE /* DataDictModel.m in Sources */,
29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */, 29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */,
291D6A6B1D000A2A007891AE /* ProductScreeningCollectionViewCell.m in Sources */,
299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */, 299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */,
29EC331A1CE023D5005F0C13 /* ChangePasswordViewController.m in Sources */, 29EC331A1CE023D5005F0C13 /* ChangePasswordViewController.m in Sources */,
29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */, 29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */,
...@@ -1628,6 +1671,7 @@ ...@@ -1628,6 +1671,7 @@
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */, 2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */,
2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */, 2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */,
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */, 29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */,
291D6A6E1D0012AB007891AE /* GoodsCategoryModel.m in Sources */,
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */, 0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */,
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */, 2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
29808A641CFEC41B001D1020 /* ExperienceCentreViewController.m in Sources */, 29808A641CFEC41B001D1020 /* ExperienceCentreViewController.m in Sources */,
......
Lighting/Lighting/Images.xcassets/圆角矩形-3-副本.imageset/Contents.json 0 → 100644
View file @ 330971f1
{
"images" : [
{
"idiom" : "universal",
"filename" : "圆角矩形-3-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "圆角矩形-3-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 330971f1
...@@ -3312,15 +3312,15 @@ ...@@ -3312,15 +3312,15 @@
<objects> <objects>
<viewController storyboardIdentifier="SceneController" id="oDx-32-j3R" customClass="SceneViewController" sceneMemberID="viewController"> <viewController storyboardIdentifier="SceneController" id="oDx-32-j3R" customClass="SceneViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="gkF-Yq-Az3"> <view key="view" contentMode="scaleToFill" id="gkF-Yq-Az3">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" id="3aN-RP-MSb"> <view contentMode="scaleToFill" id="3aN-RP-MSb">
<rect key="frame" x="134" y="76" width="500" height="515"/> <rect key="frame" x="134" y="76" width="756" height="515"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<button opaque="NO" tag="103" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9K2-Ir-Ek4"> <button opaque="NO" tag="103" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9K2-Ir-Ek4">
<rect key="frame" x="397" y="167" width="103" height="50"/> <rect key="frame" x="653" y="167" width="103" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
...@@ -3336,12 +3336,12 @@ ...@@ -3336,12 +3336,12 @@
</connections> </connections>
</button> </button>
<button opaque="NO" tag="102" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="yqc-qb-xMr"> <button opaque="NO" tag="102" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="yqc-qb-xMr">
<rect key="frame" x="397" y="112" width="103" height="50"/> <rect key="frame" x="653" y="112" width="103" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="空间"> <state key="normal" title="类型">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state> </state>
<state key="selected"> <state key="selected">
...@@ -3352,12 +3352,12 @@ ...@@ -3352,12 +3352,12 @@
</connections> </connections>
</button> </button>
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pWS-6Q-Bfm"> <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pWS-6Q-Bfm">
<rect key="frame" x="397" y="57" width="103" height="50"/> <rect key="frame" x="653" y="57" width="103" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="类型"> <state key="normal" title="空间">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state> </state>
<state key="selected"> <state key="selected">
...@@ -3368,7 +3368,7 @@ ...@@ -3368,7 +3368,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="d4v-Yx-CKR"> <button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="d4v-Yx-CKR">
<rect key="frame" x="397" y="2" width="103" height="50"/> <rect key="frame" x="653" y="2" width="103" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
...@@ -3384,7 +3384,7 @@ ...@@ -3384,7 +3384,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" tag="104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="aXq-zd-zbV"> <button opaque="NO" tag="104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="aXq-zd-zbV">
<rect key="frame" x="397" y="222" width="103" height="50"/> <rect key="frame" x="653" y="222" width="103" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
...@@ -3400,13 +3400,31 @@ ...@@ -3400,13 +3400,31 @@
</connections> </connections>
</button> </button>
<view contentMode="scaleToFill" id="ae8-6e-hfY"> <view contentMode="scaleToFill" id="ae8-6e-hfY">
<rect key="frame" x="0.0" y="0.0" width="450" height="515"/> <rect key="frame" x="0.0" y="0.0" width="706" height="515"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" id="zvU-Oe-Img"> <view contentMode="scaleToFill" id="zvU-Oe-Img">
<rect key="frame" x="0.0" y="0.0" width="350" height="55"/> <rect key="frame" x="0.0" y="0.0" width="606" height="55"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" id="21f-Sd-auv">
<rect key="frame" x="291" y="16" width="240" height="27"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="line" id="yKx-1y-sSM">
<rect key="frame" x="0.0" y="0.0" width="240" height="27"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入产品关键字" minimumFontSize="17" id="kCx-iQ-d1X">
<rect key="frame" x="53" y="-3" width="160" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" returnKeyType="search"/>
</textField>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Folder" id="KsJ-QO-PwN"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Folder" id="KsJ-QO-PwN">
<rect key="frame" x="34" y="13" width="25" height="25"/> <rect key="frame" x="34" y="13" width="25" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
...@@ -3421,8 +3439,8 @@ ...@@ -3421,8 +3439,8 @@
</subviews> </subviews>
<color key="backgroundColor" red="0.90980392156862744" green="0.90980392156862744" blue="0.90980392156862744" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.90980392156862744" green="0.90980392156862744" blue="0.90980392156862744" alpha="1" colorSpace="calibratedRGB"/>
</view> </view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="6ls-zF-PlY"> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" id="6ls-zF-PlY">
<rect key="frame" x="0.0" y="55" width="350" height="460"/> <rect key="frame" x="0.0" y="55" width="606" height="460"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="5Dv-ta-zBb"> <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="5Dv-ta-zBb">
...@@ -3433,7 +3451,7 @@ ...@@ -3433,7 +3451,7 @@
</collectionViewFlowLayout> </collectionViewFlowLayout>
<cells> <cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ScreeningCollectioncell" id="0Ez-VX-wtD" customClass="ScreeningCollectionViewCell"> <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ScreeningCollectioncell" id="0Ez-VX-wtD" customClass="ScreeningCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="159" height="104"/> <rect key="frame" x="0.0" y="53" width="159" height="104"/>
<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="159" height="104"/> <rect key="frame" x="0.0" y="0.0" width="159" height="104"/>
...@@ -3452,13 +3470,64 @@ ...@@ -3452,13 +3470,64 @@
<outlet property="sceneImageView" destination="KTD-Jg-IUS" id="wl0-hn-uOS"/> <outlet property="sceneImageView" destination="KTD-Jg-IUS" id="wl0-hn-uOS"/>
</connections> </connections>
</collectionViewCell> </collectionViewCell>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ProductCollectionViewCell" id="KUD-2T-2PZ" customClass="ProductScreeningCollectionViewCell">
<rect key="frame" x="169" y="0.0" width="236" height="210"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="236" height="210"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="Wom-Bb-RIf">
<rect key="frame" x="0.0" y="0.0" width="236" height="125"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.9882352941176471" green="0.97254901960784312" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Yeo-h4-v3G">
<rect key="frame" x="0.0" y="138" width="236" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n0r-zG-ehM">
<rect key="frame" x="0.0" y="162" width="236" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥2000" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bqd-6W-DHa">
<rect key="frame" x="0.0" y="187" width="236" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<size key="customSize" width="236" height="210"/>
<connections>
<outlet property="goodsImageView" destination="Wom-Bb-RIf" id="9fu-pg-GfK"/>
<outlet property="goodsName" destination="Yeo-h4-v3G" id="iIs-tD-qEh"/>
<outlet property="goodsPrice" destination="bqd-6W-DHa" id="rss-H0-1l3"/>
<outlet property="goodsSpecifications" destination="n0r-zG-ehM" id="HR8-9a-nee"/>
</connections>
</collectionViewCell>
</cells> </cells>
</collectionView> </collectionView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="55" sectionHeaderHeight="28" sectionFooterHeight="28" id="uIv-ej-r0S"> <view contentMode="scaleToFill" id="njW-mp-vvz">
<rect key="frame" x="350" y="0.0" width="100" height="515"/> <rect key="frame" x="606" y="0.0" width="100" height="515"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="55" sectionHeaderHeight="28" sectionFooterHeight="28" id="uIv-ej-r0S">
<rect key="frame" x="0.0" y="0.0" width="100" height="515"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</tableView> </view>
</subviews> </subviews>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</view> </view>
...@@ -3467,21 +3536,25 @@ ...@@ -3467,21 +3536,25 @@
</subviews> </subviews>
<color key="backgroundColor" red="0.1176470588" green="0.37913761406206903" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.1176470588" green="0.37913761406206903" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
</view> </view>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="iPadPro"/>
<connections> <connections>
<outlet property="clickEventView" destination="3aN-RP-MSb" id="u48-oO-Tdl"/> <outlet property="clickEventView" destination="3aN-RP-MSb" id="u48-oO-Tdl"/>
<outlet property="collectionViewLayout" destination="5Dv-ta-zBb" id="fWU-Zq-gA6"/> <outlet property="collectionViewLayout" destination="5Dv-ta-zBb" id="fWU-Zq-gA6"/>
<outlet property="materialButton" destination="9K2-Ir-Ek4" id="XB2-T7-PaM"/> <outlet property="materialButton" destination="9K2-Ir-Ek4" id="XB2-T7-PaM"/>
<outlet property="myTableViewBackView" destination="njW-mp-vvz" id="yf9-IB-Ebc"/>
<outlet property="priceButton" destination="aXq-zd-zbV" id="EIo-Sh-hZP"/> <outlet property="priceButton" destination="aXq-zd-zbV" id="EIo-Sh-hZP"/>
<outlet property="sceneOrProductClollectionView" destination="6ls-zF-PlY" id="ryB-8i-5dQ"/> <outlet property="sceneOrProductClollectionView" destination="6ls-zF-PlY" id="ryB-8i-5dQ"/>
<outlet property="screeningTableView" destination="uIv-ej-r0S" id="d3G-Z5-xex"/> <outlet property="screeningTableView" destination="uIv-ej-r0S" id="d3G-Z5-xex"/>
<outlet property="spaceButton" destination="yqc-qb-xMr" id="oL5-QH-OXT"/> <outlet property="searchBackView" destination="21f-Sd-auv" id="Mcb-PK-ki5"/>
<outlet property="searchProductField" destination="kCx-iQ-d1X" id="8gd-Ha-XzP"/>
<outlet property="spaceButton" destination="pWS-6Q-Bfm" id="nKl-ED-Tf6"/>
<outlet property="styleButton" destination="d4v-Yx-CKR" id="gpB-q9-V46"/> <outlet property="styleButton" destination="d4v-Yx-CKR" id="gpB-q9-V46"/>
<outlet property="typeButton" destination="pWS-6Q-Bfm" id="Ruc-8c-fRv"/> <outlet property="typeButton" destination="yqc-qb-xMr" id="Q5A-oF-kSj"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="sGv-mn-3hq" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="sGv-mn-3hq" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1826" y="15382"/> <point key="canvasLocation" x="1800" y="15580"/>
</scene> </scene>
<!--Navigation Controller--> <!--Navigation Controller-->
<scene sceneID="mef-so-Hgk"> <scene sceneID="mef-so-Hgk">
......
Lighting/Podfile.lock
View file @ 330971f1
...@@ -14,6 +14,7 @@ PODS: ...@@ -14,6 +14,7 @@ PODS:
- AFNetworking/Serialization (3.1.0) - AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0): - AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession - AFNetworking/NSURLSession
- DZNEmptyDataSet (1.8.1)
- IQKeyboardManager (4.0.3) - IQKeyboardManager (4.0.3)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (0.6.4) - Masonry (0.6.4)
...@@ -40,6 +41,7 @@ PODS: ...@@ -40,6 +41,7 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- AFNetworking (~> 3.1.0) - AFNetworking (~> 3.1.0)
- DZNEmptyDataSet (~> 1.8.1)
- IQKeyboardManager (~> 4.0.0) - IQKeyboardManager (~> 4.0.0)
- JSONModel (~> 1.2.0) - JSONModel (~> 1.2.0)
- Masonry (~> 0.6.4) - Masonry (~> 0.6.4)
...@@ -53,6 +55,7 @@ DEPENDENCIES: ...@@ -53,6 +55,7 @@ DEPENDENCIES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
IQKeyboardManager: be9695ffc5a52077deb4847608f338771022d6d1 IQKeyboardManager: be9695ffc5a52077deb4847608f338771022d6d1
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: 281802d04d787ea2973179ee8bcb50500579ede2 Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
......
Lighting/Tools/DataDictModel.h 0 → 100644
View file @ 330971f1
//
// DataDictModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface DataDictModel : DataDict
/**
* 保存选中状态
*/
@property (nonatomic,assign) BOOL isSelectedSate;
@end
Lighting/Tools/DataDictModel.m 0 → 100644
View file @ 330971f1
//
// DataDictModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "DataDictModel.h"
@implementation DataDictModel
@end
Lighting/Tools/ExperienceCentreViewController.m
View file @ 330971f1
...@@ -76,17 +76,33 @@ ...@@ -76,17 +76,33 @@
#pragma mark -场景筛选 #pragma mark -场景筛选
- (IBAction)SceneSelectedButtonClickAction:(UIButton *)sender { - (IBAction)SceneSelectedButtonClickAction:(UIButton *)sender {
[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"SCENE"];
SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"]; SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"];
sceneVC.view.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.1]; sceneVC.view.backgroundColor = [UIColor clearColor];
sceneVC.searchBackView.hidden = YES;
sceneVC.materialButton.hidden = YES;
sceneVC.priceButton.hidden = YES;
sceneVC.typeButton.hidden = YES;
sceneVC.modalPresentationStyle = UIModalPresentationOverFullScreen; sceneVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
UIPopoverPresentationController *pop = sceneVC.popoverPresentationController; UIPopoverPresentationController *pop = sceneVC.popoverPresentationController;
pop.sourceView = sceneVC.view; pop.sourceView = sceneVC.view;
[self presentViewController:sceneVC animated:YES completion:nil]; [self presentViewController:sceneVC animated:YES completion:nil];
} }
#pragma mark -产品筛选 #pragma mark -产品筛选
- (IBAction)ProductSelectedButtonClickAction:(UIButton *)sender { - (IBAction)ProductSelectedButtonClickAction:(UIButton *)sender {
[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"SCENE"];
SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"];
sceneVC.view.backgroundColor = [UIColor clearColor];
sceneVC.searchBackView.hidden = NO;
sceneVC.materialButton.hidden = NO;
sceneVC.priceButton.hidden = NO;
sceneVC.typeButton.hidden = NO;
sceneVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
UIPopoverPresentationController *pop = sceneVC.popoverPresentationController;
pop.sourceView = sceneVC.view;
[self presentViewController:sceneVC animated:YES completion:nil];
} }
......
Lighting/Tools/GoodsCategoryModel.h 0 → 100644
View file @ 330971f1
//
// GoodsCategoryModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface GoodsCategoryModel : GoodsCategory
/**
* 选中状态
*/
@property (nonatomic,assign) BOOL isSelectedState;
@end
Lighting/Tools/GoodsCategoryModel.m 0 → 100644
View file @ 330971f1
//
// GoodsCategoryModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "GoodsCategoryModel.h"
@implementation GoodsCategoryModel
@end
Lighting/Tools/PrefixHeader.pch
View file @ 330971f1
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#import "PromptinformationView.h" #import "PromptinformationView.h"
#import "BaseViewController.h" #import "BaseViewController.h"
#import "MjRefreshHeaderCustom.h" #import "MjRefreshHeaderCustom.h"
#import "UIScrollView+EmptyDataSet.h"
// Include any system framework and library headers here that should be included in all compilation units. // Include any system framework and library headers here that should be included in all compilation units.
// You will also need to set the Prefix Header build setting of one or more of your targets to reference this file. // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
/** /**
* 服务器地址 * 服务器地址
*/ */
#define ServerAddress @"http://139.196.195.30:8090/opple-web/app" #define ServerAddress @"http://dg-dev.opple.com/opple-web/app"
/** /**
......
Lighting/Tools/ProductScreeningCollectionViewCell.h 0 → 100644
View file @ 330971f1
//
// ProductScreeningCollectionViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ProductScreeningCollectionViewCell : UICollectionViewCell
/**
* 商品图片
*/
@property (weak, nonatomic) IBOutlet UIImageView *goodsImageView;
/**
* 商品名称
*/
@property (weak, nonatomic) IBOutlet UILabel *goodsName;
/**
* 商品规格
*/
@property (weak, nonatomic) IBOutlet UILabel *goodsSpecifications;
/**
* 商品价格
*/
@property (weak, nonatomic) IBOutlet UILabel *goodsPrice;
@end
Lighting/Tools/ProductScreeningCollectionViewCell.m 0 → 100644
View file @ 330971f1
//
// ProductScreeningCollectionViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ProductScreeningCollectionViewCell.h"
@implementation ProductScreeningCollectionViewCell
/**
* 商品图片
*/
@end
Lighting/Tools/SceneListModel.h 0 → 100644
View file @ 330971f1
//
// SceneListModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface SceneListModel : TOSceneEntity
/**
* 选中状态
*/
@property (nonatomic,assign) BOOL isSelectedSate;
@end
Lighting/Tools/SceneListModel.m 0 → 100644
View file @ 330971f1
//
// SceneListModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SceneListModel.h"
@implementation SceneListModel
@end
Lighting/Tools/SceneSectionHeaderView.h 0 → 100644
View file @ 330971f1
//
// SceneSectionHeaderView.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface SceneSectionHeaderView : UITableViewHeaderFooterView
/**
* 区头title
*/
@property (nonatomic,strong) UIButton *sectionButton;
@end
Lighting/Tools/SceneSectionHeaderView.m 0 → 100644
View file @ 330971f1
//
// SceneSectionHeaderView.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SceneSectionHeaderView.h"
@implementation SceneSectionHeaderView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier
{
if (self = [super initWithReuseIdentifier:reuseIdentifier]) {
self.sectionButton = [UIButton buttonWithType:UIButtonTypeCustom];
self.sectionButton.frame = CGRectMake(0, 0, 100, 55);
[self.sectionButton setTitleColor:kTCColor(170, 170, 170) forState:UIControlStateNormal];
self.sectionButton.titleLabel.font = [UIFont systemFontOfSize:13];
[self.sectionButton setTitleColor:kMainBlueColor forState:UIControlStateSelected];
[self addSubview:self.sectionButton];
//横线
UIView *lineView = [[UIView alloc]initWithFrame:CGRectMake(0, 54, 100, 1)];
lineView.backgroundColor = kTCColor(221, 221, 221);
[self addSubview:lineView];
}
return self;
}
@end
Lighting/Tools/SceneViewController.h
View file @ 330971f1
...@@ -70,9 +70,20 @@ ...@@ -70,9 +70,20 @@
@property (weak, nonatomic) IBOutlet UIView *clickEventView; @property (weak, nonatomic) IBOutlet UIView *clickEventView;
/**
* tableview阴影背景
*/
@property (weak, nonatomic) IBOutlet UIView *myTableViewBackView;
/**
* 产品模块搜索框
*/
@property (weak, nonatomic) IBOutlet UITextField *searchProductField;
/**
* 搜索框背景
*/
@property (weak, nonatomic) IBOutlet UIView *searchBackView;
......
Lighting/Tools/SceneViewController.m
View file @ 330971f1
...@@ -9,26 +9,165 @@ ...@@ -9,26 +9,165 @@
#import "SceneViewController.h" #import "SceneViewController.h"
#import "ScreeningTableViewCell.h" #import "ScreeningTableViewCell.h"
#import "ScreeningCollectionViewCell.h" #import "ScreeningCollectionViewCell.h"
#import "SceneSectionHeaderView.h"
#import "SceneListModel.h"
@interface SceneViewController ()<UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UICollectionViewDelegate,UICollectionViewDataSource> #import "DataDictModel.h"
#import "TOGoodsEntityModel.h"
#import "ProductScreeningCollectionViewCell.h"
#import "GoodsCategoryModel.h"
@interface SceneViewController ()<UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource>
/**
* 场景数据源
*/
@property (nonatomic,strong) NSMutableArray *sceneDatasArray;
/**
* 产品数据源
*/
@property (nonatomic,strong) NSMutableArray *productDatasArray;
/**
* 当前页数
*/
@property (nonatomic,assign) int indexPage;
/**
* 总页数
*/
@property (nonatomic,assign) int totalPages;
/**
* 场景参数模型
*/
@property (nonatomic,strong) SceneCondition *conditionModel;
/**
* 产品参数模型
*/
@property (nonatomic,strong) GoodsCondition *goodsModel;
/**
* 场景筛选条件数据源
*/
@property (nonatomic,strong) NSMutableArray *sceneScreeningDatasArray;
/**
* 产品筛选条件数据源
*/
@property (nonatomic,strong) NSMutableArray *productScreeningDatasArray;
/**
* 右侧筛选条件选中下标
*/
@property (nonatomic,assign) NSInteger rightSelectedIndex;
/**
* 区分场景和产品
*/
@property (nonatomic,assign) BOOL isScene;
/**
* 类型区cell格式
*/
@property (nonatomic,assign) NSInteger sectionCellNumber;
/**
* 当前选中的区头
*/
@property (nonatomic,assign) NSInteger selectedSectionNumber;
@end @end
@implementation SceneViewController @implementation SceneViewController
- (NSMutableArray *)sceneDatasArray
{
if (!_sceneDatasArray) {
_sceneDatasArray = [NSMutableArray array];
}
return _sceneDatasArray;
}
- (NSMutableArray *)productDatasArray
{
if (!_productDatasArray) {
_productDatasArray = [NSMutableArray array];
}
return _productDatasArray;
}
- (SceneCondition *)conditionModel
{
if (!_conditionModel) {
_conditionModel = [[SceneCondition alloc]init];
}
return _conditionModel;
}
- (GoodsCondition *)goodsModel
{
if (!_goodsModel) {
_goodsModel = [[GoodsCondition alloc]init];
}
return _goodsModel;
}
- (NSMutableArray *)sceneScreeningDatasArray
{
if (!_sceneScreeningDatasArray) {
_sceneScreeningDatasArray = [NSMutableArray array];
}
return _sceneScreeningDatasArray;
}
- (NSMutableArray *)productScreeningDatasArray
{
if (!_productScreeningDatasArray) {
_productScreeningDatasArray = [NSMutableArray array];
}
return _productScreeningDatasArray;
}
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
self.isScene = [[NSUserDefaults standardUserDefaults] boolForKey:@"SCENE"];
[self UiConfigAction]; [self UiConfigAction];
[self ReturnDismiss]; [self ReturnDismiss];
if (self.isScene) {
//场景
[self getDatasAction];
}else
{
//产品
[self GetdatasAction];
}
} }
#pragma mark -UI #pragma mark -UI
- (void)UiConfigAction - (void)UiConfigAction
{ {
self.styleButton.layer.masksToBounds = YES; self.styleButton.layer.masksToBounds = YES;
self.styleButton.layer.cornerRadius = kSelectedCornerRadius; self.styleButton.layer.cornerRadius = kSelectedCornerRadius;
self.typeButton.layer.masksToBounds = YES; self.typeButton.layer.masksToBounds = YES;
...@@ -39,11 +178,23 @@ ...@@ -39,11 +178,23 @@
self.materialButton.layer.cornerRadius = kSelectedCornerRadius; self.materialButton.layer.cornerRadius = kSelectedCornerRadius;
self.priceButton.layer.masksToBounds = YES; self.priceButton.layer.masksToBounds = YES;
self.priceButton.layer.cornerRadius = kSelectedCornerRadius; self.priceButton.layer.cornerRadius = kSelectedCornerRadius;
self.styleButton.selected = YES;
self.styleButton.backgroundColor = kMainBlueColor;
self.rightSelectedIndex = 0;
//筛选Tableview //筛选Tableview
self.screeningTableView.delegate = self; self.screeningTableView.delegate = self;
self.screeningTableView.dataSource = self; self.screeningTableView.dataSource = self;
self.screeningTableView.tableFooterView = [UIView new];
[self.screeningTableView registerClass:[ScreeningTableViewCell class] forCellReuseIdentifier:@"ScreeningCellNew"]; [self.screeningTableView registerClass:[ScreeningTableViewCell class] forCellReuseIdentifier:@"ScreeningCellNew"];
//section
[self.screeningTableView registerClass:[SceneSectionHeaderView class] forHeaderFooterViewReuseIdentifier:@"headerView"];
self.myTableViewBackView.layer.shadowColor = [UIColor blackColor].CGColor;
self.myTableViewBackView.layer.shadowOffset = CGSizeMake(0, 0);
self.myTableViewBackView.layer.shadowRadius = 4;
self.myTableViewBackView.layer.shadowOpacity = 0.5;
self.myTableViewBackView.layer.masksToBounds = NO;
//数据列表UICollectionView //数据列表UICollectionView
self.collectionViewLayout.itemSize = CGSizeMake((self.sceneOrProductClollectionView.mj_w-40)/3, (self.sceneOrProductClollectionView.mj_w-40)/4); self.collectionViewLayout.itemSize = CGSizeMake((self.sceneOrProductClollectionView.mj_w-40)/3, (self.sceneOrProductClollectionView.mj_w-40)/4);
...@@ -55,16 +206,392 @@ ...@@ -55,16 +206,392 @@
} }
#pragma mark -场景数据
- (void)getDatasAction
{
//场景筛选条件
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/getSceneFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
SceneFilter *filterModel = [[SceneFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
//风格
NSMutableArray *styleArray = [NSMutableArray array];
//空间
NSMutableArray *spaceArray = [NSMutableArray array];
[self.sceneScreeningDatasArray addObject:styleArray];
[self.sceneScreeningDatasArray addObject:spaceArray];
for (DataDict *model in filterModel.styles) {
DataDictModel *newModel = [[DataDictModel alloc]init];
newModel.typename = model.typename;
newModel.typecode = model.typecode;
newModel.isSelectedSate = NO;
[[self.sceneScreeningDatasArray firstObject] addObject:newModel];
}
for (DataDict *model in filterModel.space) {
DataDictModel *newModel = [[DataDictModel alloc]init];
newModel.typename = model.typename;
newModel.typecode = model.typecode;
newModel.isSelectedSate = NO;
[[self.sceneScreeningDatasArray lastObject] addObject:newModel];
}
[self.screeningTableView reloadData];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
}];
//下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
//默认数据
self.indexPage = 1;
DataPage *page = [[DataPage alloc]init];
page.page = self.indexPage;
page.rows = KROWS;
self.conditionModel.page = page;
[self.sceneOrProductClollectionView.mj_footer resetNoMoreData];
[self getSceneLibrarydatas:self.conditionModel isRemove:YES];
}];
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.sceneOrProductClollectionView.mj_header = headerRefresh;
[self.sceneOrProductClollectionView.mj_header beginRefreshing];
//上拉加载
self.sceneOrProductClollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) {
[self.sceneOrProductClollectionView.mj_footer endRefreshingWithNoMoreData];
}else
{
//默认数据
DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = self.indexPage ++;
Newpage.rows = KROWS;
self.conditionModel.page = Newpage;
[self getSceneLibrarydatas:self.conditionModel isRemove:NO];
}
}];
}
#pragma mark -获取场景列表数据
- (void)getSceneLibrarydatas:(SceneCondition *)condition isRemove:(BOOL)remove
{
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
self.sceneOrProductClollectionView.emptyDataSetSource = self;
[self endRefreshingForTableView:self.sceneOrProductClollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (remove) {
[self.sceneDatasArray removeAllObjects];
}
SceneResponse *response = [[SceneResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
for (TOSceneEntity *model in response.list) {
SceneListModel *newModel = [[SceneListModel alloc]init];
newModel.fid = model.fid;
newModel.sceneCode = model.sceneCode;
newModel.name = model.name;
newModel.pricure = model.pricure;
newModel.category = model.category;
newModel.style = model.style;
newModel.space = model.space;
newModel.isSelectedSate = NO;
[self.sceneDatasArray addObject:newModel];
}
[self.sceneOrProductClollectionView reloadData];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[self endRefreshingForTableView:self.sceneOrProductClollectionView];
}];
}
#pragma mark -产品数据
- (void)GetdatasAction
{
[self getScreeningdatasisRemoveArray:YES];
//下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
//分页数据
DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = 1;
Newpage.rows = KROWS;
self.goodsModel.page = Newpage;
self.indexPage = 1;
//搜索
switch (self.rightSelectedIndex) {
case 0://风格
{
// self.goodsModel.styleEquals = self.selectedCode;
}
break;
case 1://类型
{
// self.goodsModel.categoryEquals = self.selectedCode;
}
break;
case 2://空间
{
// self.goodsModel.spaceEquals = self.selectedCode;
}
break;
case 3://材质
{
// self.goodsModel.materialEqueals = self.selectedCode;
}
break;
case 4://价格
{
//价格字符串切割
// 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]];
}
break;
default:
break;
}
[self.sceneOrProductClollectionView.mj_footer resetNoMoreData];
[self getGoodsListDatasisRemove:YES Withobject:self.goodsModel];
}];
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.sceneOrProductClollectionView.mj_header = headerRefresh;
[self.sceneOrProductClollectionView.mj_header beginRefreshing];
//上拉加载
self.sceneOrProductClollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (self.indexPage ++ > self.totalPages) {
[self.sceneOrProductClollectionView.mj_footer endRefreshingWithNoMoreData];
}else
{
//分页数据
DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = self.indexPage ++;
Newpage.rows = KROWS;
self.goodsModel.page = Newpage;
[self getGoodsListDatasisRemove:NO Withobject:self.goodsModel];
}
}];
}
#pragma mark -获取产品筛选数据
- (void)getScreeningdatasisRemoveArray:(BOOL)remove
{
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/getGoodsFilter"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (remove) {
[self.productScreeningDatasArray removeAllObjects];
}
GoodsFilter *goodsScreening = [[GoodsFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
//风格
NSMutableArray *styleArray = [NSMutableArray array];
//空间
NSMutableArray *spaceArray = [NSMutableArray array];
//类型
NSMutableArray *typeArray = [NSMutableArray array];
//材质
NSMutableArray *materialArray = [NSMutableArray array];
//价格
NSMutableArray *spricrArray = [NSMutableArray array];
[self.productScreeningDatasArray addObject:styleArray];
[self.productScreeningDatasArray addObject:spaceArray];
[self.productScreeningDatasArray addObject:typeArray];
[self.productScreeningDatasArray addObject:materialArray];
[self.productScreeningDatasArray addObject:spricrArray];
for (DataDict *model in goodsScreening.styles) {
DataDictModel *newModel = [[DataDictModel alloc]init];
newModel.typename = model.typename;
newModel.typecode = model.typecode;
newModel.isSelectedSate = NO;
[[self.productScreeningDatasArray objectAtIndex_opple:0] addObject:newModel];
}
for (DataDict *model in goodsScreening.space) {
DataDictModel *newModel = [[DataDictModel alloc]init];
newModel.typename = model.typename;
newModel.typecode = model.typecode;
newModel.isSelectedSate = NO;
[[self.productScreeningDatasArray objectAtIndex_opple:1] addObject:newModel];
}
for (GoodsCategory *model in goodsScreening.categories) {
GoodsCategoryModel *newModel = [[GoodsCategoryModel alloc]init];
newModel.fid = model.fid;
newModel.name = model.name;
newModel.children = model.children;
newModel.isSelectedState = NO;
[[self.productScreeningDatasArray objectAtIndex_opple:2] addObject:newModel];
}
for (DataDict *model in goodsScreening.material) {
DataDictModel *newModel = [[DataDictModel alloc]init];
newModel.typename = model.typename;
newModel.typecode = model.typecode;
newModel.isSelectedSate = NO;
[[self.productScreeningDatasArray objectAtIndex_opple:3] addObject:newModel];
}
for (DataDict *model in goodsScreening.price) {
DataDictModel *newModel = [[DataDictModel alloc]init];
newModel.typename = model.typename;
newModel.typecode = model.typecode;
newModel.isSelectedSate = NO;
[[self.productScreeningDatasArray objectAtIndex_opple:4] addObject:newModel];
}
[self.screeningTableView reloadData];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(NSError *error) {
[self ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark -获取商品列表数据
- (void)getGoodsListDatasisRemove:(BOOL)remove Withobject:(GoodsCondition *)conditon
{
__weak typeof(self)weakSelf = self;
[self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) {
weakSelf.sceneOrProductClollectionView.emptyDataSetSource = weakSelf;
if (remove) {
[self.productDatasArray removeAllObjects];
}
for (TOGoodsEntity *model in response.goodsEntity) {
TOGoodsEntityModel *newModel = [[TOGoodsEntityModel alloc]init];
newModel.resellerInv = model.resellerInv;
newModel.resellerTagPrice = model.resellerTagPrice;
newModel.resellerState = model.resellerState;
newModel.categoryname = model.categoryname;
newModel.brandName = model.brandName;
newModel.fid = model.fid;
newModel.createDate = model.createDate;
newModel.onlineTime = model.onlineTime;
newModel.company = model.company;
newModel.code = model.code;
newModel.name = model.name;
newModel.number = model.number;
newModel.categoryId = model.categoryId;
newModel.brandId = model.brandId;
newModel.keyword = model.keyword;
newModel.guidePrice = model.guidePrice;
newModel.tagPrice = model.tagPrice;
newModel.costPrice = model.costPrice;
newModel.state = model.state;
newModel.inv = model.inv;
newModel.detailedIntro = model.detailedIntro;
newModel.weight = model.weight;
newModel.unit = model.unit;
newModel.productProfile = model.productProfile;
newModel.power = model.power;
newModel.colorTemperature = model.colorTemperature;
newModel.spec = model.spec;
newModel.function = model.function;
newModel.material = model.material;
newModel.lightSource = model.lightSource;
newModel.goodsStyle = model.goodsStyle;
newModel.series = model.series;
newModel.area = model.area;
newModel.size = model.size;
newModel.space = model.space;
newModel.installMethod = model.installMethod;
newModel.lightNumber = model.lightNumber;
newModel.pictures = model.pictures;
newModel.barcode = model.barcode;
newModel.isSelectedState = NO;
[weakSelf.productDatasArray addObject:newModel];
}
[weakSelf.sceneOrProductClollectionView reloadData];
}];
}
#pragma mark -获取商品列表数据
- (void)getGoodsListdatas:(GoodsCondition *)conditon returnResponse:(void(^)(GoodsResponse *))finish
{
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/query"] WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
[self endRefreshingForTableView:self.sceneOrProductClollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
GoodsResponse *sponse = [[GoodsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
//返回结果
finish(sponse);
}else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self ErrorMBProgressView:@"网络连接中断"];
} WithFailureBlock:^(NSError *error) {
[self endRefreshingForTableView:self.sceneOrProductClollectionView];
[self ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - UITableViewDataSource代理 #pragma mark - UITableViewDataSource代理
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{ {
return 3; if (section == self.selectedSectionNumber) {
return self.sectionCellNumber;
}
return 0;
} }
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
ScreeningTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ScreeningCellNew" forIndexPath:indexPath]; ScreeningTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ScreeningCellNew" forIndexPath:indexPath];
cell.screeningLabe.text = @"主卧室"; GoodsCategoryModel *model= [self.productScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex][indexPath.section];
cell.screeningLabe.text = [[model.children objectAtIndex_opple:indexPath.row] name];
return cell; return cell;
} }
...@@ -73,35 +600,165 @@ ...@@ -73,35 +600,165 @@
return 55; return 55;
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[self CancelTableviewSectionState];
ScreeningTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
cell.screeningLabe.backgroundColor = kTCColor(221, 221, 221);
cell.screeningLabe.textColor = kMainBlueColor;
}
#pragma mark -UICollectionViewDataSource代理
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{ {
return 10; SceneSectionHeaderView *sectionView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:@"headerView"];
if (self.isScene) {
[sectionView.sectionButton setTitle:[[self.sceneScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex][section] typename] forState:UIControlStateNormal];
}else
{
if (self.rightSelectedIndex == 2) {
[sectionView.sectionButton setTitle:[[self.productScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex][section] name] forState:UIControlStateNormal];
}else
{
[sectionView.sectionButton setTitle:[[self.productScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex][section] typename] forState:UIControlStateNormal];
}
}
sectionView.sectionButton.tag = section+100;
[sectionView.sectionButton addTarget:self action:@selector(SectionButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
return sectionView;
} }
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{ {
ScreeningCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ScreeningCollectioncell" forIndexPath:indexPath];
cell.layer.shadowColor = [UIColor blackColor].CGColor; NSArray *array = [self.isScene?self.sceneScreeningDatasArray:self.productScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex];
cell.layer.shadowRadius = 4; return array.count;
cell.layer.shadowOpacity = 0.7; }
cell.contentView.layer.shadowOffset = CGSizeMake(0, 0);
cell.layer.masksToBounds = NO; - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
return cell; {
return 55;
}
#pragma mark -区头选中
- (void)SectionButtonClickAction:(UIButton *)button
{
[self CancelTableviewSectionState];
button.selected = YES;
button.backgroundColor = kTCColor(221, 221, 221);
switch (self.rightSelectedIndex) {
case 0://风格
{
self.conditionModel.styleEquals = [[[self.sceneScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex] objectAtIndex_opple:button.tag-100] typecode];
self.conditionModel.spaceEquals = nil;
}
break;
case 1://空间
{
self.conditionModel.spaceEquals = [[[self.sceneScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex] objectAtIndex_opple:button.tag-100] typecode];
self.conditionModel.styleEquals = nil;
}
break;
case 2://类型
{
}
break;
case 3://材质
{
}
break;
case 4://价格
{
}
break;
default:
break;
}
if (self.rightSelectedIndex == 2) {
GoodsCategoryModel *model= [self.productScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex][button.tag-100];
self.sectionCellNumber = model.children.count;
self.selectedSectionNumber = button.tag-100;
[self.screeningTableView reloadData];
// NSIndexSet *index = [[NSIndexSet alloc]initWithIndex:button.tag-100];
// [self.screeningTableView reloadSections:index withRowAnimation:UITableViewRowAnimationFade];
}else
{
self.sectionCellNumber = 0;
[self.sceneOrProductClollectionView.mj_header beginRefreshing];
}
} }
#pragma mark -tableview取消所有cell选中
- (void)CancelTableviewSectionState
{
NSArray *array = [self.isScene?self.sceneScreeningDatasArray:self.productScreeningDatasArray objectAtIndex_opple:self.rightSelectedIndex];
for (int i=0; i<array.count; i++) {
SceneSectionHeaderView *sectionView = [self.screeningTableView headerViewForSection:i];
sectionView.sectionButton.selected = NO;
sectionView.sectionButton.backgroundColor = [UIColor whiteColor];
}
}
#pragma mark -UICollectionViewDataSource代理
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
if (self.isScene) {
return self.sceneDatasArray.count;
}else
{
return self.productDatasArray.count;
}
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
if (self.isScene) {
ScreeningCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ScreeningCollectioncell" forIndexPath:indexPath];
cell.model = [self.sceneDatasArray objectAtIndex_opple:indexPath.item];
cell.layer.shadowColor = [UIColor blackColor].CGColor;
cell.layer.shadowRadius = 4;
cell.layer.shadowOpacity = 0.5;
cell.contentView.layer.shadowOffset = CGSizeMake(0, 0);
cell.layer.masksToBounds = NO;
return cell;
}else
{
ProductScreeningCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ProductCollectionViewCell" forIndexPath:indexPath];
cell.backgroundColor = kMainGrayColor;
return cell;
}
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return TCImage(@"圆角矩形-3-副本");
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
...@@ -122,12 +779,12 @@ ...@@ -122,12 +779,12 @@
} }
break; break;
case 101://类型 case 101://空间
{ {
} }
break; break;
case 102://空间 case 102://类型
{ {
} }
...@@ -147,14 +804,28 @@ ...@@ -147,14 +804,28 @@
break; break;
} }
self.rightSelectedIndex = sender.tag - 100;
[self RemoveAllButtonisSelected];
[self CancelTableviewSectionState];
sender.selected = YES;
sender.backgroundColor = kMainBlueColor;
[self.screeningTableView reloadData];
} }
#pragma mark -取消所有筛选条件按钮的选中
- (void)RemoveAllButtonisSelected
{
for (UIView *view in self.clickEventView.subviews) {
if ([view isKindOfClass:[UIButton class]]) {
UIButton *button = (UIButton *)view;
button.selected = NO;
button.backgroundColor = [UIColor whiteColor];
}
}
}
......
Lighting/Tools/ScreeningCollectionViewCell.h
View file @ 330971f1
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "SceneListModel.h"
@interface ScreeningCollectionViewCell : UICollectionViewCell @interface ScreeningCollectionViewCell : UICollectionViewCell
...@@ -17,6 +18,9 @@ ...@@ -17,6 +18,9 @@
@property (weak, nonatomic) IBOutlet UIImageView *sceneImageView; @property (weak, nonatomic) IBOutlet UIImageView *sceneImageView;
/**
* 数据源
*/
@property (nonatomic,strong) SceneListModel *model;
@end @end
Lighting/Tools/ScreeningCollectionViewCell.m
View file @ 330971f1
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
@implementation ScreeningCollectionViewCell @implementation ScreeningCollectionViewCell
- (void)setModel:(SceneListModel *)model
{
[self.sceneImageView sd_setImageWithURL:[NSURL URLWithString:model.pricure] placeholderImage:REPLACEIMAGE];
}
@end @end
Lighting/Tools/ScreeningTableViewCell.h
View file @ 330971f1
...@@ -16,10 +16,5 @@ ...@@ -16,10 +16,5 @@
*/ */
@property (nonatomic,strong) UILabel *screeningLabe; @property (nonatomic,strong) UILabel *screeningLabe;
/**
* title
*/
@property (nonatomic,copy) NSString *screeningTitle;
@end @end
Lighting/Tools/TOGoodsEntityModel.h 0 → 100644
View file @ 330971f1
//
// TOGoodsEntityModel.h
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface TOGoodsEntityModel : TOGoodsEntity
/**
* 保存选中状态
*/
@property (nonatomic,assign) BOOL isSelectedState;
@end
Lighting/Tools/TOGoodsEntityModel.m 0 → 100644
View file @ 330971f1
//
// TOGoodsEntityModel.m
// Lighting
//
// Created by 曹云霄 on 16/6/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "TOGoodsEntityModel.h"
@implementation TOGoodsEntityModel
@end
Lighting/podfile
View file @ 330971f1
platform:ios,'9.0' platform:ios,'9.0'
pod 'MBProgressHUD', '~> 0.9.2' pod 'MBProgressHUD', '~> 0.9.2'
pod 'SVProgressHUD', '~> 2.0.3' pod 'SVProgressHUD', '~> 2.0.3'
pod 'IQKeyboardManager', '~> 4.0.0’ pod 'IQKeyboardManager', '~> 4.0.0’
pod 'MMDrawerController', '~> 0.6.0' pod 'MMDrawerController', '~> 0.6.0'
pod 'MJExtension', '~> 3.0.10' pod 'MJExtension', '~> 3.0.10'
pod 'Masonry', '~> 0.6.4' pod 'Masonry', '~> 0.6.4'
pod 'MJRefresh', '~> 3.1.0' pod 'MJRefresh', '~> 3.1.0'
pod 'SDWebImage', '~> 3.7.5' pod 'SDWebImage', '~> 3.7.5'
pod 'AFNetworking', '~> 3.1.0' pod 'AFNetworking', '~> 3.1.0'
pod 'JSONModel', '~> 1.2.0' pod 'JSONModel', '~> 1.2.0'
pod 'UMengSocial', '~> 5.0' pod 'UMengSocial', '~> 5.0'
pod 'DZNEmptyDataSet', '~> 1.8.1'
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