Skip to content

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

no message

parent cad7fd9f
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 12 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ f900762e
......@@ -185,6 +185,7 @@
72B3C0D91B9DB83A00025D81 /* TransportBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0D81B9DB83A00025D81 /* TransportBoltView.m */; };
72B3C0DC1B9DBD7500025D81 /* TransportCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DB1B9DBD7500025D81 /* TransportCell.m */; };
72B3C0DF1B9DC60D00025D81 /* TransportDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3C0DE1B9DC60D00025D81 /* TransportDetailViewController.m */; };
72C4C7461BF31BE300EDC3F8 /* ReportDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C4C7451BF31BE300EDC3F8 /* ReportDetailViewController.m */; settings = {ASSET_TAGS = (); }; };
72C803521B7B897B00990363 /* DataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C803511B7B897B00990363 /* DataManager.m */; };
72D645231BF1E9B80029E146 /* ChooseTransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D645221BF1E9B80029E146 /* ChooseTransferViewController.m */; };
72EDD86E1B96E11700964115 /* ChooseParentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EDD86D1B96E11700964115 /* ChooseParentViewController.m */; };
......@@ -804,6 +805,8 @@
72B3C0DB1B9DBD7500025D81 /* TransportCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportCell.m; sourceTree = "<group>"; };
72B3C0DD1B9DC60D00025D81 /* TransportDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransportDetailViewController.h; sourceTree = "<group>"; };
72B3C0DE1B9DC60D00025D81 /* TransportDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransportDetailViewController.m; sourceTree = "<group>"; };
72C4C7441BF31BE300EDC3F8 /* ReportDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReportDetailViewController.h; sourceTree = "<group>"; };
72C4C7451BF31BE300EDC3F8 /* ReportDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReportDetailViewController.m; sourceTree = "<group>"; };
72C803501B7B897B00990363 /* DataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataManager.h; sourceTree = "<group>"; };
72C803511B7B897B00990363 /* DataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataManager.m; sourceTree = "<group>"; };
72D645211BF1E9B80029E146 /* ChooseTransferViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseTransferViewController.h; sourceTree = "<group>"; };
......@@ -1635,6 +1638,8 @@
728899E71BEF41FC003CC41E /* PassengerViewController.m */,
728899E91BEF4233003CC41E /* PassgerPriceViewController.h */,
728899EA1BEF4233003CC41E /* PassgerPriceViewController.m */,
72C4C7441BF31BE300EDC3F8 /* ReportDetailViewController.h */,
72C4C7451BF31BE300EDC3F8 /* ReportDetailViewController.m */,
);
path = Controllers;
sourceTree = "<group>";
......@@ -2977,6 +2982,7 @@
728899F11BEF4A8A003CC41E /* PassengerHeaderCell.m in Sources */,
C15918431AC062460013B391 /* IBTTableViewUserInfo.m in Sources */,
30D702461ADE3862008DC0BF /* ICRAnnouncementDetailHeadView.m in Sources */,
72C4C7461BF31BE300EDC3F8 /* ReportDetailViewController.m in Sources */,
C17E50D91B09830200C15359 /* ICRPostAttachment.m in Sources */,
C18AEA911AC9B88F00A1DB7B /* ICRUIAppearance.m in Sources */,
C142D2B61AC3A155000109A7 /* UILabel+SizeCalculate.m in Sources */,
......@@ -3395,7 +3401,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
......@@ -3420,7 +3426,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
......
XFFruit/Macro/ICRAppMacro.h
View file @ f900762e
......@@ -23,10 +23,10 @@
#define ICR_IMAGE_BG_COLOR [UIColor colorWithW:242 a:1]
//********阿里云内部测试环境********
#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//********现场测试环境********
//#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
//********现场正式环境*********
......
XFFruit/ViewControllers/Home/Announcement/ICRAnnouncementViewController.m
View file @ f900762e
......@@ -41,6 +41,9 @@ static NSString *MyTableViewCell = @"IBTTableViewCell";
[self initSegmentConatinerFromOriginY:0];
[self initTableView];
//默认请求第一个
[self fetchDataMore:NO type:kICRAnnouncementTypeUnread];
}
- (void)didReceiveMemoryWarning {
......
XFFruit/ViewControllers/Login/ICRLoginViewController.m
View file @ f900762e
......@@ -107,9 +107,9 @@
//@"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";
//现场正式环境登陆
......
XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.h 0 → 100644
View file @ f900762e
//
// ReportDetailViewController.h
// XFFruit
//
// Created by 陈俊俊 on 15/11/11.
// Copyright © 2015年 Xummer. All rights reserved.
//
#import "ICRBaseViewController.h"
@interface ReportDetailViewController : ICRBaseViewController
@end
XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.m 0 → 100644
View file @ f900762e
//
// ReportDetailViewController.m
// XFFruit
//
// Created by 陈俊俊 on 15/11/11.
// Copyright © 2015年 Xummer. All rights reserved.
//
#import "ReportDetailViewController.h"
#import "CustomSegView.h"
@interface ReportDetailViewController ()<CustomSegViewDelegate>
@property (nonatomic,strong)CustomSegView *segView;
@end
@implementation ReportDetailViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self bulidLayout];
}
#pragma mark - 布局
- (void)bulidLayout{
self.view .backgroundColor = [UIColor whiteColor];
CGRect rect = CGRectMake(10, 10, ScreenSize.width - 10*2, 30);
NSArray *arr = @[SaleDay,SaleWeek,SaleMonth];
self.segView = [[CustomSegView alloc]initWithFrame:rect withArr:arr];
self.segView.delegate = self;
[self.view addSubview:self.segView];
}
#pragma mark -CustomSegViewDelegate
- (void)customSegOneClick:(NSString *)title{
}
- (void)customSegTwoClick:(NSString *)title{
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
}
/*
#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
XFFruit/ViewControllers/Report/Controllers/SaleViewController.m
View file @ f900762e
......@@ -11,6 +11,7 @@
#import "SMPageControl.h"
#import "SaleViewCell.h"
#import "SaleHeaderView.h"
#import "ReportDetailViewController.h"
#define LeftWidth 50
static NSString *saleCellIdentify = @"saleCellIdentify";
......@@ -170,9 +171,6 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
self.pageControl.indicatorDiameter = 15.0f;
[self.view addSubview:self.pageControl];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(pageClick)];
[self.pageControl addGestureRecognizer:tap];
CLog(@"%f---------",self.view.height);
rect = CGRectMake(0, self.pageControl.bottom + 5, self.view.width, self.view.height - self.pageControl.bottom - 118);
......@@ -240,10 +238,13 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
return [SaleHeaderView viewHeight];
}
- (void)pageClick{
CLog(@"=====");
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
ReportDetailViewController *rvc = [ReportDetailViewController new];
rvc.title = @"第一门店";
[self PushViewController:rvc animated:YES];
}
#pragma mark - 搜索点击事件
- (void)searchClick{
CLog(@"搜索============");
......
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