Merge branch 'master' of https://github.com/reactnativecomponent/react-native-netease-im

Author: guangyao

android/src/main/java/com/netease/im/ReactCache.java

@@ -259,8 +259,8 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                             }
                             break;
                         case CustomAttachmentType.Card:
-                            if (attachment instanceof RedPacketOpenAttachement) {
-                                String str = "";
+                            if (attachment instanceof CardAttachment) {
+                                String str;
                                 if (fromAccount.equals(LoginService.getInstance().getAccount())) {
                                     str = "推荐了";
                                 } else {
@@ -273,7 +273,7 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                             if (attachment instanceof DefaultCustomAttachment) {
                                 content = ((DefaultCustomAttachment) attachment).getDigst();
                                 if (TextUtils.isEmpty(content)) {
-                                    content = "[自定义消息]";
+                                    content = "[未知消息]";
                                 }
                             }
                             break;

android/src/main/java/com/netease/im/session/SessionService.java

@@ -761,10 +761,10 @@ public void sendRedPacketMessage(String type, String comments, String serialNo,
         sendMessageSelf(message, onSendMessageListener, false);
     }
 
-    public void sendCardMessage(String type, String name, String imgPath, String sessionId, OnSendMessageListener onSendMessageListener) {
+    public void sendCardMessage(String type, String name, String imgPath, String id, OnSendMessageListener onSendMessageListener) {
         CustomMessageConfig config = new CustomMessageConfig();
         CardAttachment attachment = new CardAttachment();
-        attachment.setParams(type, name, imgPath, sessionId);
+        attachment.setParams(type, name, imgPath, id);
         IMMessage message = MessageBuilder.createCustomMessage(sessionId, sessionTypeEnum, "[名片] " + name, attachment, config);
         sendMessageSelf(message, onSendMessageListener, false);
     }

android/src/main/java/com/netease/im/session/extension/CardAttachment.java

@@ -11,7 +11,7 @@
 
 public class CardAttachment extends CustomAttachment {
 
-    private String type;
+    private String cardType;
     private String name;
     private String imgPath;
     private String sessionId;
@@ -22,22 +22,21 @@ public CardAttachment() {
 
     @Override
     protected void parseData(JSONObject data) {
-        type = data.getString(MessageConstant.Card.type);
+        cardType = data.getString(MessageConstant.Card.type);
         name = data.getString(MessageConstant.Card.name);
         imgPath = data.getString(MessageConstant.Card.imgPath);
         sessionId = data.getString(MessageConstant.Card.sessionId);
     }
 
     public void setParams(String type, String name, String imgPath, String sessionId) {
-        this.type = type;
+        this.cardType = type;
         this.name = name;
         this.imgPath = imgPath;
         this.sessionId = sessionId;
     }
 
-    @Override
-    public String getType() {
-        return type;
+    public String getCardType() {
+        return cardType;
     }
 
     public String getName() {
@@ -51,7 +50,7 @@ public String getImgPath() {
     @Override
     protected JSONObject packData() {
         JSONObject object = new JSONObject();
-        object.put(MessageConstant.Card.type, type);
+        object.put(MessageConstant.Card.type, cardType);
         object.put(MessageConstant.Card.name, name);
         object.put(MessageConstant.Card.imgPath, imgPath);
         object.put(MessageConstant.Card.sessionId, sessionId);
@@ -61,7 +60,7 @@ protected JSONObject packData() {
     @Override
     public WritableMap toReactNative() {
         WritableMap writableMap = Arguments.createMap();
-        writableMap.putString(MessageConstant.Card.type, type);
+        writableMap.putString(MessageConstant.Card.type, cardType);
         writableMap.putString(MessageConstant.Card.name, name);
         writableMap.putString(MessageConstant.Card.imgPath, imgPath);
         writableMap.putString(MessageConstant.Card.sessionId, sessionId);