iOS Team / CNLiveMineModule · Commits

Commit c8ae7d93714a51eda8e821b8fc853b98d2942639

Authored by zhangxiaowen
1 parent ba4e59bb

no message

Inline Side-by-side
Showing 3 changed files with 10 additions and 5 deletions
CNLiveMineModule.podspec
  View file @c8ae7d9
@@ -81,5 +81,8 @@ TODO: 网家家-我的模块. @@ -81,5 +81,8 @@ TODO: 网家家-我的模块.
81 81
82 # 二维码模块 82 # 二维码模块
83 s.dependency 'CNLiveQrCodeModule' 83 s.dependency 'CNLiveQrCodeModule'
  84 +
  85 + # 设置模块
  86 + s.dependency 'CNLiveSettingModule'
84 87
85 end 88 end
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
  View file @c8ae7d9
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 #import "CNLiveUserInfoController.h" 18 #import "CNLiveUserInfoController.h"
19 19
20 #import "CNLiveMyQrCodeController.h" 20 #import "CNLiveMyQrCodeController.h"
21 - 21 +#import "CNLiveSettingController.h"
22 22
23 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate> 23 @interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate>
24 @property (nonatomic, strong) UITableView *tableView; 24 @property (nonatomic, strong) UITableView *tableView;
@@ -242,8 +242,8 @@ static const NSInteger kHEIGHT = 250; @@ -242,8 +242,8 @@ static const NSInteger kHEIGHT = 250;
242 } 242 }
243 else if(tag == 10005){ 243 else if(tag == 10005){
244 // 设置 244 // 设置
245 -// XWSettingController *vc = [[XWSettingController alloc]init];  
246 -// [self.navigationController pushViewController:vc animated:YES]; 245 + CNLiveSettingController *vc = [[CNLiveSettingController alloc]init];
  246 + [self.navigationController pushViewController:vc animated:YES];
247 } 247 }
248 else if(tag == 10006){ 248 else if(tag == 10006){
249 //路径工具 249 //路径工具
Example/CNLiveMineModule.xcodeproj/project.pbxproj
  View file @c8ae7d9
@@ -229,7 +229,7 @@ @@ -229,7 +229,7 @@
229 6003F586195388D20070C39A /* Sources */, 229 6003F586195388D20070C39A /* Sources */,
230 6003F587195388D20070C39A /* Frameworks */, 230 6003F587195388D20070C39A /* Frameworks */,
231 6003F588195388D20070C39A /* Resources */, 231 6003F588195388D20070C39A /* Resources */,
232 - 0F54581AB8DB61CE975ACA9C /* [CP] Embed Pods Frameworks */, 232 + 7970BFE55EAFC7A3DDA56421 /* [CP] Embed Pods Frameworks */,
233 ); 233 );
234 buildRules = ( 234 buildRules = (
235 ); 235 );
@@ -320,7 +320,7 @@ @@ -320,7 +320,7 @@
320 /* End PBXResourcesBuildPhase section */ 320 /* End PBXResourcesBuildPhase section */
321 321
322 /* Begin PBXShellScriptBuildPhase section */ 322 /* Begin PBXShellScriptBuildPhase section */
323 - 0F54581AB8DB61CE975ACA9C /* [CP] Embed Pods Frameworks */ = { 323 + 7970BFE55EAFC7A3DDA56421 /* [CP] Embed Pods Frameworks */ = {
324 isa = PBXShellScriptBuildPhase; 324 isa = PBXShellScriptBuildPhase;
325 buildActionMask = 2147483647; 325 buildActionMask = 2147483647;
326 files = ( 326 files = (
@@ -333,6 +333,7 @@ @@ -333,6 +333,7 @@
333 "${BUILT_PRODUCTS_DIR}/CNLiveMineModule/CNLiveMineModule.framework", 333 "${BUILT_PRODUCTS_DIR}/CNLiveMineModule/CNLiveMineModule.framework",
334 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework", 334 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
335 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 335 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
  336 + "${BUILT_PRODUCTS_DIR}/CNLiveSettingModule/CNLiveSettingModule.framework",
336 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", 337 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
337 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 338 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
338 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 339 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
@@ -349,6 +350,7 @@ @@ -349,6 +350,7 @@
349 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMineModule.framework", 350 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMineModule.framework",
350 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework", 351 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
351 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 352 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
  353 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveSettingModule.framework",
352 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", 354 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
353 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 355 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
354 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 356 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",