在aside模式下，图片可以根据原始比例显示，并且宽度撑满父容器

pencil001 · pencil001 · commit 3a9364757a75 · 2014-11-07T01:06:00.000+08:00
diff --git a/JSQMessagesDemo/DemoModelData.m b/JSQMessagesDemo/DemoModelData.m
@@ -103,6 +103,11 @@ - (void)loadFakeMessages
                                                              displayName:@""
                                                                    media:photoItem];
     
+    JSQPhotoMediaItem *photoItem2 = [[JSQPhotoMediaItem alloc] initWithImage:[UIImage imageNamed:@"testimage"]];
+    JSQMediaMessage *photoMessage2 = [JSQMediaMessage messageWithSenderId:@""
+                                                              displayName:@""
+                                                                    media:photoItem2];
+    
     self.messages = [[NSMutableArray alloc] initWithObjects:
                      [[JSQTextMessage alloc] initWithSenderId:kJSQDemoAvatarIdSquires
                                             senderDisplayName:kJSQDemoAvatarDisplayNameSquires
@@ -143,6 +148,7 @@ - (void)loadFakeMessages
                                                          date:[NSDate date]
                                                          text:@"It is simple, elegant, and easy to use. There are super sweet default settings, but you can customize like crazy."],
                      photoMessage,
+                     photoMessage2,
                      nil];
     
     [self addPhotoMediaMessage];
