wushenghua/ManagerDemo
1
0
Fork 0
mirror of https://github.com/wu736139669/ManagerDemo.git synced 2026-08-05 05:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug 修改

Browse Source
This commit is contained in:
wushenghua
2014-09-19 08:09:46 +08:00
parent 05d2f20665
commit 757eda1719
20 changed files with 395 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ManagerDemo.xcodeproj/project.pbxproj
+20
View File
@@ -91,6 +91,10 @@
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 */; };
A99EBEA919CB9ABB005E1AA0 /* TransactionRecordsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A99EBEA719CB9ABB005E1AA0 /* TransactionRecordsViewController.m */; };
A99EBEAA19CB9ABB005E1AA0 /* TransactionRecordsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A99EBEA819CB9ABB005E1AA0 /* TransactionRecordsViewController.xib */; };
A99EBEAE19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A99EBEAC19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.m */; };
A99EBEAF19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A99EBEAD19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.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 */; };
@@ -345,6 +349,12 @@
A9971D7619B8C39C0079F143 /* DatailProfitTopTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatailProfitTopTableViewCell.h; sourceTree = "<group>"; };
A9971D7719B8C39C0079F143 /* DatailProfitTopTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatailProfitTopTableViewCell.m; sourceTree = "<group>"; };
A9971D7819B8C39C0079F143 /* DatailProfitTopTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DatailProfitTopTableViewCell.xib; sourceTree = "<group>"; };
A99EBEA619CB9ABB005E1AA0 /* TransactionRecordsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransactionRecordsViewController.h; sourceTree = "<group>"; };
A99EBEA719CB9ABB005E1AA0 /* TransactionRecordsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransactionRecordsViewController.m; sourceTree = "<group>"; };
A99EBEA819CB9ABB005E1AA0 /* TransactionRecordsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TransactionRecordsViewController.xib; sourceTree = "<group>"; };
A99EBEAB19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransactionRecordsTableViewCell.h; sourceTree = "<group>"; };
A99EBEAC19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransactionRecordsTableViewCell.m; sourceTree = "<group>"; };
A99EBEAD19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TransactionRecordsTableViewCell.xib; sourceTree = "<group>"; };
A99FDAFC19CA683100D2B3D3 /* DaiDaiTongTestApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DaiDaiTongTestApi.h; sourceTree = "<group>"; };
A99FDAFD19CA683100D2B3D3 /* DaiDaiTongTestApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DaiDaiTongTestApi.m; sourceTree = "<group>"; };
A99FDAFF19CAACA400D2B3D3 /* InputVerificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputVerificationViewController.h; sourceTree = "<group>"; };
@@ -999,6 +1009,12 @@
A9EE5EE419C20CDA004E7A2C /* WYDAmountTableViewCell.h */,
A9EE5EE519C20CDA004E7A2C /* WYDAmountTableViewCell.m */,
A9EE5EE619C20CDA004E7A2C /* WYDAmountTableViewCell.xib */,
A99EBEA619CB9ABB005E1AA0 /* TransactionRecordsViewController.h */,
A99EBEA719CB9ABB005E1AA0 /* TransactionRecordsViewController.m */,
A99EBEA819CB9ABB005E1AA0 /* TransactionRecordsViewController.xib */,
A99EBEAB19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.h */,
A99EBEAC19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.m */,
A99EBEAD19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.xib */,
);
path = MyView;
sourceTree = "<group>";
@@ -1231,6 +1247,7 @@
A9C69458199BD14D00B2CECE /* more_icon_10@2x.png in Resources */,
A9AF6C34199484200076C0EE /* HomeViewController.xib in Resources */,
A9AF6C0019947DD00076C0EE /* Main.storyboard in Resources */,
A99EBEAF19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.xib in Resources */,
A97F9D2419B595550073E7E6 /* InputPassWordViewController.xib in Resources */,
A9AF6C3E199486CA0076C0EE /* ProductListViewController.xib in Resources */,
A95CEA4119B766F400D4605F /* MessageDetailViewController.xib in Resources */,
@@ -1246,6 +1263,7 @@
A93320C319BFE8090090D640 /* MyTotalAmountViewController.xib in Resources */,
A97F9D1B19B592FD0073E7E6 /* login_button@2x.png in Resources */,
A9EC95BC19B54FDB00681678 /* textField_cancel_ios7.png in Resources */,
A99EBEAA19CB9ABB005E1AA0 /* TransactionRecordsViewController.xib in Resources */,
A9AF6C721994B5890076C0EE /* icon_bar_card@2x.png in Resources */,
A9AF6C6819949CD30076C0EE /* icon_dock_session_msg@2x.png in Resources */,
A9AF6C6619949CD30076C0EE /* icon_dock_session_actived_msg@2x.png in Resources */,
@@ -1342,6 +1360,7 @@
A9EC95B719B54F6E00681678 /* LoginViewController.m in Sources */,
A9AA326119970335000BE4FB /* ImagePlayerView.m in Sources */,
A93320C719C0227F0090D640 /* MyHoldAmountViewController.m in Sources */,
A99EBEAE19CB9E8A005E1AA0 /* TransactionRecordsTableViewCell.m in Sources */,
A9971D7919B8C39C0079F143 /* DatailProfitTopTableViewCell.m in Sources */,
A9AF6C0319947DD00076C0EE /* ViewController.m in Sources */,
A90BEC01199DDA9E00230242 /* WYDProductViewController.m in Sources */,
@@ -1368,6 +1387,7 @@
A9B9F14519AEF9BE001A1315 /* TableCellLineView.m in Sources */,
A9971D7519B8BC410079F143 /* DailyProfitViewController.m in Sources */,
A9AF6C901994C5700076C0EE /* MJRefreshBaseView.m in Sources */,
A99EBEA919CB9ABB005E1AA0 /* TransactionRecordsViewController.m in Sources */,
A9C0540519ADBCB2002331A5 /* FundProductInfoViewController.m in Sources */,
A94FE51E199C9C3C00626DE5 /* MoveSocialCellView.m in Sources */,
A93F8806199A077F00875287 /* OtherListViewController.m in Sources */,
ManagerDemo.xcworkspace/xcuserdata/xmfish.xcuserdatad/UserInterfaceState.xcuserstate
Generated
BIN
View File
Binary file not shown.
ManagerDemo/Common/ManagerUtil.h
+3
View File
@@ -53,4 +53,7 @@
//创建动画
+ (void)animationFromLayer:(CALayer *) layer type:(NSString *)type subType:(NSString *)subType duration:(double) duration;
//时间戳转时间
+(NSString*)timeFromtimeSp:(NSString*)timeSp;
@end
ManagerDemo/Common/ManagerUtil.m
+11
View File
@@ -171,4 +171,15 @@
animation.duration = duration;
[layer addAnimation:animation forKey:@"animationFromLayer"];
}
+(NSString*)timeFromtimeSp:(NSString*)timeSp
{
NSDateFormatter* formatter = [[NSDateFormatter alloc] init];
// [formatter setDateStyle:NSDateFormatterMediumStyle];
// [formatter setTimeStyle:NSDateFormatterShortStyle];
[formatter setDateFormat:@"yyyy-MM-dd HH:MM"];
// NSDate *date = [formatter dateFromString:@"1231312312"];
NSDate * date = [NSDate dateWithTimeIntervalSince1970:[timeSp floatValue]];
return [formatter stringFromDate:date];
}
@end
ManagerDemo/MainView/HomeView/HomeMainView.m
+2 -2
View File
@@ -93,9 +93,9 @@
{
NSCharacterSet* nonDigits = [[NSCharacterSet decimalDigitCharacterSet] invertedSet];
time = [time stringByReplacingOccurrencesOfString:[time stringByTrimmingCharactersInSet:nonDigits] withString:[NSString stringWithFormat:@"<span style=\"font-size:13px; color:red;\">%@</span>",[time stringByTrimmingCharactersInSet:nonDigits]]];
time = [time stringByReplacingOccurrencesOfString:[time stringByTrimmingCharactersInSet:nonDigits] withString:[NSString stringWithFormat:@"限<span style=\"font-size:13px; color:red;\">%@</span>个月",[time stringByTrimmingCharactersInSet:nonDigits]]];
//时间
NSString* htmlStr = [NSString stringWithFormat:@"<span style=\"font-size:11px;text-align:center; \">%@<span style=\"font-size:13px; color:red;\">%d</span>起购</span>",time,money];
NSString* htmlStr = [NSString stringWithFormat:@"<span style=\"font-size:11px;text-align:center; \">%@<span style=\"font-size:13px; color:red;\">%d</span>元起购</span>",time,money];
NSData* data = [htmlStr dataUsingEncoding:NSUTF8StringEncoding];
NSAttributedString* percentString = [[NSAttributedString alloc] initWithHTMLData:data documentAttributes:NULL];
_timeLabel.attributedString = percentString;
ManagerDemo/MainView/HomeView/HomeMainView.xib
+1 -1
View File
@@ -31,7 +31,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="bottom" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iR9-8X-qqa">
<rect key="frame" x="3" y="-6" width="200" height="32"/>
<rect key="frame" x="41" y="4" width="200" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
ManagerDemo/MainView/ListView/OtherListViewController.m
+1
View File
@@ -95,6 +95,7 @@
{
[tableView deselectRowAtIndexPath:indexPath animated:NO];
OtherProductInfoViewController* otherProductInfoViewController =[[OtherProductInfoViewController alloc] init];
otherProductInfoViewController.hidesBottomBarWhenPushed = YES;
[self.delegate.navigationController pushViewController:otherProductInfoViewController animated:YES];
}
ManagerDemo/MainView/LoginView/LoginViewController.xib
+1 -1
View File
@@ -36,7 +36,7 @@
<rect key="frame" x="10" y="130" width="300" height="120"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="莹莹不会在任何地方泄漏您的号码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fpY-NW-BZm">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="贷贷不会在任何地方泄漏您的号码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fpY-NW-BZm">
<rect key="frame" x="11" y="0.0" width="198" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
ManagerDemo/MainView/MyView/TransactionRecordsTableViewCell.h
+17
View File
@@ -0,0 +1,17 @@
//
// TransactionRecordsTableViewCell.h
// ManagerDemo
//
// Created by xmfish on 14-9-19.
// Copyright (c) 2014年 ash. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface TransactionRecordsTableViewCell : UITableViewCell
@property (weak, nonatomic) IBOutlet UILabel *nameLabel;
@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
@property (weak, nonatomic) IBOutlet UILabel *amountLabel;
@property (weak, nonatomic) IBOutlet UILabel *typeLabel;
@end
ManagerDemo/MainView/MyView/TransactionRecordsTableViewCell.m
+25
View File
@@ -0,0 +1,25 @@
//
// TransactionRecordsTableViewCell.m
// ManagerDemo
//
// Created by xmfish on 14-9-19.
// Copyright (c) 2014年 ash. All rights reserved.
//
#import "TransactionRecordsTableViewCell.h"
@implementation TransactionRecordsTableViewCell
- (void)awakeFromNib
{
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated
{
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
ManagerDemo/MainView/MyView/TransactionRecordsTableViewCell.xib
+53
View File
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="80" id="KGk-i7-Jjw" customClass="TransactionRecordsTableViewCell">
<rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="名字" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3UX-1a-thd">
<rect key="frame" x="20" y="12" width="132" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="0000-00-00 00:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d8V-kx-m4y">
<rect key="frame" x="20" y="41" width="132" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U5G-OY-Oxy">
<rect key="frame" x="169" y="12" width="124" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="成功" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiH-Mk-SCL">
<rect key="frame" x="213" y="41" width="80" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
<connections>
<outlet property="amountLabel" destination="U5G-OY-Oxy" id="y6z-Gf-3ki"/>
<outlet property="nameLabel" destination="3UX-1a-thd" id="QBJ-s7-7oN"/>
<outlet property="timeLabel" destination="d8V-kx-m4y" id="GbW-AH-AOM"/>
<outlet property="typeLabel" destination="eiH-Mk-SCL" id="JLs-sV-N9s"/>
</connections>
</tableViewCell>
</objects>
</document>
ManagerDemo/MainView/MyView/TransactionRecordsViewController.h
+14
View File
@@ -0,0 +1,14 @@
//
// TransactionRecordsViewController.h
// ManagerDemo
//
// Created by xmfish on 14-9-19.
// Copyright (c) 2014年 ash. All rights reserved.
//
#import "ViewController.h"
#import "BaseListViewController.h"
@interface TransactionRecordsViewController : BaseListViewController
@property (weak, nonatomic) IBOutlet UITableView *tableView;
@end
ManagerDemo/MainView/MyView/TransactionRecordsViewController.m
+107
View File
@@ -0,0 +1,107 @@
//
// TransactionRecordsViewController.m
// ManagerDemo
//
// Created by xmfish on 14-9-19.
// Copyright (c) 2014年 ash. All rights reserved.
//
#import "TransactionRecordsViewController.h"
#import "TransactionRecordsTableViewCell.h"
@interface TransactionRecordsViewController ()
@end
@implementation TransactionRecordsViewController
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) {
// Custom initialization
}
return self;
}
-(void)viewDidLoad
{
[super viewDidLoad];
self.navigationItem.title = @"全部";
}
-(void)loadDataWithDic:(NSDictionary *)dic withType:(NSString *)typeStr WithcompletionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock
{
// NSDictionary* tempDic = [[NSDictionary alloc] initWithObjectsAndKeys:_profitDate, @"profitDate", nil];
// [super loadDataWithDic:tempDic withType:@"profitDatedetail.do" WithcompletionBlock:^(id jsonRes){
// [_infoArray addObjectsFromArray:[jsonRes objectForKey:@"datas"]];
// }failedBlock:^(NSError *error){
//
// }];
DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance];
[daiDaiTongTestApi getApiWithParam:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInteger:_pageNum],@"pageNum", nil] withApiType:@"tradeRecList" completionBlock:^(id jsonRes) {
if ([[jsonRes objectForKey:@"resultflag"] integerValue] != 0) {
[MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5];
}else{
[MBProgressHUD hideAllHUDsForView:self.view animated:YES];
// 刷新表格
if ([[jsonRes objectForKey:@"totalNum"] integerValue] <= _pageNum*20) {
// [self.tableView removeFooter];
}
_infoArray = [[NSMutableArray alloc] initWithArray:[jsonRes objectForKey:@"recList"]];
[self.tableView reloadData];
}
[self headerEndRefreshing];
[self footerEndRefreshing];
} failedBlock:^(NSError *error) {
[MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5];
[self headerEndRefreshing];
[self footerEndRefreshing];
}];
}
#pragma mark UITableViewDelegate
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 1;
}
-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return _infoArray.count;
}
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 80.0;
}
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
return 1.0;
}
-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
{
return 10.0;
}
-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
static NSString *dailyIncomeTableViewCell = @"TransactionRecordsTableViewCell";
TransactionRecordsTableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:dailyIncomeTableViewCell];
if (cell == nil) {
UINib *nib = [UINib nibWithNibName:@"TransactionRecordsTableViewCell" bundle:nil];
[tableView registerNib:nib forCellReuseIdentifier:dailyIncomeTableViewCell];
cell = (TransactionRecordsTableViewCell *)[tableView dequeueReusableCellWithIdentifier:dailyIncomeTableViewCell];
}
// cell.nameLabel.text = [[_infoArray objectAtIndex:indexPath.section-1] objectForKey:@"name"];
cell.timeLabel.text = [ManagerUtil timeFromtimeSp:[[[_infoArray objectAtIndex:indexPath.section] objectForKey:@"tradeTime"] stringValue]];
cell.amountLabel.text = [NSString stringWithFormat:@"%.2f",[[[_infoArray objectAtIndex:indexPath.section] objectForKey:@"tradeMoney"] floatValue]];
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
ManagerDemo/MainView/MyView/TransactionRecordsViewController.xib
+29
View File
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TransactionRecordsViewController">
<connections>
<outlet property="tableView" destination="nTP-gj-jMg" id="GEU-vU-8CS"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="nTP-gj-jMg">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.97560586729999998" green="0.97560586729999998" blue="0.97560586729999998" alpha="1" colorSpace="calibratedRGB"/>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
</view>
</objects>
</document>
ManagerDemo/MainView/ProductView/MainOrderViewController.m
+1
View File
@@ -39,6 +39,7 @@
_nameLabel.text = _productName;
_startBuyLabel.text = [NSString stringWithFormat:@"%ld元",_startBuy];
_timeLimit.text = [NSString stringWithFormat:@"限%ld个月",_timeLimitNum];
_orderAmountTextField.placeholder = [NSString stringWithFormat:@"投标金额≤%ld",_startBuy];
}
-(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
ManagerDemo/MainView/ProductView/WYDProductViewController.m
+5
View File
@@ -77,6 +77,11 @@
self.navigationItem.title = [jsonRes objectForKey:@"fundName"];
[_wydInfoHedaView setInfoWithDic:jsonRes];
_infoDic = [NSDictionary dictionaryWithDictionary:jsonRes];
if ([[[jsonRes objectForKey:@"proInfo"] objectForKey:@"state"] integerValue] == 1) {
[_toolBarView setEnable:YES];
}else{
[_toolBarView setEnable:NO];
}
[self.tableView reloadData];
}else{
ManagerDemo/MainViewControll/HomeViewController.m
+42 -14
View File
@@ -77,27 +77,55 @@
[MBProgressHUD errorHudWithView:nil label:@"网络出错" hidesAfter:1.0];
}];
_homeMainView.hidden = YES;
[daiDaiTongApi getFundRecommendWithcompletionBlock:^(id jsonRes) {
if ([[jsonRes objectForKey:@"succ"] integerValue] != 1) {
[MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:0.5];
}else{
DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance];
[daiDaiTongTestApi getApiWithParam:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInteger:1],@"pageNum", nil] withApiType:@"proList" completionBlock:^(id jsonRes) {
if ([[jsonRes objectForKey:@"resultflag"] integerValue] == 0) {
NSDictionary* dic = [[jsonRes objectForKey:@"proList"] objectAtIndex:0];
_homeMainView.hidden = NO;
_homeMainView.fundCode = [jsonRes objectForKey:@"code"];
[_homeMainView setName:[jsonRes objectForKey:@"name"]];
[_homeMainView setpercent:[[jsonRes objectForKey:@"percent"] floatValue]/100.0];
[_homeMainView setExpect:[[jsonRes objectForKey:@"qrsy"] floatValue]];
[_homeMainView setType:[jsonRes objectForKey:@"tip"]];
[_homeMainView setInfo:[jsonRes objectForKey:@"activityDesc"]];
[_homeMainView setSecurityDesc:[jsonRes objectForKey:@"securityDesc"]];
[_homeMainView setTime:[jsonRes objectForKey:@"jjzq"] withStartBuy:[[jsonRes objectForKey:@"startBuy"] integerValue]];
_homeMainView.fundCode = [dic objectForKey:@"id"];
[_homeMainView setName:[dic objectForKey:@"proName"]];
[_homeMainView setpercent:[[dic objectForKey:@"percent"] floatValue]/100.0];
[_homeMainView setExpect:[[dic objectForKey:@"nhsy"] floatValue]];
[_homeMainView setType:[dic objectForKey:@"tip"]];
[_homeMainView setInfo:[dic objectForKey:@"activityDesc"]];
[_homeMainView setSecurityDesc:[dic objectForKey:@"syms"]];
[_homeMainView setTime:[[dic objectForKey:@"timeLimit"] stringValue] withStartBuy:[[dic objectForKey:@"startBuy"] integerValue]];
}else{
[MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:0.5];
}
[self.tableView reloadData];
[self.tableView headerEndRefreshing];
} failedBlock:^(NSError *error) {
DLog(@"失败");
[MBProgressHUD errorHudWithView:nil label:@"网络出错" hidesAfter:1.0];
[MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5];
[self.tableView headerEndRefreshing];
}];
// [daiDaiTongApi getFundRecommendWithcompletionBlock:^(id jsonRes) {
// if ([[jsonRes objectForKey:@"succ"] integerValue] != 1) {
// [MBProgressHUD errorHudWithView:nil label:[jsonRes objectForKey:@"err_msg"] hidesAfter:0.5];
// }else{
// _homeMainView.hidden = NO;
// _homeMainView.fundCode = [jsonRes objectForKey:@"code"];
// [_homeMainView setName:[jsonRes objectForKey:@"name"]];
// [_homeMainView setpercent:[[jsonRes objectForKey:@"percent"] floatValue]/100.0];
// [_homeMainView setExpect:[[jsonRes objectForKey:@"qrsy"] floatValue]];
// [_homeMainView setType:[jsonRes objectForKey:@"tip"]];
// [_homeMainView setInfo:[jsonRes objectForKey:@"activityDesc"]];
// [_homeMainView setSecurityDesc:[jsonRes objectForKey:@"securityDesc"]];
// [_homeMainView setTime:[jsonRes objectForKey:@"jjzq"] withStartBuy:[[jsonRes objectForKey:@"startBuy"] integerValue]];
// }
// [self.tableView reloadData];
// [self.tableView headerEndRefreshing];
// } failedBlock:^(NSError *error) {
// DLog(@"失败");
// [MBProgressHUD errorHudWithView:nil label:@"网络出错" hidesAfter:1.0];
// [self.tableView headerEndRefreshing];
// }];
}
- (void)footerRereshing
ManagerDemo/MainViewControll/MoreViewController.m
+3
View File
@@ -12,6 +12,7 @@
#import "HelpCenterViewController.h"
#import "MessageCenterViewController.h"
#import "AboutViewController.h"
#import "AppDelegate.h"
@interface MoreViewController ()
@end
@@ -241,6 +242,8 @@
-(void)logout
{
[ManagerUser shareInstance].isLogin = false;
AppDelegate *app = (AppDelegate *)[[UIApplication sharedApplication]delegate];
[app.mainViewController setSelectedIndex:0];
[_tableView reloadData];
}
- (void)didReceiveMemoryWarning
ManagerDemo/MainViewControll/MyViewController.m
+59 -11
View File
@@ -13,6 +13,7 @@
#import "DailyProfitViewController.h"
#import "MessageCenterViewController.h"
#import "MyTotalAmountViewController.h"
#import "TransactionRecordsViewController.h"
@interface MyViewController ()
{
NSDictionary* _myInfoDic;
@@ -60,16 +61,50 @@
#pragma mark MJRefreshDelegate
- (void)headerRereshing
{
DaiDaiTongApi* daiDaiTongApi = [DaiDaiTongApi shareInstance];
[daiDaiTongApi getAccountInfoWithcompletionBlock:^(id jsonRes) {
if ([[jsonRes objectForKey:@"succ"] integerValue] == 1) {
// DaiDaiTongApi* daiDaiTongApi = [DaiDaiTongApi shareInstance];
// [daiDaiTongApi getAccountInfoWithcompletionBlock:^(id jsonRes) {
//
// if ([[jsonRes objectForKey:@"succ"] integerValue] == 1) {
// _myInfoDic = [NSDictionary dictionaryWithDictionary:jsonRes];
// }
// [_tableView reloadData];
// [_tableView headerEndRefreshing];
// } failedBlock:^(NSError *error) {
// [MBProgressHUD errorHudWithView:self.view label:Net_Error_Str hidesAfter:0.5];
// [_tableView reloadData];
// [_tableView headerEndRefreshing];
// }];
DaiDaiTongTestApi* daiDaiTongTestApi = [DaiDaiTongTestApi shareInstance];
[daiDaiTongTestApi getApiWithParam:nil withApiType:@"userMsg" completionBlock:^(id jsonRes) {
if ([[jsonRes objectForKey:@"resultflag"] integerValue] != 0) {
[MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5];
}else{
[MBProgressHUD hideAllHUDsForView:self.view animated:YES];
_myInfoDic = [NSDictionary dictionaryWithDictionary:jsonRes];
}
[_tableView reloadData];
[_tableView headerEndRefreshing];
} failedBlock:^(NSError *error) {
[MBProgressHUD errorHudWithView:self.view label:Net_Error_Str hidesAfter:0.5];
[MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5];
[_tableView reloadData];
[_tableView headerEndRefreshing];
}];
[daiDaiTongTestApi getApiWithParam:nil withApiType:@"todayProfit" completionBlock:^(id jsonRes) {
if ([[jsonRes objectForKey:@"resultflag"] integerValue] != 0) {
[MBProgressHUD errorHudWithView:self.view label:[jsonRes objectForKey:@"resultMsg"] hidesAfter:0.5];
}else{
[MBProgressHUD hideAllHUDsForView:self.view animated:YES];
_myInfoDic = [NSDictionary dictionaryWithDictionary:jsonRes];
}
[_tableView reloadData];
[_tableView headerEndRefreshing];
} failedBlock:^(NSError *error) {
[MBProgressHUD errorHudWithView:self.view label:@"网络出错" hidesAfter:0.5];
[_tableView reloadData];
[_tableView headerEndRefreshing];
}];
@@ -181,28 +216,34 @@
switch (indexPath.section) {
case 0:
{
cell.textLabel.text = [[_myInfoDic objectForKey:@"info"] objectForKey:@"realShowName"];
cell.textLabel.text = [[_myInfoDic objectForKey:@"userMsg"] objectForKey:@"userName"];
cell.imageView.image = [UIImage imageNamed:@"icon_person_take_image"];
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
cell.detailTextLabel.text = [[_myInfoDic objectForKey:@"info"] objectForKey:@"cell"];
// cell.detailTextLabel.text = [[_myInfoDic objectForKey:@"info"] objectForKey:@"cell"];
cell.selectedBackgroundView.backgroundColor = Touch_BackGroudColor;
}
break;
case 1:
{
_timeLabel.text = [NSString stringWithFormat:@"%@收益(元)",[_myInfoDic objectForKey:@"profitShowDate"]];
NSDate * senddate=[NSDate date];
NSDateFormatter *dateformatter=[[NSDateFormatter alloc] init];
[dateformatter setDateFormat:@"MM月dd日"];
NSString * locationString=[dateformatter stringFromDate:senddate];
_timeLabel.text = [NSString stringWithFormat:@"%@收益(元)",locationString];
_profitLabel.text = [_myInfoDic objectForKey:@"datePofit"];
}
break;
case 2:
{
_myTotalProfitCellView.totalMoneyLabel.text = [_myInfoDic objectForKey:@"totalAmount"];
_myTotalProfitCellView.profitMoneyLabel.text = [_myInfoDic objectForKey:@"totalProfit"];
_myTotalProfitCellView.totalMoneyLabel.text = [[[_myInfoDic objectForKey:@"userMsg"] objectForKey:@"totalAssets"] stringValue];
_myTotalProfitCellView.profitMoneyLabel.text = [[[_myInfoDic objectForKey:@"userMsg"] objectForKey:@"totalProfit"] stringValue];
}
break;
case 4:
{
cell.detailTextLabel.text = [NSString stringWithFormat:@"%@分",[_myInfoDic objectForKey:@"point"]];
cell.detailTextLabel.text = [NSString stringWithFormat:@"%@分",[[[_myInfoDic objectForKey:@"userMsg"] objectForKey:@"totalIntegral"] stringValue]];
}
break;
@@ -233,6 +274,13 @@
[self.navigationController pushViewController:dailyProfitViewController animated:YES];
}
break;
case 3:
{
TransactionRecordsViewController* transactionRecordsViewController = [[TransactionRecordsViewController alloc] init];
transactionRecordsViewController.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:transactionRecordsViewController animated:YES];
}
break;
default:
break;
}
ManagerDemo/ManagerDemo-Info.plist
+1 -1
View File
@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>${PRODUCT_NAME}</string>
<string>贷贷通</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>