Commit cf994e58fcb7f6e8963e80c473b81d39f140ed45

Authored by zhangxiaowen
1 parent bcd8f935

no message

CNLiveIntegralModule.podspec
@@ -100,5 +100,8 @@ TODO: 网家家-积分模块. @@ -100,5 +100,8 @@ TODO: 网家家-积分模块.
100 100
101 #类别 101 #类别
102 s.dependency 'CNLiveCategory' 102 s.dependency 'CNLiveCategory'
  103 +
  104 + #
  105 + s.dependency 'CNLiveCustomUI'
103 106
104 end 107 end
CNLiveIntegralModule/Classes/Controller/CNLiveIntegralDetailsController.m
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 #import "CNLiveEnvironment.h" 18 #import "CNLiveEnvironment.h"
19 #import "CNUserInfoManager.h" 19 #import "CNUserInfoManager.h"
20 #import "CNLiveUserAgreementManager.h" 20 #import "CNLiveUserAgreementManager.h"
  21 +#import "CNLiveRefreshFooter.h"
21 22
22 #import "CNLiveIntegralDetailsTableViewCell.h" 23 #import "CNLiveIntegralDetailsTableViewCell.h"
23 #import "CNLiveScoreModel.h" 24 #import "CNLiveScoreModel.h"
@@ -190,10 +191,15 @@ @@ -190,10 +191,15 @@
190 _tableView.showsHorizontalScrollIndicator = NO; 191 _tableView.showsHorizontalScrollIndicator = NO;
191 [_tableView registerClass:[CNLiveIntegralDetailsTableViewCell class] forCellReuseIdentifier:kCNLiveIntegralDetailsTableViewCell]; 192 [_tableView registerClass:[CNLiveIntegralDetailsTableViewCell class] forCellReuseIdentifier:kCNLiveIntegralDetailsTableViewCell];
192 __weak __typeof(self)weakSelf = self; 193 __weak __typeof(self)weakSelf = self;
193 - MJRefreshAutoNormalFooter *refreshView = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ 194 +// MJRefreshAutoNormalFooter *refreshView = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
  195 +// [weakSelf loadMoreData];
  196 +// }];
  197 +// _tableView.mj_footer = refreshView;
  198 + CNLiveRefreshFooter *footer = [CNLiveRefreshFooter footerWithRefreshingBlock:^{
194 [weakSelf loadMoreData]; 199 [weakSelf loadMoreData];
195 }]; 200 }];
196 - _tableView.mj_footer = refreshView; 201 +// footer.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
  202 + _tableView.mj_footer = footer;
197 } 203 }
198 return _tableView; 204 return _tableView;
199 } 205 }
Example/CNLiveIntegralModule.xcodeproj/project.pbxproj
@@ -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 - 1B2CDA104ACEC8B94E0E05EC /* [CP] Embed Pods Frameworks */, 210 + 7148D6BFD50DE630902E3EF2 /* [CP] Embed Pods Frameworks */,
211 ); 211 );
212 buildRules = ( 212 buildRules = (
213 ); 213 );
@@ -320,7 +320,7 @@ @@ -320,7 +320,7 @@
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"; 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";
321 showEnvVarsInLog = 0; 321 showEnvVarsInLog = 0;
322 }; 322 };
323 - 1B2CDA104ACEC8B94E0E05EC /* [CP] Embed Pods Frameworks */ = { 323 + 7148D6BFD50DE630902E3EF2 /* [CP] Embed Pods Frameworks */ = {
324 isa = PBXShellScriptBuildPhase; 324 isa = PBXShellScriptBuildPhase;
325 buildActionMask = 2147483647; 325 buildActionMask = 2147483647;
326 files = ( 326 files = (
@@ -332,6 +332,7 @@ @@ -332,6 +332,7 @@
332 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 332 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
333 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", 333 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
334 "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework", 334 "${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
  335 + "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
335 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 336 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
336 "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework", 337 "${BUILT_PRODUCTS_DIR}/CNLiveIntegralModule/CNLiveIntegralModule.framework",
337 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", 338 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
@@ -353,6 +354,7 @@ @@ -353,6 +354,7 @@
353 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 354 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
354 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", 355 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
355 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework", 356 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
  357 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
356 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 358 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
357 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework", 359 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIntegralModule.framework",
358 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", 360 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",