diff --git a/JSQMessagesDemo/Images.xcassets/testimage.imageset/5457100623135b046300007e_普1-1.jpg b/JSQMessagesDemo/Images.xcassets/testimage.imageset/5457100623135b046300007e_普1-1.jpg
diff --git a/JSQMessagesDemo/Images.xcassets/testimage.imageset/5457100623135b046300007e_普1-2.jpg b/JSQMessagesDemo/Images.xcassets/testimage.imageset/5457100623135b046300007e_普1-2.jpg
diff --git a/JSQMessagesDemo/Images.xcassets/testimage.imageset/5457100623135b046300007e_普1.jpg b/JSQMessagesDemo/Images.xcassets/testimage.imageset/5457100623135b046300007e_普1.jpg
diff --git a/JSQMessagesDemo/Images.xcassets/testimage.imageset/Contents.json b/JSQMessagesDemo/Images.xcassets/testimage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "5457100623135b046300007e_普1.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "5457100623135b046300007e_普1-1.jpg"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "5457100623135b046300007e_普1-2.jpg"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m b/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m
@@ -428,6 +428,9 @@ - (CGSize)messageBubbleSizeForItemAtIndexPath:(NSIndexPath *)indexPath
     
     if ([messageItem isMediaMessage]) {
         finalSize = [[messageItem media] mediaViewDisplaySize];
+        if ([messageItem isAsideMessage]) {
+            finalSize = CGSizeMake(self.itemWidth, finalSize.height * self.itemWidth / finalSize.width);
+        }
     }
     else {
         CGSize avatarSize = [self jsq_avatarSizeForIndexPath:indexPath];
diff --git a/JSQMessagesViewController/Model/JSQMessage.h b/JSQMessagesViewController/Model/JSQMessage.h
@@ -52,6 +52,8 @@
  */
 @property (assign, nonatomic, readonly) BOOL isMediaMessage;
 
+@property (assign, nonatomic, readonly) BOOL isAsideMessage;
+
 #pragma mark - Initialization
 
 /**
diff --git a/JSQMessagesViewController/Model/JSQMessage.m b/JSQMessagesViewController/Model/JSQMessage.m
@@ -55,6 +55,12 @@ - (void)dealloc
     _date = nil;
 }
 
+#pragma mark - Property
+
+- (BOOL)isAsideMessage {
+    return [self.senderId length] == 0;
+}
+
 #pragma mark - NSObject
 
 - (BOOL)isEqual:(id)object
diff --git a/JSQMessagesViewController/Model/JSQMessageData.h b/JSQMessagesViewController/Model/JSQMessageData.h
@@ -75,6 +75,8 @@
  */
 - (BOOL)isMediaMessage;
 
+- (BOOL)isAsideMessage;
+
 @optional
 
 /**
diff --git a/JSQMessagesViewController/Model/JSQPhotoMediaItem.m b/JSQMessagesViewController/Model/JSQPhotoMediaItem.m
@@ -90,6 +90,17 @@ - (UIView *)mediaView
     return self.cachedImageView;
 }
 
+- (CGSize)mediaViewDisplaySize
+{
+    CGSize displaySize = [super mediaViewDisplaySize];
+    if (self.appliesMediaViewMaskByType == JSQMessageDisplayAside) {
+        CGFloat imageWidth = self.image.size.width;
+        CGFloat imageHeight = self.image.size.height;
+        displaySize = CGSizeMake(imageWidth, imageHeight);
+    }
+    return displaySize;
+}
+
 #pragma mark - NSObject
 
 - (BOOL)isEqual:(id)object
diff --git a/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellAside.m b/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellAside.m
@@ -19,4 +19,13 @@ - (void)awakeFromNib
     self.cellBottomLabel.textAlignment = NSTextAlignmentLeft;
 }
 
+- (void)setMediaView:(UIView *)mediaView
+{
+    [super setMediaView:mediaView];
+    if ([self.mediaView isKindOfClass:[UIImageView class]]) {
+        UIImageView *imageView = (UIImageView *)self.mediaView;
+        imageView.contentMode = UIViewContentModeScaleToFill;
+    }
+}
+
 @end
diff --git a/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellAside.xib b/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellAside.xib
@@ -35,13 +35,13 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fxB-Fv-MvE" userLabel="Bubble container">
-                        <rect key="frame" x="38" y="40" width="244" height="94"/>
+                        <rect key="frame" x="0.0" y="40" width="320" height="94"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fya-Xd-QVR" userLabel="Bubble Image View">
-                                <rect key="frame" x="0.0" y="0.0" width="244" height="94"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="94"/>
                             </imageView>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DJt-qX-bTo" customClass="JSQMessagesCellTextView">
-                                <rect key="frame" x="0.0" y="0.0" width="238" height="94"/>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="90" placeholderIntrinsicHeight="94" translatesAutoresizingMaskIntoConstraints="NO" id="DJt-qX-bTo" customClass="JSQMessagesCellTextView">
+                                <rect key="frame" x="115" y="0.0" width="90" height="94"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -50,11 +50,11 @@
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="fya-Xd-QVR" firstAttribute="top" secondItem="fxB-Fv-MvE" secondAttribute="top" id="TaT-Dh-qCD"/>
-                            <constraint firstItem="DJt-qX-bTo" firstAttribute="leading" secondItem="fxB-Fv-MvE" secondAttribute="leading" id="Vim-Mp-2J5"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="DJt-qX-bTo" secondAttribute="trailing" id="UWX-hN-ERB"/>
+                            <constraint firstAttribute="centerX" secondItem="DJt-qX-bTo" secondAttribute="centerX" id="V3d-jo-5JY"/>
                             <constraint firstAttribute="bottom" secondItem="DJt-qX-bTo" secondAttribute="bottom" id="axz-VT-hEB"/>
+                            <constraint firstItem="DJt-qX-bTo" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="fxB-Fv-MvE" secondAttribute="leading" id="dfy-bc-DVu"/>
                             <constraint firstItem="fya-Xd-QVR" firstAttribute="leading" secondItem="fxB-Fv-MvE" secondAttribute="leading" id="dfz-HB-adw"/>
-                            <constraint firstAttribute="trailing" secondItem="DJt-qX-bTo" secondAttribute="trailing" constant="6" id="giQ-io-uKL"/>
-                            <constraint firstAttribute="width" constant="244" id="ogF-G0-KfQ"/>
                             <constraint firstItem="DJt-qX-bTo" firstAttribute="top" secondItem="fxB-Fv-MvE" secondAttribute="top" id="pev-xk-GyL"/>
                             <constraint firstAttribute="bottom" secondItem="fya-Xd-QVR" secondAttribute="bottom" id="r8G-83-cO2"/>
                             <constraint firstAttribute="trailing" secondItem="fya-Xd-QVR" secondAttribute="trailing" id="tHH-GO-ObI"/>
@@ -78,13 +78,14 @@
                 <constraint firstItem="F9F-0m-1GQ" firstAttribute="leading" secondItem="Xh3-Vh-J7A" secondAttribute="leading" id="7XD-iT-f6i"/>
                 <constraint firstItem="ouD-TQ-VwT" firstAttribute="leading" secondItem="Xh3-Vh-J7A" secondAttribute="leading" id="9w4-8J-HOx"/>
                 <constraint firstItem="F9F-0m-1GQ" firstAttribute="top" secondItem="fxB-Fv-MvE" secondAttribute="bottom" id="AzR-fj-xUA"/>
-                <constraint firstAttribute="centerX" secondItem="fxB-Fv-MvE" secondAttribute="centerX" id="CfY-Fa-a3s"/>
                 <constraint firstAttribute="trailing" secondItem="F9F-0m-1GQ" secondAttribute="trailing" id="HiW-DY-6TG"/>
                 <constraint firstItem="ouD-TQ-VwT" firstAttribute="top" secondItem="Xh3-Vh-J7A" secondAttribute="top" id="hRS-0z-aId"/>
                 <constraint firstAttribute="bottom" secondItem="F9F-0m-1GQ" secondAttribute="bottom" id="mlg-09-zer"/>
+                <constraint firstItem="fxB-Fv-MvE" firstAttribute="leading" secondItem="Xh3-Vh-J7A" secondAttribute="leading" id="n3V-oa-tNW"/>
                 <constraint firstAttribute="trailing" secondItem="WsX-Zf-Uz8" secondAttribute="trailing" id="rsI-H9-bdf"/>
                 <constraint firstItem="WsX-Zf-Uz8" firstAttribute="leading" secondItem="Xh3-Vh-J7A" secondAttribute="leading" id="uF6-gC-uKA"/>
                 <constraint firstAttribute="trailing" secondItem="ouD-TQ-VwT" secondAttribute="trailing" id="wBx-OU-vYd"/>
+                <constraint firstAttribute="trailing" secondItem="fxB-Fv-MvE" secondAttribute="trailing" id="wzD-dA-Ymf"/>
                 <constraint firstItem="WsX-Zf-Uz8" firstAttribute="top" secondItem="ouD-TQ-VwT" secondAttribute="bottom" id="ylu-Hk-kLH"/>
             </constraints>
             <size key="customSize" width="317" height="245"/>
@@ -94,14 +95,11 @@
                 <outlet property="cellTopLabel" destination="ouD-TQ-VwT" id="3Aj-E6-WqQ"/>
                 <outlet property="cellTopLabelHeightConstraint" destination="0ZN-cR-EKK" id="bQC-Ye-fW1"/>
                 <outlet property="messageBubbleContainerView" destination="fxB-Fv-MvE" id="6O5-dp-zTi"/>
-                <outlet property="messageBubbleContainerWidthConstraint" destination="ogF-G0-KfQ" id="qBz-mX-HPY"/>
                 <outlet property="messageBubbleImageView" destination="fya-Xd-QVR" id="yhe-Bm-O3t"/>
                 <outlet property="messageBubbleTopLabel" destination="WsX-Zf-Uz8" id="fuM-TF-lig"/>
                 <outlet property="messageBubbleTopLabelHeightConstraint" destination="KIa-qy-yXS" id="WyG-oM-quS"/>
                 <outlet property="textView" destination="DJt-qX-bTo" id="MIO-4O-wTY"/>
-                <outlet property="textViewAvatarHorizontalSpaceConstraint" destination="giQ-io-uKL" id="FFW-G6-04i"/>
                 <outlet property="textViewBottomVerticalSpaceConstraint" destination="axz-VT-hEB" id="BcZ-fK-AE2"/>
-                <outlet property="textViewMarginHorizontalSpaceConstraint" destination="Vim-Mp-2J5" id="CWm-eA-5y3"/>
                 <outlet property="textViewTopVerticalSpaceConstraint" destination="pev-xk-GyL" id="7MG-mA-uwy"/>
             </connections>
             <point key="canvasLocation" x="371" y="145"/>

Original file line number	Diff line number	Diff line change
`@@ -428,6 +428,9 @@ - (CGSize)messageBubbleSizeForItemAtIndexPath:(NSIndexPath *)indexPath`
`428`	`428`
`429`	`429`	`if ([messageItem isMediaMessage]) {`
`430`	`430`	`finalSize = [[messageItem media] mediaViewDisplaySize];`
	`431`	`+ if ([messageItem isAsideMessage]) {`
	`432`	`+ finalSize = CGSizeMake(self.itemWidth, finalSize.height * self.itemWidth / finalSize.width);`
	`433`	`+ }`
`431`	`434`	`}`
`432`	`435`	`else {`
`433`	`436`	`CGSize avatarSize = [self jsq_avatarSizeForIndexPath:indexPath];`