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

KuDianProject/Earning/Chart/SSWLineChartView.m

@@ -41,7 +41,7 @@
     self.barsEndPointsArr = [@[] mutableCopy];
     self.linePointPathArr = [@[] mutableCopy];
     self.linePointLayerArr = [@[] mutableCopy];
-    self.barWidth =SCREEN_WIDTH/5-16;
+    self.barWidth =SCREEN_WIDTH/6-16;
     self.gapWidth = 5;
     self.yScaleValue = 100;
     self.yAxisCount = 5;

KuDianProject/Earning/Chart/SSWlineIncomeChartView.m

@@ -171,8 +171,8 @@
 }
 -(void)draWUpdate
 {
-    
-    _totalWidth= self.width-60;
+    _totalWidth= self.gapWidth+(self.barWidth+self.gapWidth)*self.xValuesArr.count;
+//    _totalWidth= self.width-60;
     _totalHeight=self.scrollView.bounds.size.height-30;
     self.scrollView.contentSize = CGSizeMake(30+_totalWidth, 0);
    

KuDianProject/Earning/Controller/KDPAccountVC.m

@@ -146,6 +146,11 @@
         _accountView.emptyDataSetSource = self;
         _accountView.delegate=self;
         _accountView.dataSource=self;
+        if (@available(iOS 11.0, *)) {
+            _accountView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _accountView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
             page_num = 1;
             [self getBalanceList];

KuDianProject/Earning/Controller/KDPForecastOrderListVC.m

@@ -134,6 +134,11 @@
             page_num = 1;
             [self getMonthOrderList];
         }];
