iOS Team / CNLiveOrganizationValidationModule · Commits

Commit bd6c5c183e7231ace5ae02d2c0db8a16d7770aca

Authored by 梁星国
1 parent 7e702a2f

提交更改

Inline Side-by-side
Showing 19 changed files with 212 additions and 165 deletions
CNLiveOrganizationValidationModule.podspec
  View file @bd6c5c1
... ... @@ -51,7 +51,10 @@ Pod::Spec.new do |s|
51 51 ########################################
52 52 #CNLive组件
53 53 s.dependency 'CNLiveBeeHive' #核心路由架构
54   - s.dependency 'CNLiveModuleServiceProtocols'
  54 + #模块协议
  55 + s.dependency 'CNLiveBServices'
  56 + #Base控制器
  57 + s.dependency 'CNLiveBusinessBaseModule'
55 58 #分享工具库
56 59 s.dependency 'CNLiveShareToolKit'
57 60 #基础请求组件库
... ... @@ -64,30 +67,18 @@ Pod::Spec.new do |s|
64 67 s.dependency 'CNLiveCommonCategory'
65 68 #用户管理库
66 69 s.dependency 'CNLiveUserManagement'
67   - #语音转文字库
68   - s.dependency 'CNLiveVoiceToTextKit'
69   - #业务工具库
70   - s.dependency 'CNLiveBusinessTools'
71   - #本地存储库
72   - s.dependency 'CNLiveCacheManagerKit'
73 70 #环境库
74 71 s.dependency 'CNLiveEnvironment'
75   - #iCould文件取得
76   - s.dependency 'CNLiveICloudPicker'
77   - # #系统定位
78   - # pod 'CNLiveLocationManager'
79 72 #上传 (新加)
80 73 s.dependency 'CNLiveUploadManager'
81 74 #相册 (新加)
82 75 s.dependency 'CNLiveImagePickerController'
83   - #腾讯QQ库
84   - s.dependency 'CNLiveTencentopenapi'
85   - #组件化-接口库CNLiveServices
86   - s.dependency 'CNLiveServices'
87 76 ########################################
88 77 ### 所有github三方管理库(非频繁更新)
89 78 ########################################
90 79 s.dependency 'CNLiveTripartiteManagement'
  80 + #相册展示
  81 + s.dependency 'YBImageBrowser'
91 82  
92 83  
93 84  
... ...
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_back@2x.png 0 → 100644
View file @bd6c5c1

768 Bytes
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_back@3x.png 0 → 100644
View file @bd6c5c1

1.3 KB
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.h
  View file @bd6c5c1
... ... @@ -6,10 +6,11 @@
6 6 //
7 7  
8 8 #import <UIKit/UIKit.h>
  9 +#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
9 10  
10 11 NS_ASSUME_NONNULL_BEGIN
11 12  
12   -@interface CNLiveBAgreementCommitFinishController : UIViewController
  13 +@interface CNLiveBAgreementCommitFinishController : CNCommonViewController
13 14  
14 15 @end
15 16  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.m
  View file @bd6c5c1
... ... @@ -47,6 +47,8 @@
47 47  
48 48 - (void)setupUI {
49 49  
  50 + self.title = @"机构认证";
  51 +
50 52 [self.view setBackgroundColor:[UIColor whiteColor]];
51 53 [self.view addSubview:self.imageVeiw];
52 54 [self.view addSubview:self.contentL];
... ... @@ -57,6 +59,9 @@
57 59 [self.view addSubview:self.returnBtn];
58 60  
59 61 [_returnBtn addTarget:self action:@selector(returnBtnAction:) forControlEvents:UIControlEventTouchUpInside];
  62 +
  63 + UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamedFromOrganization:@"organization_back"] style:UIBarButtonItemStylePlain target:self action:@selector(returnBtnAction:)];
  64 + self.navigationItem.leftBarButtonItem = backItem;
60 65  
61 66 }
62 67  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.h
  View file @bd6c5c1
... ... @@ -6,10 +6,11 @@
6 6 //
7 7  
8 8 #import <UIKit/UIKit.h>
  9 +#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
