diff --git a/build.gradle b/build.gradle index 65ba32e..fa69522 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group = 'com.hiczp' -version = '0.0.9' +version = '0.0.10' description = 'Bilibili android client API library written in Java' apply plugin: 'idea' diff --git a/src/main/java/com/hiczp/bilibili/api/live/LiveService.java b/src/main/java/com/hiczp/bilibili/api/live/LiveService.java index 24bbd08..4909b14 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/LiveService.java +++ b/src/main/java/com/hiczp/bilibili/api/live/LiveService.java @@ -49,10 +49,19 @@ public interface LiveService { //参与小电视抽奖 //房间号必须与小电视号对应 //目标小电视不存在时(房间号与小电视号不匹配时也视为不存在)返回 -400 "不存在小电视信息" + //SYS_MSG 里面取得的小电视编号是一个字符串, 实际上它肯定是一个数字 @POST("AppSmallTV/join") - Call joinAppSmallTV(@Query("roomid") long roomId, @Query("id") long tvId); + Call joinAppSmallTV(@Query("roomid") long roomId, @Query("id") String tvId); - //TODO 查看小电视抽奖结果 + //通过 getAppSmallTV 取得的小电视编号是一个数字 + default Call joinAppSmallTV(long roomId, long tvId) { + return joinAppSmallTV(roomId, String.valueOf(tvId)); + } + + //获得小电视抽奖结果(不访问这个 API, 奖励也会自动进入背包) + //其中的 status 为 0 时, 表示返回正常开奖结果, 1 为没有参与抽奖或小电视已过期, 2 为正在开奖过程中. + @GET("AppSmallTV/getReward") + Call getAppSmallTVReward(@Query("id") long tvId); //获得所有头衔的列表 //这里的 Title 是头衔的意思 diff --git a/src/main/java/com/hiczp/bilibili/api/live/entity/AppSmallTVEntity.java b/src/main/java/com/hiczp/bilibili/api/live/entity/AppSmallTVEntity.java index dad6391..af32dac 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/entity/AppSmallTVEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/entity/AppSmallTVEntity.java @@ -61,17 +61,17 @@ public class AppSmallTVEntity { */ @SerializedName("lastid") - private int lastid; + private long lastid; @SerializedName("join") private List join; @SerializedName("unjoin") private List unjoin; - public int getLastid() { + public long getLastid() { return lastid; } - public void setLastid(int lastid) { + public void setLastid(long lastid) { this.lastid = lastid; } @@ -98,15 +98,15 @@ public class AppSmallTVEntity { */ @SerializedName("id") - private int id; + private long id; @SerializedName("dtime") private int dtime; - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; } @@ -126,15 +126,15 @@ public class AppSmallTVEntity { */ @SerializedName("id") - private int id; + private long id; @SerializedName("dtime") private int dtime; - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/entity/GetAppSmallTVRewardResponseEntity.java b/src/main/java/com/hiczp/bilibili/api/live/entity/GetAppSmallTVRewardResponseEntity.java new file mode 100644 index 0000000..d275fb7 --- /dev/null +++ b/src/main/java/com/hiczp/bilibili/api/live/entity/GetAppSmallTVRewardResponseEntity.java @@ -0,0 +1,164 @@ +package com.hiczp.bilibili.api.live.entity; + +import com.google.gson.annotations.SerializedName; + +public class GetAppSmallTVRewardResponseEntity { + /** + * code : 0 + * msg : ok + * message : ok + * data : {"fname":"","sname":"麦麦0w0","win":0,"reward":{"id":7,"num":2,"name":"辣条","url":"http://s1.hdslb.com/bfs/static/blive/live-assets/mobile/gift/mobilegift-static-icon/gift-1.png?20171118161652"},"status":0} + */ + + @SerializedName("code") + private int code; + @SerializedName("msg") + private String msg; + @SerializedName("message") + private String message; + @SerializedName("data") + private Data data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + 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; + } + + public void setData(Data data) { + this.data = data; + } + + public static class Data { + /** + * fname : + * sname : 麦麦0w0 + * win : 0 + * reward : {"id":7,"num":2,"name":"辣条","url":"http://s1.hdslb.com/bfs/static/blive/live-assets/mobile/gift/mobilegift-static-icon/gift-1.png?20171118161652"} + * status : 0 + */ + + @SerializedName("fname") + private String fname; + @SerializedName("sname") + private String sname; + @SerializedName("win") + private int win; + @SerializedName("reward") + private Reward reward; + @SerializedName("status") + private int status; + + public String getFname() { + return fname; + } + + public void setFname(String fname) { + this.fname = fname; + } + + public String getSname() { + return sname; + } + + public void setSname(String sname) { + this.sname = sname; + } + + public int getWin() { + return win; + } + + public void setWin(int win) { + this.win = win; + } + + public Reward getReward() { + return reward; + } + + public void setReward(Reward reward) { + this.reward = reward; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public static class Reward { + /** + * id : 7 + * num : 2 + * name : 辣条 + * url : http://s1.hdslb.com/bfs/static/blive/live-assets/mobile/gift/mobilegift-static-icon/gift-1.png?20171118161652 + */ + + @SerializedName("id") + private int id; + @SerializedName("num") + private int num; + @SerializedName("name") + private String name; + @SerializedName("url") + private String url; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getNum() { + return num; + } + + public void setNum(int num) { + this.num = num; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + } + } +} diff --git a/src/main/java/com/hiczp/bilibili/api/live/entity/JoinAppSmallTVResponseEntity.java b/src/main/java/com/hiczp/bilibili/api/live/entity/JoinAppSmallTVResponseEntity.java index fd7bd3e..9cef298 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/entity/JoinAppSmallTVResponseEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/entity/JoinAppSmallTVResponseEntity.java @@ -59,17 +59,17 @@ public class JoinAppSmallTVResponseEntity { */ @SerializedName("id") - private int id; + private long id; @SerializedName("dtime") private int dtime; @SerializedName("status") private int status; - public int getId() { + public long getId() { return id; } - public void setId(int id) { + public void setId(long id) { this.id = id; }