提交更改

梁星国
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
Example/CNLiveServiceCenterModule.xcodeproj/project.pbxproj
Example/CNLiveServiceCenterModule/CNLIVEBAppDelegate.h
Example/CNLiveServiceCenterModule/CNLIVEBAppDelegate.m
Example/CNLiveServiceCenterModule/main.m
Example/Podfile
@@ -493,7 +493,6 @@
         @"uid":uid,
         @"clientPlat":@"i",
         @"token":token,
-        //                           @"sign":@"2A5F8868275C4562801D8F75DDE21D2BF9CA156F",
     };
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking setupShowDataResult:NO];
@@ -145,8 +145,8 @@
     [self.userImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.mas_left).offset(15);
         make.top.equalTo(weakSelf.mas_top).offset(46 + kStatusHeight - 20);
-        make.width.mas_equalTo(60 * KScreenWidth / 375);
-        make.height.mas_equalTo(60 * KScreenWidth / 375);
+        make.width.mas_equalTo(60);
+        make.height.mas_equalTo(60);
     }];
     [self.userNameL mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -227,6 +227,8 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
+				A32357CB254754CBD67CF6D0 /* [CP] Embed Pods Frameworks */,
+				6AED6C87B0B928A41D4B9FBE /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -363,6 +365,114 @@
 			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";
 			showEnvVarsInLog = 0;
 		};
+		6AED6C87B0B928A41D4B9FBE /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
+				"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A32357CB254754CBD67CF6D0 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement-fd7047a4/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
+				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
+				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
+				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
+				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
+				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule.framework",
+				"${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework",
+				"${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework",
+				"${PODS_ROOT}/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule.framework",
+				"${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLiveEncryptSDK.framework",
+				"${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLiveMsgTools.framework",
+				"${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePaySDK.framework",
+				"${PODS_ROOT}/CNLiveSDKs/CNLiveSDKs/Classes/CNLivePlayerSDK.framework",
+				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
+				"${BUILT_PRODUCTS_DIR}/Ks3SDK/Ks3SDK.framework",
+				"${BUILT_PRODUCTS_DIR}/RSKImageCropper/RSKImageCropper.framework",
+				"${BUILT_PRODUCTS_DIR}/libksygpulive_ks3/libksygpulive.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
+				"${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}/CNLiveImagePickerController.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBPersonalVerificationModule.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AipOcrSdk.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AipBase.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IdcardQuality.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveOrganizationValidationModule.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEncryptSDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMsgTools.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePaySDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePlayerSDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ks3SDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSKImageCropper.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveServiceCenterModule_Tests/Pods-CNLiveServiceCenterModule_Tests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		CCC302347CCCFE680D14E779 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -383,7 +493,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveServiceCenterModule/CNLiveServiceCenterModule.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement-4bf7a1e1/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveVoiceToTextKit/CNLiveVoiceToTextKit.framework",
@@ -7,6 +7,7 @@
 //
 @import UIKit;
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
 @interface CNLIVEBAppDelegate : UIResponder <UIApplicationDelegate>
@@ -12,6 +12,9 @@
 #import <CNLiveUserManagement/CNUserInfoManager.h>
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import "BHTimeProfiler.h"
+
+
 static NSString * uuid;
 @implementation CNLIVEBAppDelegate
@@ -19,6 +22,18 @@ static NSString * uuid;
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
+    
+//    [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:NO];
+       
+    [BHContext shareInstance].application = application;
+    [BHContext shareInstance].launchOptions = launchOptions;
+    [BHContext shareInstance].moduleConfigName = @"BeeHive.bundle/BeeHive";//可选，默认为BeeHive.bundle/BeeHive.plist
+    [BHContext shareInstance].serviceConfigName = @"BeeHive.bundle/BHService";
+    [BeeHive shareInstance].enableException = YES;
+    [[BeeHive shareInstance] setContext:[BHContext shareInstance]];
+   
+    
+    [[BHTimeProfiler sharedTimeProfiler] recordEventTime:@"BeeHive::super start launch"];
     [self networkParamAction];
     [self appUUIDString];
     return YES;
@@ -8,10 +8,14 @@
 @import UIKit;
 #import "CNLIVEBAppDelegate.h"
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
+        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveDebugAppStore];//CNLiveDebugAppStore//CNLiveProductionAppStore//CNLiveTestFlight
+        
+        
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEBAppDelegate class]));
     }
 }
@@ -11,14 +11,14 @@ target &#39;CNLiveServiceCenterModule_Example&#39; do
   pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
-#    #TODO:后面都注释掉直接在主工程导入
-#    #认证模块
-#    pod 'CNLiveOrganizationValidationModule'
-#    #用户认证模块
-#    pod 'CNLiveBPersonalVerificationModule'
-#    
-#    #用户内容
-#    pod 'CNLiveSDKs'
+    #TODO:后面都注释掉直接在主工程导入
+    #认证模块
+    pod 'CNLiveOrganizationValidationModule'
+    #用户认证模块
+    pod 'CNLiveBPersonalVerificationModule'
+    
+    #用户内容
+    pod 'CNLiveSDKs'
   end
@@ -28,14 +28,15 @@ target &#39;CNLiveServiceCenterModule_Example&#39; do
     inherit! :search_paths
-#    #TODO:后面都注释掉直接在主工程导入
-#       #认证模块
-#       pod 'CNLiveOrganizationValidationModule'
-#       #用户认证模块
-#       pod 'CNLiveBPersonalVerificationModule'
-#       
-#       #用户内容
-#       pod 'CNLiveSDKs'
+    #TODO:后面都注释掉直接在主工程导入
+       #认证模块
+       pod 'CNLiveOrganizationValidationModule'
+       #用户认证模块
+       pod 'CNLiveBPersonalVerificationModule'
+       
+       #用户内容
+       pod 'CNLiveSDKs'
+       
   end
 end