9 10  
10 11 NS_ASSUME_NONNULL_BEGIN
11 12  
12   -@interface CNLiveBAgreementContentController : UIViewController
  13 +@interface CNLiveBAgreementContentController : CNCommonViewController
13 14  
14 15 @end
15 16  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.m
  View file @bd6c5c1
... ... @@ -15,7 +15,7 @@
15 15  
16 16 - (void)viewDidLoad {
17 17 [super viewDidLoad];
18   -
  18 + self.title = @"机构认证";
19 19 [self.view setBackgroundColor:[UIColor whiteColor]];
20 20 }
21 21  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.h
  View file @bd6c5c1
... ... @@ -6,11 +6,12 @@
6 6 //
7 7  
8 8 #import <UIKit/UIKit.h>
  9 +#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
9 10 #import "CNLiveOrganizationDetailModel.h"
10 11  
11 12 NS_ASSUME_NONNULL_BEGIN
12 13  
13   -@interface CNLiveBOraganizationDetailController : UIViewController
  14 +@interface CNLiveBOraganizationDetailController : CNCommonViewController
14 15  
15 16 @property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
16 17  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
  View file @bd6c5c1
... ... @@ -20,6 +20,8 @@
20 20 #import <QMUIKit/QMUIKit.h>
21 21 #import <YYKit/YYKit.h>
22 22 #import <objc/runtime.h>
  23 +#import <YBImageBrowser/YBImageBrowser.h>
  24 +#import <YBImageBrowser/YBIBImageData.h>
23 25  
24 26  
25 27 //体育中国-详情
... ... @@ -82,6 +84,7 @@
82 84  
83 85 - (void)editUI {
84 86  
  87 + self.title = @"认证机构";
85 88 [self.view setBackgroundColor:[UIColor whiteColor]];
86 89  
87 90 [self.view addSubview:self.tableView];
... ... @@ -360,9 +363,47 @@
360 363 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
361 364  
362 365  
  366 + if (indexPath.section == 0) {
  367 + if (indexPath.row == 1 || indexPath.row == 12) {
  368 + NSMutableArray *datas = [NSMutableArray array];
  369 + // 网络图片
  370 + NSString *logoStr = [NSString stringWithFormat:@"%@",self.detailModel.account.logo?self.detailModel.account.logo:@""];
  371 + YBIBImageData *data = [YBIBImageData new];
  372 + data.imageURL = [NSURL URLWithString:logoStr];
  373 + data.projectiveView = [self viewAtIndex:1];
  374 + [datas addObject:data];
  375 +
  376 + // 网络图片
  377 + NSString *imageStr = [NSString stringWithFormat:@"%@",self.detailModel.account.idCardPic?self.detailModel.account.idCardPic:@""];
  378 + YBIBImageData *imagedata = [YBIBImageData new];
  379 + imagedata.imageURL = [NSURL URLWithString:imageStr];
  380 + imagedata.projectiveView = [self viewAtIndex:12];
  381 + [datas addObject:imagedata];
  382 +
  383 + YBImageBrowser *browser = [YBImageBrowser new];
  384 + browser.dataSourceArray = datas;
  385 + if (indexPath.row == 1) {
  386 + browser.currentPage = 0;
  387 + }else if (indexPath.row == 12) {
  388 + browser.currentPage = 1;
  389 + }else {
  390 + browser.currentPage = 0;
  391 + }
  392 +
  393 + // 只有一个保存操作的时候，可以直接右上角显示保存按钮
  394 + browser.defaultToolViewHandler.topView.operationType = YBIBTopViewOperationTypeSave;
  395 + [browser show];
  396 +
  397 + }
  398 + }
363 399  
364 400 }
365 401  
  402 +- (id)viewAtIndex:(NSInteger)index {
  403 + CNLiveBOrganizationImageVDetailCell *cell = (CNLiveBOrganizationImageVDetailCell *)[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0]];
  404 + return cell ? cell.contentImageV : nil;
  405 +}
  406 +
