提交0.0.11

梁星国
1 parent 5d8a4b26
Showing 6 changed files with 412 additions and 14 deletions
CNLiveServiceCenterModule.podspec
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceLiveSelectedView.h
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceLiveSelectedView.m
Example/CNLiveServiceCenterModule.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
     s.name             = 'CNLiveServiceCenterModule'
-    s.version          = '0.0.10'
+    s.version          = '0.0.11'
     s.summary          = '网家家企业端服务中心模块'
     # This description is used to generate tags and improve search results.
@@ -25,6 +25,7 @@
 #import <CNLiveBServices/CNLiveBMineServiceProtocol.h>
 #import <CNLiveBServices/CNLiveLiveSetHomeProtocol.h>
 #import "CNLiveBCreatorViewController.h"
+#import "CNLiveBServiceLiveSelectedView.h"
 #define CNLiveBGetServiceStatusUrl          cn_API_OpenApi2(@"/user/readWJJBStatusById")
 #define CNLiveBOrganizationValidattionStatusUrl        cn_API_OpenApi2(@"/auser/getAccount.action")
@@ -46,6 +47,9 @@
 @property (nonatomic , strong) CNLiveBServiceCenterModel *centerModel;
+/** 相册弹出实体图*/
+@property (nonatomic , strong) CNLiveBServiceLiveSelectedView *liveSelecctedView;
+
 @end
@@ -129,8 +133,19 @@
     [self.view setBackgroundColor:[UIColor whiteColor]];
+    if (CNUserShareModel.wjjStatus) {
+        self.personStatus = [NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.personStatus ? CNUserShareModel.wjjStatus.personStatus : @"0"];
+        self.institutionStatus = [NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.institutionStatus ? CNUserShareModel.wjjStatus.institutionStatus : @"0"];
+        self.centerModel.personStatus = self.personStatus;
+        self.centerModel.institutionStatus = self.institutionStatus;
+        
+    }
+    
+    
+    
     [self.view addSubview:self.tableView];
+    
     self.tableView.tableHeaderView = self.headerView;
@@ -146,7 +161,7 @@
         NSLog(@"点击-用户名字");
         [weakSelf jumpPersonVC];
     };
-
+    
     self.headerView.clickEnterViewBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, CNLiveBCenterAuthEnterView * _Nonnull enterView) {
         NSLog(@"点击-用户认证进入");
         [weakSelf  checkPersonCertification];
@@ -331,11 +346,8 @@
 ///跳转直播页
 - (void)jumpLiveVC {
-    /// 直播
-    id<CNLiveLiveSetHomeProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveLiveSetHomeProtocol)];
-    UIViewController *vc = [organizationValidationProtocol pushLiveSettingWithHomeViewController];
-    vc.hidesBottomBarWhenPushed = YES;
-    [self.navigationController pushViewController:vc animated:YES];
+    
+    [self checkLiveCertification];
 }
