Add 点击收起键盘

guangyao · guangyao · commit 0b0de951c281 · 2017-08-25T15:19:14.000+08:00
diff --git a/chatinput.ios.js b/chatinput.ios.js
@@ -65,7 +65,7 @@ export default class ChatInput extends Component {
 ChatInput.propTypes = {
     ...View.propTypes,
     menuViewH:PropTypes.number,
-    DefaultToolHeight:PropTypes.number,
+    defaultToolHeight:PropTypes.number,
     onFeatureView:PropTypes.func,
     onShowKeyboard:PropTypes.func,
     onChangeBarHeight:PropTypes.func,
diff --git a/ios/RCTAuroraIMUI.xcodeproj/project.xcworkspace/xcuserdata/dowin.xcuserdatad/UserInterfaceState.xcuserstate b/ios/RCTAuroraIMUI.xcodeproj/project.xcworkspace/xcuserdata/dowin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/RCTAuroraIMUI/DWCustomView/InputView/DWInputBarControl.h b/ios/RCTAuroraIMUI/DWCustomView/InputView/DWInputBarControl.h
@@ -41,7 +41,7 @@ typedef enum{
 @property (strong, nonatomic) UIButton *showRecordeBtn;
 @property (strong, nonatomic) HPGrowingTextView *inputGrowView;
 @property (strong, nonatomic) DWRecordButton *recordBtn;
-@property (assign, nonatomic) CGFloat DefaultToolHeight;
+@property (assign, nonatomic) CGFloat defaultToolHeight;
 @property (assign, nonatomic) CGFloat inputViewHeight;
 
 @property (assign, nonatomic) id<DWInputBarControlDelegate> delegate;
diff --git a/ios/RCTAuroraIMUI/DWCustomView/InputView/DWInputBarControl.m b/ios/RCTAuroraIMUI/DWCustomView/InputView/DWInputBarControl.m
@@ -49,6 +49,8 @@ - (void)clickKeyBoardChange:(NSNotification *)noti{
     CGRect endFrame = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
     self.height = screenH - endFrame.origin.y+self.inputViewHeight;
     if(!self.onShowKeyboard) { return; }
+//    [UIView animateWithDuration:0.5 animations:<#^(void)animations#>]
+    
     self.onShowKeyboard(@{@"inputHeight":@(self.height),@"showType":@(0)});
     [[NSNotificationCenter defaultCenter]postNotificationName:@"ChangeMessageListHeightNotification" object:@{@"listViewHeight":@(screenH - 60 - self.height)}];
 
@@ -57,14 +59,14 @@ - (void)clickKeyBoardChange:(NSNotification *)noti{
 - (void)hidenFeatureView{
     __weak typeof(self)weakSelf = self;
     dispatch_sync(dispatch_get_main_queue(), ^{
-        weakSelf.showMenuBtn.selected = NO;
-        weakSelf.showExpressionBtn.selected = NO;
+        [weakSelf.inputGrowView endEditing:YES];
         weakSelf.expressionView.hidden = YES;
         if (weakSelf.showMenuBtn.selected && (weakSelf.height > self.menuViewH )) {
             weakSelf.showMenuBtn.selected = NO;
             weakSelf.height = weakSelf.height - self.menuViewH;
             weakSelf.onFeatureView(@{@"inputHeight":@(weakSelf.height),@"showType":@(0)});
         }else if(weakSelf.showExpressionBtn.selected && (weakSelf.height > expressionViewH )){
+            weakSelf.showExpressionBtn.selected = NO;
             weakSelf.height = weakSelf.height - expressionViewH;
             weakSelf.onFeatureView(@{@"inputHeight":@(weakSelf.height),@"showType":@(0)});
         }
@@ -112,14 +114,14 @@ - (instancetype)initWithFrame:(CGRect)frame{
 }
 
 
-- (void)setDefaultToolHeight:(CGFloat)DefaultToolHeight{
-    if (DefaultToolHeight) {
-        _DefaultToolHeight = DefaultToolHeight;
+- (void)setDefaultToolHeight:(CGFloat)defaultToolHeight{
+    if (defaultToolHeight) {
+        _defaultToolHeight = defaultToolHeight;
     }else{
-        _DefaultToolHeight = DESIGN_SIZE_750(90);
+        _defaultToolHeight = DESIGN_SIZE_750(90);
     }
-    _toolH = _DefaultToolHeight;
-    _inputViewHeight = _DefaultToolHeight;
+    _toolH = _defaultToolHeight;
+    _inputViewHeight = _defaultToolHeight;
     [self creatUI];
 }
 //发送录音message
@@ -204,8 +206,8 @@ - (void)setToolH:(CGFloat)toolH{
 
 - (void)creatUI{
     line.frame = CGRectMake(0, 0, screenW, 1);
-    CGFloat _margin = _DefaultToolHeight*0.1;
-    CGFloat btnWH = _DefaultToolHeight - 3*_margin;
+    CGFloat _margin = _defaultToolHeight*0.1;
+    CGFloat btnWH = _defaultToolHeight - 3*_margin;
     _toolView.frame = CGRectMake(0, 0, screenW, _toolH);
 
     CGFloat btnY = _toolH - 1.5*_margin - btnWH;
diff --git a/ios/RCTAuroraIMUI/DWCustomView/RNCustomInputView.m b/ios/RCTAuroraIMUI/DWCustomView/RNCustomInputView.m
@@ -23,7 +23,7 @@ @implementation RNCustomInputView
 RCT_EXPORT_MODULE()
 
 RCT_EXPORT_VIEW_PROPERTY(menuViewH, CGFloat);
-RCT_EXPORT_VIEW_PROPERTY(DefaultToolHeight, CGFloat);
+RCT_EXPORT_VIEW_PROPERTY(defaultToolHeight, CGFloat);
 RCT_EXPORT_VIEW_PROPERTY(onFeatureView, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onShowKeyboard, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onChangeBarHeight, RCTBubblingEventBlock)
@@ -97,10 +97,10 @@ - (void)changeRecordView{
     inpuntBar.expressionView.hidden = YES;
     if (inpuntBar.showRecordeBtn.selected) {
         [inpuntBar.inputGrowView endEditing:YES];
-        inpuntBar.height = inpuntBar.DefaultToolHeight;
+        inpuntBar.height = inpuntBar.defaultToolHeight;
         inpuntBar.recordBtn.hidden = NO;
         inpuntBar.inputGrowView.hidden = YES;
-        inpuntBar.toolH = inpuntBar.DefaultToolHeight;
+        inpuntBar.toolH = inpuntBar.defaultToolHeight;
     }else{
         inpuntBar.recordBtn.hidden = YES;
         inpuntBar.inputGrowView.hidden = NO;
diff --git a/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Protocol/IMUIMessageMessageCollectionViewDelegate.swift b/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Protocol/IMUIMessageMessageCollectionViewDelegate.swift
@@ -27,6 +27,7 @@ import UIKit
     @objc optional func messageCollectionView(didShowMenuStr: String, model: IMUIMessageModelProtocol)
     @objc optional func messageCollectionView(openMessageBubbleUrl: String)
     @objc optional func messageCollectionView(reloadMoreData:String)
+    @objc optional func messageCollectionView(tapCellView:UICollectionViewCell)
     
   
   /**
diff --git a/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIBaseMessageCell.swift b/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIBaseMessageCell.swift
@@ -25,6 +25,7 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
   
   weak var delegate: IMUIMessageMessageCollectionViewDelegate?
   var message: IMUIMessageModelProtocol?
+    var cellGesture = UITapGestureRecognizer.init()
    var bubbleGesture = UITapGestureRecognizer.init()
    var longPress = UILongPressGestureRecognizer.init()
   override init(frame: CGRect) {
@@ -40,12 +41,14 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
     self.contentView.addSubview(self.isPlayedView)
 //    self.bubbleGesture = UITapGestureRecognizer(target: self, action: #selector(self.tapBubbleView))
 //    let longPress = UILongPressGestureRecognizer(target: self, action: #selector(self.longTapBubbleView(sender:)))
+    self.cellGesture.addTarget(self, action: #selector(self.tapCellView))
     self.bubbleGesture.addTarget(self, action: #selector(self.tapBubbleView))
     self.longPress.addTarget(self, action: #selector(self.longTapBubbleView(sender:)))
     self.bubbleView.isUserInteractionEnabled = true
     self.bubbleView.addGestureRecognizer(self.bubbleGesture)
     self.bubbleView.addGestureRecognizer(self.longPress)
     self.bubbleGesture.numberOfTapsRequired = 1
+    self.addGestureRecognizer(self.cellGesture)
     
     let avatarGesture = UITapGestureRecognizer(target: self, action: #selector(self.tapHeaderImage))
     avatarGesture.numberOfTapsRequired = 1
@@ -145,6 +148,7 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
     self.isPlayedView.isHidden = true
     
     let statusView = self.statusView as! IMUIMessageStatusViewProtocal
+    self.statusView?.isHidden = false
     switch message.messageStatus {
       case .sending:
         statusView.layoutSendingStatus()
@@ -154,6 +158,7 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
         break
       case .success:
         statusView.layoutSuccessStatus()
+        self.statusView?.isHidden = true
         if message.type == .voice{//录音
             self.durationLabel.isHidden = false
             let tmpDict = message.customDict
@@ -201,9 +206,17 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
   }
   
   func tapBubbleView() {
-    self.delegate?.messageCollectionView?(didTapMessageBubbleInCell: self, model: self.message!)
+    if self.message?.type == .text {
+        self.delegate?.messageCollectionView?(tapCellView: self)
+    }else{
+        self.delegate?.messageCollectionView?(didTapMessageBubbleInCell: self, model: self.message!)
+    }
   }
     
+    func tapCellView(){//点击整个cell，隐藏键盘
+        self.delegate?.messageCollectionView?(tapCellView: self)
+    }
+    
   func longTapBubbleView(sender : UILongPressGestureRecognizer) {
     if sender.state == UIGestureRecognizerState.began{
         if self.message?.type == .notification || self.message?.type == .redpacketOpen {
@@ -244,7 +257,8 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
   }
   
   func tapSatusView() {
-    self.delegate?.messageCollectionView?(didTapStatusViewInCell: self, model: self.message!)
+        self.delegate?.messageCollectionView?(didTapStatusViewInCell: self, model: self.message!)
+    
   }
   
   func didDisAppearCell() {
@@ -255,16 +269,19 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
         if strTouch == "begin" {
             self.bubbleView.removeGestureRecognizer(self.bubbleGesture)
             self.bubbleView.removeGestureRecognizer(self.longPress)
+            self.removeGestureRecognizer(self.cellGesture)
         }else{
             self.bubbleView.addGestureRecognizer(bubbleGesture)
             self.bubbleView.addGestureRecognizer(longPress)
+            self.addGestureRecognizer(self.cellGesture)
         }
     }
     
     deinit {
         NotificationCenter.default.removeObserver(self)
         self.bubbleView.removeGestureRecognizer(self.bubbleGesture)
         self.bubbleView.removeGestureRecognizer(self.longPress)
+        self.removeGestureRecognizer(self.cellGesture)
     }
     
 
diff --git a/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIMessageCollectionView.swift b/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIMessageCollectionView.swift
@@ -109,7 +109,7 @@ open class IMUIMessageCollectionView: UIView {
   open func appendMessage(with message: IMUIMessageModel) {
     self.chatDataManager.appendMessage(with: message)
     self.messageCollectionView.reloadData()
-    self.scrollToBottom(with: true)
+//    self.scrollToBottom(with: true)
   }
     
     open func fristAppendMessage(with message: IMUIMessageModel) {
diff --git a/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUITextMessageCell.swift b/ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUITextMessageCell.swift
@@ -39,9 +39,6 @@ open class IMUITextMessageCell: IMUIBaseMessageCell {
     fatalError("init(coder:) has not been implemented")
   }
   
-    override open func tapBubbleView() {
-        
-    }
     
   override open func layoutSubviews() {
     super.layoutSubviews()
@@ -83,6 +80,7 @@ open class IMUITextMessageCell: IMUIBaseMessageCell {
   }
     
     func clickOpenLink(notification: Notification){
+        print("clickOpenLink")
         let dict = notification.object as! NSDictionary
         let tmpLabel = dict.object(forKey: "label") as! M80AttributedLabel
         if tmpLabel == self.textMessageLable {
diff --git a/ios/RCTAuroraIMUI/RCTAuroraIMUIModule.h b/ios/RCTAuroraIMUI/RCTAuroraIMUIModule.h
@@ -20,7 +20,6 @@
 #define kInsertMessagesToTop @"kInsertMessagesToTop"
 #define kUpdateMessge @"kUpdateMessge"
 #define kScrollToBottom @"kScrollToBottom"
-#define kScrollToBottom @"kScrollToBottom"
 #define kHidenFeatureView @"kHidenFeatureView"
 #define kRecordChangeNotification @"RecordChangeNotification"
 #define kRecordLevelNotification @"RecordLevelNotification"
diff --git a/ios/RCTAuroraIMUI/RCTMessageListView.m b/ios/RCTAuroraIMUI/RCTMessageListView.m
@@ -43,7 +43,6 @@ - (instancetype)init {
   return self;
 }
 
-
 - (RCTMessageModel *)convertMessageDicToModel:(NSMutableDictionary *)message {
   return [[RCTMessageModel alloc] initWithMessageDic: message];
 }
diff --git a/ios/RCTAuroraIMUI/RCTMessageListViewManager.m b/ios/RCTAuroraIMUI/RCTMessageListViewManager.m
@@ -19,8 +19,8 @@ @interface RCTMessageListViewManager : RCTViewManager <IMUIMessageMessageCollect
 /// Tells the delegate that user tap message cell
 - (void)messageCollectionView:(UICollectionView * _Nonnull)_ forItemAt:(NSIndexPath * _Nonnull)forItemAt model:(id <IMUIMessageModelProtocol> _Nonnull)model;
 /// Tells the delegate that user tap message bubble
-- (void)messageCollectionViewWithDidTapMessageBubbleInCell:(UICollectionViewCell * _Nonnull)didTapMessageBubbleInCell model:(id <IMUIMessageModelProtocol> _Nonnull)model;
-
+- (void)messageCollectionViewWithTapCellView:(UICollectionViewCell * _Nonnull)tapCellView;
+- (void)messageCollectionViewWithDidTapMessageBubbleInCell:(UICollectionViewCell * _Nonnull)didTapMessageBubbleInCell;
 
 - (void)messageCollectionViewWithOpenMessageBubbleUrl:(NSString *)url;
 
@@ -63,6 +63,7 @@ - (UIView *)view
   
   _messageList = [[bundle loadNibNamed:@"RCTMessageListView" owner:self options: nil] objectAtIndex:0];
   _messageList.messageList.delegate = self;
+    
   _messageList.delegate = self;
   
   
@@ -112,7 +113,6 @@ - (UIView *)view
   if (color != nil) {
     IMUITextMessageCell.outGoingTextColor = color;
   }
-  
 }
 
 RCT_CUSTOM_VIEW_PROPERTY(receiveBubbleTextColor, NSString, RCTMessageListView) {
@@ -188,7 +188,7 @@ - (UIView *)view
   MyMessageCellLayout.incommingPadding = UIEdgeInsetsMake([top floatValue], [left floatValue], [bottom floatValue], [right floatValue]);
 }
 
-- (RCTMessageModel *)convertMessageDicToModel:(NSDictionary *)message {
+- (RCTMessageModel *)convertMessageDicToModel:(NSMutableDictionary *)message {
   return [[RCTMessageModel alloc] initWithMessageDic: message];
 }
 
@@ -222,6 +222,10 @@ - (void)messageCollectionViewWithDidTapMessageBubbleInCell:(UICollectionViewCell
     _messageList.onMsgClick((@{@"message": messageDic}));
 }
 
+- (void)messageCollectionViewWithTapCellView:(UICollectionViewCell *)tapCellView{//隐藏键盘
+    if(!_messageList.onBeginDragMessageList) { return; }
+    _messageList.onBeginDragMessageList(@{});
+}
 
 - (void)messageCollectionViewWithOpenMessageBubbleUrl:(NSString *)url{
     if(!_messageList.onMsgOpenUrlClick) { return; }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ open class IMUIMessageCollectionView: UIView {`
`109`	`109`	`open func appendMessage(with message: IMUIMessageModel) {`
`110`	`110`	`self.chatDataManager.appendMessage(with: message)`
`111`	`111`	`self.messageCollectionView.reloadData()`
`112`		`- self.scrollToBottom(with: true)`
	`112`	`+// self.scrollToBottom(with: true)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`open func fristAppendMessage(with message: IMUIMessageModel) {`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,6 @@ open class IMUITextMessageCell: IMUIBaseMessageCell {`
`39`	`39`	`fatalError("init(coder:) has not been implemented")`
`40`	`40`	`}`
`41`	`41`
`42`		`- override open func tapBubbleView() {`
`43`		`-`
`44`		`- }`
`45`	`42`
`46`	`43`	`override open func layoutSubviews() {`
`47`	`44`	`super.layoutSubviews()`
`@@ -83,6 +80,7 @@ open class IMUITextMessageCell: IMUIBaseMessageCell {`
`83`	`80`	`}`
`84`	`81`
`85`	`82`	`func clickOpenLink(notification: Notification){`
	`83`	`+ print("clickOpenLink")`
`86`	`84`	`let dict = notification.object as! NSDictionary`
`87`	`85`	`let tmpLabel = dict.object(forKey: "label") as! M80AttributedLabel`
`88`	`86`	`if tmpLabel == self.textMessageLable {`