0.0.6

liushiyu
1 parent 93e40209
Showing 14 changed files with 79 additions and 45 deletions
CNLiveCommunitModule.podspec
CNLiveCommunitModule/Classes/Core/CNLiveCommunitModuleProtocol.h
CNLiveCommunitModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyUserListViewController.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.5'
+  s.version          = '0.0.6'
   s.summary          = 'A short description of CNLiveCommunitModule.'
 # This description is used to generate tags and improve search results.
@@ -15,9 +15,13 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param webUrl url
 -(UIViewController *)pushWebViewWithMainProjectWithWebUrl:(NSString *)webUrl type:(NSString *)type;
-/// 用主工程的webView打开
+/// 跳转活动详情界面
+/// @param activityId 活动id
+-(void)pushWebViewWithMainProjectWithActivityId:(NSString *)activityId;
+
+/// 支付完成回调主工程
 /// @param paramDict url
--(void)pushWebViewWithMainProjectWithParamDict:(NSDictionary *)paramDict;
+-(void)pushPayResultWithMainProjectWithParamDict:(NSDictionary *)paramDict;
 /// 调用工程中支付功能
 /// @param orderId 订单id
@@ -234,10 +234,15 @@
         [self.evalButton setTitleColor:color forState:UIControlStateNormal];
     }else if ([recoredModel.index isEqualToString:@"0"]
               || [recoredModel.index isEqualToString:@"1"]) {
-        self.evalButton.hidden = NO;
-        self.evalButton.userInteractionEnabled = NO;
-        [self.evalButton setTitle:@"活动已取消" forState:UIControlStateNormal];
-        [self.evalButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
+        if ([recoredModel.status isEqualToString:@"2"]) {
+            self.evalButton.hidden = NO;
+            self.evalButton.userInteractionEnabled = NO;
+            [self.evalButton setTitle:@"活动已取消" forState:UIControlStateNormal];
+            [self.evalButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
+        }else{
+            self.evalButton.userInteractionEnabled = NO;
+            self.evalButton.hidden = YES;
+        }
     }else{
         self.evalButton.userInteractionEnabled = NO;
         self.evalButton.hidden = YES;
@@ -208,13 +208,11 @@
     }
     if (self.showType == CNLiveCommuntListShowTypeRecord) {
         CNLiveCommuntyActivityRecordListModel * repairModel = self.dataArray[indexPath.row];
-        [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithParamDict:[repairModel mj_JSONObject]];
+        [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithActivityId:repairModel.handworkId];
     }
     if (self.showType == CNLiveCommuntListShowTypeHome) {
         CNLiveCommuntyActivityHomeListModel * listModel = self.dataArray[indexPath.row];
-        [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithParamDict:[listModel mj_JSONObject]];
-//        CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:listModel.idStr];
-//        [self.navigationController pushViewController:signUpView animated:YES];
+        [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithActivityId:listModel.idStr];
     }
 }
@@ -104,7 +104,7 @@
     [self.view addSubview:bottemView];
     [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.mas_equalTo(weakSelf.view);
-        make.height.mas_equalTo(50);
+        make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
     }];
     float unitPrice = [self.detailModel.unitPrice floatValue];
@@ -160,7 +160,7 @@
             CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithSignUpModel:signUpModel activityId:handworkId];
             [weakSelf.navigationController pushViewController:resultVC animated:YES];
         }else{
-            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.orderId price:weakSelf.detailModel.unitPrice body:weakSelf.detailModel.name];
+            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.order.idStr price:weakSelf.detailModel.unitPrice body:weakSelf.detailModel.name];
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payResultSuccessNNotification:) name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
         }
     }];
