私信猴子表情特殊处理

wanghengheng · wanghengheng · commit 46cb9ab257a3 · 2015-09-15T17:23:51.000+08:00
diff --git a/Coding_iOS/Models/PrivateMessage.h b/Coding_iOS/Models/PrivateMessage.h
@@ -27,6 +27,7 @@ typedef NS_ENUM(NSInteger, PrivateMessageSendStatus) {
 @property (strong, nonatomic) VoiceMedia *voiceMedia;
 
 - (BOOL)hasMedia;
+- (BOOL)isSingleBigMonkey;
 
 + (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend;
 
diff --git a/Coding_iOS/Models/PrivateMessage.m b/Coding_iOS/Models/PrivateMessage.m
@@ -33,7 +33,18 @@ - (void)setContent:(NSString *)content{
 - (BOOL)hasMedia{
     return self.nextImg || (self.htmlMedia && self.htmlMedia.imageItems.count> 0);
 }
-
+- (BOOL)isSingleBigMonkey{
+    BOOL isSingleBigMonkey = NO;
+    if (self.content.length == 0) {
+        if (_htmlMedia.imageItems.count == 1) {
+            HtmlMediaItem *item = [_htmlMedia.imageItems firstObject];
+            if (item.type == HtmlMediaItemType_EmotionMonkey) {
+                isSingleBigMonkey = YES;
+            }
+        }
+    }
+    return isSingleBigMonkey;
+}
 + (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend{
     PrivateMessage *nextMsg = [[PrivateMessage alloc] init];
     nextMsg.sender = [Login curLoginUser];
diff --git a/Coding_iOS/Views/CCell/MessageMediaItemCCell.h b/Coding_iOS/Views/CCell/MessageMediaItemCCell.h
@@ -7,6 +7,7 @@
 //
 
 #define kCCellIdentifier_MessageMediaItem @"MessageMediaItemCCell"
+#define kCCellIdentifier_MessageMediaItem_Single @"MessageMediaItemCCell_Single"
 
 #import <UIKit/UIKit.h>
 #import "HtmlMedia.h"
@@ -16,9 +17,11 @@
 @interface MessageMediaItemCCell : UICollectionViewCell
 @property (copy, nonatomic) void (^refreshMessageMediaCCellBlock)(CGFloat diff);
 
-@property (strong, nonatomic) PrivateMessage *curPriMsg, *prePriMsg;
+//@property (strong, nonatomic) PrivateMessage *curPriMsg, *prePriMsg;
 @property (strong, nonatomic) NSObject *curObj;
 @property (strong, nonatomic) YLImageView *imgView;
 
 +(CGSize)ccellSizeWithObj:(NSObject *)obj;
++(CGSize)singleCcellSize;
+
 @end
diff --git a/Coding_iOS/Views/CCell/MessageMediaItemCCell.m b/Coding_iOS/Views/CCell/MessageMediaItemCCell.m
@@ -60,7 +60,13 @@ - (void)setCurObj:(NSObject *)curObj{
                 }
             }
         }];
-        CGSize reSize = [[ImageSizeManager shareManager] sizeWithSrc:curMediaItem.src originalWidth:kMessageCell_ContentWidth maxHeight:kScreen_Height/2];
+        
+        CGSize reSize = CGSizeZero;
+        if ([self.reuseIdentifier isEqualToString:kCCellIdentifier_MessageMediaItem_Single]) {
+            reSize = [MessageMediaItemCCell singleCcellSize];
+        }else{
+            reSize = [MessageMediaItemCCell ccellSizeWithObj:_curObj];
+        }
         [_imgView setSize:reSize];
     }
 }
@@ -78,6 +84,10 @@ +(CGSize)ccellSizeWithObj:(NSObject *)obj{
     return itemSize;
 }
 
