Commit: 145cb9355fa4b68d38f05e5933e4519d95dc33e3 - TinyBannavi (git)

タイニー番組ナビゲータ本体

Commit MetaInfo

• Revisão: 145cb9355fa4b68d38f05e5933e4519d95dc33e3 (tree)
• Hora: 2017-07-23 23:36:27
• Autor: Masahiko Kimura <mkimura@u01....>
• Commiter: Masahiko Kimura

Mensagem de Log

「本体予約一覧」ビューで予約の進行状況を「リスト形式」ビューと同様背景色と「終了前ｘｘ分」といったテキストで表示する。

Mudança Sumário

• modified: TinyBannavi/src/tainavi/AbsReserveListView.java
• modified: TinyBannavi/src/tainavi/Viewer.java

Diff

--- a/TinyBannavi/src/tainavi/AbsReserveListView.java
+++ b/TinyBannavi/src/tainavi/AbsReserveListView.java
@@ -46,7 +46,7 @@ import tainavi.AbsTitleListView.TitleColumn;
  * 本体予約一覧タブのクラス
  * @since 3.15.4β　{@link Viewer}から分離
  */
-public abstract class AbsReserveListView extends JScrollPane {
+public abstract class AbsReserveListView extends JScrollPane implements VWTimerRiseListener {
 
 	private static final long serialVersionUID = 1L;
 
@@ -121,6 +121,10 @@ public abstract class AbsReserveListView extends JScrollPane {
 	private static final String VALID_DEVNAME_COLOR = "#000000";
 	private static final String INVALID_DEVNAME_COLOR = "#ff0000";
 
+	private static final String PASSED_COLOR = "#b4b4b4";
+	private static final String CURRENT_COLOR_EVEN = "#f0b4b4";
+	private static final String CURRENT_COLOR_ODD = "#f88080";
+
 	private static final String ICONFILE_EXEC			= "icon/media-record-3.png";
 
 	/*******************************************************************************
@@ -167,6 +171,7 @@ public abstract class AbsReserveListView extends JScrollPane {
 		EXEC		("実行",			35),
 		TRACE		("追跡",			35),
 		AUTO		("自動",			35),
+		OPTIONS		("オプション",		100),
 		NEXTSTART	("次回実行予定",	150),
 		END			("終了",			50),
 		LENGTH		("長さ",			50),
@@ -219,6 +224,7 @@ public abstract class AbsReserveListView extends JScrollPane {
 		Boolean exec;
 		String trace;
 		String auto;
+		String options;
 		String nextstart;	// YYYY/MM/DD(WD) hh:mm
 		String end;			// hh:mm
 		String length;
@@ -239,6 +245,8 @@ public abstract class AbsReserveListView extends JScrollPane {
 		String hide_devicecolor;
 		Boolean hide_tunershort;
 		Boolean hide_recorded;
+		String hide_nextstart;
+		String hide_nextend;
 
 		@Override
 		protected void myrefresh(RowItem o) {
@@ -249,6 +257,7 @@ public abstract class AbsReserveListView extends JScrollPane {
 			c.addData(exec);
 			c.addData(trace);
 			c.addData(auto);
+			c.addData(options);
 			c.addData(nextstart);
 			c.addData(end);
 			c.addData(length);
@@ -341,6 +350,9 @@ public abstract class AbsReserveListView extends JScrollPane {
 	// テーブルの実体
 	private final RowItemList<ReservedItem> rowData = new RowItemList<ReservedItem>();
 
+	// 現在放送中のタイマー
+	private boolean timer_now_enabled = false;
+
 	/*******************************************************************************
 	 * コンストラクタ
 	 ******************************************************************************/
@@ -386,6 +398,22 @@ public abstract class AbsReserveListView extends JScrollPane {
 	// 対外的な
 
 	/**
+	 * 現在時刻追従を開始する
+	 * @see #stopTimer
+	 * @see #pauseTimer
+	 */
+	private void startTimer() {
+		timer_now_enabled = true;
+	}
+
+	/**
+	 * 現在時刻追従を停止する
+	 */
+	private boolean stopTimer(boolean showmsg) {
+		return (timer_now_enabled = false);
+	}
+
+	/**
 	 * 予約一覧を描画してほしいかなって
 	 * ★synchronized(rowData)★
 	 * @see #cl_tabshown
@@ -398,6 +426,7 @@ public abstract class AbsReserveListView extends JScrollPane {
 	}
 
 	private void _redrawReservedList() {
+		stopTimer(true);
 
 		//
 		rowData.clear();
@@ -408,6 +437,7 @@ public abstract class AbsReserveListView extends JScrollPane {
 
 		// 現在日時
 		String curDateTime = CommonUtils.getDateTime(0);
+		String critDateTime = CommonUtils.getCritDateTime();
 
 		// 繰り返し予約関連
 		String itecolor = CommonUtils.color2str(env.getIterationItemForeground());
@@ -438,6 +468,37 @@ public abstract class AbsReserveListView extends JScrollPane {
 						}
 					}
 
+					// 現在時刻と開始時刻、終了時刻の前後関係をチェックする
+					long cur_remain = -1;
+					long cur_wait = 0;
+
+					String cridt = CommonUtils.getDateTime(-env.getCurrentAfter());
+					String curdt = CommonUtils.getDateTime(0);
+					String nextdt = CommonUtils.getDateTime(env.getCurrentBefore());
+
+					// 開始時刻、終了時刻
+					String nextstart = CommonUtils.getDate(CommonUtils.getCalendar(starts.get(n)), false)+" "+ro.getAhh()+":"+ro.getAmm();
+					String nextend =  CommonUtils.getDate(CommonUtils.getCalendar(ends.get(n)), false)+" "+ro.getZhh()+":"+ro.getZmm();
+
+					// 予約実行中の場合
+					if ( nextstart.compareTo(cridt) <= 0 && cridt.compareTo(nextend) <= 0 ||
+						 nextstart.compareTo(curdt) <= 0 && curdt.compareTo(nextend) <= 0) {
+						cur_remain = CommonUtils.getCompareDateTime(nextend, curdt);
+					}
+					// 予約開始まで規定時間以内の場合
+					else if ( nextstart.compareTo(cridt) > 0 && nextstart.compareTo(nextdt) <= 0 ) {
+						cur_wait = CommonUtils.getCompareDateTime(nextstart, curdt);
+					}
+
+					// オプションに文字列としてセットする
+					String options = "";
+					if ( cur_remain > 0 ) {
+						options = String.format("終了まで%3d分",cur_remain/60000);
+					}
+					else if ( cur_wait > 0 ){
+						options = String.format("開始まで%3d分",cur_wait/60000);
+					}
+
 					ReservedItem sa = new ReservedItem();
 
 					sa.pattern = ro.getRec_pattern();
@@ -445,6 +506,7 @@ public abstract class AbsReserveListView extends JScrollPane {
 					sa.exec = ro.getExec();
 					sa.trace = ((ro.getPursues())?("追"):(""));
 					sa.auto = ((ro.getAutoreserved())?("○"):(""));
+					sa.options = options;
 					sa.nextstart = CommonUtils.getDate(CommonUtils.getCalendar(starts.get(n)))+" "+ro.getAhh()+":"+ro.getAmm();	// YYYY/MM/DD(WD) hh:mm
 					sa.end = ro.getZhh()+":"+ro.getZmm();			// hh:mm
 					sa.length = ro.getRec_min();
@@ -465,6 +527,8 @@ public abstract class AbsReserveListView extends JScrollPane {
 					sa.hide_devicecolor = VALID_DEVNAME_COLOR;
 					sa.hide_tunershort = ro.getTunershort();
 					sa.hide_recorded = ro.getRecorded();
+					sa.hide_nextstart = nextstart;
+					sa.hide_nextend = nextend;
 
 					sa.fireChanged();
 
@@ -483,6 +547,8 @@ public abstract class AbsReserveListView extends JScrollPane {
 		((DefaultTableModel)jTable_rowheader.getModel()).fireTableDataChanged();
 
 		setOverlapMark();
+
+		startTimer();
 	}
 
 	private String getRec_mode(ReserveList reserve) { String s = ((reserve.getAppsRsv())?(reserve.getRec_mvchapter()):(reserve.getRec_mode())); return (s==null)?(""):(s); }
@@ -680,6 +746,44 @@ public abstract class AbsReserveListView extends JScrollPane {
 	 ******************************************************************************/
 
 	/**
+	 * 現在時刻追従処理
+	 */
+	@Override
+	public void timerRised(VWTimerRiseEvent e) {
+		if ( ! timer_now_enabled ) {
+			return;
+		}
+
+		stopTimer(false);
+
+		// 更新前に選択していた行を確認する
+		String rsvid = null;
+		{
+			int row = jTable_rsved.getSelectedRow();
+			if ( row >= 0 ) {
+				int vrow = jTable_rsved.convertRowIndexToModel(row);
+				rsvid = rowData.get(vrow).hide_rsvid;
+			}
+		}
+
+		// タイマーはこの中で再開される
+		_redrawReservedList();
+
+		// 更新前に選択していた行を再度選択する
+		if ( rsvid != null ) {
+			int vrow = -1;
+			for ( ReservedItem c : rowData ) {
+				vrow++;
+				if ( c.hide_rsvid.equals(rsvid) ) {
+					int row = jTable_rsved.convertRowIndexToView(vrow);
+					jTable_rsved.setRowSelectionInterval(row,row);
+					break;
+				}
+			}
+		}
+	}
+
+	/**
 	 * タブが開かれたら表を書き換える
 	 * ★synchronized(rowData)★
 	 * @see #redrawReservedList()
@@ -892,6 +996,30 @@ public abstract class AbsReserveListView extends JScrollPane {
 		public void setDisabledColor(Color c) { disabledColor = c; }
 		private Color disabledColor = new Color(180,180,180);
 
+		// 過去の予約の背景色
+		public void setPassedColor(Color c) { passedColor = c; }
+		private Color passedColor = CommonUtils.str2color(PASSED_COLOR);
+
+		// 実行中の予約の背景色
+		private Color currentColorEven = CommonUtils.str2color(CURRENT_COLOR_EVEN);
+		private Color currentColorOdd = CommonUtils.str2color(CURRENT_COLOR_ODD);
+
+		// 実行中の予約の背景色をセットする
+		public void setCurrentColor(Color c) {
+			if ( c == null ) {
+				currentColorEven = null;
+				currentColorOdd = null;
+			}
+			else {
+				currentColorOdd = c;
+				currentColorEven = new Color(
+						((c.getRed()>=247)?(255):(c.getRed()+8)),
+						((c.getGreen()>=247)?(255):(c.getGreen()+8)),
+						((c.getBlue()>=247)?(255):(c.getBlue()+8))
+						);
+			}
+		}
+
 		public void setTunerShortColor(Color c) { tunershortColor = c; }
 		private Color tunershortColor = new Color(255,255,0);
 
@@ -902,6 +1030,9 @@ public abstract class AbsReserveListView extends JScrollPane {
 		private boolean prechkdisabled = false;
 		private boolean prechktunershort = false;
 		private boolean prechkrecorded = false;
+		private boolean prechkpassed = false;
+		private boolean prechkcurrent = false;
+		private boolean prechknextweek = false;
 
 		@Override
 		public Component prepareRenderer(TableCellRenderer tcr, int row, int column) {
@@ -915,7 +1046,14 @@ public abstract class AbsReserveListView extends JScrollPane {
 			else {
 				fgColor = this.getForeground();
 				isRowPassed(row);
-				if ( prechkdisabled ) {
+
+//				fgColor = (prechknextweek)?(nextweekFgColor):(this.getForeground());
+
+				// 過去の予約の場合
+				if( prechkpassed && passedColor != null ) {
+					bgColor = passedColor;
+				}
+				else if ( prechkdisabled ) {
 					bgColor = disabledColor;
 				}
 				else if ( prechktunershort ) {
@@ -924,6 +1062,10 @@ public abstract class AbsReserveListView extends JScrollPane {
 				else if ( prechkrecorded ) {
 					bgColor = recordedColor;
 				}
+				// 実行中の予約の場合
+				else if( prechkcurrent && currentColorEven != null ) {
+					bgColor = (isSepRowColor && row%2 == 1)?(currentColorEven):(currentColorOdd);
+				}
 				else {
 					bgColor = (isSepRowColor && row%2 == 1)?(evenColor):(super.getBackground());
 				}
@@ -947,6 +1089,10 @@ public abstract class AbsReserveListView extends JScrollPane {
 			int row = this.convertRowIndexToModel(prow);
 			ReservedItem c = rowView.get(row);
 
+			prechkpassed = false;
+			prechkcurrent = false;
+			prechknextweek = false;
+
 			{
 				// 実行可能かどうか
 				prechkrow = prow;
@@ -954,6 +1100,21 @@ public abstract class AbsReserveListView extends JScrollPane {
 				prechktunershort = c.hide_tunershort;
 				prechkrecorded = c.hide_recorded;
 			}
+			{
+				// 終了済みの番組か否か
+				String cDT = CommonUtils.getDateTime(0);
+
+				prechkpassed = (cDT.compareTo(c.hide_nextend) >= 0);
+				if ( ! prechkpassed ) {
+					// 現在放送中
+					prechkcurrent = (cDT.compareTo(c.hide_nextstart) >= 0);
+				}
+				if ( ! prechkcurrent ) {
+					// 来週かな
+					String critDT = CommonUtils.getCritDateTime(7);
+					prechknextweek = (critDT.compareTo(c.hide_nextstart) <= 0);
+				}
+			}
 
 			return true;
 		}

--- a/TinyBannavi/src/tainavi/Viewer.java
+++ b/TinyBannavi/src/tainavi/Viewer.java
@@ -5295,6 +5295,7 @@ public class Viewer extends JFrame implements ChangeListener,VWTimerRiseListener
 		timer_now.addVWTimerRiseListener(this);
 		timer_now.addVWTimerRiseListener(listed);
 		timer_now.addVWTimerRiseListener(paper);
+		timer_now.addVWTimerRiseListener(reserved);
 
 		// タイマー起動
 		timer_now.start();