Skip to content

O
Opple-iOS
Commit c11cc8ed authored by 曹云霄's avatar 曹云霄
Browse files
Options

debug

parent c13663a5
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 19 deletions
Lighting/Class/AllCustomerViewController.m
View file @ c11cc8ed
......@@ -12,7 +12,7 @@
#import "MyclientEntityModel.h"
#import "ClientdetailsViewController.h"
@interface AllCustomerViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
@interface AllCustomerViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/**
* 数据源
......@@ -154,6 +154,8 @@
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
self.allCustomerTableview.emptyDataSetSource = self;
self.allCustomerTableview.emptyDataSetDelegate = self;
[self RemoveMBProgressHUDLoding];
[self endRefreshingForTableView:self.allCustomerTableview];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -386,7 +388,22 @@
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (void)didReceiveMemoryWarning {
......
Lighting/Class/ClientViewController.m
View file @ c11cc8ed
......@@ -11,7 +11,7 @@
#import "ClientdetailsViewController.h"
#import "MyclientEntityModel.h"
@interface ClientViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
@interface ClientViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/**
* 客户数据源
......@@ -153,6 +153,8 @@
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
self.informationTableview.emptyDataSetSource = self;
self.informationTableview.emptyDataSetDelegate = self;
[self RemoveMBProgressHUDLoding];
[self endRefreshingForTableView:self.informationTableview];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -640,6 +642,22 @@
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
Lighting/Class/CustomerOrderViewController.m
View file @ c11cc8ed
......@@ -9,7 +9,7 @@
#import "CustomerOrderViewController.h"
#import "CustomerOrderTableViewCell.h"
#import "OrderdetailsViewController.h"
@interface CustomerOrderViewController ()<UITableViewDataSource,UITableViewDelegate,ReturnTableviewcellIndexpathdelegate,UITextFieldDelegate,undoOrderDelegate>
@interface CustomerOrderViewController ()<UITableViewDataSource,UITableViewDelegate,ReturnTableviewcellIndexpathdelegate,UITextFieldDelegate,undoOrderDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/**
* 数据源数组
......@@ -144,6 +144,8 @@
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/order/query"] WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) {
self.customerOrderTableView.emptyDataSetSource = self;
self.customerOrderTableView.emptyDataSetDelegate = self;
[self RemoveMBProgressHUDLoding];
[self endRefreshingForTableView:self.customerOrderTableView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -215,7 +217,7 @@
orderdetails.orderCode = model.orderNumber;
orderdetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品信息",@"附件信息"];
orderdetails.isShowattachment = YES;
if ([model.orderState isEqualToString:@"006"]) {
if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
orderdetails.isShowPrintButton = YES;
orderdetails.isDelectedButton = NO;
}
......@@ -386,7 +388,7 @@
orderdetails.orderCode = model.orderNumber;
orderdetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品信息",@"附件信息"];
orderdetails.isShowattachment = YES;
if ([model.orderState isEqualToString:@"006"]) {
if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
orderdetails.isShowPrintButton = YES;
orderdetails.isDelectedButton = NO;
}
......@@ -409,6 +411,23 @@
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (void)didReceiveMemoryWarning {
......
Lighting/Class/ProductLibraryViewController.m
View file @ c11cc8ed
......@@ -15,7 +15,7 @@
#import "ExperienceCentreViewController.h"
@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate,DZNEmptyDataSetSource>
@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/**
* 筛选背景框View
......@@ -186,6 +186,7 @@
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/query"] WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
self.productCollectionView.emptyDataSetSource = self;
self.productCollectionView.emptyDataSetDelegate = self;
[self endRefreshingForTableView:self.productCollectionView];
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -776,9 +777,13 @@
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return TCImage(@"圆角矩形-3-副本");
return kNoDataImage;
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
......
Lighting/Class/SceneLibraryViewController.m
View file @ c11cc8ed
......@@ -9,7 +9,7 @@
#import "SceneLibraryViewController.h"
#import "SeceneLibraryCollectionViewCell.h"
#import "FullScreenViewController.h"
@interface SceneLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,ReturnTableviewcellIndexpathdelegate,DZNEmptyDataSetSource>
@interface SceneLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,ReturnTableviewcellIndexpathdelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
......@@ -190,6 +190,7 @@
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/scene/query"] WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
self.seceneLibararyCollectionView.emptyDataSetSource = self;
self.seceneLibararyCollectionView.emptyDataSetDelegate = self;
[self endRefreshingForTableView:self.seceneLibararyCollectionView];
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -353,7 +354,7 @@
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return TCImage(@"圆角矩形-3-副本");
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
......@@ -361,6 +362,10 @@
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
......
Lighting/Class/Shoppingcart/ShoppingViewController.m
View file @ c11cc8ed
......@@ -13,7 +13,7 @@
#import "ShopcarModel.h"
#import "AddressModel.h"
@interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource,ChangeGoodsNumberDelegate>
@interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource,ChangeGoodsNumberDelegate,DZNEmptyDataSetSource>
@property (weak, nonatomic) IBOutlet UITableView *shoppingTableview;
......@@ -117,6 +117,7 @@
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shopcart/query"] WithRequestType:0 WithParameter:shopcarNumber WithReturnValueBlock:^(id returnValue) {
self.shoppingTableview.emptyDataSetSource = self;
[self endRefreshingForTableView:self.shoppingTableview];
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
......@@ -434,6 +435,18 @@
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
......
Lighting/Class/UserViewController.m
View file @ c11cc8ed
......@@ -150,6 +150,7 @@
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[self SuccessMBProgressView:@"登陆成功"];
LoginResult *result = [[LoginResult alloc] initWithDictionary:returnValue[@"data"] error:nil];
[Shoppersmanager manager].userNameString = self.userName.text;
[Shoppersmanager manager].passWordString = self.passWord.text;
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ c11cc8ed
......@@ -1879,8 +1879,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
......@@ -1922,7 +1922,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......@@ -1935,8 +1935,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
......@@ -1978,7 +1978,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
};
......
Lighting/Tools/PrefixHeader.pch
View file @ c11cc8ed
......@@ -190,7 +190,7 @@
#define KROWS 10
#define RGB(A, B, C, D) [UIColor colorWithRed:(A)/255.0 green:(B)/255.0 blue:(C)/255.0 alpha:(D)]
#define RGB(A, B, C, D) [UIColor colorWithRed:(A)/255.0 green:(B)/255.0 blue:(C)/255.0 alpha:(D)]
/**
......@@ -199,4 +199,16 @@
#define ShareTitle @"欧立方体验中心一键分享"
/**
* 无数据友好图片
*/
#define kNoDataImage TCImage(@"圆角矩形-3-副本")
#endif /* PrefixHeader_pch */
Lighting/Tools/SceneViewController.m
View file @ c11cc8ed
......@@ -905,7 +905,7 @@
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return TCImage(@"圆角矩形-3-副本");
return kNoDataImage;
}
......
Lighting/Tools/ShoppingBagViewController.m
View file @ c11cc8ed
......@@ -309,7 +309,7 @@
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return TCImage(@"圆角矩形-3-副本");
return kNoDataImage;
}
......
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