Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject

KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>

KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,16 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

KuDianProject/Earning/Controller/KDPAccountVC.m

@@ -116,7 +116,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 -(void)returnClickBtn
 {

KuDianProject/Earning/Controller/KDPForecastOrderListVC.m

@@ -102,7 +102,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 -(void)returnClickBtn
 {

KuDianProject/Earning/Controller/KDPForecastVC.m

@@ -93,7 +93,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 -(void)returnClickBtn
 {

KuDianProject/Earning/Controller/KDPOrderDetailListNewVC.m

@@ -94,7 +94,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 -(UITableView *)forecastView
 {

KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -140,7 +140,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{

KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -161,7 +161,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{

KuDianProject/LiveData/Controller/KDPOrderDetailViewController.m

@@ -132,7 +132,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 
 @end

KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.m

@@ -309,7 +309,7 @@
 }
 
 - (CGFloat)spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{

KuDianProject/SupplyGood/Controller/KDPSupplyGoodViewController.m

@@ -91,7 +91,7 @@
 
 - (void)setUpTopView{
     self.navBar.hidden = YES;
-    NSInteger height = KDNavBarHeight == 64 ? 130 : 163;
+    NSInteger height = KDNavBarHeight == 64 ? 135 : 163;
     UIView *topBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, height)];
     [topBackView setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFF235F],[UIColor colorWithRGB:0xFF7676]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     [self.view addSubview:topBackView];

KuDianProject/TOP/Controller/KDPDrawerVC.m

@@ -105,7 +105,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 -(UITableView *)listTabView
 {

KuDianProject/TOP/Controller/KDPNoticeViewController.m

@@ -166,6 +166,6 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 @end

KuDianProject/TOP/Controller/KDPProjectListVC.m

@@ -92,7 +92,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 
 -(void)returnClickBtn

KuDianProject/TOP/Controller/KDPTodayListViewController.m

@@ -191,7 +191,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 -(UITableView *)tableView
 {

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -479,6 +479,6 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 @end

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -106,7 +106,7 @@
 }
 
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
+    return 30;
 }
 
 -(UITableView *)collectView

KuDianProject/TOP/Drawer/Control/KDPUserInfoVC.m

@@ -51,7 +51,8 @@
         listC.contentLabel.hidden=NO;
         listC.iconImgV.hidden=YES;
         if (indexPath.row == 1) {
-            listC.contentLabel.text=userInfoDic[@"kwai_username"];
+            NSString *userName = [userInfoDic[@"kwai_username"] isEqual:[NSNull null]] ? @"" : userInfoDic[@"kwai_username"];
+            listC.contentLabel.text=userName;
         }else if (indexPath.row == 2) {
             listC.contentLabel.text=userInfoDic[@"kwai_num"];
         }else if (indexPath.row == 3) {
@@ -63,7 +64,8 @@
             }
             
         }else if (indexPath.row == 4) {
-            listC.contentLabel.text=userInfoDic[@"kwai_city_name"];
+            NSString *cityName = [userInfoDic[@"kwai_city_name"] isEqual:[NSNull null]] ? @"":userInfoDic[@"kwai_city_name"];
+            listC.contentLabel.text=cityName;
         }else if (indexPath.row == 5) {
             listC.contentLabel.text=userInfoDic[@"favorite_cate"];
         }