0.0.5

liushiyu
1 parent 86f6849e
Showing 16 changed files with 186 additions and 49 deletions
CNLiveCommunitModule.podspec
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommunitModule/Classes/View/CNLiveCommuntSignUpView.h
CNLiveCommunitModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommunitModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntActiviViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntEvaluaViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntServiceViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultListViewController.m
CNLiveCommunitModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommunitModule/CNLIVEViewController.m
Example/CNLiveCommunitModule/CNLiveCommunitModuleImpl.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommunitModule'
-  s.version          = '0.0.4'
+  s.version          = '0.0.5'
   s.summary          = 'A short description of CNLiveCommunitModule.'
  
 # This description is used to generate tags and improve search results.
@@ -81,6 +81,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *paymentStatus;
 /**活动状态 0草稿 1活动已发布 2活动已取消*/
 @property (nonatomic, copy) NSString *status;
+/**自己定义的  便于区分*/
+@property (nonatomic, copy) NSString *index;
 @property (nonatomic, copy) NSString *createUser;
 @property (nonatomic, copy) NSString *handworkName;
 @property (nonatomic, copy) NSString *refundAmount;
@@ -212,14 +214,31 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *signupEndTimeString;
 @end
  
+@interface CNLiveCommuntyActivitySignUpOrderModel : NSObject
+@property (nonatomic, copy) NSString *status;
+@property (nonatomic, copy) NSString *refundableBalance;
+@property (nonatomic, copy) NSString *idStr;
+@property (nonatomic, copy) NSString *transId;
+@property (nonatomic, copy) NSString *totalFee;
+@property (nonatomic, copy) NSString *updatorId;
+@property (nonatomic, copy) NSString *type;
+@property (nonatomic, copy) NSString *payType;
+@property (nonatomic, strong) NSNumber *createTime;
+@property (nonatomic, strong) NSNumber *updateTime;
+
+@property (nonatomic, copy) NSString *createTimeString;
+@property (nonatomic, copy) NSString *updateTimeString;
+@end
+
+
 @interface CNLiveCommuntyActivitySignUpModel : NSObject
 @property (nonatomic, copy) NSString * type;
 @property (nonatomic, copy) NSString * orderId;
 @property (nonatomic, copy) NSString * signsString;
 @property (nonatomic, strong) NSArray * signs;
+@property (nonatomic, strong) CNLiveCommuntyActivitySignUpOrderModel * order;
 @end
  
-
 @interface CNLiveCommuntyActivityUserDetailModel : NSObject
 @property (nonatomic, copy) NSString *gender;
 @property (nonatomic, copy) NSString *age;
@@ -371,12 +371,39 @@ MJCodingImplementation
  
 @end
  
