no message

zhangxiaowen
1 parent 813d89a9
Showing 4 changed files with 42 additions and 35 deletions
CNLiveBalanceModule.podspec
CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillController.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordController.m
Example/CNLiveBalanceModule.xcodeproj/project.pbxproj
@@ -84,13 +84,6 @@ 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
-  
   s.resource_bundles = {
     'CNLiveBalanceModule' => ['CNLiveBalanceModule/Assets/CNLiveBalanceModule.xcassets']
   }
@@ -64,9 +64,10 @@ static const CGFloat height = 60;
         if (error) {
             [self.data removeAllObjects];
             [self.tableView reloadData];
-            [self showEmptyViewWithImage:[UIImage imageNamed:@"wufalianjie"] text:error.localizedDescription detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
-            [self setCNAPIErrorEmptyView];
-            self.emptyView.verticalOffset = -(NavigationContentTop+height);
+            [self.tableView showEmptyViewWithType:CNLiveCustomTipsTypeLoadFail noData:self.data.count == 0 block:^{
+                [self.tableView.mj_header beginRefreshing];
+            }];
+            self.tableView.emptyView.top = 0;
             return;
         }
@@ -76,6 +77,8 @@ static const CGFloat height = 60;
                 [self.data removeAllObjects];
             }
             [self.data addObjectsFromArray:model.list];
+            [self.tableView showEmptyViewWithType:CNLiveCustomTipsTypeNoData noData:self.data.count == 0 block:nil];
+            self.tableView.emptyView.top = 0;
             [self.tableView reloadData];
         }
     }];
@@ -72,9 +72,10 @@ static const CGFloat height = 80;
         if (error) {
             [self.data removeAllObjects];
             [self.tableView reloadData];
-            [self showEmptyViewWithImage:[UIImage imageNamed:@"wufalianjie"] text:error.localizedDescription detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
-            [self setCNAPIErrorEmptyView];
-            self.emptyView.verticalOffset = -(NavigationContentTop+height);
+            [self.tableView showEmptyViewWithType:CNLiveCustomTipsTypeLoadFail noData:self.data.count == 0 block:^{
+                [self.tableView.mj_header beginRefreshing];
+            }];
+            self.tableView.emptyView.top = 0;
             return;
         }
@@ -84,6 +85,16 @@ static const CGFloat height = 80;
                 [self.data removeAllObjects];
             }
             [self.data addObjectsFromArray:self.type == TradingRecordTypeDefault?model.list:model.transferRecordList];
+//            UIImage *image = [self getImageWithImageName:@"cnlive_no_data" bundleName:@"CNLiveCategory" targetClass:[CNLiveEmptyView class]];
+//            [self.tableView showEmptyViewWithImage:image text:@"加载失败" buttonText:@"重新加载" noData:self.data.count == 0 block:^{
+//                [self.tableView.mj_header beginRefreshing];
+//
+//            }];
+            [self.tableView showEmptyViewWithType:CNLiveCustomTipsTypeNoData noData:self.data.count == 0 block:^{
+                [self.tableView.mj_header beginRefreshing];
+
+            }];
+            self.tableView.emptyView.top = 0;
             self.tradingRecordView.model = model;
             [self.tableView reloadData];
@@ -114,7 +125,7 @@ static const CGFloat height = 80;
     self.startTime = self.startTime?self.startTime:times.firstObject;
     self.endTime = self.endTime?self.endTime:times.lastObject;
     self.pageNo = 1;
-    
+
     [self.tableView.mj_header beginRefreshing];
 }
@@ -207,8 +207,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				D9364C82DD0EE796AF7084A4 /* [CP] Embed Pods Frameworks */,
-				B59B86F4A5A6E47AECF4CE6F /* [CP] Copy Pods Resources */,
+				3A0063CF6C529372DB2CB00A /* [CP] Embed Pods Frameworks */,
+				562D30DC483DBD077FFE17EC /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -321,25 +321,7 @@
 			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 */ = {
+		3A0063CF6C529372DB2CB00A /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -395,6 +377,24 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		562D30DC483DBD077FFE17EC /* [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;