diff --git a/build.gradle b/build.gradle index 44e9b90..c313e5c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group = 'com.hiczp' -version = '0.0.19' +version = '0.0.20' description = 'Bilibili android client API library written in Java' apply plugin: 'idea' @@ -25,9 +25,9 @@ dependencies { // https://mvnrepository.com/artifact/org.slf4j/slf4j-api compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' // https://mvnrepository.com/artifact/io.netty/netty-all - compile group: 'io.netty', name: 'netty-all', version: '4.1.27.Final' + compile group: 'io.netty', name: 'netty-all', version: '4.1.29.Final' // https://mvnrepository.com/artifact/com.google.guava/guava - compile group: 'com.google.guava', name: 'guava', version: '25.1-jre' + compile group: 'com.google.guava', name: 'guava', version: '26.0-jre' } dependencies { diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomShieldEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomShieldEntity.java index bd301b2..14d32b6 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomShieldEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomShieldEntity.java @@ -1,9 +1,8 @@ package com.hiczp.bilibili.api.live.socket.entity; +import com.google.gson.JsonElement; import com.google.gson.annotations.SerializedName; -import java.util.List; - public class RoomShieldEntity implements DataEntity { /** * cmd : ROOM_SHIELD @@ -19,10 +18,12 @@ public class RoomShieldEntity implements DataEntity { private int type; @SerializedName("roomid") private long roomId; + //user 可能是 JsonArray 也可能是 String @SerializedName("user") - private List user; + private JsonElement user; + //同上 @SerializedName("keyword") - private List keyword; + private JsonElement keyword; @Override public String getCmd() { @@ -49,19 +50,19 @@ public class RoomShieldEntity implements DataEntity { this.roomId = roomId; } - public List getUser() { + public JsonElement getUser() { return user; } - public void setUser(List user) { + public void setUser(JsonElement user) { this.user = user; } - public List getKeyword() { + public JsonElement getKeyword() { return keyword; } - public void setKeyword(List keyword) { + public void setKeyword(JsonElement keyword) { this.keyword = keyword; } }