iOS Team / CNLiveOrganizationValidationModule · Commits

Commit 6d2d5364a98c5a43af5994ef278e4a6906096522

Authored by 梁星国
1 parent ef7529d0

提交0.0.9

Inline Side-by-side
Showing 5 changed files with 49 additions and 45 deletions
CNLiveOrganizationValidationModule.podspec
  View file @6d2d536
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveOrganizationValidationModule'
11   - s.version = '0.0.8'
  11 + s.version = '0.0.9'
12 12 s.summary = '机构认证模块'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ... @@ -76,7 +76,7 @@ Pod::Spec.new do |s|
76 76 ########################################
77 77 ### 所有github三方管理库(非频繁更新)
78 78 ########################################
79   - s.dependency 'CNLiveTripartiteManagement'
  79 + s.dependency 'CNLiveTripartiteManagement/RSKImageCropper'
80 80 # #相册展示
81 81 # s.dependency 'YBImageBrowser'
82 82  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.m
  View file @6d2d536
... ... @@ -54,10 +54,8 @@
54 54 text.color = RGBOF(0x7b7b7b);
55 55 text.alignment = NSTextAlignmentCenter;
56 56 __weak typeof(self) weakSelf = self;
57   - [text setTextHighlightRange:range
58   - color:[UIColor colorWithRed:0.093 green:0.492 blue:1.000 alpha:1.000]
59   - backgroundColor:[UIColor whiteColor]
60   - tapAction:^(UIView *containerView, NSAttributedString *text, NSRange range, CGRect rect) {
  57 + [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) {
  58 +
61 59 //点击文本的操作
62 60 NSLog(@"输出内容");
63 61  
... ... @@ -65,7 +63,16 @@
65 63 vc.url = tipText;
66 64 vc.title = @"视讯云";
67 65 [weakSelf.navigationController pushViewController:vc animated:YES];
68   -
  66 +
  67 + } longPressAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
  68 +
  69 + UIPasteboard*pasteboard = [UIPasteboard generalPasteboard];
  70 +
  71 + pasteboard.string = tipText;
  72 +
  73 + [QMUITips showWithText:@"复制成功" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:0.5];
  74 +
  75 +
69 76 }];
70 77  
71 78 self.contentL.attributedText = text;
... ...
Example/CNLiveOrganizationValidationModule.xcodeproj/project.pbxproj
  View file @6d2d536
... ... @@ -365,30 +365,16 @@
365 365 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
366 366 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
367 367 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
368   - "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
369   - "${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
370 368 "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
371   - "${BUILT_PRODUCTS_DIR}/Ks3SDK/Ks3SDK.framework",
372   - "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
373 369 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
374 370 "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
375 371 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
376   - "${BUILT_PRODUCTS_DIR}/PGDatePicker/PGDatePicker.framework",
377   - "${BUILT_PRODUCTS_DIR}/PGPickerView/PGPickerView.framework",
378   - "${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
379 372 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
380 373 "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
381 374 "${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework",
382   - "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
383 375 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
384   - "${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework",
385 376 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
386   - "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework",
387   - "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
388   - "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
389 377 "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
390   - "${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework",
391   - "${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
392 378 );
393 379 name = "[CP] Embed Pods Frameworks";
394 380 outputPaths = (
... ... @@ -407,30 +393,16 @@
407 393 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
408 394 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
409 395 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
410   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
411   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
412 396 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
413   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ks3SDK.framework",
414   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
415 397 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
416 398 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
417 399 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
418   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGDatePicker.framework",
419   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGPickerView.framework",
420   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
421 400 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
422 401 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
423 402 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework",
424   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
425 403 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
426   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework",
427 404 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
428   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework",
429   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
430   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
431 405 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
432   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework",
433   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
434 406 );
435 407 runOnlyForDeploymentPostprocessing = 0;
436 408 shellPath = /bin/sh;
... ... @@ -444,13 +416,11 @@
444 416 );
445 417 inputPaths = (
446 418 "${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh",
447   - "${PODS_ROOT}/BaiduMapKit/BaiduMapKit/BaiduMapAPI_Map.framework/mapapi.bundle",
448 419 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
449 420 "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
450 421 );
451 422 name = "[CP] Copy Pods Resources";
452 423 outputPaths = (
453   - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mapapi.bundle",
454 424 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
455 425 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
456 426 );
... ...
Example/CNLiveOrganizationValidationModule/CNLIVEBAppDelegate.m
  View file @6d2d536
... ... @@ -11,6 +11,7 @@
11 11 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
12 12 #import <CNLiveUserManagement/CNUserInfoManager.h>
13 13 #import <CNLiveEnvironment/CNLiveEnvironment.h>
  14 +//#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
14 15  
15 16  
16 17 static NSString * uuid;
... ... @@ -52,14 +53,35 @@ static NSString * uuid;
52 53 }
53 54  
54 55 - (void)networkParamAction {
55   - NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
56   - [mDict setValue:@"10514575" forKey:@"loginSid"];
57   - [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey:@"platform_id"];
58   - [mDict setValue:[self appUUIDString] forKey:@"uuid"];
59   - [mDict setValue:@"i" forKey:@"plat"];
60   - [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
61   - [mDict setObject:AppId forKey:@"appId"];
62   - [CNLiveNetworking setupDefaultParam:mDict];
  56 +
  57 +// [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
  58 +
  59 + NSDictionary *dic = @{
  60 + @"appId":@"769_k8gs9gcq47",
  61 + @"clientPlat" :@"i",
  62 + @"loginSid" : @"10514333",
  63 + @"plat" : @"i",
  64 + @"platform_id" : @"com.cnlive.CNLiveNetPlusBusiness",
  65 + @"sid" : @"10514333",
  66 + @"sign" : @"9F21AFCB66719D83BF0F421B298761952EB88D7F",
  67 + @"timestamp" : @"1587532123",
  68 + @"token" : @"BpKDrdmPSBV9DeOaNGn2WvBgxDgw4wRlvyb6eofc3nv179rtwr5BnnmmJyhKGpkj",
  69 + @"uid" : @"10514333",
  70 + @"uuid" : @"D0E07F062CDB4907BB6428C889199415",
  71 + @"ver" : @"1.0.0.20.04.16.11"
  72 + };
  73 +
  74 +
  75 +
  76 +// NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
  77 +// [mDict setValue:@"10514575" forKey:@"loginSid"];
  78 +// [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey:@"platform_id"];
  79 +// [mDict setValue:[self appUUIDString] forKey:@"uuid"];
  80 +// [mDict setValue:@"i" forKey:@"plat"];
  81 +// [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
  82 +// [mDict setObject:@"769_k8gs9gcq47" forKey:@"appId"];
  83 +
  84 + [CNLiveNetworking setupDefaultParam:dic];
63 85 [CNLiveNetworking setupShowResult:NO];
64 86 [CNLiveNetworking setupSignKey:APPKey];
65 87 NSLog(@"打印appkey%@",APPKey);
... ...
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
  View file @6d2d536
... ... @@ -72,6 +72,11 @@
72 72  
73 73 NSLog(@"点播详情数据 = %@",responseObject);
74 74  
  75 + /// 详情页 审核中
  76 + id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
  77 + UIViewController *vc = [organizationValidationProtocol getOrganizationAuditController:@{}];
  78 + [self.navigationController pushViewController:vc animated:YES];
  79 +
75 80 NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
76 81 NSError *err = nil;
77 82 id data = nil;
... ...