no message

zhangxiaowen
1 parent 9ca80b26
Showing 11 changed files with 119 additions and 110 deletions
CNLiveBalanceModule.podspec
CNLiveBalanceModule/Classes/Controller/CNLiveBalanceController.h
CNLiveBalanceModule/Classes/Controller/CNLiveBalanceController.m
CNLiveBalanceModule/Classes/Detail/CNLiveBalanceDetailController.m
CNLiveBalanceModule/Classes/PayCenter/CNLivePayCenterCell.m
CNLiveBalanceModule/Classes/PayCenter/CNLivePayCenterController.m
CNLiveBalanceModule/Classes/MonthBill/CNLiveMonthBillController.h → CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillController.h
CNLiveBalanceModule/Classes/MonthBill/CNLiveMonthBillController.m → CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillController.m
CNLiveBalanceModule/Classes/MonthBill/CNLiveMonthBillView.h → CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillView.h
CNLiveBalanceModule/Classes/MonthBill/CNLiveMonthBillView.m → CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillView.m
Example/CNLiveBalanceModule.xcodeproj/project.pbxproj
@@ -84,12 +84,12 @@ TODO: 网家家-余额模块.
       ss.dependency 'CNLiveBalanceModule/View'
   end
-  # MonthBill 月账单
-  s.subspec 'MonthBill' do |ss|
-      ss.source_files = 'CNLiveBalanceModule/Classes/MonthBill/*.{h,m}'
-      ss.dependency 'CNLiveBalanceModule/TradingRecord'
-      ss.dependency 'CNLiveBalanceModule/View'
-  end
+#  # MonthBill 月账单
+#  s.subspec 'MonthBill' do |ss|
+#      ss.source_files = 'CNLiveBalanceModule/Classes/MonthBill/*.{h,m}'
+#      ss.dependency 'CNLiveBalanceModule/TradingRecord'
+#      ss.dependency 'CNLiveBalanceModule/View'
+#  end
   s.resource_bundles = {
     'CNLiveBalanceModule' => ['CNLiveBalanceModule/Assets/CNLiveBalanceModule.xcassets']
@@ -20,6 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBalanceController : CNCommonViewController
 - (instancetype)initWithType:(NSString *)type ID:(NSString *)ID;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -32,6 +32,7 @@
 @end
 @implementation CNLiveBalanceController
+#pragma mark - 初始化
 - (instancetype)initWithType:(NSString *)type ID:(NSString *)ID{
     if(self = [super init]){
         self.type = type;
@@ -78,6 +79,37 @@
     return UIStatusBarStyleLightContent;
 }
+
+#pragma mark - CNLiveBalanceNavigationBarDelegate
+- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        [self goBack];
+        
+    }else if ([actionEvents isEqualToString:@"2"]){
+        
+        if ([self.type isEqualToString:@"1"]) { // 支付中心
+            CNLivePayCenterController *vc = [CNLivePayCenterController new];
+            [self.navigationController pushViewController:vc animated:YES];
+            
+        } else if ([self.type isEqualToString:@"2"]) { // 明细
+            CNLiveBalanceDetailController *vc = [CNLiveBalanceDetailController new];
+            vc.ID = self.ID;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+    
+    }
+}
+
+#pragma mark - 响应方法
+- (void)goBack {
+    if (self.presentingViewController != nil) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
+    else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
 #pragma mark - 懒加载
 - (CNLiveBalanceNavigationBar *)navigationBar {
     if (!_navigationBar) {
@@ -105,34 +137,4 @@
     return _balanceView;
 }
-#pragma mark - 响应方法
-- (void)goBack {
-    if (self.presentingViewController != nil) {
-        [self dismissViewControllerAnimated:YES completion:nil];
-    }
-    else {
-        [self.navigationController popViewControllerAnimated:YES];
-    }
-}
-
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-        
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-        if ([self.type isEqualToString:@"1"]) { // 支付中心
-            CNLivePayCenterController *vc = [CNLivePayCenterController new];
-            [self.navigationController pushViewController:vc animated:YES];
-            
-        } else if ([self.type isEqualToString:@"2"]) { // 明细
-            CNLiveBalanceDetailController *vc = [CNLiveBalanceDetailController new];
-            vc.ID = self.ID;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
-    
-    }
-}
-
 @end
@@ -44,7 +44,6 @@ static const CGFloat height = 44;
     else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
-
     [self createSubViews];
 }
@@ -74,27 +73,9 @@ static const CGFloat height = 44;
     return _navigationBar;
 }