366 407  
367 408 #pragma mark - TODO:
368 409 #pragma mark - *** 事件实现 ***
... ... @@ -402,7 +443,7 @@
402 443 }
403 444 }
404 445  
405   - if (!error) {
  446 + if (!err) {
406 447 CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
407 448 self.detailModel = detailModel;
408 449 [self.tableView reloadData];
... ... @@ -441,6 +482,8 @@
441 482 }
442 483 return _headerView;;
443 484 }
  485 +
  486 +
444 487 //
445 488 //
446 489 //- (UIView *)footerView {
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.h
  View file @bd6c5c1
... ... @@ -6,11 +6,12 @@
6 6 //
7 7  
8 8 #import <UIKit/UIKit.h>
  9 +#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
9 10 #import "CNLiveOrganizationDetailModel.h"
10 11  
11 12 NS_ASSUME_NONNULL_BEGIN
12 13  
13   -@interface CNLiveBOrganizationValidattionController : UIViewController
  14 +@interface CNLiveBOrganizationValidattionController : CNCommonViewController
14 15  
15 16  
16 17 @property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
  View file @bd6c5c1
... ... @@ -146,6 +146,8 @@
146 146  
147 147 - (void)editUI {
148 148  
  149 + self.title = @"填写公司信息";
  150 +
149 151 [self.view setBackgroundColor:[UIColor whiteColor]];
150 152  
151 153 [self.view addSubview:self.tableView];
... ... @@ -294,14 +296,14 @@
294 296 NSString *filterString = [self disableEmoji:textView.text];
295 297 NSLog(@"过滤Emoji表情后的字符串===%@",filterString);
296 298 textView.text = filterString;
297   -
  299 +
298 300 CNLiveBOrganizationTextView *TV = (CNLiveBOrganizationTextView *)textView;
299 301 if (TV.tvIndexPath) {
300 302 if (TV.tvIndexPath.row == 4) {
301 303 self.companyContent = [NSString stringWithFormat:@"%@",TV.text ? TV.text : @""];
302 304 }
303 305 }
304   -
  306 +
305 307  
306 308 }
307 309  
... ... @@ -922,7 +924,7 @@
922 924 [QMUITips showWithText:@"请输入企业简介" inView:self.view hideAfterDelay:0.5];
923 925 return;
924 926 }
925   -
  927 +
