0.0.5

liushiyu
1 parent 2647ce11
Showing 10 changed files with 36 additions and 22 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.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
Example/CNLiveCommuntyModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.4'
+  s.version          = '0.0.5'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -79,11 +79,13 @@
     self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.tableFooterView = [self setTableViewFooterView];
+    
+    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
 }
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
+
 }
 -(void)rightMothodAction
 {
@@ -92,16 +92,18 @@
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.backgroundColor = UIColorHex(#f9f9f9);
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-}
--(void)layoutTableView
-{
-    [super layoutTableView];
+    
     __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)layoutTableView
+{
+    [super layoutTableView];
+
+}
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
 {
@@ -89,6 +89,9 @@
     self.tableView.dataSource = self;
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.tableFooterView = [[UIView alloc] init];
+    
+    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
+    self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
 }
 -(void)dealloc
 {
@@ -97,8 +100,7 @@
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
-    self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
+
 }
 -(void)setupWithBottemView:(NSInteger)totalPrice
 {
@@ -53,11 +53,12 @@
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
+    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
 }
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
+
 }
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
@@ -234,16 +234,17 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.backgroundColor = UIColorHex(#f9f9f9);
-}
--(void)layoutTableView
-{
-    [super layoutTableView];
     self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
     if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
         || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
         self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
     }
 }
+-(void)layoutTableView
+{
+    [super layoutTableView];
+
+}
 -(void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kCNLiveHiddenModalViewWithQrNotification object:nil];
@@ -427,7 +428,7 @@
     if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
         UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
         view.backgroundColor = [UIColor clearColor];
-        
+
         UIView * radiusView = [[UIView alloc] initWithFrame:CGRectMake(10, 0, kScreenWidth - 20, 10)];
         radiusView.backgroundColor = [UIColor whiteColor];
         radiusView.layer.shadowColor = [UIColor blackColor].CGColor;
@@ -439,7 +440,7 @@
         maskLayer.path = maskPath.CGPath;
         radiusView.layer.mask = maskLayer;
         [view insertSubview:radiusView belowSubview:view];
-        
+
         return view;
     }else{
         return nil;
@@ -96,12 +96,13 @@
     self.tableView.tableFooterView = [[UIView alloc] init];
     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);
 }
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
-    self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
+
 }
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
@@ -40,11 +40,12 @@
     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);
 }
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight - kVerticalTopHeight);
+
 }
 -(NSMutableArray *)dataSource
 {
@@ -108,12 +108,13 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     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);
 }
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
-    self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
+
 }
 /// 跳转删除人员
@@ -24,6 +24,7 @@
 #import <Masonry/Masonry.h>
 #import <MJExtension/MJExtension.h>
 #import <YYText/YYText.h>
+#import "BHRouter.h"
 #import "CNLiveCommuntViewModel.h"
 #import "CNLiveCommuntSignUpView.h"
 #import "CNLiveCommuntyResultListViewController.h"
@@ -123,8 +124,10 @@
 //        [[NSUserDefaults standardUserDefaults] synchronize];
     }
     if (indexPath.row == 2) {
-        CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
-        [self.navigationController pushViewController:repairView animated:YES];
+//        CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
+//        [self.navigationController pushViewController:repairView animated:YES];
+        [BHRouter openURL:[NSURL URLWithString:@"com.cnlive.CNLiveNetAdd://jump.vc.beehive/CNLiveCommuntActiviRepairViewController.push"]];
+        
     }
     if (indexPath.row == 3) {
         NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];