添加消息相关宏定义，修复一些bug

siyanhui · Dec 18, 2017 · 741e83f · 741e83f
1 parent 7100c22
commit 741e83f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 1 deletion.
diff --git a/ChatDemo-UI3.0/ChatDemo-UI3.0/3rdparty/BQMM_SDK/BQMM_GIF/MMGifManager.h b/ChatDemo-UI3.0/ChatDemo-UI3.0/3rdparty/BQMM_SDK/BQMM_GIF/MMGifManager.h
@@ -8,6 +8,19 @@
 
 #import <UIKit/UIKit.h>
 #import <BQMM/BQMM.h>
+
+#define TEXT_MESG_TYPE @"txt_msgType"  //key for text message
+#define TEXT_MESG_FACE_TYPE @"facetype" //key for big emoji type
+#define TEXT_MESG_EMOJI_TYPE @"emojitype" //key for photo-text message
+#define TEXT_MESG_WEB_TYPE @"webtype" //key for web sticker message
+#define TEXT_MESG_DATA @"msg_data"  //key for ext data of message
+
+#define WEBSTICKER_IS_GIF @"is_gif"  //key for web sticker is gif or not
+#define WEBSTICKER_ID @"data_id"  //key for web sticker id
+#define WEBSTICKER_URL @"sticker_url"  //key for web sticker url
+#define WEBSTICKER_HEIGHT @"h"  //key for web sticker height
+#define WEBSTICKER_WIDTH @"w"  //key for web sticker width
+
 typedef NS_OPTIONS (NSInteger, MMSearchModeStatus) {
     MMSearchModeStatusKeyboardHide = 1 << 0,         //收起键盘
     MMSearchModeStatusInputEndEditing = 1 << 1,         //收起键盘

diff --git a/ChatDemo-UI3.0/ChatDemo-UI3.0/Class/Chat/ChatView/ChatViewController.m b/ChatDemo-UI3.0/ChatDemo-UI3.0/Class/Chat/ChatView/ChatViewController.m
@@ -25,6 +25,7 @@
 #import "MMTextParser.h"
 #import <BQMM/BQMM.h>
 #import "MMTextView.h"
+#import "MMGifManager.h"
 
 @interface ChatViewController ()<UIAlertViewDelegate,EMClientDelegate, EMChooseViewDelegate>
 {

diff --git a/ChatDemo-UI3.0/ChatDemo-UI3.0/Class/Contacts/ContactListSelectViewController.m b/ChatDemo-UI3.0/ChatDemo-UI3.0/Class/Contacts/ContactListSelectViewController.m
@@ -16,6 +16,9 @@
 #import "UserProfileManager.h"
 #import "RedPacketChatViewController.h"
 
+//BQMM集成
+#import "MMGifManager.h"
+
 
 @interface ContactListSelectViewController () <EMUserListViewControllerDelegate,EMUserListViewControllerDataSource>
 

diff --git a/EaseUI/EMUIKit/Model/EaseMessageModel.m b/EaseUI/EMUIKit/Model/EaseMessageModel.m
@@ -15,6 +15,9 @@
 #import "EaseEmotionEscape.h"
 #import "EaseConvertToCommonEmoticonsHelper.h"
 
+//BQMM集成
+#import "MMGifManager.h"
+
 @implementation EaseMessageModel
 
 - (instancetype)initWithMessage:(EMMessage *)message

diff --git a/EaseUI/EMUIKit/ViewController/EaseMessageViewController.m b/EaseUI/EMUIKit/ViewController/EaseMessageViewController.m
@@ -151,8 +151,14 @@ - (void)viewDidLoad {
     //BQMM集成   设置gif搜索相关
     [[MMGifManager defaultManager] setSearchModeEnabled:true withInputView:((EaseChatToolbar *)self.chatToolbar).inputTextView];
     [[MMGifManager defaultManager] setSearchUiVisible:true withAttatchedView:self.chatToolbar];
+    __weak EaseMessageViewController* weakSelf = self;
     [MMGifManager defaultManager].selectedHandler = ^(MMGif * _Nullable gif) {
-        [self didSendGifMessage:gif];
+        __strong EaseMessageViewController *tempSelf = weakSelf;
+        if(tempSelf) {
+            ((EaseChatToolbar *)self.chatToolbar).inputTextView.text = nil;
+            [tempSelf didSendGifMessage:gif];
+        }
+
     };
 }
 

diff --git a/EaseUI/EMUIKit/Views/conversation/MessageCell/EaseBaseMessageCell.m b/EaseUI/EMUIKit/Views/conversation/MessageCell/EaseBaseMessageCell.m
@@ -18,6 +18,7 @@
 
 #import <BQMM/BQMM.h>
 #import "MMTextParser.h"
+#import "MMGifManager.h"
 
 
 @interface EaseBaseMessageCell()

diff --git a/EaseUI/EMUIKit/Views/conversation/MessageCell/EaseCustomMessageCell.m b/EaseUI/EMUIKit/Views/conversation/MessageCell/EaseCustomMessageCell.m
@@ -23,6 +23,7 @@
 
 #import "UIImage+EMGIF.h"
 #import "UIImageView+EMWebCache.h"
+#import "MMGifManager.h"
 
 
 @interface EaseCustomMessageCell ()

diff --git a/EaseUI/EMUIKit/Views/conversation/MessageCell/EaseMessageCell.m b/EaseUI/EMUIKit/Views/conversation/MessageCell/EaseMessageCell.m
@@ -25,6 +25,7 @@
 //BQMM集成
 #import "MMTextView.h"
 #import "MMTextParser.h"
+#import "MMGifManager.h"
 
 CGFloat const EaseMessageCellPadding = 10;
 

diff --git a/EaseUI/EMUIKit/Views/conversation/toolbar/EaseChatToolbar.m b/EaseUI/EMUIKit/Views/conversation/toolbar/EaseChatToolbar.m
@@ -888,6 +888,7 @@ - (void)willShowBottomView:(UIView *)bottomView
 //表情MM代理
 #pragma mark - *MMEmotionCentreDelegate
 - (void)didClickGifTab {
+    self.faceButton.selected = NO;
     if ([self.delegate respondsToSelector:@selector(didClickGifTab)]) {
         [self.delegate didClickGifTab];
     }