学丽 5 years ago
parent
commit
d6eea704c6

+ 138 - 24
KuDianProject.xcodeproj/project.pbxproj

@@ -56,8 +56,6 @@
56 56
 		76D7942622CDD3CB00C2ECFA /* UINavigationController+FDFullscreenPopGesture.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7941B22CDD3CA00C2ECFA /* UINavigationController+FDFullscreenPopGesture.m */; };
57 57
 		76D7942722CDD3CB00C2ECFA /* UIImageView+CornerRadius.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7941E22CDD3CA00C2ECFA /* UIImageView+CornerRadius.m */; };
58 58
 		76D7942822CDD3CB00C2ECFA /* UIView+Gradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7941F22CDD3CA00C2ECFA /* UIView+Gradient.m */; };
59
-		76D7942922CDD3CB00C2ECFA /* UIButton+WSLTitleImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7942122CDD3CA00C2ECFA /* UIButton+WSLTitleImage.m */; };
60
-		76D7942A22CDD3CB00C2ECFA /* UITableViewCell+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7942322CDD3CB00C2ECFA /* UITableViewCell+Extension.m */; };
61 59
 		76D7942B22CDD3CB00C2ECFA /* UICollectionViewCell+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7942422CDD3CB00C2ECFA /* UICollectionViewCell+Extension.m */; };
62 60
 		76D7942E22CDD3FC00C2ECFA /* UIView+JZExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7942C22CDD3FC00C2ECFA /* UIView+JZExtension.m */; };
63 61
 		76D7943122CDD7D600C2ECFA /* KDPHeightTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7943022CDD7D600C2ECFA /* KDPHeightTool.m */; };
@@ -97,6 +95,8 @@
97 95
 		C5AAE31622D85A140080DFBE /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5AAE31522D85A140080DFBE /* CoreMotion.framework */; };
98 96
 		C5AAE31C22D86F5A0080DFBE /* UIView+BABadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AAE31822D86F5A0080DFBE /* UIView+BABadgeView.m */; };
99 97
 		C5AAE31D22D86F5A0080DFBE /* BABadgeLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AAE31922D86F5A0080DFBE /* BABadgeLabel.m */; };
98
+		C5AAE31E22D87B240080DFBE /* UIColor+KDPColor.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5624C22CD9FBC0035A714 /* UIColor+KDPColor.m */; };
99
+		C5AAE31F22D87BAF0080DFBE /* UIButton+WSLTitleImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 76D7942122CDD3CA00C2ECFA /* UIButton+WSLTitleImage.m */; };
100 100
 		C5BAD0AF22D42EBA0084663A /* KDPCollectHistoryVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0AE22D42EBA0084663A /* KDPCollectHistoryVC.m */; };
101 101
 		C5BAD0B222D42ECA0084663A /* KDPIDViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0B122D42ECA0084663A /* KDPIDViewController.m */; };
102 102
 		C5BAD0B522D42ED50084663A /* KDPSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BAD0B422D42ED50084663A /* KDPSetViewController.m */; };
@@ -129,7 +129,6 @@
129 129
 		C5D5621422CD97860035A714 /* KuDianProjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5621322CD97860035A714 /* KuDianProjectTests.m */; };
130 130
 		C5D5621F22CD97860035A714 /* KuDianProjectUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5621E22CD97860035A714 /* KuDianProjectUITests.m */; };
131 131
 		C5D5624922CD9F350035A714 /* KDPMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5624822CD9F350035A714 /* KDPMainViewController.m */; };
132
-		C5D5624D22CD9FBC0035A714 /* UIColor+KDPColor.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5624C22CD9FBC0035A714 /* UIColor+KDPColor.m */; };
133 132
 		C5D5625022CDA1140035A714 /* KDPTopViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5624F22CDA1140035A714 /* KDPTopViewController.m */; };
134 133
 		C5D5625322CDA12F0035A714 /* KDPEarnViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5625222CDA12F0035A714 /* KDPEarnViewController.m */; };
135 134
 		C5D5625622CDC8A60035A714 /* KDPNetworkRequestHTTP.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D5625522CDC8A60035A714 /* KDPNetworkRequestHTTP.m */; };
@@ -1300,6 +1299,8 @@
1300 1299
 			isa = PBXSourcesBuildPhase;
1301 1300
 			buildActionMask = 2147483647;
