diff --git a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java index 3cf1fb2b6..e6ee6d18a 100644 --- a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java +++ b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java @@ -9,39 +9,33 @@ public class ErrorEvent { private final Type type; private String msg; - private int code; public static void url() { - EventBus.getDefault().post(new ErrorEvent(Type.URL, -1)); - } - - public static void url(int code) { - EventBus.getDefault().post(new ErrorEvent(Type.URL, code)); + EventBus.getDefault().post(new ErrorEvent(Type.URL)); } public static void drm() { - EventBus.getDefault().post(new ErrorEvent(Type.DRM, -1)); + EventBus.getDefault().post(new ErrorEvent(Type.DRM)); } public static void flag() { - EventBus.getDefault().post(new ErrorEvent(Type.FLAG, -1)); + EventBus.getDefault().post(new ErrorEvent(Type.FLAG)); } public static void parse() { - EventBus.getDefault().post(new ErrorEvent(Type.PARSE, -1)); + EventBus.getDefault().post(new ErrorEvent(Type.PARSE)); } public static void timeout() { - EventBus.getDefault().post(new ErrorEvent(Type.TIMEOUT, -1)); + EventBus.getDefault().post(new ErrorEvent(Type.TIMEOUT)); } public static void extract(String msg) { EventBus.getDefault().post(new ErrorEvent(Type.EXTRACT, msg)); } - public ErrorEvent(Type type, int code) { + public ErrorEvent(Type type) { this.type = type; - this.code = code; } public ErrorEvent(Type type, String msg) { @@ -53,16 +47,8 @@ public class ErrorEvent { return type; } - public int getCode() { - return code; - } - - public boolean isExo() { - return code / 1000 == 2 || code / 1000 == 3 || code / 1000 == 4; - } - public String getMsg() { - if (type == Type.URL) return ResUtil.getString(code == -1 ? R.string.error_play_url : R.string.error_play_url_code, code); + if (type == Type.URL) return ResUtil.getString(R.string.error_play_url); if (type == Type.DRM) return ResUtil.getString(R.string.error_play_drm_scheme); if (type == Type.FLAG) return ResUtil.getString(R.string.error_play_flag); if (type == Type.PARSE) return ResUtil.getString(R.string.error_play_parse); diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e32b3a568..0b9ae20a6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -119,7 +119,6 @@ 已经是第一集了! 播放地址解析失败 此设备不支持所需的 DRM scheme - 播放地址加载失败\n错误代码:%s 错误代码:%s 播放地址加载失败 暂无线路数据 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b756a8752..2d328fe83 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -119,7 +119,6 @@ 已經是第一集了! 播放網址解析失敗 本設備不支援所需的 DRM scheme - 播放網址載入失敗\n錯誤代碼:%s 錯誤代碼:%s 播放網址載入失敗 暫無線路資料 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 475c45ba9..392540e4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -120,7 +120,6 @@ It\'s the first episode! Unable to parse url This device does not support the required DRM scheme - Unable to load url\nError code: %s Error code: %s Unable to load url No flag data