学丽 5 years ago
parent
commit
86d60c2457

+ 1 - 1
KuDianProject/Earning/Chart/SSWLineChartView.m

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

+ 2 - 2
KuDianProject/Earning/Chart/SSWlineIncomeChartView.m

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

+ 5 - 0
KuDianProject/Earning/Controller/KDPAccountVC.m

@@ -146,6 +146,11 @@
146 146
         _accountView.emptyDataSetSource = self;
147 147
         _accountView.delegate=self;
148 148
         _accountView.dataSource=self;
149
+        if (@available(iOS 11.0, *)) {
150
+            _accountView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
151
+        } else {
152
+            self.automaticallyAdjustsScrollViewInsets = NO;
153
+        }
149 154
         _accountView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
150 155
             page_num = 1;
151 156
             [self getBalanceList];

+ 5 - 0
KuDianProject/Earning/Controller/KDPForecastOrderListVC.m

@@ -134,6 +134,11 @@
134 134
             page_num = 1;
135 135
             [self getMonthOrderList];
136 136
         }];
137
+        if (@available(iOS 11.0, *)) {
138
+            _forecastView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
139
+        } else {
140
+            self.automaticallyAdjustsScrollViewInsets = NO;
141
+        }
137 142
         _forecastView.emptyDataSetDelegate = self;
138 143
         _forecastView.emptyDataSetSource = self;
139 144
         _forecastView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{

+ 5 - 0
KuDianProject/Earning/Controller/KDPForecastVC.m

@@ -119,6 +119,11 @@
119 119
         _forecastView.backgroundColor=[UIColor clearColor];
120 120
         _forecastView.emptyDataSetDelegate = self;
121 121
         _forecastView.emptyDataSetSource = self; _forecastView.separatorStyle=UITableViewCellSeparatorStyleNone;
122
+        if (@available(iOS 11.0, *)) {
123
+            _forecastView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
124
+        } else {
125
+            self.automaticallyAdjustsScrollViewInsets = NO;
126
+        }
122 127
         _forecastView.delegate=self;
123 128
         _forecastView.dataSource=self;
124 129
         [self addtabheader];

+ 5 - 0
KuDianProject/Earning/Controller/KDPOrderDetailListNewVC.m

@@ -109,6 +109,11 @@
109 109
             page_num = 1;
110 110
             [self ordeListData];
111 111
         }];
112
+        if (@available(iOS 11.0, *)) {
113
+            _forecastView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
114
+        } else {
115
+            self.automaticallyAdjustsScrollViewInsets = NO;
116
+        }
112 117
         _forecastView.emptyDataSetDelegate = self;
113 118
         _forecastView.emptyDataSetSource = self;
114 119
         _forecastView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{

+ 6 - 1
KuDianProject/Earning/View/KDPEarnTableHeadView.m

@@ -170,7 +170,12 @@
170 170
             [yArr addObject:dic[@"num"]];
171 171
             [xArr addObject:dic[@"time"]];
172 172
         }
173
-        self.chartView.barWidth=SCREEN_WIDTH/xArr.count-80/xArr.count;
173
+        if (xArr.count > 7) {
174
+            self.chartView.barWidth=50;
175
+        }else{
176
+            self.chartView.barWidth=SCREEN_WIDTH/xArr.count-80/xArr.count;
177
+        }
178
+        
174 179
         self.chartView.xValuesArr=xArr;
175 180
         self.chartView.yValuesArr=yArr;
176 181
         

+ 1 - 1
KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

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

+ 1 - 1
KuDianProject/TOP/Controller/KDPDrawerVC.m

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

+ 2 - 2
KuDianProject/TOP/Controller/KDPGoodDetailVC.m

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

+ 5 - 0
KuDianProject/TOP/Controller/KDPProjectListVC.m

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

+ 5 - 1
KuDianProject/TOP/Controller/KDPTodayListViewController.m

@@ -200,7 +200,11 @@
200 200
         _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
201 201
         _tableView.delegate=self;
202 202
         _tableView.dataSource=self;
