diff --git a/app/src/main/java/com/fongmi/android/tv/Github.java b/app/src/main/java/com/fongmi/android/tv/Github.java index be62a2b4e..4779045a1 100644 --- a/app/src/main/java/com/fongmi/android/tv/Github.java +++ b/app/src/main/java/com/fongmi/android/tv/Github.java @@ -15,6 +15,7 @@ public class Github { public static final String C = "https://raw.iqiq.io/"; public static final String REPO = "FongMi/TV/"; public static final String RELEASE = "release"; + public static final String DEV = "dev"; public static final int TIME = 5; private String proxy; 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 a4228b95e..493ca9338 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 @@ -78,14 +78,17 @@ public class Updater { App.execute(this::doInBackground); } + private boolean need(int code, String name) { + return (branch.equals(Github.DEV) ? !name.equals(BuildConfig.VERSION_NAME) : code > BuildConfig.VERSION_CODE) && Prefers.getUpdate(); + } + private void doInBackground() { try { JSONObject object = new JSONObject(OkHttp.newCall(getJson()).execute().body().string()); String name = object.optString("name"); String desc = object.optString("desc"); int code = object.optInt("code"); - boolean need = code > BuildConfig.VERSION_CODE && Prefers.getUpdate(); - if (need || force) App.post(() -> show(name, desc)); + if (need(code, name) || force) App.post(() -> show(name, desc)); } catch (Exception e) { e.printStackTrace(); }