hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support auto change player

Browse Source
pull/183/head
FongMi 3 years ago
parent 0b04145d43
commit 2e8eaec189
4 changed files with 40 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 25
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  2. 17
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 17
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  4. 17
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

25
app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
Unescape View File

@ -106,8 +106,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private boolean initAuto;
private boolean autoMode;
private boolean useParse;
private int startPlayer;
private int currentFlag;
private int toggleCount;
private Runnable mR1;
private Runnable mR2;
@ -234,7 +234,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
mBroken = new ArrayList<>();
mR1 = this::hideControl;
mR2 = this::setTraffic;
setStartPlayer(-1);
setRecyclerView();
setVideoView();
setViewModel();
@ -849,11 +848,11 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
break;
case Player.STATE_READY:
stopSearch();
resetToggle();
hideProgress();
mPlayers.reset();
setDefaultTrack();
setTrackVisible(true);
setStartPlayer(mPlayers.getPlayer());
mHistory.setPlayer(mPlayers.getPlayer());
mBinding.widget.size.setText(mPlayers.getSizeText());
break;
@ -897,9 +896,11 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
}
private void checkError(ErrorEvent event) {
if (event.isFormat() && getStartPlayer() != mPlayers.getPlayer()) {
if (event.isFormat() && getToggleCount() < 3) {
toggleCount++;
onPlayer();
} else {
resetToggle();
onError(event);
}
}
@ -1067,14 +1068,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
this.useParse = useParse;
}
public int getStartPlayer() {
return startPlayer;
}
public void setStartPlayer(int startPlayer) {
this.startPlayer = startPlayer;
}
public int getCurrentFlag() {
return currentFlag;
}
@ -1083,6 +1076,14 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
this.currentFlag = currentFlag;
}
public int getToggleCount() {
return toggleCount;
}
public void resetToggle() {
this.toggleCount = 0;
}
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
if (isFullscreen() && Utils.isMenuKey(event)) onToggle();

17
app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
Unescape View File

@ -89,7 +89,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
private Runnable mR3;
private Runnable mR4;
private boolean confirm;
private int startPlayer;
private int toggleCount;
private int count;
public static void start(Activity activity) {
@ -138,7 +138,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
mKeyDown = CustomKeyDownLive.create(this);
mFormatDate = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
mFormatTime = new SimpleDateFormat("yyyy-MM-ddHH:mm", Locale.getDefault());
setStartPlayer(-1);
setRecyclerView();
setVideoView();
setViewModel();
@ -550,11 +549,11 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
showProgress();
break;
case Player.STATE_READY:
resetToggle();
hideProgress();
mPlayers.reset();
setSpeedVisible();
setTrackVisible(true);
setStartPlayer(mPlayers.getPlayer());
break;
case Player.STATE_ENDED:
nextChannel();
@ -579,9 +578,11 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
}
private void checkError(ErrorEvent event) {
if (event.isFormat() && getStartPlayer() != mPlayers.getPlayer()) {
if (event.isFormat() && getToggleCount() < 3) {
toggleCount++;
onPlayer();
} else {
resetToggle();
onError(event);
}
}
@ -645,12 +646,12 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
App.post(() -> confirm = false, 2000);
}
public int getStartPlayer() {
return startPlayer;
public int getToggleCount() {
return toggleCount;
}
public void setStartPlayer(int startPlayer) {
this.startPlayer = startPlayer;
public void resetToggle() {
this.toggleCount = 0;
}
@Override

17
app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
Unescape View File

@ -109,7 +109,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
private boolean rotate;
private boolean stop;
private boolean lock;
private int startPlayer;
private int toggleCount;
private Runnable mR1;
private Runnable mR2;
private Runnable mR3;
@ -227,7 +227,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
mR2 = this::setTraffic;
mR3 = this::setOrient;
mPiP = new PiP();
setStartPlayer(-1);
setRecyclerView();
setVideoView();
setViewModel();
@ -866,12 +865,12 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
case Player.STATE_READY:
stopSearch();
checkRotate();
resetToggle();
hideProgress();
mPlayers.reset();
setDefaultTrack();
setTrackVisible(true);
checkPlayImg(mPlayers.isPlaying());
setStartPlayer(mPlayers.getPlayer());
mHistory.setPlayer(mPlayers.getPlayer());
mBinding.control.size.setText(mPlayers.getSizeText());
if (isVisible(mBinding.control.getRoot())) showControl();
@ -924,9 +923,11 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
}
private void checkError(ErrorEvent event) {
if (event.isFormat() && getStartPlayer() != mPlayers.getPlayer()) {
if (event.isFormat() && getToggleCount() < 3) {
toggleCount++;
onPlayer();
} else {
resetToggle();
onError(event);
}
}
@ -1113,12 +1114,12 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
this.url = url;
}
public int getStartPlayer() {
return startPlayer;
public int getToggleCount() {
return toggleCount;
}
public void setStartPlayer(int startPlayer) {
this.startPlayer = startPlayer;
public void resetToggle() {
this.toggleCount = 0;
}
private void notifyItemChanged(RecyclerView.Adapter<?> adapter) {

17
app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
Unescape View File

@ -89,7 +89,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
private Runnable mR1;
private Runnable mR2;
private Runnable mR3;
private int startPlayer;
private int toggleCount;
private boolean rotate;
private boolean stop;
private boolean lock;
@ -149,7 +149,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
mR2 = this::setTraffic;
mR3 = this::hideInfo;
mPiP = new PiP();
setStartPlayer(-1);
setRecyclerView();
setVideoView();
setViewModel();
@ -575,11 +574,11 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
break;
case Player.STATE_READY:
checkRotate();
resetToggle();
hideProgress();
mPlayers.reset();
setSpeedVisible();
setTrackVisible(true);
setStartPlayer(mPlayers.getPlayer());
mPiP.update(this, mPlayers.isPlaying());
mBinding.control.size.setText(mPlayers.getSizeText());
if (isVisible(mBinding.control.getRoot())) showControl();
@ -614,9 +613,11 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
}
private void checkError(ErrorEvent event) {
if (event.isFormat() && getStartPlayer() != mPlayers.getPlayer()) {
if (event.isFormat() && getToggleCount() < 3) {
toggleCount++;
onPlayer();
} else {
resetToggle();
onError(event);
}
}
@ -729,12 +730,12 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
this.url = url;
}
public int getStartPlayer() {
return startPlayer;
public int getToggleCount() {
return toggleCount;
}
public void setStartPlayer(int startPlayer) {
this.startPlayer = startPlayer;
public void resetToggle() {
this.toggleCount = 0;
}
@Override

Write Preview
Loading…
Cancel
Save