UA 中的版本号跟随 ClientProperties

This commit is contained in:
czp 2018-03-06 00:05:57 +08:00
parent abf256876c
commit 4d2ae98561
2 changed files with 12 additions and 5 deletions

View File

@ -120,7 +120,7 @@ public class BilibiliAPI implements BilibiliServiceProvider, BilibiliCaptchaProv
okHttpClientBuilder okHttpClientBuilder
.addInterceptor(new AddFixedHeadersInterceptor( .addInterceptor(new AddFixedHeadersInterceptor(
"Buvid", bilibiliClientProperties.getBuvId(), "Buvid", bilibiliClientProperties.getBuvId(),
"User-Agent", "Mozilla/5.0 BiliDroid/5.15.0 (bbcallen@gmail.com)", "User-Agent", String.format("Mozilla/5.0 BiliDroid/%s (bbcallen@gmail.com)", bilibiliClientProperties.getSimpleVersion()),
"Device-ID", bilibiliClientProperties.getHardwareId() "Device-ID", bilibiliClientProperties.getHardwareId()
)) ))
.addInterceptor(new AddDynamicHeadersInterceptor( .addInterceptor(new AddDynamicHeadersInterceptor(

View File

@ -8,19 +8,22 @@ public class BilibiliClientProperties {
private String hardwareId = "JxdyESFAJkcjEicQbBBsCTlbal5uX2Y"; private String hardwareId = "JxdyESFAJkcjEicQbBBsCTlbal5uX2Y";
private String scale = "xxhdpi"; private String scale = "xxhdpi";
private String version = "5.15.0.515000"; private String version = "5.15.0.515000";
private String simpleVersion;
private String build; private String build;
private String buvId = "JxdyESFAJkcjEicQbBBsCTlbal5uX2Yinfoc"; private String buvId = "JxdyESFAJkcjEicQbBBsCTlbal5uX2Yinfoc";
private BilibiliClientProperties() { private BilibiliClientProperties() {
generateBuildProperty(); onVersionChange();
} }
public static BilibiliClientProperties defaultSetting() { public static BilibiliClientProperties defaultSetting() {
return new BilibiliClientProperties(); return new BilibiliClientProperties();
} }
private void generateBuildProperty() { private void onVersionChange() {
this.build = version.substring(version.lastIndexOf(".") + 1); int lastIndexOfDot = version.lastIndexOf(".");
this.simpleVersion = version.substring(0, lastIndexOfDot);
this.build = version.substring(lastIndexOfDot + 1);
} }
public String getAppKey() { public String getAppKey() {
@ -65,10 +68,14 @@ public class BilibiliClientProperties {
public BilibiliClientProperties setVersion(@Nonnull String version) { public BilibiliClientProperties setVersion(@Nonnull String version) {
this.version = version; this.version = version;
generateBuildProperty(); onVersionChange();
return this; return this;
} }
public String getSimpleVersion() {
return simpleVersion;
}
public String getBuild() { public String getBuild() {
return build; return build;
} }