@@ -478,7 +490,147 @@
             if (!isEnter) {
-               [QMUITips showError:err.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];//@"上传失败"
+                [QMUITips showError:err.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];//@"上传失败"
+            }
+            
+        }else {
+            if (error) {
+                if (error.code == -1001 || error.code == -1009) {
+                    [QMUITips showError:@"网络连接已断开" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];
+                }else {
+                    [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败"
+                }
+                return;
+            }
+            
+        }
+        
+    }];
+    
+    
+}
+
+
+/// 检查直播个人状态状态
+- (void)checkLiveCertification {
+    
+    //URL: https://apiwjjtest.cnlive.com/Daren/buser/getBUserInfo.action?
+    NSString *strUrl = CNLiveBOrganizationPersonStatusUrl;
+    NSDictionary *dict = @{
+        @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
+    };
+    [QMUITips showLoadingInView:self.view];
+    
+    __weak typeof(self) weakSelf = self;
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllTipsInView:self.view];
+        
+        NSLog(@"点播详情数据 = %@",responseObject);
+        
+        NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
+        NSError *err = nil;
+        id data = nil;
+        if([resultCode isEqualToString:@"0"]) {
+            data = responseObject[@"data"];
+        } else {
+            @try {
+                err = [[NSError alloc] initWithDomain:responseObject[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
+            } @catch (NSException *exception) {
+                err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
+            }
+        }
+        
+        if (!err) {
+            BOOL isEnter = NO;
+            NSDictionary *dicContent = (NSDictionary *)data;
+            if (dicContent) {
+                if ([dicContent containsObjectForKey:@"checkStatus"]) {
+                    isEnter = YES;
+                    
+                    NSString *ischeckStatusStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"checkStatus"]];
+                    if ([ischeckStatusStr isEqualToString:@"0"]) {//无认证_弹框直接去填表页
+                        
+                        [weakSelf.liveSelecctedView popViewForView:[UIApplication sharedApplication].keyWindow];
+                        weakSelf.liveSelecctedView.clickViewBlock = ^(CNLiveBServiceLiveSelectedView * _Nonnull view, NSInteger indexCount) {
+                            if (indexCount == 1) {
+                                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                    ///  填表页
+                                    id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
+                                    UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
+                                    vc.hidesBottomBarWhenPushed = YES;
+                                    [self.navigationController pushViewController:vc animated:YES];
+                                });
+                                
+                            }else {
+                                
+                            }
+                            
+                        };
+                        
+                        
+                    }else if ([ischeckStatusStr isEqualToString:@"1"]) {//已认证
+                        /// 直播
+                        id<CNLiveLiveSetHomeProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveLiveSetHomeProtocol)];
+                        UIViewController *vc = [organizationValidationProtocol pushLiveSettingWithHomeViewController];
+                        vc.hidesBottomBarWhenPushed = YES;
+                        [self.navigationController pushViewController:vc animated:YES];
+                        
+                        
+                        isEnter = YES;
+                    }else if ([ischeckStatusStr isEqualToString:@"2"]) {//审核中_去状态页
+                        isEnter = YES;
+                        
+                        [weakSelf.liveSelecctedView popViewForView:[UIApplication sharedApplication].keyWindow];
+                        weakSelf.liveSelecctedView.clickViewBlock = ^(CNLiveBServiceLiveSelectedView * _Nonnull view, NSInteger indexCount) {
+                            if (indexCount == 1) {
+                                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                    id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
+                                    UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
+                                    vc.hidesBottomBarWhenPushed = YES;
+                                    [self.navigationController pushViewController:vc animated:YES];
+                                });
+
+                            }else {
+                                
+                            }
+                            
+                        };
+                        
+                        
+                        
+                        
+                    }else if ([ischeckStatusStr isEqualToString:@"3"]) {//审核失败_去状态页
+                        isEnter = YES;
+                        
+                        [weakSelf.liveSelecctedView popViewForView:[UIApplication sharedApplication].keyWindow];
+                        weakSelf.liveSelecctedView.clickViewBlock = ^(CNLiveBServiceLiveSelectedView * _Nonnull view, NSInteger indexCount) {
+                            if (indexCount == 1) {
+                                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                    id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
+                                    UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
+                                    vc.hidesBottomBarWhenPushed = YES;
+                                    [self.navigationController pushViewController:vc animated:YES];
+                                });
+
+                                
+                            }else {
+                                
+                            }
+                            
+                        };
+                        
+                        
+                        
+                    }
+                    
+                }
+            }
+            
+            if (!isEnter) {
+                
+                [QMUITips showError:err.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];//@"上传失败"
             }
         }else {
@@ -498,6 +650,7 @@
 }
+
 /// 检查机构认证状态
 - (void)checkAccreditedInstitution {
@@ -540,7 +693,7 @@
                         UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
                         vc.hidesBottomBarWhenPushed = YES;
                         [self.navigationController pushViewController:vc animated:YES];
-
+                        
                         isEnter = YES;
                     }else if ([isCertificationStr isEqualToString:@"1"]) {
@@ -550,7 +703,7 @@
                         vc.hidesBottomBarWhenPushed = YES;
                         [self.navigationController pushViewController:vc animated:YES];
-    
+                        
                         isEnter = YES;
                     }else if ([isCertificationStr isEqualToString:@"2"]) {
@@ -617,6 +770,14 @@
 }
