iOS Team / CNLiveCommuntyModule · Commits

Commit 8dddf2b3f08152f52808bade4de7a6b24e0489fc

Authored by liushiyu
1 parent 3a33efd3

0.0.6

Inline Side-by-side
Showing 8 changed files with 27 additions and 17 deletions
CNLiveCommuntyModule.podspec
  View file @8dddf2b
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCommuntyModule'
11   - s.version = '0.0.5'
  11 + s.version = '0.0.6'
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/ViewController/CNLiveCommuntInformViewController.m
  View file @8dddf2b
... ... @@ -78,9 +78,12 @@
78 78 self.tableView.tableFooterView = [[UIView alloc] init];
79 79 self.tableView.backgroundColor = [UIColor whiteColor];
80 80 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
81   - self.tableView.tableFooterView = [self setTableViewFooterView];
  81 +// self.tableView.tableFooterView = [self setTableViewFooterView];
  82 + UIView * footerView = [self setTableViewFooterView];
  83 + [self.view addSubview:footerView];
82 84  
83   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
  85 + self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
  86 +
84 87 }
85 88 -(void)layoutTableView
86 89 {
... ... @@ -111,7 +114,9 @@
111 114 {
112 115 NSString * nb_info = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
113 116  
114   - UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, [nb_info isNotBlank]?90:70)];
  117 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, [nb_info isNotBlank]?90:70, 0);
  118 +
  119 + UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreenHeight - ([nb_info isNotBlank]?90:70), kScreenWidth, [nb_info isNotBlank]?90:70)];
115 120 footerView.backgroundColor = [UIColor whiteColor];
116 121  
117 122 if ([nb_info isNotBlank]) {
... ... @@ -151,7 +156,7 @@
151 156  
152 157 UIButton * submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
153 158 submitBtn.backgroundColor = UIColorHex(#CD0302);
154   - submitBtn.frame = CGRectMake(10, 40, kScreenWidth - 20, 40);
  159 + submitBtn.frame = CGRectMake(10, [nb_info isNotBlank]?40:20, kScreenWidth - 20, 40);
155 160 submitBtn.layer.cornerRadius = 20;
156 161 submitBtn.layer.masksToBounds = YES;
157 162 [submitBtn setTitle:@"提交" forState:UIControlStateNormal];
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
  View file @8dddf2b
... ... @@ -91,7 +91,7 @@
91 91 self.tableView.tableFooterView = [[UIView alloc] init];
92 92  
93 93 self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
94   - self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
  94 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
95 95 }
96 96 -(void)dealloc
97 97 {
... ... @@ -128,7 +128,7 @@
128 128 priceLabel.hidden = unitPrice == 0.00;
129 129 [bottemView addSubview:priceLabel];
130 130 [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
131   - make.centerY.mas_equalTo(bottemView);
  131 + make.top.mas_equalTo(bottemView.mas_top).offset(7);
132 132 make.left.mas_equalTo(bottemView).offset(10);
133 133 }];
134 134  
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
  View file @8dddf2b
... ... @@ -54,6 +54,7 @@
54 54 self.tableView.backgroundColor = [UIColor whiteColor];
55 55 self.tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
56 56 self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
  57 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, 0, 0);
57 58 }
58 59 -(void)layoutTableView
59 60 {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
  View file @8dddf2b
... ... @@ -149,7 +149,7 @@
149 149 [self.payButton addTarget:self action:@selector(payResultAction:) forControlEvents:UIControlEventTouchUpInside];
150 150 [self.bottemView addSubview:self.payButton];
151 151 [self.payButton mas_makeConstraints:^(MASConstraintMaker *make) {
152   - make.centerY.mas_equalTo(weakSelf.bottemView);
  152 + make.top.mas_equalTo(weakSelf.bottemView.mas_top).offset(7);
153 153 make.right.mas_equalTo(weakSelf.bottemView.mas_right).offset(-10);
154 154 make.left.mas_equalTo(weakSelf.bottemView.mas_left).offset(10);
155 155 make.height.mas_equalTo(36);
... ... @@ -237,7 +237,9 @@
237 237 self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
238 238 if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
239 239 || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
240   - self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
  240 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
  241 + }else{
  242 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 0, 0);
241 243 }
242 244 }
243 245 -(void)layoutTableView
... ... @@ -406,8 +408,8 @@
406 408 nameLabel.textColor = UIColorHex(#333333);
407 409 nameLabel.lineBreakMode = NSLineBreakByTruncatingTail;
408 410 nameLabel.numberOfLines = 1;
409   - nameLabel.font = [UIFont systemFontOfSize:15];
410   - nameLabel.font = [UIFont boldSystemFontOfSize:15];
  411 + nameLabel.font = [UIFont systemFontOfSize:14];
  412 + nameLabel.font = [UIFont boldSystemFontOfSize:14];
411 413 nameLabel.text = section == 0 ? [NSString stringWithFormat:@"订单编号：%@",self.createMdoel.idStr]:@"进度详情";
412 414 [view addSubview:nameLabel];
413 415 [nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyResultListViewController.m
  View file @8dddf2b
... ... @@ -81,7 +81,7 @@
81 81 priceLabel.attributedText = str;
82 82 [bottemView addSubview:priceLabel];
83 83 [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
84   - make.centerY.mas_equalTo(bottemView);
  84 + make.top.mas_equalTo(bottemView.mas_top).offset(7);
85 85 make.right.mas_equalTo(bottemView.mas_right).offset(-10);
86 86 }];
87 87 }
... ... @@ -97,7 +97,7 @@
97 97 self.tableView.backgroundColor = UIColorHex(#f9f9f9);
98 98 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
99 99 self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
100   - self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
  100 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
101 101 }
102 102 -(void)layoutTableView
103 103 {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
  View file @8dddf2b
... ... @@ -40,7 +40,9 @@
40 40 self.tableView.tableFooterView = [[UIView alloc] init];
41 41 self.tableView.backgroundColor = [UIColor whiteColor];
42 42 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
43   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
  43 +
  44 + self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
  45 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, 60 + kVerticalBottomSafeHeight, 0);
44 46 }
45 47 -(void)layoutTableView
46 48 {
... ... @@ -83,7 +85,7 @@
83 85 [payButton addTarget:self action:@selector(saveAction:) forControlEvents:UIControlEventTouchUpInside];
84 86 [bottemView addSubview:payButton];
85 87 [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
86   - make.centerY.mas_equalTo(bottemView);
  88 + make.top.mas_equalTo(bottemView.mas_top).offset(7);
87 89 make.right.mas_equalTo(bottemView.mas_right).offset(-10);
88 90 make.height.mas_equalTo(36);
89 91 make.width.mas_equalTo(kScreenWidth - 30);
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserListViewController.m
  View file @8dddf2b
... ... @@ -82,7 +82,7 @@
82 82 [payButton addTarget:self action:@selector(doneAction:) forControlEvents:UIControlEventTouchUpInside];
83 83 [bottemView addSubview:payButton];
84 84 [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
85   - make.centerY.mas_equalTo(bottemView);
  85 + make.top.mas_equalTo(bottemView.mas_top).offset(7);
86 86 make.right.mas_equalTo(bottemView.mas_right).offset(-10);
87 87 make.height.mas_equalTo(36);
88 88 make.width.mas_equalTo(kScreenWidth - 30);
... ... @@ -109,7 +109,7 @@
109 109 self.tableView.tableFooterView = [[UIView alloc] init];
110 110 self.tableView.backgroundColor = UIColorHex(#F9F9F9);
111 111 self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
112   - self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
  112 + self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
113 113 }
114 114 -(void)layoutTableView
115 115 {
... ...