iOS Team / CNLiveCommuntyModule · Commits

Commit 15132d87e8080ddcd783d12c208dc140e15a4e39

Authored by liushiyu
1 parent 00e4a6fb

0.2.5

Inline Side-by-side
Showing 9 changed files with 237 additions and 19 deletions
CNLiveCommuntyModule.podspec
  View file @15132d8
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCommuntyModule'
11   - s.version = '0.2.4'
  11 + s.version = '0.2.5'
12 12 s.summary = 'A short description of CNLiveCommuntyModule.'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitModuleProtocol.h
  View file @15132d8
... ... @@ -38,6 +38,10 @@ NS_ASSUME_NONNULL_BEGIN
38 38 /// @param webUrl url
39 39 -(UIViewController *)pushLiveViewWithMainProjectWithPageId:(NSString *)pageId ChannelName:(NSString *)channelName ChannelId:(NSString *)channelId WebUrl:(NSString *)webUrl;
40 40  
  41 +/// 调用转发好友方法
  42 +/// @param imageData 转发的data
  43 +-(void)pushPayResultWithForwardFriendsWithImageData:(NSData *)imageData;
  44 +
41 45 @end
42 46  
43 47 NS_ASSUME_NONNULL_END
... ...
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.h
  View file @15132d8
... ... @@ -129,10 +129,21 @@ NS_ASSUME_NONNULL_BEGIN
129 129 @interface CNLiveCommuntyActivityPaycostListModel : NSObject
130 130 @property (nonatomic, copy) NSString *idStr;
131 131 @property (nonatomic, copy) NSString *locality;
132   -/**0未缴费 1已缴费*/
  132 +/**缴费状态 0未缴费 1已缴费*/
133 133 @property (nonatomic, copy) NSString *payStatus;
134 134 @property (nonatomic, copy) NSString *totalFee;
  135 +/**缴费方式 1现金缴费 2线上缴费*/
  136 +@property (nonatomic, copy) NSString *payType;
  137 +/**快捷支付方式 1微信 2 支付宝*/
  138 +@property (nonatomic, copy) NSString *bankPayType;
  139 +/**缴费人id*/
  140 +@property (nonatomic, copy) NSString *payUserId;
135 141 @property (nonatomic, copy) NSString *payerName;
  142 +/**回执单号id*/
  143 +@property (nonatomic, copy) NSString *receiptId;
  144 +@property (nonatomic, copy) NSString *receiptType;
  145 +@property (nonatomic, copy) NSString *receiptName;
  146 +@property (nonatomic, copy) NSString *rmb;
136 147 @property (nonatomic, strong) NSNumber *beginTime;
137 148 @property (nonatomic, strong) NSNumber *endTime;
138 149 @property (nonatomic, strong) NSNumber *payTime;
... ...
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.h
  View file @15132d8
... ... @@ -23,6 +23,11 @@ NS_ASSUME_NONNULL_BEGIN
23 23 /// @param completerBlock 确认回调
24 24 +(void)showAlertViewWithMessage:(NSString *)message CompleterBlock:(void(^)(void))completerBlock;
25 25  
  26 +
  27 +/// 获取显示的回执图片
  28 +/// @param paycostModel 显示参数
  29 ++(UIImageView *)showContentViewWithParamPaycostModel:(CNLiveCommuntyActivityPaycostListModel *)paycostModel;
  30 +
26 31 @end
27 32  
28 33  
... ... @@ -136,6 +141,7 @@ NS_ASSUME_NONNULL_BEGIN
136 141 @property (nonatomic, strong) UILabel * nameLabel;
137 142 @property (nonatomic, strong) UILabel * timeLabel;
138 143 @property (nonatomic, strong) QMUIButton * moreButton;
  144 +@property (nonatomic, strong) QMUIButton * receiptButton;
139 145 @property (nonatomic, strong) UILabel * lineLabel;
140 146 @property (nonatomic, strong) UILabel * priceLabel;
141 147  
... ...
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
  View file @15132d8
