diff --git a/ManagerDemo.xcodeproj/project.pbxproj b/ManagerDemo.xcodeproj/project.pbxproj index 125f2f5..7f895c0 100644 --- a/ManagerDemo.xcodeproj/project.pbxproj +++ b/ManagerDemo.xcodeproj/project.pbxproj @@ -29,6 +29,8 @@ A91C6D4019AB8E9C00AEBF4D /* p2c_alert@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C6D3D19AB8E9C00AEBF4D /* p2c_alert@2x.png */; }; A91C6D4119AB8E9C00AEBF4D /* p2c_datesum@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C6D3E19AB8E9C00AEBF4D /* p2c_datesum@2x.png */; }; A91C6D4219AB8E9C00AEBF4D /* p2c_safeicon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C6D3F19AB8E9C00AEBF4D /* p2c_safeicon@2x.png */; }; + A9202B8719C95B97009932C2 /* ProFitCaculateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9202B8519C95B97009932C2 /* ProFitCaculateViewController.m */; }; + A9202B8819C95B97009932C2 /* ProFitCaculateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9202B8619C95B97009932C2 /* ProFitCaculateViewController.xib */; }; A9233E64199CA44700DA80D8 /* more_icon_5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9233E63199CA44700DA80D8 /* more_icon_5@2x.png */; }; A93320C219BFE8090090D640 /* MyTotalAmountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93320C019BFE8090090D640 /* MyTotalAmountViewController.m */; }; A93320C319BFE8090090D640 /* MyTotalAmountViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A93320C119BFE8090090D640 /* MyTotalAmountViewController.xib */; }; @@ -61,6 +63,8 @@ A95CEA3C19B7667400D4605F /* icon_success@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A95CEA3B19B7667400D4605F /* icon_success@2x.png */; }; A95CEA4019B766F400D4605F /* MessageDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A95CEA3E19B766F400D4605F /* MessageDetailViewController.m */; }; A95CEA4119B766F400D4605F /* MessageDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A95CEA3F19B766F400D4605F /* MessageDetailViewController.xib */; }; + A95EAEE319C9BE2E00D1592B /* FundCaculateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A95EAEE119C9BE2E00D1592B /* FundCaculateViewController.m */; }; + A95EAEE419C9BE2E00D1592B /* FundCaculateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A95EAEE219C9BE2E00D1592B /* FundCaculateViewController.xib */; }; A96F2A7C199D008200608237 /* UIButton+Bootstrap.m in Sources */ = {isa = PBXBuildFile; fileRef = A96F2A7B199D008200608237 /* UIButton+Bootstrap.m */; }; A96F2A7F199D01C000608237 /* NSString+FontAwesome.m in Sources */ = {isa = PBXBuildFile; fileRef = A96F2A7E199D01C000608237 /* NSString+FontAwesome.m */; }; A97F9D1519B592E90073E7E6 /* get_ver_button_gry@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97F9D1219B592E90073E7E6 /* get_ver_button_gry@2x.png */; }; @@ -87,6 +91,11 @@ A9971D7519B8BC410079F143 /* DailyProfitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9971D7419B8BC410079F143 /* DailyProfitViewController.m */; }; A9971D7919B8C39C0079F143 /* DatailProfitTopTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9971D7719B8C39C0079F143 /* DatailProfitTopTableViewCell.m */; }; A9971D7A19B8C39C0079F143 /* DatailProfitTopTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9971D7819B8C39C0079F143 /* DatailProfitTopTableViewCell.xib */; }; + A99FDAFE19CA683100D2B3D3 /* DaiDaiTongTestApi.m in Sources */ = {isa = PBXBuildFile; fileRef = A99FDAFD19CA683100D2B3D3 /* DaiDaiTongTestApi.m */; }; + A99FDB0219CAACA400D2B3D3 /* InputVerificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A99FDB0019CAACA400D2B3D3 /* InputVerificationViewController.m */; }; + A99FDB0319CAACA400D2B3D3 /* InputVerificationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A99FDB0119CAACA400D2B3D3 /* InputVerificationViewController.xib */; }; + A99FDB0A19CAC16E00D2B3D3 /* SetPassWordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A99FDB0819CAC16E00D2B3D3 /* SetPassWordViewController.m */; }; + A99FDB0B19CAC16E00D2B3D3 /* SetPassWordViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A99FDB0919CAC16E00D2B3D3 /* SetPassWordViewController.xib */; }; A9A7948319C8AC4E00516C60 /* FundAmountTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9A7948119C8AC4E00516C60 /* FundAmountTableViewCell.m */; }; A9A7948419C8AC4E00516C60 /* FundAmountTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A7948219C8AC4E00516C60 /* FundAmountTableViewCell.xib */; }; A9AA325A199702DB000BE4FB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9AA3259199702DB000BE4FB /* Images.xcassets */; }; @@ -236,6 +245,9 @@ A91C6D3D19AB8E9C00AEBF4D /* p2c_alert@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "p2c_alert@2x.png"; sourceTree = ""; }; A91C6D3E19AB8E9C00AEBF4D /* p2c_datesum@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "p2c_datesum@2x.png"; sourceTree = ""; }; A91C6D3F19AB8E9C00AEBF4D /* p2c_safeicon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "p2c_safeicon@2x.png"; sourceTree = ""; }; + A9202B8419C95B97009932C2 /* ProFitCaculateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProFitCaculateViewController.h; sourceTree = ""; }; + A9202B8519C95B97009932C2 /* ProFitCaculateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProFitCaculateViewController.m; sourceTree = ""; }; + A9202B8619C95B97009932C2 /* ProFitCaculateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProFitCaculateViewController.xib; sourceTree = ""; }; A9233E63199CA44700DA80D8 /* more_icon_5@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "more_icon_5@2x.png"; sourceTree = ""; }; A93320BF19BFE8090090D640 /* MyTotalAmountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTotalAmountViewController.h; sourceTree = ""; }; A93320C019BFE8090090D640 /* MyTotalAmountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyTotalAmountViewController.m; sourceTree = ""; }; @@ -286,6 +298,9 @@ A95CEA3D19B766F400D4605F /* MessageDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageDetailViewController.h; sourceTree = ""; }; A95CEA3E19B766F400D4605F /* MessageDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageDetailViewController.m; sourceTree = ""; }; A95CEA3F19B766F400D4605F /* MessageDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageDetailViewController.xib; sourceTree = ""; }; + A95EAEE019C9BE2E00D1592B /* FundCaculateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FundCaculateViewController.h; sourceTree = ""; }; + A95EAEE119C9BE2E00D1592B /* FundCaculateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FundCaculateViewController.m; sourceTree = ""; }; + A95EAEE219C9BE2E00D1592B /* FundCaculateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FundCaculateViewController.xib; sourceTree = ""; }; A96F2A7A199D008200608237 /* UIButton+Bootstrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+Bootstrap.h"; sourceTree = ""; }; A96F2A7B199D008200608237 /* UIButton+Bootstrap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Bootstrap.m"; sourceTree = ""; }; A96F2A7D199D01C000608237 /* NSString+FontAwesome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+FontAwesome.h"; sourceTree = ""; }; @@ -325,6 +340,14 @@ A9971D7619B8C39C0079F143 /* DatailProfitTopTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatailProfitTopTableViewCell.h; sourceTree = ""; }; A9971D7719B8C39C0079F143 /* DatailProfitTopTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatailProfitTopTableViewCell.m; sourceTree = ""; }; A9971D7819B8C39C0079F143 /* DatailProfitTopTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DatailProfitTopTableViewCell.xib; sourceTree = ""; }; + A99FDAFC19CA683100D2B3D3 /* DaiDaiTongTestApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DaiDaiTongTestApi.h; sourceTree = ""; }; + A99FDAFD19CA683100D2B3D3 /* DaiDaiTongTestApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DaiDaiTongTestApi.m; sourceTree = ""; }; + A99FDAFF19CAACA400D2B3D3 /* InputVerificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputVerificationViewController.h; sourceTree = ""; }; + A99FDB0019CAACA400D2B3D3 /* InputVerificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputVerificationViewController.m; sourceTree = ""; }; + A99FDB0119CAACA400D2B3D3 /* InputVerificationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InputVerificationViewController.xib; sourceTree = ""; }; + A99FDB0719CAC16E00D2B3D3 /* SetPassWordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetPassWordViewController.h; sourceTree = ""; }; + A99FDB0819CAC16E00D2B3D3 /* SetPassWordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SetPassWordViewController.m; sourceTree = ""; }; + A99FDB0919CAC16E00D2B3D3 /* SetPassWordViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SetPassWordViewController.xib; sourceTree = ""; }; A9A7948019C8AC4E00516C60 /* FundAmountTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FundAmountTableViewCell.h; sourceTree = ""; }; A9A7948119C8AC4E00516C60 /* FundAmountTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FundAmountTableViewCell.m; sourceTree = ""; }; A9A7948219C8AC4E00516C60 /* FundAmountTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FundAmountTableViewCell.xib; sourceTree = ""; }; @@ -518,6 +541,12 @@ A9B9F14919AF1493001A1315 /* OtherProductInfoViewController.h */, A9B9F14A19AF1493001A1315 /* OtherProductInfoViewController.m */, A9B9F14B19AF1493001A1315 /* OtherProductInfoViewController.xib */, + A9202B8419C95B97009932C2 /* ProFitCaculateViewController.h */, + A9202B8519C95B97009932C2 /* ProFitCaculateViewController.m */, + A9202B8619C95B97009932C2 /* ProFitCaculateViewController.xib */, + A95EAEE019C9BE2E00D1592B /* FundCaculateViewController.h */, + A95EAEE119C9BE2E00D1592B /* FundCaculateViewController.m */, + A95EAEE219C9BE2E00D1592B /* FundCaculateViewController.xib */, ); path = ProductView; sourceTree = ""; @@ -947,6 +976,8 @@ children = ( A9E8589B19AC2AAE001996DF /* DaiDaiTongApi.h */, A9E8589C19AC2AAE001996DF /* DaiDaiTongApi.m */, + A99FDAFC19CA683100D2B3D3 /* DaiDaiTongTestApi.h */, + A99FDAFD19CA683100D2B3D3 /* DaiDaiTongTestApi.m */, ); path = DaiDaiTongApi; sourceTree = ""; @@ -969,6 +1000,12 @@ A97F9D2019B595550073E7E6 /* InputPassWordViewController.h */, A97F9D2119B595550073E7E6 /* InputPassWordViewController.m */, A97F9D2219B595550073E7E6 /* InputPassWordViewController.xib */, + A99FDAFF19CAACA400D2B3D3 /* InputVerificationViewController.h */, + A99FDB0019CAACA400D2B3D3 /* InputVerificationViewController.m */, + A99FDB0119CAACA400D2B3D3 /* InputVerificationViewController.xib */, + A99FDB0719CAC16E00D2B3D3 /* SetPassWordViewController.h */, + A99FDB0819CAC16E00D2B3D3 /* SetPassWordViewController.m */, + A99FDB0919CAC16E00D2B3D3 /* SetPassWordViewController.xib */, ); path = LoginView; sourceTree = ""; @@ -1087,11 +1124,13 @@ A9C69451199BD14D00B2CECE /* more_icon_2@2x.png in Resources */, A9EAA04A19986E8C001A872A /* pull_arrow_down_black@2x.png in Resources */, A9AF6C6119949CD30076C0EE /* icon_dock_mine@2x.png in Resources */, + A99FDB0319CAACA400D2B3D3 /* InputVerificationViewController.xib in Resources */, A9B9F14D19AF1493001A1315 /* OtherProductInfoViewController.xib in Resources */, A9EAA04819986DC3001A872A /* fund_cell_label_bg_red@2x.png in Resources */, A91C6D4219AB8E9C00AEBF4D /* p2c_safeicon@2x.png in Resources */, A9C6945A199BD16000B2CECE /* more_icon_1@2x.png in Resources */, A9EC95B819B54F6E00681678 /* LoginViewController.xib in Resources */, + A99FDB0B19CAC16E00D2B3D3 /* SetPassWordViewController.xib in Resources */, A9EAA05F1998BB82001A872A /* about_dot@2x.png in Resources */, A93320C819C0227F0090D640 /* MyHoldAmountViewController.xib in Resources */, A9AF6C5E19949CD30076C0EE /* icon_dock_home_actived@2x.png in Resources */, @@ -1111,6 +1150,7 @@ A9EAA0501998787B001A872A /* hk_home_center_cover@2x.png in Resources */, A9C0540619ADBCB2002331A5 /* FundProductInfoViewController.xib in Resources */, A9AF6C6719949CD30076C0EE /* icon_dock_session_actived@2x.png in Resources */, + A9202B8819C95B97009932C2 /* ProFitCaculateViewController.xib in Resources */, A9EC95BB19B54FDB00681678 /* textField_cancel_ios7_s.png in Resources */, A9B2507719B4C8B2003E8855 /* red_select_arrow@2x.png in Resources */, A9AF6C771994B5890076C0EE /* icon_indicate_more@2x.png in Resources */, @@ -1141,6 +1181,7 @@ A90BEC07199DDAFB00230242 /* WYDInfoHeadView.xib in Resources */, A97F9D1619B592E90073E7E6 /* get_ver_button_red_s@2x.png in Resources */, A9B2507519B4C796003E8855 /* HelpCenterTableViewCell.xib in Resources */, + A95EAEE419C9BE2E00D1592B /* FundCaculateViewController.xib in Resources */, A919056119B02A83002575DF /* icon_color_name@2x.png in Resources */, A95CEA3519B754A800D4605F /* MessageCenterViewController.xib in Resources */, A9AF6BF719947DD00076C0EE /* InfoPlist.strings in Resources */, @@ -1231,7 +1272,9 @@ A9B9F14C19AF1493001A1315 /* OtherProductInfoViewController.m in Sources */, A9EAA05619988C55001A872A /* MRCircularProgressView.m in Sources */, A9AF6C961994C5700076C0EE /* UIView+Extension.m in Sources */, + A99FDB0219CAACA400D2B3D3 /* InputVerificationViewController.m in Sources */, A9AF6C921994C5700076C0EE /* MJRefreshFooterView.m in Sources */, + A9202B8719C95B97009932C2 /* ProFitCaculateViewController.m in Sources */, A93F87CA1999E62000875287 /* AdjustableUILable.m in Sources */, A93F8803199A077F00875287 /* LoanListCell.m in Sources */, A9AA326019970335000BE4FB /* HomeAdView.m in Sources */, @@ -1277,7 +1320,9 @@ A95CEA3919B755C000D4605F /* MessageCenterTableViewCell.m in Sources */, A9F1E18619ACB63100B6A441 /* DTCoreTextTableViewCell.m in Sources */, A9AF6BF919947DD00076C0EE /* main.m in Sources */, + A99FDAFE19CA683100D2B3D3 /* DaiDaiTongTestApi.m in Sources */, A90BEC05199DDACA00230242 /* WYDInfoHeadView.m in Sources */, + A95EAEE319C9BE2E00D1592B /* FundCaculateViewController.m in Sources */, A93F877C1999ACF600875287 /* MBProgressHUD+Util.m in Sources */, A9C69446199BBEB200B2CECE /* MyTotalProfitCellView.m in Sources */, A9AF6C33199484200076C0EE /* HomeViewController.m in Sources */, @@ -1290,6 +1335,7 @@ A9C0540519ADBCB2002331A5 /* FundProductInfoViewController.m in Sources */, A94FE51E199C9C3C00626DE5 /* MoveSocialCellView.m in Sources */, A93F8806199A077F00875287 /* OtherListViewController.m in Sources */, + A99FDB0A19CAC16E00D2B3D3 /* SetPassWordViewController.m in Sources */, A9AF6C2E199483520076C0EE /* MainViewController.m in Sources */, A9EE5EE719C20CDA004E7A2C /* WYDAmountTableViewCell.m in Sources */, A9AF6C42199498C40076C0EE /* MyViewController.m in Sources */, diff --git a/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate b/ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate index 11da7c4..968960e 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/DaiDaiTongApi/DaiDaiTongApi.h b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.h index 524ca73..9477510 100644 --- a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.h +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.h @@ -22,10 +22,21 @@ typedef void (^FailedBlock) (NSError *error); * @param apiType api接口 * @param completionBlock 请求完成 * @param failedBlock 请求失败 - * + * post请求 * @return MKNetworkOperation */ +-(MKNetworkOperation*)postApiWithParam:(NSDictionary*)param withApiType:(NSString*) apiType completionBlock:(CompletionBlock) completionBlock failedBlock:(FailedBlock)failedBlock; +///** +// * api +// * @param param 参数 +// * @param apiType api接口 +// * @param completionBlock 请求完成 +// * @param failedBlock 请求失败 +// * get请求 +// * @return MKNetworkOperation +// */ -(MKNetworkOperation*)getApiWithParam:(NSDictionary*)param withApiType:(NSString*) apiType completionBlock:(CompletionBlock) completionBlock failedBlock:(FailedBlock)failedBlock; + /** * 获取首页广告 * diff --git a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m index 85faae7..86671da 100644 --- a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongApi.m @@ -64,6 +64,22 @@ return [self operationWithPath:path params:dic httpMethod:@"POST" ssl:YES]; } -(MKNetworkOperation*)getApiWithParam:(NSDictionary *)param withApiType:(NSString *)apiType completionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock +{ + MKNetworkOperation* op = [self getWithPath:apiType params:param]; + + [op addCompletionHandler:^(MKNetworkOperation *completedOperation) { + completionBlock(completedOperation.responseJSON); + + } errorHandler:^(MKNetworkOperation *completedOperation, NSError *error) { + DLog(@"%@", error); + failedBlock(error); + }]; + + [self enqueueOperation:op forceReload:YES]; + + return op; +} +-(MKNetworkOperation*)postApiWithParam:(NSDictionary *)param withApiType:(NSString *)apiType completionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock { MKNetworkOperation* op = [self postWithPath:apiType params:param]; diff --git a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.h b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.h new file mode 100644 index 0000000..f790ac4 --- /dev/null +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.h @@ -0,0 +1,39 @@ +// +// DaiDaiTongTestApi.h +// ManagerDemo +// +// Created by xmfish on 14-9-18. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "MKNetworkEngine.h" + +@interface DaiDaiTongTestApi : MKNetworkEngine + +typedef void (^CompletionBlock) (id jsonRes); +typedef void (^FailedBlock) (NSError *error); + ++(DaiDaiTongTestApi*)shareInstance; + + +/** + * api + * @param param 参数 + * @param apiType api接口 + * @param completionBlock 请求完成 + * @param failedBlock 请求失败 + * post请求 + * @return MKNetworkOperation + */ +-(MKNetworkOperation*)postApiWithParam:(NSDictionary*)param withApiType:(NSString*) apiType completionBlock:(CompletionBlock) completionBlock failedBlock:(FailedBlock)failedBlock; +///** +// * api +// * @param param 参数 +// * @param apiType api接口 +// * @param completionBlock 请求完成 +// * @param failedBlock 请求失败 +// * get请求 +// * @return MKNetworkOperation +// */ +-(MKNetworkOperation*)getApiWithParam:(NSDictionary*)param withApiType:(NSString*) apiType completionBlock:(CompletionBlock) completionBlock failedBlock:(FailedBlock)failedBlock; +@end diff --git a/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.m b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.m new file mode 100644 index 0000000..8048bab --- /dev/null +++ b/ManagerDemo/Common/DaiDaiTongApi/DaiDaiTongTestApi.m @@ -0,0 +1,99 @@ +// +// DaiDaiTongTestApi.m +// ManagerDemo +// +// Created by xmfish on 14-9-18. +// Copyright (c) 2014年 ash. All rights reserved. +// + +#import "DaiDaiTongTestApi.h" + +@implementation DaiDaiTongTestApi + ++(DaiDaiTongTestApi*)shareInstance +{ + static DaiDaiTongTestApi* shareInstance = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + NSMutableDictionary *postHeaderFields = [NSMutableDictionary dictionary]; + [postHeaderFields setValue:@"application/json;charset=utf-8" forKey:@"Content-Type"]; + [postHeaderFields setValue:@"gzip,deflate" forKey:@"Accept-Encoding"]; + shareInstance = [[super alloc] initWithHostName:DaiDaiTong_Api_Test_URL customHeaderFields:postHeaderFields]; + }); + return shareInstance; +} + +-(MKNetworkOperation*)getWithPath:(NSString*)path params:(NSDictionary *)params +{ + NSMutableDictionary* dic = nil; + if (params) { + dic = [[NSMutableDictionary alloc] initWithDictionary:params]; + }else{ + dic = [[NSMutableDictionary alloc] init]; + } + NSDate* timeDate = [NSDate dateWithTimeIntervalSinceNow:0]; + NSTimeInterval timeInterval =[timeDate timeIntervalSince1970]*1000; + NSString *timeString = [NSString stringWithFormat:@"%f", timeInterval];//转为字符型 + [dic setObject:timeString forKey:@"timeStamp"]; + if ([ManagerUser shareInstance].token.length > 0) { + [dic setObject:[ManagerUser shareInstance].token forKey:@"token"]; + } + NSError *parseError = nil; + NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError]; + NSString* tempStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + NSDictionary* tempDic = [NSDictionary dictionaryWithObject:tempStr forKey:@"jsonData"]; + return [self operationWithPath:path params:tempDic httpMethod:@"GET" ssl:NO];; +} +-(MKNetworkOperation*)postWithPath:(NSString*)path params:(NSDictionary *)params +{ + NSMutableDictionary* dic = nil; + if (params) { + dic = [[NSMutableDictionary alloc] initWithDictionary:params]; + }else{ + dic = [[NSMutableDictionary alloc] init]; + } + NSDate* timeDate = [NSDate dateWithTimeIntervalSinceNow:0]; + NSTimeInterval timeInterval =[timeDate timeIntervalSince1970]*1000; + NSString *timeString = [NSString stringWithFormat:@"%f", timeInterval];//转为字符型 + [dic setObject:timeString forKey:@"timeStamp"]; + NSError *parseError = nil; + NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError]; + NSString* tempStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + + NSDictionary* tempDic = [NSDictionary dictionaryWithObject:tempStr forKey:@"jsonData"]; + return [self operationWithPath:path params:tempDic httpMethod:@"POST" ssl:NO]; +} +-(MKNetworkOperation*)getApiWithParam:(NSDictionary *)param withApiType:(NSString *)apiType completionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock +{ + MKNetworkOperation* op = [self getWithPath:apiType params:param]; + + [op addCompletionHandler:^(MKNetworkOperation *completedOperation) { + completionBlock(completedOperation.responseJSON); + + } errorHandler:^(MKNetworkOperation *completedOperation, NSError *error) { + DLog(@"%@", error); + + failedBlock(error); + }]; + + [self enqueueOperation:op forceReload:YES]; + + return op; +} +-(MKNetworkOperation*)postApiWithParam:(NSDictionary *)param withApiType:(NSString *)apiType completionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock +{ + MKNetworkOperation* op = [self postWithPath:apiType params:param]; + + [op addCompletionHandler:^(MKNetworkOperation *completedOperation) { + completionBlock(completedOperation.responseJSON); + + } errorHandler:^(MKNetworkOperation *completedOperation, NSError *error) { + DLog(@"%@", error); + failedBlock(error); + }]; + + [self enqueueOperation:op forceReload:YES]; + + return op; +} +@end diff --git a/ManagerDemo/Common/ManagerConstants.h b/ManagerDemo/Common/ManagerConstants.h index 7e6d41e..8e09a12 100644 --- a/ManagerDemo/Common/ManagerConstants.h +++ b/ManagerDemo/Common/ManagerConstants.h @@ -15,6 +15,7 @@ */ #define DaiDaiTong_API_URL @"mobi.yingyinglicai.com:8443/front" +#define DaiDaiTong_Api_Test_URL @"daidaitong.imwanmei.com:8080/mobile" /** * 系统版本 */ diff --git a/ManagerDemo/Common/ManagerUser.m b/ManagerDemo/Common/ManagerUser.m index 6aa500e..d5c318c 100644 --- a/ManagerDemo/Common/ManagerUser.m +++ b/ManagerDemo/Common/ManagerUser.m @@ -19,4 +19,15 @@ }); return shareInstance; } + +-(void)setIsLogin:(BOOL)isLogin +{ + _isLogin = isLogin; + [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:_isLogin] forKey:@"LoginState"]; +} +-(BOOL)isLogin +{ + _isLogin = [[[NSUserDefaults standardUserDefaults] objectForKey:@"LoginState"] boolValue]; + return _isLogin; +} @end diff --git a/ManagerDemo/Common/ManagerUtil.h b/ManagerDemo/Common/ManagerUtil.h index d5af23b..a99a050 100644 --- a/ManagerDemo/Common/ManagerUtil.h +++ b/ManagerDemo/Common/ManagerUtil.h @@ -18,6 +18,11 @@ * @param type type description */ +(void)presentLoginView; + +//获取view的viewcontroller ++(UIViewController*)getCurrentViewControllerWithView:(UIView*)view; +//获取当前viewcontroller ++(UIViewController*)getCurrentRootViewController; //删除参数view所有的subview + (void)removeAllSubView:(UIView*) view; /** @@ -40,11 +45,12 @@ +(UIView*)selectBackgroudViewWithFrame:(CGRect)frame; +(UIImage*) buttonImageFromColor:(UIColor *)color withFrame:(CGRect)frame; -+(UIViewController *)getCurrentRootViewController; /** * 手机号码验证 */ +(BOOL) isValidateMobile:(NSString *)mobile; +//创建动画 ++ (void)animationFromLayer:(CALayer *) layer type:(NSString *)type subType:(NSString *)subType duration:(double) duration; @end diff --git a/ManagerDemo/Common/ManagerUtil.m b/ManagerDemo/Common/ManagerUtil.m index 004203b..a9cecff 100644 --- a/ManagerDemo/Common/ManagerUtil.m +++ b/ManagerDemo/Common/ManagerUtil.m @@ -23,7 +23,6 @@ }]; } - +(void)SetSubViewExternNone:(UIViewController *)viewController { #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 @@ -105,6 +104,16 @@ UIGraphicsEndImageContext(); return img; } ++(UIViewController *)getCurrentViewControllerWithView:(UIView *)view +{ + for (UIView* next = [view superview]; next; next = next.superview) { + UIResponder *nextResponder = [next nextResponder]; + if ([nextResponder isKindOfClass:[UIViewController class]]) { + return (UIViewController *)nextResponder; + } + } + return nil; +} +(UIViewController *)getCurrentRootViewController { @@ -147,4 +156,19 @@ NSPredicate *phoneTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",phoneRegex]; return [phoneTest evaluateWithObject:mobile]; } + ++ (CATransition*)animationLayer:(NSString *)type subType:(NSString *)subType +{ + CATransition *transition = [CATransition animation]; //定义过度动画 + transition.duration = 1; //持续时间 + transition.type = type; //动画样式 + transition.subtype = subType; //方向 + + return transition; +} ++ (void)animationFromLayer:(CALayer *) layer type:(NSString *)type subType:(NSString *)subType duration:(double) duration { + CAAnimation* animation = [ManagerUtil animationLayer:type subType:subType]; + animation.duration = duration; + [layer addAnimation:animation forKey:@"animationFromLayer"]; +} @end diff --git a/ManagerDemo/MainView/HomeView/HomeMainView.h b/ManagerDemo/MainView/HomeView/HomeMainView.h index d47c3c6..759b8bd 100644 --- a/ManagerDemo/MainView/HomeView/HomeMainView.h +++ b/ManagerDemo/MainView/HomeView/HomeMainView.h @@ -9,6 +9,12 @@ #import #import "MRCircularProgressView.h" @interface HomeMainView : UIView +{ + NSString* _fundCode; + __weak UIViewController* _delegate; +} +@property (weak, nonatomic)UIViewController* delegate; +@property (strong, nonatomic)NSString* fundCode; @property (weak, nonatomic) IBOutlet UILabel *typeLabel; @property (weak, nonatomic) IBOutlet UILabel *nameLabel; @property (weak, nonatomic) IBOutlet MRCircularProgressView *percentView; diff --git a/ManagerDemo/MainView/HomeView/HomeMainView.m b/ManagerDemo/MainView/HomeView/HomeMainView.m index 15e1671..19d9ab1 100644 --- a/ManagerDemo/MainView/HomeView/HomeMainView.m +++ b/ManagerDemo/MainView/HomeView/HomeMainView.m @@ -7,6 +7,7 @@ // #import "HomeMainView.h" +#import "WYDProductViewController.h" #import "MBProgressHUD+Util.h" @implementation HomeMainView { @@ -50,7 +51,6 @@ - (IBAction)percentBtnClick:(id)sender { - DLog("首页点击"); [_percentView setProgress:0.00 animated:YES]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC*0.2), dispatch_get_main_queue(), ^(){ @@ -60,8 +60,10 @@ } - (IBAction)sureBtnClick:(id)sender { - [MBProgressHUD errorHudWithView:self label:@"点我没用" hidesAfter:1.0]; - DLog(@"确认"); + WYDProductViewController* wydProductViewController = [[WYDProductViewController alloc] init]; + wydProductViewController.productId = self.fundCode; + wydProductViewController.hidesBottomBarWhenPushed = YES; + [self.delegate.navigationController pushViewController:wydProductViewController animated:YES]; } -(void)setName:(NSString *)name @@ -93,7 +95,7 @@ NSCharacterSet* nonDigits = [[NSCharacterSet decimalDigitCharacterSet] invertedSet]; time = [time stringByReplacingOccurrencesOfString:[time stringByTrimmingCharactersInSet:nonDigits] withString:[NSString stringWithFormat:@"%@",[time stringByTrimmingCharactersInSet:nonDigits]]]; //时间 - NSString* htmlStr = [NSString stringWithFormat:@"%@%ld起购",time,money]; + NSString* htmlStr = [NSString stringWithFormat:@"%@%d起购",time,money]; NSData* data = [htmlStr dataUsingEncoding:NSUTF8StringEncoding]; NSAttributedString* percentString = [[NSAttributedString alloc] initWithHTMLData:data documentAttributes:NULL]; _timeLabel.attributedString = percentString; diff --git a/ManagerDemo/MainView/HomeView/HomeMainView.xib b/ManagerDemo/MainView/HomeView/HomeMainView.xib index 76c308b..50b0b35 100644 --- a/ManagerDemo/MainView/HomeView/HomeMainView.xib +++ b/ManagerDemo/MainView/HomeView/HomeMainView.xib @@ -86,7 +86,7 @@ - + diff --git a/ManagerDemo/MainView/ListView/FundListCell.h b/ManagerDemo/MainView/ListView/FundListCell.h index 4fd406f..0eef8d8 100644 --- a/ManagerDemo/MainView/ListView/FundListCell.h +++ b/ManagerDemo/MainView/ListView/FundListCell.h @@ -9,6 +9,10 @@ #import @interface FundListCell : UITableViewCell +{ + NSString* _productId; +} +@property (strong, nonatomic) NSString* productId; @property (weak, nonatomic) IBOutlet UILabel *nameLabel; @property (weak, nonatomic) IBOutlet UILabel *infoLabel; @property (weak, nonatomic) IBOutlet UILabel *profitLabel; diff --git a/ManagerDemo/MainView/ListView/FundListCell.m b/ManagerDemo/MainView/ListView/FundListCell.m index 34af51d..8a6a888 100644 --- a/ManagerDemo/MainView/ListView/FundListCell.m +++ b/ManagerDemo/MainView/ListView/FundListCell.m @@ -53,8 +53,9 @@ } -(void)setInfoDic:(NSDictionary *)dic { + self.productId = [dic objectForKey:@"jjdm"]; self.nameLabel.text = [dic objectForKey:@"jjmc"]; - self.profitLabel.text = [NSString stringWithFormat:@"%@ + %@",[dic objectForKey:@"nhsy"],[dic objectForKey:@"fd"]]; + self.profitLabel.text = [NSString stringWithFormat:@"%@ + %@%%",[dic objectForKey:@"nhsy"],[dic objectForKey:@"fd"]]; self.totalLabel.text = [NSString stringWithFormat:@"已申购%@人",[dic objectForKey:@"ygrs"]]; self.priceLabel.text = [NSString stringWithFormat:@"%@元",[dic objectForKey:@"wfsy"]]; [self setLowestPriceWtihCount:[[dic objectForKey:@"startBuy"] integerValue]]; diff --git a/ManagerDemo/MainView/ListView/FundListCell.xib b/ManagerDemo/MainView/ListView/FundListCell.xib index 40d3d00..b98a126 100644 --- a/ManagerDemo/MainView/ListView/FundListCell.xib +++ b/ManagerDemo/MainView/ListView/FundListCell.xib @@ -55,16 +55,16 @@ - + - + - + @@ -75,7 +75,7 @@ -