提交更改

梁星国
1 parent 7e702a2f
Showing 19 changed files with 212 additions and 165 deletions
CNLiveOrganizationValidationModule.podspec
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_back@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_back@3x.png
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Service/CNLiveBOrganizationValidattionService.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Service/CNLiveBOrganizationValidattionService.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.m
Example/CNLiveOrganizationValidationModule.xcodeproj/project.pbxproj
Example/CNLiveOrganizationValidationModule/Base.lproj/Main.storyboard
Example/CNLiveOrganizationValidationModule/CNLIVEBAppDelegate.m
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
@@ -51,7 +51,10 @@ Pod::Spec.new do |s|
   ########################################
   #CNLive组件
   s.dependency 'CNLiveBeeHive' #核心路由架构
-  s.dependency 'CNLiveModuleServiceProtocols'
+  #模块协议
+  s.dependency 'CNLiveBServices'
+  #Base控制器
+  s.dependency 'CNLiveBusinessBaseModule'
   #分享工具库
   s.dependency 'CNLiveShareToolKit'
   #基础请求组件库
@@ -64,30 +67,18 @@ Pod::Spec.new do |s|
   s.dependency 'CNLiveCommonCategory'
   #用户管理库
   s.dependency 'CNLiveUserManagement'
-  #语音转文字库
-  s.dependency 'CNLiveVoiceToTextKit'
-  #业务工具库
-  s.dependency 'CNLiveBusinessTools'
-  #本地存储库
-  s.dependency 'CNLiveCacheManagerKit'
   #环境库
   s.dependency 'CNLiveEnvironment'
-  #iCould文件取得
-  s.dependency 'CNLiveICloudPicker'
-  #    #系统定位
-  #    pod 'CNLiveLocationManager'
   #上传 (新加)
   s.dependency 'CNLiveUploadManager'
   #相册 (新加)
   s.dependency 'CNLiveImagePickerController'
-  #腾讯QQ库
-  s.dependency 'CNLiveTencentopenapi'
-  #组件化-接口库CNLiveServices
-  s.dependency 'CNLiveServices'
   ########################################
   ###    所有github三方管理库(非频繁更新)
   ########################################
   s.dependency  'CNLiveTripartiteManagement'
+  #相册展示
+  s.dependency 'YBImageBrowser'
@@ -6,10 +6,11 @@
 //
 #import <UIKit/UIKit.h>
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveBAgreementCommitFinishController : UIViewController
+@interface CNLiveBAgreementCommitFinishController : CNCommonViewController
 @end
@@ -47,6 +47,8 @@
 - (void)setupUI {
+    self.title = @"机构认证";
+    
     [self.view setBackgroundColor:[UIColor whiteColor]];
     [self.view addSubview:self.imageVeiw];
     [self.view addSubview:self.contentL];
@@ -57,6 +59,9 @@
     [self.view addSubview:self.returnBtn];
     [_returnBtn addTarget:self action:@selector(returnBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamedFromOrganization:@"organization_back"] style:UIBarButtonItemStylePlain target:self action:@selector(returnBtnAction:)];
+    self.navigationItem.leftBarButtonItem = backItem;
 }
@@ -6,10 +6,11 @@
 //
 #import <UIKit/UIKit.h>
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveBAgreementContentController : UIViewController
+@interface CNLiveBAgreementContentController : CNCommonViewController
 @end
@@ -15,7 +15,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    self.title = @"机构认证";
     [self.view setBackgroundColor:[UIColor whiteColor]];
 }
@@ -6,11 +6,12 @@
 //
 #import <UIKit/UIKit.h>
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
 #import "CNLiveOrganizationDetailModel.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveBOraganizationDetailController : UIViewController
+@interface CNLiveBOraganizationDetailController : CNCommonViewController
 @property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
@@ -20,6 +20,8 @@
 #import <QMUIKit/QMUIKit.h>
 #import <YYKit/YYKit.h>
 #import <objc/runtime.h>
+#import <YBImageBrowser/YBImageBrowser.h>
+#import <YBImageBrowser/YBIBImageData.h>
 //体育中国-详情
