From d7981811ee1b4ca52da2c2d575f7cad60f07498f Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Fri, 5 Aug 2011 23:36:31 +0900
Subject: [PATCH] =?utf8?q?=E8=A8=AD=E5=AE=9A=E6=A9=9F=E8=83=BD=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 workspace/TrainDelayed/AndroidManifest.xml         |   2 +
 workspace/TrainDelayed/gen/com/td/R.java           | 151 +++++++++++----------
 workspace/TrainDelayed/res/layout/history_list.xml |   3 +-
 .../TrainDelayed/src/com/td/ConfActivity.java      |   6 +
 .../src/com/td/HistoryListActivity.java            |  16 ++-
 .../TrainDelayed/src/com/td/service/Scheduler.java |   9 +-
 .../src/com/td/service/SchedulerTest.java          |   4 +-
 .../com/td/service/TrainDelayedServiceImpl.java    |   4 +-
 .../src/com/td/service/TrainTwitterAdapter.java    |  11 +-
 .../TrainDelayed/src/com/td/utility/ConfUtil.java  |  13 ++
 .../TrainDelayed/src/com/td/utility/PrefUtil.java  |   2 +-
 11 files changed, 132 insertions(+), 89 deletions(-)
 create mode 100644 workspace/TrainDelayed/src/com/td/ConfActivity.java
 create mode 100644 workspace/TrainDelayed/src/com/td/utility/ConfUtil.java

diff --git a/workspace/TrainDelayed/AndroidManifest.xml b/workspace/TrainDelayed/AndroidManifest.xml
index 5ea39b8..9e74dba 100644
--- a/workspace/TrainDelayed/AndroidManifest.xml
+++ b/workspace/TrainDelayed/AndroidManifest.xml
@@ -23,6 +23,8 @@
 		<activity android:name=".WaitActivity" />
 		<activity android:name=".TrainEditActivity" />
 		<activity android:name=".HistoryListActivity" />
+		<activity android:name=".ConfActivity" />
+		
 
 <!--		
     	<service android:enabled="true" android:name="com.td.service.TrainDelayedServiceImpl" android:process=":service" />
