Commit 25d3a8d718077ccf20d26c2900d7bb58e19bd859

Authored by zhangxiaowen
1 parent e090737e

no message

CNLiveMineModule/Classes/Controller/CNLiveMineController.m
@@ -22,7 +22,11 @@ @@ -22,7 +22,11 @@
22 #import "CNLiveMyQrCodeController.h" 22 #import "CNLiveMyQrCodeController.h"
23 #import "CNLiveSettingController.h" 23 #import "CNLiveSettingController.h"
24 24
25 -@interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate> 25 +// 积分
  26 +#import "CNLiveTaskListController.h"
  27 +#import "CNLiveSignInView.h"
  28 +
  29 +@interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate,CNLiveSignInViewDelegate>
26 @property (nonatomic, strong) UITableView *tableView; 30 @property (nonatomic, strong) UITableView *tableView;
27 @property (nonatomic, weak) CNLiveMineHeaderView *headerView; 31 @property (nonatomic, weak) CNLiveMineHeaderView *headerView;
28 @property (nonatomic, strong) CNLiveMineNavigationBar *navigationBar; 32 @property (nonatomic, strong) CNLiveMineNavigationBar *navigationBar;
@@ -160,11 +164,16 @@ static const NSInteger kHEIGHT = 250; @@ -160,11 +164,16 @@ static const NSInteger kHEIGHT = 250;
160 164
161 } 165 }
162 break; 166 break;
163 -  
164 - default: 167 + case CNLiveMineHeaderViewTypeSign:
  168 + {
  169 + [CNLiveSignInView showSignInView:@"asd" scores:@"312" day:1 url:@"asd" delegate:self];
  170 + }
165 break; 171 break;
166 } 172 }
167 } 173 }
  174 +- (void)clickedrRulesButton:(CNLiveSignInView *)view{
  175 +
  176 +}