... ... @@ -9,6 +9,147 @@
9 9  
10 10 @implementation CNLiveCommuntSignUpView
11 11  
  12 +
  13 +
  14 +/// 获取显示的回执图片
  15 +/// @param paycostModel 显示参数
  16 ++(UIImageView *)showContentViewWithParamPaycostModel:(CNLiveCommuntyActivityPaycostListModel *)paycostModel
  17 +{
  18 + UIImage * temp_image = (UIImage *)[CNLiveRespCacheManager objectCacheWithFileName:[NSString stringWithFormat:@"receipt_%@_%@",CNUserShareModelUid,paycostModel.receiptId]];
  19 + if (temp_image) {
  20 + UIImageView * imageView = [[UIImageView alloc] initWithImage:temp_image];
  21 + imageView.backgroundColor = [UIColor whiteColor];
  22 + imageView.contentMode = UIViewContentModeScaleAspectFill;
  23 + return imageView;
  24 + }
  25 +
  26 + UIView * mainView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth - DS_adapt_length(10), 0)];
  27 + mainView.backgroundColor = [UIColor whiteColor];
  28 +
  29 + UILabel * nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(DS_adapt_length(5), DS_adapt_length(2.5), kScreenWidth - DS_adapt_length(30), DS_adapt_length(20))];
  30 + nameLabel.textColor = [UIColor blackColor];
  31 + nameLabel.font = DS_regular_font(9);
  32 + nameLabel.text = [NSString stringWithFormat:@"电子回执单号码: %@",paycostModel.receiptId];
  33 + [mainView addSubview:nameLabel];
  34 +
  35 + NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
  36 + [dateFormatter setDateFormat:@"yyyy/MM"];
  37 + NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.beginTime doubleValue]/1000)];
  38 + NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.endTime doubleValue]/1000)];
  39 + NSString * time_string = [NSString stringWithFormat:@"%@~%@",[dateFormatter stringFromDate:detaildate_beginTime],[dateFormatter stringFromDate:detaildate_endTime]];
  40 +
  41 + NSDateFormatter *dateFormatter_pay = [[NSDateFormatter alloc] init];
  42 + [dateFormatter_pay setDateFormat:@"yyyy/MM/dd"];//HH:mm:ss
  43 + NSDate *detaildate_payTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.payTime doubleValue]/1000)];
  44 + NSMutableArray * dataArray = [[NSMutableArray alloc] init];
  45 + [dataArray addObject:@{@"key":@"回单类型",@"value":paycostModel.receiptType}];
  46 + [dataArray addObject:@{@"key":@"收费单位",@"value":paycostModel.propertyName}];
  47 + [dataArray addObject:@{@"key":@"缴费房屋",@"value":paycostModel.locality}];
  48 + [dataArray addObject:@{@"key":@"缴费人",@"value":paycostModel.payerName}];
  49 + [dataArray addObject:@{@"key":@"金额(大写)",@"value":paycostModel.rmb}];
  50 + [dataArray addObject:@{@"key":@"支付方式",@"value":[paycostModel.bankPayType isEqualToString:@"1"]?@"微信支付":@"支付宝支付"}];
  51 + [dataArray addObject:@{@"key":@"账单周期",@"value":time_string}];
  52 + [dataArray addObject:@{@"key":@"支付时间",@"value":[dateFormatter_pay stringFromDate:detaildate_payTime]}];
  53 +
  54 + UIView * lastView;
  55 + for (int i = 0; i < dataArray.count; i ++) {
  56 + NSDictionary * dict = dataArray[i];
  57 + UIView * view = [[UIView alloc] initWithFrame:CGRectMake(DS_adapt_length(5), lastView?CGRectGetMaxY(lastView.frame):0 + DS_adapt_length(23), mainView.width - DS_adapt_length(10), DS_adapt_length(35))];
  58 + view.backgroundColor = [UIColor whiteColor];
  59 + [mainView addSubview:view];
  60 +
  61 + UILabel * leftLab = [[UILabel alloc]initWithFrame:CGRectMake(DS_adapt_length(5), 0, 0, 0)];
  62 + leftLab.textColor = DS_HEX_RGB(0x000000);//DS_HEX_RGB(0x6d6d6d);
  63 + leftLab.font = [UIFont systemFontOfSize:10];
  64 + leftLab.font = [UIFont fontWithName:@"Heiti SC" size:10];
  65 + leftLab.textAlignment = NSTextAlignmentCenter;
  66 + leftLab.backgroundColor = [UIColor whiteColor];
  67 + leftLab.text = dict[@"key"];
  68 + leftLab.numberOfLines = 1;
  69 + [view addSubview:leftLab];
  70 + leftLab.height = ceil([leftLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:leftLab.font].height) + DS_adapt_length(5);
  71 + leftLab.width = ceil([leftLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:leftLab.font].width);
  72 +
  73 + UILabel * rightLab = [[UILabel alloc] initWithFrame:CGRectMake(DS_adapt_length(65), DS_adapt_length(2.5), 0, 0)];
  74 + rightLab.textColor = DS_HEX_RGB(0x000000);//DS_HEX_RGB(0xaaaaaa);
  75 + rightLab.font = [UIFont systemFontOfSize:10];
  76 + rightLab.font = [UIFont fontWithName:@"Heiti SC" size:10];
  77 + rightLab.textAlignment = NSTextAlignmentCenter;
  78 + rightLab.backgroundColor = [UIColor whiteColor];
  79 + rightLab.text = dict[@"value"];
  80 + rightLab.numberOfLines = 0;
  81 + [view addSubview:rightLab];
  82 + rightLab.height = ceil([rightLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:rightLab.font].height) + DS_adapt_length(5);
  83 + rightLab.width = ceil([rightLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:rightLab.font].width);
  84 +
  85 +
  86 + if (rightLab.height > leftLab.height) {
  87 + view.height = rightLab.height;
  88 + }else{
  89 + view.height = leftLab.height;
  90 + }
  91 +
  92 + DSImageView * line = [[DSImageView alloc] initWithFrame:CGRectMake(0, 0, view.width, DS_ONE_PIXEL)];
  93 + line.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
  94 + [view addSubview:line];
  95 +
  96 + if (i == 0 || i == 4) {
  97 + UILabel * insertLeftLabel = [[UILabel alloc] initWithFrame:CGRectMake(mainView.width - DS_adapt_length(150), 0, 0, leftLab.height + DS_adapt_length(2))];
  98 + insertLeftLabel.textColor = DS_HEX_RGB(0x000000);
  99 + insertLeftLabel.font = [UIFont systemFontOfSize:10];
  100 + insertLeftLabel.font = [UIFont fontWithName:@"Heiti SC" size:10];
  101 + insertLeftLabel.textAlignment = NSTextAlignmentCenter;
  102 + insertLeftLabel.backgroundColor = [UIColor whiteColor];
  103 + insertLeftLabel.text = i == 0 ? @"缴费项目" : @"金额(小写)";
  104 + insertLeftLabel.numberOfLines = 1;
  105 + insertLeftLabel.layer.borderColor = [UIColor blackColor].CGColor;
  106 + insertLeftLabel.layer.borderWidth = DS_ONE_PIXEL;
  107 + [view addSubview:insertLeftLabel];
  108 + insertLeftLabel.width = ceil([insertLeftLabel.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:insertLeftLabel.font].width) + DS_adapt_length(5);
  109 +
  110 + UILabel * insertRightLab = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(insertLeftLabel.frame) + DS_adapt_length(5), DS_adapt_length(2.5), 0, rightLab.height + DS_adapt_length(1))];
  111 + insertRightLab.textColor = DS_HEX_RGB(0x000000);
  112 + insertRightLab.font = [UIFont systemFontOfSize:10];
  113 + insertRightLab.font = [UIFont fontWithName:@"Heiti SC" size:10];
  114 + insertRightLab.textAlignment = NSTextAlignmentCenter;
  115 + insertRightLab.backgroundColor = [UIColor whiteColor];
  116 + insertRightLab.text = i == 0 ? paycostModel.receiptName : [NSString stringWithFormat:@"¥%@",paycostModel.totalFee];
  117 + insertRightLab.numberOfLines = 1;
  118 + [view addSubview:insertRightLab];
  119 + insertRightLab.width = ceil([insertRightLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:insertRightLab.font].width) + DS_adapt_length(5);
  120 + }
  121 +
  122 + lastView = view;
  123 + }
  124 +
  125 + DSImageView * leftLine = [[DSImageView alloc] initWithFrame:CGRectMake(lastView.x, DS_adapt_length(23), DS_ONE_PIXEL, CGRectGetMaxY(lastView.frame) - DS_adapt_length(23))];
  126 + leftLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
  127 + [mainView addSubview:leftLine];
  128 +
  129 + DSImageView * middleLine = [[DSImageView alloc] initWithFrame:CGRectMake(lastView.x + DS_adapt_length(63), DS_adapt_length(23), DS_ONE_PIXEL, CGRectGetMaxY(lastView.frame) - DS_adapt_length(23))];
  130 + middleLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
  131 + [mainView addSubview:middleLine];
  132 +
  133 + DSImageView * rightLine = [[DSImageView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(lastView.frame) - DS_ONE_PIXEL, DS_adapt_length(23), DS_ONE_PIXEL, CGRectGetMaxY(lastView.frame) - DS_adapt_length(23))];
  134 + rightLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
  135 + [mainView addSubview:rightLine];
  136 +
  137 + DSImageView * bottomLine = [[DSImageView alloc] initWithFrame:CGRectMake(lastView.x, CGRectGetMaxY(lastView.frame), lastView.width, DS_ONE_PIXEL)];
  138 + bottomLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
  139 + [mainView addSubview:bottomLine];
  140 +
  141 + mainView.height = CGRectGetMaxY(bottomLine.frame) + DS_adapt_length(5);
  142 +
  143 + UIImage * image = [UIImage qmui_imageWithView:mainView];
  144 +
  145 + [CNLiveRespCacheManager cachePathWithObject:image FileName:[NSString stringWithFormat:@"receipt_%@_%@",CNUserShareModelUid,paycostModel.receiptId]];
  146 +
  147 + UIImageView * imageView = [[UIImageView alloc] initWithImage:image];
  148 + imageView.backgroundColor = [UIColor whiteColor];
  149 + imageView.contentMode = UIViewContentModeScaleAspectFill;
  150 + return imageView;
  151 +}
  152 +
12 153 /// 显示接单成功弹框
13 154 +(void)showHaveTipSuccessViewCompleterBlock:(void(^)(void))completerBlock
14 155 {
... ... @@ -1136,6 +1277,7 @@
1136 1277 [self.mainView addSubview:self.moreButton];
1137 1278 [self.mainView addSubview:self.lineLabel];
1138 1279 [self.mainView addSubview:self.priceLabel];
  1280 + [self.mainView addSubview:self.receiptButton];
1139 1281  
1140 1282 }
1141 1283 return self;
... ... @@ -1153,6 +1295,22 @@
1153 1295 self.lineLabel.hidden = [payModel.payStatus isEqualToString:@"1"];
1154 1296 self.priceLabel.hidden = [payModel.payStatus isEqualToString:@"1"];
1155 1297 self.priceLabel.text = [NSString stringWithFormat:@"待缴金额：¥%@",payModel.totalFee];
  1298 +
  1299 + self.receiptButton.hidden = ![payModel.payType isEqualToString:@"2"];
  1300 + self.lineLabel.hidden = ![payModel.payType isEqualToString:@"2"];
  1301 +
  1302 +}
  1303 +-(void)browerAction:(UIButton *)button
  1304 +{
  1305 + UIImageView * imageView = [CNLiveCommuntSignUpView showContentViewWithParamPaycostModel:self.payModel];
  1306 + imageView.frame = button.frame;
  1307 + imageView.hidden = YES;
  1308 + [self.contentView addSubview:imageView];
  1309 + [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:@[imageView] MediaURLArray:@[imageView.image] CurrentIndex:0 ShowType:CNLivePhotoBrowserShowTypeImage Sheet:@[@"转发好友",@"保存图片"] CompleterBlock:^(NSString *sheet) {
  1310 + if ([sheet isEqualToString:@"转发好友"]) {
  1311 + [[CNLiveCommuntyModule shareInstance].protocol pushPayResultWithForwardFriendsWithImageData:UIImagePNGRepresentation(imageView.image)];
  1312 + }
  1313 + }];
1156 1314 }
1157 1315 -(void)layoutSubviews
1158 1316 {
... ... @@ -1187,6 +1345,10 @@
1187 1345 make.top.mas_equalTo(weakSelf.lineLabel.mas_bottom).offset(10);
1188 1346 make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
1189 1347 }];
  1348 + [self.receiptButton mas_makeConstraints:^(MASConstraintMaker *make) {
  1349 + make.top.mas_equalTo(weakSelf.lineLabel.mas_bottom).offset(10);
  1350 + make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-10);
  1351 + }];
