0.0.6

liushiyu
1 parent 3a33efd3
Showing 8 changed files with 27 additions and 17 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyResultListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserListViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.5'
+  s.version          = '0.0.6'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -78,9 +78,12 @@
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    self.tableView.tableFooterView = [self setTableViewFooterView];
+//    self.tableView.tableFooterView = [self setTableViewFooterView];
+    UIView * footerView = [self setTableViewFooterView];
+    [self.view addSubview:footerView];
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
+    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
+
 }
 -(void)layoutTableView
 {
@@ -111,7 +114,9 @@
 {
     NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
-    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, [nb_info isNotBlank]?90:70)];
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, [nb_info isNotBlank]?90:70, 0);
+    
+    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreenHeight - ([nb_info isNotBlank]?90:70), kScreenWidth, [nb_info isNotBlank]?90:70)];
     footerView.backgroundColor = [UIColor whiteColor];
     if ([nb_info isNotBlank]) {
@@ -151,7 +156,7 @@
     UIButton * submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     submitBtn.backgroundColor = UIColorHex(#CD0302);
-    submitBtn.frame = CGRectMake(10, 40, kScreenWidth - 20, 40);
+    submitBtn.frame = CGRectMake(10, [nb_info isNotBlank]?40:20, kScreenWidth - 20, 40);
     submitBtn.layer.cornerRadius = 20;
     submitBtn.layer.masksToBounds = YES;
     [submitBtn setTitle:@"提交" forState:UIControlStateNormal];
@@ -91,7 +91,7 @@
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
-    self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
 }
 -(void)dealloc
 {
@@ -128,7 +128,7 @@
     priceLabel.hidden = unitPrice == 0.00;
     [bottemView addSubview:priceLabel];
     [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(bottemView);
+        make.top.mas_equalTo(bottemView.mas_top).offset(7);
         make.left.mas_equalTo(bottemView).offset(10);
     }];
@@ -54,6 +54,7 @@
     self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
     self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, 0, 0);
 }
 -(void)layoutTableView
 {
@@ -149,7 +149,7 @@
             [self.payButton addTarget:self action:@selector(payResultAction:) forControlEvents:UIControlEventTouchUpInside];
             [self.bottemView addSubview:self.payButton];
             [self.payButton mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.centerY.mas_equalTo(weakSelf.bottemView);
+                make.top.mas_equalTo(weakSelf.bottemView.mas_top).offset(7);
                 make.right.mas_equalTo(weakSelf.bottemView.mas_right).offset(-10);
                 make.left.mas_equalTo(weakSelf.bottemView.mas_left).offset(10);
                 make.height.mas_equalTo(36);
@@ -237,7 +237,9 @@
     self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
     if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
         || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
-        self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
+        self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
+    }else{
+        self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 0, 0);
     }
 }
 -(void)layoutTableView
@@ -406,8 +408,8 @@
         nameLabel.textColor = UIColorHex(#333333);
         nameLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         nameLabel.numberOfLines = 1;
-        nameLabel.font = [UIFont systemFontOfSize:15];
-        nameLabel.font = [UIFont boldSystemFontOfSize:15];
+        nameLabel.font = [UIFont systemFontOfSize:14];
+        nameLabel.font = [UIFont boldSystemFontOfSize:14];
         nameLabel.text = section == 0 ? [NSString stringWithFormat:@"订单编号：%@",self.createMdoel.idStr]:@"进度详情";
         [view addSubview:nameLabel];
         [nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -81,7 +81,7 @@
         priceLabel.attributedText = str;
         [bottemView addSubview:priceLabel];
         [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerY.mas_equalTo(bottemView);
+            make.top.mas_equalTo(bottemView.mas_top).offset(7);
             make.right.mas_equalTo(bottemView.mas_right).offset(-10);
         }];
     }
@@ -97,7 +97,7 @@
     self.tableView.backgroundColor = UIColorHex(#f9f9f9);
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
-    self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
 }
 -(void)layoutTableView
 {
@@ -40,7 +40,9 @@
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
+    
+    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, 60 + kVerticalBottomSafeHeight, 0);
 }
 -(void)layoutTableView
 {
@@ -83,7 +85,7 @@
     [payButton addTarget:self action:@selector(saveAction:) forControlEvents:UIControlEventTouchUpInside];
     [bottemView addSubview:payButton];
     [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(bottemView);
+        make.top.mas_equalTo(bottemView.mas_top).offset(7);
         make.right.mas_equalTo(bottemView.mas_right).offset(-10);
         make.height.mas_equalTo(36);
         make.width.mas_equalTo(kScreenWidth - 30);
@@ -82,7 +82,7 @@
         [payButton addTarget:self action:@selector(doneAction:) forControlEvents:UIControlEventTouchUpInside];
         [bottemView addSubview:payButton];
         [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerY.mas_equalTo(bottemView);
+            make.top.mas_equalTo(bottemView.mas_top).offset(7);
             make.right.mas_equalTo(bottemView.mas_right).offset(-10);
             make.height.mas_equalTo(36);
             make.width.mas_equalTo(kScreenWidth - 30);
@@ -109,7 +109,7 @@
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.backgroundColor = UIColorHex(#F9F9F9);
     self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
-    self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
 }
 -(void)layoutTableView
 {