iOS Team / CNLiveOrganizationValidationModule · Commits

Commit 00c1056409635202b68234005e3dffba898955b6

Authored by daojian
1 parent f10cc6d6

0.0.2 版本，解决Xcode 13 报错

Inline Side-by-side
Showing 10 changed files with 65 additions and 47 deletions
CNLiveOrganizationValidationModule.podspec
  View file @00c1056
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveOrganizationValidationModule'
11   - s.version = '0.0.17'
  11 + s.version = '0.0.2'
12 12 s.summary = '机构认证模块'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ... @@ -28,7 +28,7 @@ Pod::Spec.new do |s|
28 28 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveOrganizationValidationModule.git', :tag => s.version.to_s }
29 29 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
30 30  
31   - s.ios.deployment_target = '9.0'
  31 + s.ios.deployment_target = '10.0'
32 32  
33 33 s.requires_arc = true
34 34 s.resources = "CNLiveOrganizationValidationModule/Assets/*.{png,bundle}"
... ... @@ -76,7 +76,7 @@ Pod::Spec.new do |s|
76 76 ########################################
77 77 ### 所有github三方管理库(非频繁更新)
78 78 ########################################
79   - s.dependency 'CNLiveTripartiteManagement/RSKImageCropper'
  79 + s.dependency 'CNLiveNewTripartiteManagement/RSKImageCropper'
80 80 # #相册展示
81 81 # s.dependency 'YBImageBrowser'
82 82  
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.m
  View file @00c1056
... ... @@ -10,7 +10,8 @@
10 10 #import "UIImage+OrganizationValidation.h"
11 11 #import <CNLiveBaseKit/CNLiveBaseKit.h>
12 12 #import "CNLiveBOrganizationTextField.h"
13   -#import <YYKit/YYKit.h>
  13 +//#import <YYKit/YYKit.h>
  14 +#import <YYText/YYText.h>
14 15 #import "CNLiveBWebViewController.h"
15 16  
16 17  
... ... @@ -50,11 +51,11 @@
50 51 NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:contentText];
51 52 NSRange range = [contentText rangeOfString:tipText];
52 53 // 2. 将属性设置为文本，可以使用几乎所有的CoreText属性。
53   - text.font = [UIFont systemFontOfSize:12];
54   - text.color = RGBOF(0x7b7b7b);
55   - text.alignment = NSTextAlignmentCenter;
  54 + text.yy_font = [UIFont systemFontOfSize:12];
  55 + text.yy_color = RGBOF(0x7b7b7b);
  56 + text.yy_alignment = NSTextAlignmentCenter;
56 57 __weak typeof(self) weakSelf = self;
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 + [text yy_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 59  
59 60 //点击文本的操作
60 61 NSLog(@"输出内容");
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.m
  View file @00c1056
... ... @@ -14,7 +14,7 @@
14 14 #import <CNLiveBeeHive/CNLiveBeeHive.h>
15 15 #import <MJExtension/MJExtension.h>
16 16 #import <QMUIKit/QMUIKit.h>
17   -#import <YYKit/YYKit.h>
  17 +//#import <YYKit/YYKit.h>
18 18 #import <objc/runtime.h>
19 19 #import <CNLiveBaseKit/CNLiveBaseKit.h>
20 20  
... ... @@ -63,7 +63,7 @@
63 63  
64 64  
65 65 self.view.backgroundColor = [UIColor whiteColor];
66   - WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, kScreenWidth, KScreenHeight - kNavigationBarHeight)];
  66 + WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight - kNavigationBarHeight)];
67 67 [self.view addSubview:webView];
68 68 webView.UIDelegate = self;
69 69 webView.navigationDelegate = self;
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
  View file @00c1056
... ... @@ -18,7 +18,7 @@
18 18 #import "CNLiveOrganizationDetailModel.h"
19 19 #import <MJExtension/MJExtension.h>
20 20 #import <QMUIKit/QMUIKit.h>
21   -#import <YYKit/YYKit.h>
  21 +//#import <YYKit/YYKit.h>