1302 1301
 			files = (
1302
+				C5AAE31F22D87BAF0080DFBE /* UIButton+WSLTitleImage.m in Sources */,
1303
+				C5AAE31E22D87B240080DFBE /* UIColor+KDPColor.m in Sources */,
1303 1304
 				C5BAD0C122D4482F0084663A /* KDPHistoryListCell.m in Sources */,
1304 1305
 				C5BAD0C722D461420084663A /* WYWeakScriptMessageDelegate.m in Sources */,
1305 1306
 				C53FD3EF22D31C3300687706 /* KDPAccountVC.m in Sources */,
@@ -1325,13 +1326,11 @@
1325 1326
 				C5BEABD522D8296600FE0CF3 /* KDPOrderTitleCell.m in Sources */,
1326 1327
 				76D7941322CDCC9C00C2ECFA /* KDPLiveDataViewController.m in Sources */,
1327 1328
 				764A24BF22D32CBC009B3891 /* KDPWebViewViewController.m in Sources */,
1328
-				76D7942922CDD3CB00C2ECFA /* UIButton+WSLTitleImage.m in Sources */,
1329 1329
 				764A24E522D489F6009B3891 /* KDPLiveRightTableViewCell.m in Sources */,
1330 1330
 				764A24D022D43F05009B3891 /* KDPAccountModel.m in Sources */,
1331 1331
 				7662960522D73F6C00B2C0DB /* KDPNoticeViewController.m in Sources */,
1332 1332
 				C53FD3F522D31C8900687706 /* KDPUserInfoVC.m in Sources */,
1333 1333
 				C53FD3FB22D3361F00687706 /* KDPForecastListCell.m in Sources */,
1334
-				76D7942922CDD3CB00C2ECFA /* UIButton+WSLTitleImage.m in Sources */,
1335 1334
 				76D6EE8122D587D300E7AC1C /* KDPSearchViewController.m in Sources */,
1336 1335
 				C5BAD0CD22D46E150084663A /* KDPDetailGoodInformationView.m in Sources */,
1337 1336
 				7662960E22D8233600B2C0DB /* KDPMainNavViewController.m in Sources */,
@@ -1352,7 +1351,6 @@
1352 1351
 				C5D5625022CDA1140035A714 /* KDPTopViewController.m in Sources */,
1353 1352
 				C5D5620A22CD97860035A714 /* main.m in Sources */,
1354 1353
 				76D7945722D2E3EB00C2ECFA /* KDPScreenBtnView.m in Sources */,
1355
-				76D7942A22CDD3CB00C2ECFA /* UITableViewCell+Extension.m in Sources */,
1356 1354
 				764A24E222D47CEC009B3891 /* KDPLiveRightHeaderView.m in Sources */,
1357 1355
 				764A24D922D46B2E009B3891 /* KDPLiveLeftViewController.m in Sources */,
1358 1356
 				76D6EE7422D4A7D600E7AC1C /* KDPSupplyContentViewController.m in Sources */,
@@ -1360,7 +1358,6 @@
1360 1358
 				76D6EE7122D4A7A100E7AC1C /* KDPTabBarVC.m in Sources */,
1361 1359
 				C5BAD0BE22D441A70084663A /* KDPWebInteractionVC.m in Sources */,
1362 1360
 				76D6EE9C22D5D53B00E7AC1C /* KDPLiveDetailModel.m in Sources */,
1363
-				76D7942A22CDD3CB00C2ECFA /* UITableViewCell+Extension.m in Sources */,
1364 1361
 				C5BAD0E622D49AC80084663A /* KDPIDTipView.m in Sources */,
1365 1362
 				C53FD3F222D31C5500687706 /* KDPAccountListCell.m in Sources */,
1366 1363
 				C5BAD0D022D46E270084663A /* KDPSellingPointView.m in Sources */,
@@ -1389,7 +1386,6 @@
1389 1386
 				C5BAD0BB22D441910084663A /* KDPWebVC.m in Sources */,
1390 1387
 				76D7942522CDD3CB00C2ECFA /* UINavigationBar+handle.m in Sources */,
1391 1388
 				764A24DC22D46C2F009B3891 /* KDPLiveLeftTableViewCell.m in Sources */,
1392
-				C5D5624D22CD9FBC0035A714 /* UIColor+KDPColor.m in Sources */,
1393 1389
 				76D7944E22CDEBC000C2ECFA /* KDPSupplyContentReusableView.m in Sources */,
1394 1390
 				C5BAD0D322D46E300084663A /* KDPShopView.m in Sources */,
1395 1391
 				76D7942622CDD3CB00C2ECFA /* UINavigationController+FDFullscreenPopGesture.m in Sources */,
@@ -1408,7 +1404,6 @@
1408 1404
 				C5BAD0DA22D47DD60084663A /* KDPTodayLiveDataVC.m in Sources */,
1409 1405
 				C5AAE2F122D850C70080DFBE /* KDPServiceView.m in Sources */,
1410 1406
 				C5BAD0B522D42ED50084663A /* KDPSetViewController.m in Sources */,
1411
-				C5D5624D22CD9FBC0035A714 /* UIColor+KDPColor.m in Sources */,
1412 1407
 				C53FD40422D34DBD00687706 /* KDPDrawerListCell.m in Sources */,
1413 1408
 				C5BAD0E022D4845B0084663A /* KDPTodayListCell.m in Sources */,
1414 1409
 				76D6EEA222D6D83A00E7AC1C /* KDPSupplyListViewController.m in Sources */,
@@ -1591,18 +1586,13 @@
1591 1586
 			baseConfigurationReference = 23D7D3060F9A8E22DBEC9CDB /* Pods-KuDianProject.debug.xcconfig */;
1592 1587
 			buildSettings = {
1593 1588
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1594
-
1589
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1595 1590
 				CODE_SIGN_STYLE = Manual;
1596 1591
 				DEVELOPMENT_TEAM = WV23VEMQV8;
1597 1592
 				FRAMEWORK_SEARCH_PATHS = (
1598 1593
 					"$(inherited)",
1599 1594
 					"$(PROJECT_DIR)/KuDianProject/ALBC",
1600 1595
 				);
1601
-
1602
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1603
-				CODE_SIGN_STYLE = Automatic;
1604
-				DEVELOPMENT_TEAM = WV23VEMQV8;
1605
-
1606 1596
 				GCC_PREFIX_HEADER = KuDianProject/PrefixHeader.pch;
1607 1597
 				INFOPLIST_FILE = KuDianProject/Info.plist;
1608 1598
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
@@ -1610,9 +1600,73 @@
1610 1600
 					"$(inherited)",
1611 1601
 					"@executable_path/Frameworks",
1612 1602
 				);
1613
-
1614 1603
 				MiSDKRun = debug;
1615
-
1604
+				OTHER_LDFLAGS = (
1605
+					"$(inherited)",
1606
+					"-all_load",
1607
+					"-ObjC",
1608
+					"-l\"AFNetworking\"",
1609
+					"-l\"CWLateralSlide\"",
1610
+					"-l\"DZNEmptyDataSet\"",
1611
+					"-l\"FORScrollViewEmptyAssistant\"",
1612
+					"-l\"IQKeyboardManager\"",
1613
+					"-l\"MBProgressHUD\"",
1614
+					"-l\"MJExtension\"",
1615
+					"-l\"MJRefresh\"",
1616
+					"-l\"Masonry\"",
1617
+					"-l\"MiPushSDK\"",
1618
+					"-l\"PYSearch\"",
1619
+					"-l\"SDCycleScrollView\"",
1620
+					"-l\"SDWebImage\"",
1621
+					"-l\"SVProgressHUD\"",
1622
+					"-l\"YYCache\"",
1623
+					"-l\"YYCategories\"",
1624
+					"-l\"YYImage\"",
1625
+					"-l\"YYModel\"",
1626
+					"-l\"YYText\"",
1627
+					"-l\"YYWebImage\"",
1628
+					"-l\"c++\"",
1629
+					"-l\"resolv\"",
1630
+					"-l\"sqlite3\"",
1631
+					"-l\"xml2\"",
1632
+					"-l\"z\"",
1633
+					"-framework",
1634
+					"\"Accelerate\"",
1635
+					"-framework",
1636
+					"\"AssetsLibrary\"",
1637
+					"-framework",
1638
+					"\"Bugly\"",
1639
+					"-framework",
1640
+					"\"CFNetwork\"",
1641
+					"-framework",
1642
+					"\"CoreFoundation\"",
1643
+					"-framework",
1644
+					"\"CoreGraphics\"",
1645
+					"-framework",
1646
+					"\"CoreImage\"",
1647
+					"-framework",
1648
+					"\"CoreTelephony\"",
1649
+					"-framework",
1650
+					"\"CoreText\"",
1651
+					"-framework",
1652
+					"\"Foundation\"",
1653
+					"-framework",
1654
+					"\"ImageIO\"",
1655
+					"-framework",
1656
+					"\"MobileCoreServices\"",
1657
+					"-framework",
1658
+					"\"QuartzCore\"",
1659
+					"-framework",
1660
+					"\"Security\"",
1661
+					"-framework",
1662
+					"\"SystemConfiguration\"",
1663
+					"-framework",
1664
+					"\"UIKit\"",
1665
+					"-framework",
1666
+					"\"UMMobClick\"",
1667
+					"-framework",
1668
+					"\"UserNotifications\"",
1669
+				);
1616 1670
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1617 1671
 				PRODUCT_NAME = "$(TARGET_NAME)";
1618 1672
 				PROVISIONING_PROFILE_SPECIFIER = dev;
@@ -1625,7 +1679,7 @@
1625 1679
 			baseConfigurationReference = 9FDB6DC7EAE821D7A256491B /* Pods-KuDianProject.release.xcconfig */;
1626 1680
 			buildSettings = {
1627 1681
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1628
-
1682
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1629 1683
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
1630 1684
 				CODE_SIGN_STYLE = Manual;
1631 1685
 				DEVELOPMENT_TEAM = WV23VEMQV8;
@@ -1633,10 +1687,6 @@
1633 1687
 					"$(inherited)",
1634 1688
 					"$(PROJECT_DIR)/KuDianProject/ALBC",
1635 1689
 				);
1636
-
1637
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1638
-				CODE_SIGN_STYLE = Automatic;
1639
-				DEVELOPMENT_TEAM = WV23VEMQV8;
1640 1690
 				GCC_PREFIX_HEADER = KuDianProject/PrefixHeader.pch;
1641 1691
 				INFOPLIST_FILE = KuDianProject/Info.plist;
1642 1692
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
@@ -1644,9 +1694,73 @@
1644 1694
 					"$(inherited)",
1645 1695
 					"@executable_path/Frameworks",
1646 1696
 				);
