From 48db76ef36b5fa7ba9d74231a56cdcd65a042bba Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 13 Dec 2023 22:58:29 +0800
Subject: [PATCH] Fix bug

---
 .../java/com/fongmi/android/tv/server/Nano.java     |  9 ++++-----
 .../java/com/fongmi/android/tv/server/Server.java   | 13 ++++---------
 2 files changed, 8 insertions(+), 14 deletions(-)

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 f075f1fa8..3a6f66b1c 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
@@ -10,6 +10,7 @@ import com.fongmi.android.tv.server.process.Local;
 import com.fongmi.android.tv.server.process.Process;
 import com.fongmi.android.tv.utils.M3U8;
 import com.github.catvod.Init;
+import com.github.catvod.net.OkHttp;
 import com.google.common.net.HttpHeaders;
 
 import java.io.ByteArrayInputStream;
@@ -69,7 +70,7 @@ public class Nano extends NanoHTTPD {
         Map<String, String> files = new HashMap<>();
         if (session.getMethod() == Method.POST) parse(session, files);
         if (url.contains("?")) url = url.substring(0, url.indexOf('?'));
-        if (url.startsWith("/go")) return go(session);
+        if (url.startsWith("/go")) return go();
         if (url.startsWith("/m3u8")) return m3u8(session);
         if (url.startsWith("/proxy")) return proxy(session);
         if (url.startsWith("/tvbus")) return success(LiveConfig.getResp());
@@ -92,10 +93,8 @@ public class Nano extends NanoHTTPD {
         }
     }
 
-    private Response go(IHTTPSession session) {
-        String action = session.getParms().get("action");
-        if ("start".equals(action)) Server.get().startGo();
-        else if ("stop".equals(action)) Server.get().stopGo();
+    private Response go() {
+        if (OkHttp.string("http://127.0.0.1:7777").isEmpty()) Server.get().go();
         return success();
     }
 
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 daf99b31b..4768028ae 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
@@ -1,5 +1,6 @@
 package com.fongmi.android.tv.server;
 
+import com.fongmi.android.tv.App;
 import com.github.catvod.Proxy;
 import com.github.catvod.utils.Util;
 
@@ -40,16 +41,10 @@ public class Server {
         return "http://" + (local ? "127.0.0.1" : Util.getIp()) + ":" + getPort();
     }
 
-    public void startGo() {
-        if (proxy != null) return;
+    public void go() {
+        if (proxy != null) proxy.stop();
         proxy = Go_proxy_video.newGoVideoProxy();
-        proxy.start();
-    }
-
-    public void stopGo() {
-        if (proxy == null) return;
-        proxy.stop();
-        proxy = null;
+        App.execute(() -> proxy.start());
     }
 
     public void start() {