Commit 5c37b3b82b3d34d41c342118583ba382078c8831

Authored by zhangxiaowen
1 parent dabb460d

no message

CNLiveMineModule/Classes/Controller/CNLiveMineController.m
@@ -159,8 +159,8 @@ static const CGFloat timeValue = 1.5; @@ -159,8 +159,8 @@ static const CGFloat timeValue = 1.5;
159 break; 159 break;
160 case CNLiveMineHeaderViewTypeCode: 160 case CNLiveMineHeaderViewTypeCode:
161 { 161 {
162 - CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc]init];  
163 - [self.navigationController pushViewController:vc animated:YES]; 162 + id<CNLiveQrCodeServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveQrCodeServiceProtocol)];
  163 + [service pushToMyQrCodeController:NO];
164 } 164 }
165 break; 165 break;
166 case CNLiveMineHeaderViewTypeSign: 166 case CNLiveMineHeaderViewTypeSign:
@@ -288,11 +288,11 @@ static const CGFloat timeValue = 1.5; @@ -288,11 +288,11 @@ static const CGFloat timeValue = 1.5;
288 } 288 }
289 else if(tag == 10005){ 289 else if(tag == 10005){
290 // 设置 290 // 设置
291 - CNLiveSettingController *vc = [[CNLiveSettingController alloc]init];  
292 - [self.navigationController pushViewController:vc animated:YES]; 291 + id<CNLiveSettingServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveSettingServiceProtocol)];
  292 + [service pushToSettingViewController];
293 } 293 }
294 else if(tag == 10006){ 294 else if(tag == 10006){
295 - //路径工具 295 + // 路径工具
296 // XWOrdersController *vc = [[XWOrdersController alloc]init]; 296 // XWOrdersController *vc = [[XWOrdersController alloc]init];
297 // [self.navigationController pushViewController:vc animated:YES]; 297 // [self.navigationController pushViewController:vc animated:YES];
298 } 298 }
@@ -374,8 +374,8 @@ static const CGFloat timeValue = 1.5; @@ -374,8 +374,8 @@ static const CGFloat timeValue = 1.5;
374 374
375 #pragma mark - 响应方法 375 #pragma mark - 响应方法
376 - (void)soccerDidClicked:(UIButton *)btn{ 376 - (void)soccerDidClicked:(UIButton *)btn{
377 - CNLiveTaskListController *vc = [[CNLiveTaskListController alloc]init];  
378 - [self.navigationController pushViewController:vc animated:YES]; 377 + id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
  378 + [service pushToTaskListViewController];
379 } 379 }
380 380
381 /** 381 /**
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
@@ -11,12 +11,12 @@ @@ -11,12 +11,12 @@
11 #import "QMUIKit.h" 11 #import "QMUIKit.h"
12 12
13 #import "CNUserInfoManager.h" 13 #import "CNUserInfoManager.h"
  14 +#import "CNLiveServices.h"
14 15
15 #import "CNLiveUserInfoCell.h" 16 #import "CNLiveUserInfoCell.h"
16 #import "CNLiveUserInfoModel.h" 17 #import "CNLiveUserInfoModel.h"
17 #import "CNLiveInfoUpdateController.h" 18 #import "CNLiveInfoUpdateController.h"
18 #import "CNLiveUserInfoNotification.h" 19 #import "CNLiveUserInfoNotification.h"
19 -#import "CNLiveMyQrCodeController.h"  
20 #import "CNLiveUserInfoNavigationBar.h" 20 #import "CNLiveUserInfoNavigationBar.h"
21 21
22 @interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveInfoUpdateDelegate, CNLiveUserInfoNavigationBarDelegate>{ 22 @interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveInfoUpdateDelegate, CNLiveUserInfoNavigationBarDelegate>{
@@ -146,7 +146,6 @@ @@ -146,7 +146,6 @@
146 switch (model.dataType) { 146 switch (model.dataType) {
147 case CNLiveUserInfoDataTypeHead: 147 case CNLiveUserInfoDataTypeHead:
148 { 148 {
149 -// [self updateHeaderActionSheetView];  
150 CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model]; 149 CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
151 vc.delegate = self; 150 vc.delegate = self;
152 [self.navigationController pushViewController:vc animated:YES]; 151 [self.navigationController pushViewController:vc animated:YES];
@@ -166,8 +165,8 @@ @@ -166,8 +165,8 @@
166 break; 165 break;
167 case CNLiveUserInfoDataTypeCode: 166 case CNLiveUserInfoDataTypeCode:
168 { 167 {
169 - CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc]init];;  
170 - [self.navigationController pushViewController:vc animated:YES]; 168 + id<CNLiveQrCodeServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveQrCodeServiceProtocol)];
  169 + [service pushToMyQrCodeController:NO];
171 } 170 }
172 break; 171 break;
173 case CNLiveUserInfoDataTypeAddress: 172 case CNLiveUserInfoDataTypeAddress:
@@ -194,6 +193,18 @@ @@ -194,6 +193,18 @@
194 [self updateDataType:dataType info:info]; 193 [self updateDataType:dataType info:info];
195 } 194 }
196 195
  196 +// 更新cell展示信息
  197 +- (void)updateDataType:(CNLiveUserInfoDataType)dataType info:(NSString *)info{
  198 + for(CNLiveUserInfoModel *model in self.data){
  199 + if(dataType == model.dataType){
  200 + model.content = info;
  201 + break;
  202 + }
  203 + }
  204 + [self.tableView reloadData];
  205 +}
  206 +
  207 +#pragma mark - CNLiveUserInfoNavigationBarDelegate
197 - (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{ 208 - (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
198 if ([actionEvents isEqualToString:@"1"]) { 209 if ([actionEvents isEqualToString:@"1"]) {
199 [self goBack]; 210 [self goBack];
@@ -212,16 +223,6 @@ @@ -212,16 +223,6 @@
212 223
213 224
214 } 225 }
215 -// 更新cell展示信息  
216 -- (void)updateDataType:(CNLiveUserInfoDataType)dataType info:(NSString *)info{  
217 - for(CNLiveUserInfoModel *model in self.data){  
218 - if(dataType == model.dataType){  
219 - model.content = info;  
220 - break;  
221 - }  
222 - }  
223 - [self.tableView reloadData];  
224 -}  
225 226
226 #pragma mark - 懒加载 227 #pragma mark - 懒加载
227 - (CNLiveUserInfoNavigationBar *)navigationBar { 228 - (CNLiveUserInfoNavigationBar *)navigationBar {
Example/CNLiveMineModule.xcodeproj/project.pbxproj
@@ -234,8 +234,8 @@ @@ -234,8 +234,8 @@
234 6003F586195388D20070C39A /* Sources */, 234 6003F586195388D20070C39A /* Sources */,
235 6003F587195388D20070C39A /* Frameworks */, 235 6003F587195388D20070C39A /* Frameworks */,
236 6003F588195388D20070C39A /* Resources */, 236 6003F588195388D20070C39A /* Resources */,
237 - 2E3F32B2D2B892B11EBB1C63 /* [CP] Embed Pods Frameworks */,  
238 - 1E6224051C3016E67E3E81EE /* [CP] Copy Pods Resources */, 237 + 06FD919DAE83A07EEEEA0ACA /* [CP] Embed Pods Frameworks */,
  238 + 3E68B94E334E331D8947AD7E /* [CP] Copy Pods Resources */,