1647
-
1648 1697
 				MiSDKRun = online;
1649
-
1698
+				OTHER_LDFLAGS = (
1699
+					"$(inherited)",
1700
+					"-all_load",
1701
+					"-ObjC",
1702
+					"-l\"AFNetworking\"",
1703
+					"-l\"CWLateralSlide\"",
1704
+					"-l\"DZNEmptyDataSet\"",
1705
+					"-l\"FORScrollViewEmptyAssistant\"",
1706
+					"-l\"IQKeyboardManager\"",
1707
+					"-l\"MBProgressHUD\"",
1708
+					"-l\"MJExtension\"",
1709
+					"-l\"MJRefresh\"",
1710
+					"-l\"Masonry\"",
1711
+					"-l\"MiPushSDK\"",
1712
+					"-l\"PYSearch\"",
1713
+					"-l\"SDCycleScrollView\"",
1714
+					"-l\"SDWebImage\"",
1715
+					"-l\"SVProgressHUD\"",
1716
+					"-l\"YYCache\"",
1717
+					"-l\"YYCategories\"",
1718
+					"-l\"YYImage\"",
1719
+					"-l\"YYModel\"",
1720
+					"-l\"YYText\"",
1721
+					"-l\"YYWebImage\"",
1722
+					"-l\"c++\"",
1723
+					"-l\"resolv\"",
1724
+					"-l\"sqlite3\"",
1725
+					"-l\"xml2\"",
1726
+					"-l\"z\"",
1727
+					"-framework",
1728
+					"\"Accelerate\"",
1729
+					"-framework",
1730
+					"\"AssetsLibrary\"",
1731
+					"-framework",
1732
+					"\"Bugly\"",
1733
+					"-framework",
1734
+					"\"CFNetwork\"",
1735
+					"-framework",
1736
+					"\"CoreFoundation\"",
1737
+					"-framework",
1738
+					"\"CoreGraphics\"",
1739
+					"-framework",
1740
+					"\"CoreImage\"",
1741
+					"-framework",
1742
+					"\"CoreTelephony\"",
1743
+					"-framework",
1744
+					"\"CoreText\"",
1745
+					"-framework",
1746
+					"\"Foundation\"",
1747
+					"-framework",
1748
+					"\"ImageIO\"",
1749
+					"-framework",
1750
+					"\"MobileCoreServices\"",
1751
+					"-framework",
1752
+					"\"QuartzCore\"",
1753
+					"-framework",
1754
+					"\"Security\"",
1755
+					"-framework",
1756
+					"\"SystemConfiguration\"",
1757
+					"-framework",
1758
+					"\"UIKit\"",
1759
+					"-framework",
1760
+					"\"UMMobClick\"",
1761
+					"-framework",
1762
+					"\"UserNotifications\"",
1763
+				);
1650 1764
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1651 1765
 				PRODUCT_NAME = "$(TARGET_NAME)";