168 177
169 - (void)scrollViewDidScroll:(UIScrollView *)scrollView { 178 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
170 CGPoint point = scrollView.contentOffset; 179 CGPoint point = scrollView.contentOffset;
@@ -329,7 +338,8 @@ static const NSInteger kHEIGHT = 250; @@ -329,7 +338,8 @@ static const NSInteger kHEIGHT = 250;
329 338
330 #pragma mark - 响应方法 339 #pragma mark - 响应方法
331 - (void)soccerDidClicked:(UIButton *)btn{ 340 - (void)soccerDidClicked:(UIButton *)btn{
332 - 341 + CNLiveTaskListController *vc = [[CNLiveTaskListController alloc]init];
  342 + [self.navigationController pushViewController:vc animated:YES];
333 } 343 }
334 344
335 /** 345 /**
Example/CNLiveMineModule.xcodeproj/project.pbxproj
@@ -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 - A78AB9505BFFB31040E09CB9 /* [CP] Embed Pods Frameworks */, 232 + DFCE8E9B555773C3DDB56144 /* [CP] Embed Pods Frameworks */,
233 ); 233 );
234 buildRules = ( 234 buildRules = (
235 ); 235 );
@@ -320,7 +320,51 @@ @@ -320,7 +320,51 @@
320 /* End PBXResourcesBuildPhase section */ 320 /* End PBXResourcesBuildPhase section */
321 321
322 /* Begin PBXShellScriptBuildPhase section */ 322 /* Begin PBXShellScriptBuildPhase section */
323 - A78AB9505BFFB31040E09CB9 /* [CP] Embed Pods Frameworks */ = { 323 + A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = {
  324 + isa = PBXShellScriptBuildPhase;
  325 + buildActionMask = 2147483647;
  326 + files = (
  327 + );
  328 + inputFileListPaths = (
  329 + );
  330 + inputPaths = (
  331 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  332 + "${PODS_ROOT}/Manifest.lock",
  333 + );
  334 + name = "[CP] Check Pods Manifest.lock";
  335 + outputFileListPaths = (
  336 + );
  337 + outputPaths = (
  338 + "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Example-checkManifestLockResult.txt",
  339 + );
  340 + runOnlyForDeploymentPostprocessing = 0;
  341 + 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";
  343 + showEnvVarsInLog = 0;
  344 + };
  345 + BFE3DD8ECDF347EE483385B5 /* [CP] Check Pods Manifest.lock */ = {
  346 + isa = PBXShellScriptBuildPhase;
  347 + buildActionMask = 2147483647;
  348 + files = (
  349 + );
  350 + inputFileListPaths = (
  351 + );
  352 + inputPaths = (
  353 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  354 + "${PODS_ROOT}/Manifest.lock",
  355 + );
  356 + name = "[CP] Check Pods Manifest.lock";
  357 + outputFileListPaths = (
  358 + );
  359 + outputPaths = (
  360 + "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Tests-checkManifestLockResult.txt",
  361 + );
  362 + runOnlyForDeploymentPostprocessing = 0;
  363 + shellPath = /bin/sh;
  364 + 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";
  365 + showEnvVarsInLog = 0;
  366 + };
  367 + DFCE8E9B555773C3DDB56144 /* [CP] Embed Pods Frameworks */ = {
324 isa = PBXShellScriptBuildPhase; 368 isa = PBXShellScriptBuildPhase;
325 buildActionMask = 2147483647; 369 buildActionMask = 2147483647;
326 files = ( 370 files = (
@@ -333,6 +377,7 @@ @@ -333,6 +377,7 @@
333 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", 377 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
334 "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework", 378 "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
335 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 379 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  380 + "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework",
336 "${BUILT_PRODUCTS_DIR}/CNLiveMineModule/CNLiveMineModule.framework", 381 "${BUILT_PRODUCTS_DIR}/CNLiveMineModule/CNLiveMineModule.framework",
337 "${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework", 382 "${BUILT_PRODUCTS_DIR}/CNLiveMyOrderModule/CNLiveMyOrderModule.framework",
338 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework", 383 "${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
@@ -343,6 +388,7 @@ @@ -343,6 +388,7 @@
343 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", 388 "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
344 "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework", 389 "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
345 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", 390 "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
  391 + "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
346 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", 392 "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
347 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", 393 "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
348 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 394 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
@@ -357,6 +403,7 @@ @@ -357,6 +403,7 @@
357 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", 403 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
358 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework", 404 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
359 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 405 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  406 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework",
360 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMineModule.framework", 407 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMineModule.framework",
361 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework", 408 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveMyOrderModule.framework",
362 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework", 409 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
@@ -367,6 +414,7 @@ @@ -367,6 +414,7 @@
367 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", 414 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
368 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework", 415 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
369 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", 416 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
  417 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
370 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", 418 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
371 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", 419 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
372 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 420 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
@@ -378,50 +426,6 @@ @@ -378,50 +426,6 @@
378 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n"; 426 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveMineModule_Example/Pods-CNLiveMineModule_Example-frameworks.sh\"\n";
379 showEnvVarsInLog = 0; 427 showEnvVarsInLog = 0;
380 }; 428 };
381 - A9B5D0EFC5B6FCA241FAE929 /* [CP] Check Pods Manifest.lock */ = {  
382 - isa = PBXShellScriptBuildPhase;  
383 - buildActionMask = 2147483647;  
384 - files = (  
385 - );  
386 - inputFileListPaths = (  
387 - );  
388 - inputPaths = (  
389 - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",  
390 - "${PODS_ROOT}/Manifest.lock",  
391 - );  
392 - name = "[CP] Check Pods Manifest.lock";  
393 - outputFileListPaths = (  
394 - );  
395 - outputPaths = (  
396 - "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Example-checkManifestLockResult.txt",  
397 - );  
398 - runOnlyForDeploymentPostprocessing = 0;  
399 - shellPath = /bin/sh;  
400 - 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";  
401 - showEnvVarsInLog = 0;  
402 - };  
403 - BFE3DD8ECDF347EE483385B5 /* [CP] Check Pods Manifest.lock */ = {  
404 - isa = PBXShellScriptBuildPhase;  
405 - buildActionMask = 2147483647;  
406 - files = (  
407 - );  
408 - inputFileListPaths = (  
409 - );  
410 - inputPaths = (  
411 - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",  
412 - "${PODS_ROOT}/Manifest.lock",  
413 - );  
414 - name = "[CP] Check Pods Manifest.lock";  
415 - outputFileListPaths = (  
416 - );  
417 - outputPaths = (  
418 - "$(DERIVED_FILE_DIR)/Pods-CNLiveMineModule_Tests-checkManifestLockResult.txt",  
419 - );  
420 - runOnlyForDeploymentPostprocessing = 0;  
421 - shellPath = /bin/sh;  
422 - 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";  
423 - showEnvVarsInLog = 0;  
424 - };  
425 /* End PBXShellScriptBuildPhase section */ 429 /* End PBXShellScriptBuildPhase section */
426 430
427 /* Begin PBXSourcesBuildPhase section */ 431 /* Begin PBXSourcesBuildPhase section */