From 8095d12214823552810de2f63b4c70f362476b8a Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Wed, 3 Aug 2011 00:54:32 +0900
Subject: [PATCH] =?utf8?q?HistoryListActivity=E8=BF=BD=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           | 185 +++++++++++----------
 workspace/TrainDelayed/res/layout/history.xml      |   3 +-
 workspace/TrainDelayed/res/layout/history_list.xml |   9 +
 .../res/layout/history_list_item_1.xml             |  26 +++
 workspace/TrainDelayed/res/layout/search_word.xml  |   2 +-
 .../TrainDelayed/src/com/td/HistoryActivity.java   |  21 ++-
 .../src/com/td/HistoryListActivity.java            |  68 ++++++++
 .../src/com/td/HistoryListViewArrayAdapter.java    |  42 +++++
 .../src/com/td/TrainDelayedActivity.java           |   2 +-
 10 files changed, 268 insertions(+), 92 deletions(-)
 create mode 100644 workspace/TrainDelayed/res/layout/history_list.xml
 create mode 100644 workspace/TrainDelayed/res/layout/history_list_item_1.xml
 create mode 100644 workspace/TrainDelayed/src/com/td/HistoryListActivity.java
 create mode 100644 workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java

diff --git a/workspace/TrainDelayed/AndroidManifest.xml b/workspace/TrainDelayed/AndroidManifest.xml
index 1c652c6..0fd08fa 100644
--- a/workspace/TrainDelayed/AndroidManifest.xml
+++ b/workspace/TrainDelayed/AndroidManifest.xml
@@ -22,7 +22,7 @@
 		<activity android:name=".SearchWordActivity" />
 		<activity android:name=".WaitActivity" />
 		<activity android:name=".TrainEditActivity" />
-		
+		<activity android:name=".HistoryListActivity" />
 
 <!--		
     	<service android:enabled="true" android:name="com.td.service.TrainDelayedServiceImpl" />
