履歴に起動、エラー挿入

[train-delayed/source.git] / workspace / TrainDelayed / src / com / td / HistoryListActivity.java

diff --git a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
index 38d08e2..ca485c1 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
@@ -5,21 +5,28 @@ import java.util.List;
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
+import android.widget.AdapterView;\r
+import android.widget.AdapterView.OnItemSelectedListener;\r
+import android.widget.ArrayAdapter;\r
 import android.widget.Button;\r
 import android.widget.ListView;\r
 import android.widget.Spinner;\r
 \r
 import com.td.db.History;\r
 import com.td.db.HistoryDao;\r
+import com.td.db.Train;\r
 import com.td.db.TrainDao;\r
+import com.td.service.TrainTwitterAdapter;\r
 import com.td.utility.BaseActivity;\r
+import com.td.utility.Debug;\r
 import com.td.utility.EditPrefUtil;\r
 \r
 public class HistoryListActivity extends BaseActivity {\r
     private ListView listView;\r
     private Spinner spinner;\r
     private Button button;\r
-\r
+    private List<Train> trainList;\r
+    \r
     private EditPrefUtil pref = new EditPrefUtil(this);\r
 \r
        @Override\r
@@ -36,7 +43,37 @@ public class HistoryListActivity extends BaseActivity {
                                HistoryListActivity.this.finish();\r
                        }});\r
                \r
-               updateList();\r
+               spinner.setOnItemSelectedListener(new OnItemSelectedListener(){\r
+                       public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {\r
+                                //Spinner spinner = (Spinner) parent;\r
+                               updateList();\r
+                       }\r
+\r
+                       public void onNothingSelected(AdapterView<?> parent) {\r
+                               // TODO Auto-generated method stub\r
+                               \r
+                       }});\r
+               \r
+               trainList = TrainDao.getInstance().search(true);\r
+               if (Debug.isDebug()){\r
+                       Train t;\r
+                       t = new Train(TrainTwitterAdapter.START_ID, "\8aJ\8en");\r
+                       trainList.add(t);\r
+                       t = new Train(TrainTwitterAdapter.ERROR_ID, "\83G\83\89\81[");\r
+                       trainList.add(t);\r
+               }\r
+               ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item);\r
+               for (Train train : trainList){\r
+                       adapter.add(train.getName());\r
+               }\r
+               spinner.setAdapter(adapter);\r
+               adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);\r
+               \r
+               int n = 0;\r
+               if (trainList.size() > 0){\r
+                       spinner.setSelection(n);\r
+                       updateList();\r
+               }\r
        }\r
        \r
        private void updateList(){\r
@@ -47,22 +84,14 @@ public class HistoryListActivity extends BaseActivity {
                HistoryDao hisDao = HistoryDao.getInstance();\r
                TrainDao traDao = TrainDao.getInstance();\r
 \r
-               List<History> list = hisDao.search(this, ymd, from, to);\r
+               int n  = spinner.getSelectedItemPosition();\r
+               Train train = trainList.get(n);\r
+               long id = train.getId();\r
+               \r
+               List<History> list = hisDao.search(this, id, ymd, from, to);\r
 \r
                HistoryListViewArrayAdapter adapter = new HistoryListViewArrayAdapter(this,\r
                                R.layout.history_list_item_1, list);\r
                listView.setAdapter(adapter);           \r
-\r
-               //              for (History history : list) {\r
-//                     int hm = history.getHm();\r
-//                     String text = DateUtil.formattedHm(hm);\r
-//                     \r
-//                     long id = history.getRouteId();\r
-//                     Train train = traDao.searchById(id);\r
-//                     if (train != null){\r
-//                             String route = train.getName();\r
-//\r
-//                     }\r
-//             }\r
        }\r
 }\r