1652 1766
 				PROVISIONING_PROFILE_SPECIFIER = dis;

+ 1 - 1
KuDianProject.xcodeproj/xcuserdata/lxl.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
7 7
 		<key>KuDianProject.xcscheme_^#shared#^_</key>
8 8
 		<dict>
9 9
 			<key>orderHint</key>
10
-			<integer>0</integer>
10
+			<integer>24</integer>
11 11
 		</dict>
12 12
 	</dict>
13 13
 </dict>

+ 8 - 0
KuDianProject.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+<plist version="1.0">
4
+<dict>
5
+	<key>IDEDidComputeMac32BitWarning</key>
6
+	<true/>
7
+</dict>
8
+</plist>

+ 17 - 0
KuDianProject.xcworkspace/xcuserdata/lxl.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,17 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<Bucket
3
+   type = "0"
4
+   version = "2.0">
5
+   <Breakpoints>
6
+      <BreakpointProxy
7
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
8
+         <BreakpointContent
9
+            shouldBeEnabled = "Yes"
10
+            ignoreCount = "0"
11
+            continueAfterRunningActions = "No"
12
+            scope = "0"
13
+            stopOnStyle = "0">
14
+         </BreakpointContent>
15
+      </BreakpointProxy>
16
+   </Breakpoints>
17
+</Bucket>

+ 19 - 1
KuDianProject/Earning/Controller/KDPAccountVC.m

@@ -9,7 +9,7 @@
9 9
 #import "KDPAccountVC.h"
10 10
 #import "KDPAccountListCell.h"
11 11
 
12
-@interface KDPAccountVC ()<UITableViewDelegate,UITableViewDataSource>
12
+@interface KDPAccountVC ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
13 13
 {
14 14
     UILabel *_accountMoneyLabel;
15 15
     UILabel *_tipeLabel;
@@ -102,6 +102,22 @@
102 102
 {
103 103
     return 1;
104 104
 }
105
+
106
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
107
+    return [UIImage imageNamed:@"no_order"];
108
+}
109
+
110
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
111
+    return YES;
112
+}
113
+
114
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
115
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
116
+}
117
+
118
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
119
+    return 50;
120
+}
105 121
 -(void)returnClickBtn
106 122
 {
107 123
     [self.navigationController popViewControllerAnimated:YES];
@@ -126,6 +142,8 @@
126 142
         _accountView=[[UITableView alloc]initWithFrame:CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, self.view.height)];
127 143
         _accountView.backgroundColor=[UIColor clearColor];
128 144
         _accountView.separatorStyle=UITableViewCellSeparatorStyleNone;
145
+        _accountView.emptyDataSetDelegate = self;
146
+        _accountView.emptyDataSetSource = self;
129 147
         _accountView.delegate=self;
130 148
         _accountView.dataSource=self;
131 149
         _accountView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{

+ 18 - 2
KuDianProject/Earning/Controller/KDPEarnViewController.m

@@ -12,7 +12,7 @@
12 12
 #import "KDPAccountVC.h"
13 13
 #import "KDPForecastVC.h"
14 14
 
15
-@interface KDPEarnViewController ()<UITableViewDelegate,UITableViewDataSource>
15
+@interface KDPEarnViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
16 16
 @property(nonatomic,strong)NSDictionary *incomeDic;
17 17
 @property(nonatomic,strong)KDPEarningHeadView *headView;
18 18
 @property(nonatomic,strong)UITableView *tableView;
@@ -86,6 +86,21 @@
86 86
     return 0;
87 87
 }
88 88
 
89
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
90
+    return [UIImage imageNamed:@"no_order"];
91
+}
92
+
93
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
94
+    return YES;
95
+}
96
+
97
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
98
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
99
+}
100
+
101
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
102
+    return 50;
103
+}
89 104
 
90 105
 #pragma mark---侧滑
91 106
 -(void)drawerClickButton
@@ -124,7 +139,8 @@
124 139
         _tableView =[[UITableView alloc]init];
125 140
         _tableView.delegate =self;
126 141
         _tableView.dataSource=self;
127
-        _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
142
+        _tableView.emptyDataSetDelegate = self;
143
+        _tableView.emptyDataSetSource = self; _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
128 144
         _tableView.backgroundColor=[UIColor clearColor];
129 145
     }
130 146
     return _tableView;

+ 17 - 1
KuDianProject/Earning/Controller/KDPForecastOrderListVC.m

@@ -9,7 +9,7 @@
9 9
 #import "KDPForecastOrderListVC.h"
10 10
 #import "KDPForecastOrderCell.h"
11 11
 
12
-@interface KDPForecastOrderListVC ()<UITableViewDelegate,UITableViewDataSource>
12
+@interface KDPForecastOrderListVC ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
13 13
 {
14 14
     UILabel *_orderLabel;
15 15
     
@@ -89,7 +89,21 @@
89 89
 {
90 90
     return 1;
91 91
 }
92
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
93
+    return [UIImage imageNamed:@"no_order"];
94
+}
95
+
96
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
97
+    return YES;
98
+}
92 99
 
100
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
101
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
102
+}
103
+
104
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
105
+    return 50;
106
+}
93 107
 -(void)returnClickBtn
94 108
 {
95 109
     [self.navigationController popViewControllerAnimated:YES];
@@ -120,6 +134,8 @@
120 134
             page_num = 1;
121 135
             [self getMonthOrderList];
122 136
         }];
137
+        _forecastView.emptyDataSetDelegate = self;
138
+        _forecastView.emptyDataSetSource = self;
123 139
         _forecastView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
124 140
             page_num++;
125 141
             [self getMonthOrderList];

+ 17 - 2
KuDianProject/Earning/Controller/KDPForecastVC.m

@@ -9,7 +9,7 @@
9 9
 #import "KDPForecastVC.h"
