From 8eb075b94459ded8365e2eb7830cbadea041303a Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 9 Apr 2023 01:58:29 +0800 Subject: [PATCH] [leanback] support cast - part 3 --- .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 2 +- app/src/main/java/com/fongmi/android/tv/server/Nano.java | 2 +- app/src/main/java/com/fongmi/android/tv/server/Server.java | 4 ++-- .../fongmi/android/tv/server/process/InputRequestProcess.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 933f91038..d7579a558 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -859,8 +859,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mSearchAdapter.clear(); mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL); for (Site site : ApiConfig.get().getSites()) { - if (site.getKey().equals(getKey())) continue; if (isAutoMode() && !site.isChangeable()) continue; + if (isAutoMode() && site.getKey().equals(getKey())) continue; if (site.isSearchable()) mExecutor.execute(() -> search(site, keyword)); } } diff --git a/app/src/main/java/com/fongmi/android/tv/server/Nano.java b/app/src/main/java/com/fongmi/android/tv/server/Nano.java index c60bc9c77..4959b0080 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/Nano.java +++ b/app/src/main/java/com/fongmi/android/tv/server/Nano.java @@ -183,6 +183,6 @@ public class Nano extends NanoHTTPD { void onApi(String url); - void onCast(String url, String history); + void onCast(String url, String device, String history); } } diff --git a/app/src/main/java/com/fongmi/android/tv/server/Server.java b/app/src/main/java/com/fongmi/android/tv/server/Server.java index 3c093dedb..074c7782f 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/Server.java +++ b/app/src/main/java/com/fongmi/android/tv/server/Server.java @@ -106,7 +106,7 @@ public class Server implements Nano.Listener { } @Override - public void onCast(String url, String history) { - CastEvent.post(url, history); + public void onCast(String url, String device, String history) { + CastEvent.post(url, device, history); } } diff --git a/app/src/main/java/com/fongmi/android/tv/server/process/InputRequestProcess.java b/app/src/main/java/com/fongmi/android/tv/server/process/InputRequestProcess.java index 95998a318..41400008e 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/process/InputRequestProcess.java +++ b/app/src/main/java/com/fongmi/android/tv/server/process/InputRequestProcess.java @@ -34,7 +34,7 @@ public class InputRequestProcess implements RequestProcess { nano.getListener().onApi(params.get("url").trim()); break; case "cast": - nano.getListener().onCast(params.get("url").trim(), params.get("history").trim()); + nano.getListener().onCast(params.get("url").trim(), params.get("device").trim(), params.get("history").trim()); break; } return Nano.createPlainTextResponse(NanoHTTPD.Response.Status.OK, "ok");