0.2.2

liushiyu
1 parent d9d044b0
Showing 5 changed files with 49 additions and 16 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Core/CNLiveCommuntyModule.h
CNLiveCommuntyModule/Classes/Core/CNLiveCommuntyModule.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntPaycostViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.2.1'
+  s.version          = '0.2.2'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -40,6 +40,10 @@ static NSString *const kCNLiveHiddenModalViewWithQrNotification = @&quot;kCNLiveHidde
 /// @param nbhdId 小区id
 -(void)pushCommuntyRepairEditWithNBhdId:(NSString *)nbhdId;
+/// 跳转到缴费记录列表界面
+/// @param nbhdId 小区id
+-(void)pushCommuntyPayCostWithNBhdId:(NSString *)nbhdId;
+
 /// 跳转到支付结果界面
 /// @param status 支付结果
 -(void)pushCommuntyPayCostResultWithStatus:(BOOL)status;
@@ -99,6 +99,13 @@
     [[self displayViewController] dsPushViewController:informView animated:YES];
 }
+/// 跳转到缴费记录列表界面
+/// @param nbhdId 小区id
+-(void)pushCommuntyPayCostWithNBhdId:(NSString *)nbhdId
+{
+    CNLiveCommuntListViewController * informView = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypePayCost NBhdId:nbhdId];
+    [[self displayViewController] dsPushViewController:informView animated:YES];
+}
 /// 跳转到支付结果界面
 /// @param status 支付结果
@@ -54,6 +54,7 @@
     self.view.backgroundColor = UIColorHex(#F9F9F9);
     self.dataArray = [[NSMutableArray alloc] init];
     [self addRefreshMainView];
+    if (self.showType == CNLiveCommuntListShowTypePayCost) self.title = @"物业缴费";
 }
@@ -101,11 +102,11 @@
     self.tableView.backgroundColor = UIColorHex(#f9f9f9);
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    __weak typeof(self) weakSelf = self;
-    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(weakSelf.view).offset(kNavigationBarHeight+44);
-        make.left.right.bottom.mas_equalTo(weakSelf.view);
-    }];
+//    __weak typeof(self) weakSelf = self;
+//    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo(weakSelf.view).offset(kNavigationBarHeight+44);
+//        make.left.right.bottom.mas_equalTo(weakSelf.view);
+//    }];
 }
 -(void)initSubviews
 {
@@ -114,7 +115,18 @@
 -(void)layoutTableView
 {
     [super layoutTableView];
-
+    if (self.showType == CNLiveCommuntListShowTypePayCost) {
+        self.tableView.estimatedRowHeight = 0;
+        self.tableView.estimatedSectionFooterHeight = 0;
+        self.tableView.estimatedSectionHeaderHeight = 0;
+        self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
+    }else{
+        __weak typeof(self) weakSelf = self;
+        [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(weakSelf.view).offset(kNavigationBarHeight+44);
+            make.left.right.bottom.mas_equalTo(weakSelf.view);
+        }];
+    }
 }
 -(void)dealloc
 {
@@ -12,6 +12,7 @@
 @property (nonatomic, strong) CNLiveCommuntyActivityPaycostListModel * detailModel;
 @property (nonatomic, copy) NSString * payCostId;
 @property (nonatomic, strong) NSMutableArray * dataArray;
+@property (nonatomic, strong) UIView * footerView;
 @end
 @implementation CNLiveCommuntPaycostViewController
@@ -19,20 +20,28 @@
 {
     self = [super init];
     if (self) {
-        self.dataArray = [[NSMutableArray alloc] init];
         _payCostId = payCostId;
     }
     return self;
 }
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self loadData];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = UIColorHex(#F9F9F9);
+    self.dataArray = [[NSMutableArray alloc] init];
     self.title = @"物业费";
-    
+}
+-(void)loadData
+{
     __weak typeof(self) weakSelf = self;
     [CNLiveCommuntViewModel requestWithCommuntyPayCostDetailMentPaycostId:self.payCostId CompleterBlock:^(CNLiveCommuntyActivityPaycostListModel * _Nonnull detailModel) {
         weakSelf.detailModel = detailModel;
+        [weakSelf.dataArray removeAllObjects];
         [weakSelf.view addSubview:[weakSelf setTableViewFooterView:[NSString stringWithFormat:@"（¥%@）",detailModel.totalFee] isStatus:[detailModel.payStatus isEqualToString:@"1"]]];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy/MM"];
@@ -53,7 +62,6 @@
         [weakSelf.tableView reloadData];
     }];
 }
-
 - (void)initTableView
 {
     [super initTableView];
@@ -72,8 +80,9 @@
     self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, [nb_info isNotBlank]?(isStatus?30:90):0, 0);
-    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreenHeight - ([nb_info isNotBlank]?(isStatus?30:90):0), kScreenWidth, [nb_info isNotBlank]?(isStatus?30:90):0)];
-    footerView.backgroundColor = [UIColor whiteColor];
+    [self.footerView removeFromSuperview];
+    self.footerView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreenHeight - ([nb_info isNotBlank]?(isStatus?30:90):0) - kVerticalBottomSafeHeight, kScreenWidth, [nb_info isNotBlank]?(isStatus?30:90):0 + kVerticalBottomSafeHeight)];
+    self.footerView.backgroundColor = [UIColor whiteColor];
     if ([nb_info isNotBlank]) {
         CNLiveCommuntyHomeListModel * listModel = [CNLiveCommuntyHomeListModel mj_objectWithKeyValues:nb_info];
@@ -103,12 +112,12 @@
             [[self displayViewController] presentViewController:alert animated:YES completion:nil];
         }];
         phoneLabel.attributedText = textAttributedString;
-        [footerView addSubview:phoneLabel];
+        [self.footerView addSubview:phoneLabel];
         UILabel * lineLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 30, kScreenWidth - 20, 0.5)];
         lineLabel.backgroundColor = UIColorHex(#E6E6E6);
         lineLabel.hidden = isStatus;
-        [footerView addSubview:lineLabel];
+        [self.footerView addSubview:lineLabel];
     }
     UIButton * submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -116,13 +125,14 @@
     submitBtn.frame = CGRectMake(10, [nb_info isNotBlank]?40:20, kScreenWidth - 20, isStatus?0:40);
     submitBtn.layer.cornerRadius = 20;
     submitBtn.layer.masksToBounds = YES;
+    submitBtn.hidden = isStatus;
     [submitBtn setTitle:[NSString stringWithFormat:@"立即缴费%@",priceString] forState:UIControlStateNormal];
     submitBtn.titleLabel.font = [UIFont systemFontOfSize:16];
     submitBtn.titleLabel.font = [UIFont boldSystemFontOfSize:16];
     [submitBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     [submitBtn addTarget:self action:@selector(submitRequestAction:) forControlEvents:UIControlEventTouchUpInside];
-    [footerView addSubview:submitBtn];
-    return footerView;
+    [self.footerView addSubview:submitBtn];
+    return self.footerView;
 }
 -(void)submitRequestAction:(UIButton *)button
 {