mirror of
https://github.com/czp3009/bilibili-api.git
synced 2024-12-21 20:30:28 +08:00
修正命名和数据类型
This commit is contained in:
czp3009
parent
b73b3c5c25
commit
a721bf1d99
@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class ActivityGiftsEntity {
|
||||
public class ActivityGiftsEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -14,10 +14,8 @@ public class ActivityGiftsEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<DataEntity> data;
|
||||
private List<Data> data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -27,23 +25,15 @@ public class ActivityGiftsEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<DataEntity> getData() {
|
||||
public List<Data> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<DataEntity> data) {
|
||||
public void setData(List<Data> data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* id : 102
|
||||
* bag_id : 48843715
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class AppSmallTVEntity {
|
||||
public class AppSmallTVEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : OK
|
||||
@ -14,10 +14,6 @@ public class AppSmallTVEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class AppSmallTVEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -61,18 +41,18 @@ public class AppSmallTVEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("lastid")
|
||||
private long lastid;
|
||||
private long lastId;
|
||||
@SerializedName("join")
|
||||
private List<Join> join;
|
||||
@SerializedName("unjoin")
|
||||
private List<Unjoin> unjoin;
|
||||
private List<Unjoin> unJoin;
|
||||
|
||||
public long getLastid() {
|
||||
return lastid;
|
||||
public long getLastId() {
|
||||
return lastId;
|
||||
}
|
||||
|
||||
public void setLastid(long lastid) {
|
||||
this.lastid = lastid;
|
||||
public void setLastId(long lastId) {
|
||||
this.lastId = lastId;
|
||||
}
|
||||
|
||||
public List<Join> getJoin() {
|
||||
@ -83,12 +63,12 @@ public class AppSmallTVEntity {
|
||||
this.join = join;
|
||||
}
|
||||
|
||||
public List<Unjoin> getUnjoin() {
|
||||
return unjoin;
|
||||
public List<Unjoin> getUnJoin() {
|
||||
return unJoin;
|
||||
}
|
||||
|
||||
public void setUnjoin(List<Unjoin> unjoin) {
|
||||
this.unjoin = unjoin;
|
||||
public void setUnJoin(List<Unjoin> unJoin) {
|
||||
this.unJoin = unJoin;
|
||||
}
|
||||
|
||||
public static class Join {
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class AreaListEntity {
|
||||
public class AreaListEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -14,10 +14,6 @@ public class AreaListEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<Data> data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class AreaListEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<Data> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class AssistantRoomInfoEntity {
|
||||
public class AssistantRoomInfoEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -12,10 +12,6 @@ public class AssistantRoomInfoEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -27,22 +23,6 @@ public class AssistantRoomInfoEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -87,7 +67,7 @@ public class AssistantRoomInfoEntity {
|
||||
@SerializedName("face")
|
||||
private String face;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("rcost")
|
||||
private int rcost;
|
||||
@SerializedName("online")
|
||||
@ -99,7 +79,7 @@ public class AssistantRoomInfoEntity {
|
||||
@SerializedName("title")
|
||||
private String title;
|
||||
@SerializedName("istry")
|
||||
private int istry;
|
||||
private int isTry;
|
||||
@SerializedName("try_time")
|
||||
private String tryTime;
|
||||
@SerializedName("is_medal")
|
||||
@ -153,12 +133,12 @@ public class AssistantRoomInfoEntity {
|
||||
this.face = face;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public int getRcost() {
|
||||
@ -201,12 +181,12 @@ public class AssistantRoomInfoEntity {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public int getIstry() {
|
||||
return istry;
|
||||
public int getIsTry() {
|
||||
return isTry;
|
||||
}
|
||||
|
||||
public void setIstry(int istry) {
|
||||
this.istry = istry;
|
||||
public void setIsTry(int isTry) {
|
||||
this.isTry = isTry;
|
||||
}
|
||||
|
||||
public String getTryTime() {
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class AwardsEntity {
|
||||
public class AwardsEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,10 +13,8 @@ public class AwardsEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,23 +24,15 @@ public class AwardsEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* list : [{"id":100000,"uid":1000000,"gift_name":"小电视","gift_type":"2","gift_num":1,"user_name":"打码","user_phone":"打码","user_address":"打码","user_extra_field":"{\"user_area\":\"打码\",\"user_post_code\":\"打码\",\"user_city\":\"打码\",\"user_province\":\"打码\"}","source":"小电视抽奖","source_id":10000,"create_time":"2018-02-01 00:00:00","update_time":null,"expire_time":"2018-02-16 00:00:00","comment":null,"status":0,"expire":true,"finished":true},{"id":10000,"uid":1000000,"gift_name":"小米Max2手机","gift_type":"2","gift_num":1,"user_name":"打码","user_phone":"打码","user_address":"打码","user_extra_field":"{\"user_province\":\"\\u6253\\u7801\",\"user_city\":\"\\u6253\\u7801\",\"user_area\":\"\\u6253\\u7801\",\"user_post_code\":\"打码\"}","source":"小米Max2超耐久直播第二季","source_id":1,"create_time":"2017-06-01 00:00:00","update_time":"2017-06-01 00:00:00","expire_time":"2017-06-30 00:00:00","comment":null,"status":0,"expire":true,"finished":true}]
|
||||
* use_count : 0
|
||||
@ -54,7 +44,7 @@ public class AwardsEntity {
|
||||
@SerializedName("count")
|
||||
private int count;
|
||||
@SerializedName("list")
|
||||
private List<AwardEntity> awardList;
|
||||
private List<Award> awardList;
|
||||
|
||||
public int getUseCount() {
|
||||
return useCount;
|
||||
@ -72,15 +62,15 @@ public class AwardsEntity {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public List<AwardEntity> getAwardList() {
|
||||
public List<Award> getAwardList() {
|
||||
return awardList;
|
||||
}
|
||||
|
||||
public void setAwardList(List<AwardEntity> awardList) {
|
||||
public void setAwardList(List<Award> awardList) {
|
||||
this.awardList = awardList;
|
||||
}
|
||||
|
||||
public static class AwardEntity {
|
||||
public static class Award {
|
||||
/**
|
||||
* id : 100000
|
||||
* uid : 1000000
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class BulletScreenConfigEntity {
|
||||
public class BulletScreenConfigEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -11,10 +11,8 @@ public class BulletScreenConfigEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -24,23 +22,15 @@ public class BulletScreenConfigEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* refresh_row_factor : 0.125
|
||||
* refresh_rate : 100
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class CancelMedalResponseEntity {
|
||||
public class CancelMedalResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,8 +13,6 @@ public class CancelMedalResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<?> data;
|
||||
|
||||
@ -26,14 +24,6 @@ public class CancelMedalResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<?> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class CancelTitleResponseEntity {
|
||||
public class CancelTitleResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -14,10 +14,6 @@ public class CancelTitleResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<?> data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class CancelTitleResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<?> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class CapsuleInfoEntity {
|
||||
public class CapsuleInfoEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,8 +13,6 @@ public class CapsuleInfoEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -26,14 +24,6 @@ public class CapsuleInfoEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class CoverEntity {
|
||||
public class CoverEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -14,10 +14,6 @@ public class CoverEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class CoverEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -69,9 +49,9 @@ public class CoverEntity {
|
||||
@SerializedName("reason")
|
||||
private String reason;
|
||||
@SerializedName("isup")
|
||||
private int isup;
|
||||
private int isUp;
|
||||
@SerializedName("cover_list")
|
||||
private List<CoverList> coverList;
|
||||
private List<CoverData> coverList;
|
||||
|
||||
public String getCover() {
|
||||
return cover;
|
||||
@ -97,23 +77,23 @@ public class CoverEntity {
|
||||
this.reason = reason;
|
||||
}
|
||||
|
||||
public int getIsup() {
|
||||
return isup;
|
||||
public int getIsUp() {
|
||||
return isUp;
|
||||
}
|
||||
|
||||
public void setIsup(int isup) {
|
||||
this.isup = isup;
|
||||
public void setIsUp(int isUp) {
|
||||
this.isUp = isUp;
|
||||
}
|
||||
|
||||
public List<CoverList> getCoverList() {
|
||||
public List<CoverData> getCoverList() {
|
||||
return coverList;
|
||||
}
|
||||
|
||||
public void setCoverList(List<CoverList> coverList) {
|
||||
public void setCoverList(List<CoverData> coverList) {
|
||||
this.coverList = coverList;
|
||||
}
|
||||
|
||||
public static class CoverList {
|
||||
public static class CoverData {
|
||||
/**
|
||||
* id : 381657
|
||||
* iscover : 1
|
||||
@ -127,7 +107,7 @@ public class CoverEntity {
|
||||
@SerializedName("id")
|
||||
private int id;
|
||||
@SerializedName("iscover")
|
||||
private int iscover;
|
||||
private int isCover;
|
||||
@SerializedName("cover")
|
||||
private String cover;
|
||||
@SerializedName("status")
|
||||
@ -135,7 +115,7 @@ public class CoverEntity {
|
||||
@SerializedName("reason")
|
||||
private String reason;
|
||||
@SerializedName("isup")
|
||||
private int isup;
|
||||
private int isUp;
|
||||
@SerializedName("lock")
|
||||
private int lock;
|
||||
|
||||
@ -147,12 +127,12 @@ public class CoverEntity {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public int getIscover() {
|
||||
return iscover;
|
||||
public int getIsCover() {
|
||||
return isCover;
|
||||
}
|
||||
|
||||
public void setIscover(int iscover) {
|
||||
this.iscover = iscover;
|
||||
public void setIsCover(int isCover) {
|
||||
this.isCover = isCover;
|
||||
}
|
||||
|
||||
public String getCover() {
|
||||
@ -179,12 +159,12 @@ public class CoverEntity {
|
||||
this.reason = reason;
|
||||
}
|
||||
|
||||
public int getIsup() {
|
||||
return isup;
|
||||
public int getIsUp() {
|
||||
return isUp;
|
||||
}
|
||||
|
||||
public void setIsup(int isup) {
|
||||
this.isup = isup;
|
||||
public void setIsUp(int isUp) {
|
||||
this.isUp = isUp;
|
||||
}
|
||||
|
||||
public int getLock() {
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class FollowedHostsEntity {
|
||||
public class FollowedHostsEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -14,10 +14,6 @@ public class FollowedHostsEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class FollowedHostsEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -67,7 +47,7 @@ public class FollowedHostsEntity {
|
||||
@SerializedName("page")
|
||||
private long page;
|
||||
@SerializedName("pagesize")
|
||||
private long pagesize;
|
||||
private long pageSize;
|
||||
@SerializedName("count")
|
||||
private long count;
|
||||
@SerializedName("total_page")
|
||||
@ -87,12 +67,12 @@ public class FollowedHostsEntity {
|
||||
this.page = page;
|
||||
}
|
||||
|
||||
public long getPagesize() {
|
||||
return pagesize;
|
||||
public long getPageSize() {
|
||||
return pageSize;
|
||||
}
|
||||
|
||||
public void setPagesize(long pagesize) {
|
||||
this.pagesize = pagesize;
|
||||
public void setPageSize(long pageSize) {
|
||||
this.pageSize = pageSize;
|
||||
}
|
||||
|
||||
public long getCount() {
|
||||
@ -160,7 +140,7 @@ public class FollowedHostsEntity {
|
||||
@SerializedName("face")
|
||||
private String face;
|
||||
@SerializedName("roomid")
|
||||
private int roomid;
|
||||
private int roomId;
|
||||
@SerializedName("areaName")
|
||||
private String areaName;
|
||||
@SerializedName("area_v2_id")
|
||||
@ -206,12 +186,12 @@ public class FollowedHostsEntity {
|
||||
this.face = face;
|
||||
}
|
||||
|
||||
public int getRoomid() {
|
||||
return roomid;
|
||||
public int getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(int roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(int roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public String getAreaName() {
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class FreeSilverAwardEntity {
|
||||
public class FreeSilverAwardEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -11,10 +11,8 @@ public class FreeSilverAwardEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -24,23 +22,15 @@ public class FreeSilverAwardEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* surplus : -1039.6166666667
|
||||
* silver : 2426
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class FreeSilverCurrentTaskEntity {
|
||||
public class FreeSilverCurrentTaskEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message :
|
||||
@ -11,10 +11,8 @@ public class FreeSilverCurrentTaskEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -24,23 +22,15 @@ public class FreeSilverCurrentTaskEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* minute : 3
|
||||
* silver : 30
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class GetAppSmallTVRewardResponseEntity {
|
||||
public class GetAppSmallTVRewardResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : ok
|
||||
@ -12,10 +12,6 @@ public class GetAppSmallTVRewardResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -27,22 +23,6 @@ public class GetAppSmallTVRewardResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -27,6 +27,15 @@ public class GiftEntity {
|
||||
@SerializedName("rnd")
|
||||
private long random = (long) (Math.random() * 9999999999L);
|
||||
|
||||
/**
|
||||
* 礼物的构造器, giftId 与 bagId 必须匹配, roomId 与 roomUserId 必须匹配
|
||||
*
|
||||
* @param giftId 礼物 ID
|
||||
* @param bagId 礼物在背包中的 ID
|
||||
* @param number 数量
|
||||
* @param roomId 房间号
|
||||
* @param roomUserId 房间主播的用户 ID
|
||||
*/
|
||||
public GiftEntity(long giftId, long bagId, long number, long roomId, long roomUserId) {
|
||||
this.giftId = giftId;
|
||||
this.bagId = bagId;
|
||||
@ -35,16 +44,16 @@ public class GiftEntity {
|
||||
this.roomUserId = roomUserId;
|
||||
}
|
||||
|
||||
public GiftEntity(long giftId, long bagId, long number, LiveRoomInfoEntity.LiveRoomEntity liveRoomEntity) {
|
||||
this(giftId, bagId, number, liveRoomEntity.getRoomId(), liveRoomEntity.getMid());
|
||||
public GiftEntity(long giftId, long bagId, long number, LiveRoomInfoEntity.LiveRoom liveRoom) {
|
||||
this(giftId, bagId, number, liveRoom.getRoomId(), liveRoom.getMid());
|
||||
}
|
||||
|
||||
public GiftEntity(PlayerBagEntity.BagGiftEntity bagGiftEntity, long number, long roomId, long roomUserId) {
|
||||
this(bagGiftEntity.getGiftId(), bagGiftEntity.getId(), number, roomId, roomUserId);
|
||||
public GiftEntity(PlayerBagEntity.BagGift bagGift, long number, long roomId, long roomUserId) {
|
||||
this(bagGift.getGiftId(), bagGift.getId(), number, roomId, roomUserId);
|
||||
}
|
||||
|
||||
public GiftEntity(PlayerBagEntity.BagGiftEntity bagGiftEntity, long number, LiveRoomInfoEntity.LiveRoomEntity liveRoomEntity) {
|
||||
this(bagGiftEntity.getGiftId(), bagGiftEntity.getId(), number, liveRoomEntity.getRoomId(), liveRoomEntity.getMid());
|
||||
public GiftEntity(PlayerBagEntity.BagGift bagGift, long number, LiveRoomInfoEntity.LiveRoom liveRoom) {
|
||||
this(bagGift.getGiftId(), bagGift.getId(), number, liveRoom.getRoomId(), liveRoom.getMid());
|
||||
}
|
||||
|
||||
public long getGiftId() {
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class GiftTopEntity {
|
||||
public class GiftTopEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,10 +13,8 @@ public class GiftTopEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,23 +24,15 @@ public class GiftTopEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* unlogin : 0
|
||||
* uname : czp3009
|
||||
@ -52,30 +42,30 @@ public class GiftTopEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("unlogin")
|
||||
private int unlogin;
|
||||
private int unLogin;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("rank")
|
||||
private int rank;
|
||||
@SerializedName("coin")
|
||||
private int coin;
|
||||
@SerializedName("list")
|
||||
private List<ListEntity> list;
|
||||
private List<GiftSender> giftSenders;
|
||||
|
||||
public int getUnlogin() {
|
||||
return unlogin;
|
||||
public int getUnLogin() {
|
||||
return unLogin;
|
||||
}
|
||||
|
||||
public void setUnlogin(int unlogin) {
|
||||
this.unlogin = unlogin;
|
||||
public void setUnLogin(int unLogin) {
|
||||
this.unLogin = unLogin;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public int getRank() {
|
||||
@ -94,15 +84,15 @@ public class GiftTopEntity {
|
||||
this.coin = coin;
|
||||
}
|
||||
|
||||
public List<ListEntity> getList() {
|
||||
return list;
|
||||
public List<GiftSender> getGiftSenders() {
|
||||
return giftSenders;
|
||||
}
|
||||
|
||||
public void setList(List<ListEntity> list) {
|
||||
this.list = list;
|
||||
public void setGiftSenders(List<GiftSender> giftSenders) {
|
||||
this.giftSenders = giftSenders;
|
||||
}
|
||||
|
||||
public static class ListEntity {
|
||||
public static class GiftSender {
|
||||
/**
|
||||
* uid : 20293030
|
||||
* rank : 1
|
||||
@ -123,7 +113,7 @@ public class GiftTopEntity {
|
||||
@SerializedName("score")
|
||||
private int score;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("coin")
|
||||
private int coin;
|
||||
@SerializedName("face")
|
||||
@ -163,12 +153,12 @@ public class GiftTopEntity {
|
||||
this.score = score;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public int getCoin() {
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class HistoryEntity {
|
||||
public class HistoryEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,8 +13,6 @@ public class HistoryEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -26,14 +24,6 @@ public class HistoryEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -53,7 +43,7 @@ public class HistoryEntity {
|
||||
@SerializedName("page")
|
||||
private int page;
|
||||
@SerializedName("pagesize")
|
||||
private int pagesize;
|
||||
private int pageSize;
|
||||
@SerializedName("total_page")
|
||||
private int totalPage;
|
||||
@SerializedName("list")
|
||||
@ -67,12 +57,12 @@ public class HistoryEntity {
|
||||
this.page = page;
|
||||
}
|
||||
|
||||
public int getPagesize() {
|
||||
return pagesize;
|
||||
public int getPageSize() {
|
||||
return pageSize;
|
||||
}
|
||||
|
||||
public void setPagesize(int pagesize) {
|
||||
this.pagesize = pagesize;
|
||||
public void setPageSize(int pageSize) {
|
||||
this.pageSize = pageSize;
|
||||
}
|
||||
|
||||
public int getTotalPage() {
|
||||
@ -112,7 +102,7 @@ public class HistoryEntity {
|
||||
@SerializedName("face")
|
||||
private String face;
|
||||
@SerializedName("roomid")
|
||||
private long roomid;
|
||||
private long roomId;
|
||||
@SerializedName("areaName")
|
||||
private String areaName;
|
||||
@SerializedName("live_status")
|
||||
@ -148,12 +138,12 @@ public class HistoryEntity {
|
||||
this.face = face;
|
||||
}
|
||||
|
||||
public long getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(long roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public String getAreaName() {
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class IsFollowedResponseEntity {
|
||||
public class IsFollowedResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -12,12 +12,8 @@ public class IsFollowedResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -27,31 +23,15 @@ public class IsFollowedResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* follow : 1
|
||||
*/
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemsEntity {
|
||||
public class ItemsEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -13,10 +13,8 @@ public class ItemsEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<DataEntity> data;
|
||||
private List<Item> items;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,23 +24,15 @@ public class ItemsEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
public List<Item> getItems() {
|
||||
return items;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
public void setItems(List<Item> items) {
|
||||
this.items = items;
|
||||
}
|
||||
|
||||
public List<DataEntity> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<DataEntity> data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Item {
|
||||
/**
|
||||
* id : 99
|
||||
* name : 花酒
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class JoinAppSmallTVResponseEntity {
|
||||
public class JoinAppSmallTVResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : OK
|
||||
@ -12,10 +12,6 @@ public class JoinAppSmallTVResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -27,22 +23,6 @@ public class JoinAppSmallTVResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class LiveHistoryBulletScreensEntity {
|
||||
public class LiveHistoryBulletScreensEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,10 +14,8 @@ public class LiveHistoryBulletScreensEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,34 +25,26 @@ public class LiveHistoryBulletScreensEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
@SerializedName("room")
|
||||
private List<LiveHistoryBulletScreenEntity> room;
|
||||
private List<LiveHistoryBulletScreen> liveHistoryBulletScreens;
|
||||
@SerializedName("admin")
|
||||
private List<?> admin;
|
||||
|
||||
public List<LiveHistoryBulletScreenEntity> getRoom() {
|
||||
return room;
|
||||
public List<LiveHistoryBulletScreen> getLiveHistoryBulletScreens() {
|
||||
return liveHistoryBulletScreens;
|
||||
}
|
||||
|
||||
public void setRoom(List<LiveHistoryBulletScreenEntity> room) {
|
||||
this.room = room;
|
||||
public void setLiveHistoryBulletScreens(List<LiveHistoryBulletScreen> liveHistoryBulletScreens) {
|
||||
this.liveHistoryBulletScreens = liveHistoryBulletScreens;
|
||||
}
|
||||
|
||||
public List<?> getAdmin() {
|
||||
@ -64,7 +55,7 @@ public class LiveHistoryBulletScreensEntity {
|
||||
this.admin = admin;
|
||||
}
|
||||
|
||||
public static class LiveHistoryBulletScreenEntity {
|
||||
public static class LiveHistoryBulletScreen {
|
||||
/**
|
||||
* text : 这是自动发送的弹幕
|
||||
* uid : 20293030
|
||||
@ -90,7 +81,7 @@ public class LiveHistoryBulletScreensEntity {
|
||||
@SerializedName("nickname")
|
||||
private String nickname;
|
||||
@SerializedName("timeline")
|
||||
private String timeline;
|
||||
private String timeLine;
|
||||
@SerializedName("isadmin")
|
||||
private int isAdmin;
|
||||
@SerializedName("vip")
|
||||
@ -108,7 +99,7 @@ public class LiveHistoryBulletScreensEntity {
|
||||
@SerializedName("guard_level")
|
||||
private int guardLevel;
|
||||
@SerializedName("medal")
|
||||
private List<?> medal;
|
||||
private List<JsonElement> medal;
|
||||
@SerializedName("title")
|
||||
private List<String> title;
|
||||
@SerializedName("user_level")
|
||||
@ -138,12 +129,12 @@ public class LiveHistoryBulletScreensEntity {
|
||||
this.nickname = nickname;
|
||||
}
|
||||
|
||||
public String getTimeline() {
|
||||
return timeline;
|
||||
public String getTimeLine() {
|
||||
return timeLine;
|
||||
}
|
||||
|
||||
public void setTimeline(String timeline) {
|
||||
this.timeline = timeline;
|
||||
public void setTimeLine(String timeLine) {
|
||||
this.timeLine = timeLine;
|
||||
}
|
||||
|
||||
public int getIsAdmin() {
|
||||
@ -210,11 +201,11 @@ public class LiveHistoryBulletScreensEntity {
|
||||
this.guardLevel = guardLevel;
|
||||
}
|
||||
|
||||
public List<?> getMedal() {
|
||||
public List<JsonElement> getMedal() {
|
||||
return medal;
|
||||
}
|
||||
|
||||
public void setMedal(List<?> medal) {
|
||||
public void setMedal(List<JsonElement> medal) {
|
||||
this.medal = medal;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class MobileActivityEntity {
|
||||
public class MobileActivityEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg :
|
||||
@ -12,10 +12,6 @@ public class MobileActivityEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -27,22 +23,6 @@ public class MobileActivityEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class MyMedalListEntity {
|
||||
public class MyMedalListEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,8 +13,6 @@ public class MyMedalListEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<Medal> data;
|
||||
|
||||
@ -26,14 +24,6 @@ public class MyMedalListEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<Medal> getData() {
|
||||
return data;
|
||||
}
|
||||
@ -63,7 +53,7 @@ public class MyMedalListEntity {
|
||||
@SerializedName("level")
|
||||
private int level;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("intimacy")
|
||||
private int intimacy;
|
||||
@SerializedName("next_intimacy")
|
||||
@ -101,12 +91,12 @@ public class MyMedalListEntity {
|
||||
this.level = level;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public int getIntimacy() {
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class MyTitleListEntity {
|
||||
public class MyTitleListEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : 获取成功
|
||||
@ -13,8 +14,6 @@ public class MyTitleListEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -26,14 +25,6 @@ public class MyTitleListEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -82,7 +73,7 @@ public class MyTitleListEntity {
|
||||
@SerializedName("title_pic")
|
||||
private TitlePic titlePic;
|
||||
@SerializedName("level")
|
||||
private List<?> level;
|
||||
private List<JsonElement> level;
|
||||
@SerializedName("category")
|
||||
private List<Category> category;
|
||||
|
||||
@ -142,11 +133,11 @@ public class MyTitleListEntity {
|
||||
this.titlePic = titlePic;
|
||||
}
|
||||
|
||||
public List<?> getLevel() {
|
||||
public List<JsonElement> getLevel() {
|
||||
return level;
|
||||
}
|
||||
|
||||
public void setLevel(List<?> level) {
|
||||
public void setLevel(List<JsonElement> level) {
|
||||
this.level = level;
|
||||
}
|
||||
|
||||
@ -182,13 +173,13 @@ public class MyTitleListEntity {
|
||||
@SerializedName("height")
|
||||
private int height;
|
||||
@SerializedName("is_lihui")
|
||||
private int isLihui;
|
||||
private int isLiHui;
|
||||
@SerializedName("lihui_img")
|
||||
private String lihuiImg;
|
||||
private String liHuiImg;
|
||||
@SerializedName("lihui_width")
|
||||
private int lihuiWidth;
|
||||
private int liHuiWidth;
|
||||
@SerializedName("lihui_height")
|
||||
private int lihuiHeight;
|
||||
private int liHuiHeight;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
@ -230,36 +221,36 @@ public class MyTitleListEntity {
|
||||
this.height = height;
|
||||
}
|
||||
|
||||
public int getIsLihui() {
|
||||
return isLihui;
|
||||
public int getIsLiHui() {
|
||||
return isLiHui;
|
||||
}
|
||||
|
||||
public void setIsLihui(int isLihui) {
|
||||
this.isLihui = isLihui;
|
||||
public void setIsLiHui(int isLiHui) {
|
||||
this.isLiHui = isLiHui;
|
||||
}
|
||||
|
||||
public String getLihuiImg() {
|
||||
return lihuiImg;
|
||||
public String getLiHuiImg() {
|
||||
return liHuiImg;
|
||||
}
|
||||
|
||||
public void setLihuiImg(String lihuiImg) {
|
||||
this.lihuiImg = lihuiImg;
|
||||
public void setLiHuiImg(String liHuiImg) {
|
||||
this.liHuiImg = liHuiImg;
|
||||
}
|
||||
|
||||
public int getLihuiWidth() {
|
||||
return lihuiWidth;
|
||||
public int getLiHuiWidth() {
|
||||
return liHuiWidth;
|
||||
}
|
||||
|
||||
public void setLihuiWidth(int lihuiWidth) {
|
||||
this.lihuiWidth = lihuiWidth;
|
||||
public void setLiHuiWidth(int liHuiWidth) {
|
||||
this.liHuiWidth = liHuiWidth;
|
||||
}
|
||||
|
||||
public int getLihuiHeight() {
|
||||
return lihuiHeight;
|
||||
public int getLiHuiHeight() {
|
||||
return liHuiHeight;
|
||||
}
|
||||
|
||||
public void setLihuiHeight(int lihuiHeight) {
|
||||
this.lihuiHeight = lihuiHeight;
|
||||
public void setLiHuiHeight(int liHuiHeight) {
|
||||
this.liHuiHeight = liHuiHeight;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class OpenCapsuleResponseEntity {
|
||||
public class OpenCapsuleResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,8 +13,6 @@ public class OpenCapsuleResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -26,14 +24,6 @@ public class OpenCapsuleResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ public class PlayUrlEntity {
|
||||
@SerializedName("current_quality")
|
||||
private int currentQuality;
|
||||
@SerializedName("durl")
|
||||
private List<DurlEntity> durl;
|
||||
private List<DUrl> dUrl;
|
||||
@SerializedName("accept_quality")
|
||||
private List<Integer> acceptQuality;
|
||||
|
||||
@ -26,12 +26,12 @@ public class PlayUrlEntity {
|
||||
this.currentQuality = currentQuality;
|
||||
}
|
||||
|
||||
public List<DurlEntity> getDurl() {
|
||||
return durl;
|
||||
public List<DUrl> getdUrl() {
|
||||
return dUrl;
|
||||
}
|
||||
|
||||
public void setDurl(List<DurlEntity> durl) {
|
||||
this.durl = durl;
|
||||
public void setdUrl(List<DUrl> dUrl) {
|
||||
this.dUrl = dUrl;
|
||||
}
|
||||
|
||||
public List<Integer> getAcceptQuality() {
|
||||
@ -42,7 +42,7 @@ public class PlayUrlEntity {
|
||||
this.acceptQuality = acceptQuality;
|
||||
}
|
||||
|
||||
public static class DurlEntity {
|
||||
public static class DUrl {
|
||||
/**
|
||||
* order : 1
|
||||
* length : 0
|
||||
|
||||
@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class PlayerBagEntity {
|
||||
public class PlayerBagEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -14,10 +14,8 @@ public class PlayerBagEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<BagGiftEntity> data;
|
||||
private List<BagGift> data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -27,23 +25,15 @@ public class PlayerBagEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<BagGiftEntity> getData() {
|
||||
public List<BagGift> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<BagGiftEntity> data) {
|
||||
public void setData(List<BagGift> data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class BagGiftEntity {
|
||||
public static class BagGift {
|
||||
/**
|
||||
* id : 49345439
|
||||
* uid : 20293030
|
||||
@ -69,7 +59,7 @@ public class PlayerBagEntity {
|
||||
@SerializedName("gift_num")
|
||||
private long giftNum;
|
||||
@SerializedName("expireat")
|
||||
private long expireat;
|
||||
private long expireAt;
|
||||
@SerializedName("gift_type")
|
||||
private long giftType;
|
||||
@SerializedName("gift_name")
|
||||
@ -81,9 +71,9 @@ public class PlayerBagEntity {
|
||||
@SerializedName("count_set")
|
||||
private String countSet;
|
||||
@SerializedName("combo_num")
|
||||
private long comboNum;
|
||||
private long comboNumber;
|
||||
@SerializedName("super_num")
|
||||
private long superNum;
|
||||
private long superNumber;
|
||||
@SerializedName("count_map")
|
||||
private Map<String, String> countMap;
|
||||
|
||||
@ -119,12 +109,12 @@ public class PlayerBagEntity {
|
||||
this.giftNum = giftNum;
|
||||
}
|
||||
|
||||
public long getExpireat() {
|
||||
return expireat;
|
||||
public long getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireat(long expireat) {
|
||||
this.expireat = expireat;
|
||||
public void setExpireAt(long expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public long getGiftType() {
|
||||
@ -167,20 +157,20 @@ public class PlayerBagEntity {
|
||||
this.countSet = countSet;
|
||||
}
|
||||
|
||||
public long getComboNum() {
|
||||
return comboNum;
|
||||
public long getComboNumber() {
|
||||
return comboNumber;
|
||||
}
|
||||
|
||||
public void setComboNum(long comboNum) {
|
||||
this.comboNum = comboNum;
|
||||
public void setComboNumber(long comboNumber) {
|
||||
this.comboNumber = comboNumber;
|
||||
}
|
||||
|
||||
public long getSuperNum() {
|
||||
return superNum;
|
||||
public long getSuperNumber() {
|
||||
return superNumber;
|
||||
}
|
||||
|
||||
public void setSuperNum(long superNum) {
|
||||
this.superNum = superNum;
|
||||
public void setSuperNumber(long superNumber) {
|
||||
this.superNumber = superNumber;
|
||||
}
|
||||
|
||||
public Map<String, String> getCountMap() {
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ReceiveUserTaskAward {
|
||||
public class ReceiveUserTaskAward extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg :
|
||||
@ -14,12 +15,8 @@ public class ReceiveUserTaskAward {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<?> data;
|
||||
private List<JsonElement> data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -29,27 +26,11 @@ public class ReceiveUserTaskAward {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<?> getData() {
|
||||
public List<JsonElement> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<?> data) {
|
||||
public void setData(List<JsonElement> data) {
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class RecommendRoomRefreshResponseEntity {
|
||||
public class RecommendRoomRefreshResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : ok
|
||||
@ -14,10 +14,6 @@ public class RecommendRoomRefreshResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class RecommendRoomRefreshResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -65,7 +45,7 @@ public class RecommendRoomRefreshResponseEntity {
|
||||
@SerializedName("banner_data")
|
||||
private List<BannerData> bannerData;
|
||||
@SerializedName("lives")
|
||||
private List<Lives> lives;
|
||||
private List<Live> lives;
|
||||
|
||||
public Partition getPartition() {
|
||||
return partition;
|
||||
@ -83,11 +63,11 @@ public class RecommendRoomRefreshResponseEntity {
|
||||
this.bannerData = bannerData;
|
||||
}
|
||||
|
||||
public List<Lives> getLives() {
|
||||
public List<Live> getLives() {
|
||||
return lives;
|
||||
}
|
||||
|
||||
public void setLives(List<Lives> lives) {
|
||||
public void setLives(List<Live> lives) {
|
||||
this.lives = lives;
|
||||
}
|
||||
|
||||
@ -341,7 +321,7 @@ public class RecommendRoomRefreshResponseEntity {
|
||||
}
|
||||
}
|
||||
|
||||
public static class Lives {
|
||||
public static class Live {
|
||||
/**
|
||||
* owner : {"face":"https://i1.hdslb.com/bfs/face/8ed8e486437b5053628248dd3c031b109b4cefcd.jpg","mid":218972880,"name":"萌萌の糖酱"}
|
||||
* cover : {"src":"https://i0.hdslb.com/bfs/live/d5805bf0e4cb51b50ad4cbe209ae328aedaeeeda.jpg","height":180,"width":320}
|
||||
@ -384,7 +364,7 @@ public class RecommendRoomRefreshResponseEntity {
|
||||
@SerializedName("title")
|
||||
private String title;
|
||||
@SerializedName("playurl")
|
||||
private String playurl;
|
||||
private String playUrl;
|
||||
@SerializedName("current_quality")
|
||||
private int currentQuality;
|
||||
@SerializedName("accept_quality")
|
||||
@ -476,12 +456,12 @@ public class RecommendRoomRefreshResponseEntity {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getPlayurl() {
|
||||
return playurl;
|
||||
public String getPlayUrl() {
|
||||
return playUrl;
|
||||
}
|
||||
|
||||
public void setPlayurl(String playurl) {
|
||||
this.playurl = playurl;
|
||||
public void setPlayUrl(String playUrl) {
|
||||
this.playUrl = playUrl;
|
||||
}
|
||||
|
||||
public int getCurrentQuality() {
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public abstract class ResponseEntity {
|
||||
//有一些返回的模型中的 code 是字符串, 所以这个父类不能包含 code
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public ResponseEntity setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public ResponseEntity setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class RoomListEntity {
|
||||
public class RoomListEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -14,10 +14,6 @@ public class RoomListEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<Data> data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class RoomListEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<Data> getData() {
|
||||
return data;
|
||||
}
|
||||
@ -83,13 +63,13 @@ public class RoomListEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("roomid")
|
||||
private int roomid;
|
||||
private int roomId;
|
||||
@SerializedName("uid")
|
||||
private int uid;
|
||||
@SerializedName("title")
|
||||
private String title;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("online")
|
||||
private int online;
|
||||
@SerializedName("user_cover")
|
||||
@ -133,12 +113,12 @@ public class RoomListEntity {
|
||||
@SerializedName("accept_quality_v2")
|
||||
private List<Integer> acceptQualityV2;
|
||||
|
||||
public int getRoomid() {
|
||||
return roomid;
|
||||
public int getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(int roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(int roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public int getUid() {
|
||||
@ -157,12 +137,12 @@ public class RoomListEntity {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public int getOnline() {
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class RoomsEntity {
|
||||
public class RoomsEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -13,8 +13,6 @@ public class RoomsEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<Data> data;
|
||||
|
||||
@ -26,14 +24,6 @@ public class RoomsEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<Data> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SearchResponseEntity {
|
||||
public class SearchResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,8 +13,6 @@ public class SearchResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -26,14 +24,6 @@ public class SearchResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -54,7 +44,7 @@ public class SearchResponseEntity {
|
||||
@SerializedName("page")
|
||||
private long page;
|
||||
@SerializedName("pagesize")
|
||||
private long pagesize;
|
||||
private long pageSize;
|
||||
@SerializedName("type")
|
||||
private String type;
|
||||
@SerializedName("room")
|
||||
@ -70,12 +60,12 @@ public class SearchResponseEntity {
|
||||
this.page = page;
|
||||
}
|
||||
|
||||
public long getPagesize() {
|
||||
return pagesize;
|
||||
public long getPageSize() {
|
||||
return pageSize;
|
||||
}
|
||||
|
||||
public void setPagesize(long pagesize) {
|
||||
this.pagesize = pagesize;
|
||||
public void setPageSize(long pageSize) {
|
||||
this.pageSize = pageSize;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
@ -114,7 +104,7 @@ public class SearchResponseEntity {
|
||||
@SerializedName("total_page")
|
||||
private long totalPage;
|
||||
@SerializedName("list")
|
||||
private List<RoomEntity> list;
|
||||
private List<RoomData> list;
|
||||
|
||||
public long getTotalRoom() {
|
||||
return totalRoom;
|
||||
@ -132,15 +122,15 @@ public class SearchResponseEntity {
|
||||
this.totalPage = totalPage;
|
||||
}
|
||||
|
||||
public List<RoomEntity> getList() {
|
||||
public List<RoomData> getList() {
|
||||
return list;
|
||||
}
|
||||
|
||||
public void setList(List<RoomEntity> list) {
|
||||
public void setList(List<RoomData> list) {
|
||||
this.list = list;
|
||||
}
|
||||
|
||||
public static class RoomEntity {
|
||||
public static class RoomData {
|
||||
/**
|
||||
* roomid : 23058
|
||||
* cover : //i0.hdslb.com/bfs/live/6029764557e3cbe91475faae26e6e244de8c1d3c.jpg
|
||||
@ -151,7 +141,7 @@ public class SearchResponseEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("roomid")
|
||||
private long roomid;
|
||||
private long roomId;
|
||||
@SerializedName("cover")
|
||||
private String cover;
|
||||
@SerializedName("title")
|
||||
@ -163,12 +153,12 @@ public class SearchResponseEntity {
|
||||
@SerializedName("online")
|
||||
private int online;
|
||||
|
||||
public long getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(long roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public String getCover() {
|
||||
@ -225,7 +215,7 @@ public class SearchResponseEntity {
|
||||
@SerializedName("total_page")
|
||||
private long totalPage;
|
||||
@SerializedName("list")
|
||||
private List<UserEntity> list;
|
||||
private List<UserData> list;
|
||||
|
||||
public long getTotalUser() {
|
||||
return totalUser;
|
||||
@ -243,15 +233,15 @@ public class SearchResponseEntity {
|
||||
this.totalPage = totalPage;
|
||||
}
|
||||
|
||||
public List<UserEntity> getList() {
|
||||
public List<UserData> getList() {
|
||||
return list;
|
||||
}
|
||||
|
||||
public void setList(List<UserEntity> list) {
|
||||
public void setList(List<UserData> list) {
|
||||
this.list = list;
|
||||
}
|
||||
|
||||
public static class UserEntity {
|
||||
public static class UserData {
|
||||
/**
|
||||
* face : //i1.hdslb.com/bfs/face/a1b248975dcc42dec34c9b097c5ce3b1b4d6f7bb.jpg
|
||||
* name : 聆听の音乐
|
||||
@ -273,7 +263,7 @@ public class SearchResponseEntity {
|
||||
@SerializedName("fansNum")
|
||||
private long fansNum;
|
||||
@SerializedName("roomid")
|
||||
private long roomid;
|
||||
private long roomId;
|
||||
@SerializedName("roomTags")
|
||||
private List<String> roomTags;
|
||||
|
||||
@ -317,12 +307,12 @@ public class SearchResponseEntity {
|
||||
this.fansNum = fansNum;
|
||||
}
|
||||
|
||||
public long getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(long roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public List<String> getRoomTags() {
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SendBulletScreenResponseEntity {
|
||||
public class SendBulletScreenResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg :
|
||||
@ -13,10 +14,8 @@ public class SendBulletScreenResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("data")
|
||||
private List<?> data;
|
||||
private List<JsonElement> data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,19 +25,11 @@ public class SendBulletScreenResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public List<?> getData() {
|
||||
public List<JsonElement> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<?> data) {
|
||||
public void setData(List<JsonElement> data) {
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class SendDailyResponseEntity {
|
||||
public class SendDailyResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -11,10 +11,8 @@ public class SendDailyResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -24,23 +22,15 @@ public class SendDailyResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* result : 2
|
||||
*/
|
||||
|
||||
@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SendGiftResponseEntity {
|
||||
public class SendGiftResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -16,12 +16,8 @@ public class SendGiftResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntityX data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -31,31 +27,15 @@ public class SendGiftResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntityX getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntityX data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntityX {
|
||||
public static class Data {
|
||||
/**
|
||||
* silver : 2696
|
||||
* gold : 0
|
||||
@ -68,7 +48,7 @@ public class SendGiftResponseEntity {
|
||||
@SerializedName("gold")
|
||||
private String gold;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private DataX dataX;
|
||||
@SerializedName("remain")
|
||||
private int remain;
|
||||
|
||||
@ -88,12 +68,12 @@ public class SendGiftResponseEntity {
|
||||
this.gold = gold;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
return data;
|
||||
public DataX getDataX() {
|
||||
return dataX;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
this.data = data;
|
||||
public void setDataX(DataX dataX) {
|
||||
this.dataX = dataX;
|
||||
}
|
||||
|
||||
public int getRemain() {
|
||||
@ -104,7 +84,7 @@ public class SendGiftResponseEntity {
|
||||
this.remain = remain;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class DataX {
|
||||
/**
|
||||
* giftName : 辣条
|
||||
* num : 1
|
||||
@ -143,7 +123,7 @@ public class SendGiftResponseEntity {
|
||||
@SerializedName("num")
|
||||
private int num;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("rcost")
|
||||
private int rcost;
|
||||
@SerializedName("uid")
|
||||
@ -187,18 +167,18 @@ public class SendGiftResponseEntity {
|
||||
@SerializedName("specialGift")
|
||||
private JsonElement specialGift;
|
||||
@SerializedName("capsule")
|
||||
private CapsuleEntity capsule;
|
||||
private Capsule capsule;
|
||||
@SerializedName("addFollow")
|
||||
private int addFollow;
|
||||
@SerializedName("top_list")
|
||||
private List<TopListEntity> topList;
|
||||
private List<TopListData> topList;
|
||||
/**
|
||||
* medal 可能是空的 JsonArray, 也可能是一个 JsonObject
|
||||
*/
|
||||
@SerializedName("medal")
|
||||
private JsonElement medal;
|
||||
@SerializedName("smalltv_msg")
|
||||
private JsonElement smalltvMsg;
|
||||
private JsonElement smallTvMsg;
|
||||
@SerializedName("notice_msg")
|
||||
private JsonElement noticeMsg;
|
||||
|
||||
@ -218,12 +198,12 @@ public class SendGiftResponseEntity {
|
||||
this.num = num;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public int getRcost() {
|
||||
@ -394,11 +374,11 @@ public class SendGiftResponseEntity {
|
||||
this.specialGift = specialGift;
|
||||
}
|
||||
|
||||
public CapsuleEntity getCapsule() {
|
||||
public Capsule getCapsule() {
|
||||
return capsule;
|
||||
}
|
||||
|
||||
public void setCapsule(CapsuleEntity capsule) {
|
||||
public void setCapsule(Capsule capsule) {
|
||||
this.capsule = capsule;
|
||||
}
|
||||
|
||||
@ -410,11 +390,11 @@ public class SendGiftResponseEntity {
|
||||
this.addFollow = addFollow;
|
||||
}
|
||||
|
||||
public List<TopListEntity> getTopList() {
|
||||
public List<TopListData> getTopList() {
|
||||
return topList;
|
||||
}
|
||||
|
||||
public void setTopList(List<TopListEntity> topList) {
|
||||
public void setTopList(List<TopListData> topList) {
|
||||
this.topList = topList;
|
||||
}
|
||||
|
||||
@ -426,12 +406,12 @@ public class SendGiftResponseEntity {
|
||||
this.medal = medal;
|
||||
}
|
||||
|
||||
public JsonElement getSmalltvMsg() {
|
||||
return smalltvMsg;
|
||||
public JsonElement getSmallTvMsg() {
|
||||
return smallTvMsg;
|
||||
}
|
||||
|
||||
public void setSmalltvMsg(JsonElement smalltvMsg) {
|
||||
this.smalltvMsg = smalltvMsg;
|
||||
public void setSmallTvMsg(JsonElement smallTvMsg) {
|
||||
this.smallTvMsg = smallTvMsg;
|
||||
}
|
||||
|
||||
public JsonElement getNoticeMsg() {
|
||||
@ -442,34 +422,34 @@ public class SendGiftResponseEntity {
|
||||
this.noticeMsg = noticeMsg;
|
||||
}
|
||||
|
||||
public static class CapsuleEntity {
|
||||
public static class Capsule {
|
||||
/**
|
||||
* normal : {"coin":10,"change":0,"progress":{"now":2900,"max":10000}}
|
||||
* colorful : {"coin":0,"change":0,"progress":{"now":0,"max":5000}}
|
||||
*/
|
||||
|
||||
@SerializedName("normal")
|
||||
private NormalEntity normal;
|
||||
private Normal normal;
|
||||
@SerializedName("colorful")
|
||||
private ColorfulEntity colorful;
|
||||
private Colorful colorful;
|
||||
|
||||
public NormalEntity getNormal() {
|
||||
public Normal getNormal() {
|
||||
return normal;
|
||||
}
|
||||
|
||||
public void setNormal(NormalEntity normal) {
|
||||
public void setNormal(Normal normal) {
|
||||
this.normal = normal;
|
||||
}
|
||||
|
||||
public ColorfulEntity getColorful() {
|
||||
public Colorful getColorful() {
|
||||
return colorful;
|
||||
}
|
||||
|
||||
public void setColorful(ColorfulEntity colorful) {
|
||||
public void setColorful(Colorful colorful) {
|
||||
this.colorful = colorful;
|
||||
}
|
||||
|
||||
public static class NormalEntity {
|
||||
public static class Normal {
|
||||
/**
|
||||
* coin : 10
|
||||
* change : 0
|
||||
@ -536,7 +516,7 @@ public class SendGiftResponseEntity {
|
||||
}
|
||||
}
|
||||
|
||||
public static class ColorfulEntity {
|
||||
public static class Colorful {
|
||||
/**
|
||||
* coin : 0
|
||||
* change : 0
|
||||
@ -548,7 +528,7 @@ public class SendGiftResponseEntity {
|
||||
@SerializedName("change")
|
||||
private int change;
|
||||
@SerializedName("progress")
|
||||
private ProgressEntityX progress;
|
||||
private ProgressX progress;
|
||||
|
||||
public int getCoin() {
|
||||
return coin;
|
||||
@ -566,15 +546,15 @@ public class SendGiftResponseEntity {
|
||||
this.change = change;
|
||||
}
|
||||
|
||||
public ProgressEntityX getProgress() {
|
||||
public ProgressX getProgress() {
|
||||
return progress;
|
||||
}
|
||||
|
||||
public void setProgress(ProgressEntityX progress) {
|
||||
public void setProgress(ProgressX progress) {
|
||||
this.progress = progress;
|
||||
}
|
||||
|
||||
public static class ProgressEntityX {
|
||||
public static class ProgressX {
|
||||
/**
|
||||
* now : 0
|
||||
* max : 5000
|
||||
@ -604,7 +584,7 @@ public class SendGiftResponseEntity {
|
||||
}
|
||||
}
|
||||
|
||||
public static class TopListEntity {
|
||||
public static class TopListData {
|
||||
/**
|
||||
* uid : 20293030
|
||||
* uname : czp3009
|
||||
@ -618,7 +598,7 @@ public class SendGiftResponseEntity {
|
||||
@SerializedName("uid")
|
||||
private int uid;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("coin")
|
||||
private int coin;
|
||||
@SerializedName("face")
|
||||
@ -638,12 +618,12 @@ public class SendGiftResponseEntity {
|
||||
this.uid = uid;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public int getCoin() {
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SendOnlineHeartResponseEntity {
|
||||
public class SendOnlineHeartResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -13,10 +14,8 @@ public class SendOnlineHeartResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,32 +25,24 @@ public class SendOnlineHeartResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
@SerializedName("giftlist")
|
||||
private List<?> giftlist;
|
||||
private List<JsonElement> giftList;
|
||||
|
||||
public List<?> getGiftlist() {
|
||||
return giftlist;
|
||||
public List<JsonElement> getGiftList() {
|
||||
return giftList;
|
||||
}
|
||||
|
||||
public void setGiftlist(List<?> giftlist) {
|
||||
this.giftlist = giftlist;
|
||||
public void setGiftList(List<JsonElement> giftList) {
|
||||
this.giftList = giftList;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SignInfoEntity {
|
||||
public class SignInfoEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,10 +13,8 @@ public class SignInfoEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,23 +24,15 @@ public class SignInfoEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* sign_msg : 今天签到已获得<br /> 辣条<font color='#fea024'>2个</font> 经验<font color='#fea024'>3000</font>
|
||||
* maxday_num : 30
|
||||
@ -53,11 +43,11 @@ public class SignInfoEntity {
|
||||
@SerializedName("sign_msg")
|
||||
private String signMsg;
|
||||
@SerializedName("maxday_num")
|
||||
private int maxdayNum;
|
||||
private int maxDayNumber;
|
||||
@SerializedName("sign_day")
|
||||
private int signDay;
|
||||
@SerializedName("days_award")
|
||||
private List<DaysAwardEntity> daysAward;
|
||||
private List<DaysAward> daysAwards;
|
||||
|
||||
public String getSignMsg() {
|
||||
return signMsg;
|
||||
@ -67,12 +57,12 @@ public class SignInfoEntity {
|
||||
this.signMsg = signMsg;
|
||||
}
|
||||
|
||||
public int getMaxdayNum() {
|
||||
return maxdayNum;
|
||||
public int getMaxDayNumber() {
|
||||
return maxDayNumber;
|
||||
}
|
||||
|
||||
public void setMaxdayNum(int maxdayNum) {
|
||||
this.maxdayNum = maxdayNum;
|
||||
public void setMaxDayNumber(int maxDayNumber) {
|
||||
this.maxDayNumber = maxDayNumber;
|
||||
}
|
||||
|
||||
public int getSignDay() {
|
||||
@ -83,15 +73,15 @@ public class SignInfoEntity {
|
||||
this.signDay = signDay;
|
||||
}
|
||||
|
||||
public List<DaysAwardEntity> getDaysAward() {
|
||||
return daysAward;
|
||||
public List<DaysAward> getDaysAwards() {
|
||||
return daysAwards;
|
||||
}
|
||||
|
||||
public void setDaysAward(List<DaysAwardEntity> daysAward) {
|
||||
this.daysAward = daysAward;
|
||||
public void setDaysAwards(List<DaysAward> daysAwards) {
|
||||
this.daysAwards = daysAwards;
|
||||
}
|
||||
|
||||
public static class DaysAwardEntity {
|
||||
public static class DaysAward {
|
||||
/**
|
||||
* id : 1
|
||||
* award : silver
|
||||
@ -112,7 +102,7 @@ public class SignInfoEntity {
|
||||
@SerializedName("day")
|
||||
private int day;
|
||||
@SerializedName("img")
|
||||
private ImgEntity img;
|
||||
private Img img;
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
@ -154,15 +144,15 @@ public class SignInfoEntity {
|
||||
this.day = day;
|
||||
}
|
||||
|
||||
public ImgEntity getImg() {
|
||||
public Img getImg() {
|
||||
return img;
|
||||
}
|
||||
|
||||
public void setImg(ImgEntity img) {
|
||||
public void setImg(Img img) {
|
||||
this.img = img;
|
||||
}
|
||||
|
||||
public static class ImgEntity {
|
||||
public static class Img {
|
||||
/**
|
||||
* src : http://static.hdslb.com/live-static/live-app/dayaward/1/5_1.png?20171102172700
|
||||
* width : 56
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class Silver2CoinResponseEntity {
|
||||
public class Silver2CoinResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : 兑换成功
|
||||
@ -12,10 +12,6 @@ public class Silver2CoinResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -27,22 +23,6 @@ public class Silver2CoinResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class SpecialGiftEntity {
|
||||
public class SpecialGiftEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -14,12 +14,8 @@ public class SpecialGiftEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -29,31 +25,15 @@ public class SpecialGiftEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* gift39 : null
|
||||
*/
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TitlesEntity {
|
||||
public class TitlesEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : ok
|
||||
@ -13,10 +13,8 @@ public class TitlesEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<DataEntity> data;
|
||||
private List<Title> titles;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,23 +24,15 @@ public class TitlesEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
public List<Title> getTitles() {
|
||||
return titles;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
public void setTitles(List<Title> titles) {
|
||||
this.titles = titles;
|
||||
}
|
||||
|
||||
public List<DataEntity> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<DataEntity> data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Title {
|
||||
/**
|
||||
* id : task-color
|
||||
* title : 姹紫嫣红成就
|
||||
@ -66,13 +56,13 @@ public class TitlesEntity {
|
||||
@SerializedName("height")
|
||||
private int height;
|
||||
@SerializedName("is_lihui")
|
||||
private int isLihui;
|
||||
private int isLiHui;
|
||||
@SerializedName("lihui_img")
|
||||
private String lihuiImg;
|
||||
private String liHuiImg;
|
||||
@SerializedName("lihui_width")
|
||||
private int lihuiWidth;
|
||||
private int liHuiWidth;
|
||||
@SerializedName("lihui_height")
|
||||
private int lihuiHeight;
|
||||
private int liHuiHeight;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
@ -114,36 +104,36 @@ public class TitlesEntity {
|
||||
this.height = height;
|
||||
}
|
||||
|
||||
public int getIsLihui() {
|
||||
return isLihui;
|
||||
public int getIsLiHui() {
|
||||
return isLiHui;
|
||||
}
|
||||
|
||||
public void setIsLihui(int isLihui) {
|
||||
this.isLihui = isLihui;
|
||||
public void setIsLiHui(int isLiHui) {
|
||||
this.isLiHui = isLiHui;
|
||||
}
|
||||
|
||||
public String getLihuiImg() {
|
||||
return lihuiImg;
|
||||
public String getLiHuiImg() {
|
||||
return liHuiImg;
|
||||
}
|
||||
|
||||
public void setLihuiImg(String lihuiImg) {
|
||||
this.lihuiImg = lihuiImg;
|
||||
public void setLiHuiImg(String liHuiImg) {
|
||||
this.liHuiImg = liHuiImg;
|
||||
}
|
||||
|
||||
public int getLihuiWidth() {
|
||||
return lihuiWidth;
|
||||
public int getLiHuiWidth() {
|
||||
return liHuiWidth;
|
||||
}
|
||||
|
||||
public void setLihuiWidth(int lihuiWidth) {
|
||||
this.lihuiWidth = lihuiWidth;
|
||||
public void setLiHuiWidth(int liHuiWidth) {
|
||||
this.liHuiWidth = liHuiWidth;
|
||||
}
|
||||
|
||||
public int getLihuiHeight() {
|
||||
return lihuiHeight;
|
||||
public int getLiHuiHeight() {
|
||||
return liHuiHeight;
|
||||
}
|
||||
|
||||
public void setLihuiHeight(int lihuiHeight) {
|
||||
this.lihuiHeight = lihuiHeight;
|
||||
public void setLiHuiHeight(int liHuiHeight) {
|
||||
this.liHuiHeight = liHuiHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class UserInfoEntity {
|
||||
public class UserInfoEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : OK
|
||||
@ -12,10 +12,6 @@ public class UserInfoEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -27,22 +23,6 @@ public class UserInfoEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class UserTasksEntity {
|
||||
public class UserTasksEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -14,10 +14,6 @@ public class UserTasksEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class UserTasksEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -109,7 +89,7 @@ public class UserTasksEntity {
|
||||
@SerializedName("status")
|
||||
private int status;
|
||||
@SerializedName("awards")
|
||||
private List<Awards> awards;
|
||||
private List<Award> awards;
|
||||
|
||||
public String getTaskId() {
|
||||
return taskId;
|
||||
@ -143,11 +123,11 @@ public class UserTasksEntity {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public List<Awards> getAwards() {
|
||||
public List<Award> getAwards() {
|
||||
return awards;
|
||||
}
|
||||
|
||||
public void setAwards(List<Awards> awards) {
|
||||
public void setAwards(List<Award> awards) {
|
||||
this.awards = awards;
|
||||
}
|
||||
|
||||
@ -179,7 +159,7 @@ public class UserTasksEntity {
|
||||
}
|
||||
}
|
||||
|
||||
public static class Awards {
|
||||
public static class Award {
|
||||
/**
|
||||
* name : 扭蛋币
|
||||
* type : toycoin
|
||||
@ -234,7 +214,7 @@ public class UserTasksEntity {
|
||||
@SerializedName("progress")
|
||||
private ProgressX progress;
|
||||
@SerializedName("awards")
|
||||
private List<AwardsX> awards;
|
||||
private List<AwardX> awards;
|
||||
|
||||
public String getTaskId() {
|
||||
return taskId;
|
||||
@ -260,11 +240,11 @@ public class UserTasksEntity {
|
||||
this.progress = progress;
|
||||
}
|
||||
|
||||
public List<AwardsX> getAwards() {
|
||||
public List<AwardX> getAwards() {
|
||||
return awards;
|
||||
}
|
||||
|
||||
public void setAwards(List<AwardsX> awards) {
|
||||
public void setAwards(List<AwardX> awards) {
|
||||
this.awards = awards;
|
||||
}
|
||||
|
||||
@ -296,7 +276,7 @@ public class UserTasksEntity {
|
||||
}
|
||||
}
|
||||
|
||||
public static class AwardsX {
|
||||
public static class AwardX {
|
||||
/**
|
||||
* name : 银瓜子
|
||||
* type : silver
|
||||
@ -357,7 +337,7 @@ public class UserTasksEntity {
|
||||
@SerializedName("progress")
|
||||
private ProgressXX progress;
|
||||
@SerializedName("awards")
|
||||
private List<AwardsXX> awards;
|
||||
private List<AwardXX> awards;
|
||||
|
||||
public String getTaskId() {
|
||||
return taskId;
|
||||
@ -399,11 +379,11 @@ public class UserTasksEntity {
|
||||
this.progress = progress;
|
||||
}
|
||||
|
||||
public List<AwardsXX> getAwards() {
|
||||
public List<AwardXX> getAwards() {
|
||||
return awards;
|
||||
}
|
||||
|
||||
public void setAwards(List<AwardsXX> awards) {
|
||||
public void setAwards(List<AwardXX> awards) {
|
||||
this.awards = awards;
|
||||
}
|
||||
|
||||
@ -435,7 +415,7 @@ public class UserTasksEntity {
|
||||
}
|
||||
}
|
||||
|
||||
public static class AwardsXX {
|
||||
public static class AwardXX {
|
||||
/**
|
||||
* name : 银瓜子
|
||||
* type : silver
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class WearMedalResponseEntity {
|
||||
public class WearMedalResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* message : OK
|
||||
@ -13,10 +14,8 @@ public class WearMedalResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<?> data;
|
||||
private List<JsonElement> data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -26,19 +25,11 @@ public class WearMedalResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<?> getData() {
|
||||
public List<JsonElement> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<?> data) {
|
||||
public void setData(List<JsonElement> data) {
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class WearTitleEntity {
|
||||
public class WearTitleEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -14,10 +14,6 @@ public class WearTitleEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -29,22 +25,6 @@ public class WearTitleEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -236,13 +216,13 @@ public class WearTitleEntity {
|
||||
@SerializedName("height")
|
||||
private int height;
|
||||
@SerializedName("is_lihui")
|
||||
private int isLihui;
|
||||
private int isLiHui;
|
||||
@SerializedName("lihui_img")
|
||||
private String lihuiImg;
|
||||
private String liHuiImg;
|
||||
@SerializedName("lihui_width")
|
||||
private int lihuiWidth;
|
||||
private int liHuiWidth;
|
||||
@SerializedName("lihui_height")
|
||||
private int lihuiHeight;
|
||||
private int liHuiHeight;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
@ -284,36 +264,36 @@ public class WearTitleEntity {
|
||||
this.height = height;
|
||||
}
|
||||
|
||||
public int getIsLihui() {
|
||||
return isLihui;
|
||||
public int getIsLiHui() {
|
||||
return isLiHui;
|
||||
}
|
||||
|
||||
public void setIsLihui(int isLihui) {
|
||||
this.isLihui = isLihui;
|
||||
public void setIsLiHui(int isLiHui) {
|
||||
this.isLiHui = isLiHui;
|
||||
}
|
||||
|
||||
public String getLihuiImg() {
|
||||
return lihuiImg;
|
||||
public String getLiHuiImg() {
|
||||
return liHuiImg;
|
||||
}
|
||||
|
||||
public void setLihuiImg(String lihuiImg) {
|
||||
this.lihuiImg = lihuiImg;
|
||||
public void setLiHuiImg(String liHuiImg) {
|
||||
this.liHuiImg = liHuiImg;
|
||||
}
|
||||
|
||||
public int getLihuiWidth() {
|
||||
return lihuiWidth;
|
||||
public int getLiHuiWidth() {
|
||||
return liHuiWidth;
|
||||
}
|
||||
|
||||
public void setLihuiWidth(int lihuiWidth) {
|
||||
this.lihuiWidth = lihuiWidth;
|
||||
public void setLiHuiWidth(int liHuiWidth) {
|
||||
this.liHuiWidth = liHuiWidth;
|
||||
}
|
||||
|
||||
public int getLihuiHeight() {
|
||||
return lihuiHeight;
|
||||
public int getLiHuiHeight() {
|
||||
return liHuiHeight;
|
||||
}
|
||||
|
||||
public void setLihuiHeight(int lihuiHeight) {
|
||||
this.lihuiHeight = lihuiHeight;
|
||||
public void setLiHuiHeight(int liHuiHeight) {
|
||||
this.liHuiHeight = liHuiHeight;
|
||||
}
|
||||
}
|
||||
|
||||
@ -369,13 +349,13 @@ public class WearTitleEntity {
|
||||
@SerializedName("height")
|
||||
private int height;
|
||||
@SerializedName("is_lihui")
|
||||
private int isLihui;
|
||||
private int isLiHui;
|
||||
@SerializedName("lihui_img")
|
||||
private String lihuiImg;
|
||||
private String liHuiImg;
|
||||
@SerializedName("lihui_width")
|
||||
private int lihuiWidth;
|
||||
private int liHuiWidth;
|
||||
@SerializedName("lihui_height")
|
||||
private int lihuiHeight;
|
||||
private int liHuiHeight;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
@ -417,36 +397,36 @@ public class WearTitleEntity {
|
||||
this.height = height;
|
||||
}
|
||||
|
||||
public int getIsLihui() {
|
||||
return isLihui;
|
||||
public int getIsLiHui() {
|
||||
return isLiHui;
|
||||
}
|
||||
|
||||
public void setIsLihui(int isLihui) {
|
||||
this.isLihui = isLihui;
|
||||
public void setIsLiHui(int isLiHui) {
|
||||
this.isLiHui = isLiHui;
|
||||
}
|
||||
|
||||
public String getLihuiImg() {
|
||||
return lihuiImg;
|
||||
public String getLiHuiImg() {
|
||||
return liHuiImg;
|
||||
}
|
||||
|
||||
public void setLihuiImg(String lihuiImg) {
|
||||
this.lihuiImg = lihuiImg;
|
||||
public void setLiHuiImg(String liHuiImg) {
|
||||
this.liHuiImg = liHuiImg;
|
||||
}
|
||||
|
||||
public int getLihuiWidth() {
|
||||
return lihuiWidth;
|
||||
public int getLiHuiWidth() {
|
||||
return liHuiWidth;
|
||||
}
|
||||
|
||||
public void setLihuiWidth(int lihuiWidth) {
|
||||
this.lihuiWidth = lihuiWidth;
|
||||
public void setLiHuiWidth(int liHuiWidth) {
|
||||
this.liHuiWidth = liHuiWidth;
|
||||
}
|
||||
|
||||
public int getLihuiHeight() {
|
||||
return lihuiHeight;
|
||||
public int getLiHuiHeight() {
|
||||
return liHuiHeight;
|
||||
}
|
||||
|
||||
public void setLihuiHeight(int lihuiHeight) {
|
||||
this.lihuiHeight = lihuiHeight;
|
||||
public void setLiHuiHeight(int liHuiHeight) {
|
||||
this.liHuiHeight = liHuiHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package com.hiczp.bilibili.api.live.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class WearTitleResponseEntity {
|
||||
public class WearTitleResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -14,12 +15,8 @@ public class WearTitleResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private List<?> data;
|
||||
private List<JsonElement> data;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -29,27 +26,11 @@ public class WearTitleResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public List<?> getData() {
|
||||
public List<JsonElement> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<?> data) {
|
||||
public void setData(List<JsonElement> data) {
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ public class LiveClient {
|
||||
private final long userId;
|
||||
private final EventBus eventBus = new EventBus("BilibiliLiveClientEventBus");
|
||||
|
||||
private LiveRoomInfoEntity.LiveRoomEntity liveRoomEntity;
|
||||
private LiveRoomInfoEntity.LiveRoom liveRoom;
|
||||
|
||||
private Channel channel;
|
||||
|
||||
@ -55,14 +55,14 @@ public class LiveClient {
|
||||
.getRoomInfo(showRoomId);
|
||||
}
|
||||
|
||||
public LiveRoomInfoEntity.LiveRoomEntity fetchRoomInfo() throws IOException {
|
||||
LiveRoomInfoEntity.LiveRoomEntity liveRoomEntity =
|
||||
public LiveRoomInfoEntity.LiveRoom fetchRoomInfo() throws IOException {
|
||||
LiveRoomInfoEntity.LiveRoom liveRoom =
|
||||
fetchRoomInfoAsync()
|
||||
.execute()
|
||||
.body()
|
||||
.getData();
|
||||
if (liveRoomEntity != null) {
|
||||
return liveRoomEntity;
|
||||
if (liveRoom != null) {
|
||||
return liveRoom;
|
||||
} else {
|
||||
throw new IllegalArgumentException("Target room " + showRoomId + " not exists");
|
||||
}
|
||||
@ -75,8 +75,8 @@ public class LiveClient {
|
||||
}
|
||||
|
||||
LOGGER.info("Fetching info of live room {}", showRoomId);
|
||||
liveRoomEntity = fetchRoomInfo();
|
||||
long roomId = liveRoomEntity.getRoomId();
|
||||
liveRoom = fetchRoomInfo();
|
||||
long roomId = liveRoom.getRoomId();
|
||||
LOGGER.info("Get actual room id {}", roomId);
|
||||
|
||||
LOGGER.debug("Init SocketChannel Bootstrap");
|
||||
@ -101,8 +101,8 @@ public class LiveClient {
|
||||
}
|
||||
});
|
||||
|
||||
String address = liveRoomEntity.getCmt();
|
||||
int port = liveRoomEntity.getCmtPortGoim();
|
||||
String address = liveRoom.getCmt();
|
||||
int port = liveRoom.getCmtPortGoim();
|
||||
LOGGER.info("Connecting to Bullet Screen server {}:{}", address, port);
|
||||
try {
|
||||
channel = bootstrap.connect(address, port)
|
||||
@ -182,23 +182,23 @@ public class LiveClient {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public Optional<LiveRoomInfoEntity.LiveRoomEntity> getRoomInfo() {
|
||||
if (liveRoomEntity == null) {
|
||||
public Optional<LiveRoomInfoEntity.LiveRoom> getRoomInfo() {
|
||||
if (liveRoom == null) {
|
||||
try {
|
||||
liveRoomEntity = fetchRoomInfo();
|
||||
liveRoom = fetchRoomInfo();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return Optional.of(liveRoomEntity);
|
||||
return Optional.of(liveRoom);
|
||||
}
|
||||
|
||||
public long getRoomIdOrShowRoomId() {
|
||||
return getRoomInfo().map(LiveRoomInfoEntity.LiveRoomEntity::getRoomId).orElse(showRoomId);
|
||||
return getRoomInfo().map(LiveRoomInfoEntity.LiveRoom::getRoomId).orElse(showRoomId);
|
||||
}
|
||||
|
||||
public int getBulletScreenLengthLimitOrDefaultLengthLimit() {
|
||||
return getRoomInfo().map(LiveRoomInfoEntity.LiveRoomEntity::getMsgLength).orElse(BulletScreenConstDefinition.DEFAULT_MESSAGE_LENGTH_LIMIT);
|
||||
return getRoomInfo().map(LiveRoomInfoEntity.LiveRoom::getMsgLength).orElse(BulletScreenConstDefinition.DEFAULT_MESSAGE_LENGTH_LIMIT);
|
||||
}
|
||||
|
||||
public Channel getChannel() {
|
||||
|
||||
@ -14,7 +14,7 @@ public class CutOffEntity implements DataEntity {
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("roomid")
|
||||
private int roomid;
|
||||
private int roomId;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -33,11 +33,11 @@ public class CutOffEntity implements DataEntity {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public int getRoomid() {
|
||||
return roomid;
|
||||
public int getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(int roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(int roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,18 +10,18 @@ public class EventCmdEntity implements DataEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("roomid")
|
||||
private long roomid;
|
||||
private long roomId;
|
||||
@SerializedName("cmd")
|
||||
private String cmd;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
public long getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(long roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -14,7 +14,7 @@ public class GuardBuyEntity implements DataEntity {
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
@SerializedName("roomid")
|
||||
private String roomid;
|
||||
private String roomId;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -33,12 +33,12 @@ public class GuardBuyEntity implements DataEntity {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public String getRoomid() {
|
||||
return roomid;
|
||||
public String getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(String roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(String roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public static class Data {
|
||||
|
||||
@ -12,7 +12,7 @@ public class RaffleEndEntity implements DataEntity {
|
||||
@SerializedName("cmd")
|
||||
private String cmd;
|
||||
@SerializedName("roomid")
|
||||
private long roomid;
|
||||
private long roomId;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -25,12 +25,12 @@ public class RaffleEndEntity implements DataEntity {
|
||||
this.cmd = cmd;
|
||||
}
|
||||
|
||||
public long getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(long roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
@ -111,7 +111,7 @@ public class RaffleEndEntity implements DataEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("face")
|
||||
private String face;
|
||||
@SerializedName("giftId")
|
||||
@ -121,12 +121,12 @@ public class RaffleEndEntity implements DataEntity {
|
||||
@SerializedName("giftNum")
|
||||
private int giftNum;
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getFace() {
|
||||
|
||||
@ -12,7 +12,7 @@ public class RaffleStartEntity implements DataEntity {
|
||||
@SerializedName("cmd")
|
||||
private String cmd;
|
||||
@SerializedName("roomid")
|
||||
private int roomid;
|
||||
private long roomId;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -25,12 +25,12 @@ public class RaffleStartEntity implements DataEntity {
|
||||
this.cmd = cmd;
|
||||
}
|
||||
|
||||
public int getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(int roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
|
||||
@ -16,7 +16,7 @@ public class RoomAdminsEntity implements DataEntity {
|
||||
@SerializedName("roomid")
|
||||
private long roomId;
|
||||
@SerializedName("uids")
|
||||
private List<Long> uids;
|
||||
private List<Long> userIds;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -35,11 +35,11 @@ public class RoomAdminsEntity implements DataEntity {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public List<Long> getUids() {
|
||||
return uids;
|
||||
public List<Long> getUserIds() {
|
||||
return userIds;
|
||||
}
|
||||
|
||||
public void setUids(List<Long> uids) {
|
||||
this.uids = uids;
|
||||
public void setUserIds(List<Long> userIds) {
|
||||
this.userIds = userIds;
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,9 +15,9 @@ public class RoomBlockMsgEntity implements DataEntity {
|
||||
@SerializedName("uid")
|
||||
private String uid;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("roomid")
|
||||
private long roomid;
|
||||
private long roomId;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -36,19 +36,19 @@ public class RoomBlockMsgEntity implements DataEntity {
|
||||
this.uid = uid;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public long getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(long roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ public class RoomLockEntity implements DataEntity {
|
||||
@SerializedName("expire")
|
||||
private String expire;
|
||||
@SerializedName("roomid")
|
||||
private int roomid;
|
||||
private long roomId;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -33,11 +33,11 @@ public class RoomLockEntity implements DataEntity {
|
||||
this.expire = expire;
|
||||
}
|
||||
|
||||
public int getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(int roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ public class RoomShieldEntity implements DataEntity {
|
||||
@SerializedName("type")
|
||||
private int type;
|
||||
@SerializedName("roomid")
|
||||
private long roomid;
|
||||
private long roomId;
|
||||
@SerializedName("user")
|
||||
private List<String> user;
|
||||
@SerializedName("keyword")
|
||||
@ -41,12 +41,12 @@ public class RoomShieldEntity implements DataEntity {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public long getRoomid() {
|
||||
return roomid;
|
||||
public long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(long roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public List<String> getUser() {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.hiczp.bilibili.api.live.socket.entity;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
@ -14,9 +15,9 @@ public class RoomSilentOffEntity implements DataEntity {
|
||||
@SerializedName("cmd")
|
||||
private String cmd;
|
||||
@SerializedName("roomid")
|
||||
private String roomid;
|
||||
private String roomId;
|
||||
@SerializedName("data")
|
||||
private List<?> data;
|
||||
private List<JsonElement> data;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -27,19 +28,19 @@ public class RoomSilentOffEntity implements DataEntity {
|
||||
this.cmd = cmd;
|
||||
}
|
||||
|
||||
public String getRoomid() {
|
||||
return roomid;
|
||||
public String getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(String roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(String roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public List<?> getData() {
|
||||
public List<JsonElement> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<?> data) {
|
||||
public void setData(List<JsonElement> data) {
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ public class SendGiftEntity implements DataEntity {
|
||||
@SerializedName("cmd")
|
||||
private String cmd;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public String getCmd() {
|
||||
return cmd;
|
||||
@ -24,15 +24,15 @@ public class SendGiftEntity implements DataEntity {
|
||||
this.cmd = cmd;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* giftName : 节奏风暴
|
||||
* num : 1
|
||||
@ -141,7 +141,7 @@ public class SendGiftEntity implements DataEntity {
|
||||
@SerializedName("top_list")
|
||||
private List<TopList> topList;
|
||||
@SerializedName("smalltv_msg")
|
||||
private JsonElement smalltvMsg;
|
||||
private JsonElement smallTvMsg;
|
||||
@SerializedName("notice_msg")
|
||||
private JsonElement noticeMsg;
|
||||
|
||||
@ -393,12 +393,12 @@ public class SendGiftEntity implements DataEntity {
|
||||
this.topList = topList;
|
||||
}
|
||||
|
||||
public JsonElement getSmalltvMsg() {
|
||||
return smalltvMsg;
|
||||
public JsonElement getSmallTvMsg() {
|
||||
return smallTvMsg;
|
||||
}
|
||||
|
||||
public void setSmalltvMsg(JsonElement smalltvMsg) {
|
||||
this.smalltvMsg = smalltvMsg;
|
||||
public void setSmallTvMsg(JsonElement smallTvMsg) {
|
||||
this.smallTvMsg = smallTvMsg;
|
||||
}
|
||||
|
||||
public JsonElement getNoticeMsg() {
|
||||
@ -707,7 +707,7 @@ public class SendGiftEntity implements DataEntity {
|
||||
@SerializedName("uid")
|
||||
private int uid;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("face")
|
||||
private String face;
|
||||
@SerializedName("rank")
|
||||
@ -727,12 +727,12 @@ public class SendGiftEntity implements DataEntity {
|
||||
this.uid = uid;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getFace() {
|
||||
|
||||
@ -60,11 +60,11 @@ public class SpecialGiftEntity implements DataEntity {
|
||||
@SerializedName("id")
|
||||
private long id;
|
||||
@SerializedName("time")
|
||||
private int time;
|
||||
private Integer time;
|
||||
@SerializedName("hadJoin")
|
||||
private int hadJoin;
|
||||
private Integer hadJoin;
|
||||
@SerializedName("num")
|
||||
private int num;
|
||||
private Integer num;
|
||||
@SerializedName("content")
|
||||
private String content;
|
||||
@SerializedName("action")
|
||||
@ -80,27 +80,27 @@ public class SpecialGiftEntity implements DataEntity {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public int getTime() {
|
||||
public Integer getTime() {
|
||||
return time;
|
||||
}
|
||||
|
||||
public void setTime(int time) {
|
||||
public void setTime(Integer time) {
|
||||
this.time = time;
|
||||
}
|
||||
|
||||
public int getHadJoin() {
|
||||
public Integer getHadJoin() {
|
||||
return hadJoin;
|
||||
}
|
||||
|
||||
public void setHadJoin(int hadJoin) {
|
||||
public void setHadJoin(Integer hadJoin) {
|
||||
this.hadJoin = hadJoin;
|
||||
}
|
||||
|
||||
public int getNum() {
|
||||
public Integer getNum() {
|
||||
return num;
|
||||
}
|
||||
|
||||
public void setNum(int num) {
|
||||
public void setNum(Integer num) {
|
||||
this.num = num;
|
||||
}
|
||||
|
||||
|
||||
@ -26,13 +26,13 @@ public class SysGiftEntity implements DataEntity {
|
||||
@SerializedName("url")
|
||||
private String url;
|
||||
@SerializedName("roomid")
|
||||
private long roomId;
|
||||
private Long roomId;
|
||||
@SerializedName("real_roomid")
|
||||
private long realRoomId;
|
||||
private Long realRoomId;
|
||||
@SerializedName("giftId")
|
||||
private int giftId;
|
||||
private Long giftId;
|
||||
@SerializedName("msgTips")
|
||||
private int msgTips;
|
||||
private Integer msgTips;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -75,35 +75,35 @@ public class SysGiftEntity implements DataEntity {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public long getRoomId() {
|
||||
public Long getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomId(long roomId) {
|
||||
public void setRoomId(Long roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public long getRealRoomId() {
|
||||
public Long getRealRoomId() {
|
||||
return realRoomId;
|
||||
}
|
||||
|
||||
public void setRealRoomId(long realRoomId) {
|
||||
public void setRealRoomId(Long realRoomId) {
|
||||
this.realRoomId = realRoomId;
|
||||
}
|
||||
|
||||
public int getGiftId() {
|
||||
public Long getGiftId() {
|
||||
return giftId;
|
||||
}
|
||||
|
||||
public void setGiftId(int giftId) {
|
||||
public void setGiftId(Long giftId) {
|
||||
this.giftId = giftId;
|
||||
}
|
||||
|
||||
public int getMsgTips() {
|
||||
public Integer getMsgTips() {
|
||||
return msgTips;
|
||||
}
|
||||
|
||||
public void setMsgTips(int msgTips) {
|
||||
public void setMsgTips(Integer msgTips) {
|
||||
this.msgTips = msgTips;
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ public class TVEndEntity implements DataEntity {
|
||||
@SerializedName("id")
|
||||
private String id;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("sname")
|
||||
private String sname;
|
||||
@SerializedName("giftName")
|
||||
@ -73,12 +73,12 @@ public class TVEndEntity implements DataEntity {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getSname() {
|
||||
@ -155,7 +155,7 @@ public class TVEndEntity implements DataEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("face")
|
||||
private String face;
|
||||
@SerializedName("giftName")
|
||||
@ -165,12 +165,12 @@ public class TVEndEntity implements DataEntity {
|
||||
@SerializedName("giftNum")
|
||||
private int giftNum;
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getFace() {
|
||||
|
||||
@ -139,9 +139,9 @@ public class TVStartEntity implements DataEntity {
|
||||
@SerializedName("url")
|
||||
private String url;
|
||||
@SerializedName("roomid")
|
||||
private int roomid;
|
||||
private int roomId;
|
||||
@SerializedName("real_roomid")
|
||||
private int realRoomid;
|
||||
private int realRoomId;
|
||||
@SerializedName("rnd")
|
||||
private int rnd;
|
||||
@SerializedName("tv_id")
|
||||
@ -195,20 +195,20 @@ public class TVStartEntity implements DataEntity {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public int getRoomid() {
|
||||
return roomid;
|
||||
public int getRoomId() {
|
||||
return roomId;
|
||||
}
|
||||
|
||||
public void setRoomid(int roomid) {
|
||||
this.roomid = roomid;
|
||||
public void setRoomId(int roomId) {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public int getRealRoomid() {
|
||||
return realRoomid;
|
||||
public int getRealRoomId() {
|
||||
return realRoomId;
|
||||
}
|
||||
|
||||
public void setRealRoomid(int realRoomid) {
|
||||
this.realRoomid = realRoomid;
|
||||
public void setRealRoomId(int realRoomId) {
|
||||
this.realRoomId = realRoomId;
|
||||
}
|
||||
|
||||
public int getRnd() {
|
||||
|
||||
@ -41,7 +41,7 @@ public class WelcomeActivityEntity implements DataEntity {
|
||||
@SerializedName("uid")
|
||||
private long uid;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("type")
|
||||
private String type;
|
||||
@SerializedName("display_mode")
|
||||
@ -55,12 +55,12 @@ public class WelcomeActivityEntity implements DataEntity {
|
||||
this.uid = uid;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
|
||||
@ -11,7 +11,7 @@ public class WelcomeEntity implements DataEntity {
|
||||
@SerializedName("cmd")
|
||||
private String cmd;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
@Override
|
||||
public String getCmd() {
|
||||
@ -22,15 +22,15 @@ public class WelcomeEntity implements DataEntity {
|
||||
this.cmd = cmd;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* uid : 516505
|
||||
* uname : 圣蝎
|
||||
|
||||
@ -12,7 +12,7 @@ public class WelcomeGuardEntity implements DataEntity {
|
||||
@SerializedName("cmd")
|
||||
private String cmd;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
@SerializedName("roomid")
|
||||
private long roomId;
|
||||
|
||||
@ -25,11 +25,11 @@ public class WelcomeGuardEntity implements DataEntity {
|
||||
this.cmd = cmd;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ public class WelcomeGuardEntity implements DataEntity {
|
||||
this.roomId = roomId;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* uid : 23598108
|
||||
* username : lovevael
|
||||
@ -56,7 +56,7 @@ public class WelcomeGuardEntity implements DataEntity {
|
||||
@SerializedName("guard_level")
|
||||
private int guardLevel;
|
||||
@SerializedName("water_god")
|
||||
private int waterGod;
|
||||
private Integer waterGod;
|
||||
|
||||
public int getUid() {
|
||||
return uid;
|
||||
@ -82,11 +82,11 @@ public class WelcomeGuardEntity implements DataEntity {
|
||||
this.guardLevel = guardLevel;
|
||||
}
|
||||
|
||||
public int getWaterGod() {
|
||||
public Integer getWaterGod() {
|
||||
return waterGod;
|
||||
}
|
||||
|
||||
public void setWaterGod(int waterGod) {
|
||||
public void setWaterGod(Integer waterGod) {
|
||||
this.waterGod = waterGod;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.passport.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class InfoEntity {
|
||||
public class InfoEntity extends ResponseEntity {
|
||||
/**
|
||||
* ts : 1509555703
|
||||
* code : 0
|
||||
@ -10,20 +10,18 @@ public class InfoEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("ts")
|
||||
private long ts;
|
||||
private long timestamp;
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public long getTs() {
|
||||
return ts;
|
||||
public long getTimestamp() {
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
public void setTs(long ts) {
|
||||
this.ts = ts;
|
||||
public void setTimestamp(long timestamp) {
|
||||
this.timestamp = timestamp;
|
||||
}
|
||||
|
||||
public int getCode() {
|
||||
@ -34,23 +32,15 @@ public class InfoEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* mid : 20293030
|
||||
* appid : 878
|
||||
@ -63,15 +53,15 @@ public class InfoEntity {
|
||||
@SerializedName("mid")
|
||||
private long mid;
|
||||
@SerializedName("appid")
|
||||
private int appid;
|
||||
private int appId;
|
||||
@SerializedName("access_token")
|
||||
private String accessToken;
|
||||
@SerializedName("expires_in")
|
||||
private long expiresIn;
|
||||
@SerializedName("userid")
|
||||
private String userid;
|
||||
private String userId;
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
|
||||
public long getMid() {
|
||||
return mid;
|
||||
@ -81,12 +71,12 @@ public class InfoEntity {
|
||||
this.mid = mid;
|
||||
}
|
||||
|
||||
public int getAppid() {
|
||||
return appid;
|
||||
public int getAppId() {
|
||||
return appId;
|
||||
}
|
||||
|
||||
public void setAppid(int appid) {
|
||||
this.appid = appid;
|
||||
public void setAppId(int appId) {
|
||||
this.appId = appId;
|
||||
}
|
||||
|
||||
public String getAccessToken() {
|
||||
@ -105,20 +95,20 @@ public class InfoEntity {
|
||||
this.expiresIn = expiresIn;
|
||||
}
|
||||
|
||||
public String getUserid() {
|
||||
return userid;
|
||||
public String getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserid(String userid) {
|
||||
this.userid = userid;
|
||||
public void setUserId(String userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.passport.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class KeyEntity {
|
||||
public class KeyEntity extends ResponseEntity {
|
||||
/**
|
||||
* ts : 1509555699
|
||||
* code : 0
|
||||
@ -10,20 +10,18 @@ public class KeyEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("ts")
|
||||
private long ts;
|
||||
private long timestamp;
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public long getTs() {
|
||||
return ts;
|
||||
public long getTimestamp() {
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
public void setTs(long ts) {
|
||||
this.ts = ts;
|
||||
public void setTimestamp(long timestamp) {
|
||||
this.timestamp = timestamp;
|
||||
}
|
||||
|
||||
public int getCode() {
|
||||
@ -34,23 +32,15 @@ public class KeyEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* hash : 8b9030ef5ff6d9f6
|
||||
* key : -----BEGIN PUBLIC KEY-----
|
||||
|
||||
@ -3,7 +3,7 @@ package com.hiczp.bilibili.api.passport.entity;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import com.hiczp.bilibili.api.BilibiliAccount;
|
||||
|
||||
public class LoginResponseEntity {
|
||||
public class LoginResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* data : {"access_token":"8501735069b043dd62c3bb88810444fd","refresh_token":"d41affc888082ffa11d7d2c37ad0cf2c","mid":20293030,"expires_in":2592000}
|
||||
@ -12,12 +12,10 @@ public class LoginResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
@SerializedName("ts")
|
||||
private long ts;
|
||||
private long timestamp;
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
@ -27,28 +25,20 @@ public class LoginResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public long getTs() {
|
||||
return ts;
|
||||
public long getTimestamp() {
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
public void setTs(long ts) {
|
||||
this.ts = ts;
|
||||
public void setTimestamp(long timestamp) {
|
||||
this.timestamp = timestamp;
|
||||
}
|
||||
|
||||
public BilibiliAccount toBilibiliAccount() {
|
||||
@ -57,11 +47,11 @@ public class LoginResponseEntity {
|
||||
this.data.refreshToken,
|
||||
this.data.mid,
|
||||
this.data.expiresIn,
|
||||
this.ts
|
||||
this.timestamp
|
||||
);
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* access_token : 8501735069b043dd62c3bb88810444fd
|
||||
* refresh_token : d41affc888082ffa11d7d2c37ad0cf2c
|
||||
|
||||
@ -2,34 +2,24 @@ package com.hiczp.bilibili.api.passport.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class LogoutResponseEntity {
|
||||
public class LogoutResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* message : access_key not found.
|
||||
* ts : 1509555707
|
||||
* code : -901
|
||||
*/
|
||||
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("ts")
|
||||
private long ts;
|
||||
private long timestamp;
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
public long getTimestamp() {
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public long getTs() {
|
||||
return ts;
|
||||
}
|
||||
|
||||
public void setTs(long ts) {
|
||||
this.ts = ts;
|
||||
public void setTimestamp(long timestamp) {
|
||||
this.timestamp = timestamp;
|
||||
}
|
||||
|
||||
public int getCode() {
|
||||
|
||||
@ -3,7 +3,7 @@ package com.hiczp.bilibili.api.passport.entity;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import com.hiczp.bilibili.api.BilibiliAccount;
|
||||
|
||||
public class RefreshTokenResponseEntity {
|
||||
public class RefreshTokenResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* ts : 1509734125
|
||||
* code : 0
|
||||
@ -14,10 +14,8 @@ public class RefreshTokenResponseEntity {
|
||||
private long ts;
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private DataEntity data;
|
||||
private Data data;
|
||||
|
||||
public long getTs() {
|
||||
return ts;
|
||||
@ -35,19 +33,11 @@ public class RefreshTokenResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public DataEntity getData() {
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(DataEntity data) {
|
||||
public void setData(Data data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
@ -61,7 +51,7 @@ public class RefreshTokenResponseEntity {
|
||||
);
|
||||
}
|
||||
|
||||
public static class DataEntity {
|
||||
public static class Data {
|
||||
/**
|
||||
* mid : 20293030
|
||||
* refresh_token : 19d64022154e033574df4c753fc7926d
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
package com.hiczp.bilibili.api.passport.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public abstract class ResponseEntity {
|
||||
//有一些返回的模型中的 code 是字符串, 所以这个父类不能包含 code
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public ResponseEntity setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@ -1,10 +1,6 @@
|
||||
package com.hiczp.bilibili.api.passport.exception;
|
||||
|
||||
public class CaptchaMismatchException extends RuntimeException {
|
||||
public CaptchaMismatchException() {
|
||||
|
||||
}
|
||||
|
||||
public CaptchaMismatchException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
package com.hiczp.bilibili.api.web.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public abstract class ResponseEntity {
|
||||
//有一些返回的模型中的 code 是字符串, 所以这个父类不能包含 code
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public ResponseEntity setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public ResponseEntity setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.web.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class SendHeartBeatResponseEntity {
|
||||
public class SendHeartBeatResponseEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : 0
|
||||
* msg : success
|
||||
@ -12,10 +12,6 @@ public class SendHeartBeatResponseEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private int code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("message")
|
||||
private String message;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -27,22 +23,6 @@ public class SendHeartBeatResponseEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.web.live.entity;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class UserInfoEntity {
|
||||
public class UserInfoEntity extends ResponseEntity {
|
||||
/**
|
||||
* code : REPONSE_OK
|
||||
* msg : ok
|
||||
@ -11,8 +11,6 @@ public class UserInfoEntity {
|
||||
|
||||
@SerializedName("code")
|
||||
private String code;
|
||||
@SerializedName("msg")
|
||||
private String msg;
|
||||
@SerializedName("data")
|
||||
private Data data;
|
||||
|
||||
@ -24,14 +22,6 @@ public class UserInfoEntity {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public Data getData() {
|
||||
return data;
|
||||
}
|
||||
@ -58,7 +48,7 @@ public class UserInfoEntity {
|
||||
*/
|
||||
|
||||
@SerializedName("uname")
|
||||
private String uname;
|
||||
private String username;
|
||||
@SerializedName("face")
|
||||
private String face;
|
||||
@SerializedName("silver")
|
||||
@ -84,12 +74,12 @@ public class UserInfoEntity {
|
||||
@SerializedName("billCoin")
|
||||
private int billCoin;
|
||||
|
||||
public String getUname() {
|
||||
return uname;
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUname(String uname) {
|
||||
this.uname = uname;
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getFace() {
|
||||
|
||||
@ -6,7 +6,7 @@ import org.junit.Test;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
public class GetAwardsTest {
|
||||
public class GetAwardTest {
|
||||
private static final BilibiliAPI BILIBILI_API = Config.getBilibiliAPI();
|
||||
|
||||
@Test
|
||||
@ -126,11 +126,11 @@ public class LiveClientTest {
|
||||
|
||||
@Subscribe
|
||||
public void sendGift(SendGiftPackageEvent sendGiftPackageEvent) {
|
||||
SendGiftEntity.DataEntity dataEntity = sendGiftPackageEvent.getEntity().getData();
|
||||
SendGiftEntity.Data data = sendGiftPackageEvent.getEntity().getData();
|
||||
LOGGER.info("[SendGift] {} give {}*{}",
|
||||
dataEntity.getUsername(),
|
||||
dataEntity.getGiftName(),
|
||||
dataEntity.getNum()
|
||||
data.getUsername(),
|
||||
data.getGiftName(),
|
||||
data.getNum()
|
||||
);
|
||||
}
|
||||
|
||||
@ -156,29 +156,29 @@ public class LiveClientTest {
|
||||
public void tvEnd(TVEndPackageEvent tvEndPackageEvent) {
|
||||
TVEndEntity tvEndEntity = tvEndPackageEvent.getEntity();
|
||||
LOGGER.info("[TVEnd] user {} win the {}",
|
||||
tvEndEntity.getData().getUname(),
|
||||
tvEndEntity.getData().getUsername(),
|
||||
tvEndEntity.getData().getType()
|
||||
);
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void welcome(WelcomePackageEvent welcomePackageEvent) {
|
||||
WelcomeEntity.DataEntity dataEntity = welcomePackageEvent.getEntity().getData();
|
||||
WelcomeEntity.Data data = welcomePackageEvent.getEntity().getData();
|
||||
StringBuilder stringBuilder = new StringBuilder("[Welcome] ");
|
||||
if (dataEntity.isAdmin()) {
|
||||
if (data.isAdmin()) {
|
||||
stringBuilder.append("[ADMIN] ");
|
||||
}
|
||||
stringBuilder.append(String.format("[VIP %d] ", dataEntity.getVip()))
|
||||
.append(dataEntity.getUserName());
|
||||
stringBuilder.append(String.format("[VIP %d] ", data.getVip()))
|
||||
.append(data.getUserName());
|
||||
LOGGER.info(stringBuilder.toString());
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void welcomeGuard(WelcomeGuardPackageEvent welcomeGuardPackageEvent) {
|
||||
WelcomeGuardEntity.DataEntity dataEntity = welcomeGuardPackageEvent.getEntity().getData();
|
||||
WelcomeGuardEntity.Data data = welcomeGuardPackageEvent.getEntity().getData();
|
||||
LOGGER.info("[WelcomeGuard] [GL {}] {}",
|
||||
dataEntity.getGuardLevel(),
|
||||
dataEntity.getUsername()
|
||||
data.getGuardLevel(),
|
||||
data.getUsername()
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ import java.nio.file.Paths;
|
||||
SecurityHelperTest.class,
|
||||
AuthenticatorTest.class,
|
||||
WebAPITest.class,
|
||||
GetAwardsTest.class,
|
||||
GetAwardTest.class,
|
||||
LogoutTest.class
|
||||
})
|
||||
public class RuleSuite {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user