@@ -82,6 +84,7 @@
 - (void)editUI {
+    self.title = @"认证机构";
     [self.view setBackgroundColor:[UIColor whiteColor]];
     [self.view addSubview:self.tableView];
@@ -360,9 +363,47 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (indexPath.section == 0) {
+        if (indexPath.row == 1 || indexPath.row == 12) {
+            NSMutableArray *datas = [NSMutableArray array];
+            // 网络图片
+            NSString *logoStr = [NSString stringWithFormat:@"%@",self.detailModel.account.logo?self.detailModel.account.logo:@""];
+            YBIBImageData *data = [YBIBImageData new];
+            data.imageURL = [NSURL URLWithString:logoStr];
+            data.projectiveView = [self viewAtIndex:1];
+            [datas addObject:data];
+            
+            // 网络图片
+            NSString *imageStr = [NSString stringWithFormat:@"%@",self.detailModel.account.idCardPic?self.detailModel.account.idCardPic:@""];
+            YBIBImageData *imagedata = [YBIBImageData new];
+            imagedata.imageURL = [NSURL URLWithString:imageStr];
+            imagedata.projectiveView = [self viewAtIndex:12];
+            [datas addObject:imagedata];
+            
+            YBImageBrowser *browser = [YBImageBrowser new];
+            browser.dataSourceArray = datas;
+            if (indexPath.row == 1) {
+                browser.currentPage =  0;
+            }else if (indexPath.row == 12) {
+                browser.currentPage =  1;
+            }else {
+                browser.currentPage =  0;
+            }
+            
+            // 只有一个保存操作的时候，可以直接右上角显示保存按钮
+            browser.defaultToolViewHandler.topView.operationType = YBIBTopViewOperationTypeSave;
+            [browser show];
+            
+        }
+    }
 }
+- (id)viewAtIndex:(NSInteger)index {
+    CNLiveBOrganizationImageVDetailCell *cell = (CNLiveBOrganizationImageVDetailCell *)[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0]];
+    return cell ? cell.contentImageV : nil;
+}
+
 #pragma mark - TODO:
 #pragma mark - *** 事件实现 ***
@@ -402,7 +443,7 @@
             }
         }
-        if (!error) {
+        if (!err) {
             CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
             self.detailModel = detailModel;
             [self.tableView reloadData];
@@ -441,6 +482,8 @@
     }
     return _headerView;;
 }
+
+
 //
 //
 //- (UIView *)footerView {
@@ -6,11 +6,12 @@
 //
 #import <UIKit/UIKit.h>
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
 #import "CNLiveOrganizationDetailModel.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveBOrganizationValidattionController : UIViewController
+@interface CNLiveBOrganizationValidattionController : CNCommonViewController
 @property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
@@ -146,6 +146,8 @@
 - (void)editUI {
+    self.title = @"填写公司信息";
+    
     [self.view setBackgroundColor:[UIColor whiteColor]];
     [self.view addSubview:self.tableView];
@@ -294,14 +296,14 @@
     NSString *filterString = [self disableEmoji:textView.text];
     NSLog(@"过滤Emoji表情后的字符串===%@",filterString);
     textView.text = filterString;
-
+    
     CNLiveBOrganizationTextView *TV = (CNLiveBOrganizationTextView *)textView;
     if (TV.tvIndexPath) {
         if (TV.tvIndexPath.row == 4) {
             self.companyContent = [NSString stringWithFormat:@"%@",TV.text ? TV.text : @""];
         }
     }
-
+    
 }
@@ -922,7 +924,7 @@
         [QMUITips showWithText:@"请输入企业简介" inView:self.view hideAfterDelay:0.5];
         return;
     }
-
+    
     if (!self.tipModel) {
         [QMUITips showWithText:@"请选择企业类型" inView:self.view hideAfterDelay:0.5];
         return;
@@ -969,7 +971,7 @@
     NSString *htno = [NSString stringWithFormat:@"%@",self.contractCount ? self.contractCount : @""];
     NSString *idCard = [NSString stringWithFormat:@"%@",self.licenseCount ? self.licenseCount : @""];
     NSString *idCardPic = [NSString stringWithFormat:@"%@",self.licenseImageUrl ? self.licenseImageUrl : @""];
- 
+    
     NSMutableDictionary *dict = @{
         @"sid": sid,
         @"mobile": mobile,
@@ -987,7 +989,7 @@
         @"htno":htno,//合同编号,
         @"idCard": idCard,//营业执照号
         @"idCardPic": idCardPic//营业执照
-       
+        
     }.mutableCopy;
     NSString *contentDic = [NSString stringWithFormat:@"%@",[dict mj_JSONString]];
@@ -1002,26 +1004,44 @@
         [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) {
+        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;
+            
+        }else {
+            NSError *err = nil;
+            id data = nil;
+            NSDictionary *responseDic = (NSDictionary *)responseObject;
+            if (!responseDic || ![responseDic containsObjectForKey:@"errorCode"]) {
                 err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
+            }else {
+                NSString *resultCode = [NSString stringWithFormat:@"%@",  responseDic[@"errorCode"]];
+
+                if([resultCode isEqualToString:@"0"]) {
+                    data = responseDic[@"data"];
+                } else {
+                    @try {
+                        err = [[NSError alloc] initWithDomain:responseDic[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
+                    } @catch (NSException *exception) {
+                        err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
+                    }
+                }
+                
             }
+            
+            if (!err) {
+                CNLiveBAgreementCommitFinishController *vc = [[CNLiveBAgreementCommitFinishController alloc]init];
+                [self.navigationController pushViewController:vc animated:YES];
+            }else {
+                [QMUITips showError:error.domain inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];//@"上传失败"
+            }
+            
         }
-        if (!error) {
-            CNLiveBAgreementContentController *vc = [[CNLiveBAgreementContentController alloc]init];
-            [self.navigationController pushViewController:vc animated:YES];
-        }
-        
-        
-        
     }];
@@ -1030,23 +1050,6 @@
 }