239 ); 239 );
240 buildRules = ( 240 buildRules = (
241 ); 241 );
@@ -326,27 +326,7 @@ @@ -326,27 +326,7 @@
326 /* End PBXResourcesBuildPhase section */ 326 /* End PBXResourcesBuildPhase section */
327 327
328 /* Begin PBXShellScriptBuildPhase section */ 328 /* Begin PBXShellScriptBuildPhase section */
329 - 1E6224051C3016E67E3E81EE /* [CP] Copy Pods Resources */ = {  
330 - isa = PBXShellScriptBuildPhase;  
331 - buildActionMask = 2147483647;  
332 - files = (  
333 - );  
334 - inputPaths = (  
335 - "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",  
336 - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",  
337 - "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",  
338 - );  
339 - name = "[CP] Copy Pods Resources";  
340 - outputPaths = (  
341 - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",  
342 - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",  
343 - );  
344 - runOnlyForDeploymentPostprocessing = 0;  
345 - shellPath = /bin/sh;  
346 - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";  
347 - showEnvVarsInLog = 0;  
348 - };  
349 - 2E3F32B2D2B892B11EBB1C63 /* [CP] Embed Pods Frameworks */ = { 329 + 06FD919DAE83A07EEEEA0ACA /* [CP] Embed Pods Frameworks */ = {
350 isa = PBXShellScriptBuildPhase; 330 isa = PBXShellScriptBuildPhase;
351 buildActionMask = 2147483647; 331 buildActionMask = 2147483647;
352 files = ( 332 files = (
@@ -365,6 +345,7 @@ @@ -365,6 +345,7 @@
365 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 345 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
366 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", 346 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
367 "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework", 347 "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework",
  348 + "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
368 "${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework", 349 "${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework",
369 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework", 350 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
370 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 351 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
@@ -398,6 +379,7 @@ @@ -398,6 +379,7 @@
398 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 379 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
399 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", 380 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
400 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework", 381 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework",
  382 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
401 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework", 383 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework",
402 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework", 384 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
403 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
@@ -422,6 +404,26 @@ @@ -422,6 +404,26 @@
422 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n"; 404 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n";
423 showEnvVarsInLog = 0; 405 showEnvVarsInLog = 0;
424 }; 406 };
  407 + 3E68B94E334E331D8947AD7E /* [CP] Copy Pods Resources */ = {
  408 + isa = PBXShellScriptBuildPhase;
  409 + buildActionMask = 2147483647;
  410 + files = (
  411 + );
  412 + inputPaths = (
  413 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh",
  414 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveMineModule/CNLiveMineModule.bundle",
  415 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
  416 + );
  417 + name = "[CP] Copy Pods Resources";
  418 + outputPaths = (
  419 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveMineModule.bundle",
  420 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
  421 + );
  422 + runOnlyForDeploymentPostprocessing = 0;
  423 + shellPath = /bin/sh;
  424 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-resources.sh\"\n";
  425 + showEnvVarsInLog = 0;
  426 + };
425 A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = { 427 A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = {
426 isa = PBXShellScriptBuildPhase; 428 isa = PBXShellScriptBuildPhase;
427 buildActionMask = 2147483647; 429 buildActionMask = 2147483647;