diff --git a/app/src/leanback/res/layout/view_controller_live.xml b/app/src/leanback/res/layout/view_controller_live.xml
index a727e36d0..085c3bc9d 100644
--- a/app/src/leanback/res/layout/view_controller_live.xml
+++ b/app/src/leanback/res/layout/view_controller_live.xml
@@ -53,7 +53,6 @@
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:singleLine="true"
- android:text="@string/live_epg_empty"
android:textColor="@color/grey_700"
android:textSize="16sp"
android:textStyle="bold"
diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml
index 5910adc61..c6f90891a 100644
--- a/app/src/leanback/res/layout/view_widget_live.xml
+++ b/app/src/leanback/res/layout/view_widget_live.xml
@@ -70,7 +70,6 @@
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:singleLine="true"
- android:text="@string/live_epg_empty"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java
index 5f5d0d6d4..a20c74643 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java
@@ -181,7 +181,7 @@ public class Channel {
}
public String getLineText() {
- return ResUtil.getString(R.string.live_line, getLine() + 1, getUrls().size());
+ return getUrls().size() == 1 ? "" : ResUtil.getString(R.string.live_line, getLine() + 1);
}
public Channel setNumber(int number) {
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Epg.java b/app/src/main/java/com/fongmi/android/tv/bean/Epg.java
index 64d65b2af..411a98731 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Epg.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Epg.java
@@ -90,13 +90,13 @@ public class Epg {
}
private String format() {
- if (getTitle().isEmpty()) return ResUtil.getString(R.string.live_epg_empty);
+ if (getTitle().isEmpty()) return "";
if (getStart().isEmpty() || getEnd().isEmpty()) return ResUtil.getString(R.string.live_epg_now, getTitle());
return getStart() + " ~ " + getEnd() + " " + getTitle();
}
public String getEpg() {
for (Epg item : getList()) if (item.isInRange()) return item.format();
- return ResUtil.getString(R.string.live_epg_empty);
+ return "";
}
}
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a0efafd55..8401d04e2 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -13,7 +13,6 @@
密码
设定
- 暂无节目资讯
正在播放:%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 693ecffde..bc0abdc18 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -13,7 +13,6 @@
密碼
設定
- 暫無頻道資訊
正在播放:%s
來源 %s
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb845dc1b..f873d1cb9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,7 +13,6 @@
Pass
Setting
- No schedule
Playing: %s
Line %s