From 229c229ec720cd025ae5ba4956ed15743aede4f7 Mon Sep 17 00:00:00 2001 From: duzhaokun123 Date: Fri, 3 Apr 2020 14:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86=E6=97=A7?= =?UTF-8?q?=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- build.gradle | 2 +- .../com/hiczp/bilibili/api/app/model/View.kt | 29 ++++++++++++++++++- .../api/passport/model/LoginResponse.kt | 4 +-- .../bilibili/api/player/model/VideoPlayUrl.kt | 18 +++++++++++- 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 197af6a..e5306fd 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # 使用 ```groovy -compile group: 'com.hiczp', name: 'bilibili-api', version: '0.1.3' +compile group: 'com.hiczp', name: 'bilibili-api', version: '0.1.4' ``` # 技术说明 diff --git a/build.gradle b/build.gradle index f7e7d00..5abd6b3 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { } group = 'com.hiczp' -version = '0.1.3' +version = '0.1.4' description = 'Bilibili Android client API library for Kotlin' apply plugin: 'kotlin' diff --git a/src/main/kotlin/com/hiczp/bilibili/api/app/model/View.kt b/src/main/kotlin/com/hiczp/bilibili/api/app/model/View.kt index cef5684..1c0d31c 100644 --- a/src/main/kotlin/com/hiczp/bilibili/api/app/model/View.kt +++ b/src/main/kotlin/com/hiczp/bilibili/api/app/model/View.kt @@ -76,7 +76,11 @@ data class View( @SerializedName("tname") var tname: String, // 星海 @SerializedName("videos") - var videos: Int // 1 + var videos: Int, // 1 + @SerializedName("honor") + var honor: Honor, + @SerializedName("bvid") + var bvid: String //BV1xx411c79H ) { data class Cm( @SerializedName("ad_info") @@ -445,5 +449,28 @@ data class View( var hasDanmu: Int // 0 ) } + + data class Honor( + @SerializedName("icon") + var icon: String, + @SerializedName("icon_night") + var iconNight: String, + @SerializedName("text") + var text: String, + @SerializedName("text_extra") + var textExtra: String, + @SerializedName("text_color") + var textColor: String, //#F3921F + @SerializedName("text_color_night") + var textColorNight: String, + @SerializedName("bg_color") + var bgColor: String, + @SerializedName("bg_color_night") + var bgColorNight: String, + @SerializedName("url") + var url: String, + @SerializedName("url_text") + var urlText: String + ) } } diff --git a/src/main/kotlin/com/hiczp/bilibili/api/passport/model/LoginResponse.kt b/src/main/kotlin/com/hiczp/bilibili/api/passport/model/LoginResponse.kt index 5a93f8e..86ed529 100644 --- a/src/main/kotlin/com/hiczp/bilibili/api/passport/model/LoginResponse.kt +++ b/src/main/kotlin/com/hiczp/bilibili/api/passport/model/LoginResponse.kt @@ -21,11 +21,9 @@ data class LoginResponse( @SerializedName("status") var status: Int, // 0 @SerializedName("token_info") - var tokenInfo: TokenInfo + var tokenInfo: TokenInfo, @SerializedName("url") var url: String - @SerializedName("status") - var status: int ) : Serializable { data class CookieInfo( @SerializedName("cookies") diff --git a/src/main/kotlin/com/hiczp/bilibili/api/player/model/VideoPlayUrl.kt b/src/main/kotlin/com/hiczp/bilibili/api/player/model/VideoPlayUrl.kt index 2795009..356b866 100644 --- a/src/main/kotlin/com/hiczp/bilibili/api/player/model/VideoPlayUrl.kt +++ b/src/main/kotlin/com/hiczp/bilibili/api/player/model/VideoPlayUrl.kt @@ -1,6 +1,7 @@ package com.hiczp.bilibili.api.player.model import com.google.gson.annotations.SerializedName +import org.jetbrains.annotations.Nullable data class VideoPlayUrl( @SerializedName("code") @@ -42,7 +43,9 @@ data class VideoPlayUrl( @SerializedName("video_codecid") var videoCodecid: Int, // 7 @SerializedName("video_project") - var videoProject: Boolean // true + var videoProject: Boolean, // true + @SerializedName("durl") + var durl: List ) { data class Dash( @SerializedName("audio") @@ -76,5 +79,18 @@ data class VideoPlayUrl( var id: Int // 16 ) } + + data class Durl( + @SerializedName("order") + var order: Int, + @SerializedName("length") + var length: Long, + @SerializedName("size") + var size: Long, + @SerializedName("url") + var url: String, + @SerializedName("backup_url") + var backupUrl: List + ) } }