提交0.0.9

梁星国
1 parent ef7529d0
Showing 5 changed files with 49 additions and 45 deletions
CNLiveOrganizationValidationModule.podspec
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.m
Example/CNLiveOrganizationValidationModule.xcodeproj/project.pbxproj
Example/CNLiveOrganizationValidationModule/CNLIVEBAppDelegate.m
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveOrganizationValidationModule'
-  s.version          = '0.0.8'
+  s.version          = '0.0.9'
   s.summary          = '机构认证模块'
 # This description is used to generate tags and improve search results.
@@ -76,7 +76,7 @@ Pod::Spec.new do |s|
   ########################################
   ###    所有github三方管理库(非频繁更新)
   ########################################
-  s.dependency  'CNLiveTripartiteManagement'
+  s.dependency  'CNLiveTripartiteManagement/RSKImageCropper'
 #  #相册展示
 #  s.dependency 'YBImageBrowser'
@@ -54,10 +54,8 @@
     text.color = RGBOF(0x7b7b7b);
     text.alignment = NSTextAlignmentCenter;
     __weak typeof(self) weakSelf = self;
-    [text setTextHighlightRange:range
-                                 color:[UIColor colorWithRed:0.093 green:0.492 blue:1.000 alpha:1.000]
-                       backgroundColor:[UIColor whiteColor]
-                             tapAction:^(UIView *containerView, NSAttributedString *text, NSRange range, CGRect rect) {
+    [text setTextHighlightRange:range color:[UIColor colorWithRed:0.093 green:0.492 blue:1.000 alpha:1.000] backgroundColor:[UIColor whiteColor] userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+        
         //点击文本的操作
         NSLog(@"输出内容");
@@ -65,7 +63,16 @@
         vc.url = tipText;
         vc.title = @"视讯云";
         [weakSelf.navigationController pushViewController:vc animated:YES];
-               
+        
+    } longPressAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+        
+        UIPasteboard*pasteboard = [UIPasteboard generalPasteboard];
+
+        pasteboard.string = tipText;
+        
+        [QMUITips showWithText:@"复制成功" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];
+
+        
     }];
     self.contentL.attributedText = text;
@@ -365,30 +365,16 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
-				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
-				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
 				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
-				"${BUILT_PRODUCTS_DIR}/Ks3SDK/Ks3SDK.framework",
-				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
-				"${BUILT_PRODUCTS_DIR}/PGDatePicker/PGDatePicker.framework",
-				"${BUILT_PRODUCTS_DIR}/PGPickerView/PGPickerView.framework",
-				"${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
 				"${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework",
-				"${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
 				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
-				"${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
-				"${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework",
-				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
-				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
-				"${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework",
-				"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -407,30 +393,16 @@
 				"${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}/FMDB.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ks3SDK.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGDatePicker.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGPickerView.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
-				"${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}/YYKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -444,13 +416,11 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh",
-				"${PODS_ROOT}/BaiduMapKit/BaiduMapKit/BaiduMapAPI_Map.framework/mapapi.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
 				"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mapapi.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
 			);
@@ -11,6 +11,7 @@
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
+//#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 static NSString * uuid;
@@ -52,14 +53,35 @@ static NSString * uuid;
 }
 - (void)networkParamAction {
-    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
-    [mDict setValue:@"10514575" forKey:@"loginSid"];
-    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey:@"platform_id"];
-    [mDict setValue:[self appUUIDString] forKey:@"uuid"];
-    [mDict setValue:@"i" forKey:@"plat"];
-    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
-    [mDict setObject:AppId forKey:@"appId"];
-    [CNLiveNetworking setupDefaultParam:mDict];
+    
+//    [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
+    
+   NSDictionary *dic = @{
+       @"appId":@"769_k8gs9gcq47",
+       @"clientPlat" :@"i",
+       @"loginSid" : @"10514333",
+       @"plat" : @"i",
+       @"platform_id" : @"com.cnlive.CNLiveNetPlusBusiness",
+       @"sid" : @"10514333",
+       @"sign" : @"9F21AFCB66719D83BF0F421B298761952EB88D7F",
+       @"timestamp" : @"1587532123",
+       @"token" : @"BpKDrdmPSBV9DeOaNGn2WvBgxDgw4wRlvyb6eofc3nv179rtwr5BnnmmJyhKGpkj",
+       @"uid" : @"10514333",
+       @"uuid" : @"D0E07F062CDB4907BB6428C889199415",
+       @"ver" : @"1.0.0.20.04.16.11"
+   };
+    
+    
+    
+//    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+//    [mDict setValue:@"10514575" forKey:@"loginSid"];
+//    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey:@"platform_id"];
+//    [mDict setValue:[self appUUIDString] forKey:@"uuid"];
+//    [mDict setValue:@"i" forKey:@"plat"];
+//    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
+//    [mDict setObject:@"769_k8gs9gcq47" forKey:@"appId"];
+    
+    [CNLiveNetworking setupDefaultParam:dic];
     [CNLiveNetworking setupShowResult:NO];
     [CNLiveNetworking setupSignKey:APPKey];
     NSLog(@"打印appkey%@",APPKey);
@@ -72,6 +72,11 @@
         NSLog(@"点播详情数据 = %@",responseObject);
+        /// 详情页 审核中
+                              id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+        UIViewController *vc = [organizationValidationProtocol getOrganizationAuditController:@{}];
+                              [self.navigationController pushViewController:vc animated:YES];
+        
         NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
         NSError *err = nil;
         id data = nil;