OSDN Git Service

HistoryListActivity追加
authorYuji Konishi <yuji.k64613@gmail.com>
Tue, 2 Aug 2011 15:54:32 +0000 (00:54 +0900)
committerYuji Konishi <yuji.k64613@gmail.com>
Tue, 2 Aug 2011 15:54:32 +0000 (00:54 +0900)
workspace/TrainDelayed/AndroidManifest.xml
workspace/TrainDelayed/gen/com/td/R.java
workspace/TrainDelayed/res/layout/history.xml
workspace/TrainDelayed/res/layout/history_list.xml [new file with mode: 0644]
workspace/TrainDelayed/res/layout/history_list_item_1.xml [new file with mode: 0644]
workspace/TrainDelayed/res/layout/search_word.xml
workspace/TrainDelayed/src/com/td/HistoryActivity.java
workspace/TrainDelayed/src/com/td/HistoryListActivity.java [new file with mode: 0644]
workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java [new file with mode: 0644]
workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java

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