Fix

Author: guangyao

ios/RCTAuroraIMUI.xcodeproj/project.pbxproj

@@ -57,6 +57,7 @@
 		4E49AE2D1F3476E500B50439 /* NIMInputEmoticonDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E49AE2C1F3476E500B50439 /* NIMInputEmoticonDefine.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4E49AE301F3476F800B50439 /* NSString+NIMKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E49AE2E1F3476F800B50439 /* NSString+NIMKit.h */; };
 		4E49AE311F3476F800B50439 /* NSString+NIMKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E49AE2F1F3476F800B50439 /* NSString+NIMKit.m */; };
+		4E4EB3A01F5112F6009A5AF8 /* IMUIBaseMessageHeadCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E4EB39F1F5112F6009A5AF8 /* IMUIBaseMessageHeadCell.swift */; };
 		4E5274CE1F3C0925005FB9B9 /* IMUILocationMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E5274CD1F3C0925005FB9B9 /* IMUILocationMessageCell.swift */; };
 		4E5274D21F3C5CE2005FB9B9 /* IMUIRedPacketMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E5274D11F3C5CE2005FB9B9 /* IMUIRedPacketMessageCell.swift */; };
 		4E77A3A51F30840000098CAF /* IMUIAudioPlayerHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E77A3681F30840000098CAF /* IMUIAudioPlayerHelper.swift */; };
@@ -189,6 +190,7 @@
 		4E49AE2C1F3476E500B50439 /* NIMInputEmoticonDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NIMInputEmoticonDefine.h; sourceTree = "<group>"; };
 		4E49AE2E1F3476F800B50439 /* NSString+NIMKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+NIMKit.h"; sourceTree = "<group>"; };
 		4E49AE2F1F3476F800B50439 /* NSString+NIMKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+NIMKit.m"; sourceTree = "<group>"; };
+		4E4EB39F1F5112F6009A5AF8 /* IMUIBaseMessageHeadCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMUIBaseMessageHeadCell.swift; sourceTree = "<group>"; };
 		4E5274CD1F3C0925005FB9B9 /* IMUILocationMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMUILocationMessageCell.swift; sourceTree = "<group>"; };
 		4E5274D11F3C5CE2005FB9B9 /* IMUIRedPacketMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMUIRedPacketMessageCell.swift; sourceTree = "<group>"; };
 		4E77A3681F30840000098CAF /* IMUIAudioPlayerHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMUIAudioPlayerHelper.swift; sourceTree = "<group>"; };
@@ -479,6 +481,7 @@
 			isa = PBXGroup;
 			children = (
 				4E77A38C1F30840000098CAF /* IMUIBaseMessageCell.swift */,
+				4E4EB39F1F5112F6009A5AF8 /* IMUIBaseMessageHeadCell.swift */,
 				4E77A38D1F30840000098CAF /* IMUIImageMessageCell.swift */,
 				4E77A38E1F30840000098CAF /* IMUILiveVideoMessageCell.swift */,
 				4E77A38F1F30840000098CAF /* IMUIMessageBubbleView.swift */,
@@ -783,6 +786,7 @@
 				4E77A3B61F30840000098CAF /* IMUIMessageModel.swift in Sources */,
 				4E77A3BE1F30840000098CAF /* IMUIUserProtocol.swift in Sources */,
 				4E49AE231F34764100B50439 /* NIMInputEmoticonTabView.m in Sources */,
+				4E4EB3A01F5112F6009A5AF8 /* IMUIBaseMessageHeadCell.swift in Sources */,
 				4E466F941F3ADECF0014451B /* M80AttributedLabelAttachment.m in Sources */,
 				4E77A3BC1F30840000098CAF /* IMUIMessageModelProtocol.swift in Sources */,
 				4E77A3C31F30840000098CAF /* IMUIMessageBubbleView.swift in Sources */,

ios/RCTAuroraIMUI/DWCustomView/RNCustomInputView.m

@@ -55,12 +55,12 @@ - (void)changeMenuView{
         CGFloat inputH = inpuntBar.inputViewHeight + inpuntBar.menuViewH;
         inpuntBar.height = inputH;
         showType = 1;
+        if(!inpuntBar.onFeatureView) { return; }
+        inpuntBar.onFeatureView(@{@"inputHeight":@(inpuntBar.height),@"showType":@(showType)});
     }else{
         inpuntBar.height = inpuntBar.inputViewHeight;
         [inpuntBar.inputGrowView becomeFirstResponder];
     }
-    if(!inpuntBar.onFeatureView) { return; }
-    inpuntBar.onFeatureView(@{@"inputHeight":@(inpuntBar.height),@"showType":@(showType)});
 }
 //显示ExpressionView
 - (void)changExpressionView{
@@ -79,15 +79,15 @@ - (void)changExpressionView{
         inpuntBar.expressionView.hidden = NO;
         CGFloat inputH = inpuntBar.inputViewHeight + expressionViewH;
         inpuntBar.height = inputH;
-        showType = 2;
-
+        showType = 0;
+        if(!inpuntBar.onFeatureView) { return; }
+        inpuntBar.onFeatureView(@{@"inputHeight":@(inpuntBar.height),@"showType":@(showType)});
     }else{
         inpuntBar.expressionView.hidden = YES;
         inpuntBar.height = inpuntBar.inputViewHeight;
         [inpuntBar.inputGrowView becomeFirstResponder];
     }
-    if(!inpuntBar.onFeatureView) { return; }
-    inpuntBar.onFeatureView(@{@"inputHeight":@(inpuntBar.height),@"showType":@(showType)});
+
 }
 
 - (void)changeRecordView{
@@ -101,21 +101,22 @@ - (void)changeRecordView{
         inpuntBar.recordBtn.hidden = NO;
         inpuntBar.inputGrowView.hidden = YES;
         inpuntBar.toolH = inpuntBar.defaultToolHeight;
+        if(!inpuntBar.onFeatureView) { return; }
+        inpuntBar.onFeatureView(@{@"inputHeight":@(inpuntBar.height),@"showType":@(0)});
     }else{
         inpuntBar.recordBtn.hidden = YES;
         inpuntBar.inputGrowView.hidden = NO;
         inpuntBar.toolH = inpuntBar.inputViewHeight;
         inpuntBar.height = inpuntBar.inputViewHeight;
         [inpuntBar.inputGrowView becomeFirstResponder];
     }
-    if(!inpuntBar.onFeatureView) { return; }
-    inpuntBar.onFeatureView(@{@"inputHeight":@(inpuntBar.height),@"showType":@(0)});
+
 }
 
 #pragma mark -- DWIputBarDelegate
 //点击按钮
 - (void)inputBarClickBtn:(UIButton *)btn{
-    NSLog(@"%zd",btn.tag);
+    NSLog(@"~inputBarClickBtn:%zd",btn.tag);
     switch (btn.tag) {
         case DWInputBarControlBtnTypeRecord:
         {

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Models/IMUIMessageModel.swift

@@ -143,20 +143,20 @@ open class IMUIMessageModel: NSObject, IMUIMessageModelProtocol {
       bubbleContentSize = CGSize(width: 120, height: 160)
       break
     case .location:
-        let locationW = UIScreen.main.bounds.width*0.7
+        let locationW = UIScreen.main.bounds.width*0.625
         let strTitle = self.customDict.object(forKey: "title") as! String
         let tmpSize = heightWithFont(font: UIFont.systemFont(ofSize: (screenW * 13 / 375)), fixedWidth: (locationW-15), text: strTitle)
-      bubbleContentSize = CGSize(width: locationW, height: UIScreen.main.bounds.width*0.35+tmpSize.height+15 )
+      bubbleContentSize = CGSize(width: locationW, height: UIScreen.main.bounds.width*0.625*0.5+tmpSize.height+15 )
       break
     case .notification:
         bubbleContentSize = CGSize(width: UIScreen.main.bounds.width, height: 40)
         isShowAvatar = false
         break
     case .redpacket:
-        bubbleContentSize = CGSize(width: UIScreen.main.bounds.width*0.7, height: UIScreen.main.bounds.width*0.245)
+        bubbleContentSize = CGSize(width: UIScreen.main.bounds.width*0.62, height: UIScreen.main.bounds.width*0.62*0.35)
         break
     case .transfer:
-        bubbleContentSize = CGSize(width: UIScreen.main.bounds.width*0.7, height: UIScreen.main.bounds.width*0.245)
+        bubbleContentSize = CGSize(width: UIScreen.main.bounds.width*0.62, height: UIScreen.main.bounds.width*0.62*0.35)
         break
     case .url:
         bubbleContentSize = CGSize(width: 100, height: 100)

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIBaseMessageHeadCell.swift

@@ -0,0 +1,43 @@
+//
+//  IMUIBaseMessageHeadCell.swift
+//  RCTAuroraIMUI
+//
+//  Created by Dowin on 2017/8/26.
+//  Copyright © 2017年 HXHG. All rights reserved.
+//
+
+//
+
+import UIKit
+
+open class IMUIBaseMessageHeadCell: UICollectionViewCell {
+    var actView: UIActivityIndicatorView!
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = UIColor.clear
+        actView = UIActivityIndicatorView.init(activityIndicatorStyle: UIActivityIndicatorViewStyle.gray)
+        actView.hidesWhenStopped = true
+        self.addSubview(self.actView)
+        self.setupSubViews()
+    }
+    
+    public  func playActView(){
+        self.actView.startAnimating()
+    }
+    
+    public  func stopActView(){
+        self.actView.stopAnimating()
+    }
+    
+    fileprivate func setupSubViews() {
+        self.actView.center = CGPoint(x:UIScreen.main.bounds.size.width*0.5,y:5)
+        
+
+    }
+    
+    required public init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIMessageCollectionView.swift

@@ -10,11 +10,12 @@ import UIKit
 
 
 open class IMUIMessageCollectionView: UIView {
-
+    
   @IBOutlet var view: UIView!
   @IBOutlet open weak var messageCollectionView: UICollectionView!
     var isPull = false
   var viewCache = IMUIReuseViewCache()
+    var headView = IMUIBaseMessageHeadCell()
 
   // React Native Property ---->
   var action: Array<Any> {
@@ -44,8 +45,9 @@ open class IMUIMessageCollectionView: UIView {
     view.frame = self.bounds
     self.chatDataManager = IMUIChatDataManager()
     self.setupMessageCollectionView()
+    
   }
-  
+    
   required public init?(coder aDecoder: NSCoder) {
     super.init(coder: aDecoder)
 
@@ -80,8 +82,11 @@ open class IMUIMessageCollectionView: UIView {
     self.messageCollectionView.register(IMUIRedPacketMessageCell.self, forCellWithReuseIdentifier: IMUIRedPacketMessageCell.self.description())
     self.messageCollectionView.register(IMUITransferMessageCell.self, forCellWithReuseIdentifier: IMUITransferMessageCell.self.description())
     self.messageCollectionView.register(IMUIRedPacketOpenMessageCell.self, forCellWithReuseIdentifier: IMUIRedPacketOpenMessageCell.self.description())
+    self.messageCollectionView.register(IMUIBaseMessageHeadCell.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: "headView")
 
     self.messageCollectionView.isScrollEnabled = true
+    
+    NotificationCenter.default.addObserver(self, selector: #selector(clickStopPlayActivity(notification:)), name: NSNotification.Name(rawValue: "StopPlayActivity"), object: nil)
   }
 
   open subscript(index: Int) -> IMUIMessageModelProtocol {
@@ -138,13 +143,15 @@ open class IMUIMessageCollectionView: UIView {
   }
 
   open func insertMessages(with messages:[IMUIMessageModel]) {
+
     self.chatDataManager.insertMessages(with: messages)
     self.messageCollectionView.reloadData()
-    var scrollIndex = messages.count
-    if scrollIndex>1 {
-        scrollIndex = scrollIndex - 1
-    }
+    let scrollIndex = messages.count
+//    if scrollIndex>1 {
+//        scrollIndex = scrollIndex
+//    }
     self.scrollTo(index: scrollIndex)
+
   }
 
   open func updateMessage(with message:IMUIMessageModel) {
@@ -154,6 +161,16 @@ open class IMUIMessageCollectionView: UIView {
       self.messageCollectionView.reloadItems(at: [indexPath])
     }
   }
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+    
+    //通知方法
+    func clickStopPlayActivity(notification: Notification){
+        DispatchQueue.main.async(execute: {
+            self.headView.stopActView()
+        })
+    }
 }
 
 // MARK: - UICollectionViewDelegate, UICollectionViewDataSource
@@ -247,20 +264,38 @@ extension IMUIMessageCollectionView: UICollectionViewDelegate, UICollectionViewD
         self.delegate?.messageCollectionView?(collectionView, didEndDisplaying: didEndDisplaying, forItemAt: forItemAt, model: messageModel)
     }
   }
-}
+    
+    public   func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+        return CGSize(width: UIScreen.main.bounds.width, height: 30)
+    }
 
+    public func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+        let headCell = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionElementKindSectionHeader, withReuseIdentifier: "headView", for: indexPath) as! IMUIBaseMessageHeadCell
+        self.headView = headCell
+        return headCell
+    }
+    
+}
 
 
 extension IMUIMessageCollectionView: UIScrollViewDelegate {
   public func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
     self.delegate?.messageCollectionView?(self.messageCollectionView)
   }
     public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        DispatchQueue.main.async(execute: {
+            self.headView.playActView()
+        })
         if scrollView.contentOffset.y < -30 {
             isPull = true
         }else if scrollView.contentOffset.y == 0 && isPull{
+
             isPull = false
             self.delegate?.messageCollectionView?(reloadMoreData:"")
+        }else{
+            DispatchQueue.main.async(execute: {
+                self.headView.stopActView()
+            })
         }
     }
 

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIRedPacketMessageCell.swift

