Commit b7286159c94436d8193c0a4b07cbe59435ae88b9
1 parent
76367f5b
0.0.32 版本 Xcode 13适配
Showing
11 changed files
with
69 additions
and
171 deletions
CNLiveServiceCenterModule.podspec
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | |
| 9 | 9 | Pod::Spec.new do |s| |
| 10 | 10 | s.name = 'CNLiveServiceCenterModule' |
| 11 | - s.version = '0.0.31' | |
| 11 | + s.version = '0.0.32' | |
| 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/CNLiveServiceCenterModule.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 | s.requires_arc = true |
| 33 | 33 | |
| 34 | 34 | s.resources = "CNLiveServiceCenterModule/Assets/*.{png,bundle}" | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBCreatorViewController.m
| ... | ... | @@ -6,6 +6,9 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import "CNLiveBCreatorViewController.h" |
| 9 | +#import "UIImage+Service.h" | |
| 10 | + | |
| 11 | + | |
| 9 | 12 | #import <WebKit/WebKit.h> |
| 10 | 13 | #import <CNLiveEnvironment/CNLiveEnvironment.h> |
| 11 | 14 | #import <CNLiveRequestBastKit/CNLiveNetworkRequest.h> |
| ... | ... | @@ -14,10 +17,10 @@ |
| 14 | 17 | #import <CNLiveBeeHive/CNLiveBeeHive.h> |
| 15 | 18 | #import <MJExtension/MJExtension.h> |
| 16 | 19 | #import <QMUIKit/QMUIKit.h> |
| 17 | -#import <YYKit/YYKit.h> | |
| 20 | +#import <YYText/YYText.h> | |
| 21 | +#import <YYCategories/YYCategories.h> | |
| 18 | 22 | #import <objc/runtime.h> |
| 19 | 23 | #import <CNLiveBaseKit/CNLiveBaseKit.h> |
| 20 | -#import "UIImage+Service.h" | |
| 21 | 24 | |
| 22 | 25 | |
| 23 | 26 | @interface CNLiveBCreatorViewController ()<WKNavigationDelegate,WKUIDelegate,UIScrollViewDelegate> | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
| ... | ... | @@ -13,21 +13,23 @@ |
| 13 | 13 | #import "CNLiveBServiceHelpLearnCell.h" |
| 14 | 14 | #import "CNLiveBServiceCenterModel.h" |
| 15 | 15 | #import "CNLiveBServiceWorkCell.h" |
| 16 | +#import "NSString+Random.h" | |
| 17 | +#import "CNLiveBCreatorViewController.h" | |
| 18 | +#import "CNLiveBServiceLiveSelectedView.h" | |
| 19 | + | |
| 16 | 20 | #import <CNLiveEnvironment/CNLiveEnvironment.h> |
| 17 | 21 | #import <CNLiveRequestBastKit/CNLiveNetworkRequest.h> |
| 18 | 22 | #import <CNLiveRequestBastKit/CNLiveNetworking.h> |
| 19 | 23 | #import <CNLiveUserManagement/CNUserInfoManager.h> |
| 20 | 24 | #import <CNLiveBeeHive/CNLiveBeeHive.h> |
| 21 | -#import "CNLiveBOrganizationValidationProtocol.h" | |
| 22 | -#import <YYKit/YYKit.h> | |
| 25 | +#import <CNLiveBServices/CNLiveBOrganizationValidationProtocol.h> | |
| 26 | +#import <YYText/YYText.h> | |
| 27 | +#import <YYCategories/YYCategories.h> | |
| 23 | 28 | #import <QMUIKit/QMUIKit.h> |
| 24 | 29 | #import <CNLiveBServices/CNLiveBPersonAuthentProtocol.h> |
| 25 | 30 | #import <CNLiveBServices/CNLiveBMineServiceProtocol.h> |
| 26 | 31 | #import <CNLiveBServices/CNLiveLiveSetHomeProtocol.h> |
| 27 | 32 | #import <CNLiveBServices/CNLiveIDCardAuthenProtocol.h> |
| 28 | -#import "CNLiveBCreatorViewController.h" | |
| 29 | -#import "CNLiveBServiceLiveSelectedView.h" | |
| 30 | -#import "NSString+Random.h" | |
| 31 | 33 | #import <CNLiveBServices/CNLiveBStreamServiceProtocol.h> |
| 32 | 34 | |
| 33 | 35 | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Service/CNLiveBCenterService.h
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
| ... | ... | @@ -7,8 +7,9 @@ |
| 7 | 7 | |
| 8 | 8 | #import "CNLiveBServiceCenterHeaderView.h" |
| 9 | 9 | #import "CNLiveBServiceCenterModel.h" |
| 10 | -#import <Masonry/Masonry.h> | |
| 11 | 10 | #import "UIImage+Service.h" |
| 11 | + | |
| 12 | +#import <Masonry/Masonry.h> | |
| 12 | 13 | #import <CNLiveBaseKit/CNLiveBaseKit.h> |
| 13 | 14 | #import <SDWebImage/SDWebImage.h> |
| 14 | 15 | #import <CNLiveEnvironment/CNLiveEnvironment.h> | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCertificationCell.m
| ... | ... | @@ -7,10 +7,12 @@ |
| 7 | 7 | |
| 8 | 8 | #import "CNLiveBServiceCertificationCell.h" |
| 9 | 9 | #import "CNLiveBServiceCenterModel.h" |
| 10 | -#import <Masonry/Masonry.h> | |
| 11 | 10 | #import "UIImage+Service.h" |
| 11 | + | |
| 12 | +#import <Masonry/Masonry.h> | |
| 12 | 13 | #import <CNLiveBaseKit/CNLiveBaseKit.h> |
| 13 | -#import <YYKit/YYKit.h> | |
| 14 | +#import <YYText/YYText.h> | |
| 15 | +#import <YYCategories/YYCategories.h> | |
| 14 | 16 | #import <QMUIKit/QMUIKit.h> |
| 15 | 17 | |
| 16 | 18 | @interface CNLiveBServiceCertificationCell() |
| ... | ... | @@ -148,11 +150,11 @@ |
| 148 | 150 | |
| 149 | 151 | NSRange range = [contentText rangeOfString:tipText]; |
| 150 | 152 | // 2. 将属性设置为文本,可以使用几乎所有的CoreText属性。 |
| 151 | - text.font = [UIFont systemFontOfSize:12]; | |
| 152 | - text.color = RGBOF(0x7b7b7b); | |
| 153 | + text.yy_font = [UIFont systemFontOfSize:12]; | |
| 154 | + text.yy_color = RGBOF(0x7b7b7b); | |
| 153 | 155 | __weak typeof(self) weakSelf = self; |
| 154 | 156 | |
| 155 | - [text setTextHighlightRange:range color:RGBOF(0xF0AD24) backgroundColor:[UIColor whiteColor] userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 157 | + [text yy_setTextHighlightRange:range color:RGBOF(0xF0AD24) backgroundColor:[UIColor whiteColor] userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { | |
| 156 | 158 | |
| 157 | 159 | //点击文本的操作 |
| 158 | 160 | NSLog(@"输出内容"); | ... | ... |
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceHelpLearnCell.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceWorkCell.m
| ... | ... | @@ -6,10 +6,10 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import "CNLiveBServiceWorkCell.h" |
| 9 | - | |
| 10 | 9 | #import "CNLiveBServiceCenterModel.h" |
| 11 | -#import <Masonry/Masonry.h> | |
| 12 | 10 | #import "UIImage+Service.h" |
| 11 | + | |
| 12 | +#import <Masonry/Masonry.h> | |
| 13 | 13 | #import <CNLiveBaseKit/CNLiveBaseKit.h> |
| 14 | 14 | |
| 15 | 15 | @interface CNLiveBServiceWorkCell() | ... | ... |
Example/CNLiveServiceCenterModule.xcodeproj/project.pbxproj
| ... | ... | @@ -208,7 +208,7 @@ |
| 208 | 208 | 6003F587195388D20070C39A /* Frameworks */, |
| 209 | 209 | 6003F588195388D20070C39A /* Resources */, |
| 210 | 210 | CCC302347CCCFE680D14E779 /* [CP] Embed Pods Frameworks */, |
| 211 | - 25F4EA24D60B5177A489CCD3 /* [CP] Copy Pods Resources */, | |
| 211 | + 48B4BB3A0E37262F71930FB8 /* [CP] Copy Pods Resources */, | |
| 212 | 212 | ); |
| 213 | 213 | buildRules = ( |
| 214 | 214 | ); |
| ... | ... | @@ -227,8 +227,6 @@ |
| 227 | 227 | 6003F5AA195388D20070C39A /* Sources */, |
| 228 | 228 | 6003F5AB195388D20070C39A /* Frameworks */, |
| 229 | 229 | 6003F5AC195388D20070C39A /* Resources */, |
| 230 | - A32357CB254754CBD67CF6D0 /* [CP] Embed Pods Frameworks */, | |
| 231 | - 6AED6C87B0B928A41D4B9FBE /* [CP] Copy Pods Resources */, | |
| 232 | 230 | ); |
| 233 | 231 | buildRules = ( |
| 234 | 232 | ); |
| ... | ... | @@ -302,26 +300,6 @@ |
| 302 | 300 | /* End PBXResourcesBuildPhase section */ |
| 303 | 301 | |
| 304 | 302 | /* Begin PBXShellScriptBuildPhase section */ |
| 305 | - 25F4EA24D60B5177A489CCD3 /* [CP] Copy Pods Resources */ = { | |
| 306 | - isa = PBXShellScriptBuildPhase; | |
| 307 | - buildActionMask = 2147483647; | |
| 308 | - files = ( | |
| 309 | - ); | |
| 310 | - inputPaths = ( | |
| 311 | - "${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Example/Pods-CNLiveServiceCenterModule_Example-resources.sh", | |
| 312 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", | |
| 313 | - "${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle", | |
| 314 | - ); | |
| 315 | - name = "[CP] Copy Pods Resources"; | |
| 316 | - outputPaths = ( | |
| 317 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", | |
| 318 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", | |
| 319 | - ); | |
| 320 | - runOnlyForDeploymentPostprocessing = 0; | |
| 321 | - shellPath = /bin/sh; | |
| 322 | - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Example/Pods-CNLiveServiceCenterModule_Example-resources.sh\"\n"; | |
| 323 | - showEnvVarsInLog = 0; | |
| 324 | - }; | |
| 325 | 303 | 46C676FFAB5056B5123535CF /* [CP] Check Pods Manifest.lock */ = { |
| 326 | 304 | isa = PBXShellScriptBuildPhase; |
| 327 | 305 | buildActionMask = 2147483647; |
| ... | ... | @@ -344,35 +322,13 @@ |
| 344 | 322 | 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"; |
| 345 | 323 | showEnvVarsInLog = 0; |
| 346 | 324 | }; |
| 347 | - 4E51BAA2024E893E273AEB09 /* [CP] Check Pods Manifest.lock */ = { | |
| 348 | - isa = PBXShellScriptBuildPhase; | |
| 349 | - buildActionMask = 2147483647; | |
| 350 | - files = ( | |
| 351 | - ); | |
| 352 | - inputFileListPaths = ( | |
| 353 | - ); | |
| 354 | - inputPaths = ( | |
| 355 | - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", | |
| 356 | - "${PODS_ROOT}/Manifest.lock", | |
| 357 | - ); | |
| 358 | - name = "[CP] Check Pods Manifest.lock"; | |
| 359 | - outputFileListPaths = ( | |
| 360 | - ); | |
| 361 | - outputPaths = ( | |
| 362 | - "$(DERIVED_FILE_DIR)/Pods-CNLiveServiceCenterModule_Example-checkManifestLockResult.txt", | |
| 363 | - ); | |
| 364 | - runOnlyForDeploymentPostprocessing = 0; | |
| 365 | - shellPath = /bin/sh; | |
| 366 | - 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"; | |
| 367 | - showEnvVarsInLog = 0; | |
| 368 | - }; | |
| 369 | - 6AED6C87B0B928A41D4B9FBE /* [CP] Copy Pods Resources */ = { | |
| 325 | + 48B4BB3A0E37262F71930FB8 /* [CP] Copy Pods Resources */ = { | |
| 370 | 326 | isa = PBXShellScriptBuildPhase; |
| 371 | 327 | buildActionMask = 2147483647; |
| 372 | 328 | files = ( |
| 373 | 329 | ); |
| 374 | 330 | inputPaths = ( |
| 375 | - "${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-resources.sh", | |
| 331 | + "${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Example/Pods-CNLiveServiceCenterModule_Example-resources.sh", | |
| 376 | 332 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", |
| 377 | 333 | "${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle", |
| 378 | 334 | ); |
| ... | ... | @@ -383,101 +339,29 @@ |
| 383 | 339 | ); |
| 384 | 340 | runOnlyForDeploymentPostprocessing = 0; |
| 385 | 341 | shellPath = /bin/sh; |
| 386 | - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-resources.sh\"\n"; | |
| 342 | + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Example/Pods-CNLiveServiceCenterModule_Example-resources.sh\"\n"; | |
| 387 | 343 | showEnvVarsInLog = 0; |
| 388 | 344 | }; |
| 389 | - A32357CB254754CBD67CF6D0 /* [CP] Embed Pods Frameworks */ = { | |
| 345 | + 4E51BAA2024E893E273AEB09 /* [CP] Check Pods Manifest.lock */ = { | |
| 390 | 346 | isa = PBXShellScriptBuildPhase; |
| 391 | 347 | buildActionMask = 2147483647; |
| 392 | 348 | files = ( |
| 393 | 349 | ); |
| 350 | + inputFileListPaths = ( | |
| 351 | + ); | |
| 394 | 352 | inputPaths = ( |
| 395 | - "${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-frameworks.sh", | |
| 396 | - "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", | |
| 397 | - "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", | |
| 398 | - "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", | |
| 399 | - "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", | |
| 400 | - "${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework", | |
| 401 | - "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", | |
| 402 | - "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", | |
| 403 | - "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", | |
| 404 | - "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", | |
| 405 | - "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", | |
| 406 | - "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", | |
| 407 | - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement-b938e76b/CNLiveTripartiteManagement.framework", | |
| 408 | - "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", | |
| 409 | - "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", | |
| 410 | - "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", | |
| 411 | - "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", | |
| 412 | - "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework", | |
| 413 | - "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", | |
| 414 | - "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", | |
| 415 | - "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", | |
| 416 | - "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", | |
| 417 | - "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", | |
| 418 | - "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", | |
| 419 | - "${BUILT_PRODUCTS_DIR}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule.framework", | |
| 420 | - "${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework", | |
| 421 | - "${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework", | |
| 422 | - "${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework", | |
| 423 | - "${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework", | |
| 424 | - "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", | |
| 425 | - "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", | |
| 426 | - "${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework", | |
| 427 | - "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLiveEncryptSDK.framework", | |
| 428 | - "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePaySDK.framework", | |
| 429 | - "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePlayerSDK.framework", | |
| 430 | - "${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework", | |
| 431 | - "${BUILT_PRODUCTS_DIR}/Ks3SDK/Ks3SDK.framework", | |
| 432 | - "${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework", | |
| 433 | - "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | |
| 434 | - "${BUILT_PRODUCTS_DIR}/libksygpulive/libksygpulive.framework", | |
| 353 | + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", | |
| 354 | + "${PODS_ROOT}/Manifest.lock", | |
| 355 | + ); | |
| 356 | + name = "[CP] Check Pods Manifest.lock"; | |
| 357 | + outputFileListPaths = ( | |
| 435 | 358 | ); |
| 436 | - name = "[CP] Embed Pods Frameworks"; | |
| 437 | 359 | outputPaths = ( |
| 438 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", | |
| 439 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", | |
| 440 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", | |
| 441 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", | |
| 442 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework", | |
| 443 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", | |
| 444 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", | |
| 445 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", | |
| 446 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", | |
| 447 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", | |
| 448 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", | |
| 449 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", | |
| 450 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", | |
| 451 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", | |
| 452 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", | |
| 453 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", | |
| 454 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework", | |
| 455 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", | |
| 456 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", | |
| 457 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", | |
| 458 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", | |
| 459 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", | |
| 460 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", | |
| 461 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBPersonalVerificationModule.framework", | |
| 462 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AipOcrSdk.framework", | |
| 463 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AipBase.framework", | |
| 464 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IdcardQuality.framework", | |
| 465 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework", | |
| 466 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", | |
| 467 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", | |
| 468 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework", | |
| 469 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEncryptSDK.framework", | |
| 470 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePaySDK.framework", | |
| 471 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePlayerSDK.framework", | |
| 472 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework", | |
| 473 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ks3SDK.framework", | |
| 474 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework", | |
| 475 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | |
| 476 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework", | |
| 360 | + "$(DERIVED_FILE_DIR)/Pods-CNLiveServiceCenterModule_Example-checkManifestLockResult.txt", | |
| 477 | 361 | ); |
| 478 | 362 | runOnlyForDeploymentPostprocessing = 0; |
| 479 | 363 | shellPath = /bin/sh; |
| 480 | - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-frameworks.sh\"\n"; | |
| 364 | + 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"; | |
| 481 | 365 | showEnvVarsInLog = 0; |
| 482 | 366 | }; |
| 483 | 367 | CCC302347CCCFE680D14E779 /* [CP] Embed Pods Frameworks */ = { |
| ... | ... | @@ -497,9 +381,9 @@ |
| 497 | 381 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", |
| 498 | 382 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 499 | 383 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| 384 | + "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", | |
| 500 | 385 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 501 | 386 | "${BUILT_PRODUCTS_DIR}/CNLiveServiceCenterModule/CNLiveServiceCenterModule.framework", |
| 502 | - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement-4bf7a1e1/CNLiveTripartiteManagement.framework", | |
| 503 | 387 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", |
| 504 | 388 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 505 | 389 | "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", |
| ... | ... | @@ -510,7 +394,15 @@ |
| 510 | 394 | "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", |
| 511 | 395 | "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", |
| 512 | 396 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 513 | - "${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", | |
| 514 | 406 | ); |
| 515 | 407 | name = "[CP] Embed Pods Frameworks"; |
| 516 | 408 | outputPaths = ( |
| ... | ... | @@ -524,9 +416,9 @@ |
| 524 | 416 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", |
| 525 | 417 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 526 | 418 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", |
| 419 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", | |
| 527 | 420 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 528 | 421 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveServiceCenterModule.framework", |
| 529 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", | |
| 530 | 422 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", |
| 531 | 423 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", |
| 532 | 424 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", |
| ... | ... | @@ -537,7 +429,15 @@ |
| 537 | 429 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", |
| 538 | 430 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", |
| 539 | 431 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 540 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", | |
| 432 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", | |
| 433 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", | |
| 434 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework", | |
| 435 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework", | |
| 436 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", | |
| 437 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework", | |
| 438 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework", | |
| 439 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework", | |
| 440 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework", | |
| 541 | 441 | ); |
| 542 | 442 | runOnlyForDeploymentPostprocessing = 0; |
| 543 | 443 | shellPath = /bin/sh; | ... | ... |
Example/Podfile
| 1 | 1 | use_frameworks! |
| 2 | -source 'https://github.com/CocoaPods/Specs.git' | |
| 2 | +#source 'https://github.com/CocoaPods/Specs.git' | |
| 3 | +source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' | |
| 3 | 4 | source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git' |
| 4 | 5 | |
| 5 | -platform :ios, '9.0' | |
| 6 | +platform :ios, '10.0' | |
| 6 | 7 | |
| 7 | 8 | target 'CNLiveServiceCenterModule_Example' do |
| 8 | 9 | pod 'CNLiveServiceCenterModule', :path => '../' |
| ... | ... | @@ -11,14 +12,6 @@ target 'CNLiveServiceCenterModule_Example' do |
| 11 | 12 | pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} |
| 12 | 13 | |
| 13 | 14 | |
| 14 | - #TODO:后面都注释掉直接在主工程导入 | |
| 15 | - #认证模块 | |
| 16 | - pod 'CNLiveOrganizationValidationModule' | |
| 17 | - #用户认证模块 | |
| 18 | - pod 'CNLiveBPersonalVerificationModule' | |
| 19 | - | |
| 20 | - #用户内容 | |
| 21 | - pod 'CNLiveSDKs' | |
| 22 | 15 | |
| 23 | 16 | |
| 24 | 17 | end |
| ... | ... | @@ -29,14 +22,6 @@ target 'CNLiveServiceCenterModule_Example' do |
| 29 | 22 | |
| 30 | 23 | |
| 31 | 24 | #TODO:后面都注释掉直接在主工程导入 |
| 32 | - #认证模块 | |
| 33 | - pod 'CNLiveOrganizationValidationModule' | |
| 34 | - #用户认证模块 | |
| 35 | - pod 'CNLiveBPersonalVerificationModule' | |
| 36 | - | |
| 37 | - #用户内容 | |
| 38 | - pod 'CNLiveSDKs' | |
| 39 | - | |
| 40 | 25 | |
| 41 | 26 | end |
| 42 | 27 | end | ... | ... |
README.md
| ... | ... | @@ -27,3 +27,7 @@ pod 'CNLiveServiceCenterModule' |
| 27 | 27 | ## License |
| 28 | 28 | |
| 29 | 29 | CNLiveServiceCenterModule is available under the MIT license. See the LICENSE file for more info. |
| 30 | + | |
| 31 | +## 推送 | |
| 32 | +pod repo push CNLiveRepos CNLiveServiceCenterModule.podspec --verbose --use-libraries --skip-import-validation --allow-warnings | |
| 33 | + | ... | ... |