iOS Team / CNLiveBusinessTools · Commits

Commit 2e4e74b20a1d0e47791fb4fd32d83799601be99f

Authored by yanglingyu
1 parent 43f97c2f

拆分yykit

Inline Side-by-side
Showing 3 changed files with 29 additions and 9 deletions
CNLiveBusinessTools.podspec
  View file @2e4e74b
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveBusinessTools' 10 s.name = 'CNLiveBusinessTools'
11 - s.version = '0.1.25' 11 + s.version = '0.1.26'
12 s.summary = '业务工具集合组件.' 12 s.summary = '业务工具集合组件.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
@@ -40,5 +40,12 @@ Pod::Spec.new do |s| @@ -40,5 +40,12 @@ Pod::Spec.new do |s|
40 s.dependency 'CNLiveBaseKit' 40 s.dependency 'CNLiveBaseKit'
41 s.dependency 'CNLiveRequestBastKit' 41 s.dependency 'CNLiveRequestBastKit'
42 s.dependency 'CNLiveNewTripartiteManagement/QMUIKit' 42 s.dependency 'CNLiveNewTripartiteManagement/QMUIKit'
43 - s.dependency 'CNLiveNewTripartiteManagement/YYKit' 43 + s.dependency 'YYImage'
  44 + s.dependency 'YYModel'
  45 + s.dependency 'YYCache'
  46 + s.dependency 'YYWebImage'
  47 + s.dependency 'YYText'
  48 + s.dependency 'YYDispatchQueuePool'
  49 + s.dependency 'YYAsyncLayer'
  50 + s.dependency 'YYCategories'
44 end 51 end
CNLiveBusinessTools/Classes/CNLiveBusinessTools.m
  View file @2e4e74b
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 7
8 #import "CNLiveBusinessTools.h" 8 #import "CNLiveBusinessTools.h"
9 #import <Photos/Photos.h> 9 #import <Photos/Photos.h>
10 -#import <YYKit/YYKit.h> 10 +#import <YYImage/YYImage.h>
  11 +#import <YYText/YYText.h>
11 @implementation CNLiveBusinessTools 12 @implementation CNLiveBusinessTools
12 13
13 /// 拼接音视频通话时长统计内容 14 /// 拼接音视频通话时长统计内容
@@ -1009,14 +1010,14 @@ @@ -1009,14 +1010,14 @@
1009 YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image]; 1010 YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image];
1010 imageView.width = 24*RATIO; 1011 imageView.width = 24*RATIO;
1011 imageView.height = 24*RATIO; 1012 imageView.height = 24*RATIO;
1012 - NSMutableAttributedString *attachText = [NSMutableAttributedString attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter]; 1013 + NSMutableAttributedString *attachText = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter];
1013 [attStr replaceCharactersInRange:result.range withAttributedString:attachText]; 1014 [attStr replaceCharactersInRange:result.range withAttributedString:attachText];
1014 }); 1015 });
1015 }else{ 1016 }else{
1016 YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image]; 1017 YYAnimatedImageView *imageView = [[YYAnimatedImageView alloc] initWithImage:emojiArr[j].image];
1017 imageView.width = 24*RATIO; 1018 imageView.width = 24*RATIO;
1018 imageView.height = 24*RATIO; 1019 imageView.height = 24*RATIO;
1019 - NSMutableAttributedString *attachText = [NSMutableAttributedString attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter]; 1020 + NSMutableAttributedString *attachText = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeCenter attachmentSize:imageView.size alignToFont:UIFontCNMake(contentLabelFontSize) alignment:YYTextVerticalAlignmentCenter];
1020 1021
1021 [attStr replaceCharactersInRange:result.range withAttributedString:attachText]; 1022 [attStr replaceCharactersInRange:result.range withAttributedString:attachText];
1022 } 1023 }
Example/CNLiveBusinessTools.xcodeproj/project.pbxproj
  View file @2e4e74b
@@ -310,11 +310,17 @@ @@ -310,11 +310,17 @@
310 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 310 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
311 "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", 311 "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
312 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 312 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
313 - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",  
314 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 313 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
315 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 314 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
316 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", 315 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
317 - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", 316 + "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
  317 + "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
  318 + "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
  319 + "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
  320 + "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
  321 + "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
  322 + "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
  323 + "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
318 ); 324 );
319 name = "[CP] Embed Pods Frameworks"; 325 name = "[CP] Embed Pods Frameworks";
320 outputPaths = ( 326 outputPaths = (
@@ -324,11 +330,17 @@ @@ -324,11 +330,17 @@
324 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 330 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
325 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", 331 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
326 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 332 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
327 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",  
328 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 333 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
329 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 334 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
330 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", 335 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
331 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", 336 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
  337 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
  338 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
  339 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
  340 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
  341 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
  342 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
  343 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
332 ); 344 );
333 runOnlyForDeploymentPostprocessing = 0; 345 runOnlyForDeploymentPostprocessing = 0;
334 shellPath = /bin/sh; 346 shellPath = /bin/sh;