0.1.1 版本 Xcode 13报错处理

daojian
1 parent df0a00e4
Showing 11 changed files with 80 additions and 44 deletions
CNLiveWitnessVideoModule.podspec
CNLiveWitnessVideoModule/Classes/Controller/CNBWitnessListController.m
CNLiveWitnessVideoModule/Classes/Model/CNBWitnessListModel.m
CNLiveWitnessVideoModule/Classes/Services/CNBWitnessVideoService.m
CNLiveWitnessVideoModule/Classes/View/CNBWitnessListCell.m
CNLiveWitnessVideoModule/Classes/View/CNBWitnessPlayerControlView.m
CNLiveWitnessVideoModule/Classes/View/CNBWitnessPlayerManager.m
CNLiveWitnessVideoModule/Classes/View/CNBWitnessPlayerView.m
CNLiveWitnessVideoModule/Classes/ViewModel/CNBWitnessListViewModel.m
Example/CNLiveWitnessVideoModule.xcodeproj/project.pbxproj
Example/Podfile
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveWitnessVideoModule'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.summary          = '目击者视频播放功能'
 # This description is used to generate tags and improve search results.
@@ -27,7 +27,7 @@ TODO: Add long description of the pod here.
   s.author           = { 'dawanzi' => '1427945373@qq.com' }
   s.source           = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveWitnessVideoModule.git', :tag => s.version.to_s }
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '10.0'
   s.subspec 'Model' do |model|
       model.source_files = 'CNLiveWitnessVideoModule/Classes/Model/*.{h,m}'
@@ -48,16 +48,21 @@ TODO: Add long description of the pod here.
       service.source_files = 'CNLiveWitnessVideoModule/Classes/Services/*.{h,m}'
       service.dependency 'CNLiveWitnessVideoModule/Controller'
   end
-   s.dependency 'CNLiveTripartiteManagement/MJExtension'
-   s.dependency 'CNLiveTripartiteManagement/YYKit'
-   s.dependency 'CNLiveTripartiteManagement/AFNetworking'
-   s.dependency 'CNLiveTripartiteManagement/Masonry'
-   s.dependency 'CNLiveTripartiteManagement/QMUIKit'
-   s.dependency 'CNLiveTripartiteManagement/SDWebImage'
+   s.dependency 'CNLiveNewTripartiteManagement/MJExtension'
+   s.dependency 'CNLiveNewTripartiteManagement/YYText'
+
+   s.dependency 'CNLiveNewTripartiteManagement/YYCategories'
+   s.dependency 'CNLiveNewTripartiteManagement/YYImage'
+
+   s.dependency 'CNLiveNewTripartiteManagement/AFNetworking'
+   s.dependency 'CNLiveNewTripartiteManagement/Masonry'
+   s.dependency 'CNLiveNewTripartiteManagement/QMUIKit'
+   s.dependency 'CNLiveNewTripartiteManagement/SDWebImage'
    #基础业务库
    s.dependency 'CNLiveBusinessTools'
    #基础库
    s.dependency 'CNLiveBaseKit'
+   s.dependency 'CNLiveUserManagement'
    #环境库
    s.dependency 'CNLiveEnvironment'
    #基础类目库
@@ -8,17 +8,19 @@
 #import "CNBWitnessListController.h"
 #import "CNBWitnessPlayerManager.h"
 #import "CNBWitnessListModel.h"
-#import "MJExtension.h"
-#import "MJRefresh.h"
-#import "CNLiveRefreshHeader.h"
-#import "CNLiveBaseKit.h"
-#import <QMUIKit/QMUIKit.h>
-#import "CNBWitnessListViewModel.h"
-#import "CNEmptyView.h"
 #import "CNBWitnessListCell.h"
 #import "CNBWitnessGetImage.h"
-#import "UIColor+CNLiveExtension.h"
-#import "CNLiveNetworking.h"
+#import "CNBWitnessListViewModel.h"
+
+#import <MJExtension/MJExtension.h>
+#import <MJRefresh/MJRefresh.h>
+#import <CNLiveCustomUI/CNLiveRefreshHeader.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import <QMUIKit/QMUIKit.h>
+#import <CNLiveCustomUI/CNEmptyView.h>
+#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+
 #define CNBWitnessAppKeyWindow ([UIApplication sharedApplication].delegate).window
 typedef NS_ENUM(NSUInteger,CNBWitnessVideoErrorType) {
    CNBWitnessVideoErrorTypeNoNet, //没网
@@ -6,7 +6,7 @@
 //
 #import "CNBWitnessListModel.h"
-#import "MJExtension.h"
+#import <MJExtension/MJExtension.h>
 @implementation CNBWitnessListModel
 MJCodingImplementation
 + (NSDictionary *)mj_replacedKeyFromPropertyName
@@ -6,9 +6,11 @@
 //
 #import "CNBWitnessVideoService.h"
-#import <CNLiveBeeHive/BeeHive.h>
 #import "CNBWitnessListController.h"
 #import "CNBWitnessVideoPlayProtocol.h"
+
+#import <CNLiveBeeHive/BeeHive.h>
+
 @interface CNBWitnessVideoService () <CNBWitnessVideoPlayProtocol>
 @end
@@ -6,15 +6,18 @@
 //
 #import "CNBWitnessListCell.h"
-#import "UIColor+CNLiveExtension.h"
-#import "NSString+CNLiveExtension.h"
 #import "CNBWitnessListModel.h"
-#import <YYKit/YYKit.h>
+
+#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
+#import <YYText/YYText.h>
+#import <YYCategories/YYCategories.h>
+#import <YYImage/YYImage.h>
 #import <Masonry/Masonry.h>
-#import "CNLiveBaseKit.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import <SDWebImage/SDWebImage.h>
 #import <QMUIKit/QMUIKit.h>
-#import "CNLiveQQEmotionManager.h"
+#import <CNLiveBusinessTools/CNLiveQQEmotionManager.h>
+
 @interface CNBWitnessListCell ()
 @property (nonatomic, strong) UIImageView             *coverImageView;
 @property (nonatomic, strong) YYLabel                *desc;//详情
@@ -143,7 +146,7 @@
         [self.tagButton setTitle:witnessModel.tagName forState:UIControlStateNormal];
         YYTextContainer *container = [YYTextContainer containerWithSize:CGSizeMake(MAXFLOAT,25)];
         NSMutableAttributedString *tagStr = [[NSMutableAttributedString alloc]initWithString:witnessModel.tagName];
-        tagStr.font = [UIFont systemFontOfSize:11];
+        tagStr.yy_font = [UIFont systemFontOfSize:11];
         YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:tagStr];
         CGFloat width = ceilf(layout.textBoundingSize.width);
         if (width < 46) {
@@ -212,14 +215,14 @@
                                 YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image];
                                 imageView.width = 24*RATIO;
                                 imageView.height = 24*RATIO;
