diff --git a/app/src/main/java/com/fongmi/android/tv/server/Go.java b/app/src/main/java/com/fongmi/android/tv/server/Go.java index 0fa6aca2e..fd4c9810d 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/Go.java +++ b/app/src/main/java/com/fongmi/android/tv/server/Go.java @@ -13,7 +13,7 @@ public class Go { new Thread(() -> { File file = Path.cache(GO); if (!file.exists()) Path.copy(Path.getAsset(GO), file); - Shell.exec("chmod 777 " + file); + Shell.exec("killall -9 " + GO); Shell.exec("nohup " + file); }).start(); } 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 c493cad94..2a8d25b91 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 @@ -37,7 +37,6 @@ public class Server { } public void go() { - Go.stop(); Go.start(); } diff --git a/catvod/src/main/java/com/github/catvod/utils/Path.java b/catvod/src/main/java/com/github/catvod/utils/Path.java index 6d0abec21..71898f9f4 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Path.java +++ b/catvod/src/main/java/com/github/catvod/utils/Path.java @@ -10,7 +10,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; @@ -179,26 +178,24 @@ public class Path { public static void copy(File in, File out) { try { - copy(new FileInputStream(in), new FileOutputStream(out)); + copy(new FileInputStream(in), out); } catch (Exception ignored) { } } public static void copy(InputStream in, File out) { try { - copy(in, new FileOutputStream(out)); + int read; + byte[] buffer = new byte[8192]; + FileOutputStream fos = new FileOutputStream(out); + while ((read = in.read(buffer)) != -1) fos.write(buffer, 0, read); + fos.close(); + in.close(); + chmod(out); } catch (Exception ignored) { } } - public static void copy(InputStream in, OutputStream out) throws IOException { - int read; - byte[] buffer = new byte[8192]; - while ((read = in.read(buffer)) != -1) out.write(buffer, 0, read); - out.close(); - in.close(); - } - public static void newFile(File file) { try { file.createNewFile();