iOS Team / CNLiveSettingModule · Commits

Commit 9c81c7916379eb5f8bdc9a0270af9b5263da7d28

Authored by zhangxiaowen
1 parent 1596bd19

no message

Inline Side-by-side
Showing 2 changed files with 37 additions and 48 deletions
CNLiveSettingModule/Classes/Module/CNLiveSettingService.m
  View file @9c81c79
@@ -10,32 +10,21 @@ @@ -10,32 +10,21 @@
10 #import "CNLiveServices.h" 10 #import "CNLiveServices.h"
11 #import "CNLiveSettingController.h" 11 #import "CNLiveSettingController.h"
12 12
13 -@BeeHiveService(CNLiveMineServiceProtocol,CNLiveSettingService)  
14 -@interface CNLiveSettingService ()<CNLiveMineServiceProtocol> 13 +@BeeHiveService(CNLiveSettingServiceProtocol,CNLiveSettingService)
  14 +@interface CNLiveSettingService ()<CNLiveSettingServiceProtocol>
15 15
16 @end 16 @end
17 17
18 @implementation CNLiveSettingService 18 @implementation CNLiveSettingService
19 19
20 // 设置 20 // 设置
21 -- (UIViewController *)getMineViewController { 21 +- (UIViewController *)getSettingViewController {
22 return [CNLiveSettingController new]; 22 return [CNLiveSettingController new];
23 } 23 }
24 24
25 -- (void)pushToMineViewController { 25 +- (void)pushToSettingViewController {
26 CNLiveSettingController *vc = [[CNLiveSettingController alloc]init]; 26 CNLiveSettingController *vc = [[CNLiveSettingController alloc]init];
27 // [CNLivePageJumpManager pushViewController:vc]; 27 // [CNLivePageJumpManager pushViewController:vc];
28 } 28 }
29 29
30 -  
31 -  
32 -  
33 -// 积分  
34 -// 目击者  
35 -// 订单  
36 -// 余额  
37 -// 我的收藏  
38 -// 设置  
39 -  
40 -  
41 @end 30 @end
Example/CNLiveSettingModule.xcodeproj/project.pbxproj
  View file @9c81c79
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
207 6003F586195388D20070C39A /* Sources */, 207 6003F586195388D20070C39A /* Sources */,
208 6003F587195388D20070C39A /* Frameworks */, 208 6003F587195388D20070C39A /* Frameworks */,
209 6003F588195388D20070C39A /* Resources */, 209 6003F588195388D20070C39A /* Resources */,
210 - CF894FF382F663F823338760 /* [CP] Embed Pods Frameworks */, 210 + 2D88B1C7BEEC9344BC0B7E97 /* [CP] Embed Pods Frameworks */,
211 ); 211 );
212 buildRules = ( 212 buildRules = (
213 ); 213 );
@@ -298,29 +298,39 @@ @@ -298,29 +298,39 @@
298 /* End PBXResourcesBuildPhase section */ 298 /* End PBXResourcesBuildPhase section */
299 299
300 /* Begin PBXShellScriptBuildPhase section */ 300 /* Begin PBXShellScriptBuildPhase section */
301 - 653FED99FAD33AD7306D3799 /* [CP] Check Pods Manifest.lock */ = { 301 + 2D88B1C7BEEC9344BC0B7E97 /* [CP] Embed Pods Frameworks */ = {
302 isa = PBXShellScriptBuildPhase; 302 isa = PBXShellScriptBuildPhase;
303 buildActionMask = 2147483647; 303 buildActionMask = 2147483647;
304 files = ( 304 files = (
305 ); 305 );
306 - inputFileListPaths = (  
307 - );  
308 inputPaths = ( 306 inputPaths = (
309 - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",  
310 - "${PODS_ROOT}/Manifest.lock",  
311 - );  
312 - name = "[CP] Check Pods Manifest.lock";  
313 - outputFileListPaths = ( 307 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-frameworks.sh",
  308 + "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
  309 + "${BUILT_PRODUCTS_DIR}/CNLiveSettingModule/CNLiveSettingModule.framework",
  310 + "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
  311 + "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
  312 + "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
  313 + "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
  314 + "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
  315 + "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
314 ); 316 );
  317 + name = "[CP] Embed Pods Frameworks";
315 outputPaths = ( 318 outputPaths = (
316 - "$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Tests-checkManifestLockResult.txt", 319 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
  320 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveSettingModule.framework",
  321 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
  322 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
  323 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
  324 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
  325 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
  326 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
317 ); 327 );
318 runOnlyForDeploymentPostprocessing = 0; 328 runOnlyForDeploymentPostprocessing = 0;
319 shellPath = /bin/sh; 329 shellPath = /bin/sh;
320 - 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"; 330 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-frameworks.sh\"\n";
321 showEnvVarsInLog = 0; 331 showEnvVarsInLog = 0;
322 }; 332 };
323 - B63C2143E7B1CC8A1F17474A /* [CP] Check Pods Manifest.lock */ = { 333 + 653FED99FAD33AD7306D3799 /* [CP] Check Pods Manifest.lock */ = {
324 isa = PBXShellScriptBuildPhase; 334 isa = PBXShellScriptBuildPhase;
325 buildActionMask = 2147483647; 335 buildActionMask = 2147483647;
326 files = ( 336 files = (
@@ -335,43 +345,33 @@ @@ -335,43 +345,33 @@
335 outputFileListPaths = ( 345 outputFileListPaths = (
336 ); 346 );
337 outputPaths = ( 347 outputPaths = (
338 - "$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Example-checkManifestLockResult.txt", 348 + "$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Tests-checkManifestLockResult.txt",
339 ); 349 );
340 runOnlyForDeploymentPostprocessing = 0; 350 runOnlyForDeploymentPostprocessing = 0;
341 shellPath = /bin/sh; 351 shellPath = /bin/sh;
342 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"; 352 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";
343 showEnvVarsInLog = 0; 353 showEnvVarsInLog = 0;
344 }; 354 };
345 - CF894FF382F663F823338760 /* [CP] Embed Pods Frameworks */ = { 355 + B63C2143E7B1CC8A1F17474A /* [CP] Check Pods Manifest.lock */ = {
346 isa = PBXShellScriptBuildPhase; 356 isa = PBXShellScriptBuildPhase;
347 buildActionMask = 2147483647; 357 buildActionMask = 2147483647;
348 files = ( 358 files = (
349 ); 359 );
  360 + inputFileListPaths = (
  361 + );
350 inputPaths = ( 362 inputPaths = (
351 - "${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-frameworks.sh",  
352 - "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",  
353 - "${BUILT_PRODUCTS_DIR}/CNLiveSettingModule/CNLiveSettingModule.framework",  
354 - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",  
355 - "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",  
356 - "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",  
357 - "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",  
358 - "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",  
359 - "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 363 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  364 + "${PODS_ROOT}/Manifest.lock",
  365 + );
  366 + name = "[CP] Check Pods Manifest.lock";
  367 + outputFileListPaths = (
360 ); 368 );
361 - name = "[CP] Embed Pods Frameworks";  
362 outputPaths = ( 369 outputPaths = (
363 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",  
364 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveSettingModule.framework",  
365 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",  
366 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",  
367 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",  
368 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",  
369 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",  
370 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 370 + "$(DERIVED_FILE_DIR)/Pods-CNLiveSettingModule_Example-checkManifestLockResult.txt",
371 ); 371 );
372 runOnlyForDeploymentPostprocessing = 0; 372 runOnlyForDeploymentPostprocessing = 0;
373 shellPath = /bin/sh; 373 shellPath = /bin/sh;
374 - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-frameworks.sh\"\n"; 374 + 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";
375 showEnvVarsInLog = 0; 375 showEnvVarsInLog = 0;
376 }; 376 };
377 /* End PBXShellScriptBuildPhase section */ 377 /* End PBXShellScriptBuildPhase section */