diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
index af762725d..f51815d6f 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
@@ -91,7 +91,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List
@Override
protected void initView() {
bindService(new Intent(this, DLNARendererService.class), this, Context.BIND_AUTO_CREATE);
- mClock = Clock.create(mBinding.widget.time);
+ mClock = Clock.create(mBinding.widget.clock);
mKeyDown = CustomKeyDownCast.create(this);
mPlayers = new Players().init(this);
mParser = new DIDLParser();
diff --git 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
index 32c8a0057..8fe5e14ae 100644
--- 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
@@ -101,7 +101,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@Override
protected void initView() {
DLNARendererService.Companion.start(this, R.drawable.ic_logo);
- mClock = Clock.create(mBinding.time).format("MM/dd HH:mm:ss");
+ mClock = Clock.create(mBinding.clock).format("MM/dd HH:mm:ss");
mBinding.progressLayout.showProgress();
Updater.get().release().start(this);
mResult = Result.empty();
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 f8cd3d441..99099d91a 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
@@ -139,7 +139,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override
protected void initView() {
- mClock = Clock.create(mBinding.widget.time);
+ mClock = Clock.create(mBinding.widget.clock);
mKeyDown = CustomKeyDownLive.create(this);
mPlayers = new Players().init(this);
mHides = new ArrayList<>();
@@ -822,14 +822,14 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
}
private void prevLine() {
- if (mChannel == null) return;
+ if (mChannel == null || mChannel.isOnly()) return;
mChannel.prevLine();
showInfo();
fetch();
}
private void nextLine(boolean show) {
- if (mChannel == null) return;
+ if (mChannel == null || mChannel.isOnly()) return;
mChannel.nextLine();
if (show) showInfo();
else setInfo();
@@ -838,6 +838,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
private void seekTo(int time) {
mPlayers.seekTo(time);
+ mKeyDown.resetTime();
showProgress();
hideCenter();
}
@@ -907,7 +908,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override
public void onSeeking(int time) {
- if (!mPlayers.isVod() || !mChannel.isOnly()) return;
+ if (!mPlayers.isVod()) return;
mBinding.widget.exoDuration.setText(mPlayers.getDurationTime());
mBinding.widget.exoPosition.setText(mPlayers.getPositionTime(time));
mBinding.widget.action.setImageResource(time > 0 ? R.drawable.ic_widget_forward : R.drawable.ic_widget_rewind);
@@ -927,18 +928,14 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override
public void onKeyLeft(int time) {
- if (mChannel == null) return;
- if (mChannel.isOnly() && mPlayers.isVod()) App.post(() -> seekTo(time), 250);
- else if (!mChannel.isOnly()) prevLine();
- mKeyDown.resetTime();
+ if (!mPlayers.isVod()) prevLine();
+ else App.post(() -> seekTo(time), 250);
}
@Override
public void onKeyRight(int time) {
- if (mChannel == null) return;
- if (mChannel.isOnly() && mPlayers.isVod()) App.post(() -> seekTo(time), 250);
- else if (!mChannel.isOnly()) nextLine(true);
- mKeyDown.resetTime();
+ if (!mPlayers.isVod()) nextLine(true);
+ else App.post(() -> seekTo(time), 250);
}
@Override
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 890998b8d..a93a967a2 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -292,7 +292,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
@Override
protected void initView() {
mFrameParams = mBinding.video.getLayoutParams();
- mClock = Clock.create(mBinding.widget.time);
+ mClock = Clock.create(mBinding.widget.clock);
mKeyDown = CustomKeyDownVod.create(this);
mPlayers = new Players().init(this);
mBroken = new ArrayList<>();
@@ -1416,8 +1416,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
@Override
public void onSeekTo(int time) {
- mKeyDown.resetTime();
mPlayers.seekTo(time);
+ mKeyDown.resetTime();
showProgress();
onPlay();
}
diff --git a/app/src/leanback/res/layout/activity_home.xml b/app/src/leanback/res/layout/activity_home.xml
index 4a9183ed5..66eb1eb02 100644
--- a/app/src/leanback/res/layout/activity_home.xml
+++ b/app/src/leanback/res/layout/activity_home.xml
@@ -46,7 +46,7 @@