diff --git a/ManagerDemo.xcodeproj/project.pbxproj b/ManagerDemo.xcodeproj/project.pbxproj index 63c4379..79dccec 100644 --- a/ManagerDemo.xcodeproj/project.pbxproj +++ b/ManagerDemo.xcodeproj/project.pbxproj @@ -8,6 +8,10 @@ /* Begin PBXBuildFile section */ 63816045C89E43DD9F96396F /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C7B3792862C24377B1ACD469 /* libPods.a */; settings = {ATTRIBUTES = (Required, ); }; }; + A904E4A619BEF11F0014F694 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A904E4A419BEF11F0014F694 /* AboutViewController.m */; }; + A904E4A719BEF11F0014F694 /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A904E4A519BEF11F0014F694 /* AboutViewController.xib */; }; + A904E4AA19BEF18A0014F694 /* about_copyright@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A904E4A819BEF18A0014F694 /* about_copyright@2x.png */; }; + A904E4AB19BEF18A0014F694 /* about_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A904E4A919BEF18A0014F694 /* about_logo@2x.png */; }; A90BEC01199DDA9E00230242 /* WYDProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A90BEBFF199DDA9E00230242 /* WYDProductViewController.m */; }; A90BEC02199DDA9E00230242 /* WYDProductViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A90BEC00199DDA9E00230242 /* WYDProductViewController.xib */; }; A90BEC05199DDACA00230242 /* WYDInfoHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = A90BEC04199DDACA00230242 /* WYDInfoHeadView.m */; }; @@ -67,7 +71,6 @@ 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 */; }; @@ -133,7 +136,6 @@ 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 */; }; @@ -196,6 +198,11 @@ /* Begin PBXFileReference section */ 5730F11CFCAA47EB9D024FB8 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = ""; }; + A904E4A319BEF11F0014F694 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = ""; }; + A904E4A419BEF11F0014F694 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = ""; }; + A904E4A519BEF11F0014F694 /* AboutViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AboutViewController.xib; sourceTree = ""; }; + A904E4A819BEF18A0014F694 /* about_copyright@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "about_copyright@2x.png"; sourceTree = ""; }; + A904E4A919BEF18A0014F694 /* about_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "about_logo@2x.png"; sourceTree = ""; }; A90BEBFE199DDA9E00230242 /* WYDProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYDProductViewController.h; sourceTree = ""; }; A90BEBFF199DDA9E00230242 /* WYDProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYDProductViewController.m; sourceTree = ""; }; A90BEC00199DDA9E00230242 /* WYDProductViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WYDProductViewController.xib; sourceTree = ""; }; @@ -280,7 +287,6 @@ 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 = ""; }; @@ -373,7 +379,6 @@ 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 = ""; }; @@ -530,16 +535,17 @@ 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 */, + A904E4A319BEF11F0014F694 /* AboutViewController.h */, + A904E4A419BEF11F0014F694 /* AboutViewController.m */, + A904E4A519BEF11F0014F694 /* AboutViewController.xib */, ); path = MoveView; sourceTree = ""; @@ -774,6 +780,8 @@ A9233E63199CA44700DA80D8 /* more_icon_5@2x.png */, A9C69441199BB7B100B2CECE /* icon_person_take_image@2x.png */, A93F87811999BB1D00875287 /* red_line_and_shadow@2x.png */, + A904E4A819BEF18A0014F694 /* about_copyright@2x.png */, + A904E4A919BEF18A0014F694 /* about_logo@2x.png */, A9C69449199BD14D00B2CECE /* more_icon_2@2x.png */, A9C6944A199BD14D00B2CECE /* more_icon_3@2x.png */, A9C6944B199BD14D00B2CECE /* more_icon_4@2x.png */, @@ -1059,16 +1067,16 @@ A9AF6C6519949CD30076C0EE /* icon_dock_service@2x.png in Resources */, A93F87821999BB1D00875287 /* red_line_and_shadow@2x.png in Resources */, A91C6D4019AB8E9C00AEBF4D /* p2c_alert@2x.png in Resources */, + A904E4AB19BEF18A0014F694 /* about_logo@2x.png in Resources */, A9AF6C6019949CD30076C0EE /* icon_dock_mine_actived@2x.png in Resources */, A95CEA3C19B7667400D4605F /* icon_success@2x.png in Resources */, A919056C19B0882E002575DF /* AccountInfoViewController.xib in Resources */, - A9B2507019B4C75E003E8855 /* HelpCenterViewController.xib in Resources */, A9AF6C8F1994C5700076C0EE /* MJRefresh.bundle in Resources */, A97F9D1A19B592FD0073E7E6 /* login_button_s@2x.png in Resources */, A9E76DD619AB378A00C0D232 /* hk_home_icon2@2x.png in Resources */, A9AF6C6419949CD30076C0EE /* icon_dock_service_actived@2x.png in Resources */, + A904E4A719BEF11F0014F694 /* AboutViewController.xib 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 */, @@ -1083,6 +1091,7 @@ A95CEA3519B754A800D4605F /* MessageCenterViewController.xib in Resources */, A9AF6BF719947DD00076C0EE /* InfoPlist.strings in Resources */, A9AF6C761994B5890076C0EE /* icon_indicate_more_down@2x.png in Resources */, + A904E4AA19BEF18A0014F694 /* about_copyright@2x.png in Resources */, A919056319B02A8C002575DF /* icon_color_person@2x.png in Resources */, A9EAA04619986DC3001A872A /* fund_cell_label_bg_gray@2x.png in Resources */, A919055919B02A4F002575DF /* hw_verifycard_info_icon.png in Resources */, @@ -1170,6 +1179,7 @@ A9AA326019970335000BE4FB /* HomeAdView.m in Sources */, A988A900199A751500EB10AA /* FundListCell.m in Sources */, A9AF6C3D199486CA0076C0EE /* ProductListViewController.m in Sources */, + A904E4A619BEF11F0014F694 /* AboutViewController.m in Sources */, A93F87741999AA8300875287 /* ManagerUtil.m in Sources */, A9AF6C941994C5700076C0EE /* UIScrollView+Extension.m in Sources */, A9E8589D19AC2AAE001996DF /* DaiDaiTongApi.m in Sources */, diff --git a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate index 1e881e0..4a748b9 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/BaseView/BaseListViewController.xib b/ManagerDemo/Common/BaseView/BaseListViewController.xib index 4b4222f..8ebbc71 100644 --- a/ManagerDemo/Common/BaseView/BaseListViewController.xib +++ b/ManagerDemo/Common/BaseView/BaseListViewController.xib @@ -18,7 +18,7 @@ - + diff --git a/ManagerDemo/MainView/MoveView/AboutViewController.h b/ManagerDemo/MainView/MoveView/AboutViewController.h new file mode 100644 index 0000000..ee995ee --- /dev/null +++ b/ManagerDemo/MainView/MoveView/AboutViewController.h @@ -0,0 +1,14 @@ +// +// AboutViewController.h +// ManagerDemo +// +// Created by xmfish on 14-9-9. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import + +@interface AboutViewController : UIViewController +@property (weak, nonatomic) IBOutlet UITableView *tableView; + +@end diff --git a/ManagerDemo/MainView/MoveView/AboutViewController.m b/ManagerDemo/MainView/MoveView/AboutViewController.m new file mode 100644 index 0000000..1609745 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/AboutViewController.m @@ -0,0 +1,91 @@ +// +// AboutViewController.m +// ManagerDemo +// +// Created by xmfish on 14-9-9. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "AboutViewController.h" + +@interface AboutViewController () + +@end + +@implementation AboutViewController + +- (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; + self.tableView.layer.borderWidth = 1; + self.tableView.layer.borderColor = [Touch_BackGroudColor CGColor]; +} + +#pragma mark UITableViewDelegate +-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 1; +} +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 5; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return 30; +} +-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString* cellIdentifier = @"cellIdentifier"; + UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; + if (!cell) { + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier]; + } + cell.textLabel.font = Font_Black(12); + cell.textLabel.textColor = [UIColor grayColor]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + switch (indexPath.row) { + case 0: + cell.textLabel.text = @"欢迎页"; + break; + case 1: + cell.textLabel.text = @"客服热线:400-400-40400"; + break; + case 2: + cell.textLabel.text = @"客服qq群:12355552"; + break; + case 3: + cell.textLabel.text = @"客服邮箱:kefu@yingyinglicai.com"; + break; + case 4: + cell.textLabel.text = @"www.yingyinglicai.com"; + break; + default: + break; + } + return cell; +} +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + [tableView deselectRowAtIndexPath:indexPath animated:NO]; +} +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end diff --git a/ManagerDemo/MainView/MoveView/AboutViewController.xib b/ManagerDemo/MainView/MoveView/AboutViewController.xib new file mode 100644 index 0000000..8cee8f7 --- /dev/null +++ b/ManagerDemo/MainView/MoveView/AboutViewController.xib @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.h b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.h index 58e6387..64da639 100644 --- a/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.h +++ b/ManagerDemo/MainView/MoveView/ActivityCenterTableViewCell.h @@ -9,6 +9,16 @@ #import @interface ActivityCenterTableViewCell : UITableViewCell +{ + NSString* _activeUrl; + NSString* _state; + NSString* _activeTitle; + NSInteger _activeType; +} +@property (strong, nonatomic) NSString* activeUrl; +@property (strong, nonatomic) NSString* state; +@property (strong, nonatomic) NSString* activeTitle; +@property (assign, nonatomic) NSInteger activeType; @property (weak, nonatomic) IBOutlet UIImageView *infoImageView; @property (weak, nonatomic) IBOutlet UILabel *infoLabel; diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.h b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.h index 39bd35b..9669f8d 100644 --- a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.h +++ b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.h @@ -7,8 +7,7 @@ // #import - -@interface ActivityCenterViewController : UIViewController -@property (weak, nonatomic) IBOutlet UITableView *tableView; +#import "BaseListViewController.h" +@interface ActivityCenterViewController : BaseListViewController @end diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.m b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.m index 2d99a6e..8fb2795 100644 --- a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.m +++ b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.m @@ -8,6 +8,7 @@ #import "ActivityCenterViewController.h" #import "ActivityCenterTableViewCell.h" +#import "SVWebViewController.h" @interface ActivityCenterViewController () @end @@ -28,15 +29,23 @@ [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; + self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; } +-(void)loadDataWithDic:(NSDictionary *)dic withType:(NSString *)typeStr WithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock +{ + + [super loadDataWithDic:nil withType:@"activeInfoQuery.do" WithcompletionBlock:^(id jsonRes){ + [_infoArray addObjectsFromArray:[jsonRes objectForKey:@"datas"]]; + + }failedBlock:^(NSError *error){ + + }]; +} #pragma mark UITableViewDelegate -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 10; + return _infoArray.count; } -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { @@ -44,6 +53,9 @@ } -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { + if (section == _infoArray.count-1) { + return 10.0; + } return 1.0; } -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section @@ -57,15 +69,28 @@ -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { static NSString *activityCenterTableViewCell = @"ActivityCenterTableViewCell"; - UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:activityCenterTableViewCell]; + ActivityCenterTableViewCell* 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.selectionStyle = UITableViewCellSelectionStyleNone; cell.backgroundColor = [UIColor clearColor]; + cell.activeUrl = [[_infoArray objectAtIndex:indexPath.section] objectForKey:@"activeUrl"]; + [cell.infoImageView sd_setImageWithURL:[NSURL URLWithString:[[_infoArray objectAtIndex:indexPath.section] objectForKey:@"activePoster"]]]; + cell.infoLabel.text = [[_infoArray objectAtIndex:indexPath.section] objectForKey:@"activeDesc"]; + cell.state = [[_infoArray objectAtIndex:indexPath.section] objectForKey:@"state"]; + cell.activeType = [[[_infoArray objectAtIndex:indexPath.section] objectForKey:@"activeType"] integerValue]; + cell.activeTitle = [[_infoArray objectAtIndex:indexPath.section] objectForKey:@"activeTitle"]; return cell; } +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + SVWebViewController* svWebViewController = [[SVWebViewController alloc] initWithURL:[NSURL URLWithString:((ActivityCenterTableViewCell*)[self tableView:tableView cellForRowAtIndexPath:indexPath]).activeUrl]]; + [self.navigationController pushViewController:svWebViewController animated:YES]; +} - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; diff --git a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.xib b/ManagerDemo/MainView/MoveView/ActivityCenterViewController.xib deleted file mode 100644 index 7f28075..0000000 --- a/ManagerDemo/MainView/MoveView/ActivityCenterViewController.xib +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.h b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.h index f092ad2..d979d2c 100644 --- a/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.h +++ b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.h @@ -9,7 +9,13 @@ #import @interface HelpCenterTableViewCell : UITableViewCell - +{ + BOOL _top; + NSString* _helpUrl; +} +@property (strong, nonatomic)NSString* helpUrl; +@property (assign, nonatomic)BOOL top; @property (weak, nonatomic) IBOutlet UITextView *infoTextView; +@property (weak, nonatomic) IBOutlet UILabel *helpTitle; @end diff --git a/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.xib b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.xib index 3919c86..7a21f34 100644 --- a/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.xib +++ b/ManagerDemo/MainView/MoveView/HelpCenterTableViewCell.xib @@ -17,13 +17,13 @@ - + diff --git a/ManagerDemo/MainView/MoveView/HelpCenterViewController.h b/ManagerDemo/MainView/MoveView/HelpCenterViewController.h index 8271c5c..33d7cfb 100644 --- a/ManagerDemo/MainView/MoveView/HelpCenterViewController.h +++ b/ManagerDemo/MainView/MoveView/HelpCenterViewController.h @@ -7,8 +7,7 @@ // #import - -@interface HelpCenterViewController : UIViewController -@property (weak, nonatomic) IBOutlet UITableView *tableView; +#import "BaseListViewController.h" +@interface HelpCenterViewController : BaseListViewController @end diff --git a/ManagerDemo/MainView/MoveView/HelpCenterViewController.m b/ManagerDemo/MainView/MoveView/HelpCenterViewController.m index 2ebab3f..872a8dc 100644 --- a/ManagerDemo/MainView/MoveView/HelpCenterViewController.m +++ b/ManagerDemo/MainView/MoveView/HelpCenterViewController.m @@ -8,6 +8,7 @@ #import "HelpCenterViewController.h" #import "HelpCenterTableViewCell.h" +#import "SVWebViewController.h" @interface HelpCenterViewController () @end @@ -27,18 +28,34 @@ { [super viewDidLoad]; // Do any additional setup after loading the view from its nib. - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSelectionStyleNone; + self.navigationItem.title = @"帮助中心"; + self.tableView.separatorStyle = UITableViewCellSelectionStyleNone; } +-(void)loadDataWithDic:(NSDictionary *)dic withType:(NSString *)typeStr WithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock +{ + [super loadDataWithDic:nil withType:@"helpquery.do" WithcompletionBlock:^(id jsonRes){ + [_infoArray addObjectsFromArray:[jsonRes objectForKey:@"datas"]]; + + }failedBlock:^(NSError *error){ + + }]; +} +#pragma mark UITableViewDelegate -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 10; + NSInteger count = 0; + for (int i=0; i<_infoArray.count; i++) { + if ([[[_infoArray objectAtIndex:i] objectForKey:@"top"]boolValue]) { + count++; + } + } + return count+1; } -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 9) { - return 6; + if (section == [self numberOfSectionsInTableView:tableView]-1) { + + return _infoArray.count-[self numberOfSectionsInTableView:tableView]; } return 1; } @@ -48,11 +65,14 @@ } -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { + if (section == [self numberOfSectionsInTableView:tableView]-1) { + return 10.0; + } return 1.0; } -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 9) { + if (indexPath.section == [self numberOfSectionsInTableView:tableView]-1) { return 45; } return 90; @@ -60,7 +80,7 @@ -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { static NSString *cellIdentifier = @"HelpCenterTableViewCell"; - UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; + HelpCenterTableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; if (cell == nil) { UINib *nib = [UINib nibWithNibName:@"HelpCenterTableViewCell" bundle:nil]; [tableView registerNib:nib forCellReuseIdentifier:cellIdentifier]; @@ -68,14 +88,21 @@ } cell.backgroundColor = [UIColor clearColor]; cell.selectionStyle = UITableViewCellSelectionStyleNone; - if (indexPath.section == 9) { + if (indexPath.section == [self numberOfSectionsInTableView:tableView]-1) { [((HelpCenterTableViewCell *)cell).infoTextView setHidden:YES]; }else{ [((HelpCenterTableViewCell *)cell).infoTextView setHidden:NO]; } - + cell.helpTitle.text = [[_infoArray objectAtIndex:indexPath.section+indexPath.row] objectForKey:@"title"]; + cell.helpUrl = [[_infoArray objectAtIndex:indexPath.section+indexPath.row] objectForKey:@"url"]; + cell.infoTextView.text = [[_infoArray objectAtIndex:indexPath.section+indexPath.row] objectForKey:@"titleDesc"]; return cell; } +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + SVWebViewController* svWebViewController = [[SVWebViewController alloc] initWithURL:[NSURL URLWithString:((HelpCenterTableViewCell*)[self tableView:tableView cellForRowAtIndexPath:indexPath]).helpUrl]]; + [self.navigationController pushViewController:svWebViewController animated:YES]; +} - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; diff --git a/ManagerDemo/MainView/MoveView/HelpCenterViewController.xib b/ManagerDemo/MainView/MoveView/HelpCenterViewController.xib deleted file mode 100644 index 240c565..0000000 --- a/ManagerDemo/MainView/MoveView/HelpCenterViewController.xib +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ManagerDemo/MainView/MyView/DailyProfitViewController.m b/ManagerDemo/MainView/MyView/DailyProfitViewController.m index efc9a81..43025ea 100644 --- a/ManagerDemo/MainView/MyView/DailyProfitViewController.m +++ b/ManagerDemo/MainView/MyView/DailyProfitViewController.m @@ -32,7 +32,7 @@ // Do any additional setup after loading the view. _topCell = [DatailProfitTopTableViewCell instance]; - [self headerBeginRefreshing]; +// [self headerBeginRefreshing]; } -(void)loadDataWithDic:(NSDictionary *)dic withType:(NSString *)typeStr WithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock { diff --git a/ManagerDemo/MainViewControll/MoreViewController.m b/ManagerDemo/MainViewControll/MoreViewController.m index aca36d8..ddbd334 100644 --- a/ManagerDemo/MainViewControll/MoreViewController.m +++ b/ManagerDemo/MainViewControll/MoreViewController.m @@ -11,6 +11,7 @@ #import "ActivityCenterViewController.h" #import "HelpCenterViewController.h" #import "MessageCenterViewController.h" +#import "AboutViewController.h" @interface MoreViewController () @end @@ -146,17 +147,17 @@ switch (indexPath.row) { case 0: { - cell.textLabel.text = @"活动中心"; + cell.textLabel.text = @"检查更新"; cell.imageView.image = [UIImage imageNamed:@"more_icon_7"]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; cell.detailTextLabel.textColor = [UIColor grayColor]; - cell.detailTextLabel.text = @"有什么我能帮助你的嘛？"; + cell.detailTextLabel.text = [NSString stringWithFormat:@"当前版本v%@", [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey]]; } break; case 1: { - cell.textLabel.text = @"帮助中心"; + cell.textLabel.text = @"关于盈盈"; cell.imageView.image = [UIImage imageNamed:@"more_icon_8"]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; @@ -213,7 +214,15 @@ } break; - + case 2: + { + if (indexPath.row == 1) { + AboutViewController* aboutViewController = [[AboutViewController alloc] init]; + aboutViewController.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:aboutViewController animated:YES]; + } + } + break; default: break; } diff --git a/ManagerDemo/Resource/about_copyright@2x.png b/ManagerDemo/Resource/about_copyright@2x.png new file mode 100644 index 0000000..6c9757c Binary files /dev/null and b/ManagerDemo/Resource/about_copyright@2x.png differ diff --git a/ManagerDemo/Resource/about_logo@2x.png b/ManagerDemo/Resource/about_logo@2x.png new file mode 100644 index 0000000..ec0c54b Binary files /dev/null and b/ManagerDemo/Resource/about_logo@2x.png differ