Skip to content

O
Opple-iOS
Commit 27d221f0 authored by 勾芒's avatar 勾芒
Browse files
Options

caoyunxiao

parent 93d78f62
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 35 deletions
Lighting/Class/HotCollectionViewCell.h
View file @ 27d221f0
......@@ -21,6 +21,6 @@
/**
* title
*/
@property (nonatomic,strong) UILabel *titleLabe;
@property (weak, nonatomic) IBOutlet UILabel *titleLabe;
@end
Lighting/Class/HotCollectionViewCell.m
View file @ 27d221f0
......@@ -37,6 +37,7 @@
{
_responseDatas = responseDatas;
self.titleLabe.text = _responseDatas.name;
}
......
Lighting/Class/ProductLibraryViewController.m
View file @ 27d221f0
......@@ -137,11 +137,11 @@
} WithFailureBlock:^(id error) {
NSLog(@"%@",error);
}];
}
#pragma mark -获取商品列表数据
- (void)getGoodsListdatas:(GoodsCondition *)conditon returnResponse:(void(^)(GoodsResponse *))finish
{
......@@ -163,8 +163,6 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
......@@ -186,8 +184,17 @@
[self CreatescreeningButton];
//搜索关键字
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(searchInputString:) name:@"SEARCHINPUTSTRING" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(searchInputString:) name:SEARCHSTRING object:nil];
//返回根视图
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(popTorootviewController:) name:POPROOTCONTROLLER object:nil];
}
#pragma mark -返回根视图
- (void)popTorootviewController:(NSNotification *)not
{
[self.navigationController popViewControllerAnimated:YES];
}
......
Lighting/Class/SceneLibraryViewController.m
View file @ 27d221f0
......@@ -93,9 +93,15 @@
page.page = 0;
condition.page = page;
[self getSceneLibrarydatas:condition];
}
#pragma mark -获取场景筛选数据
- (void)getdatasAction
{
......
Lighting/Class/SearchViewController.m
View file @ 27d221f0
......@@ -9,6 +9,8 @@
#import "SearchViewController.h"
#import "SearchCollectionViewCell.h"
#import "HotCollectionViewCell.h"
#import "ProductLibraryViewController.h"
@interface SearchViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
......@@ -67,10 +69,35 @@
self.historyCollectionView.dataSource = self;
self.hotCollectionView.dataSource = self;
self.hotCollectionView.delegate = self;
self.hotCollectionView.backgroundColor = [UIColor redColor];
self.historyCollectionView.backgroundColor = [UIColor greenColor];
self.hotCollectionView.alwaysBounceVertical = YES;
self.historyCollectionView.alwaysBounceVertical = YES;
//保存输入内容
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(searchInputString:) name:SEARCHSTRING object:nil];
//返回根视图
// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(popTorootviewController:) name:POPROOTCONTROLLER object:nil];
}
#pragma mark -返回根视图
- (void)popTorootviewController:(NSNotification *)not
{
[self.navigationController popViewControllerAnimated:YES];
}
#pragma mark -输入内容
- (void)searchInputString:(NSNotification *)not
{
[self.localSearchArray addObject:not.object];
ProductLibraryViewController *productVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productlibrary"];
UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:productVC];
[self.navigationController pushViewController:nav animated:YES];
}
......@@ -124,7 +151,7 @@
if ([collectionView isEqual:self.historyCollectionView]) {
SearchCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"firstcell" forIndexPath:indexPath];
cell.searchLabe.text = [self.localSearchArray objectAtIndex_opple:indexPath.item];
return cell;
}
if ([collectionView isEqual:self.hotCollectionView]) {
......@@ -145,7 +172,7 @@
return self.response.list.count;
}
return 20;
return self.localSearchArray.count;
}
......
Lighting/Class/Tabbar/CustomTabbarController.m
View file @ 27d221f0
......@@ -218,11 +218,19 @@
}
#pragma mark -搜索框代理方法
- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
{
if (textField.text.length != 0) {
//返回根视图
[[NSNotificationCenter defaultCenter] postNotificationName:POPROOTCONTROLLER object:nil];
}else
{
self.selectedIndex = 9;
}
return YES;
}
......@@ -236,7 +244,9 @@
[textField resignFirstResponder];
self.selectedIndex = 4;
[[NSNotificationCenter defaultCenter] postNotificationName:@"SEARCHINPUTSTRING" object:textField.text];
//搜索
[[NSNotificationCenter defaultCenter] postNotificationName:SEARCHSTRING object:textField.text];
}
return YES;
}
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 27d221f0
......@@ -1167,7 +1167,7 @@
TargetAttributes = {
29706DA01CD082980003C412 = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = 39XYE6VSP8;
DevelopmentTeam = W54V2VB863;
};
};
};
......@@ -1517,7 +1517,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......@@ -1569,7 +1569,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 27d221f0
......@@ -734,7 +734,7 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
<rect key="frame" x="0.0" y="49.5" width="768" height="84"/>
<rect key="frame" x="0.0" y="113.5" width="768" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
<rect key="frame" x="0.0" y="0.0" width="768" height="83.5"/>
......@@ -811,7 +811,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="135" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="133.5" width="768" height="135"/>
<rect key="frame" x="0.0" y="197.5" width="768" height="135"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
<rect key="frame" x="0.0" y="0.0" width="768" height="134.5"/>
......@@ -907,7 +907,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="90" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
<rect key="frame" x="0.0" y="268.5" width="768" height="90"/>
<rect key="frame" x="0.0" y="332.5" width="768" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
<rect key="frame" x="0.0" y="0.0" width="768" height="89.5"/>
......@@ -967,7 +967,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="358.5" width="768" height="80"/>
<rect key="frame" x="0.0" y="422.5" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
......@@ -1028,7 +1028,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="438.5" width="768" height="50"/>
<rect key="frame" x="0.0" y="502.5" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
......@@ -1188,7 +1188,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<rect key="frame" x="0.0" y="64" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
......@@ -1261,7 +1261,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
<rect key="frame" x="0.0" y="28" width="768" height="170"/>
<rect key="frame" x="0.0" y="92" width="768" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
<rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
......@@ -1843,7 +1843,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="140" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="28" width="768" height="140"/>
<rect key="frame" x="0.0" y="92" width="768" height="140"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
<rect key="frame" x="0.0" y="0.0" width="768" height="139.5"/>
......@@ -1940,7 +1940,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell">
<rect key="frame" x="0.0" y="168" width="768" height="56"/>
<rect key="frame" x="0.0" y="232" width="768" height="56"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
......@@ -2011,7 +2011,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="56" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
<rect key="frame" x="0.0" y="224" width="768" height="56"/>
<rect key="frame" x="0.0" y="288" width="768" height="56"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
......@@ -2042,7 +2042,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="280" width="768" height="80"/>
<rect key="frame" x="0.0" y="344" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
......@@ -2103,7 +2103,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="360" width="768" height="50"/>
<rect key="frame" x="0.0" y="424" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
......@@ -3037,10 +3037,10 @@
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="fmC-jg-sSJ">
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" id="fmC-jg-sSJ">
<rect key="frame" x="434" y="170" width="260" height="720"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="qxJ-mL-6DU">
<size key="itemSize" width="100" height="47"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
......@@ -3066,6 +3066,9 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<size key="customSize" width="100" height="44"/>
<connections>
<outlet property="titleLabe" destination="SUW-Fc-3HB" id="V8D-b0-LvX"/>
</connections>
</collectionViewCell>
</cells>
</collectionView>
......@@ -3093,10 +3096,10 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="dkI-Sw-rjp">
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" id="dkI-Sw-rjp">
<rect key="frame" x="73" y="170" width="260" height="720"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="w9P-dR-D2U">
<size key="itemSize" width="100" height="45"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
......@@ -3122,6 +3125,9 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<size key="customSize" width="100" height="44"/>
<connections>
<outlet property="searchLabe" destination="yra-Bz-UVB" id="2ta-Qn-PNC"/>
</connections>
</collectionViewCell>
</cells>
</collectionView>
......
Lighting/Tools/PrefixHeader.pch
View file @ 27d221f0
......@@ -134,10 +134,15 @@
#define ServerAddress @"http://139.196.195.30:8090/opple-web/app"
/**
* 搜索框输入通知
*/
#define SEARCHSTRING @"SEARCHINPUTSTRING"
/**
* 搜索框返回根视图
*/
#define POPROOTCONTROLLER @"POPROOTCONTROLLER"
......
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