0.0.4

liushiyu
1 parent f16a8aa8
Showing 18 changed files with 303 additions and 82 deletions
CNLiveCommunitModule.podspec
CNLiveCommunitModule/Assets/CNLiveCommunitModule.bundle/c_community_service_location.png
CNLiveCommunitModule/Assets/CNLiveCommunitModule.bundle/c_community_service_location@2x.png
CNLiveCommunitModule/Assets/CNLiveCommunitModule.bundle/c_community_service_location@3x.png
CNLiveCommunitModule/Classes/Core/CNLiveCommunitHeader.h
CNLiveCommunitModule/Classes/Core/CNLiveCommunitModuleProtocol.h
CNLiveCommunitModule/Classes/Core/CNLiveCommuntyModule.m
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntActiviViewController.h
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntActiviViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntConsuViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntServiceViewController.h
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntServiceViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
CNLiveCommunitModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommunitModule/CNLiveCommunitModuleImpl.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommunitModule'
-  s.version          = '0.0.3'
+  s.version          = '0.0.4'
   s.summary          = 'A short description of CNLiveCommunitModule.'
 # This description is used to generate tags and improve search results.
@@ -58,6 +58,6 @@
 static NSString *const kCNLiveCommuntyNBhdIdIdentifier = @"kCNLiveCommuntyNBhdIdIdentifier";
-
+static NSString *const kCNLiveCommuntyNBhdNameIdentifier = @"kCNLiveCommuntyNBhdNameIdentifier";
 #endif /* CNLiveCommunitHeader_h */
@@ -13,10 +13,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// 获取主工程的WebView
 /// @param webUrl url
--(UIViewController *)pushWebViewWithMainProjectWithWebUrl:(NSString *)webUrl;
+-(UIViewController *)pushWebViewWithMainProjectWithWebUrl:(NSString *)webUrl type:(NSString *)type;
 /// 用主工程的webView打开
-/// @param webUrl url
+/// @param paramDict url
 -(void)pushWebViewWithMainProjectWithParamDict:(NSDictionary *)paramDict;
 /// 调用工程中支付功能
@@ -39,9 +39,11 @@
     NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdIdIdentifier];
     if ([nbhdId isNotBlank]) {
         CNLiveCommuntViewController * homeVC = [[CNLiveCommuntViewController alloc] initWithNBhdId:nbhdId];
+        homeVC.hidesBottomBarWhenPushed = YES;
         [[CNLiveCommuntTools cCommunt_currentViewController].navigationController pushViewController:homeVC animated:YES];
     }else{
         CNLiveCommuntyHomeListViewController * homeListVC = [[CNLiveCommuntyHomeListViewController alloc] init];
+        homeListVC.hidesBottomBarWhenPushed = YES;
         [[CNLiveCommuntTools cCommunt_currentViewController].navigationController pushViewController:homeListVC animated:YES];
     }
 }
@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *idStr;
 @property (nonatomic, copy) NSString *cmsPageId;
 @property (nonatomic, copy) NSString *cmsPageType;
+@property (nonatomic, copy) NSString *cmsPageUrl;
 @property (nonatomic, copy) NSString *type;
 @property (nonatomic, copy) NSString *columnName;
 @property (nonatomic, copy) NSString *columnImgUncheck;
@@ -33,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *columnImg;
 @property (nonatomic, copy) NSString *idStr;
 @property (nonatomic, copy) NSString *type;
+@property (nonatomic, copy) NSString *cmsPageUrl;
 @property (nonatomic, copy) NSString *cmsPageId;
 @property (nonatomic, copy) NSString *cmsPageType;
 @property (nonatomic, copy) NSString *columnName;
@@ -77,7 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *age;
 /**0未缴费 1已缴费*/
 @property (nonatomic, copy) NSString *paymentStatus;
-/**自己定义 0未开始 1进行中 2已结束 3待评价 4退款*/
+/**活动状态 0草稿 1活动已发布 2活动已取消*/
 @property (nonatomic, copy) NSString *status;
 @property (nonatomic, copy) NSString *createUser;
 @property (nonatomic, copy) NSString *handworkName;
