0712

KuDianProject/AppConfig.h

@@ -14,12 +14,11 @@
 
 #define UMENG_KEY @"5cbebbdc4ca357298a000094"
 
+#define placholderImg @"placholderImg"
 #define SOURCE_ID @"7000"
 
-
 //验证码签名
 #define SignCode @"cNHWj7pqBSXTi2DS4uvxqMTzuXOk5xvL"
-
 #define UserPhone  @"UserPhone"
 
 

KuDianProject/Assets.xcassets/placholderImg.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "placholderImg.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "placholderImg@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "placholderImg@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

KuDianProject/Earning/Controller/KDPEarnViewController.m

@@ -12,7 +12,7 @@
 #import "KDPAccountVC.h"
 #import "KDPForecastVC.h"
 
-@interface KDPEarnViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
+@interface KDPEarnViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property(nonatomic,strong)NSDictionary *incomeDic;
 @property(nonatomic,strong)KDPEarningHeadView *headView;
 @property(nonatomic,strong)UITableView *tableView;
@@ -86,21 +86,6 @@
     return 0;
 }
 
-- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView{
-    return [UIImage imageNamed:@"no_order"];
-}
-
-- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
-    return YES;
-}
-
-- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
-    return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
-}
-
-- (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
-    return 50;
-}
 
 #pragma mark---侧滑
 -(void)drawerClickButton
@@ -139,8 +124,7 @@
         _tableView =[[UITableView alloc]init];
         _tableView.delegate =self;
         _tableView.dataSource=self;
-        _tableView.emptyDataSetDelegate = self;
-        _tableView.emptyDataSetSource = self; _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
+        _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
         _tableView.backgroundColor=[UIColor clearColor];
     }
     return _tableView;

KuDianProject/Earning/View/KDPAccountListCell.m

