fix animation

Author: guangyao

ios/RCTAuroraIMUI/DWCustomView/InputView/DWInputBarControl.m

@@ -45,31 +45,39 @@ - (void)addNotification{
 #pragma mark -- 监听键盘
 - (void)clickKeyBoardChange:(NSNotification *)noti{
     NSDictionary *userInfo = noti.userInfo;
-    NSLog(@"clickKeyBoardChange:%@",userInfo);
+//    NSLog(@"clickKeyBoardChange:%@",userInfo);
     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.height = screenH - endFrame.origin.y+self.inputViewHeight;
+    NSLog(@"----height:%f",self.height);
+    CGFloat tmpH = screenH - endFrame.origin.y+self.inputViewHeight;
+    CGFloat keyboardY = screenH - 20;
+    if (!(self.showExpressionBtn.selected || self.showMenuBtn.selected) || (keyboardY > endFrame.origin.y)) {
+        if(!self.onShowKeyboard) { return; }
+        self.onShowKeyboard(@{@"inputHeight":@(tmpH),@"showType":@(0)});
+    }
+//    [[NSNotificationCenter defaultCenter]postNotificationName:@"ChangeMessageListHeightNotification" object:@{@"listViewHeight":@(screenH - 60 - tmpH)}];
 
-    self.onShowKeyboard(@{@"inputHeight":@(self.height),@"showType":@(0)});
-    [[NSNotificationCenter defaultCenter]postNotificationName:@"ChangeMessageListHeightNotification" object:@{@"listViewHeight":@(screenH - 60 - self.height)}];
 
 }
 
 - (void)hidenFeatureView{
     __weak typeof(self)weakSelf = self;
     dispatch_sync(dispatch_get_main_queue(), ^{
         [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)});
-        }
+        [UIView animateWithDuration:1.0 animations:^{
+            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)});
+            }
+        } completion:^(BOOL finished) {
+            weakSelf.expressionView.hidden = YES;
+        }];
+
     });
 
 }

ios/RCTAuroraIMUI/DWCustomView/RNCustomInputView.m

@@ -58,15 +58,14 @@ - (void)changeMenuView{
     }else{
         inpuntBar.height = inpuntBar.inputViewHeight;
         [inpuntBar.inputGrowView becomeFirstResponder];
-        showType = 0;
     }
     if(!inpuntBar.onFeatureView) { return; }
     inpuntBar.onFeatureView(@{@"inputHeight":@(inpuntBar.height),@"showType":@(showType)});
 }
 //显示ExpressionView
 - (void)changExpressionView{
     int showType = 0;
-    [inpuntBar.inputGrowView endEditing:YES];
+//    [inpuntBar.inputGrowView endEditing:YES];
     if (inpuntBar.showRecordeBtn.selected) {
         inpuntBar.showRecordeBtn.selected = NO;
         inpuntBar.recordBtn.hidden = YES;
@@ -80,6 +79,7 @@ - (void)changExpressionView{
         inpuntBar.expressionView.hidden = NO;
         CGFloat inputH = inpuntBar.inputViewHeight + expressionViewH;
         inpuntBar.height = inputH;
+        showType = 2;
 
     }else{
         inpuntBar.expressionView.hidden = YES;

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIMessageCollectionView.swift

@@ -58,9 +58,11 @@ open class IMUIMessageCollectionView: UIView {
     self.setupMessageCollectionView()
   }
 
+    
   override open func layoutSubviews() {
     super.layoutSubviews()
-    IMUIMessageCellLayout.cellWidth = self.imui_width
+//    IMUIMessageCellLayout.cellWidth = self.imui_width
+    IMUIMessageCellLayout.cellWidth = UIScreen.main.bounds.size.width
   }
 
   func setupMessageCollectionView() {
@@ -112,10 +114,12 @@ open class IMUIMessageCollectionView: UIView {
 //    self.scrollToBottom(with: true)
   }
 
+    
     open func fristAppendMessage(with message: IMUIMessageModel) {
         self.chatDataManager.appendMessage(with: message)
         self.messageCollectionView.reloadData()
-        self.scrollToBottom(with: false)
+        scrollToBottom(with: false)
+
     }
 
     open func deleteMessage(with messageId: String) {
@@ -168,6 +172,7 @@ extension IMUIMessageCollectionView: UICollectionViewDelegate, UICollectionViewD
   func collectionView(_ collectionView: UICollectionView,
                       layout collectionViewLayout: UICollectionViewLayout,
                       sizeForItemAtIndexPath indexPath: IndexPath) -> CGSize {
+//    return CGSize(width: messageCollectionView.imui_width, height: chatDataManager[indexPath.item].layout.cellHeight)
     return CGSize(width: messageCollectionView.imui_width, height: chatDataManager[indexPath.item].layout.cellHeight)
   }
 

ios/RCTAuroraIMUI/RCTMessageListView.m

@@ -11,7 +11,7 @@
 #import <RCTAuroraIMUI/RCTAuroraIMUI-Swift.h>
 #import "RCTAuroraIMUIModule.h"
 #import "RNRecordTipsView.h"
-
+#import "UIView+Extend.h"
 
 #define screenW [UIScreen mainScreen].bounds.size.width
 #define screenH [UIScreen mainScreen].bounds.size.height
@@ -276,10 +276,15 @@ - (void)clickRecordLongTimeNotification:(NSNotification *)notification{
 
 - (void)clickChangeHeight:(NSNotification *)noti{
     NSDictionary *dict = noti.object;
-    CGFloat height = [[dict objectForKey:@"listViewHeight"] floatValue];
-    CGRect rect = self.frame;
-    rect.size.height = height;
-    self.frame = rect;
+    CGFloat height = [[dict objectForKey:@"listViewHeight"] floatValue] ;
+    CGFloat tmpH = height - self.height;
+    [UIView animateWithDuration:3 animations:^{
+        self.height += tmpH;
+    } completion:^(BOOL finished) {
+         self.height = height;
+    }];
+    
+   
 }
 
 - (void)clickLongTouchShowMenu:(NSNotification *)noti{