@@ -28,6 +28,14 @@ MJCodingImplementation
             [self.titles addObject:[subDict stringValueForKey:@"columnName" default:@""]];
         }
     }
+#ifdef DEBUG
+    if ([property.name isEqualToString:@"cmsPageUrl"]) {
+        if (oldValue == nil || [oldValue isKindOfClass:NSNull.class]) {
+            oldValue = @"https://www.baidu.com";
+        }
+    }
+#else
+#endif
     return oldValue;
 }
 @end
@@ -40,7 +48,18 @@ MJCodingImplementation
 {
     return @{@"idStr":@"id"};
 }
-
+- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
+{
+#ifdef DEBUG
+    if ([property.name isEqualToString:@"cmsPageUrl"]) {
+        if (oldValue == nil || [oldValue isKindOfClass:NSNull.class]) {
+            oldValue = @"https://www.baidu.com";
+        }
+    }
+#else
+#endif
+    return oldValue;
+}
 @end
@@ -9,14 +9,11 @@
 NS_ASSUME_NONNULL_BEGIN
-typedef enum : NSUInteger {
-    CNLiveCommuntActiviShowTypeLive,//显示视讯列表界面内容
-    CNLiveCommuntActiviShowTypeWeb//使用内置网页
-} CNLiveCommuntActiviShowType;
-
 @interface CNLiveCommuntActiviViewController : DSBaseViewController<JXCategoryListContentViewDelegate>
-
+/// 初始化网页界面显示
+/// @param webUrl 内容URL
+- (instancetype)initWithWebUrl:(NSString *)webUrl isRootVC:(BOOL)isRootVC Type:(NSString *)type;
 @end
 NS_ASSUME_NONNULL_END
@@ -8,35 +8,119 @@
 #import "CNLiveCommuntActiviViewController.h"
 @interface CNLiveCommuntActiviViewController ()
-@property (nonatomic, assign) CNLiveCommuntActiviShowType showType;
+@property (nonatomic, strong) WKWebView *webView;
+@property (nonatomic, copy) NSString *webUrl;
+@property (nonatomic, assign) BOOL isLoading;
+@property (nonatomic, assign) BOOL isRootVC;
+@property (nonatomic, copy) NSString * type;
 @end
 @implementation CNLiveCommuntActiviViewController
-- (instancetype)initWithShowType:(CNLiveCommuntActiviShowType)showType
+- (instancetype)initWithWebUrl:(NSString *)webUrl isRootVC:(BOOL)isRootVC Type:(NSString *)type
 {
     self = [super init];
     if (self) {
-        _showType = showType;
+        _isRootVC = isRootVC;
+        _webUrl = webUrl;
+        _isRootVC = isRootVC;
+        _type = type;
     }
     return self;
 }