1190 1352 }
1191 1353  
1192 1354 -(UIView *)mainView
... ... @@ -1240,6 +1402,18 @@
1240 1402 }
1241 1403 return _moreButton;
1242 1404 }
  1405 +-(QMUIButton *)receiptButton
  1406 +{
  1407 + if (!_receiptButton) {
  1408 + _receiptButton = [[QMUIButton alloc] init];
  1409 + [_receiptButton setTitleColor:UIColorHex(#0091FF) forState:UIControlStateNormal];
  1410 + [_receiptButton setTitle:@"电子回执单" forState:UIControlStateNormal];
  1411 + _receiptButton.titleLabel.font = DS_regular_font(14);
  1412 + _receiptButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
  1413 + [_receiptButton addTarget:self action:@selector(browerAction:) forControlEvents:UIControlEventTouchUpInside];
  1414 + }
  1415 + return _receiptButton;
  1416 +}
1243 1417 -(UILabel *)lineLabel
1244 1418 {
1245 1419 if (!_lineLabel) {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
  View file @15132d8
... ... @@ -238,7 +238,7 @@
238 238 }
239 239 if (self.showType == CNLiveCommuntListShowTypePayCost) {
240 240 CNLiveCommuntyActivityPaycostListModel * paycostModel = self.dataArray[indexPath.row];
241   - return [paycostModel.payStatus isEqualToString:@"0"]?120.0:80.0;
  241 + return [paycostModel.payStatus isEqualToString:@"0"] || [paycostModel.payType isEqualToString:@"2"] ? 120.0 : 80.0;
242 242 }
243 243 return 0.001;
244 244 }
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntPaycostViewController.m
  View file @15132d8
... ... @@ -48,7 +48,7 @@
48 48 NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([detailModel.beginTime doubleValue]/1000)];
49 49 NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([detailModel.endTime doubleValue]/1000)];
50 50 NSDateFormatter *dateFormatter_pay = [[NSDateFormatter alloc] init];
51   - [dateFormatter_pay setDateFormat:@"yyyy/MM/dd HH:mm:ss"];
  51 + [dateFormatter_pay setDateFormat:@"yyyy/MM/dd"];// HH:mm:ss