-#pragma mark - 响应方法
-- (void)goBack {
-    if (self.presentingViewController != nil) {
-        [self dismissViewControllerAnimated:YES completion:nil];
-    }
-    else {
-        [self.navigationController popViewControllerAnimated:YES];
-    }
-}
-
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-        
-    }
-}
 #pragma mark - JXCategoryViewDelegate
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     //侧滑手势处理
-
 }
 #pragma mark - JXCategoryListContainerViewDelegate
@@ -109,6 +90,24 @@ static const CGFloat height = 44;
     return self.titles.count;
 }
+#pragma mark - CNLiveBalanceNavigationBarDelegate
+- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        [self goBack];
+        
+    }
+}
+
+#pragma mark - 响应方法
+- (void)goBack {
+    if (self.presentingViewController != nil) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
+    else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
 #pragma mark - 懒加载
 - (UIView *)tline {
     if (!_tline) {
@@ -23,7 +23,7 @@
 @implementation CNLivePayCenterCell
 static const NSInteger margin = 12;
-
+#pragma mark - 初始化
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
@@ -36,12 +36,6 @@ static const NSInteger margin = 12;
     }
     return self;
 }
-- (void)setModel:(CNLiveBalanceModel *)model{
-    _model = model;
-    _title.text = model.title;
-    [self xw_layoutSubviews];
-
-}
 - (void)xw_layoutSubviews{
@@ -70,6 +64,14 @@ static const NSInteger margin = 12;
 }
+#pragma mark - 数据
+- (void)setModel:(CNLiveBalanceModel *)model{
+    _model = model;
+    _title.text = model.title;
+    [self xw_layoutSubviews];
+
+}
+
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
@@ -143,6 +143,7 @@
     }
     return _tableView;
 }
+
 #pragma mark - 响应方法
 - (void)goBack {
     if (self.presentingViewController != nil) {
@@ -15,8 +15,7 @@
 @interface CNLiveMonthBillController : CNCommonViewController
 - (instancetype)initWithDate:(NSString *)date startTime:(NSString *)startTime endTime:(NSString *)endTime;
-@property (nonatomic, copy) NSString *date;
-@property (nonatomic, copy) NSString *startTime;
-@property (nonatomic, copy) NSString *endTime;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
 @end
@@ -32,17 +32,20 @@
 @property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveMonthBillView *monthBillView;
 @property (nonatomic, strong) UITableView *tableView;
-
 @property (nonatomic, strong) NSMutableArray *data;
 @property (nonatomic, assign) NSInteger pageNo;
-
 @property (nonatomic, copy) NSString *type;
+@property (nonatomic, copy) NSString *date;
+@property (nonatomic, copy) NSString *startTime;
+@property (nonatomic, copy) NSString *endTime;
+
 @end
 @implementation CNLiveMonthBillController
 static const CGFloat height = 60;
+#pragma mark - 初始化
 - (instancetype)initWithDate:(NSString *)date startTime:(NSString *)startTime endTime:(NSString *)endTime{
     if(self = [super init]){
         self.date = date;
@@ -207,8 +207,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				04DAF2C133B9CFF22FDE1366 /* [CP] Embed Pods Frameworks */,
-				CDA0F25F90257941F752081C /* [CP] Copy Pods Resources */,
+				D9364C82DD0EE796AF7084A4 /* [CP] Embed Pods Frameworks */,
+				B59B86F4A5A6E47AECF4CE6F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -299,7 +299,47 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		04DAF2C133B9CFF22FDE1366 /* [CP] Embed Pods Frameworks */ = {
+		23C1ED5A0D9008CEAD156961 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-CNLiveBalanceModule_Tests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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";
+			showEnvVarsInLog = 0;
+		};
+		B59B86F4A5A6E47AECF4CE6F /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBalanceModule/CNLiveBalanceModule.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBalanceModule.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		D9364C82DD0EE796AF7084A4 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -355,46 +395,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		23C1ED5A0D9008CEAD156961 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-CNLiveBalanceModule_Tests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			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";
-			showEnvVarsInLog = 0;
-		};
-		CDA0F25F90257941F752081C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBalanceModule/CNLiveBalanceModule.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBalanceModule.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E8746ACFF48907801CC338D9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;