22 22 #import <objc/runtime.h>
23 23 #import "YBImageBrowser.h"
24 24 #import "YBIBImageData.h"
... ... @@ -520,7 +520,7 @@
520 520 if (!_showImageV) {
521 521 _showImageV = [[UIImageView alloc] init];
522 522 _showImageV.image = [UIImage imageNamedFromOrganization:@"organization_detailCer"];
523   - _showImageV.frame = CGRectMake(kScreenWidth - 81 -10, 16, 81, 81);
  523 + _showImageV.frame = CGRectMake(KScreenWidth - 81 -10, 16, 81, 81);
524 524 }
525 525 return _showImageV;
526 526 }
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
  View file @00c1056
... ... @@ -17,7 +17,6 @@
17 17 #import <CNLiveImagePickerController/CNImagePickerController.h>
18 18 #import <RSKImageCropper/RSKImageCropper.h>
19 19 #import <QMUIKit/QMUIKit.h>
20   -#import <YYKit/YYKit.h>
21 20 #import <objc/runtime.h>
22 21 #import <CNLiveEnvironment/CNLiveEnvironment.h>
23 22 #import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
... ... @@ -26,7 +25,9 @@
26 25 #import <CNLiveBeeHive/CNLiveBeeHive.h>
27 26 #import <MJExtension/MJExtension.h>
28 27 #import <CNLiveUploadManager/CNLiveUploadManager.h>
29   -#import <YYKit/YYKit.h>
  28 +#import <YYCategories/YYCategories.h>
  29 +#import <YYCache/YYCache.h>
  30 +
