Skip to content

O
Opple-iOS
Commit 43d5bdfd authored by 勾芒's avatar 勾芒
Browse files
Options

客户添加公司字段,优化代码

parent 5c3bbb32
Hide whitespace changes
Inline Side-by-side
Showing with 1652 additions and 577 deletions
Lighting/Class/ClientViewController.m
View file @ 43d5bdfd
......@@ -456,6 +456,7 @@
customerEntity.mobile = self.phoneNumberField.text;
customerEntity.address = self.customerAddress.text;
customerEntity.name = self.customerNameField.text;
customerEntity.company = self.companyNameField.text;
//修改
if (isChange) {
customerEntity.fid = [Customermanager manager].customerID;
......
Lighting/Class/Login/LoginViewController.m
View file @ 43d5bdfd
......@@ -443,7 +443,6 @@
ResetPasswordRequest *passwrod = [[ResetPasswordRequest alloc]init];
passwrod.fnewPassword = self.resetPasswordView.newpass.text;
passwrod.username = self.userName.text;
passwrod.smsCode = self.verifyCode;//验证码
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/employee/resetPassword"] WithRequestType:0 WithParameter:passwrod WithReturnValueBlock:^(id returnValue) {
......
Lighting/Class/OrderdetailsViewController.m
View file @ 43d5bdfd
......@@ -415,11 +415,12 @@
#pragma mark -下载PDF
- (void)DownloadPDF:(void(^)(id returnValue))success
{
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@",ServerAddress,@"/order/UrlOfprintPDF/",_orderCode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@",ServerAddress,@"/order/urlOfprintPDF/",_orderCode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
NSString *url = [NSString stringWithFormat:@"%@%@",PDFSERADDRESS,returnValue[@"data"]];
NSString *url = [NSString stringWithFormat:@"%@",returnValue[@"data"]];
success(url);
......
Lighting/Class/PayViewController.xib
View file @ 43d5bdfd
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PayViewController">
<connections>
<outlet property="dealersImageView" destination="kZZ-Mx-zku" id="EkS-xw-9hm"/>
<outlet property="dealersName" destination="Qnn-EJ-jG9" id="7Xd-rp-40Q"/>
<outlet property="payTypeBackimageView" destination="65W-fM-QJC" id="IXr-70-nIX"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
......@@ -21,29 +21,19 @@
<rect key="frame" x="0.0" y="13" width="281" height="365"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kZZ-Mx-zku">
<rect key="frame" x="60" y="92" width="160" height="160"/>
<rect key="frame" x="60" y="61" width="160" height="190"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欧普经销商名称" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qnn-EJ-jG9">
<rect key="frame" x="0.0" y="63" width="281" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.11764705882352941" green="0.77647058823529413" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="kZZ-Mx-zku" secondAttribute="trailing" constant="61" id="APK-0F-TZ6"/>
<constraint firstItem="kZZ-Mx-zku" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="60" id="GXV-eC-ZJb"/>
<constraint firstAttribute="trailing" secondItem="65W-fM-QJC" secondAttribute="trailing" id="L7y-ix-jMK"/>
<constraint firstAttribute="trailing" secondItem="Qnn-EJ-jG9" secondAttribute="trailing" id="MXx-9A-Ffx"/>
<constraint firstItem="kZZ-Mx-zku" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="92" id="N7Y-JB-Ueu"/>
<constraint firstItem="Qnn-EJ-jG9" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Pna-Q8-0U3"/>
<constraint firstAttribute="bottom" secondItem="65W-fM-QJC" secondAttribute="bottom" id="Ww7-uF-rTQ"/>
<constraint firstItem="kZZ-Mx-zku" firstAttribute="top" secondItem="Qnn-EJ-jG9" secondAttribute="bottom" constant="8" id="X7q-ck-CM0"/>
<constraint firstItem="Qnn-EJ-jG9" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="63" id="d8h-WT-jvW"/>
<constraint firstAttribute="bottom" secondItem="kZZ-Mx-zku" secondAttribute="bottom" constant="127" id="abj-oP-Xla"/>
<constraint firstItem="kZZ-Mx-zku" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="61" id="c9q-Ik-bav"/>
<constraint firstItem="65W-fM-QJC" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="13" id="eaq-dy-IeU"/>
<constraint firstAttribute="bottom" secondItem="kZZ-Mx-zku" secondAttribute="bottom" constant="126" id="jSm-lX-Jkm"/>
<constraint firstItem="65W-fM-QJC" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="laS-5z-ueR"/>
<constraint firstItem="kZZ-Mx-zku" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="60" id="zAz-0X-GtW"/>
<constraint firstAttribute="trailing" secondItem="kZZ-Mx-zku" secondAttribute="trailing" constant="61" id="zKx-cF-x9a"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="448.5" y="228"/>
......
Lighting/Class/ProductCollectionPictureCell.m
View file @ 43d5bdfd
......@@ -13,7 +13,7 @@
self = [super initWithFrame:frame];
if (self) {
self.backgroundColor=[UIColor whiteColor];
self.productImageView =[[UIImageView alloc]initWithFrame:CGRectMake(0, 0, frame.size.width, 2*frame.size.height/3)];
self.productImageView =[[UIImageView alloc]initWithFrame:CGRectMake(15, 0, frame.size.width-30, 2*frame.size.height/3)];
[self addSubview:self.productImageView];
self.subView=[[UIView alloc]initWithFrame:CGRectMake(0, 2*frame.size.height/3, frame.size.width, frame.size.height/3)];
[self.subView setBackgroundColor:[UIColor whiteColor]];
......
Lighting/Class/ProductLibraryView.h
View file @ 43d5bdfd
......@@ -20,7 +20,7 @@
@interface ProductLibraryView :BaseViewController<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource,UITableViewDataSource,UICollectionViewDataSource,
UICollectionViewDelegate,UICollectionViewDelegateFlowLayout>
@property (nonatomic,assign) id<AddProductPicturedelegate> delegate;
@property (nonatomic,strong) id<AddProductPicturedelegate> delegate;
@property (nonatomic,strong) UIView *subView;
@property (nonatomic,strong) UIView *headerView;
@property (nonatomic,strong) UITableView *seceneTableView;
......
Lighting/Class/ProductLibraryView.m
View file @ 43d5bdfd
......@@ -468,7 +468,6 @@
ProductCollectionPictureCell * cell = (ProductCollectionPictureCell*)[collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
NSArray *imageArray = [[[self.datasArray objectAtIndex_opple:indexPath.item] pictures] componentsSeparatedByString:@","];
[cell.productImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray firstObject]] placeholderImage:REPLACEIMAGE];
[cell.productImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray firstObject]] placeholderImage:REPLACEIMAGE];
cell.productDesce.text=[[self.datasArray objectAtIndex_opple:indexPath.item] name];
TOGoodsEntity *model = [self.datasArray objectAtIndex_opple:indexPath.item];
......
Lighting/Class/ProductLibraryViewController.m
View file @ 43d5bdfd
......@@ -12,6 +12,7 @@
#import "ScreeningView.h"
#import "screeningFirstView.h"
#import "screeningSecondView.h"
#import "ExperienceCentreViewController.h"
@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate>
......@@ -117,7 +118,6 @@
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
self.view.backgroundColor = [UIColor blueColor];
[self uiConfigAction];
[self GetdatasAction];
......@@ -506,7 +506,15 @@
#pragma mark -筛选
- (void)ScreeningButtonClick
{
// ExperienceCentreViewController *ExperienceCenter = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
//// [self presentViewController:ExperienceCenter animated:YES completion:nil];
//
// ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
// UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
// popover.sourceView = ExperienceCenter.view;
// [self presentViewController:ExperienceCenter animated:YES completion:nil];
self.screenView = [[[NSBundle mainBundle] loadNibNamed:@"ScreeningView" owner:self options:nil]firstObject];
self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
self.screenView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
......@@ -684,11 +692,12 @@
if (self.temporaryArray.goodsEntity.count == 0) {
[self ErrorMBProgressView:@"暂无数据"];
return;
}else
{
self.datasArray = [NSMutableArray arrayWithArray:self.temporaryArray.goodsEntity];
[self.productCollectionView reloadData];
[self DismissScreenView];
}
self.datasArray = [NSMutableArray arrayWithArray:self.temporaryArray.goodsEntity];
[self.productCollectionView reloadData];
[self DismissScreenView];
}
......
Lighting/Class/SeceneCollectionPictureCell.m
View file @ 43d5bdfd
......@@ -22,7 +22,7 @@
{
_model = model;
[self.imageView sd_setImageWithURL:[NSURL URLWithString:_model.pricure] placeholderImage:ReplaceImage];
[self.imageView sd_setImageWithURL:[NSURL URLWithString:_model.pricure] placeholderImage:REPLACEIMAGE];
}
@end
Lighting/Class/Tabbar/Toolview.m
View file @ 43d5bdfd
......@@ -43,9 +43,8 @@
{
//阴影
self.layer.shadowColor = [UIColor blackColor].CGColor;
self.layer.shadowRadius = 4;
self.layer.shadowRadius = 10;
self.layer.shadowOpacity = 0.5;
self.layer.shadowOffset = CGSizeMake(0,0);
//图标
UIImageView *iconImage = [[UIImageView alloc]initWithFrame:CGRectMake(50, 13, 115, 35)];
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 43d5bdfd
......@@ -42,11 +42,11 @@
2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; };
2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; };
290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; };
2925D03D1CFEE5D7008879BC /* ScreeningTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */; };
2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; };
2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; };
2928F8381CD09E730036D761 /* CustomButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8371CD09E730036D761 /* CustomButton.m */; };
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F83A1CD0A0CE0036D761 /* CustomTabbarController.m */; };
2928F83D1CD0A9CD0036D761 /* qq.png in Resources */ = {isa = PBXBuildFile; fileRef = 2928F83C1CD0A9CD0036D761 /* qq.png */; };
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */; };
292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 292A14301CE81D1D00EB4430 /* AddressModel.m */; };
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */ = {isa = PBXBuildFile; fileRef = 2933934E1CD3158B000D997B /* instructionsLabe.m */; };
......@@ -74,6 +74,8 @@
29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; };
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29807C611CD20C2A00F111B8 /* Images.xcassets */; };
29807C651CD20F0F00F111B8 /* StoryboardwithCYX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */; };
29808A641CFEC41B001D1020 /* ExperienceCentreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29808A631CFEC41B001D1020 /* ExperienceCentreViewController.m */; };
29808A6B1CFED730001D1020 /* SceneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29808A6A1CFED730001D1020 /* SceneViewController.m */; };
29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EB31CDF1EAA001A484F /* screeningSecondView.m */; };
29834EB61CDF1EB6001A484F /* screeningSecondView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29834EB51CDF1EB6001A484F /* screeningSecondView.xib */; };
29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EB81CDF1FB3001A484F /* screeningFirstView.m */; };
......@@ -117,6 +119,7 @@
29BFBD981CE46FDA00C238FB /* MyclientEntityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD971CE46FDA00C238FB /* MyclientEntityModel.m */; };
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; };
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */; };
29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CCA43B1CF7ED6100BC19DD /* SelectedTableViewCell.m */; };
29D260F51CEEAE2800A9787D /* FullScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260F41CEEAE2800A9787D /* FullScreenViewController.m */; };
29D260F81CEEAF2D00A9787D /* FullScreenViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260F71CEEAF2D00A9787D /* FullScreenViewCell.m */; };
......@@ -147,7 +150,6 @@
29F725FE1CE1928F0072FE0E /* opple_objc_json_client.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F725FD1CE1928F0072FE0E /* opple_objc_json_client.m */; };
29F726011CE1D05D0072FE0E /* ScreeningCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F726001CE1D05D0072FE0E /* ScreeningCollectionReusableView.m */; };
29F726041CE1E96E0072FE0E /* ScreeningSecondCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29F726031CE1E96E0072FE0E /* ScreeningSecondCollectionReusableView.m */; };
B3F7042640AEFA916A6D9E6A /* Pods_Lighting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 700F6F058D87C328303E31C8 /* Pods_Lighting.framework */; };
FDB3E374E3D92A371F79B245 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD9ABF900C09EF17340B0DE6 /* libPods.a */; };
/* End PBXBuildFile section */
......@@ -214,6 +216,8 @@
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>"; };
290887121CE5DF16000B7097 /* ShopcarModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopcarModel.m; 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>"; };
2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
2928F7E51CD087FE0036D761 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
2928F7E61CD087FE0036D761 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
......@@ -223,7 +227,6 @@
2928F8371CD09E730036D761 /* CustomButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomButton.m; sourceTree = "<group>"; };
2928F8391CD0A0CE0036D761 /* CustomTabbarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTabbarController.h; sourceTree = "<group>"; };
2928F83A1CD0A0CE0036D761 /* CustomTabbarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomTabbarController.m; sourceTree = "<group>"; };
2928F83C1CD0A9CD0036D761 /* qq.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = qq.png; sourceTree = "<group>"; };
2928F8401CD0ABAC0036D761 /* ShoppingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingViewController.h; sourceTree = "<group>"; };
2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingViewController.m; sourceTree = "<group>"; };
292A142F1CE81D1D00EB4430 /* AddressModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressModel.h; sourceTree = "<group>"; };
......@@ -269,6 +272,10 @@
29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
29807C611CD20C2A00F111B8 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
29807C641CD20F0F00F111B8 /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; };
29808A621CFEC41B001D1020 /* ExperienceCentreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExperienceCentreViewController.h; sourceTree = "<group>"; };
29808A631CFEC41B001D1020 /* ExperienceCentreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExperienceCentreViewController.m; sourceTree = "<group>"; };
29808A691CFED730001D1020 /* SceneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneViewController.h; sourceTree = "<group>"; };
29808A6A1CFED730001D1020 /* SceneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneViewController.m; sourceTree = "<group>"; };
29834EB21CDF1EAA001A484F /* screeningSecondView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screeningSecondView.h; sourceTree = "<group>"; };
29834EB31CDF1EAA001A484F /* screeningSecondView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = screeningSecondView.m; sourceTree = "<group>"; };
29834EB51CDF1EB6001A484F /* screeningSecondView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = screeningSecondView.xib; sourceTree = "<group>"; };
......@@ -347,6 +354,8 @@
29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductCollectionViewCell.m; sourceTree = "<group>"; };
29C584EB1CDA429500C6F677 /* ProductDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsViewController.h; sourceTree = "<group>"; };
29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductDetailsViewController.m; sourceTree = "<group>"; };
29CB35401CFF0FB60061A5F3 /* ScreeningCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningCollectionViewCell.h; sourceTree = "<group>"; };
29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningCollectionViewCell.m; sourceTree = "<group>"; };
29CCA43A1CF7ED6100BC19DD /* SelectedTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectedTableViewCell.h; sourceTree = "<group>"; };
29CCA43B1CF7ED6100BC19DD /* SelectedTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectedTableViewCell.m; sourceTree = "<group>"; };
29D260F31CEEAE2800A9787D /* FullScreenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullScreenViewController.h; sourceTree = "<group>"; };
......@@ -422,7 +431,6 @@
041843DF1CF7735C0081B694 /* SystemConfiguration.framework in Frameworks */,
041843DE1CF773530081B694 /* libiconv.tbd in Frameworks */,
041843DC1CF773490081B694 /* Security.framework in Frameworks */,
B3F7042640AEFA916A6D9E6A /* Pods_Lighting.framework in Frameworks */,
FDB3E374E3D92A371F79B245 /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -624,6 +632,7 @@
2928F7DE1CD085430036D761 /* Tools */ = {
isa = PBXGroup;
children = (
29808A611CFEC287001D1020 /* Experiencecentre */,
29F14B931CF6A4B50005D3E5 /* Scanner */,
2902E1301CF2907200268161 /* RefreshHeader */,
294CF0E91CEDCF250055F1D8 /* PromptinformationView */,
......@@ -687,7 +696,6 @@
children = (
2928F8361CD09E730036D761 /* CustomButton.h */,
2928F8371CD09E730036D761 /* CustomButton.m */,
2928F83C1CD0A9CD0036D761 /* qq.png */,
2933934D1CD3158B000D997B /* instructionsLabe.h */,
2933934E1CD3158B000D997B /* instructionsLabe.m */,
);
......@@ -904,6 +912,53 @@
name = Controller;
sourceTree = "<group>";
};
29808A611CFEC287001D1020 /* Experiencecentre */ = {
isa = PBXGroup;
children = (
29808A681CFED712001D1020 /* Controller */,
29808A651CFED6E5001D1020 /* Scene */,
);
name = Experiencecentre;
sourceTree = "<group>";
};
29808A651CFED6E5001D1020 /* Scene */ = {
isa = PBXGroup;
children = (
29808A671CFED70A001D1020 /* View */,
29808A661CFED6FE001D1020 /* Controller */,
);
name = Scene;
sourceTree = "<group>";
};
29808A661CFED6FE001D1020 /* Controller */ = {
isa = PBXGroup;
children = (
29808A691CFED730001D1020 /* SceneViewController.h */,
29808A6A1CFED730001D1020 /* SceneViewController.m */,
);
name = Controller;
sourceTree = "<group>";
};
29808A671CFED70A001D1020 /* View */ = {
isa = PBXGroup;
children = (
2925D03B1CFEE5D7008879BC /* ScreeningTableViewCell.h */,
2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */,
29CB35401CFF0FB60061A5F3 /* ScreeningCollectionViewCell.h */,
29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */,
);
name = View;
sourceTree = "<group>";
};
29808A681CFED712001D1020 /* Controller */ = {
isa = PBXGroup;
children = (
29808A621CFEC41B001D1020 /* ExperienceCentreViewController.h */,
29808A631CFEC41B001D1020 /* ExperienceCentreViewController.m */,
);
name = Controller;
sourceTree = "<group>";
};
29834EBC1CDF21D8001A484F /* screeningSecondView */ = {
isa = PBXGroup;
children = (
......@@ -1418,7 +1473,6 @@
29834EBB1CDF1FBC001A484F /* screeningFirstView.xib in Resources */,
2994C0161CFBE793005A80AF /* PayViewController.xib in Resources */,
29EAAEAC1CDCA28300C4DBA2 /* city.json in Resources */,
2928F83D1CD0A9CD0036D761 /* qq.png in Resources */,
29834EC61CDF76C1001A484F /* UserViewController.xib in Resources */,
299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */,
29706DB41CD082990003C412 /* Assets.xcassets in Resources */,
......@@ -1512,7 +1566,9 @@
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */,
2994C0151CFBE793005A80AF /* PayViewController.m in Sources */,
2925D03D1CFEE5D7008879BC /* ScreeningTableViewCell.m in Sources */,
2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */,
2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */,
299876271CD9837C00C90D0A /* OrderTableViewCell.m in Sources */,
......@@ -1538,6 +1594,7 @@
29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */,
04F9EE181CF2235000BD729F /* ShoppingView.m in Sources */,
29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */,
29808A6B1CFED730001D1020 /* SceneViewController.m in Sources */,
04F9EE1B1CF22B5900BD729F /* ShoppingCell.m in Sources */,
29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */,
2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */,
......@@ -1573,6 +1630,7 @@
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */,
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */,
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
29808A641CFEC41B001D1020 /* ExperienceCentreViewController.m in Sources */,
29A9DCAE1CEB643C00A7567A /* PDFViewController.m in Sources */,
29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */,
0470D6141CE2938000647F0F /* ProductLibraryView.m in Sources */,
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 43d5bdfd
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
......@@ -153,7 +154,7 @@
<rect key="frame" x="0.0" y="28" width="721" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NV8-I4-ig4" id="E0m-wU-1b5">
<rect key="frame" x="0.0" y="0.0" width="721" height="99"/>
<rect key="frame" x="0.0" y="0.0" width="721" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="F66-vh-va3">
......@@ -422,7 +423,7 @@
<rect key="frame" x="0.0" y="28" width="717" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Sl-4a-xI0" id="Kls-Lg-VEy">
<rect key="frame" x="0.0" y="0.0" width="717" height="99"/>
<rect key="frame" x="0.0" y="0.0" width="717" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="mhA-C1-oB5">
......@@ -530,7 +531,7 @@
<rect key="frame" x="0.0" y="128" width="717" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1pL-BK-mae" id="zJa-bo-n5G">
<rect key="frame" x="0.0" y="0.0" width="717" height="199"/>
<rect key="frame" x="0.0" y="0.0" width="717" height="199.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单时间：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DqG-UR-Q08">
......@@ -749,10 +750,10 @@
<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="50" width="1024" height="84"/>
<rect key="frame" x="0.0" y="49.5" width="1024" 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="1024" height="83"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KGm-XJ-NyV">
......@@ -822,10 +823,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="134" width="1024" height="110"/>
<rect key="frame" x="0.0" y="133.5" width="1024" height="110"/>
<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="1024" height="109"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="109.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="Zdg-s0-xfD">
......@@ -899,10 +900,10 @@
</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="244" width="1024" height="90"/>
<rect key="frame" x="0.0" y="243.5" width="1024" 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="1024" height="89"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="89.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tiK-JC-Jy4">
......@@ -956,10 +957,10 @@
</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="334" width="1024" height="80"/>
<rect key="frame" x="0.0" y="333.5" width="1024" 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="1024" height="79"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="6MS-gq-TMk">
......@@ -1028,10 +1029,10 @@
</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="414" width="1024" height="50"/>
<rect key="frame" x="0.0" y="413.5" width="1024" 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="1024" height="49"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rbZ-Pg-7Uu">
......@@ -1189,7 +1190,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="64" width="300" height="300"/>
<rect key="frame" x="0.0" y="0.0" 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"/>
......@@ -1271,10 +1272,10 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<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="50" width="768" height="170"/>
<rect key="frame" x="0.0" y="49.5" 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"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" id="2bG-Ip-ptr">
......@@ -1661,7 +1662,7 @@
<rect key="frame" x="0.0" y="28" width="973" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
<rect key="frame" x="0.0" y="0.0" width="973" height="79"/>
<rect key="frame" x="0.0" y="0.0" width="973" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">
......@@ -1882,7 +1883,7 @@
<rect key="frame" x="0.0" y="28" width="768" height="110"/>
<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="109"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="109.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="qWT-p0-Gta">
......@@ -1959,7 +1960,7 @@
<rect key="frame" x="0.0" y="138" 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"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X0Z-8j-BdI">
......@@ -2027,7 +2028,7 @@
<rect key="frame" x="0.0" y="194" width="768" height="70"/>
<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="69"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="69.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0f-EW-LM5">
......@@ -2062,7 +2063,7 @@
<rect key="frame" x="0.0" y="264" 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"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="Un4-g0-sG6">
......@@ -2134,7 +2135,7 @@
<rect key="frame" x="0.0" y="344" 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"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ULe-0J-pCd">
......@@ -3200,6 +3201,288 @@
</objects>
<point key="canvasLocation" x="1824" y="13177"/>
</scene>
<!--Experience Centre View Controller-->
<scene sceneID="LfM-Vg-riy">
<objects>
<viewController storyboardIdentifier="ExperienceCentre" id="Gqn-uq-cA1" customClass="ExperienceCentreViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="xNf-Ng-NUx">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="默认场景" id="GBJ-e6-U4h">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="WBE-oY-ZzS">
<rect key="frame" x="38" y="94" width="45" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="1"/>
<connections>
<action selector="ReturnButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="iBL-Zc-enW"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Owr-Ny-CHc">
<rect key="frame" x="40" y="257" width="45" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="gouwuche"/>
<connections>
<action selector="ShoppingBagButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="4on-rf-6wU"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="RLx-QE-anb">
<rect key="frame" x="40" y="342" width="45" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="fenxiang"/>
<connections>
<action selector="ShareButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="SkX-Ud-eH9"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="J0C-9n-Nc1">
<rect key="frame" x="40" y="427" width="45" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="customchangjing"/>
<connections>
<action selector="TakingPhotoButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="a1e-Ai-Itx"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Rdf-QC-ILr">
<rect key="frame" x="40" y="512" width="45" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="quanping"/>
<connections>
<action selector="AmplificationButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="NSd-sb-tbj"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="yLQ-kh-sZt">
<rect key="frame" x="40" y="644" width="45" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="bangzhu"/>
<connections>
<action selector="HelpButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="vNb-YQ-vFg"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="DZ8-8m-TAP">
<rect key="frame" x="32" y="921" width="60" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<state key="normal" backgroundImage="场景2"/>
<connections>
<action selector="SceneSelectedButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="wnw-wT-qrA"/>
</connections>
</button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="M0K-FF-oX8">
<rect key="frame" x="116" y="901" width="629" height="100"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
</scrollView>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="f7n-Qk-GhU">
<rect key="frame" x="645" y="38" width="100" height="607"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES" flexibleMaxY="YES"/>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Liv-2f-f1g">
<rect key="frame" x="665" y="707" width="60" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="产品2"/>
<connections>
<action selector="ProductSelectedButtonClickAction:" destination="Gqn-uq-cA1" eventType="touchUpInside" id="hpB-yH-WYT"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<simulatedScreenMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="amplificationButton" destination="Rdf-QC-ILr" id="al8-jx-GEV"/>
<outlet property="helpButton" destination="yLQ-kh-sZt" id="FoD-Iw-n7l"/>
<outlet property="productScrollview" destination="f7n-Qk-GhU" id="vBn-yI-5x9"/>
<outlet property="productSelectedButton" destination="Liv-2f-f1g" id="sDd-OF-ScS"/>
<outlet property="returnButton" destination="WBE-oY-ZzS" id="njb-qK-rAa"/>
<outlet property="sceneImageView" destination="GBJ-e6-U4h" id="f8j-jh-W3E"/>
<outlet property="sceneScrollview" destination="M0K-FF-oX8" id="g4o-Nt-xRG"/>
<outlet property="sceneSelectedButton" destination="DZ8-8m-TAP" id="Rud-yQ-pfE"/>
<outlet property="shareButton" destination="RLx-QE-anb" id="YWL-iE-dJw"/>
<outlet property="shoppingbagButton" destination="Owr-Ny-CHc" id="haF-mw-fxs"/>
<outlet property="takingPicturesButton" destination="J0C-9n-Nc1" id="dN0-eW-hQV"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="56N-nP-yeb" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1824" y="14303"/>
</scene>
<!--Scene View Controller-->
<scene sceneID="Ezg-ab-G2Y">
<objects>
<viewController storyboardIdentifier="SceneController" id="oDx-32-j3R" customClass="SceneViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="gkF-Yq-Az3">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" id="3aN-RP-MSb">
<rect key="frame" x="134" y="76" width="500" height="515"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="材质">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="ScreeningConditionsSelectedButtonClick:" destination="oDx-32-j3R" eventType="touchUpInside" id="HAT-NW-Mzf"/>
</connections>
</button>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="空间">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="ScreeningConditionsSelectedButtonClick:" destination="oDx-32-j3R" eventType="touchUpInside" id="QC7-jd-bOJ"/>
</connections>
</button>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="类型">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="ScreeningConditionsSelectedButtonClick:" destination="oDx-32-j3R" eventType="touchUpInside" id="YJO-ha-Jg2"/>
</connections>
</button>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="风格">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="ScreeningConditionsSelectedButtonClick:" destination="oDx-32-j3R" eventType="touchUpInside" id="m5j-pS-zx9"/>
</connections>
</button>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="50" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="价格">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="ScreeningConditionsSelectedButtonClick:" destination="oDx-32-j3R" eventType="touchUpInside" id="Z5y-Wz-0zU"/>
</connections>
</button>
<view contentMode="scaleToFill" id="ae8-6e-hfY">
<rect key="frame" x="0.0" y="0.0" width="450" height="515"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" id="zvU-Oe-Img">
<rect key="frame" x="0.0" y="0.0" width="350" height="55"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择场景" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Dpv-8s-VU9">
<rect key="frame" x="73" y="15" width="113" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.90980392156862744" green="0.90980392156862744" blue="0.90980392156862744" alpha="1" colorSpace="calibratedRGB"/>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="6ls-zF-PlY">
<rect key="frame" x="0.0" y="55" width="350" height="460"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="5Dv-ta-zBb">
<size key="itemSize" width="159" height="104"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<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"/>
<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="159" height="104"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="登录" id="KTD-Jg-IUS">
<rect key="frame" x="5" y="5" width="149" height="94"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<color key="backgroundColor" red="0.90588235294117647" green="0.90588235294117647" blue="0.90588235294117647" alpha="1" colorSpace="calibratedRGB"/>
<size key="customSize" width="159" height="104"/>
<connections>
<outlet property="sceneImageView" destination="KTD-Jg-IUS" id="wl0-hn-uOS"/>
</connections>
</collectionViewCell>
</cells>
</collectionView>
<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="350" 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="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
</view>
</subviews>
<color key="backgroundColor" red="0.1176470588" green="0.37913761406206903" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
</view>
<connections>
<outlet property="clickEventView" destination="3aN-RP-MSb" id="u48-oO-Tdl"/>
<outlet property="collectionViewLayout" destination="5Dv-ta-zBb" id="fWU-Zq-gA6"/>
<outlet property="materialButton" destination="9K2-Ir-Ek4" id="XB2-T7-PaM"/>
<outlet property="priceButton" destination="aXq-zd-zbV" id="EIo-Sh-hZP"/>
<outlet property="sceneOrProductClollectionView" destination="6ls-zF-PlY" id="ryB-8i-5dQ"/>
<outlet property="screeningTableView" destination="uIv-ej-r0S" id="d3G-Z5-xex"/>
<outlet property="spaceButton" destination="yqc-qb-xMr" id="oL5-QH-OXT"/>
<outlet property="styleButton" destination="d4v-Yx-CKR" id="gpB-q9-V46"/>
<outlet property="typeButton" destination="pWS-6Q-Bfm" id="Ruc-8c-fRv"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="sGv-mn-3hq" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1826" y="15382"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="mef-so-Hgk">
<objects>
......@@ -3239,17 +3522,28 @@
</scenes>
<resources>
<image name="05产品库-详情_03" width="500" height="375"/>
<image name="1" width="45" height="45"/>
<image name="Folder" width="18" height="17"/>
<image name="Trash" width="25" height="26"/>
<image name="aboutus" width="1024" height="510"/>
<image name="add" width="49" height="45"/>
<image name="bangzhu" width="45" height="45"/>
<image name="bg" width="26" height="26"/>
<image name="box-副本" width="26" height="26"/>
<image name="customchangjing" width="45" height="45"/>
<image name="fenxiang" width="45" height="45"/>
<image name="gouwuche" width="45" height="45"/>
<image name="jia" width="30" height="30"/>
<image name="line" width="301" height="30"/>
<image name="lineNew" width="1024" height="7"/>
<image name="now" width="110" height="110"/>
<image name="quanping" width="45" height="45"/>
<image name="reduce" width="49" height="45"/>
<image name="产品2" width="50" height="50"/>
<image name="场景2" width="50" height="50"/>
<image name="已完成" width="88" height="87"/>
<image name="登录" width="1024" height="768"/>
<image name="视角" width="27" height="28"/>
<image name="默认场景" width="1500" height="1125"/>
</resources>
</document>
Lighting/Tools/ExperienceCentreViewController.h 0 → 100644
View file @ 43d5bdfd
//
// ExperienceCentreViewController.h
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface ExperienceCentreViewController : BaseViewController
/**
* 场景图片
*/
@property (weak, nonatomic) IBOutlet UIImageView *sceneImageView;
/**
* 返回按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *returnButton;
/**
* 购物袋按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *shoppingbagButton;
/**
* 分享按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *shareButton;
/**
* 拍照按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *takingPicturesButton;
/**
* 放大按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *amplificationButton;
/**
* 帮助按钮
*/
@property (weak, nonatomic) IBOutlet UIButton *helpButton;
/***********************************功能区*************************************/
/**
* 场景筛选
*/
@property (weak, nonatomic) IBOutlet UIButton *sceneSelectedButton;
/**
* 场景展示
*/
@property (weak, nonatomic) IBOutlet UIScrollView *sceneScrollview;
/**
* 产品筛选
*/
@property (weak, nonatomic) IBOutlet UIButton *productSelectedButton;
/**
* 产品展示
*/
@property (weak, nonatomic) IBOutlet UIScrollView *productScrollview;
@end
Lighting/Tools/ExperienceCentreViewController.m 0 → 100644
View file @ 43d5bdfd
//
// ExperienceCentreViewController.m
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ExperienceCentreViewController.h"
#import "SceneViewController.h"
@interface ExperienceCentreViewController ()
@end
@implementation ExperienceCentreViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
}
#pragma mark -返回
- (IBAction)ReturnButtonClickAction:(UIButton *)sender {
[self dismissViewControllerAnimated:YES completion:nil];
}
#pragma mark -购物袋
- (IBAction)ShoppingBagButtonClickAction:(UIButton *)sender {
}
#pragma mark -分享
- (IBAction)ShareButtonClickAction:(UIButton *)sender {
}
#pragma mark -拍照
- (IBAction)TakingPhotoButtonClickAction:(UIButton *)sender {
}
#pragma mark -全屏
- (IBAction)AmplificationButtonClickAction:(UIButton *)sender {
}
#pragma mark -帮助
- (IBAction)HelpButtonClickAction:(UIButton *)sender {
}
/**************************功能区**************************/
#pragma mark -场景筛选
- (IBAction)SceneSelectedButtonClickAction:(UIButton *)sender {
SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"];
sceneVC.view.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.1];
sceneVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
UIPopoverPresentationController *pop = sceneVC.popoverPresentationController;
pop.sourceView = sceneVC.view;
[self presentViewController:sceneVC animated:YES completion:nil];
}
#pragma mark -产品筛选
- (IBAction)ProductSelectedButtonClickAction:(UIButton *)sender {
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
Lighting/Tools/SceneViewController.h 0 → 100644
View file @ 43d5bdfd
//
// SceneViewController.h
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface SceneViewController : BaseViewController
/**
* 场景或商品列表
*/
@property (weak, nonatomic) IBOutlet UICollectionView *sceneOrProductClollectionView;
/**
* UICollectionViewLayout
*/
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *collectionViewLayout;
/************************筛选条件*****************************/
/**
* 筛选tableview
*/
@property (weak, nonatomic) IBOutlet UITableView *screeningTableView;
/**
* 风格
*/
@property (weak, nonatomic) IBOutlet UIButton *styleButton;
/**
* 类型
*/
@property (weak, nonatomic) IBOutlet UIButton *typeButton;
/**
* 空间
*/
@property (weak, nonatomic) IBOutlet UIButton *spaceButton;
/**
* 材质
*/
@property (weak, nonatomic) IBOutlet UIButton *materialButton;
/**
* 价格
*/
@property (weak, nonatomic) IBOutlet UIButton *priceButton;
/**
* 拦截点击事件(列表背景)
*/
@property (weak, nonatomic) IBOutlet UIView *clickEventView;
@end
Lighting/Tools/SceneViewController.m 0 → 100644
View file @ 43d5bdfd
//
// SceneViewController.m
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "SceneViewController.h"
#import "ScreeningTableViewCell.h"
#import "ScreeningCollectionViewCell.h"
@interface SceneViewController ()<UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UICollectionViewDelegate,UICollectionViewDataSource>
@end
@implementation SceneViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
[self UiConfigAction];
[self ReturnDismiss];
}
#pragma mark -UI
- (void)UiConfigAction
{
self.styleButton.layer.masksToBounds = YES;
self.styleButton.layer.cornerRadius = kSelectedCornerRadius;
self.typeButton.layer.masksToBounds = YES;
self.typeButton.layer.cornerRadius = kSelectedCornerRadius;
self.spaceButton.layer.masksToBounds = YES;
self.spaceButton.layer.cornerRadius = kSelectedCornerRadius;
self.materialButton.layer.masksToBounds = YES;
self.materialButton.layer.cornerRadius = kSelectedCornerRadius;
self.priceButton.layer.masksToBounds = YES;
self.priceButton.layer.cornerRadius = kSelectedCornerRadius;
//筛选Tableview
self.screeningTableView.delegate = self;
self.screeningTableView.dataSource = self;
[self.screeningTableView registerClass:[ScreeningTableViewCell class] forCellReuseIdentifier:@"ScreeningCellNew"];
//数据列表UICollectionView
self.collectionViewLayout.itemSize = CGSizeMake((self.sceneOrProductClollectionView.mj_w-40)/3, (self.sceneOrProductClollectionView.mj_w-40)/4);
self.collectionViewLayout.minimumLineSpacing = 10;
self.collectionViewLayout.minimumInteritemSpacing = 10;
self.collectionViewLayout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10);
self.sceneOrProductClollectionView.dataSource = self;
self.sceneOrProductClollectionView.delegate = self;
}
#pragma mark - UITableViewDataSource代理
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 3;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
ScreeningTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ScreeningCellNew" forIndexPath:indexPath];
cell.screeningLabe.text = @"主卧室";
return cell;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 55;
}
#pragma mark -UICollectionViewDataSource代理
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
return 10;
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
ScreeningCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ScreeningCollectioncell" forIndexPath:indexPath];
cell.layer.shadowColor = [UIColor blackColor].CGColor;
cell.layer.shadowRadius = 4;
cell.layer.shadowOpacity = 0.7;
cell.contentView.layer.shadowOffset = CGSizeMake(0, 0);
cell.layer.masksToBounds = NO;
return cell;
}
#pragma mark -筛选条件
- (IBAction)ScreeningConditionsSelectedButtonClick:(UIButton *)sender {
switch (sender.tag) {
case 100://风格
{
}
break;
case 101://类型
{
}
break;
case 102://空间
{
}
break;
case 103://材质
{
}
break;
case 104://价格
{
}
break;
default:
break;
}
}
#pragma mark -UIGestureRecognizerDelegate代理
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
{
//取消子视图的的时间穿透，否则子视图的点击无效，会被传递到父视图响应
if (CGRectContainsPoint(self.clickEventView.frame, [touch locationInView:self.view.window])) {
return NO;
}
return YES;
}
#pragma mark -返回手势
- (void)ReturnDismiss
{
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(ReturnButtonClickAction)];
tap.delegate = self;
[self.view addGestureRecognizer:tap];
}
#pragma mark -销毁
- (void)ReturnButtonClickAction
{
[self dismissViewControllerAnimated:YES completion:nil];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
Lighting/Tools/ScreeningCollectionViewCell.h 0 → 100644
View file @ 43d5bdfd
//
// ScreeningCollectionViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ScreeningCollectionViewCell : UICollectionViewCell
/**
* 场景图片
*/
@property (weak, nonatomic) IBOutlet UIImageView *sceneImageView;
@end
Lighting/Tools/ScreeningCollectionViewCell.m 0 → 100644
View file @ 43d5bdfd
//
// ScreeningCollectionViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ScreeningCollectionViewCell.h"
@implementation ScreeningCollectionViewCell
@end
Lighting/Tools/ScreeningTableViewCell.h 0 → 100644
View file @ 43d5bdfd
//
// ScreeningTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ScreeningTableViewCell : UITableViewCell
/**
* 筛选条件UIlabe
*/
@property (nonatomic,strong) UILabel *screeningLabe;
/**
* title
*/
@property (nonatomic,copy) NSString *screeningTitle;
@end
Lighting/Tools/ScreeningTableViewCell.m 0 → 100644
View file @ 43d5bdfd
//
// ScreeningTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 16/6/1.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ScreeningTableViewCell.h"
@implementation ScreeningTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
{
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.screeningLabe = [[UILabel alloc]initWithFrame:CGRectMake(0, 0, 100, 55)];
self.screeningLabe.textColor = kTCColor(170, 170, 170);
self.screeningLabe.font = [UIFont systemFontOfSize:13];
self.screeningLabe.textAlignment = NSTextAlignmentCenter;
[self.contentView addSubview:self.screeningLabe];
}
return self;
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
Lighting/Tools/opple_objc_json_client.h
View file @ 43d5bdfd
......@@ -36,21 +36,22 @@ extern NSString * const SORTDIRECTION_DESC;
@class RsShippingAddrEntity;
@class SaveShoppingCartRequest;
@class ShopCartFilter;
@class TOGoodsEntity;
@class TOGoodsBrandEntity;
@class TOGoodsLabelEntity;
@class TOHottagEntity;
@class TOOrderdetailEntity;
@class TOSceneEntity;
@class TOConsumerEntity;
@class VOResellerGoodsEntity;
@class TOGoodsCategoryEntity;
@class TOGoodsLabelCategoryEntity;
@class TOOrderEntity;
@class TOPositionEntity;
@class TOShippingAddrEntity;
@class TOShopcartEntity;
@class IdEntity;
@class TOShippingAddrEntity;
@class TOPositionEntity;
@class TOOrderEntity;
@class TOGoodsLabelCategoryEntity;
@class TOGoodsCategoryEntity;
@class VOResellerGoodsEntity;
@class TOConsumerEntity;
@class TOSceneEntity;
@class TOOrderdetailEntity;
@class TOHottagEntity;
@class TOGoodsLabelEntity;
@class TOGoodsBrandEntity;
@class TOGoodsEntity;
@class RsShareResponse;
@class DeleteCartRequest;
@class SceneCondition;
@class HotTagResponse;
......@@ -62,8 +63,8 @@ extern NSString * const SORTDIRECTION_DESC;
@class DataPage;
@class TSBaseUser;
@class TSDepart;
@class ShopCartResponse;
@class TSUserOrg;
@class ShopCartResponse;
@class SceneResponse;
@class OrderResponse;
@class GoodsResponse;
......@@ -84,21 +85,22 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol RsShippingAddrEntity @end
@protocol SaveShoppingCartRequest @end
@protocol ShopCartFilter @end
@protocol TOGoodsEntity @end
@protocol TOGoodsBrandEntity @end
@protocol TOGoodsLabelEntity @end
@protocol TOHottagEntity @end
@protocol TOOrderdetailEntity @end
@protocol TOSceneEntity @end
@protocol TOConsumerEntity @end
@protocol VOResellerGoodsEntity @end
@protocol TOGoodsCategoryEntity @end
@protocol TOGoodsLabelCategoryEntity @end
@protocol TOOrderEntity @end
@protocol TOPositionEntity @end
@protocol TOShippingAddrEntity @end
@protocol TOShopcartEntity @end
@protocol IdEntity @end
@protocol TOShippingAddrEntity @end
@protocol TOPositionEntity @end
@protocol TOOrderEntity @end
@protocol TOGoodsLabelCategoryEntity @end
@protocol TOGoodsCategoryEntity @end
@protocol VOResellerGoodsEntity @end
@protocol TOConsumerEntity @end
@protocol TOSceneEntity @end
@protocol TOOrderdetailEntity @end
@protocol TOHottagEntity @end
@protocol TOGoodsLabelEntity @end
@protocol TOGoodsBrandEntity @end
@protocol TOGoodsEntity @end
@protocol RsShareResponse @end
@protocol DeleteCartRequest @end
@protocol SceneCondition @end
@protocol HotTagResponse @end
......@@ -110,8 +112,8 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol DataPage @end
@protocol TSBaseUser @end
@protocol TSDepart @end
@protocol ShopCartResponse @end
@protocol TSUserOrg @end
@protocol ShopCartResponse @end
@protocol SceneResponse @end
@protocol OrderResponse @end
@protocol GoodsResponse @end
......@@ -557,14 +559,12 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
//针对多个商品 goodsId拼接商品id ，号隔开
@property (nonatomic, copy) NSString *goodsId;
/**
* 商品数量，>0表示添加, <0表示减少
*
*
*/
//针对多个商品 count拼接商品count ，号隔开
@property (nonatomic, copy) NSString *count;
@end /* interface SaveShoppingCartRequest */
......@@ -599,19 +599,119 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_TOGoodsEntity_H
#define DEF_TOGoodsEntity_H
#ifndef DEF_TOConsumerEntity_H
#define DEF_TOConsumerEntity_H
/**
* @Title: Entity
@Description: t_o_goods
@Description: 客户
@author onlineGenerator
@date 2016-05-12 15:44:01
@date 2016-05-08 18:08:58
@version V1.0
*/
@interface TOGoodsEntity : JSONModel
@interface TOConsumerEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *mobile;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *province;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *city;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *country;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *address;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *picture;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *lastVisitedTime;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *company;
@end /* interface TOConsumerEntity */
#endif
#ifndef DEF_VOResellerGoodsEntity_H
#define DEF_VOResellerGoodsEntity_H
/**
* 经销商和商品关系表。
@author Debenson
@since 0.1
*/
@interface VOResellerGoodsEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -816,60 +916,54 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *barcode;
@end /* interface TOGoodsEntity */
#endif
#ifndef DEF_TOGoodsBrandEntity_H
#define DEF_TOGoodsBrandEntity_H
/**
* @Title: Entity
@Description: 商品品牌
@author onlineGenerator
@date 2016-05-05 16:14:51
@version V1.0
*/
@interface TOGoodsBrandEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *resellerId;
/**
* 方法: 取得java.lang.String
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *createName;
@property (nonatomic, copy) NSString *categoryName;
/**
* 方法: 取得java.lang.String
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *createBy;
@property (nonatomic, copy) NSString *brandName;
@end /* interface VOResellerGoodsEntity */
#endif
#ifndef DEF_TOGoodsCategoryEntity_H
#define DEF_TOGoodsCategoryEntity_H
/**
* 方法: 取得java.util.Date
*
*
* @Title: Entity
@Description: 商品分类
@author onlineGenerator
@date 2016-05-10 10:17:53
@version V1.0
*/
@property (nonatomic, copy) NSString *createDate;
@interface TOGoodsCategoryEntity : JSONModel
/**
* 方法: 取得java.lang.String
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
@property (nonatomic, copy) NSString *upperName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysCompanyCode;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
......@@ -882,48 +976,36 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.Integer
*
*
*/
@property (nonatomic, assign) int state;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *logo;
@property (nonatomic, copy) NSString *upperId;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.lang.Integer
*
*
*/
@property (nonatomic, copy) NSString *fdescription;
@end /* interface TOGoodsBrandEntity */
@property (nonatomic, assign) int level;
@end /* interface TOGoodsCategoryEntity */
#endif
#ifndef DEF_TOGoodsLabelEntity_H
#define DEF_TOGoodsLabelEntity_H
#ifndef DEF_TOGoodsLabelCategoryEntity_H
#define DEF_TOGoodsLabelCategoryEntity_H
/**
* @Title: Entity
@Description: 商品标签
@Description: 商品标签分类
@author onlineGenerator
@date 2016-05-05 17:18:15
@date 2016-05-05 16:57:27
@version V1.0
*/
@interface TOGoodsLabelEntity : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TOGoodsLabelCategoryEntity *category;
@interface TOGoodsLabelCategoryEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -947,31 +1029,31 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *code;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *categoryId;
@end /* interface TOGoodsLabelEntity */
@property (nonatomic, copy) NSString *name;
@end /* interface TOGoodsLabelCategoryEntity */
#endif
#ifndef DEF_TOHottagEntity_H
#define DEF_TOHottagEntity_H
#ifndef DEF_TOOrderEntity_H
#define DEF_TOOrderEntity_H
/**
* @Title: Entity
@Description: 热门推荐
@Description: 订单
@author onlineGenerator
@date 2016-05-06 16:36:36
@date 2016-05-06 12:53:09
@version V1.0
*/
@interface TOHottagEntity : JSONModel
@interface TOOrderEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -983,67 +1065,73 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface TOHottagEntity */
#endif
#ifndef DEF_TOOrderdetailEntity_H
#define DEF_TOOrderdetailEntity_H
@property (nonatomic, copy) NSString *createName;
/**
* @Title: Entity
@Description: 订单详情
@author onlineGenerator
@date 2016-05-06 12:53:09
@version V1.0
* 方法: 取得java.lang.String
*
*
*/
@interface TOOrderdetailEntity : JSONModel
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *updateName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsId;
@property (nonatomic, copy) NSString *updateBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *updateDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsCode;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsName;
@property (nonatomic, copy) NSString *orderNumber;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *orderTime;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsCover;
@property (nonatomic, copy) NSString *guideId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsSpec;
@property (nonatomic, copy) NSString *orderState;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsBrand;
@property (nonatomic, copy) NSString *consumerId;
/**
* 方法: 取得java.lang.String
*
......@@ -1055,49 +1143,79 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, strong) NSNumber *goodsPrice;
@property (nonatomic, strong) NSNumber *orderPrice;
/**
* 方法: 取得java.math.BigDecimal
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSNumber *goodsTotalPrice;
@property (nonatomic, copy) NSString *receiverName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *orderId;
@property (nonatomic, copy) NSString *receiverMobile;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsUnit;
@property (nonatomic, copy) NSString *receiverAddress;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *remark;
@end /* interface TOOrderdetailEntity */
@property (nonatomic, copy) NSString *isBill;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billType;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billTitle;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *payType;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *consumerName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *guideName;
@end /* interface TOOrderEntity */
#endif
#ifndef DEF_TOSceneEntity_H
#define DEF_TOSceneEntity_H
#ifndef DEF_TOPositionEntity_H
#define DEF_TOPositionEntity_H
/**
* @Title: Entity
@Description: 场景
@Description: 经销商员工职位
@author onlineGenerator
@date 2016-05-05 18:39:39
@date 2016-05-02 17:39:21
@version V1.0
*/
@interface TOSceneEntity : JSONModel
@interface TOPositionEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -1109,38 +1227,104 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *sceneCode;
@property (nonatomic, copy) NSString *code;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSNumber *commission;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *pricure;
@property (nonatomic, copy) NSString *resellerCode;
@end /* interface TOPositionEntity */
#endif
#ifndef DEF_TOShippingAddrEntity_H
#define DEF_TOShippingAddrEntity_H
/**
* @Title: Entity
@Description: t_o_shipping_addr
@author onlineGenerator
@date 2016-05-14 16:14:15
@version V1.0
*/
@interface TOShippingAddrEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *category;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *style;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *space;
@end /* interface TOSceneEntity */
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *miblephone;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *province;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *city;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *country;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *address;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *consumerId;
@end /* interface TOShippingAddrEntity */
#endif
......@@ -1259,37 +1443,31 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_TOShippingAddrEntity_H
#define DEF_TOShippingAddrEntity_H
#ifndef DEF_TOSceneEntity_H
#define DEF_TOSceneEntity_H
/**
* @Title: Entity
@Description: t_o_shipping_addr
@Description: 场景
@author onlineGenerator
@date 2016-05-14 16:14:15
@date 2016-05-05 18:39:39
@version V1.0
*/
@interface TOShippingAddrEntity : JSONModel
@interface TOSceneEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
@property (nonatomic, copy) NSString *sceneCode;
/**
* 方法: 取得java.lang.String
*
......@@ -1301,55 +1479,43 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *miblephone;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *province;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *city;
@property (nonatomic, copy) NSString *pricure;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *country;
@property (nonatomic, copy) NSString *category;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *address;
@property (nonatomic, copy) NSString *style;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *consumerId;
@end /* interface TOShippingAddrEntity */
@property (nonatomic, copy) NSString *space;
@end /* interface TOSceneEntity */
#endif
#ifndef DEF_TOPositionEntity_H
#define DEF_TOPositionEntity_H
#ifndef DEF_TOOrderdetailEntity_H
#define DEF_TOOrderdetailEntity_H
/**
* @Title: Entity
@Description: 经销商员工职位
@Description: 订单详情
@author onlineGenerator
@date 2016-05-02 17:39:21
@date 2016-05-06 12:53:09
@version V1.0
*/
@interface TOPositionEntity : JSONModel
@interface TOOrderdetailEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -1361,199 +1527,199 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, copy) NSString *goodsId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSNumber *commission;
@property (nonatomic, copy) NSString *goodsCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *resellerCode;
@end /* interface TOPositionEntity */
#endif
#ifndef DEF_TOOrderEntity_H
#define DEF_TOOrderEntity_H
/**
* @Title: Entity
@Description: 订单
@author onlineGenerator
@date 2016-05-06 12:53:09
@version V1.0
*/
@interface TOOrderEntity : JSONModel
@property (nonatomic, copy) NSString *goodsName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, copy) NSString *goodsCover;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
@property (nonatomic, copy) NSString *goodsSpec;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *createDate;
@property (nonatomic, copy) NSString *goodsBrand;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateName;
@property (nonatomic, copy) NSString *goodsNum;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *updateBy;
@property (nonatomic, strong) NSNumber *goodsPrice;
/**
* 方法: 取得java.util.Date
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *updateDate;
@property (nonatomic, strong) NSNumber *goodsTotalPrice;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
@property (nonatomic, copy) NSString *orderId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *orderNumber;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *orderTime;
@property (nonatomic, copy) NSString *goodsUnit;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *guideId;
@property (nonatomic, copy) NSString *remark;
@end /* interface TOOrderdetailEntity */
#endif
#ifndef DEF_TOHottagEntity_H
#define DEF_TOHottagEntity_H
/**
* 方法: 取得java.lang.String
*
*
* @Title: Entity
@Description: 热门推荐
@author onlineGenerator
@date 2016-05-06 16:36:36
@version V1.0
*/
@property (nonatomic, copy) NSString *orderState;
@interface TOHottagEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *consumerId;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsNum;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSNumber *orderPrice;
@property (nonatomic, copy) NSString *name;
@end /* interface TOHottagEntity */
#endif
#ifndef DEF_TOGoodsLabelEntity_H
#define DEF_TOGoodsLabelEntity_H
/**
* 方法: 取得java.lang.String
*
*
* @Title: Entity
@Description: 商品标签
@author onlineGenerator
@date 2016-05-05 17:18:15
@version V1.0
*/
@property (nonatomic, copy) NSString *receiverName;
@interface TOGoodsLabelEntity : JSONModel
/**
* 方法: 取得java.lang.String
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *receiverMobile;
@property (nonatomic, strong) TOGoodsLabelCategoryEntity *category;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *receiverAddress;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *isBill;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billType;
@property (nonatomic, copy) NSString *sysCompanyCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billTitle;
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *payType;
@end /* interface TOOrderEntity */
@property (nonatomic, copy) NSString *categoryId;
@end /* interface TOGoodsLabelEntity */
#endif
#ifndef DEF_TOGoodsLabelCategoryEntity_H
#define DEF_TOGoodsLabelCategoryEntity_H
#ifndef DEF_TOGoodsBrandEntity_H
#define DEF_TOGoodsBrandEntity_H
/**
* @Title: Entity
@Description: 商品标签分类
@Description: 商品品牌
@author onlineGenerator
@date 2016-05-05 16:57:27
@date 2016-05-05 16:14:51
@version V1.0
*/
@interface TOGoodsLabelCategoryEntity : JSONModel
@interface TOGoodsBrandEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
* 方法: 取得java.lang.String
*
......@@ -1578,76 +1744,72 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *name;
@end /* interface TOGoodsLabelCategoryEntity */
/**
* 方法: 取得java.lang.Integer
*
*
*/
@property (nonatomic, copy) NSString *state;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *logo;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fdescription;
@end /* interface TOGoodsBrandEntity */
#endif
#ifndef DEF_TOGoodsCategoryEntity_H
#define DEF_TOGoodsCategoryEntity_H
#ifndef DEF_TOGoodsEntity_H
#define DEF_TOGoodsEntity_H
/**
* @Title: Entity
@Description: 商品分类
@Description: t_o_goods
@author onlineGenerator
@date 2016-05-10 10:17:53
@date 2016-05-12 15:44:01
@version V1.0
*/
@interface TOGoodsCategoryEntity : JSONModel
@interface TOGoodsEntity : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *upperName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
@property (nonatomic, assign) int resellerInv;
/**
* 方法: 取得java.lang.String
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *code;
@property (nonatomic, strong) NSNumber *resellerTagPrice;
/**
* 方法: 取得java.lang.String
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *resellerState;
/**
* 方法: 取得java.lang.String
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *upperId;
@property (nonatomic, copy) NSString *categoryname;
/**
* 方法: 取得java.lang.Integer
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) int level;
@end /* interface TOGoodsCategoryEntity */
#endif
#ifndef DEF_VOResellerGoodsEntity_H
#define DEF_VOResellerGoodsEntity_H
/**
* 经销商和商品关系表。
@author Debenson
@since 0.1
*/
@interface VOResellerGoodsEntity : JSONModel
@property (nonatomic, copy) NSString *brandName;
/**
* 方法: 取得java.lang.String
*
......@@ -1667,7 +1829,7 @@ extern NSString * const SORTDIRECTION_DESC;
*/
@property (nonatomic, copy) NSString *onlineTime;
/**
* 方法: 取得java.lang.String
* 方��: 取得java.lang.String
*
*
*/
......@@ -1852,109 +2014,35 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *barcode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *resellerId;
@end /* interface VOResellerGoodsEntity */
@end /* interface TOGoodsEntity */
#endif
#ifndef DEF_TOConsumerEntity_H
#define DEF_TOConsumerEntity_H
#ifndef DEF_RsShareResponse_H
#define DEF_RsShareResponse_H
/**
* @Title: Entity
@Description: 客户
@author onlineGenerator
@date 2016-05-08 18:08:58
@version V1.0
* 商品分享返回数据。
@author Debenson
@since 0.1
*/
@interface TOConsumerEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *mobile;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *province;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *city;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *country;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *address;
@interface RsShareResponse : JSONModel
/**
* 方法: 取得java.lang.String
* 分享记录标识
*
*
*/
@property (nonatomic, copy) NSString *picture;
@property (nonatomic, copy) NSString *shareId;
/**
* 方法: 取得java.util.Date
* 分享页面链接
*
*
*/
@property (nonatomic, copy) NSString *lastVisitedTime;
@end /* interface TOConsumerEntity */
@property (nonatomic, copy) NSString *url;
@end /* interface RsShareResponse */
#endif
......@@ -2080,13 +2168,6 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *username;
/**
* 短信验证码，请先调用发送短信接口
* com.gomore.opple.rest.system.RsSystemService#sendSms(String)
*
*
*/
@property (nonatomic, copy) NSString *smsCode;
/**
* 新密码
*
......@@ -2400,28 +2481,6 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_ShopCartResponse_H
#define DEF_ShopCartResponse_H
/**
* 购物车返回对象
@author Flash
@since 0.1
*/
@interface ShopCartResponse : PageRows
/**
* (no documentation provided)
* @see TOShopcartEntity
*
*/
@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
@end /* interface ShopCartResponse */
#endif
#ifndef DEF_TSUserOrg_H
#define DEF_TSUserOrg_H
......@@ -2452,6 +2511,28 @@ extern NSString * const SORTDIRECTION_DESC;
#endif
#ifndef DEF_ShopCartResponse_H
#define DEF_ShopCartResponse_H
/**
* 购物车返回对象
@author Flash
@since 0.1
*/
@interface ShopCartResponse : PageRows
/**
* (no documentation provided)
* @see TOShopcartEntity
*
*/
@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
@end /* interface ShopCartResponse */
#endif
#ifndef DEF_SceneResponse_H
#define DEF_SceneResponse_H
......@@ -2635,6 +2716,12 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *positions;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *positionsName;
@end /* interface TOEmployee */
#endif
......
Lighting/Tools/opple_objc_json_client.m
View file @ 43d5bdfd
......@@ -194,7 +194,39 @@
@end
@implementation TOGoodsEntity
@implementation TOConsumerEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize name;
@synthesize mobile;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize picture;
@synthesize lastVisitedTime;
@synthesize company;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation VOResellerGoodsEntity
@synthesize fid;
@synthesize createDate;
@synthesize onlineTime;
......@@ -229,6 +261,9 @@
@synthesize lightNumber;
@synthesize pictures;
@synthesize barcode;
@synthesize resellerId;
@synthesize categoryName;
@synthesize brandName;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -246,18 +281,13 @@
@end
@implementation TOGoodsBrandEntity
@implementation TOGoodsCategoryEntity
@synthesize upperName;
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize sysCompanyCode;
@synthesize code;
@synthesize name;
@synthesize state;
@synthesize logo;
@synthesize fdescription;
@synthesize upperId;
@synthesize level;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -268,7 +298,6 @@
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"description": @"fdescription",
@"id": @"fid",
}];
}
......@@ -276,13 +305,12 @@
@end
@implementation TOGoodsLabelEntity
@synthesize category;
@implementation TOGoodsLabelCategoryEntity
@synthesize fid;
@synthesize sysOrgCode;
@synthesize sysCompanyCode;
@synthesize code;
@synthesize name;
@synthesize categoryId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -300,9 +328,31 @@
@end
@implementation TOHottagEntity
@implementation TOOrderEntity
@synthesize fid;
@synthesize name;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize orderNumber;
@synthesize orderTime;
@synthesize guideId;
@synthesize orderState;
@synthesize consumerId;
@synthesize goodsNum;
@synthesize orderPrice;
@synthesize receiverName;
@synthesize receiverMobile;
@synthesize receiverAddress;
@synthesize isBill;
@synthesize billType;
@synthesize billTitle;
@synthesize payType;
@synthesize consumerName;
@synthesize guideName;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -320,20 +370,12 @@
@end
@implementation TOOrderdetailEntity
@implementation TOPositionEntity
@synthesize fid;
@synthesize goodsId;
@synthesize goodsCode;
@synthesize goodsName;
@synthesize goodsCover;
@synthesize goodsSpec;
@synthesize goodsBrand;
@synthesize goodsNum;
@synthesize goodsPrice;
@synthesize goodsTotalPrice;
@synthesize orderId;
@synthesize goodsUnit;
@synthesize remark;
@synthesize code;
@synthesize name;
@synthesize commission;
@synthesize resellerCode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -351,14 +393,17 @@
@end
@implementation TOSceneEntity
@implementation TOShippingAddrEntity
@synthesize fid;
@synthesize sceneCode;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize name;
@synthesize pricure;
@synthesize category;
@synthesize style;
@synthesize space;
@synthesize miblephone;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize consumerId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -407,6 +452,12 @@
@end
#ifndef DEF_SortDirection_M
#define DEF_SortDirection_M
NSString * const SORTDIRECTION_ASC = @"asc";
NSString * const SORTDIRECTION_DESC = @"desc";
#endif /* DEF_SortDirection_M */
@implementation IdEntity
@synthesize fid;
......@@ -426,23 +477,14 @@
@end
#ifndef DEF_SortDirection_M
#define DEF_SortDirection_M
NSString * const SORTDIRECTION_ASC = @"asc";
NSString * const SORTDIRECTION_DESC = @"desc";
#endif /* DEF_SortDirection_M */
@implementation TOShippingAddrEntity
@implementation TOSceneEntity
@synthesize fid;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize sceneCode;
@synthesize name;
@synthesize miblephone;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize consumerId;
@synthesize pricure;
@synthesize category;
@synthesize style;
@synthesize space;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -460,12 +502,20 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TOPositionEntity
@implementation TOOrderdetailEntity
@synthesize fid;
@synthesize code;
@synthesize name;
@synthesize commission;
@synthesize resellerCode;
@synthesize goodsId;
@synthesize goodsCode;
@synthesize goodsName;
@synthesize goodsCover;
@synthesize goodsSpec;
@synthesize goodsBrand;
@synthesize goodsNum;
@synthesize goodsPrice;
@synthesize goodsTotalPrice;
@synthesize orderId;
@synthesize goodsUnit;
@synthesize remark;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -483,29 +533,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TOOrderEntity
@implementation TOHottagEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize orderNumber;
@synthesize orderTime;
@synthesize guideId;
@synthesize orderState;
@synthesize consumerId;
@synthesize goodsNum;
@synthesize orderPrice;
@synthesize receiverName;
@synthesize receiverMobile;
@synthesize receiverAddress;
@synthesize isBill;
@synthesize billType;
@synthesize billTitle;
@synthesize payType;
@synthesize name;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -523,12 +553,13 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TOGoodsLabelCategoryEntity
@implementation TOGoodsLabelEntity
@synthesize category;
@synthesize fid;
@synthesize sysOrgCode;
@synthesize sysCompanyCode;
@synthesize code;
@synthesize name;
@synthesize categoryId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -546,13 +577,18 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TOGoodsCategoryEntity
@synthesize upperName;
@implementation TOGoodsBrandEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize sysCompanyCode;
@synthesize code;
@synthesize name;
@synthesize upperId;
@synthesize level;
@synthesize state;
@synthesize logo;
@synthesize fdescription;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -563,6 +599,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"description": @"fdescription",
@"id": @"fid",
}];
}
......@@ -570,7 +607,12 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation VOResellerGoodsEntity
@implementation TOGoodsEntity
@synthesize resellerInv;
@synthesize resellerTagPrice;
@synthesize resellerState;
@synthesize categoryname;
@synthesize brandName;
@synthesize fid;
@synthesize createDate;
@synthesize onlineTime;
......@@ -605,7 +647,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@synthesize lightNumber;
@synthesize pictures;
@synthesize barcode;
@synthesize resellerId;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -623,20 +664,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TOConsumerEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize sysOrgCode;
@synthesize name;
@synthesize mobile;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize picture;
@synthesize lastVisitedTime;
@implementation RsShareResponse
@synthesize shareId;
@synthesize url;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -644,14 +674,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation DeleteCartRequest
......@@ -712,7 +734,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@implementation ResetPasswordRequest
@synthesize username;
@synthesize smsCode;
@synthesize fnewPassword;
+(BOOL)propertyIsOptional:(NSString*)propertyName
......@@ -834,8 +855,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation ShopCartResponse
@synthesize shopcart;
@implementation TSUserOrg
@synthesize tsUser;
@synthesize tsDepart;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -845,9 +867,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TSUserOrg
@synthesize tsUser;
@synthesize tsDepart;
@implementation ShopCartResponse
@synthesize shopcart;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -924,6 +945,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@implementation TOEmployee
@synthesize positions;
@synthesize positionsName;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......
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