From fd969c02ffe51dd4c98f3d5170a88d4e5b0be7d5 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 6 Jul 2023 14:01:10 +0800 Subject: [PATCH] Update msg system --- .../java/com/fongmi/android/tv/Updater.java | 4 ++-- .../android/tv/ui/activity/HomeActivity.java | 8 ++++---- .../android/tv/ui/activity/KeepActivity.java | 4 ++-- .../tv/ui/activity/SettingActivity.java | 4 ++-- .../com/fongmi/android/tv/api/ApiConfig.java | 20 +++++++------------ .../com/fongmi/android/tv/api/LiveConfig.java | 3 ++- .../com/fongmi/android/tv/api/WallConfig.java | 3 ++- .../com/fongmi/android/tv/impl/Callback.java | 2 +- .../server/process/ActionRequestProcess.java | 8 ++++---- .../com/fongmi/android/tv/utils/Download.java | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 4 ++-- app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- .../java/com/fongmi/android/tv/Updater.java | 4 ++-- .../android/tv/ui/activity/KeepActivity.java | 4 ++-- .../android/tv/ui/activity/MainActivity.java | 4 ++-- .../tv/ui/custom/dialog/ReceiveDialog.java | 4 ++-- .../tv/ui/fragment/SettingFragment.java | 4 ++-- 18 files changed, 43 insertions(+), 47 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/Updater.java b/app/src/leanback/java/com/fongmi/android/tv/Updater.java index a0ec44c86..ba5acc5e1 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Updater.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Updater.java @@ -128,8 +128,8 @@ public class Updater implements Download.Callback { } @Override - public void error(String message) { - Notify.show(message); + public void error(String msg) { + Notify.show(msg); dismiss(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index af38e4093..161992e2f 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -152,10 +152,10 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen } @Override - public void error(int resId) { + public void error(String msg) { mBinding.progressLayout.showContent(); result = Result.empty(); - Notify.show(resId); + Notify.show(msg); setFocus(); } }; @@ -353,8 +353,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); } }; } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java index c20a4582c..7f1804c0e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java @@ -63,8 +63,8 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); } }); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index 208eb52c4..9b1e98e04 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -158,8 +158,8 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); setConfig(); } }; diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java index 234bec70f..076917692 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java @@ -11,6 +11,7 @@ import com.fongmi.android.tv.bean.Rule; import com.fongmi.android.tv.bean.Site; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.utils.Json; +import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Utils; import com.github.catvod.bean.Doh; import com.github.catvod.crawler.Spider; @@ -123,30 +124,23 @@ public class ApiConfig { } public void load(Callback callback) { - load(false, callback); - } - - public void load(boolean cache, Callback callback) { - new Thread(() -> { - if (cache) loadCache(callback); - else loadConfig(callback); - }).start(); + new Thread(() -> loadConfig(callback)).start(); } private void loadConfig(Callback callback) { try { checkJson(JsonParser.parseString(Decoder.getJson(config.getUrl())).getAsJsonObject(), callback); } catch (Exception e) { - if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(0)); - else loadCache(callback); + if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error("")); + else loadCache(callback, e); LiveConfig.get().load(); e.printStackTrace(); } } - private void loadCache(Callback callback) { + private void loadCache(Callback callback, Exception e) { if (!TextUtils.isEmpty(config.getJson())) checkJson(JsonParser.parseString(config.getJson()).getAsJsonObject(), callback); - else App.post(() -> callback.error(R.string.error_config_get)); + else App.post(() -> callback.error(ResUtil.getString(R.string.error_config_get, e.getMessage()))); } private void checkJson(JsonObject object, Callback callback) { @@ -177,7 +171,7 @@ public class ApiConfig { App.post(callback::success); } catch (Throwable e) { e.printStackTrace(); - App.post(() -> callback.error(R.string.error_config_parse)); + App.post(() -> callback.error(ResUtil.getString(R.string.error_config_parse, e.getMessage()))); } } diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java index 77f37c99b..a6f2ebe93 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java @@ -15,6 +15,7 @@ import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.utils.Json; import com.fongmi.android.tv.utils.Prefers; +import com.fongmi.android.tv.utils.ResUtil; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -97,7 +98,7 @@ public class LiveConfig { parseConfig(Decoder.getJson(config.getUrl()), callback); } catch (Exception e) { e.printStackTrace(); - App.post(() -> callback.error(TextUtils.isEmpty(config.getUrl()) ? 0 : R.string.error_config_get)); + App.post(() -> callback.error(TextUtils.isEmpty(config.getUrl()) ? "" : ResUtil.getString(R.string.error_config_get, e.getMessage()))); } } diff --git a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java index 97b3d3a50..013c54e11 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java @@ -11,6 +11,7 @@ import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.utils.FileUtil; import com.fongmi.android.tv.utils.ImgUtil; import com.fongmi.android.tv.utils.Prefers; +import com.fongmi.android.tv.utils.ResUtil; import com.github.catvod.net.OkHttp; import java.io.File; @@ -84,7 +85,7 @@ public class WallConfig { App.post(callback::success); config.update(); } catch (Exception e) { - App.post(() -> callback.error(R.string.error_config_parse)); + App.post(() -> callback.error(ResUtil.getString(R.string.error_config_parse, e.getMessage()))); config(Config.find(ApiConfig.get().getWall(), 2)); e.printStackTrace(); } diff --git a/app/src/main/java/com/fongmi/android/tv/impl/Callback.java b/app/src/main/java/com/fongmi/android/tv/impl/Callback.java index 10349a4e9..a42f8958a 100644 --- a/app/src/main/java/com/fongmi/android/tv/impl/Callback.java +++ b/app/src/main/java/com/fongmi/android/tv/impl/Callback.java @@ -16,7 +16,7 @@ public class Callback implements okhttp3.Callback { public void success(String result) { } - public void error(@StringRes int resId) { + public void error(String msg) { } @Override diff --git a/app/src/main/java/com/fongmi/android/tv/server/process/ActionRequestProcess.java b/app/src/main/java/com/fongmi/android/tv/server/process/ActionRequestProcess.java index 1cad4dd14..4d6629f36 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/process/ActionRequestProcess.java +++ b/app/src/main/java/com/fongmi/android/tv/server/process/ActionRequestProcess.java @@ -139,8 +139,8 @@ public class ActionRequestProcess implements RequestProcess { } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); } }; } @@ -168,8 +168,8 @@ public class ActionRequestProcess implements RequestProcess { } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); } }; } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Download.java b/app/src/main/java/com/fongmi/android/tv/utils/Download.java index 514f54046..7c2558c75 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Download.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Download.java @@ -60,7 +60,7 @@ public class Download { void progress(int progress); - void error(String message); + void error(String msg); void success(File file); } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2dd3b3dc7..7af375ee0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -90,8 +90,8 @@ 请输入地址… - 配置取得失败 - 配置解析失败 + 配置取得失败\n%s + 配置解析失败\n%s 已经是最后一集了！ 已经是第一集了！ 播放地址解析失败 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2d89ee169..b94d453d0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -90,8 +90,8 @@ 請輸入網址… - 配置取得失敗 - 配置解析失敗 + 配置取得失敗\n%s + 配置解析失敗\n%s 已經是最後一集了！ 已經是第一集了！ 播放網址解析失敗 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d0ce2592c..63b5a083d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,8 +90,8 @@ Please enter the url… - Configuration get failed - Configuration parse failed + Configuration get failed\n%s + Configuration parse failed\n%s It\'s the last episode! It\'s the first episode! Unable to parse url diff --git a/app/src/mobile/java/com/fongmi/android/tv/Updater.java b/app/src/mobile/java/com/fongmi/android/tv/Updater.java index 1fae366b0..a51465336 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Updater.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Updater.java @@ -128,8 +128,8 @@ public class Updater implements Download.Callback { } @Override - public void error(String message) { - Notify.show(message); + public void error(String msg) { + Notify.show(msg); dismiss(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java index 4dbceb152..4e686deac 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java @@ -88,8 +88,8 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); } }); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index 20558a6a7..8b924078c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -96,10 +96,10 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt } @Override - public void error(int resId) { + public void error(String msg) { RefreshEvent.config(); RefreshEvent.empty(); - Notify.show(resId); + Notify.show(msg); } }; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java index 936c8a181..09f0a7553 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java @@ -90,8 +90,8 @@ public class ReceiveDialog extends BaseDialog { } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); hideProgress(); } }; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index ebf324aa3..149cfb59c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -164,8 +164,8 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit } @Override - public void error(int resId) { - Notify.show(resId); + public void error(String msg) { + Notify.show(msg); setConfig(); } };