完善框架和稳定框架

xhzengAIB · xhzengAIB · commit bbb34f02b282 · 2015-07-31T18:11:45.000+08:00
diff --git a/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/Vendor/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h b/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/Vendor/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h
@@ -9,6 +9,8 @@
 #import <UIKit/UIKit.h>
 #import "XHMessageBubbleFactory.h"
 
+#define kXHBubblePhotoMargin 8.0f
+
 @interface XHBubblePhotoImageView : UIView
 
 /**
diff --git a/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/Vendor/MessageDisplayKit.framework/MessageDisplayKit b/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/Vendor/MessageDisplayKit.framework/MessageDisplayKit
diff --git a/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/Vendor/MessageDisplayKit.framework/_CodeSignature/CodeResources b/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/Vendor/MessageDisplayKit.framework/_CodeSignature/CodeResources
@@ -162,7 +162,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
@@ -899,7 +899,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
diff --git a/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h b/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h
@@ -9,6 +9,8 @@
 #import <UIKit/UIKit.h>
 #import "XHMessageBubbleFactory.h"
 
+#define kXHBubblePhotoMargin 8.0f
+
 @interface XHBubblePhotoImageView : UIView
 
 /**
diff --git a/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/MessageDisplayKit b/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/MessageDisplayKit
diff --git a/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/_CodeSignature/CodeResources b/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/_CodeSignature/CodeResources
@@ -162,7 +162,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
@@ -899,7 +899,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
diff --git a/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/Vendor/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h b/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/Vendor/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h
@@ -9,6 +9,8 @@
 #import <UIKit/UIKit.h>
 #import "XHMessageBubbleFactory.h"
 
+#define kXHBubblePhotoMargin 8.0f
+
 @interface XHBubblePhotoImageView : UIView
 
 /**
diff --git a/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/Vendor/MessageDisplayKit.framework/MessageDisplayKit b/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/Vendor/MessageDisplayKit.framework/MessageDisplayKit
diff --git a/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/Vendor/MessageDisplayKit.framework/_CodeSignature/CodeResources b/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/Vendor/MessageDisplayKit.framework/_CodeSignature/CodeResources
@@ -162,7 +162,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
@@ -899,7 +899,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
diff --git a/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h b/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/Headers/XHBubblePhotoImageView.h
@@ -9,6 +9,8 @@
 #import <UIKit/UIKit.h>
 #import "XHMessageBubbleFactory.h"
 
+#define kXHBubblePhotoMargin 8.0f
+
 @interface XHBubblePhotoImageView : UIView
 
 /**
diff --git a/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/MessageDisplayKit b/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/MessageDisplayKit
diff --git a/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/_CodeSignature/CodeResources b/Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/_CodeSignature/CodeResources
@@ -162,7 +162,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
@@ -899,7 +899,7 @@
 		</data>
 		<key>Headers/XHBubblePhotoImageView.h</key>
 		<data>
-		r/j/fr7Y3RrWW0ZwWIZJim9UcpQ=
+		pJaBOHl0JoGtAQlJEZr0ObDPRhE=
 		</data>
 		<key>Headers/XHCacheManager.h</key>
 		<data>
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHBubblePhotoImageView.h b/MessageDisplayKit/Classes/Views/MessageContentViews/XHBubblePhotoImageView.h
@@ -9,6 +9,8 @@
 #import <UIKit/UIKit.h>
 #import "XHMessageBubbleFactory.h"
 
+#define kXHBubblePhotoMargin 8.0f
+
 @interface XHBubblePhotoImageView : UIView
 
 /**
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHBubblePhotoImageView.m b/MessageDisplayKit/Classes/Views/MessageContentViews/XHBubblePhotoImageView.m
@@ -116,7 +116,7 @@ - (void)drawRect:(CGRect)rect {
     CGFloat height = rect.size.height+1;//莫名其妙会出现绘制底部有残留 +1像素遮盖
     // 简便起见，这里把圆角半径设置为长和宽平均值的1/10
     CGFloat radius = 6;
-    CGFloat margin = 8;//留出上下左右的边距
+    CGFloat margin = kXHBubblePhotoMargin;//留出上下左右的边距
     
     CGFloat triangleSize = 8;//三角形的边长
     CGFloat triangleMarginTop = 8;//三角形距离圆角的距离
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.m b/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.m
@@ -10,16 +10,17 @@
 
 #import "XHMessageBubbleHelper.h"
 
-#define kBubbleMarginTop 15.0f // 距离气泡上边的间隙
-#define kBubbleMarginBottom 15.0f // 距离气泡下边的间隙
+#define kXHHaveBubbleMargin 15.0f // 距离气泡上下边的间隙
 
-#define kVoiceMargin 20.0f // 语音间隙
+#define kXHVoiceMargin 20.0f // 语音间隙
 
 #define kXHArrowMarginWidth 3.0f // 箭头宽度
 
-#define kTextHorizontalBubblePadding 16.0f // 文本的水平间隙
+#define kXHTextHorizontalBubblePadding 16.0f // 文本的水平间隙
 
-#define kUnReadDotSize 10.0f // 语音未读的红点大小
+#define kXHUnReadDotSize 10.0f // 语音未读的红点大小
+
+#define kXHNoneBubblePhotoMargin (kXHHaveBubbleMargin - kXHBubblePhotoMargin) // 在没有气泡的时候，也就是在图片、视频、地理位置的时候，图片内部做了Margin，所以需要减去内部的Margin
 
 @interface XHMessageBubbleView ()
 
@@ -119,35 +120,35 @@ + (CGSize)getBubbleFrameWithMessage:(id <XHMessageModel>)message {
     switch (message.messageMediaType) {
         case XHBubbleMessageMediaTypeText: {
             CGSize needTextSize = [XHMessageBubbleView neededSizeForText:message.text];
-            bubbleSize = CGSizeMake(needTextSize.width + kTextHorizontalBubblePadding * 2 + kXHArrowMarginWidth, needTextSize.height + kBubbleMarginTop * 2 + kBubbleMarginBottom * 2);
+            bubbleSize = CGSizeMake(needTextSize.width + kXHTextHorizontalBubblePadding * 2 + kXHArrowMarginWidth, needTextSize.height + kXHHaveBubbleMargin * 4); //这里*4的原因是：气泡内部的文本也做了margin，而且margin的大小和气泡的margin一样大小，所以需要加上*2的间隙大小
             break;
         }
         case XHBubbleMessageMediaTypeVoice: {
             // 这里的宽度是不定的，高度是固定的，根据需要根据语音长短来定制啦
             CGSize needVoiceSize = [XHMessageBubbleView neededSizeForVoicePath:message.voicePath voiceDuration:message.voiceDuration];
-            bubbleSize = CGSizeMake(needVoiceSize.width, needVoiceSize.height + kBubbleMarginTop + kBubbleMarginBottom);
+            bubbleSize = CGSizeMake(needVoiceSize.width, needVoiceSize.height + kXHHaveBubbleMargin * 2);
             break;
         }
         case XHBubbleMessageMediaTypeEmotion: {
             // 是否固定大小呢？
             CGSize emotionSize = [XHMessageBubbleView neededSizeForEmotion];
-            bubbleSize = CGSizeMake(emotionSize.width, emotionSize.height + kBubbleMarginTop + kBubbleMarginBottom);
+            bubbleSize = CGSizeMake(emotionSize.width, emotionSize.height + kXHHaveBubbleMargin * 2);
             break;
         }
         case XHBubbleMessageMediaTypePhoto: {
             CGSize needPhotoSize = [XHMessageBubbleView neededSizeForPhoto:message.photo];
-            bubbleSize = CGSizeMake(needPhotoSize.width, needPhotoSize.height + 7 + 7);
+            bubbleSize = CGSizeMake(needPhotoSize.width, needPhotoSize.height + kXHNoneBubblePhotoMargin * 2);
             break;
         }
         case XHBubbleMessageMediaTypeVideo: {
             CGSize needVideoConverPhotoSize = [XHMessageBubbleView neededSizeForPhoto:message.videoConverPhoto];
-            bubbleSize = CGSizeMake(needVideoConverPhotoSize.width, needVideoConverPhotoSize.height + 7 + 7);
+            bubbleSize = CGSizeMake(needVideoConverPhotoSize.width, needVideoConverPhotoSize.height + kXHNoneBubblePhotoMargin * 2);
             break;
         }
         case XHBubbleMessageMediaTypeLocalPosition: {
             // 固定大小，必须的
             CGSize localPostionSize = [XHMessageBubbleView neededSizeForLocalPostion];
-            bubbleSize = CGSizeMake(localPostionSize.width, localPostionSize.height + 7 + 7);
+            bubbleSize = CGSizeMake(localPostionSize.width, localPostionSize.height + kXHNoneBubblePhotoMargin * 2);
             break;
         }
         default:
@@ -186,9 +187,9 @@ - (CGRect)bubbleFrame {
     // 最终减去上下边距的像素就可以得到气泡的位置以及大小
     return CGRectIntegral(
                           CGRectMake(paddingX,
-                                     kBubbleMarginTop,
+                                     kXHHaveBubbleMargin,
                                      bubbleSize.width,
-                                     bubbleSize.height - kBubbleMarginTop - kBubbleMarginBottom)
+                                     bubbleSize.height - kXHHaveBubbleMargin * 2)
                           );
 }
 
@@ -314,8 +315,8 @@ - (void)configureVoiceDurationLabelFrameWithBubbleFrame:(CGRect)bubbleFrame {
 
 - (void)configureVoiceUnreadDotImageViewFrameWithBubbleFrame:(CGRect)bubbleFrame {
     CGRect voiceUnreadDotFrame = _voiceUnreadDotImageView.frame;
-    voiceUnreadDotFrame.origin.x = (self.message.bubbleMessageType == XHBubbleMessageTypeSending ? bubbleFrame.origin.x + kUnReadDotSize : CGRectGetMaxX(bubbleFrame) - kUnReadDotSize * 2);
-    voiceUnreadDotFrame.origin.y = CGRectGetMidY(bubbleFrame) - kUnReadDotSize / 2.0;
+    voiceUnreadDotFrame.origin.x = (self.message.bubbleMessageType == XHBubbleMessageTypeSending ? bubbleFrame.origin.x + kXHUnReadDotSize : CGRectGetMaxX(bubbleFrame) - kXHUnReadDotSize * 2);
+    voiceUnreadDotFrame.origin.y = CGRectGetMidY(bubbleFrame) - kXHUnReadDotSize / 2.0;
     _voiceUnreadDotImageView.frame = voiceUnreadDotFrame;
 }
 
@@ -396,7 +397,7 @@ - (instancetype)initWithFrame:(CGRect)frame
         
         // 6. 初始化显示语音未读标记的imageview
         if (!_voiceUnreadDotImageView) {
-            UIImageView *voiceUnreadDotImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kUnReadDotSize, kUnReadDotSize)];
+            UIImageView *voiceUnreadDotImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kXHUnReadDotSize, kXHUnReadDotSize)];
             voiceUnreadDotImageView.image = [UIImage imageNamed:@"msg_chat_voice_unread"];
             voiceUnreadDotImageView.hidden = YES;
             [self addSubview:voiceUnreadDotImageView];
@@ -444,22 +445,22 @@ - (void)layoutSubviews {
             CGRect bubbleFrame = [self bubbleFrame];
             self.bubbleImageView.frame = bubbleFrame;
             
-            CGFloat textX = CGRectGetMinX(bubbleFrame) + kTextHorizontalBubblePadding;
+            CGFloat textX = CGRectGetMinX(bubbleFrame) + kXHTextHorizontalBubblePadding;
             if (self.message.bubbleMessageType == XHBubbleMessageTypeReceiving) {
                 textX += kXHArrowMarginWidth;
             }
             
             CGRect textFrame = CGRectMake(textX,
-                                          CGRectGetMinY(bubbleFrame) + kBubbleMarginTop,
-                                          CGRectGetWidth(bubbleFrame) - kTextHorizontalBubblePadding * 2 - kXHArrowMarginWidth,
-                                          bubbleFrame.size.height - kBubbleMarginTop - kBubbleMarginBottom);
+                                          CGRectGetMinY(bubbleFrame) + kXHHaveBubbleMargin,
+                                          CGRectGetWidth(bubbleFrame) - kXHTextHorizontalBubblePadding * 2 - kXHArrowMarginWidth,
+                                          bubbleFrame.size.height - kXHHaveBubbleMargin * 2);
             
             self.displayTextView.frame = CGRectIntegral(textFrame);
             
             CGRect animationVoiceImageViewFrame = self.animationVoiceImageView.frame;
-            CGFloat voiceImagePaddingX = CGRectGetMaxX(bubbleFrame) - kVoiceMargin - CGRectGetWidth(animationVoiceImageViewFrame);
+            CGFloat voiceImagePaddingX = CGRectGetMaxX(bubbleFrame) - kXHVoiceMargin - CGRectGetWidth(animationVoiceImageViewFrame);
             if (self.message.bubbleMessageType == XHBubbleMessageTypeReceiving) {
-                voiceImagePaddingX = CGRectGetMinX(bubbleFrame) + kVoiceMargin;
+                voiceImagePaddingX = CGRectGetMinX(bubbleFrame) + kXHVoiceMargin;
             }
             animationVoiceImageViewFrame.origin = CGPointMake(voiceImagePaddingX, CGRectGetMidY(textFrame) - CGRectGetHeight(animationVoiceImageViewFrame) / 2);  // 垂直居中
             self.animationVoiceImageView.frame = animationVoiceImageViewFrame;
@@ -480,7 +481,7 @@ - (void)layoutSubviews {
             if (self.message.bubbleMessageType == XHBubbleMessageTypeSending) {
                 paddingX = CGRectGetWidth(self.bounds) - needPhotoSize.width;
             }
-            CGRect photoImageViewFrame = CGRectMake(paddingX, 7, needPhotoSize.width, needPhotoSize.height);
+            CGRect photoImageViewFrame = CGRectMake(paddingX, kXHNoneBubblePhotoMargin, needPhotoSize.width, needPhotoSize.height);
             
             self.bubblePhotoImageView.frame = photoImageViewFrame;
             