30 31 #import "CNLiveBAgreementContentController.h"
31 32  
32 33  
... ... @@ -594,13 +595,13 @@
594 595 ///检查拍照权限
595 596 - (void)checkPermissionsWithCount:(NSInteger)indexCount type:(NSInteger)type {
596 597 AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
597   - if ((authStatus == AVAuthorizationStatusRestricted || authStatus ==AVAuthorizationStatusDenied) && kiOS7Later) {
  598 + if ((authStatus == AVAuthorizationStatusRestricted || authStatus ==AVAuthorizationStatusDenied) && ([[UIDevice currentDevice].systemVersion doubleValue]>= 7.0)) {
598 599 // 无权限 做一个友好的提示
599 600  
600 601 [self goPrivacySetting];
601 602 } else if (authStatus == AVAuthorizationStatusNotDetermined) {
602 603 // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
603   - if (kiOS7Later) {
  604 + if ([[UIDevice currentDevice].systemVersion doubleValue]>= 7.0) {
604 605 [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
605 606 if (granted) {
606 607 dispatch_sync(dispatch_get_main_queue(), ^{
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBWebViewController.m
  View file @00c1056
... ... @@ -14,7 +14,7 @@
14 14 #import <CNLiveBeeHive/CNLiveBeeHive.h>
15 15 #import <MJExtension/MJExtension.h>
16 16 #import <QMUIKit/QMUIKit.h>
17   -#import <YYKit/YYKit.h>
  17 +//#import <YYKit/YYKit.h>
18 18 #import <objc/runtime.h>
19 19 #import <CNLiveBaseKit/CNLiveBaseKit.h>
20 20  
... ... @@ -56,7 +56,7 @@
56 56  
57 57  
58 58 self.view.backgroundColor = [UIColor whiteColor];
59   - WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
  59 + WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
60 60 [self.view addSubview:webView];
61 61 webView.UIDelegate = self;
62 62 webView.navigationDelegate = self;
... ...
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/YBImageBrowser/Image/YBImage.m
  View file @00c1056
... ... @@ -188,7 +188,7 @@ static CGFloat _NSStringPathScale(NSString *string) {
188 188 _bytesPerFrame = CGImageGetBytesPerRow(image.CGImage) * CGImageGetHeight(image.CGImage);
189 189 _animatedImageMemorySize = _bytesPerFrame * decoder.frameCount;
190 190 }
191   - self.isDecodedForDisplay = YES;
  191 + self.yy_isDecodedForDisplay = YES;
192 192 }
193 193 return self;
194 194 }
... ...
Example/CNLiveOrganizationValidationModule.xcodeproj/project.pbxproj
  View file @00c1056
... ... @@ -208,7 +208,7 @@
208 208 6003F587195388D20070C39A /* Frameworks */,
209 209 6003F588195388D20070C39A /* Resources */,
210 210 8AB5314613589637C13635ED /* [CP] Embed Pods Frameworks */,
211   - CDE1720359A4D3E8B6C14822 /* [CP] Copy Pods Resources */,
  211 + 6C74718B3C212EC2812CF766 /* [CP] Copy Pods Resources */,
212 212 );
213 213 buildRules = (
214 214 );
... ... @@ -321,6 +321,26 @@
321 321 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";
322 322 showEnvVarsInLog = 0;
323 323 };
  324 + 6C74718B3C212EC2812CF766 /* [CP] Copy Pods Resources */ = {
  325 + isa = PBXShellScriptBuildPhase;
  326 + buildActionMask = 2147483647;
  327 + files = (
  328 + );
  329 + inputPaths = (
  330 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh",
  331 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
  332 + "${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle",
  333 + );
  334 + name = "[CP] Copy Pods Resources";
  335 + outputPaths = (
  336 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
  337 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
  338 + );
  339 + runOnlyForDeploymentPostprocessing = 0;
  340 + shellPath = /bin/sh;
  341 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh\"\n";
  342 + showEnvVarsInLog = 0;
  343 + };
324 344 85EF0C7CC12C6443C1F5C3E0 /* [CP] Check Pods Manifest.lock */ = {
325 345 isa = PBXShellScriptBuildPhase;
326 346 buildActionMask = 2147483647;
... ... @@ -360,9 +380,9 @@
360 380 "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
361 381 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
362 382 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
  383 + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
363 384 "${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework",
364 385 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
365   - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
366 386 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
367 387 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
368 388 "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
... ... @@ -374,7 +394,15 @@
374 394 "${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework",
375 395 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
376 396 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
377   - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
  397 + "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
  398 + "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
  399 + "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
  400 + "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
  401 + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
  402 + "${BUILT_PRODUCTS_DIR}/YYKeyboardManager/YYKeyboardManager.framework",
  403 + "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
  404 + "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
  405 + "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
378 406 );
379 407 name = "[CP] Embed Pods Frameworks";
380 408 outputPaths = (
... ... @@ -388,9 +416,9 @@
388 416 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
389 417 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
390 418 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
  419 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
391 420 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework",
392 421 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
393   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
394 422 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
395 423 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
396 424 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
... ... @@ -402,33 +430,21 @@
402 430 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework",
403 431 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
404 432 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
405   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
  433 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
  434 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
  435 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
  436 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
  437 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
  438 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework",
  439 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
  440 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
  441 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
406 442 );
407 443 runOnlyForDeploymentPostprocessing = 0;
408 444 shellPath = /bin/sh;
409 445 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-frameworks.sh\"\n";
410 446 showEnvVarsInLog = 0;
411 447 };
412   - CDE1720359A4D3E8B6C14822 /* [CP] Copy Pods Resources */ = {
413   - isa = PBXShellScriptBuildPhase;
414   - buildActionMask = 2147483647;
415   - files = (
416   - );
417   - inputPaths = (
418   - "${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh",
419   - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
420   - "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
421   - );
422   - name = "[CP] Copy Pods Resources";
423   - outputPaths = (
424   - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
425   - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
426   - );
427   - runOnlyForDeploymentPostprocessing = 0;
428   - shellPath = /bin/sh;
429   - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh\"\n";
430   - showEnvVarsInLog = 0;
431   - };
432 448 /* End PBXShellScriptBuildPhase section */
433 449  
434 450 /* Begin PBXSourcesBuildPhase section */
... ...
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
  View file @00c1056
... ... @@ -16,7 +16,7 @@
16 16 #import <CNLiveUserManagement/CNUserInfoManager.h>
17 17 #import <CNLiveBeeHive/CNLiveBeeHive.h>
18 18 #import "CNLiveBOrganizationValidationProtocol.h"
19   -#import <YYKit/YYKit.h>
  19 +#import <YYCategories/YYCategories.h>
20 20 #import <QMUIKit/QMUIKit.h>
21 21  
22 22  
... ...
Example/Podfile
  View file @00c1056
1 1 use_frameworks!
2   -source 'https://github.com/CocoaPods/Specs.git'
  2 +source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
3 3 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
4 4  
5   -platform :ios, '9.0'
  5 +platform :ios, '10.0'
6 6  
7 7 target 'CNLiveOrganizationValidationModule_Example' do
8 8 pod 'CNLiveOrganizationValidationModule', :path => '../'
... ...