203
-       
203
+        if (@available(iOS 11.0, *)) {
204
+            _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
205
+        } else {
206
+            self.automaticallyAdjustsScrollViewInsets = NO;
207
+        }
204 208
         _tableView.showsVerticalScrollIndicator=NO;
205 209
         _tableView.showsHorizontalScrollIndicator=NO;
206 210
     }

+ 18 - 13
KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -53,7 +53,7 @@
53 53
     [self initialieValues];
54 54
     [self initUI];
55 55
     
56
-
56
+    [self getBanner];
57 57
    
58 58
     
59 59
     
@@ -62,7 +62,7 @@
62 62
 #pragma makr---首页收益
63 63
 -(void)getUserTodayIncom
64 64
 {
65
-//    [LoadingView show];
65
+
66 66
     [KDPNetworkRequestHTTP postURL:topIncomeUrl params:nil success:^(id  _Nonnull json) {
67 67
         //订单数量,返回的是总数量,减去之前的数量
68 68
         
@@ -74,10 +74,8 @@
74 74
         self.order_rebate_money = json[@"total_rebate"];
75 75
         
76 76
         [self.dataCollectionView reloadData];
77
-        
78
-//        [LoadingView dismiss];
77
+
79 78
     } failure:^(NSError * _Nonnull error) {
80
-//        [LoadingView dismiss];
81 79
     }];
82 80
 }
83 81
 
@@ -98,10 +96,11 @@
98 96
 #pragma makr---获取首页数据
99 97
 -(void)getRecommendGood
100 98
 {
101
-    [LoadingView show];
99
+//    [LoadingView show];
100
+    
102 101
     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};
103 102
     [KDPNetworkRequestHTTP postURL:topGoodRecommURL params:dic success:^(id  _Nonnull json) {
104
-        [self getBanner];
103
+        
105 104
         [LoadingView dismiss];
106 105
         self.selection_id_page = json[@"selection_id_count"];
107 106
         self.selection_id = json[@"selection_id"];
@@ -120,11 +119,12 @@
120 119
        
121 120
         [self.dataArray addObjectsFromArray:currentA];
122 121
         
123
-        
124 122
         [self.dataCollectionView reloadData];
125 123
         
126 124
     } failure:^(NSError * _Nonnull error) {
127 125
         [LoadingView dismiss];
126
+        [self.dataCollectionView.mj_header endRefreshing];
127
+        [self.dataCollectionView.mj_footer endRefreshing];
128 128
     }];
129 129
 }
130 130
 
@@ -209,9 +209,9 @@
209 209
     }
210 210
     earinCell.orderNumgL.text=self.orderNumber;
211 211
     earinCell.rebet_money=self.order_rebate_money;
212
-    earinCell.liveDataBlock = ^{
213
-        self.tabBarController.selectedIndex=2;
214
-    };
212
+//    earinCell.liveDataBlock = ^{
213
+//        self.tabBarController.selectedIndex=2;
214
+//    };
215 215
     return earinCell;
216 216
     
217 217
 }
@@ -346,13 +346,17 @@
346 346
         _dataCollectionView.delegate=self;
347 347
         _dataCollectionView.dataSource=self;
348 348
         _dataCollectionView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
349
-            
349
+            [self getBanner];
350 350
             [self initialieValues];
351 351
             [self getRecommendGood];
352 352
         }];
353 353
         _dataCollectionView.emptyDataSetDelegate = self;
354 354
         _dataCollectionView.emptyDataSetSource = self;
355
-        _dataCollectionView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
355
+        if (@available(iOS 11.0, *)) {
356
+            _dataCollectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
357
+        } else {
358
+              self.automaticallyAdjustsScrollViewInsets = NO;
359
+        } _dataCollectionView.mj_footer=[MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
356 360
             self.pageNum=[NSString stringWithFormat:@"%ld",self.pageNum.integerValue+1];
357 361
             [self getRecommendGood];
358 362
         }];
@@ -394,6 +398,7 @@
394 398
         [self isOpenService];
395 399
         [self initialieValues];
396 400
         [self getRecommendGood];
401
+        
397 402
         [self messageUnreadNumData];