926 928 if (!self.tipModel) {
927 929 [QMUITips showWithText:@"请选择企业类型" inView:self.view hideAfterDelay:0.5];
928 930 return;
... ... @@ -969,7 +971,7 @@
969 971 NSString *htno = [NSString stringWithFormat:@"%@",self.contractCount ? self.contractCount : @""];
970 972 NSString *idCard = [NSString stringWithFormat:@"%@",self.licenseCount ? self.licenseCount : @""];
971 973 NSString *idCardPic = [NSString stringWithFormat:@"%@",self.licenseImageUrl ? self.licenseImageUrl : @""];
972   -
  974 +
973 975 NSMutableDictionary *dict = @{
974 976 @"sid": sid,
975 977 @"mobile": mobile,
... ... @@ -987,7 +989,7 @@
987 989 @"htno":htno,//合同编号,
988 990 @"idCard": idCard,//营业执照号
989 991 @"idCardPic": idCardPic//营业执照
990   -
  992 +
991 993 }.mutableCopy;
992 994  
993 995 NSString *contentDic = [NSString stringWithFormat:@"%@",[dict mj_JSONString]];
... ... @@ -1002,26 +1004,44 @@
1002 1004 [QMUITips hideAllTipsInView:self.view];
1003 1005 NSLog(@"上传数据 = %@",responseObject);
1004 1006  
1005   - NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
1006   - NSError *err = nil;
1007   - id data = nil;
1008   - if([resultCode isEqualToString:@"0"]) {
1009   - data = responseObject[@"data"];
1010   - } else {
1011   - @try {
1012   - err = [[NSError alloc] initWithDomain:responseObject[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
1013   - } @catch (NSException *exception) {
  1007 + if (error) {//有错误
  1008 + if (error.code == -1001 || error.code == -1009) {
  1009 + [QMUITips showError:@"网络连接已断开" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];
  1010 + }else {
  1011 + [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败"
  1012 + }
  1013 + return;
  1014 +
  1015 + }else {
  1016 + NSError *err = nil;
  1017 + id data = nil;
  1018 + NSDictionary *responseDic = (NSDictionary *)responseObject;
  1019 + if (!responseDic || ![responseDic containsObjectForKey:@"errorCode"]) {
1014 1020 err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
  1021 + }else {
  1022 + NSString *resultCode = [NSString stringWithFormat:@"%@", responseDic[@"errorCode"]];
  1023 +
  1024 + if([resultCode isEqualToString:@"0"]) {
  1025 + data = responseDic[@"data"];
  1026 + } else {
  1027 + @try {
  1028 + err = [[NSError alloc] initWithDomain:responseDic[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
  1029 + } @catch (NSException *exception) {
  1030 + err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
  1031 + }
  1032 + }
  1033 +
1015 1034 }
  1035 +
  1036 + if (!err) {
  1037 + CNLiveBAgreementCommitFinishController *vc = [[CNLiveBAgreementCommitFinishController alloc]init];
  1038 + [self.navigationController pushViewController:vc animated:YES];
  1039 + }else {
  1040 + [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败"
  1041 + }
  1042 +
1016 1043 }
1017 1044  
1018   - if (!error) {
1019   - CNLiveBAgreementContentController *vc = [[CNLiveBAgreementContentController alloc]init];
1020   - [self.navigationController pushViewController:vc animated:YES];
1021   - }
1022   -
1023   -
1024   -
1025 1045 }];
1026 1046  
1027 1047  
... ... @@ -1030,23 +1050,6 @@
1030 1050  
1031 1051 }
1032 1052  
1033   -//- (NSString *)objectToJson:(id)obj{
1034   -// if (obj == nil) {
1035   -// return nil;
1036   -// }
1037   -// NSError *error = nil;
1038   -// NSData *jsonData = [NSJSONSerialization dataWithJSONObject:obj
1039   -// options:0
1040   -// error:&error];
1041   -//
1042   -// if ([jsonData length] && error == nil){
1043   -// return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
1044   -// }else{
1045   -// return nil;
1046   -// }
1047   -//}
1048   -
1049   -
1050 1053  
1051 1054 #pragma mark -
1052 1055 #pragma mark - *** 私有属性 ***
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Service/CNLiveBOrganizationValidattionService.h
  View file @bd6c5c1
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8 #import <Foundation/Foundation.h>
9   -#import "CNLiveBOrganizationValidationProtocol.h"
  9 +#import <CNLiveBServices/CNLiveBServices.h>
10 10  
11 11 NS_ASSUME_NONNULL_BEGIN
12 12  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Service/CNLiveBOrganizationValidattionService.m
  View file @bd6c5c1
... ... @@ -23,6 +23,8 @@
23 23  
24 24 @implementation CNLiveBOrganizationValidattionService
25 25  
  26 +/// 认证机构填写
  27 +/// @param params 必要参数
26 28 - (UIViewController *)getOrganizationValidationController:(NSDictionary *)params {
27 29  
28 30 CNLiveBOrganizationValidattionController *VC = [[CNLiveBOrganizationValidattionController alloc]init];
... ... @@ -34,6 +36,9 @@
34 36 return VC;
35 37 }
36 38  
  39 +
  40 +/// 认证机构详情
  41 +/// @param params 必要参数
37 42 - (UIViewController *)getOrganizationDetailController:(NSDictionary *)params{
38 43 CNLiveBOraganizationDetailController *VC = [[CNLiveBOraganizationDetailController alloc]init];
39 44 if (params) {
... ... @@ -44,4 +49,14 @@
44 49 return VC;
45 50 }
46 51  
  52 +
  53 +/// 机构认证审核中
  54 +/// @param params 必要参数
  55 +- (UIViewController *)getOrganizationAuditController:(NSDictionary *)params {
  56 + CNLiveBAgreementCommitFinishController *VC = [[CNLiveBAgreementCommitFinishController alloc]init];
  57 + return VC;
  58 +}
  59 +
  60 +
  61 +
47 62 @end
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.h
  View file @bd6c5c1
... ... @@ -29,6 +29,9 @@ NS_ASSUME_NONNULL_BEGIN
29 29  
30 30 @interface CNLiveBOrganizationImageVDetailCell : UITableViewCell
31 31  
  32 +/** 图片内容*/
  33 +@property (nonatomic, strong) UIImageView *contentImageV;
  34 +
32 35 @property (strong, nonatomic) NSIndexPath *indexPath;
33 36  
34 37 - (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel;
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.m
  View file @bd6c5c1
... ... @@ -49,6 +49,7 @@
49 49  
50 50 [self setBackgroundColor:[UIColor whiteColor]];
51 51 [self addSubview:self.contentL];
  52 + self.selectionStyle = UITableViewCellSelectionStyleNone;
52 53  
53 54 }
54 55  
... ... @@ -89,25 +90,6 @@
89 90 }
90 91 }
91 92  
92   -// @"sid": @"10514575",
93   -// @"mobile": @"15027621766",
94   -// @"userLogo": @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg",
95   -// @"company": @"123",//企业全称
96   -// // @"logo": self.logoUrl,//logo
97   -// @"sname": @"123",//企业简称
98   -// @"sp_code": @"123",//企业代码
99   -// @"jianjie": @"123",//企业简介
100   -// @"address": @"123",//地址
101   -// @"com_type_id": @"2",//企业类型
102   -// @"siteDomain": @"www.cnlive.com",//网站
103   -// @"qiyefaren": @"l23",//企业法人
104   -// @"contacts": @"l23",//联系人
105   -// @"idCard": @"12345678912",//营业执照号
106   -// // @"idCardPic": self.licenseImageUrl,//营业执照
107   -// @"htno":@""
108   -//
109   -
110   -
111 93  
112 94 self.indexPath = indexPath;
113 95  
... ... @@ -171,6 +153,9 @@
171 153 if (isDetail) {
172 154 content = [NSString stringWithFormat:@"%@",detailModel.account.com_type_id?detailModel.account.com_type_id:@""];
173 155 }
  156 +
  157 +
  158 +
174 159 NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
175 160 self.contentL.attributedText = str;
176 161  
... ... @@ -277,8 +262,7 @@
277 262  
278 263 /** 头部*/
279 264 @property (nonatomic, strong) UILabel *titleL;
280   -/** 图片内容*/
281   -@property (nonatomic, strong) UIImageView *contentImageV;
  265 +
282 266  
283 267 @end
284 268  
... ... @@ -314,6 +298,7 @@
314 298 [self addSubview:self.contentImageV];
315 299 self.titleL.frame = CGRectMake(10, 10, 72, 12);
316 300 self.contentImageV.frame = CGRectMake(95, 10, 60, 60);
  301 + self.selectionStyle = UITableViewCellSelectionStyleNone;
317 302 }
318 303  
319 304 #pragma mark - ***layoutUI***
... ...
Example/CNLiveOrganizationValidationModule.xcodeproj/project.pbxproj
  View file @bd6c5c1
... ... @@ -354,20 +354,17 @@
354 354 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
355 355 "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
356 356 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
  357 + "${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework",
357 358 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
358   - "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
359 359 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
360 360 "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
361 361 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
362   - "${BUILT_PRODUCTS_DIR}/CNLiveICloudPicker/CNLiveICloudPicker.framework",
363 362 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
364   - "${BUILT_PRODUCTS_DIR}/CNLiveModuleServiceProtocols/CNLiveModuleServiceProtocols.framework",
365 363 "${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework",
366 364 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
367 365 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
368 366 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
369 367 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
370   - "${BUILT_PRODUCTS_DIR}/CNLiveVoiceToTextKit/CNLiveVoiceToTextKit.framework",
371 368 "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
372 369 "${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
373 370 "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
... ... @@ -389,6 +386,8 @@
389 386 "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework",
390 387 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
391 388 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
  389 + "${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework",
  390 + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
392 391 "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
393 392 "${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework",
394 393 "${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
... ... @@ -399,20 +398,17 @@
399 398 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
400 399 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
401 400 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
  401 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework",
402 402 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
403   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
404 403 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
405 404 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
406 405 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
407   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveICloudPicker.framework",
408 406 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
409   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveModuleServiceProtocols.framework",
410 407 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework",
411 408 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
412 409 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
413 410 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
414 411 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
415   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveVoiceToTextKit.framework",
416 412 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
417 413 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
418 414 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
... ... @@ -434,6 +430,8 @@
434 430 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework",
435 431 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
436 432 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
  433 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework",
  434 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
437 435 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
438 436 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework",
439 437 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
... ...
Example/CNLiveOrganizationValidationModule/Base.lproj/Main.storyboard
  View file @bd6c5c1
... ... @@ -3,7 +3,7 @@
3 3 <device id="retina4_7" orientation="portrait" appearance="light"/>
4 4 <dependencies>
5 5 <deployment identifier="iOS"/>
6   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
  6 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
7 7 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
8 8 </dependencies>
9 9 <scenes>
... ... @@ -29,7 +29,7 @@
29 29 <!--Navigation Controller-->
30 30 <scene sceneID="FjW-Zi-UO0">
31 31 <objects>
32   - <navigationController id="0XO-Q7-yxH" sceneMemberID="viewController">
  32 + <navigationController id="0XO-Q7-yxH" customClass="CNNavigationController" sceneMemberID="viewController">
33 33 <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="ezs-eV-gQK">
34 34 <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
35 35 <autoresizingMask key="autoresizingMask"/>
... ...
Example/CNLiveOrganizationValidationModule/CNLIVEBAppDelegate.m
  View file @bd6c5c1
... ... @@ -70,7 +70,7 @@ static NSString * uuid;
70 70 CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg";
71 71 CNUserShareModel.nickname = @"";
72 72 CNUserShareModel.mobile = @"15027621766";
73   - CNUserShareModel.uid = @"10514583";
  73 + CNUserShareModel.uid = @"10514501";
74 74  
75 75 }
76 76 - (NSString *)appUUIDString
... ...
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
  View file @bd6c5c1
... ... @@ -33,13 +33,13 @@
33 33 - (void)viewDidLoad
34 34 {
35 35 [super viewDidLoad];
36   - // Do any additional setup after loading the view, typically from a nib.
  36 + // Do any additional setup after loading the view, typically from a nib.
37 37  
38 38 UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
39   - [self.view addSubview:button];
40   - button.frame = CGRectMake(100, 100, 100, 100);
41   - [button setBackgroundColor:UIColorFromRGB(0x000000)];
42   - [button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
  39 + [self.view addSubview:button];
  40 + button.frame = CGRectMake(100, 100, 100, 100);
  41 + [button setBackgroundColor:UIColorFromRGB(0x000000)];
  42 + [button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
43 43  
44 44 UIButton *button1 = [UIButton buttonWithType:UIButtonTypeCustom];
45 45 [self.view addSubview:button1];
... ... @@ -51,84 +51,84 @@
51 51 - (void)buttonAction:(UIButton *)button {
52 52  
53 53  
54   -
  54 +
55 55 CNLiveBOrganizationValidattionController *vc = [[CNLiveBOrganizationValidattionController alloc]init];
56 56 [self.navigationController pushViewController:vc animated:YES];
57 57 }
58 58  
59 59 - (void)button1Action:(UIButton *)button {
60   - //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
61   - NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
62   - NSDictionary *dict = @{
63   - @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
64   - @"sign":@""
65   - };
  60 + //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
  61 + NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
  62 + NSDictionary *dict = @{
  63 + @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
  64 + @"sign":@""
  65 + };
  66 +
  67 + [CNLiveNetworking setAllowRequestDefaultArgument:YES];
  68 + [CNLiveNetworking setupShowDataResult:NO];
  69 + [QMUITips showLoadingInView:self.view];
  70 + [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
  71 + [QMUITips hideAllTipsInView:self.view];
66 72  
67   - [CNLiveNetworking setAllowRequestDefaultArgument:YES];
68   - [CNLiveNetworking setupShowDataResult:NO];
69   - [QMUITips showLoadingInView:self.view];
70   - [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
71   - [QMUITips hideAllTipsInView:self.view];
72   -
73   - NSLog(@"点播详情数据 = %@",responseObject);
74   -
75   - NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
76   - NSError *err = nil;
77   - id data = nil;
78   - if([resultCode isEqualToString:@"0"]) {
79   - data = responseObject[@"data"];
80   - } else {
81   - @try {
82   - err = [[NSError alloc] initWithDomain:responseObject[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
83   - } @catch (NSException *exception) {
84   - err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
85   - }
  73 + NSLog(@"点播详情数据 = %@",responseObject);
  74 +
  75 + NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
  76 + NSError *err = nil;
  77 + id data = nil;
  78 + if([resultCode isEqualToString:@"0"]) {
  79 + data = responseObject[@"data"];
  80 + } else {
  81 + @try {
  82 + err = [[NSError alloc] initWithDomain:responseObject[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
  83 + } @catch (NSException *exception) {
  84 + err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
86 85 }
87   -
88   - if (!error) {
89   - BOOL isEnter = NO;
90   - NSDictionary *dicContent = (NSDictionary *)data;
91   - if (dicContent) {
92   - if ([dicContent containsObjectForKey:@"isCertification"]) {
93   - NSString *isCertificationStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"isCertification"]];
94   - if ([isCertificationStr isEqualToString:@"0"]) {
95   - /// 填表页
96   - id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
97   - UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
98   - [self.navigationController pushViewController:vc animated:YES];
99   -
100   - isEnter = YES;
101   - }else if ([isCertificationStr isEqualToString:@"1"]) {
102   - /// 详情页
103   - id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
104   - UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
105   - [self.navigationController pushViewController:vc animated:YES];
106   -
107   - isEnter = YES;
108   - }else if ([isCertificationStr isEqualToString:@"2"]) {
109   -
110   - /// 详情页
111   - id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
112   - UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
113   - [self.navigationController pushViewController:vc animated:YES];
114   -
115   - isEnter = YES;
116   -
117   - isEnter = YES;
118   - }
  86 + }
  87 +
  88 + if (!err) {
  89 + BOOL isEnter = NO;
  90 + NSDictionary *dicContent = (NSDictionary *)data;
  91 + if (dicContent) {
  92 + if ([dicContent containsObjectForKey:@"isCertification"]) {
  93 + NSString *isCertificationStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"isCertification"]];
  94 + if ([isCertificationStr isEqualToString:@"0"]) {
  95 + /// 填表页
  96 + id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
  97 + UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
  98 + [self.navigationController pushViewController:vc animated:YES];
  99 +
  100 + isEnter = YES;
  101 + }else if ([isCertificationStr isEqualToString:@"1"]) {
  102 + /// 详情页
  103 + id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
  104 + UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
  105 + [self.navigationController pushViewController:vc animated:YES];
  106 +
  107 + isEnter = YES;
  108 + }else if ([isCertificationStr isEqualToString:@"2"]) {
  109 +
  110 + /// 详情页 审核中
  111 + id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
  112 + UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
  113 + [self.navigationController pushViewController:vc animated:YES];
  114 +
  115 + isEnter = YES;
  116 +
  117 + isEnter = YES;
119 118 }
120 119 }
121   -
122   - if (!isEnter) {
123   - #pragma mark - TODO:弹框
124   - ///弹框
125   - }
126   -
127   - }else {
128   -
129 120 }
130   -
131   - }];
  121 +
  122 + if (!isEnter) {
  123 +#pragma mark - TODO:弹框
  124 + ///弹框
  125 + }
  126 +
  127 + }else {
  128 +
  129 + }
  130 +
  131 + }];
132 132  
133 133 }
134 134  
... ...