0.0.2 版本，解决Xcode 13 报错

daojian
1 parent f10cc6d6
Showing 10 changed files with 65 additions and 47 deletions
CNLiveOrganizationValidationModule.podspec
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementCommitFinishController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBWebViewController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/YBImageBrowser/Image/YBImage.m
Example/CNLiveOrganizationValidationModule.xcodeproj/project.pbxproj
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
Example/Podfile
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveOrganizationValidationModule'
-  s.version          = '0.0.17'
+  s.version          = '0.0.2'
   s.summary          = '机构认证模块'
 # This description is used to generate tags and improve search results.
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.source           = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveOrganizationValidationModule.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '10.0'
   s.requires_arc = true
   s.resources    = "CNLiveOrganizationValidationModule/Assets/*.{png,bundle}"
@@ -76,7 +76,7 @@ Pod::Spec.new do |s|
   ########################################
   ###    所有github三方管理库(非频繁更新)
   ########################################
-  s.dependency  'CNLiveTripartiteManagement/RSKImageCropper'
+  s.dependency  'CNLiveNewTripartiteManagement/RSKImageCropper'
 #  #相册展示
 #  s.dependency 'YBImageBrowser'
@@ -10,7 +10,8 @@
 #import "UIImage+OrganizationValidation.h"
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import "CNLiveBOrganizationTextField.h"
-#import <YYKit/YYKit.h>
+//#import <YYKit/YYKit.h>
+#import <YYText/YYText.h>
 #import "CNLiveBWebViewController.h"
@@ -50,11 +51,11 @@
     NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:contentText];
     NSRange range = [contentText rangeOfString:tipText];
     // 2. 将属性设置为文本，可以使用几乎所有的CoreText属性。
-    text.font = [UIFont systemFontOfSize:12];
-    text.color = RGBOF(0x7b7b7b);
-    text.alignment = NSTextAlignmentCenter;
+    text.yy_font = [UIFont systemFontOfSize:12];
+    text.yy_color = RGBOF(0x7b7b7b);
+    text.yy_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] userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+    [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) {
         //点击文本的操作
         NSLog(@"输出内容");
@@ -14,7 +14,7 @@
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import <MJExtension/MJExtension.h>
 #import <QMUIKit/QMUIKit.h>
-#import <YYKit/YYKit.h>
+//#import <YYKit/YYKit.h>
 #import <objc/runtime.h>
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
@@ -63,7 +63,7 @@
     self.view.backgroundColor = [UIColor whiteColor];
-    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, kScreenWidth, KScreenHeight - kNavigationBarHeight)];
+    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight - kNavigationBarHeight)];
     [self.view addSubview:webView];
     webView.UIDelegate = self;
     webView.navigationDelegate = self;
@@ -18,7 +18,7 @@
 #import "CNLiveOrganizationDetailModel.h"
 #import <MJExtension/MJExtension.h>
 #import <QMUIKit/QMUIKit.h>
-#import <YYKit/YYKit.h>
+//#import <YYKit/YYKit.h>
 #import <objc/runtime.h>
 #import "YBImageBrowser.h"
 #import "YBIBImageData.h"
@@ -520,7 +520,7 @@
     if (!_showImageV) {
         _showImageV = [[UIImageView alloc] init];
         _showImageV.image = [UIImage imageNamedFromOrganization:@"organization_detailCer"];
-        _showImageV.frame = CGRectMake(kScreenWidth - 81 -10, 16, 81, 81);
+        _showImageV.frame = CGRectMake(KScreenWidth - 81 -10, 16, 81, 81);
     }
     return _showImageV;
 }
@@ -17,7 +17,6 @@
 #import <CNLiveImagePickerController/CNImagePickerController.h>
 #import <RSKImageCropper/RSKImageCropper.h>
 #import <QMUIKit/QMUIKit.h>