diff --git a/workspace/TrainDelayed/gen/com/td/R.java b/workspace/TrainDelayed/gen/com/td/R.java
index 5129d43..241bc6f 100644
--- a/workspace/TrainDelayed/gen/com/td/R.java
+++ b/workspace/TrainDelayed/gen/com/td/R.java
@@ -16,105 +16,116 @@ public final class R {
         public static final int on=0x7f020002;
     }
     public static final class id {
-        public static final int LinearLayout34=0x7f050049;
-        public static final int LinearLayout64=0x7f05002f;
-        public static final int LinearLayout74=0x7f05000a;
-        public static final int button01=0x7f050011;
-        public static final int button02=0x7f050013;
-        public static final int button03=0x7f050015;
-        public static final int button04=0x7f050017;
-        public static final int button05=0x7f050019;
-        public static final int button06=0x7f05001b;
-        public static final int button07=0x7f05001d;
-        public static final int button09=0x7f050023;
-        public static final int button0f=0x7f05001f;
-        public static final int button0z=0x7f050021;
+        public static final int LinearLayout34=0x7f050052;
+        public static final int LinearLayout64=0x7f050037;
+        public static final int LinearLayout74=0x7f05000b;
+        public static final int LinearLayout84=0x7f050044;
+        public static final int LinearLayout94=0x7f050011;
+        public static final int button01=0x7f050019;
+        public static final int button02=0x7f05001b;
+        public static final int button03=0x7f05001d;
+        public static final int button04=0x7f05001f;
+        public static final int button05=0x7f050021;
+        public static final int button06=0x7f050023;
+        public static final int button07=0x7f050025;
+        public static final int button09=0x7f05002b;
+        public static final int button0f=0x7f050027;
+        public static final int button0z=0x7f050029;
         public static final int button11=0x7f050005;
         public static final int button12=0x7f050006;
-        public static final int button31=0x7f05004a;
-        public static final int button32=0x7f05004b;
-        public static final int button33=0x7f050048;
-        public static final int button41=0x7f050038;
-        public static final int button51=0x7f05004e;
-        public static final int button61=0x7f050030;
-        public static final int button62=0x7f050031;
-        public static final int button63=0x7f050032;
-        public static final int button64=0x7f050033;
-        public static final int button65=0x7f050034;
-        public static final int button66=0x7f050035;
-        public static final int button71=0x7f05000b;
-        public static final int button72=0x7f05000c;
-        public static final int button81=0x7f05003c;
-        public static final int button82=0x7f05003d;
-        public static final int button83=0x7f05003e;
-        public static final int button84=0x7f05003f;
-        public static final int button85=0x7f050040;
-        public static final int button86=0x7f050041;
-        public static final int buttona1=0x7f050054;
+        public static final int button13=0x7f050007;
+        public static final int button31=0x7f050053;
+        public static final int button32=0x7f050054;
+        public static final int button33=0x7f050051;
+        public static final int button41=0x7f050040;
+        public static final int button51=0x7f050057;
+        public static final int button61=0x7f050038;
+        public static final int button62=0x7f050039;
+        public static final int button63=0x7f05003a;
+        public static final int button64=0x7f05003b;
+        public static final int button65=0x7f05003c;
+        public static final int button66=0x7f05003d;
+        public static final int button71=0x7f05000c;
+        public static final int button72=0x7f05000d;
+        public static final int button81=0x7f050045;
+        public static final int button82=0x7f050046;
+        public static final int button83=0x7f050047;
+        public static final int button84=0x7f050048;
+        public static final int button85=0x7f050049;
+        public static final int button86=0x7f05004a;
+        public static final int button91=0x7f050012;
+        public static final int buttona1=0x7f05005d;
         public static final int checkBox=0x7f050000;
-        public static final int checkBox31=0x7f050046;
-        public static final int checkBox32=0x7f050047;
-        public static final int checkBox61=0x7f050026;
-        public static final int checkBox62=0x7f050027;
-        public static final int checkBox63=0x7f050028;
-        public static final int checkBox64=0x7f050029;
-        public static final int checkBox65=0x7f05002a;
-        public static final int checkBox66=0x7f05002b;
-        public static final int checkBox67=0x7f05002c;
-        public static final int editText31=0x7f050044;
-        public static final int editText32=0x7f050045;
-        public static final int editText61=0x7f05002d;
-        public static final int editText62=0x7f05002e;
-        public static final int editText71=0x7f050008;
-        public static final int editText72=0x7f050009;
-        public static final int editText81=0x7f05003b;
+        public static final int checkBox31=0x7f05004f;
+        public static final int checkBox32=0x7f050050;
+        public static final int checkBox61=0x7f05002e;
+        public static final int checkBox62=0x7f05002f;
+        public static final int checkBox63=0x7f050030;
+        public static final int checkBox64=0x7f050031;
+        public static final int checkBox65=0x7f050032;
+        public static final int checkBox66=0x7f050033;
+        public static final int checkBox67=0x7f050034;
+        public static final int editText31=0x7f05004d;
+        public static final int editText32=0x7f05004e;
+        public static final int editText61=0x7f050035;
+        public static final int editText62=0x7f050036;
+        public static final int editText71=0x7f050009;
+        public static final int editText72=0x7f05000a;
+        public static final int editText81=0x7f050043;
         public static final int historyView11=0x7f050004;
-        public static final int imageView1=0x7f05004f;
-        public static final int linearLayout00=0x7f05000d;
-        public static final int linearLayout01=0x7f050010;
-        public static final int linearLayout02=0x7f050012;
-        public static final int linearLayout03=0x7f050014;
-        public static final int linearLayout04=0x7f050016;
-        public static final int linearLayout05=0x7f050018;
-        public static final int linearLayout06=0x7f05001a;
-        public static final int linearLayout07=0x7f05001c;
-        public static final int linearLayout09=0x7f050022;
-        public static final int linearLayout0f=0x7f05001e;
-        public static final int linearLayout0z=0x7f050020;
-        public static final int linearLayout30=0x7f050042;
-        public static final int linearLayouta0=0x7f050051;
-        public static final int listView61=0x7f050024;
-        public static final int listView81=0x7f05003a;
-        public static final int menu41=0x7f050037;
-        public static final int menu51=0x7f05004d;
-        public static final int scrollView01=0x7f05000f;
+        public static final int imageView1=0x7f050058;
+        public static final int linearLayout00=0x7f050015;
+        public static final int linearLayout01=0x7f050018;
+        public static final int linearLayout02=0x7f05001a;
+        public static final int linearLayout03=0x7f05001c;
+        public static final int linearLayout04=0x7f05001e;
+        public static final int linearLayout05=0x7f050020;
+        public static final int linearLayout06=0x7f050022;
+        public static final int linearLayout07=0x7f050024;
+        public static final int linearLayout09=0x7f05002a;
+        public static final int linearLayout0f=0x7f050026;
+        public static final int linearLayout0z=0x7f050028;
+        public static final int linearLayout30=0x7f05004b;
+        public static final int linearLayouta0=0x7f05005a;
+        public static final int listView61=0x7f05002c;
+        public static final int listView81=0x7f050042;
+        public static final int listView91=0x7f050010;
+        public static final int menu41=0x7f05003f;
+        public static final int menu51=0x7f050056;
+        public static final int scrollView01=0x7f050017;
         public static final int scrollView11=0x7f050003;
-        public static final int scrollView61=0x7f050025;
-        public static final int spinner71=0x7f050007;
+        public static final int scrollView61=0x7f05002d;
+        public static final int spinner71=0x7f050008;
+        public static final int spinner91=0x7f05000f;
         public static final int text2=0x7f050001;
-        public static final int textView01=0x7f05000e;
-        public static final int textView1=0x7f050050;
+        public static final int text911=0x7f050013;
+        public static final int text912=0x7f050014;
+        public static final int textView01=0x7f050016;
+        public static final int textView1=0x7f050059;
         public static final int textView11=0x7f050002;
-        public static final int textView31=0x7f050043;
-        public static final int textView41=0x7f050036;
-        public static final int textView51=0x7f05004c;
-        public static final int textView81=0x7f050039;
-        public static final int textViewa1=0x7f050052;
-        public static final int waitViewa1=0x7f050053;
+        public static final int textView31=0x7f05004c;
+        public static final int textView41=0x7f05003e;
+        public static final int textView51=0x7f050055;
+        public static final int textView81=0x7f050041;
+        public static final int textView91=0x7f05000e;
+        public static final int textViewa1=0x7f05005b;
+        public static final int waitViewa1=0x7f05005c;
     }
     public static final class layout {
         public static final int check_list_item_1=0x7f030000;
         public static final int history=0x7f030001;
         public static final int history_conf=0x7f030002;
-        public static final int main=0x7f030003;
-        public static final int monitor_time=0x7f030004;
-        public static final int prefecture_list=0x7f030005;
-        public static final int search_word=0x7f030006;
-        public static final int simple_list_item_1=0x7f030007;
-        public static final int train_edit=0x7f030008;
-        public static final int train_list=0x7f030009;
-        public static final int train_row=0x7f03000a;
-        public static final int wait=0x7f03000b;
+        public static final int history_list=0x7f030003;
+        public static final int history_list_item_1=0x7f030004;
+        public static final int main=0x7f030005;
+        public static final int monitor_time=0x7f030006;
+        public static final int prefecture_list=0x7f030007;
+        public static final int search_word=0x7f030008;
+        public static final int simple_list_item_1=0x7f030009;
+        public static final int train_edit=0x7f03000a;
+        public static final int train_list=0x7f03000b;
+        public static final int train_row=0x7f03000c;
+        public static final int wait=0x7f03000d;
     }
     public static final class string {
         public static final int add_button=0x7f04002d;
diff --git a/workspace/TrainDelayed/res/layout/history.xml b/workspace/TrainDelayed/res/layout/history.xml
index 8cb6821..4e92dab 100644
--- a/workspace/TrainDelayed/res/layout/history.xml
+++ b/workspace/TrainDelayed/res/layout/history.xml
@@ -15,6 +15,7 @@
 </HorizontalScrollView>
 	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
 		<Button android:text="@+string/conf_button" android:layout_weight="1" android:id="@+id/button11" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
-		<Button android:text="@+string/return_button" android:layout_weight="1" android:id="@+id/button12" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+		<Button android:text="@+string/conf_button" android:layout_weight="1" android:id="@+id/button12" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+		<Button android:text="@+string/return_button" android:layout_weight="1" android:id="@+id/button13" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
 	</LinearLayout>
 </LinearLayout>
diff --git a/workspace/TrainDelayed/res/layout/history_list.xml b/workspace/TrainDelayed/res/layout/history_list.xml
new file mode 100644
index 0000000..3f4914b
--- /dev/null
+++ b/workspace/TrainDelayed/res/layout/history_list.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
+<TextView android:text="@+string/keyword_title" android:id="@+id/textView91" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+<Spinner android:layout_height="wrap_content" android:id="@+id/spinner91" android:layout_width="fill_parent"></Spinner>
+<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" /> 
+</LinearLayout>
+</LinearLayout>
diff --git a/workspace/TrainDelayed/res/layout/history_list_item_1.xml b/workspace/TrainDelayed/res/layout/history_list_item_1.xml
new file mode 100644
index 0000000..dc47293
--- /dev/null
+++ b/workspace/TrainDelayed/res/layout/history_list_item_1.xml
@@ -0,0 +1,26 @@
+<LinearLayout 
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="horizontal"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:gravity="center_vertical"
+>
+	<TextView
+		android:id="@+id/text911"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:gravity="center_vertical"
+		android:paddingLeft="2dip"
+		android:minHeight="?android:attr/listPreferredItemHeight"
+	/>
+	<TextView
+		android:id="@+id/text912"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:gravity="center_vertical"
+		android:paddingLeft="2dip"
+		android:minHeight="?android:attr/listPreferredItemHeight"
+	/>
+</LinearLayout>
diff --git a/workspace/TrainDelayed/res/layout/search_word.xml b/workspace/TrainDelayed/res/layout/search_word.xml
index b77db8c..0145d67 100644
--- a/workspace/TrainDelayed/res/layout/search_word.xml
+++ b/workspace/TrainDelayed/res/layout/search_word.xml
@@ -3,7 +3,7 @@
 <TextView android:text="@+string/keyword_title" android:id="@+id/textView81" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
 <ListView android:id="@+id/listView81" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"></ListView>
 <EditText android:text="" android:id="@+id/editText81" android:layout_width="fill_parent" android:layout_height="wrap_content" android:inputType="text"></EditText>
-<LinearLayout android:id="@+id/LinearLayout74" android:layout_width="fill_parent" android:layout_height="wrap_content">
+<LinearLayout android:id="@+id/LinearLayout84" android:layout_width="fill_parent" android:layout_height="wrap_content">
 	<Button android:text="@+string/add_button" android:layout_weight="3" android:id="@+id/button81" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
 	<Button android:text="@+string/update_button" android:layout_weight="3" android:id="@+id/button82" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
 	<Button android:text="@+string/delete_button" android:layout_weight="3" android:id="@+id/button83" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
diff --git a/workspace/TrainDelayed/src/com/td/HistoryActivity.java b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
index aef06b3..a35867d 100644
--- a/workspace/TrainDelayed/src/com/td/HistoryActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
@@ -39,6 +39,10 @@ public class HistoryActivity extends BaseActivity {
 	public static final String PREF_HIS_EN_HOUR = "HIS_EN_HOUR";
 	public static final String PREF_HIS_EN_MINUTE = "HIS_EN_MINUTE";
 
+	public static final String PREF_HIS_YMD = "HIS_YMD";
+	public static final String PREF_HIS_FROM = "HIS_FROM";
+	public static final String PREF_HIS_TO = "HIS_TO";
+
 	public static final int[] unit = { 10, 30, 60 };
 
 	private EditPrefUtil pref = new EditPrefUtil(this);
@@ -68,7 +72,7 @@ public class HistoryActivity extends BaseActivity {
 			button1.setOnClickListener(new OnClickListener() {
 				public void onClick(View view) {
 					Intent intent = new Intent(HistoryActivity.this,
-							(Class<?>) HistoryConfActivity.class);
+							(Class<?>) HistoryListActivity.class);
 					startActivityForResult(intent, -1);
 				}
 			});
@@ -76,6 +80,15 @@ public class HistoryActivity extends BaseActivity {
 			Button button2 = (Button) findViewById(R.id.button12);
 			button2.setOnClickListener(new OnClickListener() {
 				public void onClick(View view) {
+					Intent intent = new Intent(HistoryActivity.this,
+							(Class<?>) HistoryConfActivity.class);
+					startActivityForResult(intent, -1);
+				}
+			});
+
+			Button button3 = (Button) findViewById(R.id.button13);
+			button3.setOnClickListener(new OnClickListener() {
+				public void onClick(View view) {
 					HistoryActivity.this.finish();
 				}
 			});
@@ -151,6 +164,12 @@ public class HistoryActivity extends BaseActivity {
 			int ymd = DateUtil.getYmd(currentDate.getYear(), currentDate.getMonth(), currentDate.getDate());
 			int from = DateUtil.getHm(prefStHour, prefStMinute);
 			int to = DateUtil.getHm(prefEnHour, prefEnMinute);
+			
+			pref.put(PREF_HIS_YMD, ymd);
+			pref.put(PREF_HIS_FROM, from);
+			pref.put(PREF_HIS_TO, to);
+			pref.update();
+			
 			List<History> list = hisDao.search(this, ymd, from, to);
 
 			DefaultCategoryDataset dataset = new DefaultCategoryDataset();
diff --git a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
new file mode 100644
index 0000000..38d08e2
--- /dev/null
+++ b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
@@ -0,0 +1,68 @@
+package com.td;
+
+import java.util.List;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.Spinner;
+
+import com.td.db.History;
+import com.td.db.HistoryDao;
+import com.td.db.TrainDao;
+import com.td.utility.BaseActivity;
+import com.td.utility.EditPrefUtil;
+
+public class HistoryListActivity extends BaseActivity {
+    private ListView listView;
+    private Spinner spinner;
+    private Button button;
+
+    private EditPrefUtil pref = new EditPrefUtil(this);
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.history_list);
+		
+		listView = (ListView) findViewById(R.id.listView91);
+		spinner = (Spinner) findViewById(R.id.spinner91);
+		button = (Button) findViewById(R.id.button91);
+		
+		button.setOnClickListener(new OnClickListener(){
+			public void onClick(View view) {
+				HistoryListActivity.this.finish();
+			}});
+		
+		updateList();
+	}
+	
+	private void updateList(){
+		int ymd = pref.getInt(HistoryActivity.PREF_HIS_YMD);
+		int from = pref.getInt(HistoryActivity.PREF_HIS_FROM);
+		int to = pref.getInt(HistoryActivity.PREF_HIS_TO);
+		
+		HistoryDao hisDao = HistoryDao.getInstance();
+		TrainDao traDao = TrainDao.getInstance();
+
+		List<History> list = hisDao.search(this, ymd, from, to);
+
+		HistoryListViewArrayAdapter adapter = new HistoryListViewArrayAdapter(this,
+				R.layout.history_list_item_1, list);
+		listView.setAdapter(adapter);		
+
+		//		for (History history : list) {
+//			int hm = history.getHm();
+//			String text = DateUtil.formattedHm(hm);
+//			
+//			long id = history.getRouteId();
+//			Train train = traDao.searchById(id);
+//			if (train != null){
+//				String route = train.getName();
+//
+//			}
+//		}
+	}
+}
diff --git a/workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java b/workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java
new file mode 100644
index 0000000..8a1eda2
--- /dev/null
+++ b/workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java
@@ -0,0 +1,42 @@
+package com.td;
+
+import java.util.List;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.td.db.History;
+import com.td.utility.DateUtil;
+
+public class HistoryListViewArrayAdapter extends ArrayAdapter<History> {
+    private LayoutInflater inflater;
+
+    public HistoryListViewArrayAdapter(Context context, int resourceId, List<History> items) {
+        super(context, resourceId, items);
+        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent){
+        View view = convertView;  
+        if(view == null){  
+            view = inflater.inflate(R.layout.check_list_item_1, null);  
+        }      
+
+        History item = getItem(position);
+        
+        TextView textView1 = (TextView)view.findViewById(R.id.text911);  
+        TextView textView2 = (TextView)view.findViewById(R.id.text912);  
+
+        textView1.setText(DateUtil.formattedHm(item.getHm()));  
+        textView2.setText(String.valueOf(item.getNum()));  
+        
+        return view;
+    }
+
+}
diff --git a/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java b/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
index fb76d72..f7542c0 100644
--- a/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
+++ b/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
@@ -60,7 +60,7 @@ public class TrainDelayedActivity extends BaseActivity {
 	private boolean isClick = false;
 
 	// ˆê‚©Š‚É’è‹`‚µ‚½‚¢
-	// C³
+	// C³ // TODO
 	//pref.put(TrainDelayedServiceImpl.PREF_SVS_STATUS
 	private StatusFlag tsSf = new StatusFlag(this,
 			TrainService.class.getName(), StatusFlag.TERM_30M);
-- 
2.11.0