Commit f0c7e202 authored by 曹云霄's avatar 曹云霄

修改项说明:优化

parent ceb5b36e
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib];
self.layer.shadowColor = [UIColor grayColor].CGColor; self.layer.shadowColor = [UIColor grayColor].CGColor;
self.layer.shadowRadius = 4; self.layer.shadowRadius = 4;
self.layer.shadowOpacity = 0.3; self.layer.shadowOpacity = 0.3;
......
...@@ -246,8 +246,7 @@ ...@@ -246,8 +246,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil]; ClientdetailsViewController *clientdetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"clientdetails"];
ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row]; clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
clientdetails.cellindex = indexPath.row; clientdetails.cellindex = indexPath.row;
//设置当前客户 //设置当前客户
......
...@@ -74,13 +74,12 @@ ...@@ -74,13 +74,12 @@
self.shoppingCar.model = self.model; self.shoppingCar.model = self.model;
[self addChildViewController:self.shoppingCar]; [self addChildViewController:self.shoppingCar];
self.currentVC = self.shoppingCar; self.currentVC = self.shoppingCar;
self.shoppingCar.view.frame = CGRectMake(self.controllerBackgroundView.mj_x, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h); self.shoppingCar.view.frame = CGRectMake(self.controllerBackgroundView.x, self.shoppingAndRecordBackview.bottom, self.controllerBackgroundView.width-25, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
[self.controllerBackgroundView addSubview:self.shoppingCar.view]; [self.controllerBackgroundView addSubview:self.shoppingCar.view];
self.orderRecord = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"]; self.orderRecord = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"];
[self addChildViewController:self.orderRecord]; [self addChildViewController:self.orderRecord];
self.orderRecord.model = self.model; self.orderRecord.model = self.model;
self.orderRecord.view.frame = CGRectMake(self.controllerBackgroundView.mj_x, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h); self.orderRecord.view.frame = CGRectMake(self.controllerBackgroundView.x, self.shoppingAndRecordBackview.bottom, self.controllerBackgroundView.width-25, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
} }
#pragma mark - 切换子视图 #pragma mark - 切换子视图
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib];
[self uiConfigAction]; [self uiConfigAction];
} }
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
_drawModel = [[RsLotteryRequest alloc]init]; _drawModel = [[RsLotteryRequest alloc]init];
_drawModel.winnerIdEquals = [Shoppersmanager manager].Shoppers.employee.fid; _drawModel.winnerIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
DataPage *page = [[DataPage alloc]init]; DataPage *page = [[DataPage alloc]init];
page.rows = 10; page.rows = KROWS;
page.page = ZERO; page.page = ZERO;
page.order = SORTDIRECTION_DESC; page.order = SORTDIRECTION_DESC;
_drawModel.page = page; _drawModel.page = page;
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
{ {
WS(weakSelf); WS(weakSelf);
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
weakSelf.drawModel.page.page = 0; weakSelf.drawModel.page.page = ZERO;
[weakSelf.drawDetailsTableView.mj_footer resetNoMoreData]; [weakSelf.drawDetailsTableView.mj_footer resetNoMoreData];
[weakSelf getDrawDatas:YES]; [weakSelf getDrawDatas:YES];
}]; }];
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
RsLotteryResponse *drawRecord = [[RsLotteryResponse alloc]initWithDictionary:returnValue[@"data"] error:nil]; RsLotteryResponse *drawRecord = [[RsLotteryResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.datasArray addObjectsFromArray:drawRecord.list]; [weakSelf.datasArray addObjectsFromArray:drawRecord.list];
weakSelf.totalPage = [returnValue[@"data"][@"totalpages"] integerValue]; weakSelf.totalPage = [returnValue[@"data"][@"totalpages"] integerValue];
NSLog(@"%ld",weakSelf.datasArray.count);
[weakSelf.drawDetailsTableView reloadData]; [weakSelf.drawDetailsTableView reloadData];
}else { }else {
[weakSelf SHOWPrompttext:returnValue[@"message"]]; [weakSelf SHOWPrompttext:returnValue[@"message"]];
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
- (void)awakeFromNib { - (void)awakeFromNib {
// Initialization code // Initialization code
[super awakeFromNib];
} }
- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#pragma mark -初始化Nib文件 #pragma mark -初始化Nib文件
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib];
[self uiConfigAction]; [self uiConfigAction];
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
@interface ProductDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate> @interface ProductDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,CAAnimationDelegate>
@property (nonatomic,strong) ProductDetailsHeaderView *headerView; @property (nonatomic,strong) ProductDetailsHeaderView *headerView;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#import "ExperienceCentreViewController.h" #import "ExperienceCentreViewController.h"
@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate> @interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate,CAAnimationDelegate>
/** /**
* 筛选背景框View * 筛选背景框View
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib];
[self uiConfigAction]; [self uiConfigAction];
} }
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib];
[self uiConfigAction]; [self uiConfigAction];
} }
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
- (void)awakeFromNib { - (void)awakeFromNib {
// Initialization code // Initialization code
[super awakeFromNib];
} }
- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib];
} }
- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib];
[self uiConfigAction]; [self uiConfigAction];
} }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
// [self uiConfigAction]; [super awakeFromNib];
self.defaultDatasArray = [NSMutableArray array]; self.defaultDatasArray = [NSMutableArray array];
for (int i=0; i<5; i++) { for (int i=0; i<5; i++) {
......
...@@ -1730,7 +1730,7 @@ ...@@ -1730,7 +1730,7 @@
29706D991CD082980003C412 /* Project object */ = { 29706D991CD082980003C412 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0730; LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "上海勾芒科技有限公司"; ORGANIZATIONNAME = "上海勾芒科技有限公司";
TargetAttributes = { TargetAttributes = {
29706DA01CD082980003C412 = { 29706DA01CD082980003C412 = {
...@@ -2015,6 +2015,7 @@ ...@@ -2015,6 +2015,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
...@@ -2025,8 +2026,10 @@ ...@@ -2025,8 +2026,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
...@@ -2061,6 +2064,7 @@ ...@@ -2061,6 +2064,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
...@@ -2071,8 +2075,10 @@ ...@@ -2071,8 +2075,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
...@@ -2107,7 +2113,7 @@ ...@@ -2107,7 +2113,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = W54V2VB863; DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
...@@ -2166,7 +2172,7 @@ ...@@ -2166,7 +2172,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = W54V2VB863; DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0730" LastUpgradeVersion = "0800"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>欧立方</string> <string>欧立方</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.1.9</string> <string>1.2.0</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
...@@ -68,6 +68,10 @@ ...@@ -68,6 +68,10 @@
<key>NSAllowsArbitraryLoads</key> <key>NSAllowsArbitraryLoads</key>
<true/> <true/>
</dict> </dict>
<key>NSCameraUsageDescription</key>
<string>App需要您的同意,才能访问相机</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>App需要您的同意,才能访问相册</string>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>
<key>UIMainStoryboardFile</key> <key>UIMainStoryboardFile</key>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -66,10 +66,6 @@ ...@@ -66,10 +66,6 @@
*/ */
- (void)SHOWPrompttext:(NSString *)Text; - (void)SHOWPrompttext:(NSString *)Text;
/**
* 调用无线打印机......成功回调、失败回调
*/
- (void)callAirprintWithURL:(NSURL *)datasurl SuccessBlock:(void(^)())success ErrorBlock:(void(^)())failed;
/** /**
* 显示提示图片、文本 * 显示提示图片、文本
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#import "ProductScreeningCollectionViewCell.h" #import "ProductScreeningCollectionViewCell.h"
#import "GoodsCategoryModel.h" #import "GoodsCategoryModel.h"
@interface SceneViewController ()<UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,UITextFieldDelegate> @interface SceneViewController ()<UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,UITextFieldDelegate,CAAnimationDelegate>
/** /**
* 场景数据源 * 场景数据源
......
...@@ -15,6 +15,15 @@ ...@@ -15,6 +15,15 @@
*/ */
@property (nonatomic, assign) IBInspectable CGFloat cornerRadius; @property (nonatomic, assign) IBInspectable CGFloat cornerRadius;
@property (assign) CGFloat x;
@property (assign) CGFloat y;
@property (assign) CGFloat width;
@property (assign) CGFloat height;
@property (assign) CGSize size;
@property (assign) CGPoint origin;
@property (assign) CGFloat left;
@property (assign) CGFloat right;
@property (assign) CGFloat top;
@property (assign) CGFloat bottom;
@end @end
...@@ -21,6 +21,111 @@ ...@@ -21,6 +21,111 @@
return self.layer.cornerRadius; return self.layer.cornerRadius;
} }
- (CGFloat) x {
return self.frame.origin.x;
}
- (void) setX:(CGFloat)x {
CGRect nframe = self.frame;
nframe.origin.x = x;
self.frame = nframe;
}
- (CGFloat) y {
return self.frame.origin.y;
}
- (void) setY:(CGFloat)y {
CGRect nframe = self.frame;
nframe.origin.y = y;
self.frame = nframe;
}
// Retrieve and set height, width
- (CGFloat) width {
return self.frame.size.width;
}
- (void) setWidth:(CGFloat)width {
CGRect nframe = self.frame;
nframe.size.width = width;
self.frame = nframe;
}
- (CGFloat) height {
return self.frame.size.height;
}
- (void) setHeight:(CGFloat)height {
CGRect nframe = self.frame;
nframe.size.height = height;
self.frame = nframe;
}
// Retrieve and set the origin, size
- (CGPoint) origin {
return self.frame.origin;
}
- (void) setOrigin:(CGPoint)aPoint {
CGRect nframe = self.frame;
nframe.origin = aPoint;
self.frame = nframe;
}
- (CGSize) size {
return self.frame.size;
}
- (void) setSize:(CGSize)aSize {
CGRect nframe = self.frame;
nframe.size = aSize;
self.frame = nframe;
}
- (CGFloat) left {
return self.x;
}
- (void) setLeft:(CGFloat)left {
self.x = left;
}
- (CGFloat) right {
return CGRectGetMaxX(self.frame);
}
- (void) setRight:(CGFloat)right {
self.x = right - self.width;
}
- (CGFloat) top {
return self.y;
}
- (void) setTop:(CGFloat)top {
self.y = top;
}
- (CGFloat) bottom {
return CGRectGetMaxY(self.frame);
}
- (void) setBottom:(CGFloat)bottom {
self.y = bottom - self.height;
}
......
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