@@ -61,7 +61,7 @@
 -(void)setModel:(KDPBalanceModel *)model
 {
     _model=model;
-    [self.iconImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [self.iconImgV sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.titleLabel.text=model.title;
     self.timeLabel.text=model.create_time;
     self.tipeLabel.text=model.message;

KuDianProject/Earning/View/KDPEarningHeadView.m

@@ -47,7 +47,7 @@
     imgv.layer.cornerRadius=14;
     imgv.layer.masksToBounds=YES;
     KDPAccountModel *model=[KDPAccountTool account];
-    [imgv sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [imgv sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     [self.headImgBtn addSubview:imgv];
     
     UIImageView *imgV=[[UIImageView alloc]init];

KuDianProject/Earning/View/KDPForecastOrderCell.m

@@ -64,7 +64,7 @@
     _model = model;
     self.goodTitleLabel.text=model.name;
     self.addTimeL.text=[NSString stringWithFormat:@"创建日:%@",model.order_create_at];
-    [self.goodImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [self.goodImgV sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     
     NSMutableAttributedString *forastcaStr;
     switch ([model.status integerValue]) {//0已失效 1已付款 2已结算  status

KuDianProject/LiveData/Controller/KDPLiveLeftTableViewCell.m

@@ -172,7 +172,7 @@
     _timeLabel.text = [NSString stringWithFormat:@"直播时间:%@",model.show_time];
     _goodCountLabel.text = model.goods_num;
     _orderLabel.text = model.order_num;
-    [_iconImageView sd_setImageWithURL:[NSURL URLWithString:model.show_img]];
+    [_iconImageView sd_setImageWithURL:[NSURL URLWithString:model.show_img]placeholderImage:[UIImage imageNamed:placholderImg]];
     _investLabel.text = model.pre_rebate;
     
 }

KuDianProject/LiveData/Controller/KDPLiveRightTableViewCell.m

@@ -163,7 +163,7 @@
 
 - (void)configWithViewModel:(id)viewModel indexpath:(NSIndexPath *)indexPath{
     KDPLiveStatisticsModel *statisModel = (KDPLiveStatisticsModel *)viewModel;
-    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:statisModel.img]];
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:statisModel.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.titleLabel.text = statisModel.name;
     self.priceLabel.text = [NSString stringWithFormat:@"%.2f",[statisModel.money floatValue]];
     self.profitLabel.text = [NSString stringWithFormat:@"%@%%",statisModel.commission_rate];

KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -31,6 +31,7 @@
     // Do any additional setup after loading the view.
     self.navBar.hidden = YES;
     self.type = @"today";
+    
     UIView *backView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 115)];
     [backView setGradientBackgroundWithColors:@[[UIColor colorWithHex:0xFF235F],[UIColor colorWithHex:0xFF7676]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     [self.view addSubview:backView];

KuDianProject/LiveData/Controller/KDPOrderDetailTableViewCell.m

@@ -136,7 +136,7 @@
 
 - (void)configWithViewModel:(id)viewModel indexpath:(NSIndexPath *)indexPath{
     KDPLiveDetailModel *detailModel = (KDPLiveDetailModel *)viewModel;
-    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:detailModel.img]];
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:detailModel.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.goodTitleLabel.text = detailModel.name;
     self.createTimeLabel.text = [NSString stringWithFormat:@"创建日:%@",detailModel.order_create_at];
     self.endTimeLabel.text = [NSString stringWithFormat:@"结算日:%@",detailModel.order_balance_at];

KuDianProject/MainTab/KDPMainNavViewController.m

@@ -17,8 +17,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.navigationBar.shadowImage= [UIImage new];
+    self.navigationController.navigationBar.shadowImage= [UIImage new];
 }
 
+
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated{
     
     // 解决push到子控制器时tabbar不隐藏的问题

KuDianProject/SupplyGood/Controller/KDPSupplyGoodViewController.m

@@ -140,7 +140,7 @@
     KDPClassModel *classModel = self.classArray[index];
     if (classModel.backimg.length) {
         self.topBackImageView.hidden = NO;
-        [self.topBackImageView sd_setImageWithURL:[NSURL URLWithString:classModel.backimg]];
+        [self.topBackImageView sd_setImageWithURL:[NSURL URLWithString:classModel.backimg]placeholderImage:[UIImage imageNamed:placholderImg]];
     } else{
         self.topBackImageView.hidden = YES;
     }

KuDianProject/SupplyGood/View/KDPSupplyCommentViewCell.m

@@ -118,7 +118,7 @@
 
 - (void)configCellWithModel:(id)model indexPath:(NSIndexPath *)indexpath{
     KDPClassModel *goodModel = (KDPClassModel *)model;
-    [_commentImageView sd_setImageWithURL:[NSURL URLWithString:goodModel.icon]];
+    [_commentImageView sd_setImageWithURL:[NSURL URLWithString:goodModel.icon]placeholderImage:[UIImage imageNamed:placholderImg]];
     _commentLabel.text = goodModel.name;
 }
 

KuDianProject/SupplyGood/View/KDPSupplyGoodCollectionViewCell.m

@@ -129,7 +129,7 @@
 
 - (void)configCellWithModel:(id)model indexPath:(NSIndexPath *)indexpath{
     KDPGoodsModel *goodModel = (KDPGoodsModel *)model;
-    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:goodModel.img]];
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:goodModel.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.goodLabel.text = goodModel.title;
     NSString *priceString = [NSString stringWithFormat:@"￥%@",goodModel.discount_price];
     NSMutableAttributedString *mutableAttPrice = [[NSMutableAttributedString alloc] initWithString:priceString attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:[UIFont fontWithName:@"PingFangSC-Medium" size: 18]}];

KuDianProject/TOP/Controller/KDPDrawerVC.m

@@ -142,7 +142,7 @@
     headImgV.layer.masksToBounds=YES;
     [backV addSubview:headImgV];
     KDPAccountModel *model =[KDPAccountTool account];
-    [headImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [headImgV sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     headImgV.centerX=backV.centerX;
     
     headLabel=[[UILabel alloc]initWithFrame:CGRectMake(0, headImgV.bottom+10, SCREEN_WIDTH/3*2, 21)];

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -11,6 +11,7 @@
 #import "KDPSellingPointView.h"
 #import "KDPShopView.h"
 #import <WebKit/WebKit.h>
+#import "KDPCollectHistoryPageVC.h"
 #import "KDPPasteView.h"
 #import <AlibcTradeSDK/AlibcTradeSDK.h>
 #define goodHeight 496+KDStatusHeight
@@ -299,6 +300,7 @@
     
     UIButton * collectBtn=[[UIButton alloc]initWithFrame:CGRectMake(self.view.width-47, KDStatusHeight+10, 30, 30)];
     [collectBtn setImage:[UIImage imageNamed:@"detail_collection"] forState:UIControlStateNormal];
+    collectBtn.adjustsImageWhenHighlighted=NO;
     [collectBtn addTarget:self action:@selector(collectPageClickSel) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:collectBtn];
     
@@ -393,7 +395,8 @@
 }
 -(void)collectPageClickSel
 {
-    KDPCollectHistoryVC *histT=[[KDPCollectHistoryVC alloc]init];
+    KDPCollectHistoryPageVC *histT=[[KDPCollectHistoryPageVC alloc]init];
+    
     [self.navigationController pushViewController:histT animated:YES];
 }
 #pragma mark---推广到快手

KuDianProject/TOP/Controller/KDPTodayListViewController.m

@@ -49,6 +49,8 @@
     [self.view addSubview:self.tableView];
    
     if (![self.todayStr isEqualToString:@"销量走势"]) {
+        _tableView.emptyDataSetDelegate = self;
+        _tableView.emptyDataSetSource = self;
         if ([self.todayStr isEqualToString:@"实时订单"]) {
            
             [self timerClickAction];
@@ -198,8 +200,7 @@
         _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
         _tableView.delegate=self;
         _tableView.dataSource=self;
-        _tableView.emptyDataSetDelegate = self;
-        _tableView.emptyDataSetSource = self;
+       
         _tableView.showsVerticalScrollIndicator=NO;
         _tableView.showsHorizontalScrollIndicator=NO;
     }

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -54,7 +54,7 @@
     [self initUI];
     
 
-    [self getUserTodayIncom];
+   
     
     
 }
@@ -62,7 +62,7 @@
 #pragma makr---首页收益
 -(void)getUserTodayIncom
 {
-    [LoadingView show];
+//    [LoadingView show];
     [KDPNetworkRequestHTTP postURL:topIncomeUrl params:nil success:^(id  _Nonnull json) {
         //订单数量,返回的是总数量，减去之前的数量
         
@@ -75,9 +75,9 @@
         
         [self.dataCollectionView reloadData];
         
-        [LoadingView dismiss];
+//        [LoadingView dismiss];
     } failure:^(NSError * _Nonnull error) {
-        [LoadingView dismiss];
+//        [LoadingView dismiss];
     }];
 }
 
@@ -346,7 +346,8 @@
         _dataCollectionView.delegate=self;
         _dataCollectionView.dataSource=self;
         _dataCollectionView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
-            self.pageNum = @"1";
+            
+            [self initialieValues];
             [self getRecommendGood];
         }];
         _dataCollectionView.emptyDataSetDelegate = self;
@@ -411,7 +412,7 @@
 {
     KDPAccountModel *model=[KDPAccountTool account];
     UIImageView *imgv=[self.headImgBtn viewWithTag:1000];
-    [imgv sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [imgv sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
 }
 
 #pragma mark---打开服务提示页面

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryPageVC.m

@@ -22,7 +22,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setUpPageVc];
-    
+    self.navigationController.navigationBar.barTintColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
 }
 - (void)setUpPageVc{
     self.navBar.hidden=YES;
@@ -30,7 +30,7 @@
     titleArray=@[@"收藏夹",@"浏览记录"];
     [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
     UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
-    [returnBtn setImage:[UIImage imageNamed:@"return_black"] forState:UIControlStateNormal];
+    [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
     [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
     self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn];
     
@@ -41,16 +41,16 @@
     //标题高度
     config.titleViewHeight = 40;
     //标题选中颜色
-    config.titleSelectedColor = [UIColor blackColor];
+    config.titleSelectedColor = [UIColor whiteColor];
     //标题选中字体
     config.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size: 17];
     //标题正常颜色
-    config.titleNormalColor = [UIColor colorWithHexString:@"#5B5B5B"];
+    config.titleNormalColor = [UIColor whiteColor];
     //标题正常字体
     config.titleNormalFont = [UIFont fontWithName:@"PingFang-SC-Medium" size: 14];
     config.titleViewInset = UIEdgeInsetsMake(0, 10, 0, 10);
     //阴影颜色
-    config.shadowLineColor = [UIColor colorWithHexString:@"#5B5B5B"];
+    config.shadowLineColor = [UIColor whiteColor];
     //阴影宽度
     config.shadowLineWidth = 24;
     //阴影末端是直角
@@ -106,12 +106,13 @@
 {
     [super viewWillAppear:animated];
     self.navigationController.navigationBar.hidden=NO;
+    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
     self.tabBarController.tabBar.hidden=YES;
 }
 -(void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
+   
     self.tabBarController.tabBar.hidden=NO;
     self.navigationController.navigationBar.hidden=NO;
     self.view.frame=[UIScreen mainScreen].bounds;

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -22,6 +22,7 @@
     [super viewDidLoad];
     self.page_num = 1;
     [self setNavUI];
+    
     [self reqeustData];
 }
 -(void)reqeustData

KuDianProject/TOP/Drawer/Control/KDPIDViewController.m

@@ -57,7 +57,7 @@
     [self.view addSubview:label];
     
     
-    UIButton *bindButton=[[UIButton alloc]initWithFrame:CGRectMake(0, SCREEN_HEIGHT-50, SCREEN_WIDTH, 50)];
+    UIButton *bindButton=[[UIButton alloc]initWithFrame:CGRectMake(0, SCREEN_HEIGHT-50-KDTabBottomHeight, SCREEN_WIDTH, 50)];
     [bindButton setTitleColor:[UIColor colorWithHexString:ThemeColor] forState:UIControlStateNormal];
     [bindButton setTitle:@"去绑定" forState:UIControlStateNormal];
     bindButton.titleLabel.font=[UIFont systemFontOfSize:14];

KuDianProject/TOP/Drawer/Control/KDPUserInfoVC.m

@@ -46,7 +46,7 @@
     if (indexPath.row == 0) {
         listC.iconImgV.hidden=NO;
         listC.contentLabel.hidden=YES;
-        [listC.iconImgV sd_setImageWithURL:[NSURL URLWithString:userInfoDic[@"kwai_headurl"]]];
+        [listC.iconImgV sd_setImageWithURL:[NSURL URLWithString:userInfoDic[@"kwai_headurl"]]placeholderImage:[UIImage imageNamed:placholderImg]];
     }else{
         listC.contentLabel.hidden=NO;
         listC.iconImgV.hidden=YES;

KuDianProject/TOP/Drawer/View/KDPHistoryListCell.m

@@ -118,7 +118,7 @@
 -(void)setModel:(KDPGoodsModel *)model
 {
     _model = model;
-    [self.goodImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [self.goodImgV sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.goodTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:model.title linSpacing:5];
     NSString *timetitle= [NSString stringWithFormat:@"￥%@/利润%@",model.discount_price,model.commission_rate];
     NSString *prices =[NSString stringWithFormat:@"￥%@/",model.discount_price];

KuDianProject/TOP/Drawer/View/KDPMessageTableViewCell.m

@@ -108,7 +108,7 @@
     KDPNoticeModel *noticeModel = (KDPNoticeModel *)viewModel;
     _titleLabel.text = noticeModel.title;
     _timeLabel.text = noticeModel.push_at;
-    [_iconImageView sd_setImageWithURL:[NSURL URLWithString:noticeModel.image_url]];
+    [_iconImageView sd_setImageWithURL:[NSURL URLWithString:noticeModel.image_url]placeholderImage:[UIImage imageNamed:placholderImg]];
     _contentLabel.text = noticeModel.message;
     [self setLineSpace:5.0f withText:noticeModel.message inLabel:_contentLabel];
 }

KuDianProject/TOP/View/Detail/KDPShopView.m

@@ -45,7 +45,7 @@
 -(void)setShopDic:(NSDictionary *)shopDic
 {
     _shopDic = shopDic;
-    [self.shopimgV sd_setImageWithURL:[NSURL URLWithString:shopDic[@"pic_path"]]];
+    [self.shopimgV sd_setImageWithURL:[NSURL URLWithString:shopDic[@"pic_path"]]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.shopLabel.text=shopDic[@"title"];
     
     self.desclabel.text=[NSString stringWithFormat:@"商品描述:%@  服务态度:%@  发货速度:%@",shopDic[@"item_score"],shopDic[@"service_score"],shopDic[@"delivery_score"]];

KuDianProject/TOP/View/KDPRecommendGoodCell.m

@@ -245,7 +245,7 @@
     _model = model;
     //设置字体字号和字体类别
     self.recomprofitL.text=[NSString stringWithFormat:@"利润%@",model.commission_rate];
-    [self.recomImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [self.recomImgV sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.recomShopL.text=model.shop_title;
      self.recomTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:model.title linSpacing:5];
     if (model.shop_type.integerValue == 1) {

KuDianProject/TOP/View/KDPTodayListCell.m

@@ -175,6 +175,6 @@
     self.livePriceL.attributedText = newstr;
     
     self.todayTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:model.name linSpacing:5];
-    [self.todayGoodImgV sd_setImageWithURL:[NSURL URLWithString:model.img]];
+    [self.todayGoodImgV sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
 }
 @end