+@implementation CNLiveCommuntyActivitySignUpOrderModel
+
+MJCodingImplementation
++ (NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{@"idStr":@"id"};
+}
+
+- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
+{
+    oldValue = [NSString stringWithFormat:@"%@",oldValue];
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"createTime"]) {
+        NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+        self.createTimeString = [dateFormatter stringFromDate:detaildate];
+    }
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"updateTime"]) {
+        NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+        self.updateTimeString = [dateFormatter stringFromDate:detaildate];
+    }
+    return oldValue;
+}
+@end
+
 @implementation CNLiveCommuntyActivitySignUpModel
 MJCodingImplementation
  
 - (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
 {
-    if (![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"signs"]) {
+    if (oldValue != nil && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"signs"]) {
         __block NSArray * array = (NSArray *)oldValue;
         __block NSMutableString * signsMString = [[NSMutableString alloc] init];
         [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
  
 /// 显示收款弹框
 /// @param price 价格
-+(QMUIModalPresentationViewController *)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl;
++(QMUIModalPresentationViewController *)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl CompleterBlock:(void(^)(void))completerBlock;
  
 /// 显示双选项弹框
 /// @param completerBlock 确认回调  
@@ -72,7 +72,7 @@
  
 /// 显示收款弹框
 /// @param price 价格
-+(QMUIModalPresentationViewController *)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl
++(QMUIModalPresentationViewController *)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl CompleterBlock:(void(^)(void))completerBlock
 {
     UIView * tipView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth - 60, 300)];
     tipView.backgroundColor = [UIColor whiteColor];
@@ -91,6 +91,18 @@
         make.top.mas_equalTo(tipView).offset(20);
     }];
  
+    UIButton * closeButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    [closeButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_community_content_close"] forState:UIControlStateNormal];
+    [closeButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_community_content_close"] forState:UIControlStateHighlighted];
+    [closeButton setBackgroundColor:[UIColor whiteColor]];
+    [tipView addSubview:closeButton];
+    [closeButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(tipView).offset(-10);
+        make.top.mas_equalTo(tipView).offset(10);
+        make.size.mas_equalTo(30);
+    }];
+    
+    
     UIImageView * qrView = [[UIImageView alloc] init];
     qrView.contentMode = UIViewContentModeScaleAspectFill;
     qrView.backgroundColor = [UIColor whiteColor];
@@ -105,13 +117,18 @@
     QMUIModalPresentationViewController *modalViewController = [[QMUIModalPresentationViewController alloc] init];
     modalViewController.animationStyle = QMUIModalPresentationAnimationStyleFade;
     modalViewController.contentView = tipView;
+    modalViewController.modal = YES;
     [modalViewController showWithAnimated:YES completion:nil];
  
+    __weak typeof(modalViewController) weakModalViewController = modalViewController;
+    [closeButton addBlockForControlEvents:UIControlEventTouchUpInside block:^(id  _Nonnull sender) {
+        [weakModalViewController hideWithAnimated:YES completion:^(BOOL finished) {
+            if (finished && completerBlock) completerBlock();
+        }];
+    }];
+    
     return modalViewController;
-//    __weak typeof(modalViewController) weakModalViewController = modalViewController;
-//    [payButton addBlockForControlEvents:UIControlEventTouchUpInside block:^(id  _Nonnull sender) {
-//        [weakModalViewController hideWithAnimated:YES completion:NULL];
-//    }];
+
 }
  
 + (UIImage *)communty_generateWithDefaultQRCodeData:(NSString *)data imageViewWidth:(CGFloat)imageViewWidth {
@@ -553,7 +570,7 @@
         [self.mainView addSubview:self.qrButton];
         [self.mainView addSubview:self.payButton];
  
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hiddenModalViewNotification:) name:kCNLiveHiddenModalViewWithQrNotification object:nil];
+//        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hiddenModalViewNotification:) name:kCNLiveHiddenModalViewWithQrNotification object:nil];
     }
     return self;
 }
@@ -633,7 +650,11 @@
         NSString * p = [NSString stringWithFormat:@"%.0f",([self.amoutField.text floatValue]*100)];
         [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:self.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
             NSString * p = [NSString stringWithFormat:@"%.2f",[self.amoutField.text floatValue]];
-            weakSelf.modalView = [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl];
+            weakSelf.modalView = [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl CompleterBlock:^{
+                NSLog(@"移除监听通知");
+                [[NSNotificationCenter defaultCenter] removeObserver:weakSelf name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
+            }];
+            [[NSNotificationCenter defaultCenter] addObserver:weakSelf selector:@selector(hiddenModalViewNotification:) name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
         }];
     }else{
         [CNLiveCommuntSignUpView showAlertViewWithMessage:@"请仔细核对金额，确认后将不可修改" CompleterBlock:^{
@@ -642,7 +663,11 @@
             weakSelf.amoutField.textColor = UIColorHex(#c8c8c8);
             [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:weakSelf.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
                 NSString * p = [NSString stringWithFormat:@"%.2f",[self.amoutField.text floatValue]];
-                weakSelf.modalView = [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl];
+                weakSelf.modalView = [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl CompleterBlock:^{
+                    NSLog(@"移除监听通知");
+                    [[NSNotificationCenter defaultCenter] removeObserver:weakSelf name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
+                }];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hiddenModalViewNotification:) name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
             }];
         }];
     }
@@ -213,15 +213,15 @@
     self.nameLabel.text = recoredModel.handworkName;
     self.descLabel.text = [NSString stringWithFormat:@"%@  %@",recoredModel.name,recoredModel.mobile];
     self.priceLabel.text = [recoredModel.amount isNotBlank]?[NSString stringWithFormat:@"%@.00",recoredModel.amount]:@"0.00";
