Commit 70aef4eb955647f08f8caf4ef1a34e8f4313002b

Authored by daojian
1 parent b4485a03

0.2.2 版本 解决商家版订单列表高度显示不对

CNLiveNewIMAManagerKit.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveNewIMAManagerKit' 10 s.name = 'CNLiveNewIMAManagerKit'
11 - s.version = '0.2.1' 11 + s.version = '0.2.2'
12 s.summary = 'A short description of CNLiveNewIMAManagerKit.' 12 s.summary = 'A short description of CNLiveNewIMAManagerKit.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
@@ -798,11 +798,21 @@ @@ -798,11 +798,21 @@
798 NSDictionary * jsonDic = element.data.jsonValueDecoded; 798 NSDictionary * jsonDic = element.data.jsonValueDecoded;
799 NSDictionary * foodsGoodsOrderInfo = [jsonDic objectForKey:@"foodsGoodsOrderInfo"]; 799 NSDictionary * foodsGoodsOrderInfo = [jsonDic objectForKey:@"foodsGoodsOrderInfo"];
800 NSString *selectTime = foodsGoodsOrderInfo[@"selectTime"]; 800 NSString *selectTime = foodsGoodsOrderInfo[@"selectTime"];
  801 + NSArray *goodsDetailArray = foodsGoodsOrderInfo[@"detail"];
  802 +
  803 + //处理一个订单多笔商品时的高度显示问题,最多显示3个
  804 + CGFloat goodsH = 0;
  805 + if (goodsDetailArray.count < 4) {
  806 + goodsH = 50 * goodsDetailArray.count;
  807 + }
  808 + else
  809 + goodsH = 50 * 3;
  810 +
801 if (selectTime || selectTime.length) { 811 if (selectTime || selectTime.length) {
802 //餐厅订单高度增加 812 //餐厅订单高度增加
803 - return CGSizeMake(width, (280+10)*RATIO); 813 + return CGSizeMake(width, (230 + goodsH + 10)*RATIO);
804 } 814 }
805 - return CGSizeMake(width, (200+10)*RATIO); 815 + return CGSizeMake(width, (150 + goodsH + 10)*RATIO);
806 } 816 }
807 break; 817 break;
808 case EIMAMSG_OrederRepast : 818 case EIMAMSG_OrederRepast :