Commit 4f709eb1b6bb6a14c89e391eaaf933680482e0ce

Authored by zhangxiaowen
1 parent 960104ac

no message

CNLiveBalanceModule/Classes/View/CNLiveMonthBillView.m
@@ -131,9 +131,9 @@ static const NSInteger margin = 20; @@ -131,9 +131,9 @@ static const NSInteger margin = 20;
131 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init]; 131 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
132 dateFormatter.dateFormat = @"yyyy年MM月"; 132 dateFormatter.dateFormat = @"yyyy年MM月";
133 //获取当前时间日期 133 //获取当前时间日期
134 - NSString *dateStr = [dateFormatter stringFromDate:[NSDate date]];  
135 - datePicker.minimumDate = [dateFormatter dateFromString: @"2017-01"];  
136 - datePicker.maximumDate = [dateFormatter dateFromString: dateStr]; 134 + NSString *dateString = [dateFormatter stringFromDate:[NSDate date]];
  135 + datePicker.minimumDate = [dateFormatter dateFromString:@"2017年1月"];
  136 + datePicker.maximumDate = [dateFormatter dateFromString:dateString];
137 [(UIViewController *)self.delegate presentViewController:datePickManager animated:false completion:nil]; 137 [(UIViewController *)self.delegate presentViewController:datePickManager animated:false completion:nil];
138 138
139 } 139 }
CNLiveBalanceModule/Classes/View/CNLiveTradingRecordView.m
@@ -67,7 +67,7 @@ static const NSInteger height = 30; @@ -67,7 +67,7 @@ static const NSInteger height = 30;
67 67
68 - (void)setModel:(CNLiveTradingRecordModel *)model{ 68 - (void)setModel:(CNLiveTradingRecordModel *)model{
69 _model = model; 69 _model = model;
70 - _paymentsAmount.text = [NSString stringWithFormat:@"支出 ¥%@ 收入 ¥%@",model.defray,model.income]; 70 + _paymentsAmount.text = [NSString stringWithFormat:@"支出 ¥%@ 收入 ¥%@",model.defray,model.income];
71 } 71 }
72 72
73 #pragma mark - PGDatePickerDelegate 73 #pragma mark - PGDatePickerDelegate
@@ -102,8 +102,10 @@ static const NSInteger height = 30; @@ -102,8 +102,10 @@ static const NSInteger height = 30;
102 PGDatePickManager *datePickManager = [[PGDatePickManager alloc] init]; 102 PGDatePickManager *datePickManager = [[PGDatePickManager alloc] init];
103 datePickManager.style = PGDatePickManagerStyleSheet; 103 datePickManager.style = PGDatePickManagerStyleSheet;
104 datePickManager.isShadeBackground = true; 104 datePickManager.isShadeBackground = true;
  105 +
105 datePickManager.cancelButtonTextColor = RGB(136, 136, 136); 106 datePickManager.cancelButtonTextColor = RGB(136, 136, 136);
106 datePickManager.confirmButtonTextColor = RGB(33, 188, 35); 107 datePickManager.confirmButtonTextColor = RGB(33, 188, 35);
  108 +
107 PGDatePicker *datePicker = datePickManager.datePicker; 109 PGDatePicker *datePicker = datePickManager.datePicker;
108 datePicker.isHiddenMiddleText = false; 110 datePicker.isHiddenMiddleText = false;
109 datePicker.delegate = self; 111 datePicker.delegate = self;
@@ -116,12 +118,13 @@ static const NSInteger height = 30; @@ -116,12 +118,13 @@ static const NSInteger height = 30;
116 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init]; 118 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
117 dateFormatter.dateFormat = @"yyyy年MM月"; 119 dateFormatter.dateFormat = @"yyyy年MM月";
118 //获取当前时间日期 120 //获取当前时间日期
119 - NSString *dateStr = [dateFormatter stringFromDate:[NSDate date]];  
120 - datePicker.minimumDate = [dateFormatter dateFromString: @"2017-01"];  
121 - datePicker.maximumDate = [dateFormatter dateFromString: dateStr]; 121 + NSString *dateString = [dateFormatter stringFromDate:[NSDate date]];
  122 + datePicker.minimumDate = [dateFormatter dateFromString:@"2017年1月"];
  123 + datePicker.maximumDate = [dateFormatter dateFromString:dateString];
122 [(UIViewController *)self.delegate presentViewController:datePickManager animated:false completion:nil]; 124 [(UIViewController *)self.delegate presentViewController:datePickManager animated:false completion:nil];
123 125
124 } 126 }
  127 +
125 - (void)paymentsBillDidClicked:(UIButton *)btn{ 128 - (void)paymentsBillDidClicked:(UIButton *)btn{
126 if (self.delegate && [self.delegate respondsToSelector:@selector(pushToMonthBillController)]) { 129 if (self.delegate && [self.delegate respondsToSelector:@selector(pushToMonthBillController)]) {
127 [self.delegate pushToMonthBillController]; 130 [self.delegate pushToMonthBillController];
@@ -154,7 +157,7 @@ static const NSInteger height = 30; @@ -154,7 +157,7 @@ static const NSInteger height = 30;
154 _paymentsAmount = [[UILabel alloc] init]; 157 _paymentsAmount = [[UILabel alloc] init];
155 [_paymentsAmount setFont:UIFontCNMake(12.0)]; 158 [_paymentsAmount setFont:UIFontCNMake(12.0)];
156 _paymentsAmount.textColor = [UIColor colorWithRed:152/255.0 green:152/255.0 blue:152/255.0 alpha:1.0]; 159 _paymentsAmount.textColor = [UIColor colorWithRed:152/255.0 green:152/255.0 blue:152/255.0 alpha:1.0];
157 - _paymentsAmount.text = @"支出 ¥0.00 收入 ¥0.00"; 160 + _paymentsAmount.text = @"支出 ¥0.00 收入 ¥0.00";
158 } 161 }
159 return _paymentsAmount; 162 return _paymentsAmount;
160 } 163 }
@@ -167,7 +170,6 @@ static const NSInteger height = 30; @@ -167,7 +170,6 @@ static const NSInteger height = 30;
167 [_paymentsBill setImage:[xw_image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal]; 170 [_paymentsBill setImage:[xw_image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
168 [_paymentsBill setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight]; 171 [_paymentsBill setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight];
169 [_paymentsBill addTarget:self action:@selector(paymentsBillDidClicked:) forControlEvents:UIControlEventTouchUpInside]; 172 [_paymentsBill addTarget:self action:@selector(paymentsBillDidClicked:) forControlEvents:UIControlEventTouchUpInside];
170 -  
171 } 173 }
172 return _paymentsBill; 174 return _paymentsBill;
173 } 175 }
Example/CNLiveBalanceModule/CNLIVEAppDelegate.m
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 }]; 62 }];
63 [[NSUserDefaults standardUserDefaults] setObject:@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj" forKey:@"CNLiveAuthToken"]; 63 [[NSUserDefaults standardUserDefaults] setObject:@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj" forKey:@"CNLiveAuthToken"];
64 64
65 - CNLiveBalanceController *vc = [[CNLiveBalanceController alloc] initWithType:@"2" ID:CNUserShareModel.uid]; 65 + CNLiveBalanceController *vc = [[CNLiveBalanceController alloc] initWithType:@"1" ID:CNUserShareModel.uid];
66 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc]; 66 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
67 self.window.rootViewController = nav;//设置根视图控制器 67 self.window.rootViewController = nav;//设置根视图控制器
68 [self.window makeKeyAndVisible]; 68 [self.window makeKeyAndVisible];