diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java index 8a664d07f..e8a6e0e28 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java @@ -31,7 +31,7 @@ public class Sub { if (path.startsWith("http")) { return http(path); } else { - return file(Path.utf8(Path.local(path))); + return file(Path.local(path)); } } diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index 548755fe4..b909ca49d 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -195,6 +195,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, ParseCal public void setSub(Sub sub) { this.sub = sub; if (isIjk()) return; + setPosition(getPosition()); setMediaSource(); } 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 7ced5cb5c..c414ffce8 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Path.java +++ b/catvod/src/main/java/com/github/catvod/utils/Path.java @@ -201,10 +201,6 @@ public class Path { } } - public static File utf8(File file) { - return write(cache(file.getName()), Util.utf8(readToByte(file))); - } - public static void move(File in, File out) { copy(in, out); clear(in); diff --git a/catvod/src/main/java/com/github/catvod/utils/Util.java b/catvod/src/main/java/com/github/catvod/utils/Util.java index 9d7c86254..0220732c1 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Util.java +++ b/catvod/src/main/java/com/github/catvod/utils/Util.java @@ -8,8 +8,6 @@ import android.util.Base64; import com.github.catvod.Init; -import org.mozilla.universalchardet.UniversalDetector; - import java.io.File; import java.io.FileInputStream; import java.math.BigInteger; @@ -17,7 +15,6 @@ import java.net.Inet4Address; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; -import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Enumeration; @@ -68,17 +65,6 @@ public class Util { return md5(Path.jar(name)).equalsIgnoreCase(md5); } - public static byte[] utf8(byte[] bytes) { - try { - UniversalDetector detector = new UniversalDetector(null); - detector.handleData(bytes, 0, bytes.length); - detector.dataEnd(); - return new String(bytes, detector.getDetectedCharset()).getBytes(StandardCharsets.UTF_8); - } catch (Exception e) { - return bytes; - } - } - public static String md5(String src) { try { if (TextUtils.isEmpty(src)) return "";