Merge remote-tracking branch 'origin/master'

Author: xhp

README.md

@@ -7,6 +7,11 @@
 
 ```
 npm install react-native-imui --save
+```
+## link
+
+```
+react-naive link react-native-imui 
 ```
  `settings.gradle` 中的引用路径：
 ```
@@ -67,8 +72,8 @@ dependencies {
 **status 必须为以下四个值之一: "send_succeed", "send_failed", "send_going", "download_failed"，如果没有定义这个属性， 默认值是 "send_succeed".**
 
  ```
-  message = {  // text message
-    msgId: "msgid",
+  message = {  // 文本
+    msgId: "msgid",
     status: "send_going",
     msgType: "text",
     isOutgoing: true,
@@ -82,34 +87,82 @@ message = {  // image message
     isOutGoing: true,
     progress: "progress string"
     mediaPath: "image path"
-    fromUser: {}
+    fromUser: {},
+    extend:{
+      displayName:"图片发送于2017-12-07 10:07",
+      imageHeight:"2848.000000",
+      imageWidth:"4288.000000",
+      thumbPath:"",
+      url:""
+    }
 }
 
-
-message = {  // voice message
-    msgId: "msgid",
+message = {  // 语音
+    msgId: "msgid",
     msgType: "voice",
     isOutGoing: true,
     duration: number, // 注意这个值有用户自己设置时长，单位秒
     mediaPath: "voice path"
+    fromUser: {},
+    extend:{
+      duration:"3"
+      isPlayed:false
+      url:""
+    }   
+}
+
+message = {  //红包消息
+    msgId: "msgid",
+    status: "",
+    msgType: "redpacket",
+    isOutGoing: true,
+    extend: {
+      comments:"",//祝福语
+      serialNo:"",//
+      type:""//红包类型
+    },
+    fromUser: {}
+}
+message = {  //红包领取消息
+    msgId: "msgid",
+    status: "",
+    msgType: "redpacketOpen",
+    isOutGoing: true,
+    extend: {
+     serialNo:""
+     tipMsg:""//红包通知
+    },
     fromUser: {}
 }
 
-message = {  // video message
-    msgId: "msgid",
-    status: "send_failed",
-    msgType: "video",
+message = {  //转账消息
+    msgId: "msgid",
+    status: "",
+    msgType: "transfer",
     isOutGoing: true,
-    druation: number
-    mediaPath: "voice path"
+    extend: {
+     amount:"1"
+     comments:""
+     serialNo:""
+    },
     fromUser: {}
 }
 
-message = {  // event message
-    msgId: "msgid",
-    msgType: "event",
-    text: "the event text"
+message = {  //名片消息
+    msgId: "msgid",
+    status: "",
+    msgType: "card",
+    isOutGoing: true,
+    extend: {
+     imgPath:""//头像
+     name:""//昵称
+     sessionId:""//userId
+     type:""
+    },
+    fromUser: {}
 }
+
+
  ```
 
 -    `fromUser` 对象格式:

chatinput.android.js

@@ -10,6 +10,7 @@ var {
   StyleSheet,
   View,
   requireNativeComponent,
+    ViewPropTypes
 } = ReactNative;
 import PropTypes from 'prop-types'
 
@@ -89,7 +90,7 @@ ChatInput.propTypes = {
   onShowKeyboard: PropTypes.func,
   onFeatureView: PropTypes.func,
   onEditTextChange: PropTypes.func,
-  ...View.propTypes
+  ...ViewPropTypes
 };
 
 var RCTChatInput = requireNativeComponent('RCTChatInput', ChatInput);

chatinput.ios.js

@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import {View, requireNativeComponent,NativeModules} from 'react-native';
+import {View, requireNativeComponent,NativeModules,ViewPropTypes} from 'react-native';
 import PropTypes from 'prop-types'
 
 export default class ChatInput extends Component {
@@ -64,7 +64,7 @@ export default class ChatInput extends Component {
     }
 }
 ChatInput.propTypes = {
-    ...View.propTypes,
+    ...ViewPropTypes,
     // menuViewH:PropTypes.number,
     defaultToolHeight:PropTypes.number,
     onFeatureView:PropTypes.func,

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIBaseMessageCell.swift

@@ -238,8 +238,8 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
   }
 
     func tapCellView(){//点击整个cell，隐藏键盘
-//        self.delegate?.messageCollectionView?(tapCellView: "")
-        UIApplication.shared.keyWindow?.endEditing(true)
+        self.delegate?.messageCollectionView?(tapCellView: "")
+//        UIApplication.shared.keyWindow?.endEditing(true)
     }
 
 

messagelist.android.js

@@ -11,6 +11,7 @@ var {
   StyleSheet,
   View,
   requireNativeComponent,
+    ViewPropTypes
 } = ReactNative;
 import PropTypes from 'prop-types'
 
@@ -123,7 +124,7 @@ MessageList.propTypes = {
   datePadding: PropTypes.number,
   avatarSize: PropTypes.object,
   isShowDisplayName: PropTypes.bool,
-  ...View.propTypes
+  ...ViewPropTypes
 };
 
 var RCTMessageList = requireNativeComponent('RCTMessageList', MessageList);

messagelist.ios.js

@@ -11,6 +11,7 @@ var {
   StyleSheet,
   View,
   requireNativeComponent,
+    ViewPropTypes
 } = ReactNative;
 import PropTypes from 'prop-types'
 
@@ -151,7 +152,7 @@ MessageList.propTypes = {
   isShowDisplayName: PropTypes.bool,
   isShowIncommingDisplayName: PropTypes.bool,
   isShowOutgoingDisplayName: PropTypes.bool,
-  ...View.propTypes
+  ...ViewPropTypes
 };
 
 var RCTMessageList = requireNativeComponent('RCTMessageListView', MessageList);

package.json

@@ -81,5 +81,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.0.3"
+  "version": "1.0.6"
 }