Skip to content

X
xffruit
Commit af300813 authored by 陈俊俊's avatar 陈俊俊
Browse files
Options

报表详情接口及背景图片

parent fbdf2326
Show whitespace changes
Inline Side-by-side
Showing with 460 additions and 209 deletions
XFFruit/AppDelegate/ICRAppDelegate.m
View file @ af300813
......@@ -88,7 +88,6 @@
- (void)getDataFromServer{
__weak typeof(self)weakSelf = self;
void(^succ)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
__strong __typeof(weakSelf)strongSelf = weakSelf;
if (data) {
NSInteger success = [data[@"success"] integerValue];
......@@ -111,10 +110,8 @@
}
};
void(^fail)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data];
};
[IBTLoadingView showProgressLabel:@"正在加载..."];
[[ICRHTTPController sharedController] getVeisionIdWithType:@"ipa" success:succ failure:fail];
}
//比较版本号及是否下载
......
XFFruit/Images.xcassets/Report/sale_1.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "sale_1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "sale_1@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Report/sale_2.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "sale_2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "sale_2@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Report/sale_3.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "sale_3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "sale_3@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Report/sale_4.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "sale_4@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "sale_4@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Report/salebg_1.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "salebg_1@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "salebg_1@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Report/salebg_2.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "salebg_2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "salebg_2@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Report/salebg_3.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "salebg_3@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "salebg_3@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Report/salebg_4.imageset/Contents.json 0 → 100644
View file @ af300813
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "salebg_4@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "salebg_4@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Utilities/IBTUIKit/IBTCommon.h
View file @ af300813
......@@ -49,6 +49,6 @@
+ (UIButton *)buttonWithImage:(UIImage *)image frame:(CGRect)frame;
+ (NSString *)getWeekFromDate;
+ (NSInteger)getWeeks:(NSInteger)year;
+ (NSString*)weekdayStringFromDate:(NSDate*)inputDate;
@end
XFFruit/Utilities/IBTUIKit/IBTCommon.m
View file @ af300813
......@@ -316,30 +316,14 @@
NSDateComponents *dateComponents = [greCalendar components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit | NSWeekCalendarUnit | NSWeekdayCalendarUnit | NSWeekOfMonthCalendarUnit | NSWeekOfYearCalendarUnit fromDate:[NSDate date]];
NSString *year = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy"];
if (dateComponents.weekOfYear == 1) {
yearWeek = [NSString stringWithFormat:@"%ld%ld", [year integerValue]+1
yearWeek = [NSString stringWithFormat:@"%ld-%ld", [year integerValue]+1
,(long)dateComponents.weekOfYear];
}else{
yearWeek = [NSString stringWithFormat:@"%ld%ld", (long)[year integerValue]
yearWeek = [NSString stringWithFormat:@"%ld-%ld", (long)[year integerValue]
,(long)dateComponents.weekOfYear];
}
return yearWeek;
// NSDate *today = [NSDate date];
// NSCalendar *gregorian = [[NSCalendar alloc]
// initWithCalendarIdentifier:NSGregorianCalendar];
// NSDateComponents *weekdayComponents =
// [gregorian components:(NSDayCalendarUnit |
// NSWeekdayCalendarUnit) fromDate:today];
// weekdayComponents.day = 10; //一月的第10天
//
// NSDate *date = [gregorian dateFromComponents:weekdayComponents];
//
// NSInteger day = [weekdayComponents day];
// NSInteger weekday = [weekdayComponents weekday];
//
// NSUInteger firstDay = [gregorian ordinalityOfUnit:NSWeekdayCalendarUnit inUnit:kCFCalendarUnitWeek forDate:date]; //该月的第10天星期几
}
+ (NSInteger)getWeeks:(NSInteger)year{
NSInteger weeks = 0;
......@@ -360,7 +344,20 @@
}else{
return 53;
}
}
+ (NSString*)weekdayStringFromDate:(NSDate *)inputDate{
NSArray *weekdays = [NSArray arrayWithObjects: [NSNull null], @"星期日", @"星期一", @"星期二", @"星期三", @"星期四", @"星期五", @"星期六", nil];
NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
NSTimeZone *timeZone = [[NSTimeZone alloc] initWithName:@"Asia/Shanghai"];
[calendar setTimeZone: timeZone];
NSCalendarUnit calendarUnit = NSCalendarUnitWeekday;
NSDateComponents *theComponents = [calendar components:calendarUnit fromDate:inputDate];
return [weekdays objectAtIndex:theComponents.weekday];
}
@end
XFFruit/ViewControllers/Login/ICRLoginViewController.m
View file @ af300813
......@@ -101,15 +101,15 @@
// self.m_containerView.m_passwordTextF.text = @"aaa";
//@"http://218.244.151.129:7580/cruiser-server/rest"
// self.m_containerView.m_cCodeTextF.text = @"211534962";
// self.m_containerView.m_userNameTextF.text = @"admin";
// self.m_containerView.m_passwordTextF.text = @"thoradmin";
self.m_containerView.m_cCodeTextF.text = @"211534962";
self.m_containerView.m_userNameTextF.text = @"admin";
self.m_containerView.m_passwordTextF.text = @"thoradmin";
//@"http://122.224.171.126:7280/cruiser-server/rest"
self.m_containerView.m_cCodeTextF.text = @"923";
self.m_containerView.m_userNameTextF.text = @"admin";
self.m_containerView.m_passwordTextF.text = @"thoradmin";
// self.m_containerView.m_cCodeTextF.text = @"923";
// self.m_containerView.m_userNameTextF.text = @"admin";
// self.m_containerView.m_passwordTextF.text = @"thoradmin";
//现场正式环境登陆
......@@ -142,18 +142,21 @@
}
- (void)onLoginTapped:(__unused id)sender {
ICRAppDelegate *appDelegate = (ICRAppDelegate *)[[UIApplication sharedApplication] delegate];
[appDelegate comperVersion];
#if 0
ICRAppViewControllerManager *mgr =
[ICRAppViewControllerManager getAppViewControllerManager];
[mgr openMainFrame];
#else
NSString *nsRegisterCode = self.m_containerView.m_cCodeTextF.text;
NSString *nsUserName = self.m_containerView.m_userNameTextF.text;
//NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String];
NSString *nsPassword = self.m_containerView.m_passwordTextF.text;
// NSString *nsRegisterCode = @"211534962";
// NSString *nsUserName = @"admin";
// NSString *nsPassword = @"thoradmin";
void(^succ)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
userUtil.bAutoLogin = @( [_m_containerView isAutoLogin] );
......@@ -205,15 +208,18 @@
void(^fail)(id) = ^(id data) {
CLog(@"error =%@",data);
// [IBTLoadingView showTips:data];//@"输入的信息不正确，请重新输入"
[IBTLoadingView showTextOnly: data inView:self.view];
[IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data];//@"输入的信息不正确，请重新输入"
// [IBTLoadingView showTextOnly: data inView:self.view];
};
[IBTLoadingView showProgressLabel:@"正在加载..."];
ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
[httpCtrl doLoginWithUserName:nsUserName
password:nsPassword
registerCode:nsRegisterCode
success:succ
failure:fail];
#endif
}
#pragma mark - TextObserver
......
XFFruit/ViewControllers/Report/Controllers/GrossRateViewController.m
View file @ af300813
......@@ -9,7 +9,6 @@
#import "GrossRateViewController.h"
#import "ReportDetailViewController.h"
#import "CustomSegView.h"
#import "SMPageControl.h"
#import "PasengerCell.h"
#import "PassengerHeaderCell.h"
#import "RPassgerView.h"
......@@ -19,9 +18,7 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
@interface GrossRateViewController ()<UITableViewDataSource,UITableViewDelegate>
@property (nonatomic,strong)SMPageControl *pageControl;
@property (nonatomic,strong)UIView *bgView;
@property (nonatomic,strong)RPassgerView *rpassgerView;
......@@ -39,32 +36,19 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
- (void)bulidLayout{
self.view .backgroundColor = [UIColor whiteColor];
CGRect rect = CGRectMake(0, 0, ScreenSize.width, 145);
self.bgView = [[UIView alloc]initWithFrame:rect];
self.rpassgerView = [[RPassgerView alloc]initWithFrame:rect withPage:3];
self.rpassgerView.bgImage.image = [UIImage imageNamed:@"salebg_4"];
self.rpassgerView.cenImage.image = [UIImage imageNamed:@"sale_4"];
rect = CGRectMake(0, 0, ScreenSize.width, 130);
self.rpassgerView = [[RPassgerView alloc]initWithFrame:rect];
[self.bgView addSubview:self.rpassgerView];
[self.view addSubview:self.rpassgerView];
self.pageControl = [[SMPageControl alloc]initWithFrame:CGRectMake(0, self.rpassgerView.bottom, self.view.width, 10)];
self.pageControl.numberOfPages = 4;
self.pageControl.currentPage = 3;
self.pageControl.pageIndicatorImage = [UIImage imageNamed:@"white_point"];
self.pageControl.currentPageIndicatorImage = [UIImage imageNamed:@"yellow_point"];
// self.pageControl.pageIndicatorTintColor = XXFBgColor;
// self.pageControl.currentPageIndicatorTintColor = GXF_COMMIT_COLOR;
self.pageControl.indicatorMargin = 15.0f;
self.pageControl.indicatorDiameter = 10.0f;
[self.bgView addSubview:self.pageControl];
rect = CGRectMake(0, 0, self.view.width, self.view.height - 158);
self.tableView = [[UITableView alloc]initWithFrame:rect style:UITableViewStylePlain];
self.tableView.delegate = self;
self.tableView.dataSource = self;
[self.tableView registerClass:[PassengerHeaderCell class] forHeaderFooterViewReuseIdentifier:grossRateViewHeaderController];
self.tableView.tableHeaderView = self.bgView;
self.tableView.tableHeaderView = self.rpassgerView;
[self.view addSubview:self.tableView];
......@@ -103,7 +87,12 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
return cell;
}
- (void)detailClick:(UIButton *)btn{
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil];
Compass *com = self.dataArr[btn.tag];
NSObject *comObj = [NSNull null];
if (com) {
comObj = com;
}
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil userInfo:@{@"compass":comObj}];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
......
XFFruit/ViewControllers/Report/Controllers/PassengerViewController.m
View file @ af300813
......@@ -8,7 +8,6 @@
#import "PassengerViewController.h"
#import "RPassgerView.h"
#import "SMPageControl.h"
#import "PasengerCell.h"
#import "PassengerHeaderCell.h"
#import "ReportDetailViewController.h"
......@@ -18,13 +17,8 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
@interface PassengerViewController ()<UITableViewDataSource,UITableViewDelegate>
@property (nonatomic,strong)SMPageControl *pageControl;
@property (nonatomic,strong)UIView *bgView;
@property (nonatomic,strong)RPassgerView *rpassgerView;
@end
@implementation PassengerViewController
......@@ -39,30 +33,19 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
- (void)bulidLayout{
self.view .backgroundColor = [UIColor whiteColor];
CGRect rect = CGRectMake(0, 0, ScreenSize.width, 145);
self.bgView = [[UIView alloc]initWithFrame:rect];
self.rpassgerView = [[RPassgerView alloc]initWithFrame:rect withPage:1];
self.rpassgerView.bgImage.image = [UIImage imageNamed:@"salebg_2"];
self.rpassgerView.cenImage.image = [UIImage imageNamed:@"sale_2"];
rect = CGRectMake(0, 0, ScreenSize.width, 130);
self.rpassgerView = [[RPassgerView alloc]initWithFrame:rect];
[self.bgView addSubview:self.rpassgerView];
[self.view addSubview:self.rpassgerView];
self.pageControl = [[SMPageControl alloc]initWithFrame:CGRectMake(0, self.rpassgerView.bottom, self.view.width, 10)];
self.pageControl.numberOfPages = 4;
self.pageControl.currentPage = 1;
self.pageControl.pageIndicatorImage = [UIImage imageNamed:@"white_point"];
self.pageControl.currentPageIndicatorImage = [UIImage imageNamed:@"yellow_point"];
// self.pageControl.pageIndicatorTintColor = XXFBgColor;
// self.pageControl.currentPageIndicatorTintColor = GXF_COMMIT_COLOR;
self.pageControl.indicatorMargin = 15.0f;
self.pageControl.indicatorDiameter = 10.0f;
[self.bgView addSubview:self.pageControl];
rect = CGRectMake(0, 0, self.view.width, self.view.height- 158);
self.tableView = [[UITableView alloc]initWithFrame:rect style:UITableViewStylePlain];
self.tableView.delegate = self;
self.tableView.dataSource = self;
[self.tableView registerClass:[PassengerHeaderCell class] forHeaderFooterViewReuseIdentifier:passengerHeaderIdentify];
self.tableView.tableHeaderView = self.bgView;
self.tableView.tableHeaderView = self.rpassgerView;
[self.view addSubview:self.tableView];
......@@ -123,7 +106,12 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
return headerView;
}
- (void)detailClick:(UIButton *)btn{
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil];
Compass *com = self.dataArr[btn.tag];
NSObject *comObj = [NSNull null];
if (com) {
comObj = com;
}
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil userInfo:@{@"compass":comObj}];
}
......
XFFruit/ViewControllers/Report/Controllers/PassgerPriceViewController.m
View file @ af300813
......@@ -7,7 +7,6 @@
//
#import "PassgerPriceViewController.h"
#import "SMPageControl.h"
#import "PasengerCell.h"
#import "PassengerHeaderCell.h"
#import "RPassgerView.h"
......@@ -18,9 +17,7 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
@interface PassgerPriceViewController ()<UITableViewDataSource,UITableViewDelegate>
@property (nonatomic,strong)SMPageControl *pageControl;
@property (nonatomic,strong)UIView *bgView;
@property (nonatomic,strong)RPassgerView *rpassgerView;
......@@ -37,33 +34,21 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
#pragma mark - 布局
- (void)bulidLayout{
self.view .backgroundColor = [UIColor whiteColor];
CGRect rect = CGRectMake(0, 0, ScreenSize.width, 145);
self.bgView = [[UIView alloc]initWithFrame:rect];
rect = CGRectMake(0, 0, ScreenSize.width, 130);
self.rpassgerView = [[RPassgerView alloc]initWithFrame:rect];
[self.bgView addSubview:self.rpassgerView];
self.pageControl = [[SMPageControl alloc]initWithFrame:CGRectMake(0, self.rpassgerView.bottom, self.view.width, 10)];
self.pageControl.numberOfPages = 4;
CGRect rect = CGRectMake(0, 0, ScreenSize.width, 145);
self.rpassgerView = [[RPassgerView alloc]initWithFrame:rect withPage:2];
self.rpassgerView.bgImage.image = [UIImage imageNamed:@"salebg_3"];
self.rpassgerView.cenImage.image = [UIImage imageNamed:@"sale_3"];
self.pageControl.currentPage = 2;
self.pageControl.pageIndicatorImage = [UIImage imageNamed:@"white_point"];
self.pageControl.currentPageIndicatorImage = [UIImage imageNamed:@"yellow_point"];
// self.pageControl.pageIndicatorTintColor = XXFBgColor;
// self.pageControl.currentPageIndicatorTintColor = GXF_COMMIT_COLOR;
self.pageControl.indicatorMargin = 15.0f;
[self.view addSubview:self.rpassgerView];
self.pageControl.indicatorDiameter = 10.0f;
[self.bgView addSubview:self.pageControl];
rect = CGRectMake(0,0, self.view.width, self.view.height- 158);
self.tableView = [[UITableView alloc]initWithFrame:rect style:UITableViewStylePlain];
self.tableView.delegate = self;
self.tableView.dataSource = self;
[self.tableView registerClass:[PassengerHeaderCell class] forHeaderFooterViewReuseIdentifier:passgerPriceHeaderIdentify];
self.tableView.tableHeaderView = self.bgView;
self.tableView.tableHeaderView = self.rpassgerView;
[self.view addSubview:self.tableView];
......@@ -103,7 +88,12 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
return cell;
}
- (void)detailClick:(UIButton *)btn{
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil];
Compass *com = self.dataArr[btn.tag];
NSObject *comObj = [NSNull null];
if (com) {
comObj = com;
}
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil userInfo:@{@"compass":comObj}];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
......
XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.h
View file @ af300813
......@@ -11,6 +11,5 @@
@interface ReportDetailViewController : ICRBaseViewController
@property (nonatomic,strong)NSString *reportStyle;
@property (nonatomic,strong)Compass *compass;
@property (nonatomic,strong)NSString *orgUuid;
@end
XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.m
View file @ af300813
......@@ -42,7 +42,11 @@
- (void)viewDidLoad {
[super viewDidLoad];
//初始化数据
self.dayType = @"day";
self.scopeType = @"";
[self bulidLayout];
[self getDataFromServer];
}
#pragma mark - 布局
......@@ -62,8 +66,10 @@
[self.view addSubview:self.scrollView];
//销售
rect = CGRectMake(0, 0, ScreenSize.width, 130);
rect = CGRectMake(0, 0, ScreenSize.width, 145);
self.rsaleView = [[RSaleView alloc]initWithFrame:rect];
self.rsaleView.bgImage.image = [UIImage imageNamed:@"salebg_1"];
self.rsaleView.cenImage.image = [UIImage imageNamed:@"sale_1"];
[self.scrollView addSubview:self.rsaleView];
rect = CGRectMake(0, self.rsaleView.bottom, ScreenSize.width, self.scrollView.height - self.rsaleView.bottom - 64);
self.rwebView = [[UIWebView alloc]initWithFrame:rect];
......@@ -72,8 +78,10 @@
for (int i = 1; i< 4 ; i++) {
RPassgerView *prassView = [[RPassgerView alloc]initWithFrame:CGRectMake(i*ScreenSize.width, 0, ScreenSize.width, 130)];
RPassgerView *prassView = [[RPassgerView alloc]initWithFrame:CGRectMake(i*ScreenSize.width, 0, ScreenSize.width, 145) withPage:i];
UIWebView *web = [[UIWebView alloc]initWithFrame:CGRectMake(i*ScreenSize.width, prassView.bottom, ScreenSize.width, self.scrollView.height - prassView.bottom - 64)];
prassView.bgImage.image = [UIImage imageNamed:[NSString stringWithFormat:@"salebg_%d",(i+1)]];
prassView.cenImage.image = [UIImage imageNamed:[NSString stringWithFormat:@"sale_%d",(i+1)]];
[self.scrollView addSubview:prassView];
[self.scrollView addSubview:web];
if (i == 1) {
......@@ -89,11 +97,6 @@
}
self.scrollView.contentSize = CGSizeMake(ScreenSize.width*4, ScreenSize.height - 64 - self.segView.bottom);
[self.rsaleView setValueInSaleView:self.compass];
[self.rpassgerView setPassengerWithCompass:self.compass];
[self.rpriceView setPersalesWithCompass:self.compass];
[self.rgrossView setGrossprofitWithCompass:self.compass];
}
- (void)getDataFromServer{
......@@ -102,7 +105,7 @@
__strong __typeof(weakSelf)strongSelf = weakSelf;
//赋值
[IBTLoadingView hideHUDWithText:nil];
// [strongSelf prepareDataInScrollView:data];
[strongSelf prepareData:data];
};
void(^fail)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil];
......@@ -120,8 +123,8 @@
NSDictionary *dict = @{
@"dataScopeType":self.dayType,
@"dataScope":self.scopeType,
@"orgUuid":self.orgUuid,
@"fetchScope":@"owner",
@"orgUuid":self.compass.orgUuid,
@"fetchScope":@"childs",
@"queryOrders":orderArr,
@"pageNumber":@0,
@"pageSize":@100
......@@ -129,6 +132,32 @@
[[ICRHTTPController sharedController] queryHomepageWith:dict success:succ failure:fail];
}
#pragma mark- 成功之后的操作
- (void)prepareData:(id)data{
if (data) {
NSInteger success = [data[@"success"] integerValue];
NSString *message = data[@"message"] ;
if (success == 1) {
NSDictionary *compassDict = data[ @"data" ][@"salesData"];
NSArray *arr = compassDict[@"records"];
if (arr.count > 0) {
for (NSDictionary *comDict in arr) {
Compass *com = [[Compass alloc]init];
[com setValuesForKeysWithDictionary:comDict];
self.compass = com;
}
}
[self.rsaleView setValueInSaleView:self.compass];
[self.rpassgerView setPassengerWithCompass:self.compass];
[self.rpriceView setPersalesWithCompass:self.compass];
[self.rgrossView setGrossprofitWithCompass:self.compass];
}else{
[IBTLoadingView showTips:message];
}
}else{
[IBTLoadingView showTips:@" 无记录 "];
}
}
#pragma mark -CustomSegViewDelegate
- (void)customSegOneClick:(NSString *)title{
//日周年切换
......
XFFruit/ViewControllers/Report/Controllers/ReportViewController.m
View file @ af300813
......@@ -89,6 +89,10 @@
#endif
}
- (void)searchClick{
if (self.startTimeView) {
[self.startTimeView removeFromSuperview];
self.startTimeView = nil;
}
SearchReportViewController *srvc = [SearchReportViewController new];
[self PushViewController:srvc animated:YES];
}
......@@ -100,7 +104,6 @@
void(^succ)(id) = ^(id data) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
//赋值
// [IBTLoadingView hideHUDWithText:nil];
[strongSelf prepareDataInScrollView:data];
[strongSelf getBottomData:nil];
};
......@@ -519,8 +522,11 @@
#pragma mark - 详情页面跳转
- (void)goReoprtDetail:(NSNotification *)finication{
NSDictionary *dict = finication.userInfo;
Compass *compass = dict[@"compass"];
ReportDetailViewController *rvc = [ReportDetailViewController new];
rvc.title = @"陆金所";
rvc.compass = compass;
rvc.title = compass.orgName;
[self PushViewController:rvc animated:YES];
}
......
XFFruit/ViewControllers/Report/Controllers/SaleViewController.m
View file @ af300813
......@@ -7,7 +7,6 @@
//
#import "SaleViewController.h"
#import "SMPageControl.h"
#import "SaleViewCell.h"
#import "SaleHeaderView.h"
#import "ReportDetailViewController.h"
......@@ -18,13 +17,8 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
@interface SaleViewController ()<UITableViewDataSource,UITableViewDelegate>
@property (nonatomic,strong)SMPageControl *pageControl;
@property (nonatomic,strong)RSaleView *rsaleView;
@property (nonatomic,strong)Compass *compass;
@property (nonatomic,strong)UIView *bgView;
@property (nonatomic,strong)NSIndexPath *currentIndex;
@end
......@@ -48,36 +42,20 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
self.view .backgroundColor = [UIColor whiteColor];
CGRect rect = CGRectMake(0, 0, ScreenSize.width, 145);
self.bgView = [[UIView alloc]initWithFrame:rect];
rect = CGRectMake(0, 0, ScreenSize.width, 130);
self.rsaleView = [[RSaleView alloc]initWithFrame:rect];
[self.bgView addSubview:self.rsaleView];
self.pageControl = [[SMPageControl alloc]initWithFrame:CGRectMake(0, self.rsaleView.bottom, self.view.width, 10)];
self.pageControl.currentPage = 0;
self.pageControl.pageIndicatorImage = [UIImage imageNamed:@"white_point"];
self.pageControl.currentPageIndicatorImage = [UIImage imageNamed:@"yellow_point"];
//
// self.pageControl.pageIndicatorTintColor = XXFBgColor;
// self.pageControl.currentPageIndicatorTintColor = GXF_COMMIT_COLOR;
self.pageControl.numberOfPages = 4;
self.pageControl.indicatorMargin = 15.0f;
self.pageControl.indicatorDiameter = 10.0f;
[self.bgView addSubview:self.pageControl];
self.rsaleView.bgImage.image = [UIImage imageNamed:@"salebg_1"];
self.rsaleView.cenImage.image = [UIImage imageNamed:@"sale_1"];
[self.view addSubview:self.rsaleView];
CLog(@"%f---------",self.view.height);
rect = CGRectMake(0, 0, self.view.width, self.view.height- 158);
self.tableView = [[UITableView alloc]initWithFrame:rect style:UITableViewStylePlain];
self.tableView.delegate = self;
self.tableView.dataSource = self;
[self.tableView registerClass:[SaleViewCell class] forCellReuseIdentifier:saleCellIdentify];
[self.tableView registerClass:[SaleHeaderView class] forHeaderFooterViewReuseIdentifier:saleHeaderIdentify];
self.tableView.tableHeaderView = self.bgView;
self.tableView.tableHeaderView = self.rsaleView;
[self.view addSubview:self.tableView];
......@@ -144,7 +122,12 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
}
- (void)detailClick:(UIButton *)btn{
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil];
Compass *com = self.dataArr[btn.tag];
NSObject *comObj = [NSNull null];
if (com) {
comObj = com;
}
[[NSNotificationCenter defaultCenter] postNotificationName:KNOTIFICATION_GoReportDetail object:nil userInfo:@{@"compass":comObj}];
}
......
XFFruit/ViewControllers/Report/Controllers/SearchReportViewController.m
View file @ af300813
......@@ -200,8 +200,13 @@
return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
LowerOrgs *orgs = self.dataArr[indexPath.row];
ReportDetailViewController *rvc = [ReportDetailViewController new];
rvc.title = @"陆金所";
Compass *com = [Compass new];
com.orgUuid = orgs.uuid;
com.orgName = orgs.name;
com.orgCode = orgs.code;
rvc.compass = com;
[self PushViewController:rvc animated:YES];
}
......
XFFruit/ViewControllers/Report/Views/PasengerCell.m
View file @ af300813
......@@ -75,6 +75,7 @@
rect = CGRectMake(self.saleLabel.right, 0, width, Sale_Cell_Height);
self.lastWeekLabel = [IBTCommon buttonWithTitle:@"" Image:nil frame:rect fontSize:15 fontColor:ReportContentColor];
self.lastWeekLabel.enabled = NO;
[self.contentView addSubview:self.lastWeekLabel];
rect = CGRectMake(self.lastWeekLabel.right, 0, 35, Sale_Cell_Height);
......@@ -102,12 +103,12 @@
self.saleLabel.text = [sale.persales stringValue];
//客单价比变化率
if ([sale.persalesChainSign isEqualToString:ReportChainSignPlus]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:ReportContentColor forState:UIControlStateNormal];
self.saleLabel.textColor = ReportContentColor;
}else{
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:GXF_NAVIGAYION_COLOR forState:UIControlStateNormal];
self.saleLabel.textColor = GXF_NAVIGAYION_COLOR;
......@@ -127,12 +128,12 @@
self.saleLabel.text = [sale.passenger stringValue];
//客流量比变化率
if ([sale.passengerChainSign isEqualToString:ReportChainSignPlus]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:ReportContentColor forState:UIControlStateNormal];
self.saleLabel.textColor = ReportContentColor;
}else{
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:GXF_NAVIGAYION_COLOR forState:UIControlStateNormal];
self.saleLabel.textColor = GXF_NAVIGAYION_COLOR;
......@@ -152,12 +153,12 @@
self.saleLabel.text = [sale.grossprofit stringValue];
//毛利率比变化率
if ([sale.grossprofitChainSign isEqualToString:ReportChainSignPlus]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:ReportContentColor forState:UIControlStateNormal];
self.saleLabel.textColor = ReportContentColor;
}else{
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:GXF_NAVIGAYION_COLOR forState:UIControlStateNormal];
self.saleLabel.textColor = GXF_NAVIGAYION_COLOR;
......
XFFruit/ViewControllers/Report/Views/RPassgerView.h
View file @ af300813
......@@ -9,10 +9,15 @@
#import <UIKit/UIKit.h>
#import "Compass.h"
@interface RPassgerView : UIView
@property (nonatomic,strong)UIButton *centerLabel;
@property (nonatomic,strong)UILabel *centerLabel;
@property (nonatomic,strong)UILabel *dateLabel;
@property (nonatomic,strong)UIButton *lastWeekLabel;
@property (nonatomic,strong)UIButton *lastYearLabel;
@property (nonatomic,strong)UIImageView *bgImage;
@property (nonatomic,strong)UIImageView *cenImage;
- (instancetype)initWithFrame:(CGRect)frame withPage:(NSInteger)currentPage;
//客流
- (void)setPassengerWithCompass:(Compass *)compass;
//客单价
......
XFFruit/ViewControllers/Report/Views/RPassgerView.m
View file @ af300813
......@@ -7,12 +7,16 @@
//
#import "RPassgerView.h"
#import "SMPageControl.h"
#define LeftWidth 50
#define ImageSize 20
#define ContentHeight 30
#define ContentHeight 25
#define TopWidth 200
@interface RPassgerView ()
#define CenImageSize 40
@interface RPassgerView ()
@property (nonatomic,strong)SMPageControl *pageControl;
@property (nonatomic,assign)NSInteger currentPage;
@end
@implementation RPassgerView
- (instancetype)initWithFrame:(CGRect)frame{
......@@ -22,23 +26,44 @@
}
return self;
}
- (instancetype)initWithFrame:(CGRect)frame withPage:(NSInteger)currentPage{
self = [super initWithFrame:frame];
if (self) {
self.currentPage = currentPage;
[self bulidLayout];
}
return self;
}
- (void)bulidLayout{
CGRect rect = CGRectMake((ScreenSize.width - TopWidth)/2,20, TopWidth, ContentHeight);
self.centerLabel = [IBTCommon buttonWithTitle:@"" Image:nil frame:rect fontSize:15 fontColor:ReportContentColor];
self.centerLabel.enabled = NO;
self.centerLabel.titleLabel.font = [UIFont boldSystemFontOfSize:30];
CGRect rect = CGRectMake(0, 0, self.width, self.height);
self.bgImage = [[UIImageView alloc]initWithFrame:rect];
[self addSubview:self.bgImage];
rect = CGRectMake(self.width/4, 20, CenImageSize, CenImageSize);
self.cenImage = [[UIImageView alloc]initWithFrame:rect];
self.cenImage.contentMode = UIViewContentModeScaleAspectFit;
[self addSubview:self.cenImage];
rect = CGRectMake(self.cenImage.right+5, 20, ScreenSize.width - self.cenImage.right, ContentHeight);
self.centerLabel = [[UILabel alloc]initWithFrame:rect];
self.centerLabel.textColor = ReportContentColor;
self.centerLabel.font = FontSize(28);
[self addSubview:self.centerLabel];
rect = CGRectMake(0, self.centerLabel.bottom,ScreenSize.width, 20);
rect = CGRectMake(self.centerLabel.left, self.centerLabel.bottom,self.width-self.centerLabel.left, ContentHeight);
self.dateLabel = [[UILabel alloc]initWithFrame:rect];
self.dateLabel.textColor = GXF_CONTENT_COLOR;
self.dateLabel.font = GXF_FOURTEENTH_SIZE;
self.dateLabel.textAlignment = NSTextAlignmentCenter;
self.dateLabel.text = @"";
self.dateLabel.textColor = [UIColor lightGrayColor];
self.dateLabel.font = GXF_THREETEENTH_SIZE;
self.dateLabel.textAlignment = NSTextAlignmentLeft;
[self addSubview:self.dateLabel];
CGFloat bottomWidth = (ScreenSize.width - 20*2)/2;
rect = CGRectMake(20, self.dateLabel.bottom,bottomWidth, ContentHeight);
......@@ -56,9 +81,6 @@
[self addSubview:weekLabel];
rect = CGRectMake(self.lastWeekLabel.right,self.dateLabel.bottom,bottomWidth, ContentHeight);
self.lastYearLabel = [IBTCommon buttonWithTitle:@"" Image:nil frame:rect fontSize:15 fontColor:GXF_NAVIGAYION_COLOR];
self.lastYearLabel.enabled = NO;
......@@ -72,6 +94,16 @@
yearLabel.text = @"比去年同期";
yearLabel.font = GXF_THREETEENTH_SIZE;
[self addSubview:yearLabel];
self.pageControl = [[SMPageControl alloc]initWithFrame:CGRectMake(0, yearLabel.bottom+5, ScreenSize.width, 10)];
self.pageControl.numberOfPages = 4;
self.pageControl.currentPage = self.currentPage;
self.pageControl.pageIndicatorImage = [UIImage imageNamed:@"white_point"];
self.pageControl.currentPageIndicatorImage = [UIImage imageNamed:@"yellow_point"];
self.pageControl.indicatorMargin = 5.0f;
self.pageControl.indicatorDiameter = 10.0f;
[self addSubview:self.pageControl];
}
......@@ -79,9 +111,12 @@
- (void)setPassengerWithCompass:(Compass *)compass{
//客流数
[self.centerLabel setImage:[UIImage imageNamed:@"goSale"] forState:UIControlStateDisabled];
[self.centerLabel setTitle:compass.passenger?[compass.passenger stringValue]:@"0" forState:UIControlStateNormal];
self.centerLabel.text = compass.passenger?[compass.passenger stringValue]:@"0" ;
//客流统计时间
NSString *weekday = @"";
if ([IBTCommon convertToDateFrom:compass.passengerdate]) {
weekday = [IBTCommon weekdayStringFromDate:[IBTCommon convertToDateFrom:compass.passengerdate]];
}
self.dateLabel.text = [NSString stringWithFormat:@"%@累计客流量",compass.passengerdate?compass.passengerdate:@"无"];
//客流数环比变化率
if ([compass.passengerChainSign isEqualToString:ReportChainSignPlus]) {
......@@ -107,12 +142,14 @@
}
//客单价
- (void)setPersalesWithCompass:(Compass *)compass{
//客单价
[self.centerLabel setImage:[UIImage imageNamed:@"goSale"] forState:UIControlStateDisabled];
[self.centerLabel setTitle:compass.persales?[compass.persales stringValue]:@"0" forState:UIControlStateNormal];
self.centerLabel.text = compass.persales?[compass.persales stringValue]:@"0";
//客单价统计时间
self.dateLabel.text = [NSString stringWithFormat:@"%@累计客单价",compass.persalesdate?compass.persalesdate:@"无"];
NSString *weekday = @"";
if ([IBTCommon convertToDateFrom:compass.persalesdate]) {
weekday = [IBTCommon weekdayStringFromDate:[IBTCommon convertToDateFrom:compass.persalesdate]];
}
self.dateLabel.text = [NSString stringWithFormat:@"%@%@累计客单价",compass.persalesdate?compass.persalesdate:@"无",weekday];
//客单价环比变化率
if ([compass.persalesChainSign isEqualToString:ReportChainSignPlus]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateDisabled];
......@@ -137,12 +174,14 @@
}
//毛利率
- (void)setGrossprofitWithCompass:(Compass *)compass{
//毛利率
[self.centerLabel setImage:[UIImage imageNamed:@"goSale"] forState:UIControlStateDisabled];
[self.centerLabel setTitle:compass.persales?[compass.persales stringValue]:@"0" forState:UIControlStateNormal];
self.centerLabel.text = compass.grossprofit?[compass.grossprofit stringValue]:@"0";
//毛利率统计时间
self.dateLabel.text = [NSString stringWithFormat:@"%@累计毛利率",compass.persalesdate?compass.persalesdate:@"无"];
NSString *weekday = @"";
if ([IBTCommon convertToDateFrom:compass.grossprofitdate]) {
weekday = [IBTCommon weekdayStringFromDate:[IBTCommon convertToDateFrom:compass.grossprofitdate]];
}
self.dateLabel.text = [NSString stringWithFormat:@"%@%@累计毛利率",compass.grossprofitdate?compass.grossprofitdate:@"无",weekday];
//毛利率环比变化率
if ([compass.grossprofitChainSign isEqualToString:ReportChainSignPlus]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateDisabled];
......
XFFruit/ViewControllers/Report/Views/RSaleView.h
View file @ af300813
......@@ -9,5 +9,9 @@
#import <UIKit/UIKit.h>
#import "Compass.h"
@interface RSaleView : UIView
- (instancetype)initWithFrame:(CGRect)frame withPage:(NSInteger)currentPage;
@property (nonatomic,strong)UIImageView *bgImage;
@property (nonatomic,strong)UIImageView *cenImage;
- (void)setValueInSaleView:(Compass *)compass;
@end
XFFruit/ViewControllers/Report/Views/RSaleView.m
View file @ af300813
......@@ -7,9 +7,11 @@
//
#import "RSaleView.h"
#import "SMPageControl.h"
#define LeftWidth 50
#define ImageSize 20
#define ContentHeight 30
#define ContentHeight 25
#define CenImageSize 40
@interface RSaleView ()
@property (nonatomic,strong)UILabel *centerLabel;
......@@ -20,7 +22,8 @@
@property (nonatomic,strong)UILabel *averageLabel;
@property (nonatomic,strong)UIImageView *lastWeekImage;
@property (nonatomic,strong)UIImageView *lastYearImage;
@property (nonatomic,strong)SMPageControl *pageControl;
@property (nonatomic,assign)NSInteger currentPage;
@end
......@@ -33,24 +36,44 @@
self = [super initWithFrame:frame];
if (self) {
[self bulidLayout];
self.currentPage = 0;
}
return self;
}
- (instancetype)initWithFrame:(CGRect)frame withPage:(NSInteger)currentPage{
self = [super initWithFrame:frame];
if (self) {
self.currentPage = currentPage;
[self bulidLayout];
}
return self;
}
- (void)bulidLayout{
CGRect rect = CGRectMake(0, 30, LeftWidth, 20);
CGRect rect = CGRectMake(0, 0, self.width, self.height);
rect = CGRectMake(LeftWidth, 20, ScreenSize.width - LeftWidth*2 , ContentHeight);
self.bgImage = [[UIImageView alloc]initWithFrame:rect];
[self addSubview:self.bgImage];
rect = CGRectMake(self.width/4, 20, CenImageSize, CenImageSize);
self.cenImage = [[UIImageView alloc]initWithFrame:rect];
self.cenImage.contentMode = UIViewContentModeScaleAspectFit;
[self addSubview:self.cenImage];
rect = CGRectMake(self.cenImage.right+5, 20, ScreenSize.width - self.cenImage.right, ContentHeight);
self.centerLabel = [[UILabel alloc]initWithFrame:rect];
self.centerLabel.textAlignment = NSTextAlignmentCenter;
self.centerLabel.textColor = ReportContentColor;
self.centerLabel.font = FontSize(28);
[self addSubview:self.centerLabel];
rect = CGRectMake(0, self.centerLabel.bottom,self.width, 20);
rect = CGRectMake(self.centerLabel.left, self.centerLabel.bottom,self.width-self.centerLabel.left, ContentHeight);
self.dateLabel = [[UILabel alloc]initWithFrame:rect];
self.dateLabel.textColor = GXF_CONTENT_COLOR;
self.dateLabel.font = GXF_FOURTEENTH_SIZE;
self.dateLabel.textAlignment = NSTextAlignmentCenter;
self.dateLabel.textColor = [UIColor lightGrayColor];
self.dateLabel.font = GXF_THREETEENTH_SIZE;
self.dateLabel.textAlignment = NSTextAlignmentLeft;
[self addSubview:self.dateLabel];
CGFloat bottomWidth = (ScreenSize.width - 20)/4;
......@@ -112,21 +135,28 @@
avLabel.textAlignment = NSTextAlignmentCenter;
[self addSubview:avLabel];
self.pageControl = [[SMPageControl alloc]initWithFrame:CGRectMake(0, avLabel.bottom+5, ScreenSize.width, 10)];
self.pageControl.numberOfPages = 4;
self.pageControl.currentPage = self.currentPage;
self.pageControl.pageIndicatorImage = [UIImage imageNamed:@"white_point"];
self.pageControl.currentPageIndicatorImage = [UIImage imageNamed:@"yellow_point"];
self.pageControl.indicatorMargin = 5.0f;
self.pageControl.indicatorDiameter = 10.0f;
[self addSubview:self.pageControl];
}
- (void)setValueInSaleView:(Compass *)compass{
//统计时间
// if (!compass) {
// return;
// }
self.dateLabel.text = [NSString stringWithFormat:@"%@累计销售额",compass.dataScope?compass.dataScope:@"无"];
//销售额
NSMutableAttributedString *attributeStr1 = [IBTCommon setTextViewBoldFontOfString:@"$ " paragraphStyle:8 fontSize:20 color:ReportColor];
if (compass.sales) {
[attributeStr1 appendAttributedString:[IBTCommon setTextViewBoldFontOfString:[compass.sales stringValue] paragraphStyle:8 fontSize:30 color:ReportContentColor]];
// compass.dataScope = @"2015-01";
NSString *weekday = @"";
if ([IBTCommon convertToDateFrom:compass.dataScope]) {
weekday = [IBTCommon weekdayStringFromDate:[IBTCommon convertToDateFrom:compass.dataScope]];
}
self.centerLabel.attributedText = attributeStr1;
self.centerLabel.textAlignment = NSTextAlignmentCenter;
self.dateLabel.text = [NSString stringWithFormat:@"%@%@累计销售额",compass.dataScope?compass.dataScope:@"无",weekday];
//销售额
self.centerLabel.text = compass.sales?[compass.sales stringValue]:@"0" ;
//销售环比变化率
if ([compass.salesChainSign isEqualToString:ReportChainSignPlus]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateNormal];
......
XFFruit/ViewControllers/Report/Views/SaleViewCell.m
View file @ af300813
......@@ -77,6 +77,7 @@
rect = CGRectMake(self.saleLabel.right, 0, width, Sale_Cell_Height);
self.lastWeekLabel = [IBTCommon buttonWithTitle:@"" Image:nil frame:rect fontSize:15 fontColor:ReportContentColor];
self.lastWeekLabel.enabled = NO;
[self.contentView addSubview:self.lastWeekLabel];
rect = CGRectMake(self.lastWeekLabel.right, 0, width-10, Sale_Cell_Height);
......@@ -111,12 +112,12 @@
//销售环比变化率
if ([sale.salesChainSign isEqualToString:ReportChainSignPlus]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:ReportContentColor forState:UIControlStateNormal];
self.saleLabel.textColor = ReportContentColor;
}else{
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainMinusImage] forState:UIControlStateDisabled];
[self.lastWeekLabel setTitleColor:GXF_NAVIGAYION_COLOR forState:UIControlStateNormal];
self.saleLabel.textColor = GXF_NAVIGAYION_COLOR;
}
......
XFFruit/ViewControllers/Survey/Views/FinishTimeView.m
View file @ af300813
......@@ -234,7 +234,7 @@
self.currentYear = [[self.dateStr substringWithRange:NSMakeRange(0,4)] intValue];
self.selectedYear = self.currentYear;
self.currentMonth = [[self.dateStr substringWithRange:NSMakeRange(4,2)] intValue];
self.currentMonth = [[self.dateStr substringWithRange:NSMakeRange(5,2)] intValue];
[pickerView selectRow:(self.currentYear - kStartYear) inComponent:0 animated:YES];
......@@ -557,11 +557,11 @@
NSInteger yearRow = [_pickerView selectedRowInComponent:0];
NSString *year = [self.yearList[yearRow] stringByReplacingOccurrencesOfString:@"年" withString:@""];
NSInteger monthRow = [_pickerView selectedRowInComponent:1];
NSString *month = [[self.monthList[monthRow] stringByReplacingOccurrencesOfString:@"第" withString:@""] stringByReplacingOccurrencesOfString:@"周" withString:@""];
NSString *month = [[self.monthList[monthRow] stringByReplacingOccurrencesOfString:@"第" withString:@""] stringByReplacingOccurrencesOfString:@"周" withString:@""];
NSArray *array1 = [NSArray arrayWithObjects:year,month, nil];
NSString *date1 = [array1 componentsJoinedByString:@""];
NSArray *array1 = [NSArray arrayWithObjects:year,month.length == 1 ?[NSString stringWithFormat:@"0%@",month]:month, nil];
NSString *date1 = [array1 componentsJoinedByString:@"-"];
return date1;
......@@ -569,4 +569,7 @@
- (void)cancelClick{
[self.delegate cancelTimeView];
}
- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
[self.delegate cancelTimeView];
}
@end
XFFruit/ViewControllers/Survey/Views/StartTimeView.m
View file @ af300813
......@@ -63,4 +63,7 @@
- (void)cancelClick{
[self.delegate cancelTimeView];
}
- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
[self.delegate cancelTimeView];
}
@end
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