Bläddra i källkod

Merge branch 'master' into AutomaticRedPacketGrabbing

jixionghui 4 år sedan
förälder
incheckning
0e30f7a3e1

+ 2 - 2
skWeiChatBaidu/src/main/java/com/liaobo/im/view/chatHolder/RedViewHolder.java

@@ -135,8 +135,8 @@ class RedViewHolder extends AChatHolderInterface {
                             } else {
                                 // 在群里面我领取过的红包直接跳转
 
-
-                                if (isGounp &&( mdata.getFileSize() != 1 || !mLoginUserId.equals(openRedpacket.getPacket().getAssignUserId()))) {
+                                String assignUserId = openRedpacket.getPacket().getAssignUserId();
+                                if (isGounp && ( mdata.getFileSize() != 1 || (!TextUtils.isEmpty(assignUserId) &&!mLoginUserId.equals(assignUserId)))) {
                                     mContext.startActivity(intent);
                                 } else {
                                     if (mdata.getFilePath().equals("3")) {