-//- (NSString *)objectToJson:(id)obj{
-//    if (obj == nil) {
-//        return nil;
-//    }
-//    NSError *error = nil;
-//    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:obj
-//                                                       options:0
-//                                                         error:&error];
-//
-//    if ([jsonData length] && error == nil){
-//        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-//    }else{
-//        return nil;
-//    }
-//}
-
-
 #pragma mark -
 #pragma mark - *** 私有属性 ***
@@ -6,7 +6,7 @@
 //
 #import <Foundation/Foundation.h>
-#import "CNLiveBOrganizationValidationProtocol.h"
+#import <CNLiveBServices/CNLiveBServices.h>
 NS_ASSUME_NONNULL_BEGIN
@@ -23,6 +23,8 @@
 @implementation CNLiveBOrganizationValidattionService
+/// 认证机构填写
+/// @param params 必要参数
 - (UIViewController *)getOrganizationValidationController:(NSDictionary *)params {
     CNLiveBOrganizationValidattionController *VC = [[CNLiveBOrganizationValidattionController  alloc]init];
@@ -34,6 +36,9 @@
     return VC;
 }
+
+/// 认证机构详情
+/// @param params 必要参数
 - (UIViewController *)getOrganizationDetailController:(NSDictionary *)params{
      CNLiveBOraganizationDetailController *VC = [[CNLiveBOraganizationDetailController  alloc]init];
      if (params) {
@@ -44,4 +49,14 @@
     return VC;
 }
+
+/// 机构认证审核中
+/// @param params 必要参数
+- (UIViewController *)getOrganizationAuditController:(NSDictionary *)params {
+    CNLiveBAgreementCommitFinishController *VC = [[CNLiveBAgreementCommitFinishController  alloc]init];
+    return VC;
+}
+
+
+
 @end
@@ -29,6 +29,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBOrganizationImageVDetailCell : UITableViewCell
+/** 图片内容*/
+@property (nonatomic, strong) UIImageView *contentImageV;
+
 @property (strong, nonatomic) NSIndexPath *indexPath;
 - (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel;
@@ -49,6 +49,7 @@
     [self setBackgroundColor:[UIColor whiteColor]];
     [self addSubview:self.contentL];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
 }
@@ -89,25 +90,6 @@
         }
     }
-//       @"sid": @"10514575",
-//            @"mobile": @"15027621766",
-//            @"userLogo": @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg",
-//            @"company": @"123",//企业全称
-//    //        @"logo": self.logoUrl,//logo
-//            @"sname": @"123",//企业简称
-//            @"sp_code": @"123",//企业代码
-//            @"jianjie": @"123",//企业简介
-//            @"address": @"123",//地址
-//            @"com_type_id": @"2",//企业类型
-//            @"siteDomain": @"www.cnlive.com",//网站
-//            @"qiyefaren": @"l23",//企业法人
-//            @"contacts": @"l23",//联系人
-//            @"idCard": @"12345678912",//营业执照号
-//    //        @"idCardPic": self.licenseImageUrl,//营业执照
-//            @"htno":@""
-//
-    
-    
     self.indexPath = indexPath;
@@ -171,6 +153,9 @@
             if (isDetail) {
                 content = [NSString stringWithFormat:@"%@",detailModel.account.com_type_id?detailModel.account.com_type_id:@""];
             }
+            
+            
+            
             NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
@@ -277,8 +262,7 @@
 /** 头部*/
 @property (nonatomic, strong) UILabel *titleL;
-/** 图片内容*/
-@property (nonatomic, strong) UIImageView *contentImageV;
+
 @end
@@ -314,6 +298,7 @@
     [self addSubview:self.contentImageV];
     self.titleL.frame = CGRectMake(10, 10, 72, 12);
     self.contentImageV.frame = CGRectMake(95, 10, 60, 60);
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
 }
 #pragma mark - ***layoutUI***
@@ -354,20 +354,17 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveICloudPicker/CNLiveICloudPicker.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveModuleServiceProtocols/CNLiveModuleServiceProtocols.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveVoiceToTextKit/CNLiveVoiceToTextKit.framework",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
 				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
 				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
@@ -389,6 +386,8 @@
 				"${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework",
 				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
 				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
