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 2bce04819..685374b77 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Util.java +++ b/catvod/src/main/java/com/github/catvod/utils/Util.java @@ -14,14 +14,12 @@ import java.io.FileInputStream; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.Formatter; public class Util { public static final String CHROME = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"; - public static final String[] UNITS = new String[]{"bytes", "KB", "MB", "GB", "TB"}; public static String getDeviceId() { return Settings.Secure.getString(Init.context().getContentResolver(), Settings.Secure.ANDROID_ID); @@ -145,10 +143,4 @@ public class Util { if (key.equalsIgnoreCase(HttpHeaders.COOKIE)) return HttpHeaders.COOKIE; return key; } - - public static String size(long size) { - if (size <= 0) return ""; - int group = (int) (Math.log10(size) / Math.log10(1024)); - return "[" + new DecimalFormat("###0.#").format(size / Math.pow(1024, group)) + " " + UNITS[group] + "] "; - } } diff --git a/thunder/src/main/java/com/xunlei/downloadlib/Util.java b/thunder/src/main/java/com/xunlei/downloadlib/Util.java index 8f182c7e7..5d366ee66 100644 --- a/thunder/src/main/java/com/xunlei/downloadlib/Util.java +++ b/thunder/src/main/java/com/xunlei/downloadlib/Util.java @@ -1,5 +1,6 @@ package com.xunlei.downloadlib; +import java.text.DecimalFormat; import java.util.Arrays; import java.util.List; @@ -7,9 +8,16 @@ public class Util { private static final List VIDEO = Arrays.asList("avi", "flv", "mkv", "mov", "mp4", "mpeg", "mpe", "mpg", "wmv"); private static final List AUDIO = Arrays.asList("aac", "ape", "flac", "mp3", "m4a", "ogg"); + private static final String[] UNITS = new String[]{"bytes", "KB", "MB", "GB", "TB"}; private static final long MINIMAL = 30 * 1024 * 1024; public static boolean isMedia(String ext, long size) { return (VIDEO.contains(ext) || AUDIO.contains(ext)) && size > MINIMAL; } + + public static String size(long size) { + if (size <= 0) return ""; + int group = (int) (Math.log10(size) / Math.log10(1024)); + return "[" + new DecimalFormat("###0.#").format(size / Math.pow(1024, group)) + " " + UNITS[group] + "] "; + } } diff --git a/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java b/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java index 9601611e9..73dccb7c4 100644 --- a/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java +++ b/thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java @@ -2,7 +2,7 @@ package com.xunlei.downloadlib.parameter; import android.text.TextUtils; -import com.github.catvod.utils.Util; +import com.xunlei.downloadlib.Util; import java.io.File; import java.util.Collections;