@@ -169,6 +169,27 @@
 {
     NSDictionary * paramDict = (NSDictionary *)note.userInfo;
     NSLog(@"支付成功之后返回数据=>%@  json==>%@",paramDict,[paramDict mj_JSONString]);
+    [[CNLiveCommuntyModule shareInstance].protocol pushPayResultWithMainProjectWithParamDict:paramDict];
+    if ([paramDict allKeys].count > 0 && [[paramDict allKeys] containsObject:@"systemPayData"]) {
+        //0支付失败，1支付成功报名失败，2报名成功
+        NSDictionary * systemPayData = [paramDict dictionaryForKey:@"systemPayData"];
+        NSString * type = [systemPayData stringValueForKey:@"text" default:@"0"];
+        if ([type isEqualToString:@"0"]) {
+            CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithActivityId:@"" OrderId:@"" Msg:@""];
+            [self.navigationController pushViewController:resultVC animated:YES];
+        }else if ([type isEqualToString:@"1"]) {
+            CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithActivityId:@"" OrderId:@"" Msg:@"剩余名额不足，退款将原路退回"];
+            [self.navigationController pushViewController:resultVC animated:YES];
+        }else{
+            NSString * orderId = [systemPayData stringValueForKey:@"orderId" default:@""];
+            NSString * activityId = [systemPayData stringValueForKey:@"classId" default:@""];
+            CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithActivityId:activityId OrderId:orderId Msg:@""];
+            [self.navigationController pushViewController:resultVC animated:YES];
+        }
+    }else{
+        CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithActivityId:@"" OrderId:@"" Msg:@""];
+        [self.navigationController pushViewController:resultVC animated:YES];
+    }
 }
 /// 跳转删除人员
 /// @param subDict 显示信息
