Commit 8ad2dacd844829f524723839dd188f4cc3b83ad7
1 parent
df0a00e4
0.1.1 版本 Xcode 13报错处理
Showing
11 changed files
with
80 additions
and
44 deletions
CNLiveWitnessVideoModule.podspec
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | |
| 9 | 9 | Pod::Spec.new do |s| |
| 10 | 10 | s.name = 'CNLiveWitnessVideoModule' |
| 11 | - s.version = '0.1.0' | |
| 11 | + s.version = '0.1.1' | |
| 12 | 12 | s.summary = '目击者视频播放功能' |
| 13 | 13 | |
| 14 | 14 | # This description is used to generate tags and improve search results. |
| ... | ... | @@ -27,7 +27,7 @@ TODO: Add long description of the pod here. |
| 27 | 27 | s.author = { 'dawanzi' => '1427945373@qq.com' } |
| 28 | 28 | s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveWitnessVideoModule.git', :tag => s.version.to_s } |
| 29 | 29 | |
| 30 | - s.ios.deployment_target = '9.0' | |
| 30 | + s.ios.deployment_target = '10.0' | |
| 31 | 31 | |
| 32 | 32 | s.subspec 'Model' do |model| |
| 33 | 33 | model.source_files = 'CNLiveWitnessVideoModule/Classes/Model/*.{h,m}' |
| ... | ... | @@ -48,16 +48,21 @@ TODO: Add long description of the pod here. |
| 48 | 48 | service.source_files = 'CNLiveWitnessVideoModule/Classes/Services/*.{h,m}' |
| 49 | 49 | service.dependency 'CNLiveWitnessVideoModule/Controller' |
| 50 | 50 | end |
| 51 | - s.dependency 'CNLiveTripartiteManagement/MJExtension' | |
| 52 | - s.dependency 'CNLiveTripartiteManagement/YYKit' | |
| 53 | - s.dependency 'CNLiveTripartiteManagement/AFNetworking' | |
| 54 | - s.dependency 'CNLiveTripartiteManagement/Masonry' | |
| 55 | - s.dependency 'CNLiveTripartiteManagement/QMUIKit' | |
| 56 | - s.dependency 'CNLiveTripartiteManagement/SDWebImage' | |
| 51 | + s.dependency 'CNLiveNewTripartiteManagement/MJExtension' | |
| 52 | + s.dependency 'CNLiveNewTripartiteManagement/YYText' | |
| 53 | + | |
| 54 | + s.dependency 'CNLiveNewTripartiteManagement/YYCategories' | |
| 55 | + s.dependency 'CNLiveNewTripartiteManagement/YYImage' | |
| 56 | + | |
| 57 | + s.dependency 'CNLiveNewTripartiteManagement/AFNetworking' | |
| 58 | + s.dependency 'CNLiveNewTripartiteManagement/Masonry' | |
| 59 | + s.dependency 'CNLiveNewTripartiteManagement/QMUIKit' | |
| 60 | + s.dependency 'CNLiveNewTripartiteManagement/SDWebImage' | |
| 57 | 61 | #基础业务库 |
| 58 | 62 | s.dependency 'CNLiveBusinessTools' |
| 59 | 63 | #基础库 |
| 60 | 64 | s.dependency 'CNLiveBaseKit' |
| 65 | + s.dependency 'CNLiveUserManagement' | |
| 61 | 66 | #环境库 |
| 62 | 67 | s.dependency 'CNLiveEnvironment' |
| 63 | 68 | #基础类目库 | ... | ... |
CNLiveWitnessVideoModule/Classes/Controller/CNBWitnessListController.m
| ... | ... | @@ -8,17 +8,19 @@ |
| 8 | 8 | #import "CNBWitnessListController.h" |
| 9 | 9 | #import "CNBWitnessPlayerManager.h" |
| 10 | 10 | #import "CNBWitnessListModel.h" |
| 11 | -#import "MJExtension.h" | |
| 12 | -#import "MJRefresh.h" | |
| 13 | -#import "CNLiveRefreshHeader.h" | |
| 14 | -#import "CNLiveBaseKit.h" | |
| 15 | -#import <QMUIKit/QMUIKit.h> | |
| 16 | -#import "CNBWitnessListViewModel.h" | |
| 17 | -#import "CNEmptyView.h" | |
| 18 | 11 | #import "CNBWitnessListCell.h" |
| 19 | 12 | #import "CNBWitnessGetImage.h" |
| 20 | -#import "UIColor+CNLiveExtension.h" | |
| 21 | -#import "CNLiveNetworking.h" | |
| 13 | +#import "CNBWitnessListViewModel.h" | |
| 14 | + | |
| 15 | +#import <MJExtension/MJExtension.h> | |
| 16 | +#import <MJRefresh/MJRefresh.h> | |
| 17 | +#import <CNLiveCustomUI/CNLiveRefreshHeader.h> | |
| 18 | +#import <CNLiveBaseKit/CNLiveBaseKit.h> | |
| 19 | +#import <QMUIKit/QMUIKit.h> | |
| 20 | +#import <CNLiveCustomUI/CNEmptyView.h> | |
| 21 | +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h> | |
| 22 | +#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 23 | + | |
| 22 | 24 | #define CNBWitnessAppKeyWindow ([UIApplication sharedApplication].delegate).window |
| 23 | 25 | typedef NS_ENUM(NSUInteger,CNBWitnessVideoErrorType) { |
| 24 | 26 | CNBWitnessVideoErrorTypeNoNet, //没网 | ... | ... |
CNLiveWitnessVideoModule/Classes/Model/CNBWitnessListModel.m
CNLiveWitnessVideoModule/Classes/Services/CNBWitnessVideoService.m
| ... | ... | @@ -6,9 +6,11 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import "CNBWitnessVideoService.h" |
| 9 | -#import <CNLiveBeeHive/BeeHive.h> | |
| 10 | 9 | #import "CNBWitnessListController.h" |
| 11 | 10 | #import "CNBWitnessVideoPlayProtocol.h" |
| 11 | + | |
| 12 | +#import <CNLiveBeeHive/BeeHive.h> | |
| 13 | + | |
| 12 | 14 | @interface CNBWitnessVideoService () <CNBWitnessVideoPlayProtocol> |
| 13 | 15 | |
| 14 | 16 | @end | ... | ... |
CNLiveWitnessVideoModule/Classes/View/CNBWitnessListCell.m
| ... | ... | @@ -6,15 +6,18 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import "CNBWitnessListCell.h" |
| 9 | -#import "UIColor+CNLiveExtension.h" | |
| 10 | -#import "NSString+CNLiveExtension.h" | |
| 11 | 9 | #import "CNBWitnessListModel.h" |
| 12 | -#import <YYKit/YYKit.h> | |
| 10 | + | |
| 11 | +#import <CNLiveCommonCategory/UIColor+CNLiveExtension.h> | |
| 12 | +#import <YYText/YYText.h> | |
| 13 | +#import <YYCategories/YYCategories.h> | |
| 14 | +#import <YYImage/YYImage.h> | |
| 13 | 15 | #import <Masonry/Masonry.h> |
| 14 | -#import "CNLiveBaseKit.h" | |
| 16 | +#import <CNLiveBaseKit/CNLiveBaseKit.h> | |
| 15 | 17 | #import <SDWebImage/SDWebImage.h> |
| 16 | 18 | #import <QMUIKit/QMUIKit.h> |
| 17 | -#import "CNLiveQQEmotionManager.h" | |
| 19 | +#import <CNLiveBusinessTools/CNLiveQQEmotionManager.h> | |
| 20 | + | |
| 18 | 21 | @interface CNBWitnessListCell () |
| 19 | 22 | @property (nonatomic, strong) UIImageView *coverImageView; |
| 20 | 23 | @property (nonatomic, strong) YYLabel *desc;//详情 |
| ... | ... | @@ -143,7 +146,7 @@ |
| 143 | 146 | [self.tagButton setTitle:witnessModel.tagName forState:UIControlStateNormal]; |
| 144 | 147 | YYTextContainer *container = [YYTextContainer containerWithSize:CGSizeMake(MAXFLOAT,25)]; |
| 145 | 148 | NSMutableAttributedString *tagStr = [[NSMutableAttributedString alloc]initWithString:witnessModel.tagName]; |
| 146 | - tagStr.font = [UIFont systemFontOfSize:11]; | |
| 149 | + tagStr.yy_font = [UIFont systemFontOfSize:11]; | |
| 147 | 150 | YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:tagStr]; |
| 148 | 151 | CGFloat width = ceilf(layout.textBoundingSize.width); |
| 149 | 152 | if (width < 46) { |
| ... | ... | @@ -212,14 +215,14 @@ |
| 212 | 215 | YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image]; |
| 213 | 216 | imageView.width = 24*RATIO; |
| 214 | 217 | imageView.height = 24*RATIO; |
| 215 | - NSMutableAttributedString *attachText = [NSMutableAttributedString attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter]; | |
| 218 | + NSMutableAttributedString *attachText = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter]; | |
| 216 | 219 | [attStr replaceCharactersInRange:result.range withAttributedString:attachText]; |
| 217 | 220 | }); |
| 218 | 221 | }else{ |
| 219 | 222 | YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image]; |
| 220 | 223 | imageView.width = 24*RATIO; |
| 221 | 224 | imageView.height = 24*RATIO; |
| 222 | - NSMutableAttributedString *attachText = [NSMutableAttributedString attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter]; | |
| 225 | + NSMutableAttributedString *attachText = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter]; | |
| 223 | 226 | |
| 224 | 227 | [attStr replaceCharactersInRange:result.range withAttributedString:attachText]; |
| 225 | 228 | } | ... | ... |
CNLiveWitnessVideoModule/Classes/View/CNBWitnessPlayerControlView.m
| ... | ... | @@ -6,9 +6,11 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import "CNBWitnessPlayerControlView.h" |
| 9 | -#import <Masonry/Masonry.h> | |
| 10 | -#import "CNLiveBaseKit.h" | |
| 11 | 9 | #import "CNBWitnessGetImage.h" |
| 10 | + | |
| 11 | +#import <Masonry/Masonry.h> | |
| 12 | +#import <CNLiveBaseKit/CNLiveBaseKit.h> | |
| 13 | + | |
| 12 | 14 | @interface CNBWitnessPlayerControlView () |
| 13 | 15 | @property (nonatomic, strong) UIImageView *pauseIcon; |
| 14 | 16 | @property (nonatomic, strong) UIView *playerStatusBar; | ... | ... |
CNLiveWitnessVideoModule/Classes/View/CNBWitnessPlayerManager.m
| ... | ... | @@ -6,10 +6,12 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import "CNBWitnessPlayerManager.h" |
| 9 | -#import <AVFoundation/AVFoundation.h> | |
| 10 | 9 | #import "CNBWitnessPlayerView.h" |
| 11 | 10 | #import "CNBWitnessPlayerControlView.h" |
| 12 | -#import "CNLiveNetworking.h" | |
| 11 | + | |
| 12 | +#import <AVFoundation/AVFoundation.h> | |
| 13 | +#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 14 | + | |
| 13 | 15 | @interface CNBWitnessPlayerManager ()<CNWitnessPlayerDelegate> |
| 14 | 16 | @property (nonatomic, strong) CNBWitnessPlayerView *playerView; |
| 15 | 17 | @property (nonatomic, strong) CNBWitnessPlayerModel *playerModel; | ... | ... |
CNLiveWitnessVideoModule/Classes/View/CNBWitnessPlayerView.m
| ... | ... | @@ -7,12 +7,14 @@ |
| 7 | 7 | |
| 8 | 8 | #import "CNBWitnessPlayerView.h" |
| 9 | 9 | #import "CNBWitnessPlayerModel.h" |
| 10 | +#import "CNBWitnessPlayerControlView.h" | |
| 11 | + | |
| 10 | 12 | #import <AVFoundation/AVFoundation.h> |
| 11 | 13 | #import <MediaPlayer/MediaPlayer.h> |
| 12 | -#import "CNBWitnessPlayerControlView.h" | |
| 13 | -#import "CNLiveNetworking.h" | |
| 14 | +#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 14 | 15 | #import <Masonry/Masonry.h> |
| 15 | 16 | #import <QMUIKit/QMUIKit.h> |
| 17 | + | |
| 16 | 18 | #define CNBWitnessAppKeyWindow [UIApplication sharedApplication].delegate.window |
| 17 | 19 | @interface CNBWitnessPlayerView ()<UIAlertViewDelegate,FailBtnActionDelegate> |
| 18 | 20 | /** 播放属性 */ | ... | ... |
CNLiveWitnessVideoModule/Classes/ViewModel/CNBWitnessListViewModel.m
| ... | ... | @@ -6,13 +6,15 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import "CNBWitnessListViewModel.h" |
| 9 | -#import "CNLiveEnvironment.h" | |
| 10 | -#import "NSString+CNLiveExtension.h" | |
| 11 | -#import "CNLiveNetworking.h" | |
| 12 | 9 | #import "CNBWitnessListModel.h" |
| 13 | -#import "MJExtension.h" | |
| 10 | + | |
| 11 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 12 | +#import <CNLiveBaseKit/NSString+CNLiveExtension.h> | |
| 13 | +#import <CNLiveRequestBastKit/CNLiveNetworking.h> | |
| 14 | +#import <MJExtension/MJExtension.h> | |
| 14 | 15 | #import <QMUIKit/QMUIKit.h> |
| 15 | -#import "CNUserInfoManager.h" | |
| 16 | +#import <CNLiveUserManagement/CNUserInfoManager.h> | |
| 17 | + | |
| 16 | 18 | #define CNBWitnessAppKeyWindow ([UIApplication sharedApplication].delegate).window |
| 17 | 19 | @implementation CNBWitnessListViewModel |
| 18 | 20 | + (void)getWitnessListDataTosid:(NSString *)toSid page:(NSInteger)page pageSize:(NSInteger)pageSize successBlock:(void(^)(NSMutableArray *dataArray,NSString *isHaveNext))successBlock failureBlock:(void (^)(NSError *error))failureBlock { | ... | ... |
Example/CNLiveWitnessVideoModule.xcodeproj/project.pbxproj
| ... | ... | @@ -356,8 +356,8 @@ |
| 356 | 356 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", |
| 357 | 357 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", |
| 358 | 358 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 359 | + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", | |
| 359 | 360 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 360 | - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", | |
| 361 | 361 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 362 | 362 | "${BUILT_PRODUCTS_DIR}/CNLiveWitnessVideoModule/CNLiveWitnessVideoModule.framework", |
| 363 | 363 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", |
| ... | ... | @@ -365,7 +365,15 @@ |
| 365 | 365 | "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", |
| 366 | 366 | "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", |
| 367 | 367 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 368 | - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", | |
| 368 | + "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", | |
| 369 | + "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", | |
| 370 | + "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework", | |
| 371 | + "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework", | |
| 372 | + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", | |
| 373 | + "${BUILT_PRODUCTS_DIR}/YYKeyboardManager/YYKeyboardManager.framework", | |
| 374 | + "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework", | |
| 375 | + "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework", | |
| 376 | + "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework", | |
| 369 | 377 | ); |
| 370 | 378 | name = "[CP] Embed Pods Frameworks"; |
| 371 | 379 | outputPaths = ( |
| ... | ... | @@ -376,8 +384,8 @@ |
| 376 | 384 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", |
| 377 | 385 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", |
| 378 | 386 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 387 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", | |
| 379 | 388 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 380 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", | |
| 381 | 389 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", |
| 382 | 390 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveWitnessVideoModule.framework", |
| 383 | 391 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", |
| ... | ... | @@ -385,7 +393,15 @@ |
| 385 | 393 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", |
| 386 | 394 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", |
| 387 | 395 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 388 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", | |
| 396 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", | |
| 397 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", | |
| 398 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework", | |
| 399 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework", | |
| 400 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", | |
| 401 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework", | |
| 402 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework", | |
| 403 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework", | |
| 404 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework", | |
| 389 | 405 | ); |
| 390 | 406 | runOnlyForDeploymentPostprocessing = 0; |
| 391 | 407 | shellPath = /bin/sh; | ... | ... |
Example/Podfile
| 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 | -platform :ios, '9.0' | |
| 4 | +platform :ios, '10.0' | |
| 5 | 5 | |
| 6 | 6 | target 'CNLiveWitnessVideoModule_Example' do |
| 7 | 7 | pod 'CNLiveWitnessVideoModule', :path => '../' | ... | ... |