diff --git a/ManagerDemo.xcodeproj/project.pbxproj b/ManagerDemo.xcodeproj/project.pbxproj index 499f92a..07385ab 100644 --- a/ManagerDemo.xcodeproj/project.pbxproj +++ b/ManagerDemo.xcodeproj/project.pbxproj @@ -49,6 +49,10 @@ A986269119B411AA00FF9E2C /* DailyIncomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A986268F19B411AA00FF9E2C /* DailyIncomeViewController.xib */; }; A986269519B413D600FF9E2C /* DailyIncomeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A986269319B413D600FF9E2C /* DailyIncomeTableViewCell.m */; }; A986269619B413D600FF9E2C /* DailyIncomeTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A986269419B413D600FF9E2C /* DailyIncomeTableViewCell.xib */; }; + A986269A19B423EB00FF9E2C /* ActivityCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A986269819B423EB00FF9E2C /* ActivityCenterViewController.m */; }; + A986269B19B423EB00FF9E2C /* ActivityCenterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A986269919B423EB00FF9E2C /* ActivityCenterViewController.xib */; }; + A986269F19B4241400FF9E2C /* ActivityCenterTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A986269D19B4241400FF9E2C /* ActivityCenterTableViewCell.m */; }; + A98626A019B4241400FF9E2C /* ActivityCenterTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A986269E19B4241400FF9E2C /* ActivityCenterTableViewCell.xib */; }; A988A8FC199A50D900EB10AA /* TriangleView.m in Sources */ = {isa = PBXBuildFile; fileRef = A988A8FB199A50D900EB10AA /* TriangleView.m */; }; A988A900199A751500EB10AA /* FundListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A988A8FF199A751500EB10AA /* FundListCell.m */; }; A988A902199A755300EB10AA /* FundListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A988A901199A755300EB10AA /* FundListCell.xib */; }; @@ -108,6 +112,11 @@ A9AF6C941994C5700076C0EE /* UIScrollView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AF6C8A1994C5700076C0EE /* UIScrollView+Extension.m */; }; A9AF6C951994C5700076C0EE /* UIScrollView+MJRefresh.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AF6C8C1994C5700076C0EE /* UIScrollView+MJRefresh.m */; }; A9AF6C961994C5700076C0EE /* UIView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AF6C8E1994C5700076C0EE /* UIView+Extension.m */; }; + A9B2506F19B4C75E003E8855 /* HelpCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B2506D19B4C75E003E8855 /* HelpCenterViewController.m */; }; + A9B2507019B4C75E003E8855 /* HelpCenterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9B2506E19B4C75E003E8855 /* HelpCenterViewController.xib */; }; + A9B2507419B4C796003E8855 /* HelpCenterTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B2507219B4C796003E8855 /* HelpCenterTableViewCell.m */; }; + A9B2507519B4C796003E8855 /* HelpCenterTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9B2507319B4C796003E8855 /* HelpCenterTableViewCell.xib */; }; + A9B2507719B4C8B2003E8855 /* red_select_arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B2507619B4C8B2003E8855 /* red_select_arrow@2x.png */; }; A9B9F14519AEF9BE001A1315 /* TableCellLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B9F14419AEF9BE001A1315 /* TableCellLineView.m */; }; A9B9F14C19AF1493001A1315 /* OtherProductInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B9F14A19AF1493001A1315 /* OtherProductInfoViewController.m */; }; A9B9F14D19AF1493001A1315 /* OtherProductInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9B9F14B19AF1493001A1315 /* OtherProductInfoViewController.xib */; }; @@ -219,6 +228,12 @@ A986269219B413D600FF9E2C /* DailyIncomeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DailyIncomeTableViewCell.h; sourceTree = ""; }; A986269319B413D600FF9E2C /* DailyIncomeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DailyIncomeTableViewCell.m; sourceTree = ""; }; A986269419B413D600FF9E2C /* DailyIncomeTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DailyIncomeTableViewCell.xib; sourceTree = ""; }; + A986269719B423EB00FF9E2C /* ActivityCenterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityCenterViewController.h; sourceTree = ""; }; + A986269819B423EB00FF9E2C /* ActivityCenterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivityCenterViewController.m; sourceTree = ""; }; + A986269919B423EB00FF9E2C /* ActivityCenterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ActivityCenterViewController.xib; sourceTree = ""; }; + A986269C19B4241400FF9E2C /* ActivityCenterTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityCenterTableViewCell.h; sourceTree = ""; }; + A986269D19B4241400FF9E2C /* ActivityCenterTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivityCenterTableViewCell.m; sourceTree = ""; }; + A986269E19B4241400FF9E2C /* ActivityCenterTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ActivityCenterTableViewCell.xib; sourceTree = ""; }; A988A8FA199A50D900EB10AA /* TriangleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriangleView.h; sourceTree = ""; }; A988A8FB199A50D900EB10AA /* TriangleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TriangleView.m; sourceTree = ""; }; A988A8FE199A751500EB10AA /* FundListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FundListCell.h; sourceTree = ""; }; @@ -301,6 +316,13 @@ A9AF6C8C1994C5700076C0EE /* UIScrollView+MJRefresh.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+MJRefresh.m"; sourceTree = ""; }; A9AF6C8D1994C5700076C0EE /* UIView+Extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Extension.h"; sourceTree = ""; }; A9AF6C8E1994C5700076C0EE /* UIView+Extension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Extension.m"; sourceTree = ""; }; + A9B2506C19B4C75E003E8855 /* HelpCenterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpCenterViewController.h; sourceTree = ""; }; + A9B2506D19B4C75E003E8855 /* HelpCenterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpCenterViewController.m; sourceTree = ""; }; + A9B2506E19B4C75E003E8855 /* HelpCenterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HelpCenterViewController.xib; sourceTree = ""; }; + A9B2507119B4C796003E8855 /* HelpCenterTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpCenterTableViewCell.h; sourceTree = ""; }; + A9B2507219B4C796003E8855 /* HelpCenterTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpCenterTableViewCell.m; sourceTree = ""; }; + A9B2507319B4C796003E8855 /* HelpCenterTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HelpCenterTableViewCell.xib; sourceTree = ""; }; + A9B2507619B4C8B2003E8855 /* red_select_arrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red_select_arrow@2x.png"; sourceTree = ""; }; A9B9F14319AEF9BE001A1315 /* TableCellLineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableCellLineView.h; sourceTree = ""; }; A9B9F14419AEF9BE001A1315 /* TableCellLineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableCellLineView.m; sourceTree = ""; }; A9B9F14919AF1493001A1315 /* OtherProductInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OtherProductInfoViewController.h; sourceTree = ""; }; @@ -431,6 +453,18 @@ A94FE51C199C9C3C00626DE5 /* MoveSocialCellView.h */, A94FE51D199C9C3C00626DE5 /* MoveSocialCellView.m */, A94FE51F199C9C6800626DE5 /* MoveSocialCellView.xib */, + A986269719B423EB00FF9E2C /* ActivityCenterViewController.h */, + A986269819B423EB00FF9E2C /* ActivityCenterViewController.m */, + A986269919B423EB00FF9E2C /* ActivityCenterViewController.xib */, + A986269C19B4241400FF9E2C /* ActivityCenterTableViewCell.h */, + A986269D19B4241400FF9E2C /* ActivityCenterTableViewCell.m */, + A986269E19B4241400FF9E2C /* ActivityCenterTableViewCell.xib */, + A9B2506C19B4C75E003E8855 /* HelpCenterViewController.h */, + A9B2506D19B4C75E003E8855 /* HelpCenterViewController.m */, + A9B2506E19B4C75E003E8855 /* HelpCenterViewController.xib */, + A9B2507119B4C796003E8855 /* HelpCenterTableViewCell.h */, + A9B2507219B4C796003E8855 /* HelpCenterTableViewCell.m */, + A9B2507319B4C796003E8855 /* HelpCenterTableViewCell.xib */, ); path = MoveView; sourceTree = ""; @@ -627,6 +661,7 @@ A9AF6C4D19949CAD0076C0EE /* Resource */ = { isa = PBXGroup; children = ( + A9B2507619B4C8B2003E8855 /* red_select_arrow@2x.png */, A919056919B07AAF002575DF /* pie_chart_arrow@2x.png */, A919056619B067B8002575DF /* adview@2x.png */, A919055C19B02A6E002575DF /* icon_color_key@2x.png */, @@ -878,6 +913,7 @@ A9EAA04519986DC3001A872A /* fund_cell_label_bg_blue@2x.png in Resources */, A919056719B067B8002575DF /* adview@2x.png in Resources */, A9AF6C6219949CD30076C0EE /* icon_dock_rt_actived@2x.png in Resources */, + A98626A019B4241400FF9E2C /* ActivityCenterTableViewCell.xib in Resources */, A9AF6C781994B5890076C0EE /* icon_share_default.png in Resources */, A9AF6C741994B5890076C0EE /* icon_indicate_add_module@2x.png in Resources */, A919055F19B02A72002575DF /* icon_color_bank@2x.png in Resources */, @@ -887,6 +923,7 @@ A9EAA0501998787B001A872A /* hk_home_center_cover@2x.png in Resources */, A9C0540619ADBCB2002331A5 /* FundProductInfoViewController.xib in Resources */, A9AF6C6719949CD30076C0EE /* icon_dock_session_actived@2x.png in Resources */, + A9B2507719B4C8B2003E8855 /* red_select_arrow@2x.png in Resources */, A9AF6C771994B5890076C0EE /* icon_indicate_more@2x.png in Resources */, A90BEC02199DDA9E00230242 /* WYDProductViewController.xib in Resources */, A9AA325A199702DB000BE4FB /* Images.xcassets in Resources */, @@ -895,10 +932,12 @@ A91C6D4019AB8E9C00AEBF4D /* p2c_alert@2x.png in Resources */, A9AF6C6019949CD30076C0EE /* icon_dock_mine_actived@2x.png in Resources */, A919056C19B0882E002575DF /* AccountInfoViewController.xib in Resources */, + A9B2507019B4C75E003E8855 /* HelpCenterViewController.xib in Resources */, A9AF6C8F1994C5700076C0EE /* MJRefresh.bundle in Resources */, A9E76DD619AB378A00C0D232 /* hk_home_icon2@2x.png in Resources */, A9AF6C6419949CD30076C0EE /* icon_dock_service_actived@2x.png in Resources */, A9E76DD719AB378A00C0D232 /* hk_home_icon3@2x.png in Resources */, + A986269B19B423EB00FF9E2C /* ActivityCenterViewController.xib in Resources */, A9AF6C791994B5890076C0EE /* tabbarShadowImage@2x.png in Resources */, A9E76DD519AB378A00C0D232 /* hk_home_icon1@2x.png in Resources */, A919055B19B02A5F002575DF /* icon_color_idcard@2x.png in Resources */, @@ -907,6 +946,7 @@ A9C69442199BB7B100B2CECE /* icon_person_take_image@2x.png in Resources */, A9C69457199BD14D00B2CECE /* more_icon_9@2x.png in Resources */, A90BEC07199DDAFB00230242 /* WYDInfoHeadView.xib in Resources */, + A9B2507519B4C796003E8855 /* HelpCenterTableViewCell.xib in Resources */, A919056119B02A83002575DF /* icon_color_name@2x.png in Resources */, A9AF6BF719947DD00076C0EE /* InfoPlist.strings in Resources */, A9AF6C761994B5890076C0EE /* icon_indicate_more_down@2x.png in Resources */, @@ -999,6 +1039,8 @@ A96F2A7C199D008200608237 /* UIButton+Bootstrap.m in Sources */, A9AF6C47199498D10076C0EE /* MoreViewController.m in Sources */, A986268C19B40AAC00FF9E2C /* SVWebViewController.m in Sources */, + A9B2507419B4C796003E8855 /* HelpCenterTableViewCell.m in Sources */, + A9B2506F19B4C75E003E8855 /* HelpCenterViewController.m in Sources */, A986269519B413D600FF9E2C /* DailyIncomeTableViewCell.m in Sources */, A986268A19B40AAC00FF9E2C /* SVModalWebViewController.m in Sources */, A96F2A7F199D01C000608237 /* NSString+FontAwesome.m in Sources */, @@ -1006,6 +1048,7 @@ A919055619B02741002575DF /* AccountInfoViewController.m in Sources */, A93F8805199A077F00875287 /* LoanListViewController.m in Sources */, A9C053FE19AD706C002331A5 /* ToolBarView.m in Sources */, + A986269F19B4241400FF9E2C /* ActivityCenterTableViewCell.m in Sources */, A9AF6C951994C5700076C0EE /* UIScrollView+MJRefresh.m in Sources */, A9AA326119970335000BE4FB /* ImagePlayerView.m in Sources */, A9AF6C0319947DD00076C0EE /* ViewController.m in Sources */, @@ -1020,6 +1063,7 @@ A9C69446199BBEB200B2CECE /* MyTotalProfitCellView.m in Sources */, A9AF6C33199484200076C0EE /* HomeViewController.m in Sources */, A93F8800199A077F00875287 /* FundListViewController.m in Sources */, + A986269A19B423EB00FF9E2C /* ActivityCenterViewController.m in Sources */, A93F87801999B92800875287 /* QCSlideSwitchView.m in Sources */, A9B9F14519AEF9BE001A1315 /* TableCellLineView.m in Sources */, A9AF6C901994C5700076C0EE /* MJRefreshBaseView.m in Sources */, diff --git a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate index dddf7d7..b595fe2 100644 Binary files a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate and b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ManagerDemo/Common/ManagerConstants.h b/ManagerDemo/Common/ManagerConstants.h index 68e5050..f45df7f 100644 --- a/ManagerDemo/Common/ManagerConstants.h +++ b/ManagerDemo/Common/ManagerConstants.h @@ -33,7 +33,7 @@ #define Font_Black(fontsize) [UIFont fontWithName:@"HelveticaNeue-Bold" size:fontsize]; /** - * 点击的背景颜色 + * 点击的背景颜色 */ -#define Touch_BackGroudColor [UIColor colorWithWhite:0.5 alpha:0.1] +#define Touch_BackGroudColor [UIColor colorWithWhite:0.5 alpha:0.3] #endif diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.h b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.h new file mode 100644 index 0000000..58e6387 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.h @@ -0,0 +1,15 @@ +// +// ActivityCenterTableViewCell.h +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface ActivityCenterTableViewCell : UITableViewCell +@property (weak, nonatomic) IBOutlet UIImageView *infoImageView; +@property (weak, nonatomic) IBOutlet UILabel *infoLabel; + +@end diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.m b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.m new file mode 100644 index 0000000..f9efc9b --- /dev/null +++ b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.m @@ -0,0 +1,25 @@ +// +// ActivityCenterTableViewCell.m +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "ActivityCenterTableViewCell.h" + +@implementation ActivityCenterTableViewCell + +- (void)awakeFromNib +{ + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated +{ + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +@end diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.xib b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.xib new file mode 100644 index 0000000..218b657 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.xib @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.h b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.h new file mode 100644 index 0000000..39bd35b --- /dev/null +++ b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.h @@ -0,0 +1,14 @@ +// +// ActivityCenterViewController.h +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface ActivityCenterViewController : UIViewController +@property (weak, nonatomic) IBOutlet UITableView *tableView; + +@end diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.m b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.m new file mode 100644 index 0000000..2d99a6e --- /dev/null +++ b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.m @@ -0,0 +1,75 @@ +// +// ActivityCenterViewController.m +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "ActivityCenterViewController.h" +#import "ActivityCenterTableViewCell.h" +@interface ActivityCenterViewController () + +@end + +@implementation ActivityCenterViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + self.navigationItem.title = @"活动中心"; + _tableView.delegate = self; + _tableView.dataSource = self; + _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; +} + +#pragma mark UITableViewDelegate +-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 10; +} +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 1; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return 1.0; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 10.0; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return 160; +} +-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *activityCenterTableViewCell = @"ActivityCenterTableViewCell"; + UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:activityCenterTableViewCell]; + if (cell == nil) { + UINib *nib = [UINib nibWithNibName:@"ActivityCenterTableViewCell" bundle:nil]; + [tableView registerNib:nib forCellReuseIdentifier:activityCenterTableViewCell]; + cell = (ActivityCenterTableViewCell *)[tableView dequeueReusableCellWithIdentifier:activityCenterTableViewCell]; + } + cell.backgroundColor = [UIColor clearColor]; + return cell; +} +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.xib b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.xib new file mode 100644 index 0000000..7f28075 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.xib @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.h b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.h new file mode 100644 index 0000000..f092ad2 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.h @@ -0,0 +1,15 @@ +// +// HelpCenterTableViewCell.h +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface HelpCenterTableViewCell : UITableViewCell + +@property (weak, nonatomic) IBOutlet UITextView *infoTextView; + +@end diff --git a/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.m b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.m new file mode 100644 index 0000000..e541154 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.m @@ -0,0 +1,25 @@ +// +// HelpCenterTableViewCell.m +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "HelpCenterTableViewCell.h" + +@implementation HelpCenterTableViewCell + +- (void)awakeFromNib +{ + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated +{ + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +@end diff --git a/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.xib b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.xib new file mode 100644 index 0000000..3919c86 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.xib @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainView/MoveView/HelpCenterViewController.h b/ManagerDemo/MainView/MoveView/HelpCenterViewController.h new file mode 100644 index 0000000..8271c5c --- /dev/null +++ b/ManagerDemo/MainView/MoveView/HelpCenterViewController.h @@ -0,0 +1,14 @@ +// +// HelpCenterViewController.h +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface HelpCenterViewController : UIViewController +@property (weak, nonatomic) IBOutlet UITableView *tableView; + +@end diff --git a/ManagerDemo/MainView/MoveView/HelpCenterViewController.m b/ManagerDemo/MainView/MoveView/HelpCenterViewController.m new file mode 100644 index 0000000..2ebab3f --- /dev/null +++ b/ManagerDemo/MainView/MoveView/HelpCenterViewController.m @@ -0,0 +1,85 @@ +// +// HelpCenterViewController.m +// ManagerDemo +// +// Created by xmfish on 14-9-1. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "HelpCenterViewController.h" +#import "HelpCenterTableViewCell.h" +@interface HelpCenterViewController () + +@end + +@implementation HelpCenterViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + _tableView.delegate = self; + _tableView.dataSource = self; + _tableView.separatorStyle = UITableViewCellSelectionStyleNone; +} +-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 10; +} +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + if (section == 9) { + return 6; + } + return 1; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 10.0; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return 1.0; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + if (indexPath.section == 9) { + return 45; + } + return 90; +} +-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *cellIdentifier = @"HelpCenterTableViewCell"; + UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; + if (cell == nil) { + UINib *nib = [UINib nibWithNibName:@"HelpCenterTableViewCell" bundle:nil]; + [tableView registerNib:nib forCellReuseIdentifier:cellIdentifier]; + cell = (HelpCenterTableViewCell *)[tableView dequeueReusableCellWithIdentifier:cellIdentifier]; + } + cell.backgroundColor = [UIColor clearColor]; + cell.selectionStyle = UITableViewCellSelectionStyleNone; + if (indexPath.section == 9) { + [((HelpCenterTableViewCell *)cell).infoTextView setHidden:YES]; + }else{ + [((HelpCenterTableViewCell *)cell).infoTextView setHidden:NO]; + } + + return cell; +} +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end diff --git a/ManagerDemo/MainView/MoveView/HelpCenterViewController.xib b/ManagerDemo/MainView/MoveView/HelpCenterViewController.xib new file mode 100644 index 0000000..240c565 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/HelpCenterViewController.xib @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainViewControll/HomeViewController.m b/ManagerDemo/MainViewControll/HomeViewController.m index 8c0693f..6f2fa43 100644 --- a/ManagerDemo/MainViewControll/HomeViewController.m +++ b/ManagerDemo/MainViewControll/HomeViewController.m @@ -67,7 +67,7 @@ }]; [daiDaiTongApi getFundRecommendWithcompletionBlock:^(id jsonRes) { if ([[jsonRes objectForKey:@"succ"] integerValue] != 1) { - [MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:1.0]; +// [MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:1.0]; }else{ } [self.tableView reloadData]; diff --git a/ManagerDemo/MainViewControll/MoreViewController.m b/ManagerDemo/MainViewControll/MoreViewController.m index 6e6a2c2..e2b6abb 100644 --- a/ManagerDemo/MainViewControll/MoreViewController.m +++ b/ManagerDemo/MainViewControll/MoreViewController.m @@ -8,6 +8,8 @@ #import "MoreViewController.h" #import "MoveSocialCellView.h" +#import "ActivityCenterViewController.h" +#import "HelpCenterViewController.h" @interface MoreViewController () @end @@ -183,17 +185,37 @@ default: break; } - UIView* selectedBackgroudView = [ManagerUtil selectBackgroudViewWithFrame:CGRectMake(0, 0, 320, [self tableView:tableView heightForRowAtIndexPath:indexPath])]; - CGFloat cellHeight = [self tableView:tableView heightForRowAtIndexPath:indexPath]; - [selectedBackgroudView addSubview:[ManagerUtil lineWithColor:[UIColor grayColor] withAlpha:0.3 withFrame:CGRectMake(0, 0, 1, cellHeight) ]]; - [selectedBackgroudView addSubview:[ManagerUtil lineWithColor:[UIColor grayColor] withAlpha:0.3 withFrame:CGRectMake(tableView.frame.size.width-1, 0, 1, cellHeight)]]; - cell.selectedBackgroundView = selectedBackgroudView; +// UIView* selectedBackgroudView = [ManagerUtil selectBackgroudViewWithFrame:CGRectMake(0, 0, 320, [self tableView:tableView heightForRowAtIndexPath:indexPath])]; +// CGFloat cellHeight = [self tableView:tableView heightForRowAtIndexPath:indexPath]; +// [selectedBackgroudView addSubview:[ManagerUtil lineWithColor:[UIColor grayColor] withAlpha:0.3 withFrame:CGRectMake(0, 0, 1, cellHeight) ]]; +// [selectedBackgroudView addSubview:[ManagerUtil lineWithColor:[UIColor grayColor] withAlpha:0.3 withFrame:CGRectMake(tableView.frame.size.width-1, 0, 1, cellHeight)]]; +// cell.selectedBackgroundView = selectedBackgroudView; return cell; } -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:NO]; + switch (indexPath.section) { + case 0: + { + if (indexPath.row == 0) { + ActivityCenterViewController* activityCenterViewController = [[ActivityCenterViewController alloc] init]; + activityCenterViewController.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:activityCenterViewController animated:YES]; + } + if (indexPath.row == 2) { + HelpCenterViewController* helpCenterViewController = [[HelpCenterViewController alloc] init]; + helpCenterViewController.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:helpCenterViewController animated:YES]; + } + + } + break; + + default: + break; + } } - (void)didReceiveMemoryWarning { diff --git a/ManagerDemo/Resource/red_select_arrow@2x.png b/ManagerDemo/Resource/red_select_arrow@2x.png new file mode 100644 index 0000000..dab0488 Binary files /dev/null and b/ManagerDemo/Resource/red_select_arrow@2x.png differ