diff --git a/app/src/main/java/com/fongmi/android/tv/Constant.java b/app/src/main/java/com/fongmi/android/tv/Constant.java new file mode 100644 index 000000000..5f70de988 --- /dev/null +++ b/app/src/main/java/com/fongmi/android/tv/Constant.java @@ -0,0 +1,18 @@ +package com.fongmi.android.tv; + +public class Constant { + + public static final String PROXY = "https://ghproxy.com/"; + public static final String REPO = "https://raw.githubusercontent.com/FongMi/TV/"; + public static final String RELEASE = "release"; + public static final String KITKAT = "kitkat"; + public static final String DEV = "dev"; + + public static String getReleasePath(String path) { + return PROXY + REPO + RELEASE + path; + } + + public static String getBranchPath(String branch, String path) { + return PROXY + REPO + branch + path; + } +} diff --git a/app/src/main/java/com/fongmi/android/tv/api/Updater.java b/app/src/main/java/com/fongmi/android/tv/api/Updater.java index 830e733d9..1e81fbadd 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/Updater.java +++ b/app/src/main/java/com/fongmi/android/tv/api/Updater.java @@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog; import com.fongmi.android.tv.App; import com.fongmi.android.tv.BuildConfig; +import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.R; import com.fongmi.android.tv.databinding.DialogUpdateBinding; import com.fongmi.android.tv.net.OKHttp; @@ -43,20 +44,16 @@ public class Updater implements View.OnClickListener { return FileUtil.getCacheFile(branch + ".apk"); } - private String getPath() { - return "https://raw.githubusercontent.com/FongMi/TV/" + branch + "/release/"; - } - private String getJson() { - return "https://ghproxy.com/" + getPath() + BuildConfig.FLAVOR_mode + "-" + branch + ".json"; + return Constant.getBranchPath(branch, "/release/" + BuildConfig.FLAVOR_mode + "-" + branch + ".json"); } private String getApk() { - return "https://ghproxy.com/" + getPath() + BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + ".apk"; + return Constant.getBranchPath("/release/", BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + ".apk"); } private Updater() { - this.branch = "release"; + this.branch = Constant.RELEASE; } public Updater reset() { @@ -123,7 +120,7 @@ public class Updater implements View.OnClickListener { private void dismiss() { if (dialog != null) dialog.dismiss(); - this.branch = "release"; + this.branch = Constant.RELEASE; this.force = false; this.md5 = null; } diff --git a/app/src/main/java/com/fongmi/android/tv/player/source/Force.java b/app/src/main/java/com/fongmi/android/tv/player/source/Force.java index 67b2e8c13..c7bc58c15 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/source/Force.java +++ b/app/src/main/java/com/fongmi/android/tv/player/source/Force.java @@ -9,6 +9,7 @@ import android.os.IBinder; import android.os.SystemClock; import com.fongmi.android.tv.App; +import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.net.OKHttp; import com.fongmi.android.tv.utils.FileUtil; import com.forcetech.Port; @@ -37,7 +38,7 @@ public class Force { private void check() throws Exception { File file = FileUtil.getCacheFile("libmitv.so"); - String url = "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/TV/release/other/so/libmitv.so"; + String url = Constant.getReleasePath("/other/so/libmitv.so"); if (!file.exists()) FileUtil.write(file, OKHttp.newCall(url).execute().body().bytes()); }