iOS Team / CNLiveCommuntyModule · Commits

Commit 3a33efd381dc8d65969203621ed7147d455637b0

Authored by liushiyu
1 parent 2647ce11

0.0.5

Inline Side-by-side
Showing 10 changed files with 36 additions and 22 deletions
CNLiveCommuntyModule.podspec
  View file @3a33efd
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCommuntyModule'
11   - s.version = '0.0.4'
  11 + s.version = '0.0.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/ViewController/CNLiveCommuntInformViewController.m
  View file @3a33efd
... ... @@ -79,11 +79,13 @@
79 79 self.tableView.backgroundColor = [UIColor whiteColor];
80 80 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
81 81 self.tableView.tableFooterView = [self setTableViewFooterView];
  82 +
  83 + self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
82 84 }
83 85 -(void)layoutTableView
84 86 {
85 87 [super layoutTableView];
86   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
  88 +
87 89 }
88 90 -(void)rightMothodAction
89 91 {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
  View file @3a33efd
... ... @@ -92,16 +92,18 @@
92 92 self.tableView.tableFooterView = [[UIView alloc] init];
93 93 self.tableView.backgroundColor = UIColorHex(#f9f9f9);
94 94 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
95   -}
96   --(void)layoutTableView
97   -{
98   - [super layoutTableView];
  95 +
99 96 __weak typeof(self) weakSelf = self;
100 97 [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
101 98 make.top.mas_equalTo(weakSelf.view).offset(kNavigationBarHeight+44);
102 99 make.left.right.bottom.mas_equalTo(weakSelf.view);
103 100 }];
104 101 }
  102 +-(void)layoutTableView
  103 +{
  104 + [super layoutTableView];
  105 +
  106 +}
105 107 #pragma mark - DZNEmptyDataSetSource Methods
106 108 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
107 109 {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
  View file @3a33efd
... ... @@ -89,6 +89,9 @@
89 89 self.tableView.dataSource = self;
90 90 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
91 91 self.tableView.tableFooterView = [[UIView alloc] init];
  92 +
  93 + self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
  94 + self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
92 95 }
93 96 -(void)dealloc
94 97 {
... ... @@ -97,8 +100,7 @@
97 100 -(void)layoutTableView
98 101 {
99 102 [super layoutTableView];
100   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
101   - self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
  103 +
102 104 }
103 105 -(void)setupWithBottemView:(NSInteger)totalPrice
104 106 {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
  View file @3a33efd
... ... @@ -53,11 +53,12 @@
53 53 self.tableView.tableFooterView = [[UIView alloc] init];
54 54 self.tableView.backgroundColor = [UIColor whiteColor];
55 55 self.tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
  56 + self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
56 57 }
57 58 -(void)layoutTableView
58 59 {
59 60 [super layoutTableView];
60   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
  61 +
61 62 }
62 63 #pragma mark - DZNEmptyDataSetSource Methods
63 64 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
  View file @3a33efd
... ... @@ -234,16 +234,17 @@
234 234 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
235 235 self.tableView.tableFooterView = [[UIView alloc] init];
236 236 self.tableView.backgroundColor = UIColorHex(#f9f9f9);
237   -}
238   --(void)layoutTableView
239   -{
240   - [super layoutTableView];
241 237 self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
242 238 if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
243 239 || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
244 240 self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
245 241 }
246 242 }
  243 +-(void)layoutTableView
  244 +{
  245 + [super layoutTableView];
  246 +
  247 +}
247 248 -(void)dealloc
248 249 {
249 250 [[NSNotificationCenter defaultCenter] removeObserver:self name:kCNLiveHiddenModalViewWithQrNotification object:nil];
... ... @@ -427,7 +428,7 @@
427 428 if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
428 429 UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
429 430 view.backgroundColor = [UIColor clearColor];
430   -
  431 +
431 432 UIView * radiusView = [[UIView alloc] initWithFrame:CGRectMake(10, 0, kScreenWidth - 20, 10)];
432 433 radiusView.backgroundColor = [UIColor whiteColor];
433 434 radiusView.layer.shadowColor = [UIColor blackColor].CGColor;
... ... @@ -439,7 +440,7 @@
439 440 maskLayer.path = maskPath.CGPath;
440 441 radiusView.layer.mask = maskLayer;
441 442 [view insertSubview:radiusView belowSubview:view];
442   -
  443 +
443 444 return view;
444 445 }else{
445 446 return nil;
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyResultListViewController.m
  View file @3a33efd
... ... @@ -96,12 +96,13 @@
96 96 self.tableView.tableFooterView = [[UIView alloc] init];
97 97 self.tableView.backgroundColor = UIColorHex(#f9f9f9);
98 98 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
  99 + self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
  100 + self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
99 101 }
100 102 -(void)layoutTableView
101 103 {
102 104 [super layoutTableView];
103   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
104   - self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
  105 +
105 106 }
106 107 #pragma mark - DZNEmptyDataSetSource Methods
107 108 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
  View file @3a33efd
... ... @@ -40,11 +40,12 @@
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 }
44 45 -(void)layoutTableView
45 46 {
46 47 [super layoutTableView];
47   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
  48 +
48 49 }
49 50 -(NSMutableArray *)dataSource
50 51 {
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserListViewController.m
  View file @3a33efd
... ... @@ -108,12 +108,13 @@
108 108 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
109 109 self.tableView.tableFooterView = [[UIView alloc] init];
110 110 self.tableView.backgroundColor = UIColorHex(#F9F9F9);
  111 + self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
  112 + self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
111 113 }
112 114 -(void)layoutTableView
113 115 {
114 116 [super layoutTableView];
115   - self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
116   - self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
  117 +
117 118 }
118 119  
119 120 /// 跳转删除人员
... ...
Example/CNLiveCommuntyModule/CNLIVEViewController.m
  View file @3a33efd
... ... @@ -24,6 +24,7 @@
24 24 #import <Masonry/Masonry.h>
25 25 #import <MJExtension/MJExtension.h>
26 26 #import <YYText/YYText.h>
  27 +#import "BHRouter.h"
27 28 #import "CNLiveCommuntViewModel.h"
28 29 #import "CNLiveCommuntSignUpView.h"
29 30 #import "CNLiveCommuntyResultListViewController.h"
... ... @@ -123,8 +124,10 @@
123 124 // [[NSUserDefaults standardUserDefaults] synchronize];
124 125 }
125 126 if (indexPath.row == 2) {
126   - CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
127   - [self.navigationController pushViewController:repairView animated:YES];
  127 +// CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
  128 +// [self.navigationController pushViewController:repairView animated:YES];
  129 + [BHRouter openURL:[NSURL URLWithString:@"com.cnlive.CNLiveNetAdd://jump.vc.beehive/CNLiveCommuntActiviRepairViewController.push"]];
  130 +
128 131 }
129 132 if (indexPath.row == 3) {
130 133 NSString * nbhdId = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
... ...