Commit 066d4e9effaed23fe6bf5ad93785470a322c778b
1 parent
1c357b07
0.3.3 版本 去除发送消息更新会话时判断是否是正在聊天的会话
商家版订单消息高度修改
Showing
3 changed files
with
7 additions
and
7 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
| ... | ... | @@ -1721,8 +1721,8 @@ |
| 1721 | 1721 | |
| 1722 | 1722 | - (void)updateOnLastMessageChanged:(IMAConversation *)conv |
| 1723 | 1723 | { |
| 1724 | - if ([_chattingConversation isEqual:conv]) | |
| 1725 | - { | |
| 1724 | +// if ([_chattingConversation isEqual:conv]) | |
| 1725 | +// { | |
| 1726 | 1726 | NSInteger index = [_conversationList indexOfObject:conv]; |
| 1727 | 1727 | NSInteger toindex = [self insertPosition]; |
| 1728 | 1728 | if (index == _toIndex) { |
| ... | ... | @@ -1748,7 +1748,7 @@ |
| 1748 | 1748 | { |
| 1749 | 1749 | // index == 0 不作处理 |
| 1750 | 1750 | } |
| 1751 | - } | |
| 1751 | +// } | |
| 1752 | 1752 | } |
| 1753 | 1753 | |
| 1754 | 1754 | - (void)updateOnChat:(IMAConversation *)conv moveFromIndex:(NSUInteger)index toIndex:(NSInteger)toIdx | ... | ... |
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
| ... | ... | @@ -803,16 +803,16 @@ |
| 803 | 803 | //处理一个订单多笔商品时的高度显示问题,最多显示3个 |
| 804 | 804 | CGFloat goodsH = 0; |
| 805 | 805 | if (goodsDetailArray.count < 4) { |
| 806 | - goodsH = 50 * goodsDetailArray.count; | |
| 806 | + goodsH = 40 * goodsDetailArray.count; | |
| 807 | 807 | } |
| 808 | 808 | else |
| 809 | - goodsH = 50 * 3; | |
| 809 | + goodsH = 40 * 3; | |
| 810 | 810 | |
| 811 | 811 | if (selectTime || selectTime.length) { |
| 812 | 812 | //餐厅订单高度增加 |
| 813 | 813 | return CGSizeMake(width, (230 + goodsH + 10)*RATIO); |
| 814 | 814 | } |
| 815 | - return CGSizeMake(width, (150 + goodsH + 10)*RATIO); | |
| 815 | + return CGSizeMake(width, (120 + goodsH + 10)*RATIO); | |
| 816 | 816 | } |
| 817 | 817 | break; |
| 818 | 818 | case EIMAMSG_OrederRepast : | ... | ... |