-    if ([recoredModel.status isEqualToString:@"3"]) {
+    if ([recoredModel.index isEqualToString:@"3"]) {
         self.evalButton.layer.cornerRadius = 10;
         self.evalButton.layer.masksToBounds = YES;
         self.evalButton.layer.borderWidth = 1;
         self.evalButton.layer.borderColor = UIColorHex(#FD862E).CGColor;
-        [self.evalButton setBackgroundImage:[UIImage imageWithColor:UIColorHex(#FFFD862E)] forState:UIControlStateNormal];
+        [self.evalButton setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithRed:253/255.0 green:134/255.0 blue:46/255.0 alpha:0.08]] forState:UIControlStateNormal];
         self.evalButton.hidden = NO;
         self.evalButton.userInteractionEnabled = YES;
-    }else if ([recoredModel.status isEqualToString:@"4"]) {
+    }else if ([recoredModel.index isEqualToString:@"4"]) {
         self.evalButton.hidden = NO;
         self.evalButton.userInteractionEnabled = NO;
         NSString * buttonName = @"";
@@ -232,8 +232,8 @@
         }
         [self.evalButton setTitle:buttonName forState:UIControlStateNormal];
         [self.evalButton setTitleColor:color forState:UIControlStateNormal];
-    }else if ([recoredModel.status isEqualToString:@"0"]
-              || [recoredModel.status isEqualToString:@"1"]) {
+    }else if ([recoredModel.index isEqualToString:@"0"]
+              || [recoredModel.index isEqualToString:@"1"]) {
         self.evalButton.hidden = NO;
         self.evalButton.userInteractionEnabled = NO;
         [self.evalButton setTitle:@"活动已取消" forState:UIControlStateNormal];
@@ -245,7 +245,7 @@
 }
 -(void)evalContentButton:(UIButton *)button
 {
-    if ([self.recoredModel.status isEqualToString:@"1"]) {
+    if ([self.recoredModel.index isEqualToString:@"1"]) {
         CNLiveCommuntEvaluaViewController * evaluaView = [[CNLiveCommuntEvaluaViewController alloc] initWithRecord:self.recoredModel];
         [[self displayViewController].navigationController pushViewController:evaluaView animated:YES];
     }
@@ -43,6 +43,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.view.backgroundColor = [UIColor whiteColor];
     UIViewController *subVC = [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithWebUrl:self.webUrl type:self.type];
     [self.view addSubview:subVC.view];
     [self addChildViewController:subVC];
@@ -53,6 +54,10 @@
             make.top.mas_equalTo(kNavigationBarHeight);
             make.left.bottom.right.mas_equalTo(self.view);
         }];
+    }else{
+        [subVC.view mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.mas_equalTo(self.view);
+        }];
     }
  
  
@@ -73,17 +78,24 @@
             [header addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:nil];
         }
     }
-    if (self.isRootVC) [self initNav];
+    [self initNav];
 }
  
 -(void)initNav
 {
-    self.topNavView.backgroundColor = [UIColor whiteColor];
-    self.topLine.backgroundColor = [UIColor whiteColor];
+    if (self.isRootVC) {
+        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];
+    }else{
+        self.topNavView.backgroundColor = [UIColor whiteColor];
+        self.topLine.backgroundColor = [UIColor whiteColor];
+        self.leftNavBtns = @[];
+    }
  
-    DSNavButton * searchBtn = [[DSNavButton alloc] initWithImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communit_back"]];
-    [searchBtn addTarget:self action:@selector(leftNavBtnAction) forControlEvents:UIControlEventTouchUpInside];
-    self.leftNavBtns = @[searchBtn];
 }
  
 -(void)leftNavBtnAction
@@ -91,8 +91,8 @@
     UIButton * submiteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     submiteBtn.frame = CGRectMake(0, 0, 50, 14);
     [submiteBtn setTitle:@"提交" forState:UIControlStateNormal];