10 10
 #import "KDPForecastListCell.h"
11 11
 
12
-@interface KDPForecastVC ()<UITableViewDelegate,UITableViewDataSource>
12
+@interface KDPForecastVC ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
13 13
 {
14 14
     UILabel *_orderNumMoneyLabel;
15 15
     
@@ -80,7 +80,21 @@
80 80
 {
81 81
     return 1;
82 82
 }
83
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
84
+    return [UIImage imageNamed:@"no_order"];
85
+}
86
+
87
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
88
+    return YES;
89
+}
83 90
 
91
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
92
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
93
+}
94
+
95
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
96
+    return 50;
97
+}
84 98
 -(void)returnClickBtn
85 99
 {
86 100
     [self.navigationController popViewControllerAnimated:YES];
@@ -103,7 +117,8 @@
103 117
     if (!_forecastView) {
104 118
         _forecastView=[[UITableView alloc]initWithFrame:CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, self.view.height)];
105 119
         _forecastView.backgroundColor=[UIColor clearColor];
106
-        _forecastView.separatorStyle=UITableViewCellSeparatorStyleNone;
120
+        _forecastView.emptyDataSetDelegate = self;
121
+        _forecastView.emptyDataSetSource = self; _forecastView.separatorStyle=UITableViewCellSeparatorStyleNone;
107 122
         _forecastView.delegate=self;
108 123
         _forecastView.dataSource=self;
109 124
         [self addtabheader];

+ 18 - 1
KuDianProject/Earning/Controller/KDPOrderDetailListNewVC.m

@@ -8,7 +8,7 @@
8 8
 
9 9
 #import "KDPOrderDetailListNewVC.h"
10 10
 #import "KDPForecastOrderCell.h"
11
-@interface KDPOrderDetailListNewVC ()<UITableViewDelegate,UITableViewDataSource>
11
+@interface KDPOrderDetailListNewVC ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
12 12
 {
13 13
     
14 14
     
@@ -81,6 +81,21 @@
81 81
 {
82 82
     return 1;
83 83
 }
84
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
85
+    return [UIImage imageNamed:@"no_order"];
86
+}
87
+
88
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
89
+    return YES;
90
+}
91
+
92
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
93
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
94
+}
95
+
96
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
97
+    return 50;
98
+}
84 99
 -(UITableView *)forecastView
85 100
 {
86 101
     if (!_forecastView) {
@@ -94,6 +109,8 @@
94 109
             page_num = 1;
95 110
             [self ordeListData];
96 111
         }];
112
+        _forecastView.emptyDataSetDelegate = self;
113
+        _forecastView.emptyDataSetSource = self;
97 114
         _forecastView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
98 115
             page_num++;
99 116
             [self ordeListData];

+ 4 - 6
KuDianProject/Info.plist

@@ -30,15 +30,14 @@
30 30
 	</array>
31 31
 	<key>LSRequiresIPhoneOS</key>
32 32
 	<true/>
33
-<<<<<<< HEAD
34
-=======
33
+
35 34
 	<key>MiSDKAppID</key>
36 35
 	<string>2882303761518060278</string>
37 36
 	<key>MiSDKAppKey</key>
38 37
 	<string>5351806025278</string>
39 38
 	<key>MiSDKRun</key>
40 39
 	<string>${MiSDKRun}</string>
41
->>>>>>> 70a9894cc7281a5b7cfdc240228827c3936c76a7
40
+
42 41
 	<key>NSAppTransportSecurity</key>
43 42
 	<dict>
44 43
 		<key>NSAllowsArbitraryLoads</key>
@@ -49,11 +48,10 @@
49 48
 			<string></string>
50 49
 		</dict>
51 50
 	</dict>
52
-<<<<<<< HEAD
51
+
53 52
 	<key>UILaunchStoryboardName</key>
54 53
 	<string>LaunchScreen</string>
55
-=======
56
->>>>>>> 70a9894cc7281a5b7cfdc240228827c3936c76a7
54
+
57 55
 	<key>UIMainStoryboardFile</key>
58 56
 	<string>Main</string>
59 57
 	<key>UIRequiredDeviceCapabilities</key>

+ 12 - 1
KuDianProject/MainTab/KDPMainViewController.m

@@ -32,7 +32,18 @@
32 32
 {
33 33
     if (!_navBar) {
34 34
         _navBar=[[KDPNavBar alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, KDNavBarHeight)];
35
-        _navBar.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
35
+        //代码写在这个里面
36
+        @try{
37
+            _navBar.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
38
+            
39
+        }
40
+        @catch(NSException *exception) {
41
+            NSLog(@"异常错误是:%@", exception);
42
+        }
43
+        @finally {
44
+            
45
+        }
46
+        
36 47
         
37 48
     }
38 49
     return _navBar;

+ 19 - 2
KuDianProject/TOP/Controller/KDPDrawerVC.m

@@ -15,7 +15,7 @@
15 15
 #import "KDPWebVC.h"
16 16
 #import "KDPWebInteractionVC.h"
17 17
 #import "KDPCollectHistoryPageVC.h"
18
-@interface KDPDrawerVC ()<UITableViewDelegate,UITableViewDataSource>
18
+@interface KDPDrawerVC ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
19 19
 {
20 20
     UIImageView *headImgV;
21 21
     UILabel *headLabel;
@@ -91,12 +91,29 @@
91 91
 {
92 92
     return 20;
93 93
 }
94
+
95
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
96
+    return [UIImage imageNamed:@"no_order"];
97
+}
98
+
99
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
100
+    return YES;
101
+}
102
+
103
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
104
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
105
+}
106
+
107
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
108
+    return 50;
109
+}
94 110
 -(UITableView *)listTabView
95 111
 {
96 112
     if (!_listTabView) {
97 113
         _listTabView=[[UITableView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH/3*2, self.view.height)];
98 114
         _listTabView.backgroundColor=[UIColor clearColor];
99
-        _listTabView.separatorStyle=UITableViewCellSeparatorStyleNone;
115
+        _listTabView.emptyDataSetDelegate = self;
116
+        _listTabView.emptyDataSetSource = self; _listTabView.separatorStyle=UITableViewCellSeparatorStyleNone;
100 117
         if (@available(iOS 11.0, *)) {
101 118
             _listTabView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
102 119
         } else {

+ 18 - 1
KuDianProject/TOP/Controller/KDPNoticeViewController.m

@@ -9,7 +9,7 @@
9 9
 #import "KDPNoticeViewController.h"
10 10
 #import "KDPNoticeModel.h"
11 11
 #import "KDPMessageTableViewCell.h"
12
-@interface KDPNoticeViewController ()<UITableViewDelegate,UITableViewDataSource>
12
+@interface KDPNoticeViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
13 13
 
14 14
 @property (nonatomic, strong) UITableView *tableView;
15 15
 
@@ -108,6 +108,8 @@
108 108
         _tableView.showsVerticalScrollIndicator = NO;
109 109
         _tableView.showsHorizontalScrollIndicator = NO;
110 110
         _tableView.rowHeight = 121;
111
+        _tableView.emptyDataSetDelegate = self;
112
+        _tableView.emptyDataSetSource = self;
111 113
         _tableView.delegate = self;
112 114
         _tableView.dataSource = self;
113 115
         _tableView.separatorStyle = UITableViewCellSelectionStyleNone;
@@ -150,4 +152,19 @@
150 152
     return self.dataSource.count;
151 153
 }
152 154
 
155
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
156
+    return [UIImage imageNamed:@"no_order"];
157
+}
158
+
159
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
160
+    return YES;
161
+}
162
+
163
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
164
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
165
+}
166
+
167
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
168
+    return 50;
169
+}
153 170
 @end

+ 18 - 1
KuDianProject/TOP/Controller/KDPProjectListVC.m

@@ -8,7 +8,7 @@
8 8
 
9 9
 #import "KDPProjectListVC.h"
10 10
 
11
-@interface KDPProjectListVC ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
11
+@interface KDPProjectListVC ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
12 12
 @property(nonatomic,strong)UICollectionView *listview;
13 13
 @property(nonatomic,assign)NSInteger pageNum;
14 14
 @property(nonatomic,strong)NSMutableArray *dataArray;
@@ -79,6 +79,21 @@
79 79
     goodDetail.model=self.dataArray[indexPath.row];
80 80
     [self.navigationController pushViewController:goodDetail animated:YES];
81 81
 }
82
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
83
+    return [UIImage imageNamed:@"no_order"];
84
+}
85
+
86
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
87
+    return YES;
88
+}
89
+
90
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
91
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
92
+}
93
+
94
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
95
+    return 50;
96
+}
82 97
 
83 98
 -(void)returnClickBtn
84 99
 {
@@ -115,6 +130,8 @@
115 130
             self.pageNum = 1;
116 131
             [self goodListProject];
117 132
         }];
133
+        _listview.emptyDataSetDelegate = self;
134
+        _listview.emptyDataSetSource = self;
118 135
         _listview.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
119 136
             self.pageNum++;
120 137
             [self goodListProject];

+ 17 - 2
KuDianProject/TOP/Controller/KDPTodayListViewController.m

@@ -9,7 +9,7 @@
9 9
 #import "KDPTodayListViewController.h"
10 10
 #import "KDPTodayListCell.h"
11 11
 #import "SSWLineChartView.h"
12
-@interface KDPTodayListViewController ()<UITableViewDelegate,UITableViewDataSource>
12
+@interface KDPTodayListViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
13 13
 {
14 14
     UILabel *numLabel;
15 15
     NSTimer *timer_add;
@@ -176,7 +176,21 @@
176 176
 {
177 177
     return 1;
178 178
 }
179
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
180
+    return [UIImage imageNamed:@"no_order"];
181
+}
182
+
183
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
184
+    return YES;
185
+}
179 186
 
187
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
188
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
189
+}
190
+
191
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
192
+    return 50;
193
+}
180 194
 -(UITableView *)tableView
181 195
 {
182 196
     if (!_tableView) {
@@ -184,7 +198,8 @@
184 198
         _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
185 199
         _tableView.delegate=self;
186 200
         _tableView.dataSource=self;
187
-        
201
+        _tableView.emptyDataSetDelegate = self;
202
+        _tableView.emptyDataSetSource = self;
188 203
         _tableView.showsVerticalScrollIndicator=NO;
189 204
         _tableView.showsHorizontalScrollIndicator=NO;
190 205
     }

+ 19 - 1
KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -11,7 +11,7 @@
11 11
 #define bannerCell @"bannerCell"
12 12
 #define recommendCell @"recommendCell"
13 13
 #define recommendHead @"recommendHead"
14
-@interface KDPTopViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
14
+@interface KDPTopViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
15 15
 {
16 16
     NSTimer *order_timer;
17 17
     NSInteger addNum;
@@ -349,6 +349,8 @@
349 349
             self.pageNum = @"1";
350 350
             [self getRecommendGood];
351 351
         }];
352
+        _dataCollectionView.emptyDataSetDelegate = self;
353
+        _dataCollectionView.emptyDataSetSource = self;
352 354
         _dataCollectionView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
353 355
             self.pageNum=[NSString stringWithFormat:@"%ld",self.pageNum.integerValue+1];
354 356
             [self getRecommendGood];
@@ -462,4 +464,20 @@
462 464
     }
463 465
     
464 466
 }
467
+
468
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
469
+    return [UIImage imageNamed:@"no_order"];
470
+}
471
+
472
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
473
+    return YES;
474
+}
475
+
476
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
477
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
478
+}
479
+
480
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
481
+    return 50;
482
+}
465 483
 @end

+ 1 - 0
KuDianProject/TOP/Drawer/Control/KDPCollectHistoryPageVC.m

@@ -101,6 +101,7 @@
101 101
 }
102 102
 
103 103
 
