From 96da84eb3d2467de422cb9615052aa4f007acfc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com> Date: Thu, 22 Sep 2022 17:53:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=8F=AF?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=8A=E6=AC=A1=E7=9C=8B=E5=88=B0=E5=93=AA?= =?UTF-8?q?=E4=B8=80=E9=9B=86=20=E9=95=BF=E6=8C=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=99=A8=20=E9=95=BF=E6=8C=89=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=A4=96=E6=8C=82=E5=AD=97=E5=B9=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../osc/player/controller/VodController.java | 50 ++++++++++++++++++- .../osc/ui/activity/HistoryActivity.java | 1 + .../tvbox/osc/ui/adapter/HistoryAdapter.java | 7 ++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java index e8c9affd..7e9835d4 100644 --- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java +++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java @@ -10,6 +10,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DiffUtil; @@ -19,6 +20,9 @@ import com.github.tvbox.osc.R; import com.github.tvbox.osc.api.ApiConfig; import com.github.tvbox.osc.bean.IJKCode; import com.github.tvbox.osc.bean.ParseBean; +import com.github.tvbox.osc.player.thirdparty.Kodi; +import com.github.tvbox.osc.player.thirdparty.MXPlayer; +import com.github.tvbox.osc.player.thirdparty.ReexPlayer; import com.github.tvbox.osc.subtitle.widget.SimpleSubtitleView; import com.github.tvbox.osc.ui.adapter.ParseAdapter; import com.github.tvbox.osc.ui.adapter.SelectDialogAdapter; @@ -340,6 +344,41 @@ public class VodController extends BaseController { @Override public void onClick(View view) { // myHandle.removeCallbacks(myRunnable); +// myHandle.postDelayed(myRunnable, myHandleSeconds); + try { + int playerType = mPlayerConfig.getInt("pl"); + boolean playerVail = false; + do { + playerType++; + if (playerType <= 2) { + playerVail = true; + } else if (playerType == 10) { + playerVail = MXPlayer.getPackageInfo() != null; + } else if (playerType == 11) { + playerVail = ReexPlayer.getPackageInfo() != null; + } else if (playerType == 12) { + playerVail = Kodi.getPackageInfo() != null; + } else if (playerType > 11) { + playerType = 0; + playerVail = true; + } + } while (!playerVail); + mPlayerConfig.put("pl", playerType); + updatePlayerCfgView(); + listener.updatePlayerCfg(); + listener.replay(false); +// hideBottom(); + } catch (JSONException e) { + e.printStackTrace(); + } + mPlayerBtn.requestFocus(); + } + }); + + mPlayerBtn.setOnLongClickListener(new OnLongClickListener() { + @Override + public boolean onLongClick(View view) { +// myHandle.removeCallbacks(myRunnable); // myHandle.postDelayed(myRunnable, myHandleSeconds); FastClickCheckUtil.check(view); try { @@ -394,6 +433,7 @@ public class VodController extends BaseController { } catch (JSONException e) { e.printStackTrace(); } + return true; } }); mPlayerIJKBtn.setOnClickListener(new OnClickListener() { @@ -495,7 +535,6 @@ public class VodController extends BaseController { } } }); - // takagen99: Add long press to reset counter mPlayerTimeSkipBtn.setOnLongClickListener(new OnLongClickListener() { @Override public boolean onLongClick(View view) { @@ -531,6 +570,15 @@ public class VodController extends BaseController { hideBottom(); } }); + mZimuBtn.setOnLongClickListener(new OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + mSubtitleView.setVisibility(View.GONE); + hideBottom(); + Toast.makeText(getContext(), "外挂字幕已关闭", Toast.LENGTH_SHORT).show(); + return true; + } + }); mAudioTrackBtn.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java index 0c834bbe..69ba0b8f 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java @@ -156,6 +156,7 @@ public class HistoryActivity extends BaseActivity { List allVodRecord = RoomDataManger.getAllVodRecord(100); List vodInfoList = new ArrayList<>(); for (VodInfo vodInfo : allVodRecord) { + if (vodInfo.playNote != null && !vodInfo.playNote.isEmpty())vodInfo.note = "上次看到" + vodInfo.playNote; vodInfoList.add(vodInfo); } historyAdapter.setNewData(vodInfoList); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java index 869dffec..b9c95b87 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java @@ -1,6 +1,7 @@ package com.github.tvbox.osc.ui.adapter; import android.text.TextUtils; +import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -62,7 +63,11 @@ public class HistoryAdapter extends BaseQuickAdapter { }*/ helper.setVisible(R.id.tvLang, false); helper.setVisible(R.id.tvArea, false); - helper.setVisible(R.id.tvNote, false); + if (item.note == null || item.note.isEmpty()) { + helper.setVisible(R.id.tvNote, false); + } else { + helper.setText(R.id.tvNote, item.note); + } helper.setText(R.id.tvName, item.name); // helper.setText(R.id.tvActor, item.actor); ImageView ivThumb = helper.getView(R.id.ivThumb);