Commit fd8fddf1dea73c59f92409d4c8b585de79fe3f71
1 parent
129e6436
no message
Showing
17 changed files
with
63 additions
and
67 deletions
CNLiveBMineModule.podspec
| ... | ... | @@ -79,15 +79,16 @@ TODO: 网家家企业版-我的模块. |
| 79 | 79 | s.dependency 'CNLiveTripartiteManagement/Masonry' |
| 80 | 80 | s.dependency 'CNLiveTripartiteManagement/MJExtension' |
| 81 | 81 | s.dependency 'CNLiveTripartiteManagement/AFNetworking' |
| 82 | + s.dependency 'CNLiveTripartiteManagement/YYKit' | |
| 82 | 83 | |
| 83 | 84 | # 服务层 |
| 84 | - s.dependency 'CNLiveServices' | |
| 85 | + s.dependency 'CNLiveBServices' | |
| 85 | 86 | |
| 86 | 87 | # 环境 |
| 87 | - s.dependency 'CNLiveBEnvironment' | |
| 88 | + s.dependency 'CNLiveEnvironment' | |
| 88 | 89 | |
| 89 | 90 | # 基类 |
| 90 | - s.dependency 'CNLiveCommonClass' | |
| 91 | + s.dependency 'CNLiveBaseClass' | |
| 91 | 92 | |
| 92 | 93 | # IM |
| 93 | 94 | s.dependency 'CNLiveIMBaseSDK' |
| ... | ... | @@ -96,7 +97,7 @@ TODO: 网家家企业版-我的模块. |
| 96 | 97 | s.dependency 'CNLiveCategory' |
| 97 | 98 | |
| 98 | 99 | # 用户信息本地化 |
| 99 | -# s.dependency 'CNLiveUserManagement' | |
| 100 | + s.dependency 'CNLiveUserManagement' | |
| 100 | 101 | |
| 101 | 102 | # 分享工具库 |
| 102 | 103 | s.dependency 'CNLiveShareToolKit' | ... | ... |
CNLiveBMineModule/Classes/Controller/CNLiveMineController.h
| ... | ... | @@ -10,11 +10,11 @@ |
| 10 | 10 | * 我的 |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | -#import "CNCommonViewController.h" | |
| 13 | +#import "CNLiveBaseViewController.h" | |
| 14 | 14 | |
| 15 | 15 | NS_ASSUME_NONNULL_BEGIN |
| 16 | 16 | |
| 17 | -@interface CNLiveMineController : CNCommonViewController | |
| 17 | +@interface CNLiveMineController : CNLiveBaseViewController | |
| 18 | 18 | |
| 19 | 19 | @end |
| 20 | 20 | ... | ... |
CNLiveBMineModule/Classes/Controller/CNLiveMineController.m
| ... | ... | @@ -11,10 +11,10 @@ |
| 11 | 11 | #import "MJExtension.h" |
| 12 | 12 | #import "QMUIKit.h" |
| 13 | 13 | |
| 14 | -#import "CNLiveServices.h" | |
| 14 | +#import "CNLiveBServices.h" | |
| 15 | 15 | #import <CNLiveRequestBastKit/CNLiveNetworking.h> |
| 16 | 16 | #import "CNUserInfoManager.h" |
| 17 | -//#import "CNLiveEnvironment.h" | |
| 17 | +#import "CNLiveEnvironment.h" | |
| 18 | 18 | #import "CNLiveCategory.h" |
| 19 | 19 | |
| 20 | 20 | #import "CNLiveMineHeaderView.h" |
| ... | ... | @@ -267,10 +267,6 @@ static const CGFloat timeValue = 1.5; |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | #pragma mark - 响应方法 |
| 270 | -- (void)soccerDidClicked:(UIButton *)btn{ | |
| 271 | - id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)]; | |
| 272 | - [service pushToTaskListViewController]; | |
| 273 | -} | |
| 274 | 270 | |
| 275 | 271 | #pragma mark - 懒加载 |
| 276 | 272 | - (NSMutableArray *)data { | ... | ... |
CNLiveBMineModule/Classes/Module/CNLiveBMineModule.m
CNLiveBMineModule/Classes/Module/CNLiveBMineService.m
| ... | ... | @@ -7,17 +7,16 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveBMineService.h" |
| 10 | -#import "CNLiveServices.h" | |
| 10 | +#import "CNLiveBServices.h" | |
| 11 | 11 | #import "CNLivePageJumpManager.h" |
| 12 | 12 | |
| 13 | 13 | #import "CNLiveMineController.h" |
| 14 | 14 | #import "CNLiveUserInfoController.h" |
| 15 | 15 | |
| 16 | -//@BeeHiveService(CNLiveBMineServiceProtocol,CNLiveBMineService) | |
| 17 | -////@interface CNLiveBMineService ()<CNLiveBMineServiceProtocol> | |
| 18 | -//@interface CNLiveBMineService () | |
| 19 | -// | |
| 20 | -//@end | |
| 16 | +@BeeHiveService(CNLiveBMineServiceProtocol,CNLiveBMineService) | |
| 17 | +@interface CNLiveBMineService ()<CNLiveBMineServiceProtocol> | |
| 18 | + | |
| 19 | +@end | |
| 21 | 20 | |
| 22 | 21 | @implementation CNLiveBMineService |
| 23 | 22 | ... | ... |
CNLiveBMineModule/Classes/Setting/AboutUs/CNLiveAboutUsController.h
| ... | ... | @@ -11,11 +11,11 @@ |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | #import <UIKit/UIKit.h> |
| 14 | -#import "CNCommonViewController.h" | |
| 14 | +#import "CNLiveBaseViewController.h" | |
| 15 | 15 | |
| 16 | 16 | NS_ASSUME_NONNULL_BEGIN |
| 17 | 17 | |
| 18 | -@interface CNLiveAboutUsController : CNCommonViewController | |
| 18 | +@interface CNLiveAboutUsController : CNLiveBaseViewController | |
| 19 | 19 | |
| 20 | 20 | @end |
| 21 | 21 | ... | ... |
CNLiveBMineModule/Classes/Setting/AboutUs/CNLiveAboutUsController.m
CNLiveBMineModule/Classes/Setting/BindingManage/CNLiveBindingManageController.h
| ... | ... | @@ -6,11 +6,11 @@ |
| 6 | 6 | // Copyright © 2019 cnlive. All rights reserved. |
| 7 | 7 | // |
| 8 | 8 | // 绑定管理 |
| 9 | -#import "CNCommonViewController.h" | |
| 9 | +#import "CNLiveBaseViewController.h" | |
| 10 | 10 | |
| 11 | 11 | NS_ASSUME_NONNULL_BEGIN |
| 12 | 12 | |
| 13 | -@interface CNLiveBindingManageController : CNCommonViewController | |
| 13 | +@interface CNLiveBindingManageController : CNLiveBaseViewController | |
| 14 | 14 | |
| 15 | 15 | @end |
| 16 | 16 | ... | ... |
CNLiveBMineModule/Classes/Setting/Cancellation/CNLiveCancellationController.h
| ... | ... | @@ -8,11 +8,11 @@ |
| 8 | 8 | |
| 9 | 9 | // 注销账号 |
| 10 | 10 | |
| 11 | -#import "CNCommonViewController.h" | |
| 11 | +#import "CNLiveBaseViewController.h" | |
| 12 | 12 | |
| 13 | 13 | NS_ASSUME_NONNULL_BEGIN |
| 14 | 14 | |
| 15 | -@interface CNLiveCancellationController : CNCommonViewController | |
| 15 | +@interface CNLiveCancellationController : CNLiveBaseViewController | |
| 16 | 16 | |
| 17 | 17 | @end |
| 18 | 18 | ... | ... |
CNLiveBMineModule/Classes/Setting/Controller/CNLiveSettingController.h
| ... | ... | @@ -11,11 +11,11 @@ |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | #import <UIKit/UIKit.h> |
| 14 | -#import "CNCommonViewController.h" | |
| 14 | +#import "CNLiveBaseViewController.h" | |
| 15 | 15 | |
| 16 | 16 | NS_ASSUME_NONNULL_BEGIN |
| 17 | 17 | |
| 18 | -@interface CNLiveSettingController : CNCommonViewController | |
| 18 | +@interface CNLiveSettingController : CNLiveBaseViewController | |
| 19 | 19 | |
| 20 | 20 | @end |
| 21 | 21 | ... | ... |
CNLiveBMineModule/Classes/Setting/Controller/CNLiveSettingController.m
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | |
| 17 | 17 | #import "CNLiveSettingModel.h" |
| 18 | 18 | #import "CNLiveSettingCell.h" |
| 19 | -#import "CNLiveServices.h" | |
| 19 | +#import "CNLiveBServices.h" | |
| 20 | 20 | #import "CNLiveNavigationBar.h" |
| 21 | 21 | |
| 22 | 22 | #import "CNLiveUpdateTelController.h"//修改手机号 |
| ... | ... | @@ -279,7 +279,7 @@ static const NSInteger timeValue = 1.5; |
| 279 | 279 | QMUIAlertAction *sure = [QMUIAlertAction actionWithTitle:@"退出登录" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) { |
| 280 | 280 | [UIApplication sharedApplication].delegate.window.rootViewController = nil; |
| 281 | 281 | [self cleanLocalCache]; |
| 282 | - id<CNLiveLoginServiceProtocol> login = [[BeeHive shareInstance] createService:@protocol(CNLiveLoginServiceProtocol)]; | |
| 282 | + id<CNLiveBLoginServiceProtocol> login = [[BeeHive shareInstance] createService:@protocol(CNLiveBLoginServiceProtocol)]; | |
| 283 | 283 | UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:[login getLoginViewController]]; |
| 284 | 284 | [UIApplication sharedApplication].delegate.window.rootViewController = nav; |
| 285 | 285 | }]; | ... | ... |
CNLiveBMineModule/Classes/Setting/UpdateTel/CNLiveUpdateTelController.h
| ... | ... | @@ -6,8 +6,8 @@ |
| 6 | 6 | // Copyright (c) 2019 153993236@qq.com. All rights reserved. |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | -#import "CNCommonViewController.h" | |
| 9 | +#import "CNLiveBaseViewController.h" | |
| 10 | 10 | |
| 11 | -@interface CNLiveUpdateTelController : CNCommonViewController | |
| 11 | +@interface CNLiveUpdateTelController : CNLiveBaseViewController | |
| 12 | 12 | |
| 13 | 13 | @end | ... | ... |
CNLiveBMineModule/Classes/UserInfo/CNLiveInfoUpdateController.h
| ... | ... | @@ -6,12 +6,12 @@ |
| 6 | 6 | // Copyright (c) 2019 153993236@qq.com. All rights reserved. |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | -#import "CNCommonViewController.h" | |
| 9 | +#import "CNLiveBaseViewController.h" | |
| 10 | 10 | |
| 11 | 11 | NS_ASSUME_NONNULL_BEGIN |
| 12 | 12 | @class CNLiveUserInfoModel; |
| 13 | 13 | |
| 14 | -@interface CNLiveInfoUpdateController : CNCommonViewController | |
| 14 | +@interface CNLiveInfoUpdateController : CNLiveBaseViewController | |
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * @abstract 对象方法 初始化方法 | ... | ... |
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoController.h
| ... | ... | @@ -11,11 +11,11 @@ |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | #import <UIKit/UIKit.h> |
| 14 | -#import "CNCommonViewController.h" | |
| 14 | +#import "CNLiveBaseViewController.h" | |
| 15 | 15 | |
| 16 | 16 | NS_ASSUME_NONNULL_BEGIN |
| 17 | 17 | |
| 18 | -@interface CNLiveUserInfoController : CNCommonViewController | |
| 18 | +@interface CNLiveUserInfoController : CNLiveBaseViewController | |
| 19 | 19 | |
| 20 | 20 | @end |
| 21 | 21 | ... | ... |
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoController.m
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | #import "QMUIKit.h" |
| 12 | 12 | |
| 13 | 13 | #import "CNUserInfoManager.h" |
| 14 | -#import "CNLiveServices.h" | |
| 14 | +//#import "CNLiveBServices.h" | |
| 15 | 15 | #import "CNLiveNavigationBar.h" |
| 16 | 16 | |
| 17 | 17 | #import "CNLiveUserInfoCell.h" |
| ... | ... | @@ -131,8 +131,7 @@ |
| 131 | 131 | switch (model.dataType) { |
| 132 | 132 | case CNLiveUserInfoDataTypeCode: |
| 133 | 133 | { |
| 134 | - id<CNLiveQrCodeServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveQrCodeServiceProtocol)]; | |
| 135 | - [service pushToMyQrCodeController:NO]; | |
| 134 | + | |
| 136 | 135 | } |
| 137 | 136 | break; |
| 138 | 137 | default: | ... | ... |
Example/CNLiveBMineModule.xcodeproj/project.pbxproj
| ... | ... | @@ -207,8 +207,8 @@ |
| 207 | 207 | 6003F586195388D20070C39A /* Sources */, |
| 208 | 208 | 6003F587195388D20070C39A /* Frameworks */, |
| 209 | 209 | 6003F588195388D20070C39A /* Resources */, |
| 210 | - 0736C861350FED0E8B7ED07D /* [CP] Embed Pods Frameworks */, | |
| 211 | - 03FA66881D6C81031648A678 /* [CP] Copy Pods Resources */, | |
| 210 | + 74D7B4BA2B5F765420699403 /* [CP] Embed Pods Frameworks */, | |
| 211 | + B4C8572D83613CAC1310A418 /* [CP] Copy Pods Resources */, | |
| 212 | 212 | ); |
| 213 | 213 | buildRules = ( |
| 214 | 214 | ); |
| ... | ... | @@ -299,29 +299,29 @@ |
| 299 | 299 | /* End PBXResourcesBuildPhase section */ |
| 300 | 300 | |
| 301 | 301 | /* Begin PBXShellScriptBuildPhase section */ |
| 302 | - 03FA66881D6C81031648A678 /* [CP] Copy Pods Resources */ = { | |
| 302 | + 2A8336772A36DEB07525BA2F /* [CP] Check Pods Manifest.lock */ = { | |
| 303 | 303 | isa = PBXShellScriptBuildPhase; |
| 304 | 304 | buildActionMask = 2147483647; |
| 305 | 305 | files = ( |
| 306 | 306 | ); |
| 307 | + inputFileListPaths = ( | |
| 308 | + ); | |
| 307 | 309 | inputPaths = ( |
| 308 | - "${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh", | |
| 309 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle", | |
| 310 | - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", | |
| 311 | - "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle", | |
| 310 | + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", | |
| 311 | + "${PODS_ROOT}/Manifest.lock", | |
| 312 | + ); | |
| 313 | + name = "[CP] Check Pods Manifest.lock"; | |
| 314 | + outputFileListPaths = ( | |
| 312 | 315 | ); |
| 313 | - name = "[CP] Copy Pods Resources"; | |
| 314 | 316 | outputPaths = ( |
| 315 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle", | |
| 316 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", | |
| 317 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", | |
| 317 | + "$(DERIVED_FILE_DIR)/Pods-CNLiveBMineModule_Example-checkManifestLockResult.txt", | |
| 318 | 318 | ); |
| 319 | 319 | runOnlyForDeploymentPostprocessing = 0; |
| 320 | 320 | shellPath = /bin/sh; |
| 321 | - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh\"\n"; | |
| 321 | + 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"; | |
| 322 | 322 | showEnvVarsInLog = 0; |
| 323 | 323 | }; |
| 324 | - 0736C861350FED0E8B7ED07D /* [CP] Embed Pods Frameworks */ = { | |
| 324 | + 74D7B4BA2B5F765420699403 /* [CP] Embed Pods Frameworks */ = { | |
| 325 | 325 | isa = PBXShellScriptBuildPhase; |
| 326 | 326 | buildActionMask = 2147483647; |
| 327 | 327 | files = ( |
| ... | ... | @@ -330,7 +330,7 @@ |
| 330 | 330 | "${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-frameworks.sh", |
| 331 | 331 | "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", |
| 332 | 332 | "${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework", |
| 333 | - "${BUILT_PRODUCTS_DIR}/CNLiveBEnvironment/CNLiveBEnvironment.framework", | |
| 333 | + "${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework", | |
| 334 | 334 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", |
| 335 | 335 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", |
| 336 | 336 | "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", |
| ... | ... | @@ -339,7 +339,6 @@ |
| 339 | 339 | "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", |
| 340 | 340 | "${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework", |
| 341 | 341 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", |
| 342 | - "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework", | |
| 343 | 342 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", |
| 344 | 343 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 345 | 344 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| ... | ... | @@ -357,13 +356,14 @@ |
| 357 | 356 | "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", |
| 358 | 357 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 359 | 358 | "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework", |
| 359 | + "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | |
| 360 | 360 | "${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework", |
| 361 | 361 | ); |
| 362 | 362 | name = "[CP] Embed Pods Frameworks"; |
| 363 | 363 | outputPaths = ( |
| 364 | 364 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", |
| 365 | 365 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework", |
| 366 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBEnvironment.framework", | |
| 366 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework", | |
| 367 | 367 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", |
| 368 | 368 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", |
| 369 | 369 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", |
| ... | ... | @@ -372,7 +372,6 @@ |
| 372 | 372 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", |
| 373 | 373 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework", |
| 374 | 374 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", |
| 375 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework", | |
| 376 | 375 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", |
| 377 | 376 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 378 | 377 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", |
| ... | ... | @@ -390,6 +389,7 @@ |
| 390 | 389 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", |
| 391 | 390 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 392 | 391 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework", |
| 392 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | |
| 393 | 393 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework", |
| 394 | 394 | ); |
| 395 | 395 | runOnlyForDeploymentPostprocessing = 0; |
| ... | ... | @@ -397,26 +397,28 @@ |
| 397 | 397 | shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-frameworks.sh\"\n"; |
| 398 | 398 | showEnvVarsInLog = 0; |
| 399 | 399 | }; |
| 400 | - 2A8336772A36DEB07525BA2F /* [CP] Check Pods Manifest.lock */ = { | |
| 400 | + B4C8572D83613CAC1310A418 /* [CP] Copy Pods Resources */ = { | |
| 401 | 401 | isa = PBXShellScriptBuildPhase; |
| 402 | 402 | buildActionMask = 2147483647; |
| 403 | 403 | files = ( |
| 404 | 404 | ); |
| 405 | - inputFileListPaths = ( | |
| 406 | - ); | |
| 407 | 405 | inputPaths = ( |
| 408 | - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", | |
| 409 | - "${PODS_ROOT}/Manifest.lock", | |
| 410 | - ); | |
| 411 | - name = "[CP] Check Pods Manifest.lock"; | |
| 412 | - outputFileListPaths = ( | |
| 406 | + "${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh", | |
| 407 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle", | |
| 408 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", | |
| 409 | + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.bundle", | |
| 410 | + "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle", | |
| 413 | 411 | ); |
| 412 | + name = "[CP] Copy Pods Resources"; | |
| 414 | 413 | outputPaths = ( |
| 415 | - "$(DERIVED_FILE_DIR)/Pods-CNLiveBMineModule_Example-checkManifestLockResult.txt", | |
| 414 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle", | |
| 415 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", | |
| 416 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveUserAgreementManager.bundle", | |
| 417 | + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", | |
| 416 | 418 | ); |
| 417 | 419 | runOnlyForDeploymentPostprocessing = 0; |
| 418 | 420 | shellPath = /bin/sh; |
| 419 | - 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"; | |
| 421 | + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh\"\n"; | |
| 420 | 422 | showEnvVarsInLog = 0; |
| 421 | 423 | }; |
| 422 | 424 | C07FCC71144256C0D7D38641 /* [CP] Check Pods Manifest.lock */ = { | ... | ... |
Example/CNLiveBMineModule/CNLIVEAppDelegate.m
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | // Override point for customization after application launch. |
| 37 | 37 | |
| 38 | 38 | self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; |
| 39 | - [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBusiness environmentType:CNLiveProductionAppStore]; | |
| 39 | + [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveProductionAppStore]; | |
| 40 | 40 | [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment]; |
| 41 | 41 | if ([CNUserShareManager isLogin]) { |
| 42 | 42 | [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid]; | ... | ... |