+				"${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework",
+				"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 				"${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework",
 				"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
@@ -399,20 +398,17 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveICloudPicker.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveModuleServiceProtocols.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveVoiceToTextKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
@@ -434,6 +430,8 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
@@ -3,7 +3,7 @@
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -29,7 +29,7 @@
         <!--Navigation Controller-->
         <scene sceneID="FjW-Zi-UO0">
             <objects>
-                <navigationController id="0XO-Q7-yxH" sceneMemberID="viewController">
+                <navigationController id="0XO-Q7-yxH" customClass="CNNavigationController" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="ezs-eV-gQK">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -70,7 +70,7 @@ static NSString * uuid;
     CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg";
     CNUserShareModel.nickname = @"";
     CNUserShareModel.mobile = @"15027621766";
-    CNUserShareModel.uid = @"10514583";
+    CNUserShareModel.uid = @"10514501";
 }
 - (NSString *)appUUIDString
@@ -33,13 +33,13 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
+    // Do any additional setup after loading the view, typically from a nib.
     UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-      [self.view addSubview:button];
-      button.frame = CGRectMake(100, 100, 100, 100);
-      [button setBackgroundColor:UIColorFromRGB(0x000000)];
-      [button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:button];
+    button.frame = CGRectMake(100, 100, 100, 100);
+    [button setBackgroundColor:UIColorFromRGB(0x000000)];
+    [button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
     UIButton *button1 = [UIButton buttonWithType:UIButtonTypeCustom];
     [self.view addSubview:button1];
@@ -51,84 +51,84 @@
 - (void)buttonAction:(UIButton *)button {
-   
+    
     CNLiveBOrganizationValidattionController *vc = [[CNLiveBOrganizationValidattionController alloc]init];
     [self.navigationController  pushViewController:vc animated:YES];
 }
 - (void)button1Action:(UIButton *)button {
-     //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
-        NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
-        NSDictionary *dict = @{
-            @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
-            @"sign":@""
-        };
+    //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
+    NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
+    NSDictionary *dict = @{
+        @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
+        @"sign":@""
+    };
+    
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [QMUITips showLoadingInView:self.view];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllTipsInView:self.view];
-        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-        [CNLiveNetworking setupShowDataResult:NO];
-        [QMUITips showLoadingInView:self.view];
-        [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];
-                }
+        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 (!error) {
-                BOOL isEnter = NO;
-                NSDictionary *dicContent = (NSDictionary *)data;
-                if (dicContent) {
-                    if ([dicContent containsObjectForKey:@"isCertification"]) {
-                        NSString *isCertificationStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"isCertification"]];
-                        if ([isCertificationStr isEqualToString:@"0"]) {
-                            ///  填表页
-                            id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
-                            UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
-                            [self.navigationController pushViewController:vc animated:YES];
-                            
-                            isEnter = YES;
-                        }else if ([isCertificationStr isEqualToString:@"1"]) {
-                            /// 详情页
-                            id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
-                            UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
-                            [self.navigationController pushViewController:vc animated:YES];
-                            
-                            isEnter = YES;
-                        }else if ([isCertificationStr isEqualToString:@"2"]) {
-                            
-                           /// 详情页
-                                                     id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
-                                                     UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
-                                                     [self.navigationController pushViewController:vc animated:YES];
-                                                     
-                                                     isEnter = YES;
-                            
-                            isEnter = YES;
-                        }
+        }
+        
+        if (!err) {
+            BOOL isEnter = NO;
+            NSDictionary *dicContent = (NSDictionary *)data;
+            if (dicContent) {
+                if ([dicContent containsObjectForKey:@"isCertification"]) {
+                    NSString *isCertificationStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"isCertification"]];
+                    if ([isCertificationStr isEqualToString:@"0"]) {
+                        ///  填表页
+                        id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+                        UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
+                        [self.navigationController pushViewController:vc animated:YES];
+                        
+                        isEnter = YES;
+                    }else if ([isCertificationStr isEqualToString:@"1"]) {
+                        /// 详情页
+                        id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+                        UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
+                        [self.navigationController pushViewController:vc animated:YES];
+                        
+                        isEnter = YES;
+                    }else if ([isCertificationStr isEqualToString:@"2"]) {
+                        
+                        /// 详情页 审核中
+                        id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+                        UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
+                        [self.navigationController pushViewController:vc animated:YES];
+                        
+                        isEnter = YES;
+                        
+                        isEnter = YES;
                     }
                 }
-                
-                if (!isEnter) {
-    #pragma mark - TODO:弹框
-                    ///弹框
-                }
-                
-            }else {
-                
             }
-      
-        }];
+            
+            if (!isEnter) {
+#pragma mark - TODO:弹框
+                ///弹框
+            }
+            
+        }else {
+            
+        }
+        
+    }];
 }