52 52 NSDate *detaildate_payTime = [NSDate dateWithTimeIntervalSince1970:([detailModel.payTime doubleValue]/1000)];
53 53 NSString * time_string = [NSString stringWithFormat:@"%@~%@",[dateFormatter stringFromDate:detaildate_beginTime],[dateFormatter stringFromDate:detaildate_endTime]];
54 54 [weakSelf.dataArray addObject:@{@"key":@"收费单位",@"value":detailModel.propertyName}];
... ... @@ -57,7 +57,13 @@
57 57 [weakSelf.dataArray addObject:@{@"key":@"账单周期",@"value":time_string}];
58 58 if ([detailModel.payStatus isEqualToString:@"1"]) {
59 59 [weakSelf.dataArray addObject:@{@"key":@"支付时间",@"value":[dateFormatter_pay stringFromDate:detaildate_payTime]}];
60   - [weakSelf.dataArray addObject:@{@"key":@"缴费人",@"value":[detailModel.payerName isNotBlank]?detailModel.payerName:@""}];
  60 + if ([detailModel.payType isEqualToString:@"2"]) {
  61 + [weakSelf.dataArray addObject:@{@"key":@"缴费方式",@"value":[detailModel.bankPayType isEqualToString:@"1"]?@"微信支付":@"支付宝支付"}];
  62 + [weakSelf.dataArray addObject:@{@"key":@"缴费人",@"value":[detailModel.payerName isNotBlank]?detailModel.payerName:@""}];
  63 + }else{
  64 + [weakSelf.dataArray addObject:@{@"key":@"缴费方式",@"value":@"现金支付"}];
  65 + }
  66 +
61 67 }
62 68 [weakSelf.tableView reloadData];
63 69  
... ...
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
  View file @15132d8
