RoomShield 中的 user 和 keyword 可能是 JsonArray 也可能是 String

This commit is contained in:
czp3009 2018-08-29 19:45:28 +08:00
parent d08d1fbd8c
commit 519b917105
2 changed files with 12 additions and 11 deletions

View File

@ -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 {

View File

@ -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<String> user;
private JsonElement user;
//同上
@SerializedName("keyword")
private List<String> keyword;
private JsonElement keyword;
@Override
public String getCmd() {
@ -49,19 +50,19 @@ public class RoomShieldEntity implements DataEntity {
this.roomId = roomId;
}
public List<String> getUser() {
public JsonElement getUser() {
return user;
}
public void setUser(List<String> user) {
public void setUser(JsonElement user) {
this.user = user;
}
public List<String> getKeyword() {
public JsonElement getKeyword() {
return keyword;
}
public void setKeyword(List<String> keyword) {
public void setKeyword(JsonElement keyword) {
this.keyword = keyword;
}
}