diff --git a/workspace/TrainDelayed/gen/com/td/R.java b/workspace/TrainDelayed/gen/com/td/R.java
index 967a9ea..b633f04 100644
--- a/workspace/TrainDelayed/gen/com/td/R.java
+++ b/workspace/TrainDelayed/gen/com/td/R.java
@@ -16,101 +16,102 @@ public final class R {
         public static final int on=0x7f020002;
     }
     public static final class id {
-        public static final int LinearLayout34=0x7f050053;
-        public static final int LinearLayout64=0x7f050038;
+        public static final int LinearLayout34=0x7f050054;
+        public static final int LinearLayout64=0x7f050039;
         public static final int LinearLayout74=0x7f05000b;
-        public static final int LinearLayout84=0x7f050045;
+        public static final int LinearLayout84=0x7f050046;
         public static final int LinearLayout94=0x7f050012;
-        public static final int button01=0x7f05001a;
-        public static final int button02=0x7f05001c;
-        public static final int button03=0x7f05001e;
-        public static final int button04=0x7f050020;
-        public static final int button05=0x7f050022;
-        public static final int button06=0x7f050024;
-        public static final int button07=0x7f050026;
-        public static final int button09=0x7f05002c;
-        public static final int button0f=0x7f050028;
-        public static final int button0z=0x7f05002a;
+        public static final int button01=0x7f05001b;
+        public static final int button02=0x7f05001d;
+        public static final int button03=0x7f05001f;
+        public static final int button04=0x7f050021;
+        public static final int button05=0x7f050023;
+        public static final int button06=0x7f050025;
+        public static final int button07=0x7f050027;
+        public static final int button09=0x7f05002d;
+        public static final int button0f=0x7f050029;
+        public static final int button0z=0x7f05002b;
         public static final int button11=0x7f050005;
         public static final int button12=0x7f050006;
         public static final int button13=0x7f050007;
-        public static final int button31=0x7f050054;
-        public static final int button32=0x7f050055;
-        public static final int button33=0x7f050052;
-        public static final int button41=0x7f050041;
-        public static final int button51=0x7f050058;
-        public static final int button61=0x7f050039;
-        public static final int button62=0x7f05003a;
-        public static final int button63=0x7f05003b;
-        public static final int button64=0x7f05003c;
-        public static final int button65=0x7f05003d;
-        public static final int button66=0x7f05003e;
+        public static final int button31=0x7f050055;
+        public static final int button32=0x7f050056;
+        public static final int button33=0x7f050053;
+        public static final int button41=0x7f050042;
+        public static final int button51=0x7f050059;
+        public static final int button61=0x7f05003a;
+        public static final int button62=0x7f05003b;
+        public static final int button63=0x7f05003c;
+        public static final int button64=0x7f05003d;
+        public static final int button65=0x7f05003e;
+        public static final int button66=0x7f05003f;
         public static final int button71=0x7f05000c;
         public static final int button72=0x7f05000d;
-        public static final int button81=0x7f050046;
-        public static final int button82=0x7f050047;
-        public static final int button83=0x7f050048;
-        public static final int button84=0x7f050049;
-        public static final int button85=0x7f05004a;
-        public static final int button86=0x7f05004b;
+        public static final int button81=0x7f050047;
+        public static final int button82=0x7f050048;
+        public static final int button83=0x7f050049;
+        public static final int button84=0x7f05004a;
+        public static final int button85=0x7f05004b;
+        public static final int button86=0x7f05004c;
         public static final int button91=0x7f050013;
-        public static final int buttona1=0x7f05005e;
+        public static final int button92=0x7f050014;
+        public static final int buttona1=0x7f05005f;
         public static final int checkBox=0x7f050000;
-        public static final int checkBox31=0x7f050050;
-        public static final int checkBox32=0x7f050051;
-        public static final int checkBox61=0x7f05002f;
-        public static final int checkBox62=0x7f050030;
-        public static final int checkBox63=0x7f050031;
-        public static final int checkBox64=0x7f050032;
-        public static final int checkBox65=0x7f050033;
-        public static final int checkBox66=0x7f050034;
-        public static final int checkBox67=0x7f050035;
-        public static final int editText31=0x7f05004e;
-        public static final int editText32=0x7f05004f;
-        public static final int editText61=0x7f050036;
-        public static final int editText62=0x7f050037;
+        public static final int checkBox31=0x7f050051;
+        public static final int checkBox32=0x7f050052;
+        public static final int checkBox61=0x7f050030;
+        public static final int checkBox62=0x7f050031;
+        public static final int checkBox63=0x7f050032;
+        public static final int checkBox64=0x7f050033;
+        public static final int checkBox65=0x7f050034;
+        public static final int checkBox66=0x7f050035;
+        public static final int checkBox67=0x7f050036;
+        public static final int editText31=0x7f05004f;
+        public static final int editText32=0x7f050050;
+        public static final int editText61=0x7f050037;
+        public static final int editText62=0x7f050038;
         public static final int editText71=0x7f050009;
         public static final int editText72=0x7f05000a;
-        public static final int editText81=0x7f050044;
+        public static final int editText81=0x7f050045;
         public static final int historyView11=0x7f050004;
-        public static final int imageView1=0x7f050059;
-        public static final int linearLayout00=0x7f050016;
-        public static final int linearLayout01=0x7f050019;
-        public static final int linearLayout02=0x7f05001b;
-        public static final int linearLayout03=0x7f05001d;
-        public static final int linearLayout04=0x7f05001f;
-        public static final int linearLayout05=0x7f050021;
-        public static final int linearLayout06=0x7f050023;
-        public static final int linearLayout07=0x7f050025;
-        public static final int linearLayout09=0x7f05002b;
-        public static final int linearLayout0f=0x7f050027;
-        public static final int linearLayout0z=0x7f050029;
-        public static final int linearLayout30=0x7f05004c;
-        public static final int linearLayouta0=0x7f05005b;
-        public static final int listView61=0x7f05002d;
-        public static final int listView81=0x7f050043;
+        public static final int imageView1=0x7f05005a;
+        public static final int linearLayout00=0x7f050017;
+        public static final int linearLayout01=0x7f05001a;
+        public static final int linearLayout02=0x7f05001c;
+        public static final int linearLayout03=0x7f05001e;
+        public static final int linearLayout04=0x7f050020;
+        public static final int linearLayout05=0x7f050022;
+        public static final int linearLayout06=0x7f050024;
+        public static final int linearLayout07=0x7f050026;
+        public static final int linearLayout09=0x7f05002c;
+        public static final int linearLayout0f=0x7f050028;
+        public static final int linearLayout0z=0x7f05002a;
+        public static final int linearLayout30=0x7f05004d;
+        public static final int linearLayouta0=0x7f05005c;
+        public static final int listView61=0x7f05002e;
+        public static final int listView81=0x7f050044;
         public static final int listView91=0x7f050011;
-        public static final int menu41=0x7f050040;
-        public static final int menu51=0x7f050057;
-        public static final int scrollView01=0x7f050018;
+        public static final int menu41=0x7f050041;
+        public static final int menu51=0x7f050058;
+        public static final int scrollView01=0x7f050019;
         public static final int scrollView11=0x7f050003;
-        public static final int scrollView61=0x7f05002e;
+        public static final int scrollView61=0x7f05002f;
         public static final int spinner71=0x7f050008;
         public static final int spinner91=0x7f05000f;
         public static final int text2=0x7f050001;
-        public static final int text911=0x7f050014;
-        public static final int text912=0x7f050015;
-        public static final int textView01=0x7f050017;
-        public static final int textView1=0x7f05005a;
+        public static final int text911=0x7f050015;
+        public static final int text912=0x7f050016;
+        public static final int textView01=0x7f050018;
+        public static final int textView1=0x7f05005b;
         public static final int textView11=0x7f050002;
-        public static final int textView31=0x7f05004d;
-        public static final int textView41=0x7f05003f;
-        public static final int textView51=0x7f050056;
-        public static final int textView81=0x7f050042;
+        public static final int textView31=0x7f05004e;
+        public static final int textView41=0x7f050040;
+        public static final int textView51=0x7f050057;
+        public static final int textView81=0x7f050043;
         public static final int textView91=0x7f05000e;
         public static final int textView92=0x7f050010;
-        public static final int textViewa1=0x7f05005c;
-        public static final int waitViewa1=0x7f05005d;
+        public static final int textViewa1=0x7f05005d;
+        public static final int waitViewa1=0x7f05005e;
     }
     public static final class layout {
         public static final int check_list_item_1=0x7f030000;
diff --git a/workspace/TrainDelayed/res/layout/history_list.xml b/workspace/TrainDelayed/res/layout/history_list.xml
index 584a61c..223bd15 100644
--- a/workspace/TrainDelayed/res/layout/history_list.xml
+++ b/workspace/TrainDelayed/res/layout/history_list.xml
@@ -5,6 +5,7 @@
 <TextView android:text="@+string/keyword_title" android:id="@+id/textView92" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
 <ListView android:id="@+id/listView91" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"></ListView>
 <LinearLayout android:id="@+id/LinearLayout94" android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<Button android:text="@+string/return_button" android:id="@+id/button91" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+	<Button android:text="@+string/conf_button" android:id="@+id/button91" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+	<Button android:text="@+string/return_button" android:id="@+id/button92" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
 </LinearLayout>
 </LinearLayout>
diff --git a/workspace/TrainDelayed/src/com/td/ConfActivity.java b/workspace/TrainDelayed/src/com/td/ConfActivity.java
new file mode 100644
index 0000000..c3824b0
--- /dev/null
+++ b/workspace/TrainDelayed/src/com/td/ConfActivity.java
@@ -0,0 +1,6 @@
+package com.td;
+
+import android.app.Activity;
+
+public class ConfActivity extends Activity {
+}
diff --git a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
index ca485c1..f9171bb 100644
--- a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
@@ -2,6 +2,7 @@ package com.td;
 
 import java.util.List;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -24,7 +25,8 @@ import com.td.utility.EditPrefUtil;
 public class HistoryListActivity extends BaseActivity {
     private ListView listView;
     private Spinner spinner;
-    private Button button;
+    private Button button1;
+    private Button button2;
     private List<Train> trainList;
     
     private EditPrefUtil pref = new EditPrefUtil(this);
@@ -36,9 +38,17 @@ public class HistoryListActivity extends BaseActivity {
 		
 		listView = (ListView) findViewById(R.id.listView91);
 		spinner = (Spinner) findViewById(R.id.spinner91);
-		button = (Button) findViewById(R.id.button91);
+		button1 = (Button) findViewById(R.id.button91);
+		button2 = (Button) findViewById(R.id.button92);
 		
-		button.setOnClickListener(new OnClickListener(){
+		button1.setOnClickListener(new OnClickListener(){
+			public void onClick(View view) {
+				Intent intent = new Intent(HistoryListActivity.this,
+						(Class<?>) HistoryConfActivity.class);
+				startActivityForResult(intent, -1);
+			}});
+
+		button2.setOnClickListener(new OnClickListener(){
 			public void onClick(View view) {
 				HistoryListActivity.this.finish();
 			}});
diff --git a/workspace/TrainDelayed/src/com/td/service/Scheduler.java b/workspace/TrainDelayed/src/com/td/service/Scheduler.java
index 6ca59a9..a5714fa 100644
--- a/workspace/TrainDelayed/src/com/td/service/Scheduler.java
+++ b/workspace/TrainDelayed/src/com/td/service/Scheduler.java
@@ -13,6 +13,7 @@ import com.td.db.Monitor;
 import com.td.db.MonitorDao;
 import com.td.db.Train;
 import com.td.db.TrainDao;
+import com.td.utility.ConfUtil;
 import com.td.utility.DateUtil;
 import com.td.utility.Debug;
 
@@ -39,15 +40,15 @@ public class Scheduler {
 		Debug.d(this, "end init");
 	}
 	
-	public long calcSchedule(long now){
+	public long calcSchedule(long now, int len){
 		Debug.d(this, "start");
-		long t = nextSchedule(now);
+		long t = nextSchedule(now, len);
 		Debug.d(this, "end");
 		return t;
 	}
 
-	public long nextSchedule(long now){
-		long next = now + 60 * DateUtil.LEN * 1000;
+	public long nextSchedule(long now, int len){
+		long next = now + 60 * len * 1000;
 		
 		cal.setTimeInMillis(next);
 		Date date = cal.getTime();
diff --git a/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java b/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
index 8da4e73..8219593 100644
--- a/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
+++ b/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
@@ -23,7 +23,7 @@ public class SchedulerTest {
 		sc.makeSchedule();
 		
 		for (int i = 0; i < 5; i++){
-			t = sc.calcSchedule(t);
+			t = sc.calcSchedule(t, DateUtil.LEN);
 			Date d = DateUtil.getDate(t);
 			String ymd = DateUtil.formattedYmd(DateUtil.getYmd(d));
 			String hm = DateUtil.formattedHm(DateUtil.getHm(d));
@@ -162,7 +162,7 @@ public class SchedulerTest {
 				break;
 			}
 			
-			next = sc.nextSchedule(now);
+			next = sc.nextSchedule(now, DateUtil.LEN);
 			if (next < 0){
 				throw new TestException();
 			}
diff --git a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
index 80925c1..d38d881 100644
--- a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
@@ -22,6 +22,7 @@ import com.td.broadcast.DelayReceiver;
 import com.td.db.DatabaseHelper;
 import com.td.db.Keyword;
 import com.td.db.Train;
+import com.td.utility.ConfUtil;
 import com.td.utility.DateUtil;
 import com.td.utility.Debug;
 import com.td.utility.EditPrefUtil;
@@ -157,7 +158,8 @@ public class TrainDelayedServiceImpl extends Service {
 						}
 					}
 
-					long next = scheduler.calcSchedule(now);
+					int len = ConfUtil.getLen(pref);
+					long next = scheduler.calcSchedule(now, len);
 					String nextStr = DateUtil.formatted(next);
 					Debug.t(TrainDelayedServiceImpl.this, "ŽŸ‰ñ‹N“®Žž " + nextStr);
 					Debug.d(this, "ŽŸ‰ñ‹N“®Žž " + nextStr);
diff --git a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
index cdc2c4d..261c782 100644
--- a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
@@ -16,18 +16,23 @@ import android.net.Uri;
 import com.td.HistoryContentProvider;
 import com.td.db.Keyword;
 import com.td.db.Train;
+import com.td.utility.ConfUtil;
 import com.td.utility.DateUtil;
 import com.td.utility.Debug;
+import com.td.utility.EditPrefUtil;
 
 public class TrainTwitterAdapter extends TwitterAdapter {
 	public static final long START_ID = Long.MAX_VALUE;
 	public static final long ERROR_ID = START_ID - 1;
 	
 	private TrainDelayedServiceImpl context;
+	private EditPrefUtil pref;
+
 	private Calendar cal;
 
 	public TrainTwitterAdapter(TrainDelayedServiceImpl context) {
 		this.context = context;
+		pref = new EditPrefUtil(context);
 	}
 
 	public void setCalender(Calendar cal) {
@@ -39,6 +44,8 @@ public class TrainTwitterAdapter extends TwitterAdapter {
 		super.searched(result);
 
 		try {
+			int len = ConfUtil.getLen(pref);
+			
 			long min = Long.MAX_VALUE;
 			long max = 0;
 
@@ -47,7 +54,7 @@ public class TrainTwitterAdapter extends TwitterAdapter {
 			Date curDate = cal.getTime();
 
 			long cur = curDate.getTime();
-			long from = cur - DateUtil.LEN * 60 * 1000;
+			long from = cur - len * 60 * 1000;
 			int count = 0;
 			long diff = 0;
 
@@ -78,7 +85,7 @@ public class TrainTwitterAdapter extends TwitterAdapter {
 			}
 			diff = 0;
 			if (minDate != null && maxDate != null) {
-				diff = DateUtil.LEN;
+				diff = len;
 			}
 
 			String query = result.getQuery();
diff --git a/workspace/TrainDelayed/src/com/td/utility/ConfUtil.java b/workspace/TrainDelayed/src/com/td/utility/ConfUtil.java
new file mode 100644
index 0000000..c794533
--- /dev/null
+++ b/workspace/TrainDelayed/src/com/td/utility/ConfUtil.java
@@ -0,0 +1,13 @@
+package com.td.utility;
+
+
+public class ConfUtil {
+	public static final String PREF_CNF_LEN = "CNF_LEN";
+	public static final String PREF_CNF_WIDTH = "CNF_WIDTH";
+	public static final String PREF_CNF_HEIGHT = "CNF_HEIGHT";
+
+	public static int getLen(PrefUtil pref){
+		return pref.getInt(PREF_CNF_LEN, DateUtil.LEN);
+	}
+
+}
diff --git a/workspace/TrainDelayed/src/com/td/utility/PrefUtil.java b/workspace/TrainDelayed/src/com/td/utility/PrefUtil.java
index 9ddcbbe..0e0c056 100644
--- a/workspace/TrainDelayed/src/com/td/utility/PrefUtil.java
+++ b/workspace/TrainDelayed/src/com/td/utility/PrefUtil.java
@@ -1,6 +1,6 @@
 package com.td.utility;
 
-interface PrefUtil {
+public interface PrefUtil {
 	void put(String key, String value);
 	void put(String key, int value);
 	String get(String key);
-- 
2.11.0