0.2.3

liushiyu
1 parent dfeb3f64
Showing 7 changed files with 89 additions and 20 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitHeader.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntPaycostViewController.m
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.2.2'
+  s.version          = '0.2.3'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -63,4 +63,6 @@ static NSString *const kCNLiveCommuntyNBhdInfoIdentifier = @&quot;kCNLiveCommuntyNBhd
 static NSString *const kCNLiveCommuntySaveChangeUserInfoNotification = @"kCNLiveCommuntySaveChangeUserInfoNotification";
 #define isDemo [[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] isEqualToString:@"org.cocoapods.demo.CNLiveCommuntyModule-Example"]
+
+
 #endif /* CNLiveCommunitHeader_h */
@@ -1234,7 +1234,6 @@
         [_moreButton setTitleColor:UIColorHex(#C8C8C8) forState:UIControlStateNormal];
         [_moreButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communt_list_more"] forState:UIControlStateNormal];
         _moreButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
-        _moreButton.titleLabel.font = [UIFont systemFontOfSize:14.0f];
         _moreButton.imagePosition = QMUIButtonImagePositionRight;
         _moreButton.spacingBetweenImageAndTitle = 2.5;
         _moreButton.userInteractionEnabled = NO;
@@ -54,7 +54,7 @@
     self.view.backgroundColor = UIColorHex(#F9F9F9);
     self.dataArray = [[NSMutableArray alloc] init];
     [self addRefreshMainView];
-    if (self.showType == CNLiveCommuntListShowTypePayCost) self.title = @"物业缴费";
+    if (self.showType == CNLiveCommuntListShowTypePayCost) self.title = @"缴费记录";
 }
@@ -8,7 +8,7 @@
 #import "CNLiveCommuntPaycostViewController.h"
 #import "CNLiveCommuntSignUpView.h"
 #import "CNLiveCommuntyResultViewController.h"
-@interface CNLiveCommuntPaycostViewController ()
+@interface CNLiveCommuntPaycostViewController ()<DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 @property (nonatomic, strong) CNLiveCommuntyActivityPaycostListModel * detailModel;
 @property (nonatomic, copy) NSString * payCostId;
 @property (nonatomic, strong) NSMutableArray * dataArray;
@@ -60,13 +60,21 @@
             [weakSelf.dataArray addObject:@{@"key":@"缴费人",@"value":[detailModel.payerName isNotBlank]?detailModel.payerName:@""}];
         }
         [weakSelf.tableView reloadData];
+        
+//        weakSelf.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"电子回执单" style:UIBarButtonItemStylePlain target:self action:@selector(clickWithRightBarButton:)];
     }];
 }
+-(void)clickWithRightBarButton:(UIBarButtonItem *)button
+{
+    NSLog(@"电子回执单");
+}
 - (void)initTableView
 {
     [super initTableView];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
+    self.tableView.emptyDataSetSource = self;
+    self.tableView.emptyDataSetDelegate = self;
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
     self.tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
     self.tableView.tableFooterView = [[UIView alloc] init];
@@ -94,10 +102,10 @@
         phoneLabel.hidden = ![listModel.propertyPhone isNotBlank];
         phoneLabel.backgroundColor = [UIColor whiteColor];
-        NSString * string = [NSString stringWithFormat:@"物业电话 %@",listModel.propertyPhone];
+        NSString * string = [NSString stringWithFormat:@"物业电话：%@",listModel.propertyPhone];
         NSMutableAttributedString *textAttributedString = [[NSMutableAttributedString alloc] initWithString:string];
         textAttributedString.yy_font = [UIFont systemFontOfSize:10];
-        textAttributedString.yy_color = UIColorHex(#B4B4B4);
+        textAttributedString.yy_color = UIColorHex(#0091FF);
         textAttributedString.yy_alignment = NSTextAlignmentCenter;
         [textAttributedString yy_setTextHighlightRange:[string rangeOfString:listModel.propertyPhone]
                                                  color:[UIColor qmui_colorWithHexString:@"0091FF"]
@@ -141,6 +149,49 @@
         [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:orderId price:weakSelf.detailModel.totalFee body:[weakSelf.detailModel.propertyName isNotBlank]?weakSelf.detailModel.propertyName:@"物业缴费" NotifyUrl:cn_API_CommuntyApi(@"/housePropertyFeeApi/housePropertyFeeOrderNotify")];
     }];
 }
+#pragma mark - DZNEmptyDataSetSource Methods
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+
+    return [[NSAttributedString alloc] initWithString:@"暂无物业缴费详情" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16]}];
+}
+-(UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [CNLiveCommuntTools cCommunt_setImageWithName:@"c_community_content_empty"];
+}
+- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [UIColor whiteColor];
+}
+- (NSAttributedString *)buttonTitleForEmptyDataSet:(UIScrollView *)scrollView forState:(UIControlState)state
+{
+
+    return [[NSAttributedString alloc] initWithString:@"重试" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16],NSForegroundColorAttributeName:UIColorHex(#CD0302)}];
+
+}
+- (void)emptyDataSet:(UIScrollView *)scrollView didTapButton:(UIButton *)button
+{
+    [self loadData];
+}
+- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return 0;
+}
+
+- (BOOL)emptyDataSetShouldDisplay:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (BOOL)emptyDataSetShouldAllowTouch:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return NO;
+}
 #pragma mark =
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
@@ -663,7 +663,7 @@
                 CNLiveCommuntyActivityPaycostListModel * detailModel = [CNLiveCommuntyActivityPaycostListModel mj_objectWithKeyValues:responseObject];
                 if (completerBlock) completerBlock(detailModel);
             }else{
-                if (completerBlock) completerBlock(nil);
+//                if (completerBlock) completerBlock(nil);
             }
         }];
     }];
@@ -32,7 +32,7 @@
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
-@interface CNLIVEViewController ()<UITableViewDelegate,UITableViewDataSource>
+@interface CNLIVEViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
 @property (nonatomic, strong) UITableView * tableView;
 @property (nonatomic, strong) NSMutableArray * dataArray;
 @property (nonatomic, assign) BOOL isChange;
@@ -63,6 +63,9 @@
 //        // Fallback on earlier versions
 //        self.automaticallyAdjustsScrollViewInsets = NO;
 //    }
+    
+    
+    
 }
 - (void)viewDidLoad
 {
@@ -74,18 +77,32 @@
         make.edges.mas_equalTo(self.view);
     }];
-    __block NSArray * array = @[@"123",@"123",@"123",@"123",@"123",@"123"];
-    __block NSMutableString *picString = [[NSMutableString alloc] init];
-    [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        [picString appendString:obj];
-        if (array.count != idx+1) [picString appendString:@","];
-    }];
-    NSLog(@"===>%@",picString);
-    NSString * oldValue = @"1";
-    oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
-    float unitPrice = [oldValue floatValue];
-    NSString * p = [NSString stringWithFormat:@"合计: ¥%.2f",(8 * unitPrice)];
-    NSLog(@"%@  =>%f ==>%@",oldValue,unitPrice,p);
+    int h = 23;//小时数
+    float mun = 61245.98;//3月累计
+    float s = ((21 * 91.954) + 16400);//四月前累计
+    float w = ((h * 91.954) + 16400);//五月前累计
+    float kou = 2276.25 + 5000 + 1500 + 400;//每月扣
+
+    float z = (w + s + mun) - (kou * 5);
+    float sui = (z * 0.1) - 2520 - 1767.20;
+    NSLog(@"税=>%.2f",sui);
+    float dao = w - 2276.25 - sui;
+    NSLog(@"到=>%.2f",dao);
+    
+    
+    
+//    __block NSArray * array = @[@"123",@"123",@"123",@"123",@"123",@"123"];
+//    __block NSMutableString *picString = [[NSMutableString alloc] init];
+//    [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+//        [picString appendString:obj];
+//        if (array.count != idx+1) [picString appendString:@","];
+//    }];
+//    NSLog(@"===>%@",picString);
+//    NSString * oldValue = @"1";
+//    oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+//    float unitPrice = [oldValue floatValue];
+//    NSString * p = [NSString stringWithFormat:@"合计: ¥%.2f",(8 * unitPrice)];
+//    NSLog(@"%@  =>%f ==>%@",oldValue,unitPrice,p);
 }
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView