Merge pull request #4 from wicked-tc130/dev

 ios-getHistoryMessage新增未读消息数

Author: wicked-tc130

android/src/io/jchat/android/JMessageModule.java

@@ -1855,9 +1855,9 @@ public void gotResult(int status, String desc) {
     public void getPublicGroupInfos(final ReadableMap map, final Callback success, final Callback fail) {
         try {
             String appKey = map.hasKey(Constant.APP_KEY) ? map.getString(Constant.APP_KEY) : "";
-            int start = Integer.parseInt(map.getString(Constant.START));
-            int count = Integer.parseInt(map.getString(Constant.COUNT));
-            String reason = map.getString(Constant.REASON);
+            int start = map.getInt(Constant.START);
+            int count = map.getInt(Constant.COUNT);
+            //String reason = map.getString(Constant.REASON);
             JMessageClient.getPublicGroupListByApp(appKey, start, count, new RequestCallback<List<GroupBasicInfo>>() {
                 @Override
                 public void gotResult(int status, String desc, List<GroupBasicInfo> groupBasicInfos) {

document/API.md

@@ -1139,7 +1139,7 @@ JMessage.createSendMessage({type: 'single', username: 'username', appKey: 'appke
   - isCustomNotificationEnabled: 是否开启自定义接收方通知栏功能，设置为 `true` 后可设置下面的 `notificationTitle` 和 `notificationText`。默认未设置。
   - notificationTitle: 设置此条消息在接收方通知栏所展示通知的标题。
   - notificationText: 设置此条消息在接收方通知栏所展示通知的内容。
-  - needReadReceipt: (Android Only)设置这条消息的发送是否需要对方发送已读回执 开启之后，对方收到消息后，如果调用了setMsgHaveRead()接口， 则作为消息发送方，会收到已读消息回执事件通知
+  - needReadReceipt: 设置这条消息的发送是否需要对方发送已读回执 开启之后，对方收到消息后，如果调用了setMsgHaveRead()接口， 则作为消息发送方，会收到已读消息回执事件通知
 
 ### sendTextMessage
 
@@ -1759,14 +1759,17 @@ JMessage.resetUnreadMessageCount({ type: 'single', username: 'username', appKey:
 
 ### setMsgHaveRead
 
-设置消息已读(Android Only)
+设置消息已读
 
 #### 示例
 
 ```js
-JMessageModule.setMsgHaveRead(params,(successCallback) =>{},(failCallback) => {
+JMessageModule.setMsgHaveRead(params,(result) =>{
         var code = result.code
         var desc = result.description
+        },(error) => {
+        var code = error.code
+        var desc = error.description
     }
 )
 ```
@@ -2132,7 +2135,7 @@ JMessage.removeSyncOfflineMessageListener(listener) // 移除监听(一般在 co
 
 ####  addReceiptMessageListener
 
-已读消息回执事件监听。（Android Only）
+已读消息回执事件监听。
 
 ##### 示例
 

example/app/routes/Chat/index.js

@@ -208,7 +208,7 @@ export default class Chat extends Component {
           id: message.id,
         }
 
-        JMessage.setMsgHaveRead(readParams,(successCallback) => {},(failCallback) => {})
+        JMessage.setMsgHaveRead(readParams,(result) => {},(error) => {})
 
         if (this.conversation.type === 'single') {
           if (message.target.type === 'user') {

ios/RCTJMessageModule/JMessageHelper.h

@@ -10,6 +10,7 @@
 #import <JMessage/JMessage.h>
 
 #define kJJMessageReceiveMessage     @"kJJMessageReceiveMessage"
+#define kJJMessageReceiptMessage     @"kJJMessageReceiptMessage"
 #define kJJMessageReceiveChatRoomMessage     @"kJJMessageReceiveChatRoomMessage"
 #define kJJMessageSendMessageRespone @"kJJMessageSendMessageRespone"
 

ios/RCTJMessageModule/JMessageHelper.m

@@ -18,6 +18,7 @@
 
 
 #define receiveMsgEvent @"JMessage.ReceiveMsgEvent" // 接收到消息事件
+#define receiptMsgEvent @"JMessage.ReceiptMsgEvent" // 接收到已读消息回执事件
 #define receiveChatRoomMsgEvent @"JMessage.ReceiveChatRoomMsgEvent" // 接收到消息事件
 #define conversationChangeEvent @"JMessage.conversationChange" // 会话变更事件
 #define loginStateChangedEvent @"JMessage.LoginStateChanged" // 登录状态变更通知