diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java index 3e568c916..844d00530 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java @@ -22,8 +22,6 @@ import com.google.gson.JsonParser; import org.json.JSONObject; -import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -249,9 +247,7 @@ public class ApiConfig { } public Object[] proxyLocal(Map params) { - if (params.containsKey("do") && params.get("do").equals("port")) { - return new Object[]{200, "text/plain; charset=utf-8", new ByteArrayInputStream("ok".getBytes(StandardCharsets.UTF_8))}; - } else if (params.containsKey("do") && params.get("do").equals("js")) { + if (params.containsKey("do") && params.get("do").equals("js")) { return jsLoader.proxyInvoke(params); } else if (params.containsKey("do") && params.get("do").equals("py")) { return pyLoader.proxyInvoke(params); 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 8db0066e3..55994f0ac 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 @@ -5,6 +5,7 @@ import android.net.wifi.WifiManager; import android.text.format.Formatter; import com.fongmi.android.tv.App; +import com.hiker.drpy.Proxy; import java.net.Inet4Address; import java.net.InetAddress; @@ -46,6 +47,7 @@ public class Server { do { try { nano = new Nano(port); + Proxy.set(port); nano.start(); break; } catch (Exception e) { diff --git a/drpy/src/main/java/com/hiker/drpy/Proxy.java b/drpy/src/main/java/com/hiker/drpy/Proxy.java index f936297c4..93fa0b9b4 100644 --- a/drpy/src/main/java/com/hiker/drpy/Proxy.java +++ b/drpy/src/main/java/com/hiker/drpy/Proxy.java @@ -1,32 +1,14 @@ package com.hiker.drpy; -import com.github.catvod.net.OkHttp; - public class Proxy { private static int port; - static void tryPort() { - if (port > 0) return; - int port = 9978; - while (port < 9999) { - boolean ok = string(port).equals("ok"); - if (ok) Proxy.port = port; - if (ok) break; - port++; - } - } - - private static String string(int port) { - try { - return OkHttp.newCall("http://127.0.0.1:" + port + "/proxy?do=port").execute().body().string(); - } catch (Exception e) { - return ""; - } + public static void set(int port) { + Proxy.port = port; } public static String getUrl() { - tryPort(); return "http://127.0.0.1:" + port + "/proxy"; } } diff --git a/drpy/src/main/java/com/hiker/drpy/Spider.java b/drpy/src/main/java/com/hiker/drpy/Spider.java index 0209397e9..aca126a75 100644 --- a/drpy/src/main/java/com/hiker/drpy/Spider.java +++ b/drpy/src/main/java/com/hiker/drpy/Spider.java @@ -110,11 +110,8 @@ public class Spider extends com.github.catvod.crawler.Spider { @Override public Object[] proxyLocal(Map params) throws Exception { - if ("catvod".equals(params.get("from"))) { - return proxy2(params); - } else { - return submit(() -> proxy1(params)).get(); - } + if ("catvod".equals(params.get("from"))) return proxy2(params); + else return submit(() -> proxy1(params)).get(); } @Override diff --git a/drpy/src/main/java/com/hiker/drpy/method/Function.java b/drpy/src/main/java/com/hiker/drpy/method/Function.java index 4d0971c6d..bd1229be5 100644 --- a/drpy/src/main/java/com/hiker/drpy/method/Function.java +++ b/drpy/src/main/java/com/hiker/drpy/method/Function.java @@ -40,8 +40,7 @@ public class Function implements Callable { private final JSCallFunction jsCallFunction = new JSCallFunction() { @Override public Object call(Object... args) { - result = args[0]; - return null; + return result = args[0]; } }; }