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

KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -67,6 +67,7 @@
     tipLabel.layer.cornerRadius = 11;
     tipLabel.textAlignment=NSTextAlignmentCenter;
     tipLabel.layer.masksToBounds = YES;
+    tipLabel.textAlignment = NSTextAlignmentCenter;
     tipLabel.text = @"目前只统计直播期间该商品订单数哦";
     tipLabel.centerX = self.view.centerX;
     [self.view addSubview:tipLabel];

KuDianProject/SupplyGood/View/KDPSupplyGoodCollectionViewCell.m

@@ -84,7 +84,8 @@
     self.profitLabel = [[UILabel alloc] init];
     self.profitLabel.textColor = [UIColor whiteColor];
     self.profitLabel.font = [UIFont fontWithName:@"PingFangSC-Medium" size: 16];
-    self.profitLabel.textAlignment = NSTextAlignmentCenter;
+    self.profitLabel.adjustsFontSizeToFitWidth = YES;
+    self.profitLabel.textAlignment = NSTextAlignmentLeft;
     [self.contenAView addSubview:self.profitLabel];
 }
 

KuDianProject/TOP/Controller/KDPNoticeViewController.m

@@ -87,12 +87,11 @@
             [self.dataSource addObjectsFromArray:list];
             [self.tableView.mj_footer endRefreshing];
             [self.tableView.mj_header endRefreshing];
-            self.clearBtn.hidden = NO;
         }else {
-            self.clearBtn.hidden = YES;
             [self.tableView.mj_header endRefreshing];
             [self.tableView.mj_footer endRefreshingWithNoMoreData];
         }
+        self.clearBtn.hidden = self.dataSource.count ? NO : YES;
         
         [LoadingView dismiss];
         [self.tableView reloadData];

KuDianProject/TOP/Drawer/View/KDPMessageTableViewCell.m

@@ -110,6 +110,7 @@
     _timeLabel.text = noticeModel.push_at;
     [_iconImageView sd_setImageWithURL:[NSURL URLWithString:noticeModel.image_url]placeholderImage:[UIImage imageNamed:placholderImg]];
     _contentLabel.text = noticeModel.message;
+    _isView.hidden = [noticeModel.is_view isEqualToString:@"1"] ? YES : NO;
     [self setLineSpace:5.0f withText:noticeModel.message inLabel:_contentLabel];
 }