-
+- (void)dealloc
+{
+    UIViewController *vc = self.childViewControllers[0];
+    if (([self searchProperties:[vc class] string:@"webView"] || [self searchProperties:[vc.superclass class] string:@"webView"])&&[vc valueForKey:@"webView"]&&[[vc valueForKey:@"webView"] isKindOfClass:[WKWebView class]]) {
+        WKWebView *webView = (WKWebView *)[vc valueForKey:@"webView"];
+        if ([webView.scrollView valueForKey:@"mj_header"]) {
+            id header = [webView.scrollView valueForKey:@"mj_header"];
+                [header removeObserver:self forKeyPath:@"state"];
+        }
+    }
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    UIViewController *subVC = [UIViewController new];
-    if (self.showType == CNLiveCommuntActiviShowTypeLive) {
-        subVC = [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithWebUrl:@"https://www.baidu.com"];
-    }
-    if (self.showType == CNLiveCommuntActiviShowTypeWeb) {
-        subVC = [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithWebUrl:@"https://gitee.com"];
-    }
+    UIViewController *subVC = [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithWebUrl:self.webUrl type:self.type];
     [self.view addSubview:subVC.view];
     [self addChildViewController:subVC];
     [subVC didMoveToParentViewController:self];
+    if (self.isRootVC) {
+        [subVC.view mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(kNavigationBarHeight);
+            make.left.bottom.right.mas_equalTo(self.view);
+        }];
+    }
+
+    
+    UIViewController *vc = self.childViewControllers[0];
+    if (([self searchProperties:[vc class] string:@"webView"]||[self searchProperties:[vc.superclass class] string:@"webView"]) && [vc valueForKey:@"webView"] && [[vc valueForKey:@"webView"] isKindOfClass:[WKWebView class]]) {
+        self.webView = (WKWebView *)[vc valueForKey:@"webView"];
+        [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
+            if (self.isRootVC) {
+                make.top.mas_equalTo(kNavigationBarHeight);
+            }else{
+                make.top.mas_equalTo(self.view);
+            }
+            make.left.bottom.right.mas_equalTo(self.view);
+        }];
+        if (!self.isLoading) [self.webView.scrollView.mj_header beginRefreshing];
+        if ([self.webView.scrollView valueForKey:@"mj_header"]) {
+            id header = [self.webView.scrollView valueForKey:@"mj_header"];
+            [header addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:nil];
+        }
+    }
+    if (self.isRootVC) [self initNav];
+}
+
+-(void)initNav
+{
+    self.topNavView.backgroundColor = [UIColor whiteColor];
+    self.topLine.backgroundColor = [UIColor whiteColor];
+
+    DSNavButton * searchBtn = [[DSNavButton alloc] initWithImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communit_back"]];
+    [searchBtn addTarget:self action:@selector(leftNavBtnAction) forControlEvents:UIControlEventTouchUpInside];
+    self.leftNavBtns = @[searchBtn];
+}
+
+-(void)leftNavBtnAction
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (BOOL)searchProperties:(Class)cls string:(NSString *)key
+{
+    unsigned int count;
+    objc_property_t *properties = class_copyPropertyList(cls, &count);
+    for (int i = 0; i < count; i++) {
+        objc_property_t property = properties[i];
+        const char *cName = property_getName(property);
+        NSString *name = [NSString stringWithCString:cName encoding:NSUTF8StringEncoding];
+        if ([name isEqualToString:key]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+#pragma mark - KVO
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
+{
+    NSLog(@"%@:%@",object,change);
+    if ([keyPath isEqualToString:@"state"]) {
+        NSString *state = change[NSKeyValueChangeNewKey];
+        if (state.integerValue == 1) {
+            [self performSelector:@selector(delayAction) afterDelay:1];
+        }else{
+            self.isLoading = YES;
+        }
+    }
+}
+- (void)delayAction{
+    self.isLoading = NO;
 }
 - (UIView *)listView {
@@ -6,7 +6,7 @@
 //
 #import "CNLiveCommuntConsuViewController.h"
-
+#import "CNLiveCommuntServiceViewController.h"
 static NSInteger const kCNLiveSectionTitleHeight = 44;//标题显示
 @interface CNLiveCommuntConsuViewController ()<JXCategoryViewDelegate,JXCategoryListContainerViewDelegate>
@@ -106,18 +106,14 @@ static NSInteger const kCNLiveSectionTitleHeight = 44;//标题显示
             if ([homeModel.type isEqualToString:@"2"]) {//公益活动
                 [_viewControllers addObject:[[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypeHome NBhdId:self.nbhdId]];
             }else{
-                if ([homeModel.cmsPageType isEqualToString:@"1"]) {//调用H5
-                    [_viewControllers addObject:[[CNLiveCommuntActiviViewController alloc] init]];
-                }
                 if ([homeModel.cmsPageType isEqualToString:@"4"]) {//调用视讯
-                    [_viewControllers addObject:[[CNLiveCommuntActiviViewController alloc] init]];
-                }
-#ifdef DEBUG
-                if (![homeModel.cmsPageType isNotBlank]) {
-                    [_viewControllers addObject:[[CNLiveCommuntActiviViewController alloc] init]];
+                    CNLiveCommuntServiceViewController * vc = [[CNLiveCommuntServiceViewController alloc] initWithHomeSubModel:homeModel isRootVC:NO isShowLocation:NO];
+                    vc.title = homeModel.columnName;
+                    vc.view.backgroundColor = [UIColor whiteColor];
+                    [_viewControllers addObject:vc];
+                }else{
+                    [_viewControllers addObject:[[CNLiveCommuntActiviViewController alloc] initWithWebUrl:[homeModel.cmsPageUrl isNotBlank]?homeModel.cmsPageUrl:@"" isRootVC:NO Type:homeModel.cmsPageType]];
                 }
-#else
-#endif
             }
         }
     }
@@ -9,8 +9,9 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveCommuntServiceViewController : DSBaseViewController
-
+@interface CNLiveCommuntServiceViewController : DSBaseViewController<JXCategoryListContentViewDelegate>
+- (instancetype)initWithHomeModel:(CNLiveCommuntyHomeModel *)homeModel isRootVC:(BOOL)isRootVC isShowLocation:(BOOL)isShowLocation;
+- (instancetype)initWithHomeSubModel:(CNLiveCommuntySubHomeModel *)homeSubModel isRootVC:(BOOL)isRootVC isShowLocation:(BOOL)isShowLocation;
 @end
 NS_ASSUME_NONNULL_END
@@ -10,20 +10,102 @@
 #define kGNCOLGRIDVIEWID @"GNCOLGRIDVIEWID"
-@interface CNLiveCommuntServiceViewController ()<UICollectionViewDataSource, UICollectionViewDelegate>
-@property (nonatomic, strong) UICollectionView * collectionView;
-
+@interface CNLiveCommuntServiceViewController ()
+@property (nonatomic, strong) CNLiveCommuntyHomeModel * homeModel;
+@property (nonatomic, strong) CNLiveCommuntySubHomeModel * homeSubModel;
+@property (nonatomic, assign) BOOL isRootVC;
+@property (nonatomic, assign) BOOL isLoading;
+@property (nonatomic, assign) BOOL isShowLocation;
 @end
 @implementation CNLiveCommuntServiceViewController
+- (instancetype)initWithHomeModel:(CNLiveCommuntyHomeModel *)homeModel isRootVC:(BOOL)isRootVC isShowLocation:(BOOL)isShowLocation
+{
+    self = [super init];
+    if (self) {
+        _isShowLocation = isShowLocation;
+        _isRootVC = isRootVC;
+        _homeModel = homeModel;
+        _isRootVC = isRootVC;
+    }
+    return self;
+}
+- (instancetype)initWithHomeSubModel:(CNLiveCommuntySubHomeModel *)homeSubModel isRootVC:(BOOL)isRootVC isShowLocation:(BOOL)isShowLocation
+{
+    self = [super init];
+    if (self) {
+        _isShowLocation = isShowLocation;
+        _isRootVC = isRootVC;
+        _homeSubModel = homeSubModel;
+        _isRootVC = isRootVC;
+    }
+    return self;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = [UIColor whiteColor];
-    [self initNav];
+
+    NSString * cmsPageId = self.homeModel?self.homeModel.cmsPageId:self.homeSubModel.cmsPageId;
+    NSString * cmsColumnId = self.homeModel?self.homeModel.cmsColumnId:self.homeSubModel.cmsColumnId;
+    NSString * cmsPageUrl = self.homeModel?self.homeModel.cmsPageUrl:self.homeSubModel.cmsPageUrl;
+    
+    UIViewController * subVC = [[CNLiveCommuntyModule shareInstance].protocol pushLiveViewWithMainProjectWithPageId:cmsPageId ChannelName:self.homeModel.cmsColumnName ChannelId:cmsColumnId WebUrl:cmsPageUrl];
+    [self.view addSubview:subVC.view];
+    [self addChildViewController:subVC];
+    [subVC didMoveToParentViewController:self];
+    
+    if (self.isRootVC) {
+        [subVC.view mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(kNavigationBarHeight);
+            make.left.bottom.right.mas_equalTo(self.view);
+        }];
+    }
-//    [self.view addSubview:self.collectionView];
+    UIViewController *vc = self.childViewControllers[0];
+    if ([self searchProperties:[vc class] string:@"collectionView"]&&[vc valueForKey:@"collectionView"] && [[vc valueForKey:@"collectionView"] isKindOfClass:[UICollectionView class]]){
+        UICollectionView *collectionView = (UICollectionView *)[vc valueForKey:@"collectionView"];
+        if (!self.isLoading) [collectionView.mj_header beginRefreshing];
+        if ([collectionView valueForKey:@"mj_header"]) {
+            id header = [collectionView valueForKey:@"mj_header"];
+            [header addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:nil];
+        }
+    }
+
+    if (self.isRootVC) [self initNav];
+}
+- (BOOL)searchProperties:(Class)cls string:(NSString *)key
+{
+    unsigned int count;
+    objc_property_t *properties = class_copyPropertyList(cls, &count);
+    for (int i = 0; i < count; i++) {
+        objc_property_t property = properties[i];
+        const char *cName = property_getName(property);
+        NSString *name = [NSString stringWithCString:cName encoding:NSUTF8StringEncoding];
+        if ([name isEqualToString:key]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+#pragma mark - KVO
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
+{
+    NSLog(@"%@:%@",object,change);
+    if ([keyPath isEqualToString:@"state"]) {
+        NSString *state = change[NSKeyValueChangeNewKey];
+        if (state.integerValue == 1) {
+            [self performSelector:@selector(delayAction) afterDelay:1];
+        }else{
+            self.isLoading = YES;
+        }
+    }
+}
+- (void)delayAction{
+    self.isLoading = NO;
 }
 -(void)initNav
 {
@@ -33,28 +115,25 @@
     DSNavButton * searchBtn = [[DSNavButton alloc] initWithImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communit_back"]];
     [searchBtn addTarget:self action:@selector(leftNavBtnAction) forControlEvents:UIControlEventTouchUpInside];
     self.leftNavBtns = @[searchBtn];
+    
+    if (self.isShowLocation) {
+        NSString * name = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdNameIdentifier];
+        DSNavButton * rightBtn = [[DSNavButton alloc] initWithImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_community_service_location"] imageSize:CGSizeMake(15, 15) title:name font:[UIFont systemFontOfSize:10] titleColor:UIColorHex(#333333) imagePosition:DSImagePositionLeft];
+        rightBtn.size = CGSizeMake(80, self.topNavViewHeight - kStatusHeight);
+        [rightBtn addTarget:self action:@selector(rightNavBtnAction) forControlEvents:UIControlEventTouchUpInside];
+        self.rightNavBtns = @[rightBtn];
+    }
+}
+-(void)rightNavBtnAction
+{
+    CNLiveCommuntyHomeListViewController * listView = [[CNLiveCommuntyHomeListViewController alloc] init];
+    [[self displayViewController] dsPushViewController:listView animated:YES];
 }
 -(void)leftNavBtnAction
 {
     [self.navigationController popViewControllerAnimated:YES];
 }
-#pragma mark =
-//- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
-//{
-//
-//}
-#pragma mark =
--(UICollectionView *)collectionView
-{
-    if (!_collectionView) {
-        UICollectionViewFlowLayout * layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.itemSize = CGSizeMake(SCREEN_WIDTH/4, SCREEN_WIDTH/4);
-        _collectionView = [[UICollectionView alloc] initWithFrame:self.view.bounds collectionViewLayout:layout];
-        _collectionView.delegate = self;
-        _collectionView.dataSource = self;
-        _collectionView.showsVerticalScrollIndicator = NO;
-        [_collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:kGNCOLGRIDVIEWID];
-    }
-    return _collectionView;
+- (UIView *)listView {
+    return self.view;
 }
 @end
@@ -70,20 +70,32 @@
                                 [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
                             }else{
                                 if ([homeModel.type isEqualToString:@"3"]) {//生活服务界面 原生
-                                    CNLiveCommuntServiceViewController * vc = [[CNLiveCommuntServiceViewController alloc] init];
+                                    CNLiveCommuntServiceViewController * vc = [[CNLiveCommuntServiceViewController alloc] initWithHomeModel:homeModel isRootVC:YES isShowLocation:YES];
                                     vc.title = homeModel.columnName;
-                                    vc.view.backgroundColor = [UIColor cyanColor];
+                                    vc.view.backgroundColor = [UIColor whiteColor];
+                                    [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
+                                }
+                                if ([homeModel.type isEqualToString:@"2"]) {
+                                    CNLiveCommuntListViewController * vc = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypeHome NBhdId:homeModel.idStr];
+                                    vc.title = homeModel.columnName;
+                                    vc.view.backgroundColor = [UIColor whiteColor];
                                     [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
                                 }
-                                if ([homeModel.type isEqualToString:@"2"] && [homeModel.cmsPageType isEqualToString:@"1"]) {//调用主工程H5界面
-                                    CNLiveCommuntActiviViewController * vc = [[CNLiveCommuntActiviViewController alloc] init];
-                                    vc.title = @"调用主工程H5界面";
+                                if (![homeModel.type isNotBlank] && [homeModel.cmsPageType isNotBlank] && ![homeModel.cmsPageType isEqualToString:@"4"]) {
+                                    CNLiveCommuntActiviViewController * vc = [[CNLiveCommuntActiviViewController alloc] initWithWebUrl:homeModel.cmsPageUrl isRootVC:YES Type:homeModel.cmsPageType];
+                                    vc.title = homeModel.columnName;
                                     vc.view.backgroundColor = [UIColor whiteColor];
                                     [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
                                 }
-                                if ([homeModel.type isEqualToString:@"2"] && [homeModel.cmsPageType isEqualToString:@"4"]) {//调用主工程中的视讯界面 并进行传参
-                                    CNLiveCommuntActiviViewController * vc = [[CNLiveCommuntActiviViewController alloc] init];
-                                    vc.title = @"调用主工程中的视讯界面 并进行传参";
+                                if (![homeModel.type isNotBlank] && [homeModel.cmsPageType isEqualToString:@"4"]) {
+                                    CNLiveCommuntServiceViewController * vc = [[CNLiveCommuntServiceViewController alloc] initWithHomeModel:homeModel isRootVC:YES isShowLocation:NO];
+                                    vc.title = homeModel.columnName;
+                                    vc.view.backgroundColor = [UIColor whiteColor];
+                                    [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
+                                }
+                                if (![homeModel.type isNotBlank] && ![homeModel.cmsPageType isNotBlank] && [homeModel.cmsPageUrl isNotBlank]) {
+                                    CNLiveCommuntActiviViewController * vc = [[CNLiveCommuntActiviViewController alloc] initWithWebUrl:homeModel.cmsPageUrl isRootVC:YES Type:@"1"];
+                                    vc.title = homeModel.columnName;
                                     vc.view.backgroundColor = [UIColor whiteColor];
                                     [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
                                 }
@@ -126,11 +126,26 @@
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     CNLiveCommuntyHomeListModel * listModel = self.dataSource[indexPath.row];
-    [[NSUserDefaults standardUserDefaults] setObject:listModel.idStr forKey:kCNLiveCommuntyNBhdIdIdentifier];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-    CNLiveCommuntViewController * homeView = [[CNLiveCommuntViewController alloc] initWithNBhdId:listModel.idStr];
-    [self.navigationController pushViewController:homeView animated:YES];
-    
-
+    if (listModel && [listModel.idStr isNotBlank]) {
+        NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
+        for (UIViewController * vc in self.navigationController.viewControllers) {
+            if ([vc isKindOfClass:CNLiveCommuntyHomeListViewController.class]) {
+                [tempArray removeObject:vc];
+                break;
+            }
+            if ([vc isKindOfClass:CNLiveCommuntViewController.class]) {
+                [tempArray removeObject:vc];
+                break;
+            }
+        }
+        self.navigationController.viewControllers = tempArray;
+        
+        [[NSUserDefaults standardUserDefaults] setObject:listModel.idStr forKey:kCNLiveCommuntyNBhdIdIdentifier];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+        [[NSUserDefaults standardUserDefaults] setObject:listModel.name forKey:kCNLiveCommuntyNBhdNameIdentifier];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+        CNLiveCommuntViewController * homeView = [[CNLiveCommuntViewController alloc] initWithNBhdId:listModel.idStr];
+        [self.navigationController pushViewController:homeView animated:YES];
+    }
 }
 @end
@@ -59,18 +59,25 @@
         [CNLiveNetworking setupShowResult:YES];
         [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCCommuntHomeListContentURL Param:@{@"nbhdId":[nbhdId isNotBlank]?nbhdId:@""} CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
             [QMUITips hideAllTipsInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
-            [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
-                if (responseObject) {
-                    NSMutableArray * tempArray = [CNLiveCommuntyHomeModel mj_objectArrayWithKeyValuesArray:responseObject];
+            [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:NO CompleterBlock:^(id responseObject) {
+                if (responseObject && [[responseObject numberValueForKey:@"errorCode" default:@1] isEqualToNumber:@0]) {
+                    NSMutableArray * tempArray = [CNLiveCommuntyHomeModel mj_objectArrayWithKeyValuesArray:[responseObject objectForKey:@"data"]];
                     [CNLiveRespCacheManager cachePathWithObject:responseObject FileName:CNCCommuntHomeListContentURL];
                     if (tempArray.count > 0 && completerBlock) completerBlock(tempArray);
                 }else{
-                    id resp = [CNLiveRespCacheManager objectCacheWithFileName:CNCCommuntHomeListContentURL];
-                    NSMutableArray * tempArray = [CNLiveCommuntyHomeModel mj_objectArrayWithKeyValuesArray:resp];
-                    if (tempArray.count > 0) {
-                        if (completerBlock) completerBlock(tempArray);
+                    if (![[responseObject numberValueForKey:@"errorCode" default:@1] isEqualToNumber:@100062]) {
+                        id resp = [CNLiveRespCacheManager objectCacheWithFileName:CNCCommuntHomeListContentURL];
+                        NSMutableArray * tempArray = [CNLiveCommuntyHomeModel mj_objectArrayWithKeyValuesArray:resp];
+                        if (tempArray.count > 0) {
+                            if (completerBlock) completerBlock(tempArray);
+                        }else{
+                            if (completerBlock) completerBlock(nil);
+                        }
                     }else{
-                        if (completerBlock) completerBlock(nil);
+                        [QMUITips showError:[responseObject stringValueForKey:@"errorMessage" default:@""] inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:2];
+                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                            [[self displayViewController] dsPopViewControllerAnimated:YES];
+                        });
                     }
                 }
             }];
@@ -11,7 +11,7 @@
 @implementation CNLiveCommunitModuleImpl
 /// 获取主工程的WebView
 /// @param webUrl url
--(UIViewController *)pushWebViewWithMainProjectWithWebUrl:(NSString *)webUrl
+-(UIViewController *)pushWebViewWithMainProjectWithWebUrl:(NSString *)webUrl type:(NSString *)type
 {
     CNLIVEMainViewController * VC = [[CNLIVEMainViewController alloc] initWithUrl:webUrl];
     return VC;
@@ -26,6 +26,13 @@
     NSLog(@"调用支付相关参数 orderId=>%@ price=>%@ body=>%@",orderId,price,body);
 }
+/// 用主工程的webView打开
+/// @param paramDict url
+-(void)pushWebViewWithMainProjectWithParamDict:(NSDictionary *)paramDict
+{
+    
+}
+
 /// 获取主工程的视讯相关界面逻辑
 /// @param pageId 界面id
 /// @param channelName 频道名