From 965ee32fd1dbe1e7d1f1dbb782e25d0e718f55e5 Mon Sep 17 00:00:00 2001 From: sifacai Date: Wed, 26 Jul 2023 23:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMusicVideo=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sifacai/vlcjellyfin/Ui/DetailActivity.java | 4 +++- .../org/sifacai/vlcjellyfin/Utils/JfClient.java | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Ui/DetailActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/DetailActivity.java index 573a9c8..2448446 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Ui/DetailActivity.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/DetailActivity.java @@ -163,6 +163,8 @@ public class DetailActivity extends BaseActivity implements JAdapter.OnItemClick tvDetails.append("出生地:" + String.join(",", details.getProductionLocations())); } fillItemsByPerson(Id); + }else { + fillMovie(details); } List Peoples = details.getPeople(); @@ -344,7 +346,7 @@ public class DetailActivity extends BaseActivity implements JAdapter.OnItemClick } toVlcPlayer(); } - } else if (type.equals("Movie") || type.equals("Video")) { + } else if (type.equals("Movie") || type.equals("Video") || type.equals("MusicVideo")) { JfClient.playList.clear(); JfClient.playList.add(getMedia(item)); JfClient.playIndex = 0; diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java index e318654..005cad5 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java @@ -39,7 +39,7 @@ import okhttp3.OkHttpClient; public class JfClient { public static final String TAG = "JellyfinClient"; public static final String DeviceId = "TW96aWxsYS81LjAgKFdpbmRvd3MgTlQgNi4xOyBXa"; - public static final String XEmbyAuthorization = "MediaBrowser Client=\"Vlc_J_TV\", Device=\"Vlc_J_TV\", DeviceId=\""+DeviceId+"\", Version=\"10.8.1\""; + public static final String XEmbyAuthorization = "MediaBrowser Client=\"Vlc_J_TV\", Device=\"Vlc_J_TV\", DeviceId=\"" + DeviceId + "\", Version=\"10.8.1\""; public static HttpHeaders headers; public static Config config; public static String UserId = ""; @@ -84,7 +84,8 @@ public class JfClient { /** * description 忽略https证书验证 - *`在这里插入代码片` + * `在这里插入代码片` + * * @author yanzy * @version 1.0 * @date 2021/9/8 14:42 @@ -136,9 +137,9 @@ public class JfClient { .setOkHttpClient(builder.build()) .setRetryCount(3); Picasso.setSingletonInstance(new Picasso.Builder(application.getBaseContext()) - .downloader(new OkHttp3Downloader(builder.build())) - .build() - ); + .downloader(new OkHttp3Downloader(builder.build())) + .build() + ); } /** @@ -372,6 +373,8 @@ public class JfClient { itemsUrl += "&IncludeItemTypes=Series"; } else if (type.equals("movies")) { itemsUrl += "&IncludeItemTypes=Movie"; + } else if (type.equals("CollectionFolder") || type.equals("Folder")) { + } else { itemsUrl += "&IncludeItemTypes=Movie,Series"; } @@ -495,7 +498,7 @@ public class JfClient { * @param cb */ public static void AuthenticateByName(String username, String password, JJCallBack cb, JJCallBack err, boolean saveUser) { - if(username.equals("") || password.equals("")){ + if (username.equals("") || password.equals("")) { err.onError("用户名和密码验证失败!"); return; } @@ -666,7 +669,7 @@ public class JfClient { return response; } - public static String SendPost(String url,String body) throws IOException { + public static String SendPost(String url, String body) throws IOException { String response = ""; response = OkGo.post(url).upBytes(body.getBytes()).execute().body().string(); return response;