-#import <YYKit/YYKit.h>
 #import <objc/runtime.h>
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
@@ -26,7 +25,9 @@
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import <MJExtension/MJExtension.h>
 #import <CNLiveUploadManager/CNLiveUploadManager.h>
-#import <YYKit/YYKit.h>
+#import <YYCategories/YYCategories.h>
+#import <YYCache/YYCache.h>
+
 #import "CNLiveBAgreementContentController.h"
@@ -594,13 +595,13 @@
 ///检查拍照权限
 - (void)checkPermissionsWithCount:(NSInteger)indexCount type:(NSInteger)type {
     AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
-    if ((authStatus == AVAuthorizationStatusRestricted || authStatus ==AVAuthorizationStatusDenied) && kiOS7Later) {
+    if ((authStatus == AVAuthorizationStatusRestricted || authStatus ==AVAuthorizationStatusDenied) && ([[UIDevice currentDevice].systemVersion doubleValue]>= 7.0)) {
         // 无权限 做一个友好的提示
         [self goPrivacySetting];
     } else if (authStatus == AVAuthorizationStatusNotDetermined) {
         // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
-        if (kiOS7Later) {
+        if ([[UIDevice currentDevice].systemVersion doubleValue]>= 7.0) {
             [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
                 if (granted) {
                     dispatch_sync(dispatch_get_main_queue(), ^{
@@ -14,7 +14,7 @@
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import <MJExtension/MJExtension.h>
 #import <QMUIKit/QMUIKit.h>
-#import <YYKit/YYKit.h>
+//#import <YYKit/YYKit.h>
 #import <objc/runtime.h>
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
@@ -56,7 +56,7 @@
     self.view.backgroundColor = [UIColor whiteColor];
-    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
+    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
     [self.view addSubview:webView];
     webView.UIDelegate = self;
     webView.navigationDelegate = self;
@@ -188,7 +188,7 @@ static CGFloat _NSStringPathScale(NSString *string) {
             _bytesPerFrame = CGImageGetBytesPerRow(image.CGImage) * CGImageGetHeight(image.CGImage);
             _animatedImageMemorySize = _bytesPerFrame * decoder.frameCount;
         }
-        self.isDecodedForDisplay = YES;
+        self.yy_isDecodedForDisplay = YES;
     }
     return self;
 }
@@ -208,7 +208,7 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				8AB5314613589637C13635ED /* [CP] Embed Pods Frameworks */,
-				CDE1720359A4D3E8B6C14822 /* [CP] Copy Pods Resources */,
+				6C74718B3C212EC2812CF766 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -321,6 +321,26 @@
 			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";
 			showEnvVarsInLog = 0;
 		};
+		6C74718B3C212EC2812CF766 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
+				"${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		85EF0C7CC12C6443C1F5C3E0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -360,9 +380,9 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.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}/HappyDNS/HappyDNS.framework",
@@ -374,7 +394,15 @@
 				"${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework",
 				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
-				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
+				"${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
+				"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
+				"${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
+				"${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
+				"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
+				"${BUILT_PRODUCTS_DIR}/YYKeyboardManager/YYKeyboardManager.framework",
+				"${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
+				"${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
+				"${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -388,9 +416,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.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}/HappyDNS.framework",
@@ -402,33 +430,21 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CDE1720359A4D3E8B6C14822 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh",
-				"${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}/CNLiveShareToolKit.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -16,7 +16,7 @@
 #import <CNLiveUserManagement/CNUserInfoManager.h>
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import "CNLiveBOrganizationValidationProtocol.h"
-#import <YYKit/YYKit.h>
+#import <YYCategories/YYCategories.h>
 #import <QMUIKit/QMUIKit.h>
 use_frameworks!
-source 'https://github.com/CocoaPods/Specs.git'
+source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
-platform :ios, '9.0'
+platform :ios, '10.0'
 target 'CNLiveOrganizationValidationModule_Example' do
   pod 'CNLiveOrganizationValidationModule', :path => '../'