Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix

This commit is contained in:
Max
2023-10-31 18:06:49 +08:00

View File

@@ -52,7 +52,9 @@ public class GiftAttachment extends CustomAttachment {
giftReceiveInfo.setGiftNum(data.getIntValue("giftNum"));
giftReceiveInfo.setTargetNick(data.getString("targetNick"));
giftReceiveInfo.setTargetAvatar(data.getString("targetAvatar"));
giftReceiveInfo.setRoomAlbum(data.getBoolean("isRoomAlbum"));
if (data.containsKey("isRoomAlbum")) {
giftReceiveInfo.setRoomAlbum(data.getBoolean("isRoomAlbum"));
}
JSONObject giftJson = null;
if (data.containsKey("gift")) {
giftJson = data.getJSONObject("gift");