104
+
104 105
 -(void)viewWillAppear:(BOOL)animated
105 106
 {
106 107
     [super viewWillAppear:animated];

+ 18 - 1
KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -9,7 +9,7 @@
9 9
 #import "KDPCollectHistoryVC.h"
10 10
 #import "KDPHistoryListCell.h"
11 11
 #import "KDPCollectHistoryVC.h"
12
-@interface KDPCollectHistoryVC ()<UITableViewDelegate,UITableViewDataSource>
12
+@interface KDPCollectHistoryVC ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
13 13
 @property(nonatomic,assign)NSInteger page_num;
14 14
 
15 15
 @property(nonatomic,strong)UITableView *collectView;
@@ -92,6 +92,21 @@
92 92
 {
93 93
     return 1;
94 94
 }
95
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
96
+    return [UIImage imageNamed:@"no_order"];
97
+}
98
+
99
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
100
+    return YES;
101
+}
102
+
103
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
104
+    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
105
+}
106
+
107
+- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
108
+    return 50;
109
+}
95 110
 
96 111
 -(UITableView *)collectView
97 112
 {
@@ -100,6 +115,8 @@
100 115
         _collectView.backgroundColor=[UIColor clearColor];
101 116
         _collectView.showsVerticalScrollIndicator=NO;
102 117
         _collectView.showsHorizontalScrollIndicator=NO;
118
+        _collectView.emptyDataSetDelegate = self;
119
+        _collectView.emptyDataSetSource = self;
103 120
         if (@available(iOS 11.0, *)) {
104 121
             _collectView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
105 122
         } else {

+ 1 - 0
KuDianProject/TOP/View/Detail/KDPIDTipView.m

@@ -183,6 +183,7 @@
183 183
             [MBProgressHUD showMessage:KWaiMessage];
184 184
         }
185 185
     }
186
+    self.hidden=YES;
186 187
 }
187 188
 
188 189
 #pragma mark---pid计数y统计

+ 20 - 9
Pods/Pods.xcodeproj/xcuserdata/lxl.xcuserdatad/xcschemes/FORScrollViewEmptyAssistant-FORScrollViewEmptyAssistant.xcscheme

@@ -7,15 +7,15 @@
7 7
       buildImplicitDependencies = "YES">
8 8
       <BuildActionEntries>
9 9
          <BuildActionEntry
10
-            buildForAnalyzing = "YES"
11 10
             buildForTesting = "YES"
12 11
             buildForRunning = "YES"
13 12
             buildForProfiling = "YES"
14
-            buildForArchiving = "YES">
13
+            buildForArchiving = "YES"
14
+            buildForAnalyzing = "YES">
15 15
             <BuildableReference
16 16
                BuildableIdentifier = "primary"
17 17
                BlueprintIdentifier = "D270FC67FECC34D08951E89BECD23C7B"
18
-               BuildableName = "FORScrollViewEmptyAssistant-FORScrollViewEmptyAssistant.bundle"
18
+               BuildableName = "FORScrollViewEmptyAssistant.bundle"
19 19
                BlueprintName = "FORScrollViewEmptyAssistant-FORScrollViewEmptyAssistant"
20 20
                ReferencedContainer = "container:Pods.xcodeproj">
21 21
             </BuildableReference>
@@ -23,14 +23,17 @@
23 23
       </BuildActionEntries>
24 24
    </BuildAction>
25 25
    <TestAction
26
+      buildConfiguration = "Debug"
26 27
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
27 28
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28
-      shouldUseLaunchSchemeArgsEnv = "YES"
29
-      buildConfiguration = "Debug">
29
+      shouldUseLaunchSchemeArgsEnv = "YES">
30
+      <Testables>
31
+      </Testables>
30 32
       <AdditionalOptions>
31 33
       </AdditionalOptions>
32 34
    </TestAction>
33 35
    <LaunchAction
36
+      buildConfiguration = "Debug"
34 37
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35 38
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
36 39
       launchStyle = "0"
@@ -38,17 +41,25 @@
38 41
       ignoresPersistentStateOnLaunch = "NO"
39 42
       debugDocumentVersioning = "YES"
40 43
       debugServiceExtension = "internal"
41
-      buildConfiguration = "Debug"
42 44
       allowLocationSimulation = "YES">
45
+      <MacroExpansion>
46
+         <BuildableReference
47
+            BuildableIdentifier = "primary"
48
+            BlueprintIdentifier = "D270FC67FECC34D08951E89BECD23C7B"
49
+            BuildableName = "FORScrollViewEmptyAssistant.bundle"
50
+            BlueprintName = "FORScrollViewEmptyAssistant-FORScrollViewEmptyAssistant"
51
+            ReferencedContainer = "container:Pods.xcodeproj">
52
+         </BuildableReference>
53
+      </MacroExpansion>
43 54
       <AdditionalOptions>
44 55
       </AdditionalOptions>
45 56
    </LaunchAction>
46 57
    <ProfileAction
58
+      buildConfiguration = "Release"
59
+      shouldUseLaunchSchemeArgsEnv = "YES"
47 60
       savedToolIdentifier = ""
48 61
       useCustomWorkingDirectory = "NO"
49
-      debugDocumentVersioning = "YES"
50
-      buildConfiguration = "Release"
51
-      shouldUseLaunchSchemeArgsEnv = "YES">
62
+      debugDocumentVersioning = "YES">
52 63
    </ProfileAction>
53 64
    <AnalyzeAction
54 65
       buildConfiguration = "Debug">

+ 48 - 0
Pods/Pods.xcodeproj/xcuserdata/lxl.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -8,121 +8,169 @@
8 8
 		<dict>
9 9
 			<key>isShown</key>
10 10
 			<false/>
11
+			<key>orderHint</key>
12
+			<integer>0</integer>
11 13
 		</dict>
12 14
 		<key>Bugly.xcscheme</key>
13 15
 		<dict>
14 16
 			<key>isShown</key>
15 17
 			<false/>