-    [submiteBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal];
-    submiteBtn.backgroundColor = UIColorHex(#F2F2F2);
+    [submiteBtn setTitleColor:UIColorWhite forState:UIControlStateNormal];
+    submiteBtn.backgroundColor = UIColorHex(#CD0302);//UIColorHex(#F2F2F2);
     submiteBtn.titleLabel.font = [UIFont systemFontOfSize:12];
     submiteBtn.layer.cornerRadius = 3;
     submiteBtn.layer.masksToBounds = YES;
@@ -346,17 +346,22 @@
     [self.assetsArray addObjectsFromArray:assets];
     [self setReloadFinishPickingPhotos];
 }
-- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
+-(BOOL)textViewShouldReturn:(QMUITextView *)textView
 {
-    if (text.length > 0) {
-        [self.submiteBtn setTitleColor:UIColorWhite forState:UIControlStateNormal];
-        self.submiteBtn.backgroundColor = UIColorHex(#CD0302);
-    }else{
-        [self.submiteBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal];
-        self.submiteBtn.backgroundColor = UIColorHex(#F2F2F2);
-    }
+    [textView resignFirstResponder];
     return YES;
 }
+//- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
+//{
+//    if (text.length > 0) {
+//        [self.submiteBtn setTitleColor:UIColorWhite forState:UIControlStateNormal];
+//        self.submiteBtn.backgroundColor = UIColorHex(#CD0302);
+//    }else{
+//        [self.submiteBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal];
+//        self.submiteBtn.backgroundColor = UIColorHex(#F2F2F2);
+//    }
+//    return YES;
+//}
 -(void)setReloadFinishPickingPhotos
 {
     if (self.imageArray.count == 0) {
@@ -83,7 +83,8 @@
 }
 -(void)rightMothodAction
 {
-    NSLog(@"报修记录");
+    CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
+    [[self displayViewController] dsPushViewController:repairView animated:YES];
 }
 -(NSMutableArray *)dataSource
 {
@@ -187,6 +188,16 @@
     __weak typeof(self) weakSelf = self;
     [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenPushWithParamDict:paramDict nbhdId:self.nbhdId CompleterBlock:^(CNLiveCommuntyActivityMaintainsCreateModel * _Nonnull createModel) {
         if (createModel) {
+            
+            NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:weakSelf.navigationController.viewControllers];
+            for (UIViewController * vc in weakSelf.navigationController.viewControllers) {
+                if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
+                    [tempArray removeObject:vc];
+                    break;
+                }
+            }
+            self.navigationController.viewControllers = tempArray;
+            
             CNLiveCommuntyOrderViewController * vc = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListYetOrder CreateModel:createModel];
             [weakSelf.navigationController pushViewController:vc animated:YES];
  
@@ -41,12 +41,16 @@
     }
     return self;
 }
+-(void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self loadDataSourceWithPage:1 nbhdId:self.nbhdId index:self.index CompleterBlock:NULL];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = UIColorHex(#F9F9F9);
     self.dataArray = [[NSMutableArray alloc] init];
-    [self loadDataSourceWithPage:1 nbhdId:self.nbhdId index:self.index CompleterBlock:NULL];
     [self addRefreshMainView];
 }
  
@@ -74,6 +78,7 @@
         [weakSelf.tableView.mj_header endRefreshing];
         [weakSelf.tableView.mj_footer endRefreshing];
         if (isLastPage) [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+        if (page == 1 && weakSelf.dataArray.count == 0 && weakSelf.tableView.mj_footer) weakSelf.tableView.mj_footer = nil;
     }];
 }
  
@@ -157,7 +162,7 @@
 {
     if (self.showType == CNLiveCommuntListShowTypeRecord) {
         CNLiveCommuntyActivityRecordListModel * recordModel = self.dataArray[indexPath.row];
-        recordModel.status = [NSString stringWithFormat:@"%ld",(long)self.index];
+        recordModel.index = [NSString stringWithFormat:@"%ld",(long)self.index];
         return [CNLiveCommuntSubRecordTableView setTableView:tableView RecordModel:recordModel];
     }
     if (self.showType == CNLiveCommuntListShowTypeHome) {
@@ -207,8 +212,9 @@
     }
     if (self.showType == CNLiveCommuntListShowTypeHome) {
         CNLiveCommuntyActivityHomeListModel * listModel = self.dataArray[indexPath.row];
-        CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:listModel.idStr];
-        [self.navigationController pushViewController:signUpView animated:YES];
+        [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithParamDict:[listModel mj_JSONObject]];
+//        CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:listModel.idStr];
+//        [self.navigationController pushViewController:signUpView animated:YES];
     }
 }
  
@@ -116,8 +116,8 @@
     [searchBtn addTarget:self action:@selector(leftNavBtnAction) forControlEvents:UIControlEventTouchUpInside];
     self.leftNavBtns = @[searchBtn];
  
-    if (self.isShowLocation) {
-        NSString * name = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdNameIdentifier];
+    NSString * name = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdNameIdentifier];
+    if (self.isShowLocation && [name isNotBlank]) {
         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];
