From 05012f0b0a86f0da99f83e44777c17e5386a5aee Mon Sep 17 00:00:00 2001 From: Roinlong <32796060+Roinlong@users.noreply.github.com> Date: Sun, 23 Oct 2022 18:11:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B4=E6=92=ADbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tvbox/osc/ui/activity/LivePlayActivity.java | 14 +++++++++++--- .../tvbox/osc/ui/adapter/LiveEpgAdapter.java | 3 ++- app/src/main/res/layout/activity_live_play.xml | 3 +-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java index b270548a..5036b722 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java @@ -359,6 +359,7 @@ public class LivePlayActivity extends BaseActivity { }); initEpgDateView(); initEpgListView(); + initDayList(); initVideoView(); initChannelGroupView(); initLiveChannelView(); @@ -366,7 +367,6 @@ public class LivePlayActivity extends BaseActivity { initSettingItemView(); initLiveChannelList(); initLiveSettingGroupList(); - initDayList(); } //获取EPG并存储 // 百川epg DIYP epg 51zmt epg ------- 自建EPG格式输出格式请参考 51zmt private List epgdata = new ArrayList<>(); @@ -925,7 +925,7 @@ public class LivePlayActivity extends BaseActivity { @Override public void onItemClick(TvRecyclerView parent, View itemView, int position) { - epgListAdapter.setSelectedEpgIndex(position); + Date date = liveEpgDateAdapter.getSelectedIndex() < 0 ? new Date() : liveEpgDateAdapter.getData().get(liveEpgDateAdapter.getSelectedIndex()).getDateParamVal(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); @@ -935,6 +935,10 @@ public class LivePlayActivity extends BaseActivity { String shiyiStartdate = targetDate + selectedData.originStart.replace(":", "") + "30"; String shiyiEnddate = targetDate + selectedData.originEnd.replace(":", "") + "30"; Date now = new Date(); + if(new Date().compareTo(selectedData.startdateTime) < 0){ + return; + } + epgListAdapter.setSelectedEpgIndex(position); if (now.compareTo(selectedData.startdateTime) >= 0 && now.compareTo(selectedData.enddateTime) <= 0) { mVideoView.release(); isSHIYI = false; @@ -998,7 +1002,6 @@ public class LivePlayActivity extends BaseActivity { epgListAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { @Override public void onItemClick(BaseQuickAdapter adapter, View view, int position) { - epgListAdapter.setSelectedEpgIndex(position); Date date = liveEpgDateAdapter.getSelectedIndex() < 0 ? new Date() : liveEpgDateAdapter.getData().get(liveEpgDateAdapter.getSelectedIndex()).getDateParamVal(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); @@ -1008,6 +1011,10 @@ public class LivePlayActivity extends BaseActivity { String shiyiStartdate = targetDate + selectedData.originStart.replace(":", "") + "30"; String shiyiEnddate = targetDate + selectedData.originEnd.replace(":", "") + "30"; Date now = new Date(); + if(new Date().compareTo(selectedData.startdateTime) < 0){ + return; + } + epgListAdapter.setSelectedEpgIndex(position); if (now.compareTo(selectedData.startdateTime) >= 0 && now.compareTo(selectedData.enddateTime) <= 0) { mVideoView.release(); isSHIYI = false; @@ -1059,6 +1066,7 @@ public class LivePlayActivity extends BaseActivity { sBar = (SeekBar) findViewById(R.id.pb_progressbar); sBar.setMax(shiyi_time_c*1000); sBar.setProgress((int) mVideoView.getCurrentPosition()); + // long dd = mVideoView.getDuration(); tv_currentpos.setText(durationToString((int)mVideoView.getCurrentPosition())); tv_duration.setText(durationToString(shiyi_time_c*1000)); showProgressBars(true); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/LiveEpgAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/LiveEpgAdapter.java index 747e5ac2..e1bda7b8 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/LiveEpgAdapter.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/LiveEpgAdapter.java @@ -27,6 +27,7 @@ public class LiveEpgAdapter extends BaseQuickAdapter { private int focusSelection = -1; private boolean source_include_back = false; + SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd"); public LiveEpgAdapter() { super(R.layout.epglist_item, new ArrayList<>()); } @@ -42,7 +43,7 @@ public class LiveEpgAdapter extends BaseQuickAdapter { TextView shiyi = holder.getView(R.id.shiyi); AudioWaveView wqddg_AudioWaveView = holder.getView(R.id.wqddg_AudioWaveView); wqddg_AudioWaveView.setVisibility(View.GONE); - if (value.index == selectedEpgIndex && value.index != focusedEpgIndex) { + if (value.index == selectedEpgIndex && value.index != focusedEpgIndex && (value.currentEpgDate.equals(shiyiDate) || value.currentEpgDate.equals(timeFormat.format(new Date())))) { textview.setTextColor(mContext.getResources().getColor(R.color.color_1890FF)); timeview.setTextColor(mContext.getResources().getColor(R.color.color_1890FF)); }else { diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml index eb28bc33..4fc64931 100644 --- a/app/src/main/res/layout/activity_live_play.xml +++ b/app/src/main/res/layout/activity_live_play.xml @@ -400,7 +400,7 @@ android:id="@+id/ll_epg" android:paddingBottom="5dp" android:layout_width="@dimen/vs_960" - android:layout_height="@dimen/vs_130"> + android:layout_height="@dimen/vs_140">