18
+			<key>orderHint</key>
19
+			<integer>1</integer>
16 20
 		</dict>
17 21
 		<key>CWLateralSlide.xcscheme</key>
18 22
 		<dict>
19 23
 			<key>isShown</key>
20 24
 			<false/>
25
+			<key>orderHint</key>
26
+			<integer>2</integer>
21 27
 		</dict>
22 28
 		<key>DZNEmptyDataSet.xcscheme</key>
23 29
 		<dict>
24 30
 			<key>isShown</key>
25 31
 			<false/>
32
+			<key>orderHint</key>
33
+			<integer>3</integer>
26 34
 		</dict>
27 35
 		<key>FORScrollViewEmptyAssistant-FORScrollViewEmptyAssistant.xcscheme</key>
28 36
 		<dict>
29 37
 			<key>isShown</key>
30 38
 			<false/>
39
+			<key>orderHint</key>
40
+			<integer>5</integer>
31 41
 		</dict>
32 42
 		<key>FORScrollViewEmptyAssistant.xcscheme</key>
33 43
 		<dict>
34 44
 			<key>isShown</key>
35 45
 			<false/>
46
+			<key>orderHint</key>
47
+			<integer>4</integer>
36 48
 		</dict>
37 49
 		<key>IQKeyboardManager.xcscheme</key>
38 50
 		<dict>
39 51
 			<key>isShown</key>
40 52
 			<false/>
53
+			<key>orderHint</key>
54
+			<integer>6</integer>
41 55
 		</dict>
42 56
 		<key>MBProgressHUD.xcscheme</key>
43 57
 		<dict>
44 58
 			<key>isShown</key>
45 59
 			<false/>
60
+			<key>orderHint</key>
61
+			<integer>8</integer>
46 62
 		</dict>
47 63
 		<key>MJExtension.xcscheme</key>
48 64
 		<dict>
49 65
 			<key>isShown</key>
50 66
 			<false/>
67
+			<key>orderHint</key>
68
+			<integer>10</integer>
51 69
 		</dict>
52 70
 		<key>MJRefresh.xcscheme</key>
53 71
 		<dict>
54 72
 			<key>isShown</key>
55 73
 			<false/>
74
+			<key>orderHint</key>
75
+			<integer>11</integer>
56 76
 		</dict>
57 77
 		<key>Masonry.xcscheme</key>
58 78
 		<dict>
59 79
 			<key>isShown</key>
60 80
 			<false/>
81
+			<key>orderHint</key>
82
+			<integer>7</integer>
61 83
 		</dict>
62 84
 		<key>MiPushSDK.xcscheme</key>
63 85
 		<dict>
64 86
 			<key>isShown</key>
65 87
 			<false/>
88
+			<key>orderHint</key>
89
+			<integer>9</integer>
66 90
 		</dict>
67 91
 		<key>PYSearch.xcscheme</key>
68 92
 		<dict>
69 93
 			<key>isShown</key>
70 94
 			<false/>
95
+			<key>orderHint</key>
96
+			<integer>13</integer>
71 97
 		</dict>
72 98
 		<key>Pods-KuDianProject.xcscheme</key>
73 99
 		<dict>
74 100
 			<key>isShown</key>
75 101
 			<false/>
102
+			<key>orderHint</key>
103
+			<integer>12</integer>
76 104
 		</dict>
77 105
 		<key>SDCycleScrollView.xcscheme</key>
78 106
 		<dict>
79 107
 			<key>isShown</key>
80 108
 			<false/>
109
+			<key>orderHint</key>
110
+			<integer>14</integer>
81 111
 		</dict>
82 112
 		<key>SDWebImage.xcscheme</key>
83 113
 		<dict>
84 114
 			<key>isShown</key>
85 115
 			<false/>
116
+			<key>orderHint</key>
117
+			<integer>15</integer>
86 118
 		</dict>
87 119
 		<key>SVProgressHUD.xcscheme</key>
88 120
 		<dict>
89 121
 			<key>isShown</key>
90 122
 			<false/>
123
+			<key>orderHint</key>
124
+			<integer>16</integer>
91 125
 		</dict>
92 126
 		<key>UMengAnalytics.xcscheme</key>
93 127
 		<dict>
94 128
 			<key>isShown</key>
95 129
 			<false/>
130
+			<key>orderHint</key>
131
+			<integer>17</integer>
96 132
 		</dict>
97 133
 		<key>YYCache.xcscheme</key>
98 134
 		<dict>
99 135
 			<key>isShown</key>
100 136
 			<false/>
137
+			<key>orderHint</key>
138
+			<integer>18</integer>
101 139
 		</dict>
102 140
 		<key>YYCategories.xcscheme</key>
103 141
 		<dict>
104 142
 			<key>isShown</key>
105 143
 			<false/>
144
+			<key>orderHint</key>
145
+			<integer>19</integer>
106 146
 		</dict>
107 147
 		<key>YYImage.xcscheme</key>
108 148
 		<dict>
109 149
 			<key>isShown</key>
110 150
 			<false/>
151
+			<key>orderHint</key>
152
+			<integer>20</integer>
111 153
 		</dict>
112 154
 		<key>YYModel.xcscheme</key>
113 155
 		<dict>
114 156
 			<key>isShown</key>
115 157
 			<false/>
158
+			<key>orderHint</key>
159
+			<integer>21</integer>
116 160
 		</dict>
117 161
 		<key>YYText.xcscheme</key>
118 162
 		<dict>
119 163
 			<key>isShown</key>
120 164
 			<false/>
165
+			<key>orderHint</key>
166
+			<integer>22</integer>
121 167
 		</dict>
122 168
 		<key>YYWebImage.xcscheme</key>
123 169
 		<dict>
124 170
 			<key>isShown</key>
125 171
 			<false/>
172
+			<key>orderHint</key>
173
+			<integer>23</integer>
126 174
 		</dict>
127 175
 	</dict>
128 176
 	<key>SuppressBuildableAutocreation</key>