From b294568710ca8d443abdeb3398ca1000816f6173 Mon Sep 17 00:00:00 2001 From: czp Date: Sun, 11 Feb 2018 17:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=20HttpLogger=20?= =?UTF-8?q?=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hiczp/bilibili/api/BilibiliAPI.java | 16 ++++++++++------ .../bilibili/api/live/socket/LiveClient.java | 1 + .../com/hiczp/bilibili/api/test/SsoTest.java | 10 +++++----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java b/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java index a923766..aba6cb0 100644 --- a/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java +++ b/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java @@ -65,13 +65,15 @@ public class BilibiliAPI implements BilibiliServiceProvider, LiveClientProvider @Override public PassportService getPassportService() { if (passportService == null) { - passportService = getPassportServiceWithCustomInterceptors(Collections.emptyList()); + passportService = getPassportService(Collections.emptyList(), HttpLoggingInterceptor.Level.BASIC); } return passportService; } - public PassportService getPassportServiceWithCustomInterceptors(@Nonnull List interceptors) { + public PassportService getPassportService(@Nonnull List interceptors, @Nonnull HttpLoggingInterceptor.Level logLevel) { Objects.requireNonNull(interceptors); + Objects.requireNonNull(logLevel); + OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder(); interceptors.forEach(okHttpClientBuilder::addInterceptor); @@ -88,7 +90,7 @@ public class BilibiliAPI implements BilibiliServiceProvider, LiveClientProvider .addInterceptor(new AddAppKeyInterceptor(bilibiliClientProperties)) .addInterceptor(new SortParamsAndSignInterceptor(bilibiliClientProperties)) .addInterceptor(new ErrorResponseConverterInterceptor()) - .addNetworkInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC)); + .addNetworkInterceptor(new HttpLoggingInterceptor().setLevel(logLevel)); return new Retrofit.Builder() .baseUrl(BaseUrlDefinition.PASSPORT) @@ -101,13 +103,15 @@ public class BilibiliAPI implements BilibiliServiceProvider, LiveClientProvider @Override public LiveService getLiveService() { if (liveService == null) { - liveService = getLiveServiceWithCustomInterceptors(Collections.emptyList()); + liveService = getLiveService(Collections.emptyList(), HttpLoggingInterceptor.Level.BASIC); } return liveService; } - public LiveService getLiveServiceWithCustomInterceptors(@Nonnull List interceptors) { + public LiveService getLiveService(@Nonnull List interceptors, @Nonnull HttpLoggingInterceptor.Level logLevel) { Objects.requireNonNull(interceptors); + Objects.requireNonNull(logLevel); + OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder(); interceptors.forEach(okHttpClientBuilder::addInterceptor); @@ -147,7 +151,7 @@ public class BilibiliAPI implements BilibiliServiceProvider, LiveClientProvider .addInterceptor(new AddAccessKeyInterceptor(bilibiliAccount)) .addInterceptor(new SortParamsAndSignInterceptor(bilibiliClientProperties)) .addInterceptor(new ErrorResponseConverterInterceptor()) - .addNetworkInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC)); + .addNetworkInterceptor(new HttpLoggingInterceptor().setLevel(logLevel)); return new Retrofit.Builder() .baseUrl(BaseUrlDefinition.LIVE) diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/LiveClient.java b/src/main/java/com/hiczp/bilibili/api/live/socket/LiveClient.java index 8509a35..8038d53 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/LiveClient.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/LiveClient.java @@ -164,6 +164,7 @@ public class LiveClient implements Closeable { .body(); } + //TODO 弹幕发送队列 // public void sendBulletScreenAsync(@Nonnull String message, @Nonnull BulletScreenSendingCallback bulletScreenSendingCallback, boolean autoSplit) { // if (!autoSplit) { // sendBulletScreenAsync(message, bulletScreenSendingCallback); diff --git a/src/test/java/com/hiczp/bilibili/api/test/SsoTest.java b/src/test/java/com/hiczp/bilibili/api/test/SsoTest.java index cf0c5b2..2c730d6 100644 --- a/src/test/java/com/hiczp/bilibili/api/test/SsoTest.java +++ b/src/test/java/com/hiczp/bilibili/api/test/SsoTest.java @@ -16,10 +16,10 @@ public class SsoTest { @Ignore @Test public void test() throws Exception { - Object object = BILIBILI_API.getPassportService() - .sso(BILIBILI_API.getBilibiliAccount().getAccessToken(), null) - .execute() - .body(); - LOGGER.info("{}", object.toString()); +// Object object = BILIBILI_API.getPassportService() +// .sso(BILIBILI_API.getBilibiliAccount().getAccessToken(), null) +// .execute() +// .body(); +// LOGGER.info("{}", object.toString()); } }