Commit cf09a88978f4ecc2f760b144cf3a187261e3c2ab

Authored by zhangxiaowen
1 parent 5ecb3d98

no message

CNLiveMineModule.podspec
@@ -107,6 +107,9 @@ TODO: 网家家-我的模块. @@ -107,6 +107,9 @@ TODO: 网家家-我的模块.
107 # 我的收藏模块 107 # 我的收藏模块
108 s.dependency 'CNLiveCollectionModule' 108 s.dependency 'CNLiveCollectionModule'
109 109
  110 + # 余额模块
  111 + s.dependency 'CNLiveBalanceModule'
  112 +
110 s.static_framework = true 113 s.static_framework = true
111 114
112 end 115 end
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
@@ -307,8 +307,8 @@ static const CGFloat timeValue = 1.5; @@ -307,8 +307,8 @@ static const CGFloat timeValue = 1.5;
307 } 307 }
308 else if(item == 1){ 308 else if(item == 1){
309 // 余额 309 // 余额
310 -// XWBalanceController *vc = [[XWBalanceController alloc]init];  
311 -// [self.navigationController pushViewController:vc animated:YES]; 310 + id<CNLiveBalanceServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveBalanceServiceProtocol)];
  311 + [service pushToBalanceViewControllerWithType:@"1" ID:CNUserShareModel.uid];
312 } 312 }
313 else if(item == 2){ 313 else if(item == 2){
314 // 收藏 314 // 收藏
Example/CNLiveMineModule.xcodeproj/project.pbxproj
@@ -239,8 +239,8 @@ @@ -239,8 +239,8 @@
239 6003F586195388D20070C39A /* Sources */, 239 6003F586195388D20070C39A /* Sources */,
240 6003F587195388D20070C39A /* Frameworks */, 240 6003F587195388D20070C39A /* Frameworks */,
241 6003F588195388D20070C39A /* Resources */, 241 6003F588195388D20070C39A /* Resources */,
242 - 5CDC9A122E4CCAC5E76499EE /* [CP] Embed Pods Frameworks */,  
243 - 5E3EA8922032481FC54324FD /* [CP] Copy Pods Resources */, 242 + 9C617276F47F3FC49C8F7020 /* [CP] Embed Pods Frameworks */,
  243 + 61F033546F1DCE01F4758FDD /* [CP] Copy Pods Resources */,
244 ); 244 );
245 buildRules = ( 245 buildRules = (
246 ); 246 );
@@ -331,7 +331,33 @@ @@ -331,7 +331,33 @@
331 /* End PBXResourcesBuildPhase section */ 331 /* End PBXResourcesBuildPhase section */
332 332
333 /* Begin PBXShellScriptBuildPhase section */ 333 /* Begin PBXShellScriptBuildPhase section */
334 - 5CDC9A122E4CCAC5E76499EE /* [CP] Embed Pods Frameworks */ = { 334 + 61F033546F1DCE01F4758FDD /* [CP] Copy Pods Resources */ = {
  335 + isa = PBXShellScriptBuildPhase;
  336 + buildActionMask = 2147483647;
  337 + files = (
  338 + );
  339 + inputPaths = (
  340 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",
  341 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBalanceModule/CNLiveBalanceModule.bundle",
  342 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",
  343 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle",
  344 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle",
  345 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
  346 + );
  347 + name = "[CP] Copy Pods Resources";
  348 + outputPaths = (
  349 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBalanceModule.bundle",
  350 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",
  351 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle",
  352 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle",
  353 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
  354 + );
  355 + runOnlyForDeploymentPostprocessing = 0;
  356 + shellPath = /bin/sh;
  357 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";
  358 + showEnvVarsInLog = 0;
  359 + };
  360 + 9C617276F47F3FC49C8F7020 /* [CP] Embed Pods Frameworks */ = {
335 isa = PBXShellScriptBuildPhase; 361 isa = PBXShellScriptBuildPhase;
336 buildActionMask = 2147483647; 362 buildActionMask = 2147483647;
337 files = ( 363 files = (
@@ -374,6 +400,8 @@ @@ -374,6 +400,8 @@
374 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 400 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
375 "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework", 401 "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
376 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", 402 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
  403 + "${BUILT_PRODUCTS_DIR}/PGDatePicker/PGDatePicker.framework",
  404 + "${BUILT_PRODUCTS_DIR}/PGPickerView/PGPickerView.framework",
377 "${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework", 405 "${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
378 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", 406 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
379 "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", 407 "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
@@ -422,6 +450,8 @@ @@ -422,6 +450,8 @@
422 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 450 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
423 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework", 451 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
424 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", 452 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
  453 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGDatePicker.framework",
  454 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PGPickerView.framework",
425 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework", 455 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
426 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", 456 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
427 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", 457 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
@@ -437,30 +467,6 @@ @@ -437,30 +467,6 @@
437 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n"; 467 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n";
438 showEnvVarsInLog = 0; 468 showEnvVarsInLog = 0;
439 }; 469 };
440 - 5E3EA8922032481FC54324FD /* [CP] Copy Pods Resources */ = {  
441 - isa = PBXShellScriptBuildPhase;  
442 - buildActionMask = 2147483647;  
443 - files = (  
444 - );  
445 - inputPaths = (  
446 - "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",  
447 - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",  
448 - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.bundle",  
449 - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle",  
450 - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",  
451 - );  
452 - name = "[CP] Copy Pods Resources";  
453 - outputPaths = (  
454 - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",  
455 - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMyOrderModule.bundle",  
456 - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle",  
457 - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",  
458 - );  
459 - runOnlyForDeploymentPostprocessing = 0;  
460 - shellPath = /bin/sh;  
461 - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";  
462 - showEnvVarsInLog = 0;  
463 - };  
464 A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = { 470 A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = {
465 isa = PBXShellScriptBuildPhase; 471 isa = PBXShellScriptBuildPhase;
466 buildActionMask = 2147483647; 472 buildActionMask = 2147483647;
Example/CNLiveMineModule/CNLIVEAppDelegate.m
@@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
19 { 19 {
20 // Override point for customization after application launch. 20 // Override point for customization after application launch.
21 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; 21 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
22 - [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];  
23 -// [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore]; 22 +// [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];
  23 + [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
24 [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment]; 24 [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
25 if ([CNUserShareManager isLogin]) { 25 if ([CNUserShareManager isLogin]) {
26 [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid]; 26 [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid];