fix last commit

pull/144/head
jun 9 months ago
parent ac37b135f2
commit 2bb0732ff7
  1. 19
      app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
  2. 20
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  3. 20
      app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
  4. 18
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  5. 8
      app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java

@ -1029,9 +1029,22 @@ public class VodController extends BaseController {
return super.onTouchEvent(e);
}
private final Handler mmHandler = new Handler();
private Runnable mLongPressRunnable;
private static final long LONG_PRESS_DELAY = 800;
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (isBottomVisible()) return super.onKeyDown(keyCode, event);
if ((keyCode == KeyEvent.KEYCODE_DPAD_UP) && event.getRepeatCount() == 0) {
speedPlayStart();
mLongPressRunnable = new Runnable() {
@Override
public void run() {
speedPlayStart();
}
};
mmHandler.postDelayed(mLongPressRunnable, LONG_PRESS_DELAY);
return true;
}
return super.onKeyDown(keyCode, event);
}
@ -1039,6 +1052,10 @@ public class VodController extends BaseController {
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {
if (mLongPressRunnable != null) {
mmHandler.removeCallbacks(mLongPressRunnable);
mLongPressRunnable = null;
}
speedPlayEnd();
}
return super.onKeyUp(keyCode, event);

@ -996,6 +996,26 @@ public class DetailActivity extends BaseActivity {
return super.dispatchKeyEvent(event);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (event != null && playFragment != null && fullWindows) {
if (playFragment.onKeyDown(keyCode,event)) {
return true;
}
}
return super.onKeyDown(keyCode, event);
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (event != null && playFragment != null && fullWindows) {
if (playFragment.onKeyUp(keyCode,event)) {
return true;
}
}
return super.onKeyUp(keyCode, event);
}
// preview
VodInfo previewVodInfo = null;
boolean fullWindows = false;

@ -779,6 +779,26 @@ public class PlayActivity extends BaseActivity {
return super.dispatchKeyEvent(event);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (event != null ) {
if (mController.onKeyDown(keyCode,event)) {
return true;
}
}
return super.onKeyDown(keyCode, event);
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (event != null ) {
if (mController.onKeyUp(keyCode,event)) {
return true;
}
}
return super.onKeyUp(keyCode, event);
}
@Override
protected void onResume() {
super.onResume();

@ -803,6 +803,24 @@ public class PlayFragment extends BaseLazyFragment {
return false;
}
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (event !=null) {
if (mController.onKeyDown(keyCode,event)) {
return true;
}
}
return false;
}
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (event !=null) {
if (mController.onKeyUp(keyCode,event)) {
return true;
}
}
return false;
}
@Override
public void onPause() {
super.onPause();

@ -88,11 +88,11 @@ public class SourceViewModel extends ViewModel {
public static final ExecutorService spThreadPool = Executors.newSingleThreadExecutor();
//homeContent缓存,最多存储5个sourceKey的AbsSortXml对象
private static final Map<String, AbsSortXml> sortCache = new LinkedHashMap<String, AbsSortXml>(5, 0.75f, true) {
//homeContent缓存,最多存储10个sourceKey的AbsSortXml对象
private static final Map<String, AbsSortXml> sortCache = new LinkedHashMap<String, AbsSortXml>(10, 0.75f, true) {
@Override
protected boolean removeEldestEntry(Map.Entry<String, AbsSortXml> eldest) {
return size() > 5;
return size() > 10;
}
};
@ -550,7 +550,7 @@ public class SourceViewModel extends ViewModel {
String json = null;
try {
json = future.get(8, TimeUnit.SECONDS);
json = future.get(10, TimeUnit.SECONDS);
LOG.i("echo--getDetail--result:" + json);
} catch (TimeoutException e) {
LOG.i("echo--getDetail--timeout");

Loading…
Cancel
Save