++(CGSize)singleCcellSize{
+    return CGSizeMake(100, 100);
+}
+
 - (void)layoutSubviews{
     [super layoutSubviews];
     
diff --git a/Coding_iOS/Views/Cell/MessageCell.m b/Coding_iOS/Views/Cell/MessageCell.m
@@ -79,6 +79,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
                 [self.mediaView setBackgroundView:nil];
                 [self.mediaView setBackgroundColor:[UIColor clearColor]];
                 [self.mediaView registerClass:[MessageMediaItemCCell class] forCellWithReuseIdentifier:kCCellIdentifier_MessageMediaItem];
+                [self.mediaView registerClass:[MessageMediaItemCCell class] forCellWithReuseIdentifier:kCCellIdentifier_MessageMediaItem_Single];
                 self.mediaView.dataSource = self;
                 self.mediaView.delegate = self;
                 [_bgImgView addSubview:self.mediaView];
@@ -173,7 +174,8 @@ - (void)setCurPriMsg:(PrivateMessage *)curPriMsg andPrePriMsg:(PrivateMessage *)
         //        &#26377;&#22270;&#29255;
         [_contentLabel setY:2*kMessageCell_PadingHeight + mediaViewHeight];
         
-        bgImgViewSize = CGSizeMake(kMessageCell_ContentWidth +2*kMessageCell_PadingWidth,
+        CGFloat contentWidth = [_curPriMsg isSingleBigMonkey]? [MessageMediaItemCCell singleCcellSize].width : kMessageCell_ContentWidth;
+        bgImgViewSize = CGSizeMake(contentWidth +2*kMessageCell_PadingWidth,
                                    mediaViewHeight +textSize.height + kMessageCell_PadingHeight*(_curPriMsg.content.length > 0? 3:2));
     } else if (curPriMsg.file || curPriMsg.voiceMedia) {
         bgImgViewSize = CGSizeMake(kMessageCell_ContentWidth, 40);
@@ -221,10 +223,6 @@ - (void)setCurPriMsg:(PrivateMessage *)curPriMsg andPrePriMsg:(PrivateMessage *)
         bgImg = [bgImg resizableImageWithCapInsets:UIEdgeInsetsMake(18, 30, bgImg.size.height - 19, bgImg.size.width - 31)];
         _contentLabel.textColor = [UIColor blackColor];
         _bgImgView.frame = bgImgViewFrame;
-        if (_voiceView) {
-            bgImg = nil;  //&#20351;&#29992;bubbleView&#30340;&#32972;&#26223;
-            _voiceView.type = BubbleTypeLeft;
-        }
     }else{
         //        &#36825;&#26159;&#33258;&#24049;&#21457;&#30340;
         bgImgViewFrame = CGRectMake((kScreen_Width - kPaddingLeftWidth - kMessageCell_UserIconWith) -bgImgViewSize.width, curBottomY +kMessageCell_PadingHeight, bgImgViewSize.width, bgImgViewSize.height);
@@ -233,10 +231,10 @@ - (void)setCurPriMsg:(PrivateMessage *)curPriMsg andPrePriMsg:(PrivateMessage *)
         bgImg = [bgImg resizableImageWithCapInsets:UIEdgeInsetsMake(18, 30, bgImg.size.height - 19, bgImg.size.width - 31)];
         _contentLabel.textColor = [UIColor blackColor];
         _bgImgView.frame = bgImgViewFrame;
-        if (_voiceView) {
-            bgImg = nil;  //&#20351;&#29992;bubbleView&#30340;&#32972;&#26223;
-            _voiceView.type = BubbleTypeRight;
-        }
+    }
+    if (_voiceView) {
+        bgImg = nil;  //&#20351;&#29992;bubbleView&#30340;&#32972;&#26223;
+        _voiceView.type = BubbleTypeRight;
     }
     
     __weak typeof(self) weakSelf = self;
@@ -248,7 +246,8 @@ - (void)setCurPriMsg:(PrivateMessage *)curPriMsg andPrePriMsg:(PrivateMessage *)
     [_bgImgView setImage:bgImg];
     
     if (_mediaView) {
-        [_mediaView setHeight:mediaViewHeight];
+        CGFloat contentWidth = [_curPriMsg isSingleBigMonkey]? [MessageMediaItemCCell singleCcellSize].width : kMessageCell_ContentWidth;
+        [_mediaView setSize:CGSizeMake(contentWidth, mediaViewHeight)];
         [_mediaView reloadData];
     }
     
@@ -336,10 +335,14 @@ + (CGFloat)mediaViewHeightWithObj:(PrivateMessage *)curPriMsg{
         if (curPriMsg.nextImg) {
             mediaViewHeight += [MessageMediaItemCCell ccellSizeWithObj:curPriMsg.nextImg].height;
         }else{
-            for (HtmlMediaItem *curItem in curPriMsg.htmlMedia.imageItems) {
-                mediaViewHeight += [MessageMediaItemCCell ccellSizeWithObj:curItem].height +kMessageCell_PadingHeight;
+            if ([curPriMsg isSingleBigMonkey]) {
+                mediaViewHeight += [MessageMediaItemCCell singleCcellSize].height;
+            }else{
+                for (HtmlMediaItem *curItem in curPriMsg.htmlMedia.imageItems) {
+                    mediaViewHeight += [MessageMediaItemCCell ccellSizeWithObj:curItem].height +kMessageCell_PadingHeight;
+                }
+                mediaViewHeight -= kMessageCell_PadingHeight;
             }
-            mediaViewHeight -= kMessageCell_PadingHeight;
         }
     }
     return mediaViewHeight;
@@ -356,10 +359,8 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe
 
 // The cell that is returned must be retrieved from a call to -dequeueReusableCellWithReuseIdentifier:forIndexPath:
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
-    MessageMediaItemCCell *ccell = [collectionView dequeueReusableCellWithReuseIdentifier:kCCellIdentifier_MessageMediaItem forIndexPath:indexPath];
+    MessageMediaItemCCell *ccell = [collectionView dequeueReusableCellWithReuseIdentifier:[_curPriMsg isSingleBigMonkey]? kCCellIdentifier_MessageMediaItem_Single: kCCellIdentifier_MessageMediaItem forIndexPath:indexPath];
     ccell.refreshMessageMediaCCellBlock = self.refreshMessageMediaCCellBlock;
-
-    ccell.curPriMsg = _curPriMsg;
     if (_curPriMsg.nextImg) {
         ccell.curObj = _curPriMsg.nextImg;
     }else{
@@ -370,14 +371,17 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
     return ccell;
 }
 
-
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
     CGSize itemSize = CGSizeZero;
     if (_curPriMsg.nextImg) {
         itemSize = [MessageMediaItemCCell ccellSizeWithObj:_curPriMsg.nextImg];
     }else{
-        HtmlMediaItem *curItem = [_curPriMsg.htmlMedia.imageItems objectAtIndex:indexPath.row];
-        itemSize = [MessageMediaItemCCell ccellSizeWithObj:curItem];
+        if ([_curPriMsg isSingleBigMonkey]) {
+            itemSize = [MessageMediaItemCCell singleCcellSize];
+        }else{
+            HtmlMediaItem *curItem = [_curPriMsg.htmlMedia.imageItems objectAtIndex:indexPath.row];
+            itemSize = [MessageMediaItemCCell ccellSizeWithObj:curItem];
+        }
     }
     return itemSize;
 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,13 @@ - (void)setCurObj:(NSObject *)curObj{`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`}];`
`63`		`- CGSize reSize = [[ImageSizeManager shareManager] sizeWithSrc:curMediaItem.src originalWidth:kMessageCell_ContentWidth maxHeight:kScreen_Height/2];`
	`63`	`+`
	`64`	`+ CGSize reSize = CGSizeZero;`
	`65`	`+ if ([self.reuseIdentifier isEqualToString:kCCellIdentifier_MessageMediaItem_Single]) {`
	`66`	`+ reSize = [MessageMediaItemCCell singleCcellSize];`
	`67`	`+ }else{`
	`68`	`+ reSize = [MessageMediaItemCCell ccellSizeWithObj:_curObj];`
	`69`	`+ }`
`64`	`70`	`[_imgView setSize:reSize];`
`65`	`71`	`}`
`66`	`72`	`}`
`@@ -78,6 +84,10 @@ +(CGSize)ccellSizeWithObj:(NSObject *)obj{`
`78`	`84`	`return itemSize;`
`79`	`85`	`}`
`80`	`86`
	`87`	`++(CGSize)singleCcellSize{`
	`88`	`+ return CGSizeMake(100, 100);`
	`89`	`+}`
	`90`	`+`
`81`	`91`	`- (void)layoutSubviews{`
`82`	`92`	`[super layoutSubviews];`
`83`	`93`