+        if (@available(iOS 11.0, *)) {
+            _forecastView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _forecastView.emptyDataSetDelegate = self;
         _forecastView.emptyDataSetSource = self;
         _forecastView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{

KuDianProject/Earning/Controller/KDPForecastVC.m

@@ -119,6 +119,11 @@
         _forecastView.backgroundColor=[UIColor clearColor];
         _forecastView.emptyDataSetDelegate = self;
         _forecastView.emptyDataSetSource = self; _forecastView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        if (@available(iOS 11.0, *)) {
+            _forecastView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _forecastView.delegate=self;
         _forecastView.dataSource=self;
         [self addtabheader];

KuDianProject/Earning/Controller/KDPOrderDetailListNewVC.m

@@ -109,6 +109,11 @@
             page_num = 1;
             [self ordeListData];
         }];
+        if (@available(iOS 11.0, *)) {
+            _forecastView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _forecastView.emptyDataSetDelegate = self;
         _forecastView.emptyDataSetSource = self;
         _forecastView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{

KuDianProject/Earning/View/KDPEarnTableHeadView.m

@@ -170,7 +170,12 @@
             [yArr addObject:dic[@"num"]];
             [xArr addObject:dic[@"time"]];
         }
-        self.chartView.barWidth=SCREEN_WIDTH/xArr.count-80/xArr.count;
+        if (xArr.count > 7) {
+            self.chartView.barWidth=50;
+        }else{
+            self.chartView.barWidth=SCREEN_WIDTH/xArr.count-80/xArr.count;
+        }
+        
         self.chartView.xValuesArr=xArr;
         self.chartView.yValuesArr=yArr;
         

KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -87,7 +87,7 @@
         if (@available(iOS 11.0, *)) {
             _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {
-            // Fallback on earlier versions
+            self.automaticallyAdjustsScrollViewInsets = NO;
         }
         _tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-20, 0.1f)];
         _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{

KuDianProject/TOP/Controller/KDPDrawerVC.m

@@ -117,7 +117,7 @@
         if (@available(iOS 11.0, *)) {
             _listTabView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {
-            // Fallback on earlier versions
+            self.automaticallyAdjustsScrollViewInsets = NO;
         }
     
         _listTabView.delegate=self;

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -204,7 +204,7 @@
 -(void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    self.navBar.hidden=NO;
+//    self.navBar.hidden=NO;
     
     [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
     self.tabBarController.tabBar.hidden=NO;
@@ -353,7 +353,7 @@
         if (@available(iOS 11.0, *)) {
             _detailBottonView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {
-            // Fallback on earlier versions
+            self.automaticallyAdjustsScrollViewInsets = NO;
         }
         _detailBottonView.showsHorizontalScrollIndicator=NO;
         _detailBottonView.contentSize=CGSizeMake(0, SCREEN_HEIGHT*2);

KuDianProject/TOP/Controller/KDPNoticeViewController.m

@@ -44,6 +44,7 @@
     [clearBtn setImage:[UIImage imageNamed:@"clear_icon"] forState:UIControlStateNormal];
     clearBtn.frame = CGRectMake(SCREEN_WIDTH-17-16, KDNavBarHeight-16-17, 17, 17);
     [clearBtn addTarget:self action:@selector(clearAction) forControlEvents:UIControlEventTouchUpInside];
+    clearBtn.hidden=YES;
     [self.navBar addSubview:clearBtn];
     self.clearBtn = clearBtn;
 }

KuDianProject/TOP/Controller/KDPProjectListVC.m

@@ -124,6 +124,11 @@
         _listview.showsVerticalScrollIndicator=NO;
         _listview.backgroundColor=[UIColor whiteColor];
         _listview.delegate=self;
+        if (@available(iOS 11.0, *)) {
+            _listview.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _listview.dataSource=self;
         [_listview registerClass:[KDPRecommendGoodCell class] forCellWithReuseIdentifier:@"recomm"];
         _listview.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{

KuDianProject/TOP/Controller/KDPTodayListViewController.m

@@ -200,7 +200,11 @@
         _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
         _tableView.delegate=self;
         _tableView.dataSource=self;
-       
+        if (@available(iOS 11.0, *)) {
+            _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _tableView.showsVerticalScrollIndicator=NO;
         _tableView.showsHorizontalScrollIndicator=NO;
     }

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -53,7 +53,7 @@
     [self initialieValues];
     [self initUI];
     
-
+    [self getBanner];
    
     
     
@@ -62,7 +62,7 @@
 #pragma makr---首页收益
 -(void)getUserTodayIncom
 {
-//    [LoadingView show];
+
     [KDPNetworkRequestHTTP postURL:topIncomeUrl params:nil success:^(id  _Nonnull json) {
         //订单数量,返回的是总数量，减去之前的数量
         
@@ -74,10 +74,8 @@
         self.order_rebate_money = json[@"total_rebate"];
         
         [self.dataCollectionView reloadData];
-        
-//        [LoadingView dismiss];
+
     } failure:^(NSError * _Nonnull error) {
-//        [LoadingView dismiss];
     }];
 }
 
@@ -98,10 +96,11 @@
 #pragma makr---获取首页数据
 -(void)getRecommendGood
 {
-    [LoadingView show];
+//    [LoadingView show];
+    
     NSDictionary *dic=@{@"page":self.pageNum,@"selection_page":self.selection_page,@"selection_id":self.selection_id,@"selection_id_page":self.selection_id_page,@"selection_id_count":self.selection_id_count};
     [KDPNetworkRequestHTTP postURL:topGoodRecommURL params:dic success:^(id  _Nonnull json) {
-        [self getBanner];
+        
         [LoadingView dismiss];
         self.selection_id_page = json[@"selection_id_count"];
         self.selection_id = json[@"selection_id"];
@@ -120,11 +119,12 @@
        
         [self.dataArray addObjectsFromArray:currentA];
         
-        
         [self.dataCollectionView reloadData];
         
     } failure:^(NSError * _Nonnull error) {
         [LoadingView dismiss];
+        [self.dataCollectionView.mj_header endRefreshing];
+        [self.dataCollectionView.mj_footer endRefreshing];
     }];
 }
 
@@ -209,9 +209,9 @@
     }
     earinCell.orderNumgL.text=self.orderNumber;
     earinCell.rebet_money=self.order_rebate_money;
-    earinCell.liveDataBlock = ^{
-        self.tabBarController.selectedIndex=2;
-    };
+//    earinCell.liveDataBlock = ^{
+//        self.tabBarController.selectedIndex=2;
+//    };
     return earinCell;
     
 }
@@ -346,13 +346,17 @@
         _dataCollectionView.delegate=self;
         _dataCollectionView.dataSource=self;
         _dataCollectionView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
-            
+            [self getBanner];
             [self initialieValues];
             [self getRecommendGood];
         }];
         _dataCollectionView.emptyDataSetDelegate = self;
         _dataCollectionView.emptyDataSetSource = self;
-        _dataCollectionView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+        if (@available(iOS 11.0, *)) {
+            _dataCollectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+              self.automaticallyAdjustsScrollViewInsets = NO;
+        } _dataCollectionView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
             self.pageNum=[NSString stringWithFormat:@"%ld",self.pageNum.integerValue+1];
             [self getRecommendGood];
         }];
@@ -394,6 +398,7 @@
         [self isOpenService];
         [self initialieValues];
         [self getRecommendGood];
+        
         [self messageUnreadNumData];
         order_timer = [NSTimer timerWithTimeInterval:30 target:self selector:@selector(order_timerAction) userInfo:nil repeats:YES];
         [[NSRunLoop mainRunLoop] addTimer:order_timer forMode:NSDefaultRunLoopMode];

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -118,12 +118,13 @@
         _collectView.showsHorizontalScrollIndicator=NO;
         _collectView.emptyDataSetDelegate = self;
         _collectView.emptyDataSetSource = self;
+         _collectView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        _collectView.delegate=self;
         if (@available(iOS 11.0, *)) {
             _collectView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
         } else {
-            // Fallback on earlier versions
-        } _collectView.separatorStyle=UITableViewCellSeparatorStyleNone;
-        _collectView.delegate=self;
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _collectView.dataSource=self;
         _collectView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
             self.page_num = 1;

KuDianProject/TOP/Drawer/Control/KDPSetViewController.m

@@ -85,6 +85,11 @@
         _setView=[[UITableView alloc]init];
         _setView.backgroundColor=[UIColor clearColor];
         _setView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        if (@available(iOS 11.0, *)) {
+            _setView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _setView.delegate=self;
         _setView.dataSource=self;
         

KuDianProject/TOP/Drawer/Control/KDPUserInfoVC.m

@@ -100,6 +100,11 @@
         _infoView=[[UITableView alloc]init];
         _infoView.backgroundColor=[UIColor clearColor];
         _infoView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        if (@available(iOS 11.0, *)) {
+            _infoView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _infoView.delegate=self;
         _infoView.dataSource=self;
         

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -85,6 +85,9 @@
 -(void)setModel:(KDPGoodsModel *)model
 {
     _model=model;
+    if (model.title.length<=0) {
+        return;
+    }
     self.detailTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:[NSString stringWithFormat:@"        %@",model.title] linSpacing:5];
     if (model.shop_type.integerValue == 1) {
         self.shopImgV.image =[UIImage imageNamed:@"tm_icon"];

KuDianProject/TOP/View/KDPLiveEarningCell.m

@@ -81,12 +81,13 @@
     
     UIView *oderV=[[UIView alloc]init];
     oderV.backgroundColor=[UIColor clearColor];
+    
     oderV.userInteractionEnabled=YES;
     [self.backImgV addSubview:oderV];
     [oderV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(114);
         make.height.mas_equalTo(17);
-        make.centerX.mas_equalTo(self.Forecastlabel.mas_centerX);
+       make.top.mas_equalTo(self.orderNumgL.mas_bottom).offset(1); make.centerX.mas_equalTo(self.Forecastlabel.mas_centerX);
     }];
     UIView *pointorderV=[[UIView alloc]init];
     pointorderV.layer.cornerRadius=3;
@@ -141,7 +142,7 @@
         [oderV mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.mas_equalTo(75);
             make.height.mas_equalTo(17);
-            make.centerX.mas_equalTo(self.orderNumgL.mas_centerX);
+           make.top.mas_equalTo(self.orderNumgL.mas_bottom).offset(1); make.centerX.mas_equalTo(self.orderNumgL.mas_centerX);
         }];
         UIView *pointorderV=[[UIView alloc]init];
         pointorderV.layer.cornerRadius=3;