Clean code

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")) {
+        if (params.containsKey("do") && params.get("do").equals("js")) {
-            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")) {
             return jsLoader.proxyInvoke(params);
         } else if (params.containsKey("do") && params.get("do").equals("py")) {
             return pyLoader.proxyInvoke(params);

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) {

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() {
+    public static void set(int port) {
-        if (port > 0) return;
+        Proxy.port = port;
-        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 String getUrl() {
-        tryPort();
         return "http://127.0.0.1:" + port + "/proxy";
     }
 }

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"))) {
+        if ("catvod".equals(params.get("from"))) return proxy2(params);
-            return proxy2(params);
+        else return submit(() -> proxy1(params)).get();
-        } else {
-            return submit(() -> proxy1(params)).get();
-        }
     }
 
     @Override

drpy/src/main/java/com/hiker/drpy/method/Function.java

@@ -40,8 +40,7 @@ public class Function implements Callable<Object[]> {
     private final JSCallFunction jsCallFunction = new JSCallFunction() {
         @Override
         public Object call(Object... args) {
-            result = args[0];
+            return result = args[0];
-            return null;
         }
     };
 }