Commit 69ffe16f3aff10993cadfade09357195d80cf5d1
1 parent
fdeb742e
提交更改
Showing
7 changed files
with
150 additions
and
20 deletions
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
| ... | ... | @@ -145,8 +145,8 @@ |
| 145 | 145 | [self.userImageV mas_makeConstraints:^(MASConstraintMaker *make) { |
| 146 | 146 | make.left.equalTo(weakSelf.mas_left).offset(15); |
| 147 | 147 | make.top.equalTo(weakSelf.mas_top).offset(46 + kStatusHeight - 20); |
| 148 | - make.width.mas_equalTo(60 * KScreenWidth / 375); | |
| 149 | - make.height.mas_equalTo(60 * KScreenWidth / 375); | |
| 148 | + make.width.mas_equalTo(60); | |
| 149 | + make.height.mas_equalTo(60); | |
| 150 | 150 | }]; |
| 151 | 151 | |
| 152 | 152 | [self.userNameL mas_makeConstraints:^(MASConstraintMaker *make) { | ... | ... |
Example/CNLiveServiceCenterModule.xcodeproj/project.pbxproj
| ... | ... | @@ -227,6 +227,8 @@ |
| 227 | 227 | 6003F5AA195388D20070C39A /* Sources */, |
| 228 | 228 | 6003F5AB195388D20070C39A /* Frameworks */, |
| 229 | 229 | 6003F5AC195388D20070C39A /* Resources */, |
| 230 | + A32357CB254754CBD67CF6D0 /* [CP] Embed Pods Frameworks */, | |
| 231 | + 6AED6C87B0B928A41D4B9FBE /* [CP] Copy Pods Resources */, | |
| 230 | 232 | ); |
| 231 | 233 | buildRules = ( |
| 232 | 234 | ); |
| ... | ... | @@ -363,6 +365,114 @@ |
| 363 | 365 | 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"; |
| 364 | 366 | showEnvVarsInLog = 0; |
| 365 | 367 | }; |
| 368 | + 6AED6C87B0B928A41D4B9FBE /* [CP] Copy Pods Resources */ = { | |
| 369 | + isa = PBXShellScriptBuildPhase; | |
| 370 | + buildActionMask = 2147483647; | |
| 371 | + files = ( | |
| 372 | + ); | |
| 373 | + inputPaths = ( | |
| 374 | + "${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-resources.sh", | |
| 375 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", | |
| 376 | + "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle", | |
| 377 | + ); | |
| 378 | + name = "[CP] Copy Pods Resources"; | |
| 379 | + outputPaths = ( | |
| 380 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", | |
| 381 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", | |
| 382 | + ); | |
| 383 | + runOnlyForDeploymentPostprocessing = 0; | |
| 384 | + shellPath = /bin/sh; | |
| 385 | + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-resources.sh\"\n"; | |
| 386 | + showEnvVarsInLog = 0; | |
| 387 | + }; | |
| 388 | + A32357CB254754CBD67CF6D0 /* [CP] Embed Pods Frameworks */ = { | |
| 389 | + isa = PBXShellScriptBuildPhase; | |
| 390 | + buildActionMask = 2147483647; | |
| 391 | + files = ( | |
| 392 | + ); | |
| 393 | + inputPaths = ( | |
| 394 | + "${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-frameworks.sh", | |
| 395 | + "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", | |
| 396 | + "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", | |
| 397 | + "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", | |
| 398 | + "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", | |
| 399 | + "${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework", | |
| 400 | + "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", | |
| 401 | + "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", | |
| 402 | + "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", | |
| 403 | + "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", | |
| 404 | + "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", | |
| 405 | + "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", | |
| 406 | + "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement-fd7047a4/CNLiveTripartiteManagement.framework", | |
| 407 | + "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", | |
| 408 | + "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", | |
| 409 | + "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", | |
| 410 | + "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", | |
| 411 | + "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework", | |
| 412 | + "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", | |
| 413 | + "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", | |
| 414 | + "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", | |
| 415 | + "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", | |
| 416 | + "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", | |
| 417 | + "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", | |
| 418 | + "${BUILT_PRODUCTS_DIR}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule.framework", | |
| 419 | + "${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework", | |
| 420 | + "${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework", | |
| 421 | + "${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework", | |
| 422 | + "${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework", | |
| 423 | + "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLiveEncryptSDK.framework", | |
| 424 | + "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLiveMsgTools.framework", | |
| 425 | + "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePaySDK.framework", | |
| 426 | + "${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePlayerSDK.framework", | |
| 427 | + "${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework", | |
| 428 | + "${BUILT_PRODUCTS_DIR}/Ks3SDK/Ks3SDK.framework", | |
| 429 | + "${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework", | |
| 430 | + "${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework", | |
| 431 | + ); | |
| 432 | + name = "[CP] Embed Pods Frameworks"; | |
| 433 | + outputPaths = ( | |
| 434 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", | |
| 435 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", | |
| 436 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", | |
| 437 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", | |
| 438 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework", | |
| 439 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", | |
| 440 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", | |
| 441 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", | |
| 442 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", | |
| 443 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", | |
| 444 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", | |
| 445 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", | |
| 446 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", | |
| 447 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", | |
| 448 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", | |
| 449 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", | |
| 450 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework", | |
| 451 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", | |
| 452 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", | |
| 453 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", | |
| 454 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", | |
| 455 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", | |
| 456 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", | |
| 457 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBPersonalVerificationModule.framework", | |
| 458 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AipOcrSdk.framework", | |
| 459 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AipBase.framework", | |
| 460 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IdcardQuality.framework", | |
| 461 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework", | |
| 462 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEncryptSDK.framework", | |
| 463 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMsgTools.framework", | |
| 464 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePaySDK.framework", | |
| 465 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePlayerSDK.framework", | |
| 466 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework", | |
| 467 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ks3SDK.framework", | |
| 468 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework", | |
| 469 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework", | |
| 470 | + ); | |
| 471 | + runOnlyForDeploymentPostprocessing = 0; | |
| 472 | + shellPath = /bin/sh; | |
| 473 | + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-frameworks.sh\"\n"; | |
| 474 | + showEnvVarsInLog = 0; | |
| 475 | + }; | |
| 366 | 476 | CCC302347CCCFE680D14E779 /* [CP] Embed Pods Frameworks */ = { |
| 367 | 477 | isa = PBXShellScriptBuildPhase; |
| 368 | 478 | buildActionMask = 2147483647; |
| ... | ... | @@ -383,7 +493,7 @@ |
| 383 | 493 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| 384 | 494 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 385 | 495 | "${BUILT_PRODUCTS_DIR}/CNLiveServiceCenterModule/CNLiveServiceCenterModule.framework", |
| 386 | - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", | |
| 496 | + "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement-4bf7a1e1/CNLiveTripartiteManagement.framework", | |
| 387 | 497 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", |
| 388 | 498 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 389 | 499 | "${BUILT_PRODUCTS_DIR}/CNLiveVoiceToTextKit/CNLiveVoiceToTextKit.framework", | ... | ... |
Example/CNLiveServiceCenterModule/CNLIVEBAppDelegate.h
Example/CNLiveServiceCenterModule/CNLIVEBAppDelegate.m
| ... | ... | @@ -12,6 +12,9 @@ |
| 12 | 12 | #import <CNLiveUserManagement/CNUserInfoManager.h> |
| 13 | 13 | #import <CNLiveEnvironment/CNLiveEnvironment.h> |
| 14 | 14 | |
| 15 | +#import "BHTimeProfiler.h" | |
| 16 | + | |
| 17 | + | |
| 15 | 18 | static NSString * uuid; |
| 16 | 19 | |
| 17 | 20 | @implementation CNLIVEBAppDelegate |
| ... | ... | @@ -19,6 +22,18 @@ static NSString * uuid; |
| 19 | 22 | - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions |
| 20 | 23 | { |
| 21 | 24 | // Override point for customization after application launch. |
| 25 | + | |
| 26 | +// [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:NO]; | |
| 27 | + | |
| 28 | + [BHContext shareInstance].application = application; | |
| 29 | + [BHContext shareInstance].launchOptions = launchOptions; | |
| 30 | + [BHContext shareInstance].moduleConfigName = @"BeeHive.bundle/BeeHive";//可选,默认为BeeHive.bundle/BeeHive.plist | |
| 31 | + [BHContext shareInstance].serviceConfigName = @"BeeHive.bundle/BHService"; | |
| 32 | + [BeeHive shareInstance].enableException = YES; | |
| 33 | + [[BeeHive shareInstance] setContext:[BHContext shareInstance]]; | |
| 34 | + | |
| 35 | + | |
| 36 | + [[BHTimeProfiler sharedTimeProfiler] recordEventTime:@"BeeHive::super start launch"]; | |
| 22 | 37 | [self networkParamAction]; |
| 23 | 38 | [self appUUIDString]; |
| 24 | 39 | return YES; | ... | ... |
Example/CNLiveServiceCenterModule/main.m
| ... | ... | @@ -8,10 +8,14 @@ |
| 8 | 8 | |
| 9 | 9 | @import UIKit; |
| 10 | 10 | #import "CNLIVEBAppDelegate.h" |
| 11 | +#import <CNLiveEnvironment/CNLiveEnvironment.h> | |
| 11 | 12 | |
| 12 | 13 | int main(int argc, char * argv[]) |
| 13 | 14 | { |
| 14 | 15 | @autoreleasepool { |
| 16 | + [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveDebugAppStore];//CNLiveDebugAppStore//CNLiveProductionAppStore//CNLiveTestFlight | |
| 17 | + | |
| 18 | + | |
| 15 | 19 | return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEBAppDelegate class])); |
| 16 | 20 | } |
| 17 | 21 | } | ... | ... |
Example/Podfile
| ... | ... | @@ -11,14 +11,14 @@ target 'CNLiveServiceCenterModule_Example' do |
| 11 | 11 | pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} |
| 12 | 12 | |
| 13 | 13 | |
| 14 | -# #TODO:后面都注释掉直接在主工程导入 | |
| 15 | -# #认证模块 | |
| 16 | -# pod 'CNLiveOrganizationValidationModule' | |
| 17 | -# #用户认证模块 | |
| 18 | -# pod 'CNLiveBPersonalVerificationModule' | |
| 19 | -# | |
| 20 | -# #用户内容 | |
| 21 | -# pod 'CNLiveSDKs' | |
| 14 | + #TODO:后面都注释掉直接在主工程导入 | |
| 15 | + #认证模块 | |
| 16 | + pod 'CNLiveOrganizationValidationModule' | |
| 17 | + #用户认证模块 | |
| 18 | + pod 'CNLiveBPersonalVerificationModule' | |
| 19 | + | |
| 20 | + #用户内容 | |
| 21 | + pod 'CNLiveSDKs' | |
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | end |
| ... | ... | @@ -28,14 +28,15 @@ target 'CNLiveServiceCenterModule_Example' do |
| 28 | 28 | inherit! :search_paths |
| 29 | 29 | |
| 30 | 30 | |
| 31 | -# #TODO:后面都注释掉直接在主工程导入 | |
| 32 | -# #认证模块 | |
| 33 | -# pod 'CNLiveOrganizationValidationModule' | |
| 34 | -# #用户认证模块 | |
| 35 | -# pod 'CNLiveBPersonalVerificationModule' | |
| 36 | -# | |
| 37 | -# #用户内容 | |
| 38 | -# pod 'CNLiveSDKs' | |
| 31 | + #TODO:后面都注释掉直接在主工程导入 | |
| 32 | + #认证模块 | |
| 33 | + pod 'CNLiveOrganizationValidationModule' | |
| 34 | + #用户认证模块 | |
| 35 | + pod 'CNLiveBPersonalVerificationModule' | |
| 36 | + | |
| 37 | + #用户内容 | |
| 38 | + pod 'CNLiveSDKs' | |
| 39 | + | |
| 39 | 40 | |
| 40 | 41 | end |
| 41 | 42 | end | ... | ... |