1，首页缓存问题

2，品牌商品页，根据是否有品牌图来判断是否显示品牌图区域
3，去掉所有品牌的获取缓存失败提示。

iCemarose/Class/UI/Brand/KWMBrandCaramelVC.m

@@ -65,9 +65,23 @@
     // Do any additional setup after loading the view.
     
     [self initView];
+    [self initTableViewHeaderHidden];
     [self getCollection:_handle];
 }
 
+- (void)initTableViewHeaderHidden{
+    //判断是否有品牌图，有就显示
+    if(self.collection &&
+       self.collection.image && self.collection.image.sourceURL &&
+       ![KWMStringUtil isEmpty:self.collection.image.sourceURL.absoluteString]){
+        self.tbvBrandCaramel.tableHeaderView.frame = CGRectMake(0, 0, UI_SCREEN_WIDTH, 210);
+        self.tbvBrandCaramel.tableHeaderView.hidden = NO;
+    }else{
+        self.tbvBrandCaramel.tableHeaderView.frame = CGRectMake(0, 0, 0, 0);
+        self.tbvBrandCaramel.tableHeaderView.hidden = YES;
+    }
+}
+
 - (void)setBackColor{
        colorArr = [NSArray arrayWithObjects:@"#D8A88D",@"#A4C8C6",@"#E6C995",@"#718473",@"#D7B48B", nil];
     int num = arc4random_uniform(10);
@@ -313,6 +327,7 @@ static NSString *idStr = @"KWMBrandCaramelCell";
 }
 
 - (void)setBrandData{
+    [self initTableViewHeaderHidden];
     //图片
     if(_collection!=nil && _collection.image!=nil){
         NSURL *url =  [_collection.image sourceURL];

iCemarose/Class/UI/Brand/KWMSearchBrandVC.m

@@ -322,14 +322,16 @@ static NSString *identify = @"KWMSearchBrandsCell";
         [weakSelf.tbvSearchBrand reloadData];
     };
     void(^cacheCallback)(KWMBrandsResult *) = ^(KWMBrandsResult *result){
-        if([weakSelf hasCemaroseError:result]){
-            return ;
-        }
+//        if([weakSelf hasCemaroseError:result]){
+//            return ;
+//        }
+        if(result && result.brands){
             NSArray *indexArray= [[result.brands rx_filterWithBlock:^BOOL(id each) {
                 return each && each != [NSNull null];
             }] arrayWithPinYinFirstLetterFormat];
             _dataArray =[NSMutableArray arrayWithArray:indexArray];
             [weakSelf.tbvSearchBrand reloadData];
+        }
     };
     [self.api getAllBrand:nil cacheCallback:cacheCallback success:success failure:failure];
 //    [self showLoading];

iCemarose/Class/UI/Category/KWMCategoryVC.m

@@ -300,10 +300,12 @@
         }
     };
     void(^cacheCallback)(KWMBrandsResult *) = ^(KWMBrandsResult *result){
-        if([weakSelf hasCemaroseError:result]){
-            return ;
-        }
+//        if([weakSelf hasCemaroseError:result]){
+//            return ;
+//        }
+        if(result && result.brands){
             self.allBrands = result.brands;
+        }
     };
     [self.api getAllBrand:nil cacheCallback:cacheCallback success:success failure:failure];
 }

iCemarose/Class/UI/NewHome/KWMNewHomeVC.m

@@ -455,6 +455,7 @@ typedef enum{
 
 #pragma mark -cache
 /** 因为homedata api的url是动态的，url上的时间戳随时间的改变，所以需要手动保存，和获取 **/
+//缓存规则：网络请求数据照常，如果没网络，并且缓存有数据，会拿缓存的数据显示。
 -(BOOL)isUseHomeDataCache{
     if(!kIsNetwork){
         KWMHomeData *homeData = [KWMPPCacheUtil getHomeDataByCache:nil urlKey:CACHE_KEY_getHomeDataWithSuccess];
@@ -462,7 +463,6 @@ typedef enum{
             self.homeData = homeData;
             [self.cvHome reloadData];
         }else{
-            [self showToast:CACHE_KEY_FAIL_HINT];
             return false;
         }
     }
@@ -486,6 +486,7 @@ typedef enum{
     return params;
 }
 
+//缓存规则：网络请求数据照常，如果没网络，并且缓存有数据，会拿缓存的数据显示。
 -(BOOL)isUseProductDataCache:(NSDictionary *)cacheKeyDictionary valueKeyPath:(NSString *)valueKeyPath page:(NSUInteger)page isHome:(BOOL)isHome{
     if(!kIsNetwork){
         [self hideLoading];
@@ -498,10 +499,6 @@ typedef enum{
                 products.count ? [self.cvHome.mj_footer endRefreshing] : [self.cvHome.mj_footer endRefreshingWithNoMoreData];
             }
         }else{
-            [self showToast:CACHE_KEY_FAIL_HINT];
-            if (isHome) {
-                [self.cvHome.mj_footer endRefreshing];
-            }
             return false;
         }
     }