398 403
         order_timer = [NSTimer timerWithTimeInterval:30 target:self selector:@selector(order_timerAction) userInfo:nil repeats:YES];
399 404
         [[NSRunLoop mainRunLoop] addTimer:order_timer forMode:NSDefaultRunLoopMode];

+ 4 - 3
KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -118,12 +118,13 @@
118 118
         _collectView.showsHorizontalScrollIndicator=NO;
119 119
         _collectView.emptyDataSetDelegate = self;
120 120
         _collectView.emptyDataSetSource = self;
121
+         _collectView.separatorStyle=UITableViewCellSeparatorStyleNone;
122
+        _collectView.delegate=self;
121 123
         if (@available(iOS 11.0, *)) {
122 124
             _collectView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
123 125
         } else {
124
-            // Fallback on earlier versions
125
-        } _collectView.separatorStyle=UITableViewCellSeparatorStyleNone;
126
-        _collectView.delegate=self;
126
+            self.automaticallyAdjustsScrollViewInsets = NO;
127
+        }
127 128
         _collectView.dataSource=self;
128 129
         _collectView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
129 130
             self.page_num = 1;

+ 5 - 0
KuDianProject/TOP/Drawer/Control/KDPSetViewController.m

@@ -85,6 +85,11 @@
85 85
         _setView=[[UITableView alloc]init];
86 86
         _setView.backgroundColor=[UIColor clearColor];
87 87
         _setView.separatorStyle=UITableViewCellSeparatorStyleNone;
88
+        if (@available(iOS 11.0, *)) {
89
+            _setView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
90
+        } else {
91
+            self.automaticallyAdjustsScrollViewInsets = NO;
92
+        }
88 93
         _setView.delegate=self;
89 94
         _setView.dataSource=self;
90 95
         

+ 5 - 0
KuDianProject/TOP/Drawer/Control/KDPUserInfoVC.m

@@ -100,6 +100,11 @@
100 100
         _infoView=[[UITableView alloc]init];
101 101
         _infoView.backgroundColor=[UIColor clearColor];
102 102
         _infoView.separatorStyle=UITableViewCellSeparatorStyleNone;
103
+        if (@available(iOS 11.0, *)) {
104
+            _infoView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
105
+        } else {
106
+            self.automaticallyAdjustsScrollViewInsets = NO;
107
+        }
103 108
         _infoView.delegate=self;
104 109
         _infoView.dataSource=self;
105 110
         

+ 3 - 0
KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

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

+ 3 - 2
KuDianProject/TOP/View/KDPLiveEarningCell.m

@@ -81,12 +81,13 @@
81 81
     
82 82
     UIView *oderV=[[UIView alloc]init];
83 83
     oderV.backgroundColor=[UIColor clearColor];
84
+    
84 85
     oderV.userInteractionEnabled=YES;
85 86
     [self.backImgV addSubview:oderV];
86 87
     [oderV mas_makeConstraints:^(MASConstraintMaker *make) {
87 88
         make.width.mas_equalTo(114);
88 89
         make.height.mas_equalTo(17);
89
-        make.centerX.mas_equalTo(self.Forecastlabel.mas_centerX);
90
+       make.top.mas_equalTo(self.orderNumgL.mas_bottom).offset(1); make.centerX.mas_equalTo(self.Forecastlabel.mas_centerX);
90 91
     }];
91 92
     UIView *pointorderV=[[UIView alloc]init];
92 93
     pointorderV.layer.cornerRadius=3;
@@ -141,7 +142,7 @@
141 142
         [oderV mas_makeConstraints:^(MASConstraintMaker *make) {
142 143
             make.width.mas_equalTo(75);
143 144
             make.height.mas_equalTo(17);
144
-            make.centerX.mas_equalTo(self.orderNumgL.mas_centerX);
145
+           make.top.mas_equalTo(self.orderNumgL.mas_bottom).offset(1); make.centerX.mas_equalTo(self.orderNumgL.mas_centerX);
145 146
         }];
146 147
         UIView *pointorderV=[[UIView alloc]init];
147 148
         pointorderV.layer.cornerRadius=3;