pull/123/head
FongMi 3 years ago
parent 66a9a4144c
commit 615e5ecdbf
  1. 1
      app/src/leanback/res/layout/view_controller_live.xml
  2. 1
      app/src/leanback/res/layout/view_widget_live.xml
  3. 2
      app/src/main/java/com/fongmi/android/tv/bean/Channel.java
  4. 4
      app/src/main/java/com/fongmi/android/tv/bean/Epg.java
  5. 1
      app/src/main/res/values-zh-rCN/strings.xml
  6. 1
      app/src/main/res/values-zh-rTW/strings.xml
  7. 1
      app/src/main/res/values/strings.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"

@ -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"

@ -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) {

@ -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 "";
}
}

@ -13,7 +13,6 @@
<!-- Live -->
<string name="live_pass">密码</string>
<string name="live_setting">设定</string>
<string name="live_epg_empty">暂无节目资讯</string>
<string name="live_epg_now">正在播放:<xliff:g name="name">%s</xliff:g></string>
<string name="live_line">线路 <xliff:g name="name">%s</xliff:g></string>

@ -13,7 +13,6 @@
<!-- Live -->
<string name="live_pass">密碼</string>
<string name="live_setting">設定</string>
<string name="live_epg_empty">暫無頻道資訊</string>
<string name="live_epg_now">正在播放:<xliff:g name="name">%s</xliff:g></string>
<string name="live_line">來源 <xliff:g name="name">%s</xliff:g></string>

@ -13,7 +13,6 @@
<!-- Live -->
<string name="live_pass">Pass</string>
<string name="live_setting">Setting</string>
<string name="live_epg_empty">No schedule</string>
<string name="live_epg_now">Playing: <xliff:g name="name">%s</xliff:g></string>
<string name="live_line">Line <xliff:g name="name">%s</xliff:g></string>

Loading…
Cancel
Save