Update msg system

2 years ago · fd969c02ff
parent 7255ecb834
commit fd969c02ff
18 changed files with 43 additions and 47 deletions
--- 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();
    }

--- 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);
            }
        };
    }
--- 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);
            }
        });
    }
--- 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();
            }
        };
--- 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())));
        }
    }

--- 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())));
        }
    }

--- 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();
        }
--- 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
--- 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);
            }
        };
    }
--- 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);
    }
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -90,8 +90,8 @@
    <string name="dialog_config_url">请输入地址…</string>

    <!-- Error -->
-    <string name="error_config_get">配置取得失败</string>
-    <string name="error_config_parse">配置解析失败</string>
+    <string name="error_config_get">配置取得失败\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="error_config_parse">配置解析失败\n<xliff:g name="name">%s</xliff:g></string>
    <string name="error_play_next">已经是最后一集了！</string>
    <string name="error_play_prev">已经是第一集了！</string>
    <string name="error_play_parse">播放地址解析失败</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -90,8 +90,8 @@
    <string name="dialog_config_url">請輸入網址…</string>

    <!-- Error -->
-    <string name="error_config_get">配置取得失敗</string>
-    <string name="error_config_parse">配置解析失敗</string>
+    <string name="error_config_get">配置取得失敗\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="error_config_parse">配置解析失敗\n<xliff:g name="name">%s</xliff:g></string>
    <string name="error_play_next">已經是最後一集了！</string>
    <string name="error_play_prev">已經是第一集了！</string>
    <string name="error_play_parse">播放網址解析失敗</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -90,8 +90,8 @@
    <string name="dialog_config_url">Please enter the url…</string>

    <!-- Error -->
-    <string name="error_config_get">Configuration get failed</string>
-    <string name="error_config_parse">Configuration parse failed</string>
+    <string name="error_config_get">Configuration get failed\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="error_config_parse">Configuration parse failed\n<xliff:g name="name">%s</xliff:g></string>
    <string name="error_play_next">It\'s the last episode!</string>
    <string name="error_play_prev">It\'s the first episode!</string>
    <string name="error_play_parse">Unable to parse url</string>
--- 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();
    }

--- 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);
            }
        });
    }
--- 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);
            }
        };
    }
--- 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();
            }
        };
--- 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();
            }
        };