Merge pull request #76 from jpush/dev

Dev

Author: huangminlinux

example/app/routes/Chat/index.js

@@ -88,6 +88,11 @@ export default class Chat extends Component {
       auroraMsg.text = jmessage.eventType
     }
 
+    if(jmessage.type === 'prompt') {
+      auroraMsg.msgType = 'event'
+      auroraMsg.text = jmessage.promptText
+    }
+
     var user = {
       userId: "1",
       displayName: "",
@@ -309,6 +314,24 @@ export default class Chat extends Component {
     Alert.alert('onSendGalleryFiles',JSON.stringify(message))
   }
 
+  onMsgLongClick = (message) => {
+    var msg = {}
+    msg.type = 'group'
+    msg.groupId = this.conversation.groupId
+    msg.messageId = message.msgId
+    Alert.alert('撤回消息','撤回消息')
+    JMessage.retractMessage(msg, (success) => {
+      var eventMsg = {}
+      eventMsg.msgId = message.msgId
+      eventMsg.msgType = "event"
+      eventMsg.text = "撤回的消息"
+      AuroraIController.updateMessage(message)
+    }, (error) => {
+
+    })
+    
+  }
+
   onStatusViewClick = (message) => {
     console.log(message)
     message.status = 'send_succeed'
@@ -522,6 +545,7 @@ export default class Chat extends Component {
           ref="MessageList"
           onAvatarClick={this.onAvatarClick}
           onMsgClick={this.onMsgClick}
+          onMsgLongClick={this.onMsgLongClick}
           onStatusViewClick={this.onStatusViewClick}
           onTouchMsgList={this.onTouchMsgList}
           onTapMessageCell={this.onTapMessageCell}

ios/RCTJMessageModule/RCTJMessageModule.m

@@ -1599,8 +1599,8 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
       }
 
       successCallback(@[@{@"username": user.username,
-                          @"appKey": user.appKey,
-                          @"filePath": [user largeAvatarLocalPath]}]);
+                          @"appKey": user.appKey ?: @"",
+                          @"filePath": [user largeAvatarLocalPath] ?: @""}]);
     }];
   }];
 
@@ -1658,7 +1658,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
 
         JMSGMediaAbstractContent *mediaContent = (JMSGMediaAbstractContent *) message.content;
         successCallback(@[@{@"messageId": message.msgId,
-                            @"filePath": [mediaContent originMediaLocalPath]}]);
+                            @"filePath": [mediaContent originMediaLocalPath] ?: @""}]);
       }];
     }
   }];
@@ -1714,7 +1714,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
 
                 JMSGMediaAbstractContent *mediaContent = (JMSGMediaAbstractContent *) message.content;
                 successCallback(@[@{@"messageId": message.msgId,
-                                    @"filePath": [content thumbImageLocalPath]}]);
+                                    @"filePath": [content thumbImageLocalPath] ?: @""}]);
             }];
         }
     }];
@@ -1772,7 +1772,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
 
         JMSGMediaAbstractContent *mediaContent = (JMSGMediaAbstractContent *) message.content;
         successCallback(@[@{@"messageId": message.msgId,
-                         @"filePath": [mediaContent originMediaLocalPath]}]);
+                            @"filePath": [mediaContent originMediaLocalPath] ?: @""}]);
       }];
     }
   }];
@@ -1830,7 +1830,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
         }
         JMSGFileContent *fileContent = (JMSGFileContent *) message.content;
         successCallback(@[@{@"messageId": message.msgId,
-                            @"filePath":[fileContent originMediaLocalPath]}]);
+                            @"filePath":[fileContent originMediaLocalPath] ?: @"" }]);
       }];
     }
   }];
@@ -2319,7 +2319,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
         return ;
       }
 
-      successCallback(@[@{@"id": objectId, @"filePath": group.thumbAvatarLocalPath}]);
+        successCallback(@[@{@"id": objectId, @"filePath": group.thumbAvatarLocalPath ?: @""}]);
     }];
   }];
 }
@@ -2345,7 +2345,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
         return ;
       }
 
-      successCallback(@[@{@"id": objectId, @"filePath": group.largeAvatarLocalPath}]);
+      successCallback(@[@{@"id": objectId, @"filePath": group.largeAvatarLocalPath  ?: @""}]);
     }];
   }];
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.3.9",
+  "version": "2.4.0",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {