From cb75bdd04e533353665e5d9b115a95f238619240 Mon Sep 17 00:00:00 2001 From: peeweedee Date: Wed, 11 Sep 2013 21:03:25 +0900 Subject: [PATCH] =?utf8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E4=BF=AE=E6=AD=A3=20?= =?utf8?q?=E3=83=BB=E4=BA=88=E7=B4=84=E4=B8=80=E8=A6=A7=E3=81=AE=E5=8F=96?= =?utf8?q?=E5=BE=97=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E3=82=88?= =?utf8?q?=E3=81=86=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E5=95=8F=E9=A1=8C?= =?utf8?q?=EF=BC=88=E3=83=87=E3=82=B0=E3=83=AC=E3=83=BC=E3=83=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- TinyBannavi/src/tainavi/AbsReserveDialog.java | 2 +- TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java | 4 ++-- TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java | 20 ++++++++++---------- TinyBannavi/src/tainavi/ReserveList.java | 7 +++++-- TinyBannavi/src/tainavi/SearchItem.java | 8 ++++---- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/TinyBannavi/src/tainavi/AbsReserveDialog.java b/TinyBannavi/src/tainavi/AbsReserveDialog.java index fbf0de6..07f979e 100644 --- a/TinyBannavi/src/tainavi/AbsReserveDialog.java +++ b/TinyBannavi/src/tainavi/AbsReserveDialog.java @@ -1433,6 +1433,7 @@ abstract class AbsReserveDialog extends JEscCancelDialog implements HDDRecorderL // 初期化 setTitleItems(myrec, tvd, likersvlist, false); setRecSettingItems(recorders, myrec, tvd); + jPane_title.setDateItems(tvd, tVal); // 選択 { @@ -1440,7 +1441,6 @@ abstract class AbsReserveDialog extends JEscCancelDialog implements HDDRecorderL jPane_title.setSelectedValues(tvd); jPane_title.setTimeValue(tVal); - jPane_title.setDateItems(tvd, tVal); // RDだと画質でエンコーダの種類が絞られちまうンですよ String vrate = myavs != null ? myavs.getVideorate() : null; diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java index 82fc14d..8b72967 100644 --- a/TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java +++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_EDCB.java @@ -848,7 +848,7 @@ public class PlugIn_RecRD_EDCB extends HDDRecorderUtils implements HDDRecorder,C r.setCh_name(cc.getCH_CODE2WEB(r.getChannel())); r.setRec_pattern(CommonUtils.getDate(cal)); - r.setRec_pattern_id(11); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_BYDATE); cal.set(Calendar.HOUR_OF_DAY, hh); cal.set(Calendar.MINUTE, mm); r.setAhh(String.format("%02d", cal.get(Calendar.HOUR_OF_DAY))); @@ -1153,7 +1153,7 @@ public class PlugIn_RecRD_EDCB extends HDDRecorderUtils implements HDDRecorder,C if ( mb.find() ) { GregorianCalendar cal = CommonUtils.getCalendar(mb.group(1)); r.setRec_pattern(CommonUtils.getDate(cal)); - r.setRec_pattern_id(11); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_BYDATE); r.setStartDateTime(CommonUtils.getDateTime(cal)); r.setRec_nextdate(r.getStartDateTime()); diff --git a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java b/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java index fbf2259..a6a0219 100644 --- a/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java +++ b/TinyBannavi/src/tainavi/PlugIn_RecRD_TvRock.java @@ -882,7 +882,7 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder // 年をまたいで追跡されると追いかけられないのである r.setRec_pattern(CommonUtils.getDate(c)); - r.setRec_pattern_id(11); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_BYDATE); } // 時間追従なし @@ -914,12 +914,12 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder if (mb.group(1).equals("0")) { // 当日限り r.setRec_pattern(CommonUtils.getDate(c)); - r.setRec_pattern_id(11); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_BYDATE); } else if (mb.group(1).equals("1")) { // 毎日 - r.setRec_pattern(RPTPTN[10]); - r.setRec_pattern_id(10); + r.setRec_pattern(RPTPTN[HDDRecorder.RPTPTN_ID_EVERYDAY]); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_EVERYDAY); } else if (mb.group(1).equals("2")) { // 毎週 @@ -951,19 +951,19 @@ public class PlugIn_RecRD_TvRock extends HDDRecorderUtils implements HDDRecorder switch (fw) { case 126: // 2+4+8+16+32+64 case -125: // 1+ 4+8+16+32+64 - r.setRec_pattern(RPTPTN[9]); - r.setRec_pattern_id(9); + r.setRec_pattern(RPTPTN[HDDRecorder.RPTPTN_ID_MON2SAT]); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_MON2SAT); break; case 30: // 2+4+8+16 case -60: // 4+8+16+32 - r.setRec_pattern(RPTPTN[7]); - r.setRec_pattern_id(7); + r.setRec_pattern(RPTPTN[HDDRecorder.RPTPTN_ID_MON2THU]); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_MON2THU); break; case 62: // 2+4+8+16+32 case -124: // 4+8+16+32+64 default: - r.setRec_pattern(RPTPTN[8]); - r.setRec_pattern_id(8); + r.setRec_pattern(RPTPTN[HDDRecorder.RPTPTN_ID_MON2FRI]); + r.setRec_pattern_id(HDDRecorder.RPTPTN_ID_MON2FRI); break; } } diff --git a/TinyBannavi/src/tainavi/ReserveList.java b/TinyBannavi/src/tainavi/ReserveList.java index 541d49c..9ce0e9e 100644 --- a/TinyBannavi/src/tainavi/ReserveList.java +++ b/TinyBannavi/src/tainavi/ReserveList.java @@ -90,11 +90,14 @@ public class ReserveList implements Cloneable { */ private void refreshNextDateTime() { if (rec_pattern_id == HDDRecorder.RPTPTN_ID_BYDATE) - return; + return; // 単日予約は関係がない if (endDateTime.compareTo(CommonUtils.getDateTime(0)) >= 0) - return; + return; // 終了済みだからリフレッシュしたい + if ( ! (ahh.matches("^\\d+$") && zhh.matches("^\\d+$"))) + return; // しかし時刻の情報がなかった + ArrayList starts = new ArrayList(); ArrayList ends = new ArrayList(); CommonUtils.getStartEndList(starts, ends, this); diff --git a/TinyBannavi/src/tainavi/SearchItem.java b/TinyBannavi/src/tainavi/SearchItem.java index b4ef55f..ee8684d 100644 --- a/TinyBannavi/src/tainavi/SearchItem.java +++ b/TinyBannavi/src/tainavi/SearchItem.java @@ -5,22 +5,22 @@ import java.util.ArrayList; public interface SearchItem { /** - * 検索アイテムのラベル + * 検索条件のラベル */ public String toString(); /** - * 検索マッチ数のクリア + * 検索条件にマッチした番組情報のリストのクリア */ public void clearMatchedList(); /** - * 検索マッチ数のカウントアップ + * 検索条件にマッチした番組情報の追加 */ public void addMatchedList(ProgDetailList pdl); /** - * 検索マッチ数の取得 + * 検索条件にマッチした番組情報のリストの取得 */ public ArrayList getMatchedList(); -- 2.11.0