+- (CNLiveBServiceLiveSelectedView *)liveSelecctedView {
+    if (!_liveSelecctedView) {
+        _liveSelecctedView = [[CNLiveBServiceLiveSelectedView alloc]initWithFrame:CGRectZero];
+    }
+    return _liveSelecctedView;
+}
+
+
 /*
  #pragma mark - Navigation
@@ -130,9 +130,9 @@
     //用户信息
     NSString *userImagUrl = [NSString stringWithFormat:@"%@",CNUserShareModel.faceUrl];
     [self.userImageV sd_setImageWithURL:[NSURL URLWithString:userImagUrl] placeholderImage:[UIImage imageNamedFromService:@"service_person"]];
-    NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname];
+    NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname ? CNUserShareModel.nickname : @""];
     self.userNameL.text = userName;
-    NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location];
+    NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location ? CNUserShareModel.location : @""];
     self.locationL.text = userLoc;
 }
@@ -200,7 +200,9 @@
     if ([isPerson isEqualToString:@"1"]) {
         self.personCertificationImageV.hidden = NO;
+        [self.enterView configUI:YES];
     }else {
+        [self.enterView configUI:NO];
         self.personCertificationImageV.hidden = YES;
     }
@@ -506,6 +508,12 @@
 #pragma mark - editUI
 - (void)configUI:(Boolean)isAuth {
+    if (isAuth) {
+         self.authL.text = @"用户已认证";
+    }else {
+         self.authL.text = @"用户未认证";
+    }
+    
 }
 #pragma mark - ***事件实现***
+//
+//  CNLiveBOrganizationPhotoSelectedView.h
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/14.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveBServiceLiveSelectedView : UIView
+
+/** 点击按钮l回调 */
+@property (nonatomic, copy) void(^clickViewBlock)(CNLiveBServiceLiveSelectedView *view,NSInteger indexCount);
+
+-(void)popViewForView:(UIView *)view;
+
+-(void)dismissView;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveBOrganizationPhotoSelectedView.m
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/14.
+//
+
+#import "CNLiveBServiceLiveSelectedView.h"
+
+#import <Masonry/Masonry.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+
+
+@interface CNLiveBServiceLiveSelectedView ()
+
+@property (strong ,nonatomic) UIView *contentView;
+
+@property (strong ,nonatomic) UIButton *cancelBtn;
+
+@property (strong , nonatomic) UIButton *sureBtn;
+
+@property (strong , nonatomic) UILabel *contentL;
+
+@end
+
+@implementation CNLiveBServiceLiveSelectedView
+
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        [self setupUI];
+        [self editUI];
+        
+    }
+    return self;
+}
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    [self setupUI];
+
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+    [self layoutUI];
+}
+
+#pragma mark - getter,setter
+
+
+#pragma mark - setupUI
+- (void)setupUI {
+    
+    self.contentView.frame = CGRectMake(53, 257, KScreenWidth - 106, 170);
+    [self.contentView setBackgroundColor:RGBOF(0xD8D8D8)];
+    [self.contentView addSubview:self.cancelBtn];
+    [self.contentView addSubview:self.sureBtn];
+    [self.contentView addSubview:self.contentL];
+    
+    self.contentL.frame = CGRectMake(0, 0, self.contentView.frame.size.width, 126);
+    self.cancelBtn.frame = CGRectMake(0, 127, self.contentView.frame.size.width /2, 44);
+    [self.cancelBtn setBackgroundColor:[UIColor whiteColor]];
+    self.sureBtn.frame = CGRectMake(self.contentView.frame.size.width /2 + 1, 127, self.contentView.frame.size.width /2 -1, 44);
+    [self.sureBtn setBackgroundColor:[UIColor whiteColor]];
+    
+    
+    [self addSubview:self.contentView];
+    
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(viewTapAction:)];
+    [self addGestureRecognizer:tap];
+    
+    [self.sureBtn addTarget:self action:@selector(sureBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.cancelBtn addTarget:self action:@selector(cancelBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+}
+
+#pragma mark - layoutUI
+- (void)layoutUI {
+
+
+}
+
+#pragma mark - editUI
+- (void)editUI {
+    
+}
+
+#pragma mark - 事件实现
+- (void)viewTapAction:(UITapGestureRecognizer *)tap {
+    
+    [self dismissView];
+}
+
+- (void)sureBtnAction:(UIButton *)sender {
+    
+    if (self.clickViewBlock) {
+        self.clickViewBlock(self, 1);
+        __weak typeof(self) weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            if (weakSelf) {
+                [weakSelf dismissView];
+            }
+        });
+    }
+}
+
+- (void)cancelBtnAction:(UIButton *)sender {
+    
+    if (self) {
+        [self dismissView];
+    }
+}
+
+#pragma mark - 私有方法
+
+#pragma mark - 弹出
+-(void)popViewForView:(UIView *)view{
+    
+    [view addSubview:self];
+    [view bringSubviewToFront:self];
+    self.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
+    [self setBackgroundColor:RGBA(0, 0, 0, 0.5)];
+    self.alpha = 0.3;
+    self.contentView.frame = CGRectMake(53, KScreenHeight, KScreenWidth - 106, 170);
+
+    [UIView animateWithDuration:0.25 animations:^{
+        self.alpha = 1.0;
+        
+        self.contentView.frame = CGRectMake(53, 257, KScreenWidth - 106, 170);
+        
+    }];
+}
+
+-(void)dismissView{
+    
+    [UIView animateWithDuration:0.25 animations:^{
+        self.alpha = 0.3;
+        self.contentView.frame = CGRectMake(53, KScreenHeight, KScreenWidth - 106, 170);;
+    } completion:^(BOOL finished) {
+        
+        [self removeFromSuperview];
+        
+    }];
+}
+
+
+
+#pragma mark - 懒加载
+
+- (UIView *)contentView {
+    if (!_contentView) {
+        _contentView = [[UIView alloc]initWithFrame:CGRectZero];
+        _contentView.layer.cornerRadius = 10;
+        _contentView.layer.masksToBounds = YES;
+    }
+    return _contentView;
+}
+
+
+/** 取消按钮 */
+- (UIButton *)cancelBtn {
+
+    if (!_cancelBtn) {
+        _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
+        [_cancelBtn setTitleColor:RGBOF(0x999999) forState:UIControlStateNormal];
+    }
+    return _cancelBtn;
+}
+
+/** 去认证 */
+- (UIButton *)sureBtn{
+
+    if (!_sureBtn) {
+        _sureBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_sureBtn setTitle:@"去认证" forState:UIControlStateNormal];
+        [_sureBtn setTitleColor:RGBOF(0x48A7F9) forState:UIControlStateNormal];
+    }
+    return _sureBtn;
+}
+
+/** 内容 */
+- (UILabel *)contentL{
+
+    if (!_contentL) {
+        _contentL = [[UILabel alloc]init];
+        _contentL.text = @"根据相关法律规定，直播需要\n完成实名认证，是否去认证？";
+        _contentL.textColor = RGBOF(0x333333);
+        _contentL.textAlignment = NSTextAlignmentCenter;
+        _contentL.numberOfLines = 0;
+        _contentL.font = [UIFont systemFontOfSize:18];
+        [_contentL setBackgroundColor:[UIColor whiteColor]];
+        
+    }
+    return _contentL;
+}
+
+
+
+@end
@@ -208,7 +208,7 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				CCC302347CCCFE680D14E779 /* [CP] Embed Pods Frameworks */,
-				7A1A31A9AB85C5464BF5829A /* [CP] Copy Pods Resources */,
+				4F0986FEAE0737650B68FDF9 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -343,7 +343,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7A1A31A9AB85C5464BF5829A /* [CP] Copy Pods Resources */ = {
+		4F0986FEAE0737650B68FDF9 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (