fix the face button selected image bug.

xhzengAIB · xhzengAIB · commit a7ba3ca3e22b · 2014-05-04T02:27:50.000+08:00
diff --git a/Example/MessageDisplayKitWorkSpace.xcworkspace/xcuserdata/qtone-1.xcuserdatad/UserInterfaceState.xcuserstate b/Example/MessageDisplayKitWorkSpace.xcworkspace/xcuserdata/qtone-1.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController.m b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController.m
@@ -600,19 +600,23 @@ - (void)didSelectedMultipleMediaAction {
     [self.messageInputView.inputTextView resignFirstResponder];
 }
 
-- (void)didSendFaceMessage {
-    self.textViewInputViewType = XHTextViewFaceInputViewType;
-    
-    [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
-        CGRect inputViewFrame = self.messageInputView.frame;
-        inputViewFrame.origin.y = CGRectGetMinY(self.shareMenuView.frame) - CGRectGetHeight(inputViewFrame);
-        self.messageInputView.frame = inputViewFrame;
-        
-    } completion:^(BOOL finished) {
+- (void)didSendFaceMessage:(BOOL)sendFace {
+    if (sendFace) {
+        self.textViewInputViewType = XHTextViewFaceInputViewType;
         
-    }];
-    self.emotionManagerView.alpha = 1.0;
-    [self.messageInputView.inputTextView resignFirstResponder];
+        [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
+            CGRect inputViewFrame = self.messageInputView.frame;
+            inputViewFrame.origin.y = CGRectGetMinY(self.shareMenuView.frame) - CGRectGetHeight(inputViewFrame);
+            self.messageInputView.frame = inputViewFrame;
+            
+        } completion:^(BOOL finished) {
+            
+        }];
+        self.emotionManagerView.alpha = 1.0;
+        [self.messageInputView.inputTextView resignFirstResponder];
+    } else {
+        [self.messageInputView.inputTextView becomeFirstResponder];
+    }
 }
 
 - (void)didStartRecordingVoice {
@@ -699,6 +703,10 @@ - (XHEmotionManager *)emotionManagerForColumn:(NSInteger)column {
     return nil;
 }
 
+- (NSArray *)emotionManagersAtManager {
+    return nil;
+}
+
 #pragma mark - UIScrollView delegate
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
diff --git a/MessageDisplayKit/Classes/Views/XHMessageInputView.h b/MessageDisplayKit/Classes/Views/XHMessageInputView.h
@@ -67,7 +67,7 @@ typedef NS_ENUM(NSInteger, XHMessageInputViewStyle) {
  *
  *  @param facePath 目标表情的本地路径
  */
-- (void)didSendFaceMessage;
+- (void)didSendFaceMessage:(BOOL)sendFace;
 
 @end
 
diff --git a/MessageDisplayKit/Classes/Views/XHMessageInputView.m b/MessageDisplayKit/Classes/Views/XHMessageInputView.m
@@ -53,8 +53,9 @@ - (void)messageStyleButtonClicked:(UIButton *)sender {
             break;
         }
         case 1: {
-            if ([self.delegate respondsToSelector:@selector(didSendFaceMessage)]) {
-                [self.delegate didSendFaceMessage];
+            sender.selected = !sender.selected;
+            if ([self.delegate respondsToSelector:@selector(didSendFaceMessage:)]) {
+                [self.delegate didSendFaceMessage:sender.selected];
             }
             break;
         }
@@ -153,6 +154,7 @@ - (void)setupMessageInputViewBarWithStyle:(XHMessageInputViewStyle)style {
     // 允许发送表情
     if (self.allowsSendFace) {
         button = [self createButtonWithImage:[UIImage imageNamed:@"face"] HLImage:[UIImage imageNamed:@"face_HL"]];
+        [button setImage:[UIImage imageNamed:@"keyborad"] forState:UIControlStateSelected];
         [button addTarget:self action:@selector(messageStyleButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
         button.tag = 1;
         buttonFrame = button.frame;

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ typedef NS_ENUM(NSInteger, XHMessageInputViewStyle) {`
`67`	`67`	`*`
`68`	`68`	`* @param facePath 目标表情的本地路径`
`69`	`69`	`*/`
`70`		`-- (void)didSendFaceMessage;`
	`70`	`+- (void)didSendFaceMessage:(BOOL)sendFace;`
`71`	`71`
`72`	`72`	`@end`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,9 @@ - (void)messageStyleButtonClicked:(UIButton *)sender {`
`53`	`53`	`break;`
`54`	`54`	`}`
`55`	`55`	`case 1: {`
`56`		`- if ([self.delegate respondsToSelector:@selector(didSendFaceMessage)]) {`
`57`		`- [self.delegate didSendFaceMessage];`
	`56`	`+ sender.selected = !sender.selected;`
	`57`	`+ if ([self.delegate respondsToSelector:@selector(didSendFaceMessage:)]) {`
	`58`	`+ [self.delegate didSendFaceMessage:sender.selected];`
`58`	`59`	`}`
`59`	`60`	`break;`
`60`	`61`	`}`
`@@ -153,6 +154,7 @@ - (void)setupMessageInputViewBarWithStyle:(XHMessageInputViewStyle)style {`
`153`	`154`	`// 允许发送表情`
`154`	`155`	`if (self.allowsSendFace) {`
`155`	`156`	`button = [self createButtonWithImage:[UIImage imageNamed:@"face"] HLImage:[UIImage imageNamed:@"face_HL"]];`
	`157`	`+ [button setImage:[UIImage imageNamed:@"keyborad"] forState:UIControlStateSelected];`
`156`	`158`	`[button addTarget:self action:@selector(messageStyleButtonClicked:) forControlEvents:UIControlEventTouchUpInside];`
`157`	`159`	`button.tag = 1;`
`158`	`160`	`buttonFrame = button.frame;`