diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 25d2210ee..233fa2cf6 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -614,11 +614,11 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mBinding.widget.name.setMaxEms(48); mChannel.loadLogo(mBinding.widget.logo); mBinding.widget.title.setSelected(true); + mBinding.widget.line.setText(mChannel.getLine()); mBinding.widget.name.setText(mChannel.getShow()); mBinding.widget.title.setText(mChannel.getShow()); - mBinding.widget.line.setText(mChannel.getLineText()); + mBinding.control.line.setText(mChannel.getLine()); mBinding.widget.number.setText(mChannel.getNumber()); - mBinding.control.line.setText(mChannel.getLineText()); mBinding.widget.line.setVisibility(mChannel.getLineVisible()); mBinding.control.line.setVisibility(mChannel.getLineVisible()); } 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 c0e1650ef..ef7e33962 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 @@ -297,7 +297,7 @@ public class Channel { return !getCatchup().isEmpty(); } - public String getLineText() { + public String getLine() { if (getUrls().size() <= 1) return ""; String[] sp = getUrls().get(getIndex()).split("\\$"); if (sp.length > 1 && !sp[1].isEmpty()) return sp[1]; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index d2c0911db..bc26425a3 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -637,10 +637,10 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener mBinding.widget.name.setMaxEms(48); mChannel.loadLogo(mBinding.widget.logo); mBinding.control.title.setSelected(true); + mBinding.widget.line.setText(mChannel.getLine()); mBinding.widget.name.setText(mChannel.getShow()); mBinding.control.title.setText(mChannel.getShow()); mBinding.widget.namePip.setText(mChannel.getShow()); - mBinding.widget.line.setText(mChannel.getLineText()); mBinding.widget.number.setText(mChannel.getNumber()); mBinding.widget.numberPip.setText(mChannel.getNumber()); mBinding.widget.line.setVisibility(mChannel.getLineVisible());