@@ -53,7 +53,7 @@
             for (CNLiveCommuntyHomeModel * homeModel in homeArray) {
                 if ([homeModel.columnColour isNotBlank]) weakSelf.selectColor = [UIColor colorWithHexString:homeModel.columnColour];
                 if ([homeModel.columnColourUncheck isNotBlank]) weakSelf.normalColor = [UIColor colorWithHexString:homeModel.columnColourUncheck];
-                [weakSelf settingTabberWithImages:@[homeModel.columnImg,homeModel.columnImgUncheck] CompleterBlock:^(NSDictionary *tempDict) {
+                [weakSelf settingTabberWithImages:@[homeModel.columnImgUncheck,homeModel.columnImg] CompleterBlock:^(NSDictionary *tempDict) {
                     NSMutableDictionary * dict = [[NSMutableDictionary alloc] init];
                     [dict addEntriesFromDictionary:tempDict];
                     [dict setObject:homeModel forKey:@"model"];
@@ -63,41 +63,43 @@
                         weakSelf.tabBar.backgroundColor = [UIColor whiteColor];
                         for (NSDictionary * subDict in array) {
                             CNLiveCommuntyHomeModel * homeModel = [subDict objectForKey:@"model"];
+                            UIImage *nomal_image = [[UIImage alloc] initWithData:[subDict objectForKey:@"nomal"]];
+                            UIImage *select_image = [[UIImage alloc] initWithData:[subDict objectForKey:@"select"]];
                             if (homeModel.contentColumnList.count > 0) {
                                 CNLiveCommuntConsuViewController * vc = [[CNLiveCommuntConsuViewController alloc] initWithHomeArray:homeModel.contentColumnList titles:homeModel.titles NBhdId:weakSelf.nbhdId];
                                 vc.title = homeModel.columnName;
                                 vc.view.backgroundColor = [UIColor whiteColor];
-                                [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
+                                [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
                             }else{
                                 if ([homeModel.type isEqualToString:@"3"]) {//生活服务界面 原生
                                     CNLiveCommuntServiceViewController * vc = [[CNLiveCommuntServiceViewController alloc] initWithHomeModel:homeModel isRootVC:YES isShowLocation:YES];
                                     vc.title = homeModel.columnName;
                                     vc.view.backgroundColor = [UIColor whiteColor];
-                                    [weakSelf addChildViewController:vc noralImage:[subDict objectForKey:@"nomal"] selectImage:[subDict objectForKey:@"select"]];
+                                    [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
                                 }
                                 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"]];
+                                    [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
                                 }
                                 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"]];
+                                    [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
                                 }
                                 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"]];
+                                    [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
                                 }
                                 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"]];
+                                    [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
                                 }
                             }
                         }
@@ -118,7 +120,7 @@
         NSString * imageUrl = images[i];
         if ([imageUrl isNotBlank]) {
             [SDWebImageManager.sharedManager loadImageWithURL:[NSURL URLWithString:imageUrl] options:SDWebImageRetryFailed progress:NULL completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) {
-                [tempDict setObject:image forKey:i == 1 ? @"nomal" : @"select"];
+                [tempDict setObject:UIImagePNGRepresentation(image) forKey:[images indexOfObject:imageURL.absoluteString] == 0 ? @"nomal" : @"select"];
                 if (tempDict.count == images.count && completerBlock) completerBlock(tempDict);
             }];
         }
@@ -127,25 +127,24 @@
 {
     CNLiveCommuntyHomeListModel * listModel = self.dataSource[indexPath.row];
     if (listModel && [listModel.idStr isNotBlank]) {
+
+        [[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];
+        
         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
@@ -114,7 +114,7 @@
             [self.view addSubview:self.bottemView];
             [self.bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.left.right.bottom.mas_equalTo(weakSelf.view);
-                make.height.mas_equalTo(50);
+                make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
             }];
         }
@@ -65,7 +65,7 @@
         [self.view addSubview:bottemView];
         [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.right.bottom.mas_equalTo(weakSelf.view);
-            make.height.mas_equalTo(50);
+            make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
         }];
         NSMutableAttributedString * str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"合计: %.2f元",(self.detailModel.signupVoList.count * [self.detailModel.unitPrice floatValue])/2]];
@@ -191,7 +191,7 @@
         UILabel * priceLabel = [[UILabel alloc] init];
         priceLabel.textColor = UIColorHex(#DF0D23);
         priceLabel.font = [UIFont boldSystemFontOfSize:16];
-        priceLabel.text = [NSString stringWithFormat:@"%lu元",[self.detailModel.unitPrice integerValue]*100*self.detailModel.signupVoList.count];
+        priceLabel.text = [NSString stringWithFormat:@"%@元",self.detailModel.unitPrice];
         [view addSubview:priceLabel];
         [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerY.mas_equalTo(view);
@@ -79,7 +79,7 @@
 -(void)descAction:(UIButton *)button
 {
     if (self.isSuccess) {
-        CNLiveCommuntyResultListViewController * resultVC = [[CNLiveCommuntyResultListViewController alloc] initWithStyle:UITableViewStyleGrouped SignId:self.signUpModel.signsString OrderId:self.signUpModel.orderId handworkId:self.activityId];
+        CNLiveCommuntyResultListViewController * resultVC = [[CNLiveCommuntyResultListViewController alloc] initWithStyle:UITableViewStyleGrouped SignId:self.signUpModel.signsString OrderId:[self.signUpModel.orderId isNotBlank]?self.signUpModel.orderId:self.orderId handworkId:self.activityId];
         [self.navigationController pushViewController:resultVC animated:YES];
     }else{
         [self.navigationController popViewControllerAnimated:YES];
@@ -66,7 +66,7 @@
     [self.view addSubview:bottemView];
     [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.mas_equalTo(weakSelf.view);
-        make.height.mas_equalTo(50);
+        make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
     }];
     UIButton * payButton = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -123,7 +123,7 @@
         return;
     }
     __weak typeof(self) weakSelf = self;
-    [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:paramDict isSave:YES isNew:YES CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
+    [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:paramDict isSave:YES isNew:self.userDict.allKeys.count == 0 CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
         [weakSelf.navigationController popViewControllerAnimated:YES];
     }];
 }
@@ -66,7 +66,7 @@
         [self.view addSubview:bottemView];
         [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.right.bottom.mas_equalTo(weakSelf.view);
-            make.height.mas_equalTo(50);
+            make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
         }];
         UIButton * payButton = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -112,9 +112,8 @@
 //        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(@"隐藏了");
-        }];
+        [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
     }
     if (indexPath.row == 2) {
         CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
@@ -28,15 +28,21 @@
     NSLog(@"调用支付相关参数 orderId=>%@ price=>%@ body=>%@",orderId,price,body);
 }
-/// 用主工程的webView打开
-/// @param paramDict url
--(void)pushWebViewWithMainProjectWithParamDict:(NSDictionary *)paramDict
+/// 跳转活动详情界面
+/// @param activityId 活动id
+-(void)pushWebViewWithMainProjectWithActivityId:(NSString *)activityId
 {
-    NSString * idStr = [paramDict objectForKey:@"id"];
-    CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:idStr];
+    CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:activityId];
     [[CNLiveCommuntTools cCommunt_currentViewController].navigationController pushViewController:signUpView animated:YES];
 }
+/// 支付完成回调主工程
+/// @param paramDict url
+-(void)pushPayResultWithMainProjectWithParamDict:(NSDictionary *)paramDict
+{
+    
+}
+
 /// 获取主工程的视讯相关界面逻辑
 /// @param pageId 界面id
 /// @param channelName 频道名