修复头像命名错误的变量和方法

xhzengAIB · xhzengAIB · commit 9969bf6e6210 · 2014-12-25T14:07:09.000+08:00
diff --git a/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj b/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj
@@ -104,9 +104,6 @@
 		746C89321917F691007F9A5E /* XHMessageBubbleView.h in Headers */ = {isa = PBXBuildFile; fileRef = 746C89171917F691007F9A5E /* XHMessageBubbleView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		746C89331917F691007F9A5E /* XHMessageBubbleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 746C89181917F691007F9A5E /* XHMessageBubbleView.m */; };
 		746C89341917F691007F9A5E /* XHMessageBubbleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 746C89181917F691007F9A5E /* XHMessageBubbleView.m */; };
-		746C89351917F691007F9A5E /* XHMessageDisplayTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 746C89191917F691007F9A5E /* XHMessageDisplayTextView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		746C89361917F691007F9A5E /* XHMessageDisplayTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 746C891A1917F691007F9A5E /* XHMessageDisplayTextView.m */; };
-		746C89371917F691007F9A5E /* XHMessageDisplayTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 746C891A1917F691007F9A5E /* XHMessageDisplayTextView.m */; };
 		746C89381917F691007F9A5E /* XHMessageTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 746C891B1917F691007F9A5E /* XHMessageTableView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		746C89391917F691007F9A5E /* XHMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 746C891C1917F691007F9A5E /* XHMessageTableView.m */; };
 		746C893A1917F691007F9A5E /* XHMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 746C891C1917F691007F9A5E /* XHMessageTableView.m */; };
@@ -424,9 +421,9 @@
 		AB37292A192EC6800084D7B5 /* XHDisplayTextViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB37291F192EC6800084D7B5 /* XHDisplayTextViewController.m */; };
 		AB37292B192EC6800084D7B5 /* XHDisplayTextViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB37291F192EC6800084D7B5 /* XHDisplayTextViewController.m */; };
 		AB406DD8199AE5CC00669D05 /* SECoreTextView.bundle in Resources */ = {isa = PBXBuildFile; fileRef = AB406DD7199AE5CC00669D05 /* SECoreTextView.bundle */; };
-		AB41A57B194273150095C12C /* XHMessageAvatorFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = AB41A571194273150095C12C /* XHMessageAvatorFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		AB41A57C194273150095C12C /* XHMessageAvatorFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = AB41A572194273150095C12C /* XHMessageAvatorFactory.m */; };
-		AB41A57D194273150095C12C /* XHMessageAvatorFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = AB41A572194273150095C12C /* XHMessageAvatorFactory.m */; };
+		AB41A57B194273150095C12C /* XHMessageAvatarFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = AB41A571194273150095C12C /* XHMessageAvatarFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		AB41A57C194273150095C12C /* XHMessageAvatarFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = AB41A572194273150095C12C /* XHMessageAvatarFactory.m */; };
+		AB41A57D194273150095C12C /* XHMessageAvatarFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = AB41A572194273150095C12C /* XHMessageAvatarFactory.m */; };
 		AB41A57E194273150095C12C /* XHMessageBubbleFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = AB41A573194273150095C12C /* XHMessageBubbleFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AB41A57F194273150095C12C /* XHMessageBubbleFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = AB41A574194273150095C12C /* XHMessageBubbleFactory.m */; };
 		AB41A580194273150095C12C /* XHMessageBubbleFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = AB41A574194273150095C12C /* XHMessageBubbleFactory.m */; };
@@ -831,8 +828,6 @@
 		746C89161917F691007F9A5E /* XHBubblePhotoImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHBubblePhotoImageView.m; sourceTree = "<group>"; };
 		746C89171917F691007F9A5E /* XHMessageBubbleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageBubbleView.h; sourceTree = "<group>"; };
 		746C89181917F691007F9A5E /* XHMessageBubbleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHMessageBubbleView.m; sourceTree = "<group>"; };
-		746C89191917F691007F9A5E /* XHMessageDisplayTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageDisplayTextView.h; sourceTree = "<group>"; };
-		746C891A1917F691007F9A5E /* XHMessageDisplayTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHMessageDisplayTextView.m; sourceTree = "<group>"; };
 		746C891B1917F691007F9A5E /* XHMessageTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageTableView.h; sourceTree = "<group>"; };
 		746C891C1917F691007F9A5E /* XHMessageTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHMessageTableView.m; sourceTree = "<group>"; };
 		746C891D1917F691007F9A5E /* XHMessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageTableViewCell.h; sourceTree = "<group>"; };
@@ -1090,8 +1085,8 @@
 		AB37291E192EC6800084D7B5 /* XHDisplayTextViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHDisplayTextViewController.h; sourceTree = "<group>"; };
 		AB37291F192EC6800084D7B5 /* XHDisplayTextViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHDisplayTextViewController.m; sourceTree = "<group>"; };
 		AB406DD7199AE5CC00669D05 /* SECoreTextView.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SECoreTextView.bundle; sourceTree = "<group>"; };
-		AB41A571194273150095C12C /* XHMessageAvatorFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageAvatorFactory.h; sourceTree = "<group>"; };
-		AB41A572194273150095C12C /* XHMessageAvatorFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHMessageAvatorFactory.m; sourceTree = "<group>"; };
+		AB41A571194273150095C12C /* XHMessageAvatarFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageAvatarFactory.h; sourceTree = "<group>"; };
+		AB41A572194273150095C12C /* XHMessageAvatarFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHMessageAvatarFactory.m; sourceTree = "<group>"; };
 		AB41A573194273150095C12C /* XHMessageBubbleFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageBubbleFactory.h; sourceTree = "<group>"; };
 		AB41A574194273150095C12C /* XHMessageBubbleFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHMessageBubbleFactory.m; sourceTree = "<group>"; };
 		AB41A575194273150095C12C /* XHMessageVideoConverPhotoFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHMessageVideoConverPhotoFactory.h; sourceTree = "<group>"; };
@@ -1618,8 +1613,6 @@
 				746C89181917F691007F9A5E /* XHMessageBubbleView.m */,
 				746C89151917F691007F9A5E /* XHBubblePhotoImageView.h */,
 				746C89161917F691007F9A5E /* XHBubblePhotoImageView.m */,
-				746C89191917F691007F9A5E /* XHMessageDisplayTextView.h */,
-				746C891A1917F691007F9A5E /* XHMessageDisplayTextView.m */,
 			);
 			path = MessageContentViews;
 			sourceTree = "<group>";