-                                NSMutableAttributedString *attachText = [NSMutableAttributedString attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter];
+                                NSMutableAttributedString *attachText = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter];
                                 [attStr replaceCharactersInRange:result.range withAttributedString:attachText];
                             });
                         }else{
                             YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image];
                             imageView.width = 24*RATIO;
                             imageView.height = 24*RATIO;
-                            NSMutableAttributedString *attachText = [NSMutableAttributedString attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter];
+                            NSMutableAttributedString *attachText = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter];
                             [attStr replaceCharactersInRange:result.range withAttributedString:attachText];
                         }
@@ -6,9 +6,11 @@
 //
 #import "CNBWitnessPlayerControlView.h"
-#import <Masonry/Masonry.h>
-#import "CNLiveBaseKit.h"
 #import "CNBWitnessGetImage.h"
+
+#import <Masonry/Masonry.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+
 @interface CNBWitnessPlayerControlView ()
 @property (nonatomic, strong) UIImageView              *pauseIcon;
 @property (nonatomic, strong) UIView                   *playerStatusBar;
@@ -6,10 +6,12 @@
 //
 #import "CNBWitnessPlayerManager.h"
-#import <AVFoundation/AVFoundation.h>
 #import "CNBWitnessPlayerView.h"
 #import "CNBWitnessPlayerControlView.h"
-#import "CNLiveNetworking.h"
+
+#import <AVFoundation/AVFoundation.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+
 @interface CNBWitnessPlayerManager ()<CNWitnessPlayerDelegate>
 @property (nonatomic, strong) CNBWitnessPlayerView *playerView;
 @property (nonatomic, strong) CNBWitnessPlayerModel *playerModel;
@@ -7,12 +7,14 @@
 #import "CNBWitnessPlayerView.h"
 #import "CNBWitnessPlayerModel.h"
+#import "CNBWitnessPlayerControlView.h"
+
 #import <AVFoundation/AVFoundation.h>
 #import <MediaPlayer/MediaPlayer.h>
-#import "CNBWitnessPlayerControlView.h"
-#import "CNLiveNetworking.h"
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import <Masonry/Masonry.h>
 #import <QMUIKit/QMUIKit.h>
+
 #define CNBWitnessAppKeyWindow [UIApplication sharedApplication].delegate.window
 @interface CNBWitnessPlayerView ()<UIAlertViewDelegate,FailBtnActionDelegate>
 /** 播放属性 */
@@ -6,13 +6,15 @@
 //
 #import "CNBWitnessListViewModel.h"
-#import "CNLiveEnvironment.h"
-#import "NSString+CNLiveExtension.h"
-#import "CNLiveNetworking.h"
 #import "CNBWitnessListModel.h"
-#import "MJExtension.h"
+
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveBaseKit/NSString+CNLiveExtension.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <MJExtension/MJExtension.h>
 #import <QMUIKit/QMUIKit.h>
-#import "CNUserInfoManager.h"
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+
 #define CNBWitnessAppKeyWindow ([UIApplication sharedApplication].delegate).window
 @implementation CNBWitnessListViewModel
 + (void)getWitnessListDataTosid:(NSString *)toSid page:(NSInteger)page pageSize:(NSInteger)pageSize successBlock:(void(^)(NSMutableArray *dataArray,NSString *isHaveNext))successBlock failureBlock:(void (^)(NSError *error))failureBlock {
@@ -356,8 +356,8 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveWitnessVideoModule/CNLiveWitnessVideoModule.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
@@ -365,7 +365,15 @@
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.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 = (
@@ -376,8 +384,8 @@
 				"${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}/CNLiveNewTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveWitnessVideoModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
@@ -385,7 +393,15 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.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;
 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 'CNLiveWitnessVideoModule_Example' do
   pod 'CNLiveWitnessVideoModule', :path => '../'