From 95afd4f57ad96159c05e8d982545cab90ffe1ee0 Mon Sep 17 00:00:00 2001 From: "sifacai@outlook.com" Date: Tue, 30 Aug 2022 21:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sifacai/vlcjellyfin/HomeActivity.java | 2 +- .../java/org/sifacai/vlcjellyfin/JfClient.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java index 7349187..95cc40f 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/HomeActivity.java @@ -32,7 +32,7 @@ public class HomeActivity extends BaseActivity{ tvContiner = findViewById(R.id.tvItems); - JfClient.init(this); + JfClient.init(getApplication()); Log.d(TAG, "onCreate: " + JfClient.config.getJellyfinUrl()); if(JfClient.AccessToken.equals("") ||JfClient.UserId.equals("")){ diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java b/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java index 01d4c90..018640d 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/JfClient.java @@ -18,6 +18,7 @@ import com.lzy.okgo.model.HttpHeaders; import com.lzy.okgo.model.Response; import java.io.IOException; +import java.util.Timer; import java.util.concurrent.TimeUnit; import okhttp3.OkHttpClient; @@ -40,9 +41,16 @@ public class JfClient { * 初始化配置 * @param context */ - public static void init(Context context) { - config = new Config(context); + public static void init(Application application) { + config = new Config(application); SetHeaders(); + OkHttpClient.Builder builder = new OkHttpClient.Builder(); + builder.connectTimeout(5,TimeUnit.SECONDS); + builder.readTimeout(3, TimeUnit.SECONDS); + builder.writeTimeout(5,TimeUnit.SECONDS); + OkGo.getInstance().init(application) + .setOkHttpClient(builder.build()) + .setRetryCount(3); } /** @@ -333,6 +341,7 @@ public class JfClient { @Override public void onSuccess(String str) { JsonObject serverInfo = strToGson(str, JsonObject.class); + Log.d(TAG, "onSuccess: " + str); String ServerId = jeFromGson(serverInfo, "Id") == null ? null : jeFromGson(serverInfo, "Id").getAsString(); if (ServerId == null || ServerId.length() == 0) { cb.onSuccess(false); @@ -451,7 +460,7 @@ public class JfClient { public static JsonElement jeFromGson(JsonObject obj, String key) { JsonElement jo = null; if (obj != null && obj.has(key)) { - jo = obj.get(key).getAsJsonObject(); + jo = obj.get(key); } return jo; }