@@ -2388,8 +2381,8 @@
 		AB41A570194273150095C12C /* Factorys */ = {
 			isa = PBXGroup;
 			children = (
-				AB41A571194273150095C12C /* XHMessageAvatorFactory.h */,
-				AB41A572194273150095C12C /* XHMessageAvatorFactory.m */,
+				AB41A571194273150095C12C /* XHMessageAvatarFactory.h */,
+				AB41A572194273150095C12C /* XHMessageAvatarFactory.m */,
 				AB41A573194273150095C12C /* XHMessageBubbleFactory.h */,
 				AB41A574194273150095C12C /* XHMessageBubbleFactory.m */,
 				AB41A575194273150095C12C /* XHMessageVideoConverPhotoFactory.h */,
@@ -2872,7 +2865,6 @@
 				74180C0F190F44F600A35C82 /* XHFoundationCommon.h in Headers */,
 				74180C13190F450200A35C82 /* XHMessageModel.h in Headers */,
 				746C892F1917F691007F9A5E /* XHBubblePhotoImageView.h in Headers */,
-				746C89351917F691007F9A5E /* XHMessageDisplayTextView.h in Headers */,
 				746C893E1917F691007F9A5E /* XHMessageInputView.h in Headers */,
 				746C89471917F691007F9A5E /* XHEmotionCollectionViewFlowLayout.h in Headers */,
 				746C89321917F691007F9A5E /* XHMessageBubbleView.h in Headers */,
@@ -2983,7 +2975,7 @@
 				AB41A581194273150095C12C /* XHMessageVideoConverPhotoFactory.h in Headers */,
 				AB41A587194273150095C12C /* XHVideoOutputSampleBufferFactory.h in Headers */,
 				AB41A584194273150095C12C /* XHMessageVoiceFactory.h in Headers */,
-				AB41A57B194273150095C12C /* XHMessageAvatorFactory.h in Headers */,
+				AB41A57B194273150095C12C /* XHMessageAvatarFactory.h in Headers */,
 				ABB839E9193CCACA003DEE7A /* NSString+XHDiskSizeTransfrom.h in Headers */,
 				AB72638919328D9A00AA738F /* XHLocationServiceTableViewCell.h in Headers */,
 				74E5E9951921E90A0084BCFA /* XHVoiceRecordHUD.h in Headers */,
@@ -3491,7 +3483,6 @@
 				ABB494061930086C000A2680 /* XHContactCommunicationView.m in Sources */,
 				AB6AB4A6193C03D600AFE823 /* UIButton+XHButtonTitlePosition.m in Sources */,
 				746C89461917F691007F9A5E /* XHEmotionCollectionViewCell.m in Sources */,
-				746C89371917F691007F9A5E /* XHMessageDisplayTextView.m in Sources */,
 				AB02A9F7192D8DC5004AA23D /* XHBaseSearchTableViewController.m in Sources */,
 				AB372928192EC6800084D7B5 /* XHDisplayMediaViewController.m in Sources */,
 				7DA2EC7719455EF100B009FC /* MultiSelectViewController.m in Sources */,
@@ -3528,7 +3519,7 @@
 				ABB5473519394D7C000D3C9C /* XHHTTPClient.m in Sources */,
 				AB6AB4A3193C03D600AFE823 /* NSString+XHMD5.m in Sources */,
 				AB41A580194273150095C12C /* XHMessageBubbleFactory.m in Sources */,
-				AB41A57D194273150095C12C /* XHMessageAvatorFactory.m in Sources */,
+				AB41A57D194273150095C12C /* XHMessageAvatarFactory.m in Sources */,
 				AB41A594194274950095C12C /* XHRefreshCircleView.m in Sources */,
 				74E5EAEA1924FFBE0084BCFA /* SETextMagnifierCaret.m in Sources */,
 				740660C01914D65600E1CE95 /* XHEmotion.m in Sources */,
@@ -3673,11 +3664,10 @@
 				AB8ACCE8192EB0A400FA1C80 /* XHMultipleSectionTableViewController.m in Sources */,
 				7D149FFB192DEB5D004B4D3B /* XHContactTableViewCell.m in Sources */,
 				AB63BF2B1936BE5400B6C977 /* XHNewsContainerView.m in Sources */,
-				AB41A57C194273150095C12C /* XHMessageAvatorFactory.m in Sources */,
+				AB41A57C194273150095C12C /* XHMessageAvatarFactory.m in Sources */,
 				AB8ACD0C192EBF3F00FA1C80 /* XHMoreSettingTableViewController.m in Sources */,
 				AB37290F192EC62C0084D7B5 /* XHQRCodeViewController.m in Sources */,
 				74585FFE191D10CC00F5E8C8 /* XHAnnotation.m in Sources */,
-				746C89361917F691007F9A5E /* XHMessageDisplayTextView.m in Sources */,
 				AB8C80FD1936A6F7006CDA9B /* LKBadgeView.m in Sources */,
 				AB372906192EC62C0084D7B5 /* XHBottleViewController.m in Sources */,
 				74E5EADD1924FFBE0084BCFA /* SETextEditingCaret.m in Sources */,
diff --git a/MessageDisplayKit/Classes/Categorys/UIView/UIView+XHRemoteImage.h b/MessageDisplayKit/Classes/Categorys/UIView/UIView+XHRemoteImage.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "XHMessageAvatorFactory.h"
+#import "XHMessageAvatarFactory.h"
 
 typedef NS_ENUM(NSInteger, UIImageViewURLDownloadState) {
     UIImageViewURLDownloadStateUnknown = 0,
diff --git a/MessageDisplayKit/Classes/Categorys/UIView/UIView+XHRemoteImage.m b/MessageDisplayKit/Classes/Categorys/UIView/UIView+XHRemoteImage.m
@@ -247,7 +247,7 @@ - (void)loadWithCompletionBlock:(void(^)(UIImage *image, NSURL *url, NSError *er
     dispatch_async(self.cachingQueue, ^{
         UIImage *cacheImage = [XHCacheManager imageWithURL:weakSelf.url storeMemoryCache:YES];
         if (weakSelf.messageAvatorType != XHMessageAvatorTypeNormal) {
-            cacheImage = [XHMessageAvatorFactory avatarImageNamed:cacheImage messageAvatorType:weakSelf.messageAvatorType];
+            cacheImage = [XHMessageAvatarFactory avatarImageNamed:cacheImage messageAvatorType:weakSelf.messageAvatorType];
         }
         if (cacheImage) {
             [weakSelf setImage:cacheImage forURL:weakSelf.url];
@@ -285,7 +285,7 @@ - (UIImage *)didFinishDownloadWithData:(NSData *)data forURL:(NSURL *)url error:
     }
     UIImage *image = [UIImage imageWithData:data];
     if (self.messageAvatorType != XHMessageAvatorTypeNormal) {
-        image = [XHMessageAvatorFactory avatarImageNamed:image messageAvatorType:self.messageAvatorType];
+        image = [XHMessageAvatarFactory avatarImageNamed:image messageAvatorType:self.messageAvatorType];
     }
     if([url isEqual:self.url]) {
         if(error) {
diff --git a/MessageDisplayKit/Classes/Factorys/XHMessageAvatarFactory.h b/MessageDisplayKit/Classes/Factorys/XHMessageAvatarFactory.h
@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, XHMessageAvatorType) {
     XHMessageAvatorTypeCircle
 };
 
-@interface XHMessageAvatorFactory : NSObject
+@interface XHMessageAvatarFactory : NSObject
 
 + (UIImage *)avatarImageNamed:(UIImage *)originImage
             messageAvatorType:(XHMessageAvatorType)type;
diff --git a/MessageDisplayKit/Classes/Factorys/XHMessageAvatarFactory.m b/MessageDisplayKit/Classes/Factorys/XHMessageAvatarFactory.m
@@ -6,10 +6,10 @@
 //  Copyright (c) 2014年 曾宪华 开发团队(http://iyilunba.com ) 本人QQ:543413507 本人QQ群（142557668）. All rights reserved.
 //
 
-#import "XHMessageAvatorFactory.h"
+#import "XHMessageAvatarFactory.h"
 #import "UIImage+XHRounded.h"
 
-@implementation XHMessageAvatorFactory
+@implementation XHMessageAvatarFactory
 
 + (UIImage *)avatarImageNamed:(UIImage *)originImage
             messageAvatorType:(XHMessageAvatorType)messageAvatorType {
diff --git a/MessageDisplayKit/Classes/Views/AlbumContentViews/XHAlbumRichTextView.m b/MessageDisplayKit/Classes/Views/AlbumContentViews/XHAlbumRichTextView.m
@@ -8,7 +8,7 @@
 
 #import "XHAlbumRichTextView.h"
 
-#import "XHMessageAvatorFactory.h"
+#import "XHMessageAvatarFactory.h"
 #import "XHAlbumPhotoCollectionViewCell.h"
 #import "XHAlbumCollectionViewFlowLayout.h"
 
diff --git a/MessageDisplayKit/Classes/Views/ContactViews/XHContactCommunicationView.h b/MessageDisplayKit/Classes/Views/ContactViews/XHContactCommunicationView.h
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "XHMessageAvatorFactory.h"
+#import "XHMessageAvatarFactory.h"
 
 @interface XHContactCommunicationView : UIView
 
diff --git a/MessageDisplayKit/Classes/Views/ContactViews/XHContactView.h b/MessageDisplayKit/Classes/Views/ContactViews/XHContactView.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 #import "XHContact.h"
-#import "XHMessageAvatorFactory.h"
+#import "XHMessageAvatarFactory.h"
 
 @interface XHContactView : UIView
 
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.h b/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.h
@@ -11,7 +11,6 @@
 // Views
 #import "XHMessageTextView.h"
 #import "XHMessageInputView.h"
-#import "XHMessageDisplayTextView.h"
 #import "XHBubblePhotoImageView.h"
 #import "SETextView.h"
 
@@ -25,7 +24,7 @@
 #import "XHMessage.h"
 
 // Factorys
-#import "XHMessageAvatorFactory.h"
+#import "XHMessageAvatarFactory.h"
 #import "XHMessageVoiceFactory.h"
 
 // Categorys
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageDisplayTextView.h b/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageDisplayTextView.h
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageDisplayTextView.m b/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageDisplayTextView.m
diff --git a/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m b/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m
@@ -46,7 +46,7 @@ - (void)configureTimestamp:(BOOL)displayTimestamp atMessage:(id <XHMessageModel>
  *
  *  @param message 需要配置的目标消息Model
  */
-- (void)configAvatorWithMessage:(id <XHMessageModel>)message;
+- (void)configAvatarWithMessage:(id <XHMessageModel>)message;
 
 /**
  *  3、配置需要显示什么消息内容，比如语音、文字、视频、图片
@@ -147,7 +147,7 @@ - (void)configureCellWithMessage:(id <XHMessageModel>)message
     [self configureTimestamp:displayTimestamp atMessage:message];
     
     // 2、配置头像
-    [self configAvatorWithMessage:message];
+    [self configAvatarWithMessage:message];
     
     // 3、配置用户名
     [self configUserNameWithMessage:message];
@@ -166,21 +166,30 @@ - (void)configureTimestamp:(BOOL)displayTimestamp atMessage:(id <XHMessageModel>
     }
 }
 
-- (void)configAvatorWithMessage:(id <XHMessageModel>)message {
+- (void)configAvatarWithMessage:(id <XHMessageModel>)message {
     if (message.avator) {
-        [self.avatorButton setImage:message.avator forState:UIControlStateNormal];
+        [self configAvatarWithPhoto:message.avator];
         if (message.avatorUrl) {
-            self.avatorButton.messageAvatorType = XHMessageAvatorTypeSquare;
-            [self.avatorButton setImageWithURL:[NSURL URLWithString:message.avatorUrl] placeholer:[UIImage imageNamed:@"avator"]];
+            [self configAvatarWithPhotoURLString:message.avatorUrl];
         }
     } else if (message.avatorUrl) {
-        self.avatorButton.messageAvatorType = XHMessageAvatorTypeSquare;
-        [self.avatorButton setImageWithURL:[NSURL URLWithString:message.avatorUrl] placeholer:[UIImage imageNamed:@"avator"]];
-    }else {
-        [self.avatorButton setImage:[XHMessageAvatorFactory avatarImageNamed:[UIImage imageNamed:@"avator"] messageAvatorType:XHMessageAvatorTypeSquare] forState:UIControlStateNormal];
+        [self configAvatarWithPhotoURLString:message.avatorUrl];
+    } else {
+        UIImage *avatarPhoto = [XHMessageAvatarFactory avatarImageNamed:[UIImage imageNamed:@"avator"] messageAvatorType:XHMessageAvatorTypeSquare];
+        [self configAvatarWithPhoto:avatarPhoto];
     }
 }
 
+- (void)configAvatarWithPhoto:(UIImage *)photo {
+    [self.avatorButton setImage:photo forState:UIControlStateNormal];
+}
+
+- (void)configAvatarWithPhotoURLString:(NSString *)photoURLString {
+    self.avatorButton.messageAvatorType = XHMessageAvatorTypeSquare;
+    [self.avatorButton setImageWithURL:[NSURL URLWithString:photoURLString] placeholer:[UIImage imageNamed:@"avator"]];
+    
+}
+
 - (void)configUserNameWithMessage:(id <XHMessageModel>)message {
     self.userNameLabel.text = [message sender];
 }
@@ -375,7 +384,7 @@ - (instancetype)initWithMessage:(id <XHMessageModel>)message
         }
         
         UIButton *avatorButton = [[UIButton alloc] initWithFrame:avatorButtonFrame];
-        [avatorButton setImage:[XHMessageAvatorFactory avatarImageNamed:[UIImage imageNamed:@"avator"] messageAvatorType:XHMessageAvatorTypeCircle] forState:UIControlStateNormal];
+        [avatorButton setImage:[XHMessageAvatarFactory avatarImageNamed:[UIImage imageNamed:@"avator"] messageAvatorType:XHMessageAvatorTypeCircle] forState:UIControlStateNormal];
         [avatorButton addTarget:self action:@selector(avatorButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
         [self.contentView addSubview:avatorButton];
         self.avatorButton = avatorButton;

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ - (void)loadWithCompletionBlock:(void(^)(UIImage image, NSURL url, NSError *er`
`247`	`247`	`dispatch_async(self.cachingQueue, ^{`
`248`	`248`	`UIImage *cacheImage = [XHCacheManager imageWithURL:weakSelf.url storeMemoryCache:YES];`
`249`	`249`	`if (weakSelf.messageAvatorType != XHMessageAvatorTypeNormal) {`
`250`		`- cacheImage = [XHMessageAvatorFactory avatarImageNamed:cacheImage messageAvatorType:weakSelf.messageAvatorType];`
	`250`	`+ cacheImage = [XHMessageAvatarFactory avatarImageNamed:cacheImage messageAvatorType:weakSelf.messageAvatorType];`
`251`	`251`	`}`
`252`	`252`	`if (cacheImage) {`
`253`	`253`	`[weakSelf setImage:cacheImage forURL:weakSelf.url];`
`@@ -285,7 +285,7 @@ - (UIImage )didFinishDownloadWithData:(NSData )data forURL:(NSURL *)url error:`
`285`	`285`	`}`
`286`	`286`	`UIImage *image = [UIImage imageWithData:data];`
`287`	`287`	`if (self.messageAvatorType != XHMessageAvatorTypeNormal) {`
`288`		`- image = [XHMessageAvatorFactory avatarImageNamed:image messageAvatorType:self.messageAvatorType];`
	`288`	`+ image = [XHMessageAvatarFactory avatarImageNamed:image messageAvatorType:self.messageAvatorType];`
`289`	`289`	`}`
`290`	`290`	`if([url isEqual:self.url]) {`
`291`	`291`	`if(error) {`