... ... @@ -24,7 +24,7 @@
24 24 [IQKeyboardManager sharedManager].enable = YES;
25 25 [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
26 26  
27   - [CNUserInfoManager manager].userInfoModel.uid = @"10504761";//@"10458139";//@"145680";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
  27 + [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"10504761";//@"145680";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
28 28  
29 29 // [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
30 30 // [[NSUserDefaults standardUserDefaults] synchronize];
... ...
Example/CNLiveCommuntyModule/CNLIVEViewController.m
  View file @15132d8
... ... @@ -32,6 +32,7 @@
32 32 #import <CNLiveEnvironment/CNLiveEnvironment.h>
33 33 #import <CNLiveUserManagement/CNUserInfoManager.h>
34 34 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
  35 +#import <CNLivePhotoBrowser/CNLivePhotoBrowser.h>
35 36 @interface CNLIVEViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
36 37 @property (nonatomic, strong) UITableView * tableView;
37 38 @property (nonatomic, strong) NSMutableArray * dataArray;
... ... @@ -77,19 +78,34 @@
77 78 make.edges.mas_equalTo(self.view);
78 79 }];
79 80  
80   - int h = 23;//小时数
81   - float mun = 61245.98;//3月累计
82   - float s = ((21 * 91.954) + 16400);//四月前累计
83   - float w = ((h * 91.954) + 16400);//五月前累计
84   - float kou = 2276.25 + 5000 + 1500 + 400;//每月扣
  81 +// int h = 30.5;//小时数
  82 +// float mun = 61245.98;//3月累计
  83 +// float s = ((21 * 91.954) + 16400);//四月前累计
  84 +// float w = ((h * 91.954) + 16400);//五月前累计
  85 +// float kou = 2276.25 + 5000 + 1500 + 400;//每月扣
85 86  
86   - float z = (w + s + mun) - (kou * 5);
87   - float sui = (z * 0.1) - 2520 - 1767.20;
88   - NSLog(@"税=>%.2f",sui);
89   - float dao = w - 2276.25 - sui;
90   - NSLog(@"到=>%.2f",dao);
91   -
  87 +// float z = (w + s + mun) - (kou * 5) - 2000;
  88 +// float sui = (z * 0.1) - 2520 - 1767.20;
  89 +// NSLog(@"税=>%.2f",sui);
  90 +// float dao = w - 2276.25 - sui;
  91 +// NSLog(@"到=>%.2f",dao);
92 92  
  93 +// UIImageView * imageView = [CNLiveCommuntSignUpView showContentViewWithParamPaycostModel:nil];
  94 +// [self.view addSubview:imageView];
  95 +// imageView.userInteractionEnabled = YES;
  96 +// [imageView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithActionBlock:^(id _Nonnull sender) {
  97 +// [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:@[imageView] MediaURLArray:@[imageView.image] CurrentIndex:0 ShowType:CNLivePhotoBrowserShowTypeImage Sheet:nil CompleterBlock:^(NSString *sheet) {
  98 +//
  99 +// }];
  100 +// }]];
  101 +// [imageView mas_makeConstraints:^(MASConstraintMaker *make) {
  102 +// make.top.mas_equalTo(self.view.mas_top).offset(100);
  103 +// make.centerX.mas_equalTo(self.view);
  104 +// make.height.mas_equalTo(100);
  105 +// make.left.mas_equalTo(self.view.mas_left).offset(10);
  106 +// make.right.mas_equalTo(self.view.mas_right).offset(-10);
  107 +// }];
  108 +//
93 109  
94 110 // __block NSArray * array = @[@"123",@"123",@"123",@"123",@"123",@"123"];
95 111 // __block NSMutableString *picString = [[NSMutableString alloc] init];
... ... @@ -146,8 +162,9 @@
146 162 // CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
147 163 // [self.navigationController pushViewController:repairView animated:YES];
148 164 // [BHRouter openURL:[NSURL URLWithString:@"com.cnlive.CNLiveNetAdd://jump.vc.beehive/CNLiveCommuntActiviRepairViewController.push"]];
149   -
150   - CNLiveCommuntListViewController * listView = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypePayCost NBhdId:@"72"];//@"53"];
  165 + NSString * nb_info = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
  166 + NSDictionary * dict = [nb_info mj_JSONObject];
  167 + CNLiveCommuntListViewController * listView = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypePayCost NBhdId:[dict stringValueForKey:@"id" default:@""]];//@"53"];
151 168 [self.navigationController pushViewController:listView animated:YES];
152 169 }
153 170 if (indexPath.row == 3) {
... ...