@@ -23,10 +23,10 @@ class IMUIRedPacketMessageCell: IMUIBaseMessageCell {
         contentLable.textColor = UIColor.white
         contentLable.font = UIFont.systemFont(ofSize: (screenW * 16 / 375))
         tipsLabel.textColor = UIColor.white
-        tipsLabel.font = UIFont.systemFont(ofSize: (screenW * 15 / 375))
+        tipsLabel.font = UIFont.systemFont(ofSize: (screenW * 12 / 375))
         tipsLabel.text = "领取红包"
         titleLable.textColor = UIColor.gray
-        titleLable.font = UIFont.systemFont(ofSize: (screenW * 16 / 375))
+        titleLable.font = UIFont.systemFont(ofSize: (screenW * 12 / 375))
         titleLable.text = "红包"
         titleLable.textAlignment = NSTextAlignment.center
 

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIRedPacketOpenMessageCell.swift

@@ -22,30 +22,44 @@ class IMUIRedPacketOpenMessageCell: IMUIBaseMessageCell {
     var contView = UIView()
     var titleLable = UILabel()
     var redImg = UIImageView()
+    var tapRedView = UIView()
+    var redGesture = UITapGestureRecognizer.init()
     let screenW = UIScreen.main.bounds.size.width
     override init(frame: CGRect) {
         super.init(frame: frame)
         titleLable.textColor = UIColor.white
         titleLable.font = UIFont.systemFont(ofSize: (screenW * 13 / 375))
         titleLable.textAlignment = NSTextAlignment.center
+        self.redGesture.addTarget(self, action: #selector(self.clickTapRedView))
+        tapRedView.isUserInteractionEnabled = true
+        tapRedView.addGestureRecognizer(self.redGesture)
+        self.redGesture.numberOfTapsRequired = 1
         redImg.image = UIImage.init(named: "packet_tip")
         contView.backgroundColor = UIColor.init(red: 200/255.0, green: 200/255.0, blue: 200/255.0, alpha: 0.7)
         contView.layer.cornerRadius = 5
         contView.clipsToBounds = true
         contView.addSubview(redImg)
         contView.addSubview(titleLable)
-        
+        contView.addSubview(tapRedView)
         bubbleView.addSubview(contView)
     }
 
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+    override func tapBubbleView() {
+        
+    }
+    
     override func layoutSubviews() {
         super.layoutSubviews()
     }
 
+    func clickTapRedView() {
+        self.delegate?.messageCollectionView?(didTapMessageBubbleInCell: self, model: self.message!)
+    }
+    
     override func presentCell(with message: IMUIMessageModelProtocol, viewCache: IMUIReuseViewCache , delegate: IMUIMessageMessageCollectionViewDelegate?) {
         super.presentCell(with: message, viewCache: viewCache, delegate: delegate)
         let layout = message.layout
@@ -55,6 +69,7 @@ class IMUIRedPacketOpenMessageCell: IMUIBaseMessageCell {
         let tmpArr = rangesOf(searchString: "红包", inString: strTitle)
 
         for tmpR in tmpArr {
+            
             attString.addAttribute(NSForegroundColorAttributeName, value: UIColor.init(red: 216/255.0, green: 38/255.0, blue: 23/255.0, alpha: 1), range: tmpR as! NSRange)
         }
 
@@ -65,6 +80,9 @@ class IMUIRedPacketOpenMessageCell: IMUIBaseMessageCell {
         redImg.frame = CGRect(origin: CGPoint(x:6, y:3), size: CGSize(width:14, height:18))
         contView.frame = CGRect(origin: CGPoint(x:contentX, y:contentY), size: CGSize(width:titleW+24, height:24))
         self.titleLable.frame = CGRect(origin: CGPoint(x:22, y:0), size: CGSize(width:titleW, height:24))
+        self.tapRedView.frame.size = CGSize(width:40,height:24)
+        self.tapRedView.frame.origin = CGPoint(x:titleW-16,y:0)
+        self.tapRedView.backgroundColor = UIColor.clear
 
     }
     func widthWithFont(font : UIFont,  text : String, maxWidth: CGFloat) -> CGFloat {

ios/RCTAuroraIMUI/RCTAuroraIMUIModule.h

@@ -30,7 +30,6 @@
 #define kClickLongTouchShowMenu @"kClickLongTouchShowMenuNotification"
 #define kStopPlayVoice @"kStopPlayVoice"
 
-
 @interface RCTAuroraIMUIModule : NSObject <RCTBridgeModule>
 
 @end

ios/RCTAuroraIMUI/RCTAuroraIMUIModule.m

@@ -84,4 +84,8 @@ - (id)init {
     [[NSNotificationCenter defaultCenter] postNotificationName:kStopPlayVoice object: nil];
 }
 
+RCT_EXPORT_METHOD(stopPlayActivity) {
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"StopPlayActivity" object: nil];
+}
+
 @end