@@ -86,6 +86,10 @@
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.tableFooterView = [[UIView alloc] init];
 }
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
+}
 -(void)layoutTableView
 {
     [super layoutTableView];
@@ -157,10 +161,15 @@
             [weakSelf.navigationController pushViewController:resultVC animated:YES];
         }else{
             [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.orderId price:weakSelf.detailModel.unitPrice body:weakSelf.detailModel.name];
+            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payResultSuccessNNotification:) name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
         }
     }];
 }
-
+-(void)payResultSuccessNNotification:(NSNotification *)note
+{
+    NSDictionary * paramDict = (NSDictionary *)note.userInfo;
+    NSLog(@"支付成功之后返回数据=>%@  json==>%@",paramDict,[paramDict mj_JSONString]);
+}
 /// 跳转删除人员
 /// @param subDict 显示信息
 -(void)setCommuntPushAddWithDelectUserViewController:(NSDictionary *)subDict
@@ -285,7 +294,7 @@
         [addBtn setTitle:@"添加" forState:UIControlStateHighlighted];
         [addBtn setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
         [addBtn setTitleColor:UIColorHex(#FD862E) forState:UIControlStateHighlighted];
-        [addBtn setBackgroundColor:UIColorHex(#FD862E14)];
+        addBtn.backgroundColor = [UIColor colorWithRed:253/255.0 green:234/255.0 blue:46/255.0 alpha:0.08];
         addBtn.layer.cornerRadius = 5;
         addBtn.layer.masksToBounds = YES;
         addBtn.spacingBetweenImageAndTitle = 3;
@@ -26,7 +26,22 @@
     }
     return self;
 }
-
+-(void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
+    for (UIViewController * vc in self.navigationController.viewControllers) {
+        if ([vc isKindOfClass:CNLiveCommuntyResultViewController.class]) {
+            [tempArray removeObject:vc];
+            break;
+        }
+        if ([vc isKindOfClass:NSClassFromString(@"CNLiveCommuntSignUpViewController")]) {
+            [tempArray removeObject:vc];
+            break;
+        }
+    }
+    self.navigationController.viewControllers = tempArray;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -103,7 +103,7 @@
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setupShowResult:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCCommuntNBhdListContentURL Param:@{} CacheType:CNLiveNetworkCacheTypeCacheNetwork CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCCommuntNBhdListContentURL Param:@{} 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) {
@@ -24,6 +24,7 @@
 #import <Masonry/Masonry.h>
 #import <YYText/YYText.h>
 #import "CNLiveCommuntViewModel.h"
+#import "CNLiveCommuntSignUpView.h"
 #import "CNLiveCommuntyResultListViewController.h"
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
@@ -108,9 +109,12 @@
         [[CNLiveCommuntyModule shareInstance] pushCommuntyHomeViewMethod];
     }
     if (indexPath.row == 1) {
-        NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
-        CNLiveCommuntActiviRecordViewController * recordVC = [[CNLiveCommuntActiviRecordViewController alloc] initWithNBhdId:nbhdId];
-        [self.navigationController pushViewController:recordVC animated:YES];
+//        NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
+//        CNLiveCommuntActiviRecordViewController * recordVC = [[CNLiveCommuntActiviRecordViewController alloc] initWithNBhdId:nbhdId];
+//        [self.navigationController pushViewController:recordVC animated:YES];
+        [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:@"0.01" PayUrl:@"https://www.baidu.com" CompleterBlock:^{
+            NSLog(@"隐藏了");
+        }];
     }
     if (indexPath.row == 2) {
         CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
@@ -8,6 +8,8 @@
  
 #import "CNLiveCommunitModuleImpl.h"
 #import "CNLIVEMainViewController.h"
+#import "CNLiveCommuntSignUpViewController.h"
+#import "CNLiveCommuntTools.h"
 @implementation CNLiveCommunitModuleImpl
 /// 获取主工程的WebView
 /// @param webUrl url
@@ -30,7 +32,9 @@
 /// @param paramDict url
 -(void)pushWebViewWithMainProjectWithParamDict:(NSDictionary *)paramDict
 {
-    
+    NSString * idStr = [paramDict objectForKey:@"id"];
+    CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:idStr];
+    [[CNLiveCommuntTools cCommunt_currentViewController].navigationController pushViewController:signUpView animated:YES];
 }
  
 /// 获取主工程的视讯相关界面逻辑