設定機能追加

diff --git a/workspace/TrainDelayed/AndroidManifest.xml b/workspace/TrainDelayed/AndroidManifest.xml
index 5ea39b8..9e74dba 100644 (file)
--- 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 (file)
--- 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;\r
     }\r
     public static final class id {\r
-        public static final int LinearLayout34=0x7f050053;\r
-        public static final int LinearLayout64=0x7f050038;\r
+        public static final int LinearLayout34=0x7f050054;\r
+        public static final int LinearLayout64=0x7f050039;\r
         public static final int LinearLayout74=0x7f05000b;\r
-        public static final int LinearLayout84=0x7f050045;\r
+        public static final int LinearLayout84=0x7f050046;\r
         public static final int LinearLayout94=0x7f050012;\r
-        public static final int button01=0x7f05001a;\r
-        public static final int button02=0x7f05001c;\r
-        public static final int button03=0x7f05001e;\r
-        public static final int button04=0x7f050020;\r
-        public static final int button05=0x7f050022;\r
-        public static final int button06=0x7f050024;\r
-        public static final int button07=0x7f050026;\r
-        public static final int button09=0x7f05002c;\r
-        public static final int button0f=0x7f050028;\r
-        public static final int button0z=0x7f05002a;\r
+        public static final int button01=0x7f05001b;\r
+        public static final int button02=0x7f05001d;\r
+        public static final int button03=0x7f05001f;\r
+        public static final int button04=0x7f050021;\r
+        public static final int button05=0x7f050023;\r
+        public static final int button06=0x7f050025;\r
+        public static final int button07=0x7f050027;\r
+        public static final int button09=0x7f05002d;\r
+        public static final int button0f=0x7f050029;\r
+        public static final int button0z=0x7f05002b;\r
         public static final int button11=0x7f050005;\r
         public static final int button12=0x7f050006;\r
         public static final int button13=0x7f050007;\r
-        public static final int button31=0x7f050054;\r
-        public static final int button32=0x7f050055;\r
-        public static final int button33=0x7f050052;\r
-        public static final int button41=0x7f050041;\r
-        public static final int button51=0x7f050058;\r
-        public static final int button61=0x7f050039;\r
-        public static final int button62=0x7f05003a;\r
-        public static final int button63=0x7f05003b;\r
-        public static final int button64=0x7f05003c;\r
-        public static final int button65=0x7f05003d;\r
-        public static final int button66=0x7f05003e;\r
+        public static final int button31=0x7f050055;\r
+        public static final int button32=0x7f050056;\r
+        public static final int button33=0x7f050053;\r
+        public static final int button41=0x7f050042;\r
+        public static final int button51=0x7f050059;\r
+        public static final int button61=0x7f05003a;\r
+        public static final int button62=0x7f05003b;\r
+        public static final int button63=0x7f05003c;\r
+        public static final int button64=0x7f05003d;\r
+        public static final int button65=0x7f05003e;\r
+        public static final int button66=0x7f05003f;\r
         public static final int button71=0x7f05000c;\r
         public static final int button72=0x7f05000d;\r
-        public static final int button81=0x7f050046;\r
-        public static final int button82=0x7f050047;\r
-        public static final int button83=0x7f050048;\r
-        public static final int button84=0x7f050049;\r
-        public static final int button85=0x7f05004a;\r
-        public static final int button86=0x7f05004b;\r
+        public static final int button81=0x7f050047;\r
+        public static final int button82=0x7f050048;\r
+        public static final int button83=0x7f050049;\r
+        public static final int button84=0x7f05004a;\r
+        public static final int button85=0x7f05004b;\r
+        public static final int button86=0x7f05004c;\r
         public static final int button91=0x7f050013;\r
-        public static final int buttona1=0x7f05005e;\r
+        public static final int button92=0x7f050014;\r
+        public static final int buttona1=0x7f05005f;\r
         public static final int checkBox=0x7f050000;\r
-        public static final int checkBox31=0x7f050050;\r
-        public static final int checkBox32=0x7f050051;\r
-        public static final int checkBox61=0x7f05002f;\r
-        public static final int checkBox62=0x7f050030;\r
-        public static final int checkBox63=0x7f050031;\r
-        public static final int checkBox64=0x7f050032;\r
-        public static final int checkBox65=0x7f050033;\r
-        public static final int checkBox66=0x7f050034;\r
-        public static final int checkBox67=0x7f050035;\r
-        public static final int editText31=0x7f05004e;\r
-        public static final int editText32=0x7f05004f;\r
-        public static final int editText61=0x7f050036;\r
-        public static final int editText62=0x7f050037;\r
+        public static final int checkBox31=0x7f050051;\r
+        public static final int checkBox32=0x7f050052;\r
+        public static final int checkBox61=0x7f050030;\r
+        public static final int checkBox62=0x7f050031;\r
+        public static final int checkBox63=0x7f050032;\r
+        public static final int checkBox64=0x7f050033;\r
+        public static final int checkBox65=0x7f050034;\r
+        public static final int checkBox66=0x7f050035;\r
+        public static final int checkBox67=0x7f050036;\r
+        public static final int editText31=0x7f05004f;\r
+        public static final int editText32=0x7f050050;\r
+        public static final int editText61=0x7f050037;\r
+        public static final int editText62=0x7f050038;\r
         public static final int editText71=0x7f050009;\r
         public static final int editText72=0x7f05000a;\r
-        public static final int editText81=0x7f050044;\r
+        public static final int editText81=0x7f050045;\r
         public static final int historyView11=0x7f050004;\r
-        public static final int imageView1=0x7f050059;\r
-        public static final int linearLayout00=0x7f050016;\r
-        public static final int linearLayout01=0x7f050019;\r
-        public static final int linearLayout02=0x7f05001b;\r
-        public static final int linearLayout03=0x7f05001d;\r
-        public static final int linearLayout04=0x7f05001f;\r
-        public static final int linearLayout05=0x7f050021;\r
-        public static final int linearLayout06=0x7f050023;\r
-        public static final int linearLayout07=0x7f050025;\r
-        public static final int linearLayout09=0x7f05002b;\r
-        public static final int linearLayout0f=0x7f050027;\r
-        public static final int linearLayout0z=0x7f050029;\r
-        public static final int linearLayout30=0x7f05004c;\r
-        public static final int linearLayouta0=0x7f05005b;\r
-        public static final int listView61=0x7f05002d;\r
-        public static final int listView81=0x7f050043;\r
+        public static final int imageView1=0x7f05005a;\r
+        public static final int linearLayout00=0x7f050017;\r
+        public static final int linearLayout01=0x7f05001a;\r
+        public static final int linearLayout02=0x7f05001c;\r
+        public static final int linearLayout03=0x7f05001e;\r
+        public static final int linearLayout04=0x7f050020;\r
+        public static final int linearLayout05=0x7f050022;\r
+        public static final int linearLayout06=0x7f050024;\r
+        public static final int linearLayout07=0x7f050026;\r
+        public static final int linearLayout09=0x7f05002c;\r
+        public static final int linearLayout0f=0x7f050028;\r
+        public static final int linearLayout0z=0x7f05002a;\r
+        public static final int linearLayout30=0x7f05004d;\r
+        public static final int linearLayouta0=0x7f05005c;\r
+        public static final int listView61=0x7f05002e;\r
+        public static final int listView81=0x7f050044;\r
         public static final int listView91=0x7f050011;\r
-        public static final int menu41=0x7f050040;\r
-        public static final int menu51=0x7f050057;\r
-        public static final int scrollView01=0x7f050018;\r
+        public static final int menu41=0x7f050041;\r
+        public static final int menu51=0x7f050058;\r
+        public static final int scrollView01=0x7f050019;\r
         public static final int scrollView11=0x7f050003;\r
-        public static final int scrollView61=0x7f05002e;\r
+        public static final int scrollView61=0x7f05002f;\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 text911=0x7f050014;\r
-        public static final int text912=0x7f050015;\r
-        public static final int textView01=0x7f050017;\r
-        public static final int textView1=0x7f05005a;\r
+        public static final int text911=0x7f050015;\r
+        public static final int text912=0x7f050016;\r
+        public static final int textView01=0x7f050018;\r
+        public static final int textView1=0x7f05005b;\r
         public static final int textView11=0x7f050002;\r
-        public static final int textView31=0x7f05004d;\r
-        public static final int textView41=0x7f05003f;\r
-        public static final int textView51=0x7f050056;\r
-        public static final int textView81=0x7f050042;\r
+        public static final int textView31=0x7f05004e;\r
+        public static final int textView41=0x7f050040;\r
+        public static final int textView51=0x7f050057;\r
+        public static final int textView81=0x7f050043;\r
         public static final int textView91=0x7f05000e;\r
         public static final int textView92=0x7f050010;\r
-        public static final int textViewa1=0x7f05005c;\r
-        public static final int waitViewa1=0x7f05005d;\r
+        public static final int textViewa1=0x7f05005d;\r
+        public static final int waitViewa1=0x7f05005e;\r
     }\r
     public static final class layout {\r
         public static final int check_list_item_1=0x7f030000;\r

diff --git a/workspace/TrainDelayed/res/layout/history_list.xml b/workspace/TrainDelayed/res/layout/history_list.xml
index 584a61c..223bd15 100644 (file)
--- 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>\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
+       <Button android:text="@+string/conf_button" android:id="@+id/button91" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="@+string/return_button" android:id="@+id/button92" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
 </LinearLayout>\r
 </LinearLayout>\r

diff --git a/workspace/TrainDelayed/src/com/td/ConfActivity.java b/workspace/TrainDelayed/src/com/td/ConfActivity.java
new file mode 100644 (file)
index 0000000..c3824b0
--- /dev/null
+++ b/workspace/TrainDelayed/src/com/td/ConfActivity.java
@@ -0,0 +1,6 @@
+package com.td;\r
+\r
+import android.app.Activity;\r
+\r
+public class ConfActivity extends Activity {\r
+}\r

diff --git a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
index ca485c1..f9171bb 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
@@ -2,6 +2,7 @@ package com.td;
 \r
 import java.util.List;\r
 \r
+import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
@@ -24,7 +25,8 @@ import com.td.utility.EditPrefUtil;
 public class HistoryListActivity extends BaseActivity {\r
     private ListView listView;\r
     private Spinner spinner;\r
-    private Button button;\r
+    private Button button1;\r
+    private Button button2;\r
     private List<Train> trainList;\r
     \r
     private EditPrefUtil pref = new EditPrefUtil(this);\r
@@ -36,9 +38,17 @@ public class HistoryListActivity extends BaseActivity {
                \r
                listView = (ListView) findViewById(R.id.listView91);\r
                spinner = (Spinner) findViewById(R.id.spinner91);\r
-               button = (Button) findViewById(R.id.button91);\r
+               button1 = (Button) findViewById(R.id.button91);\r
+               button2 = (Button) findViewById(R.id.button92);\r
                \r
-               button.setOnClickListener(new OnClickListener(){\r
+               button1.setOnClickListener(new OnClickListener(){\r
+                       public void onClick(View view) {\r
+                               Intent intent = new Intent(HistoryListActivity.this,\r
+                                               (Class<?>) HistoryConfActivity.class);\r
+                               startActivityForResult(intent, -1);\r
+                       }});\r
+\r
+               button2.setOnClickListener(new OnClickListener(){\r
                        public void onClick(View view) {\r
                                HistoryListActivity.this.finish();\r
                        }});\r

diff --git a/workspace/TrainDelayed/src/com/td/service/Scheduler.java b/workspace/TrainDelayed/src/com/td/service/Scheduler.java
index 6ca59a9..a5714fa 100644 (file)
--- 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;\r
 import com.td.db.Train;\r
 import com.td.db.TrainDao;\r
+import com.td.utility.ConfUtil;\r
 import com.td.utility.DateUtil;\r
 import com.td.utility.Debug;\r
 \r
@@ -39,15 +40,15 @@ public class Scheduler {
                Debug.d(this, "end init");\r
        }\r
        \r
-       public long calcSchedule(long now){\r
+       public long calcSchedule(long now, int len){\r
                Debug.d(this, "start");\r
-               long t = nextSchedule(now);\r
+               long t = nextSchedule(now, len);\r
                Debug.d(this, "end");\r
                return t;\r
        }\r
 \r
-       public long nextSchedule(long now){\r
-               long next = now + 60 * DateUtil.LEN * 1000;\r
+       public long nextSchedule(long now, int len){\r
+               long next = now + 60 * len * 1000;\r
                \r
                cal.setTimeInMillis(next);\r
                Date date = cal.getTime();\r

diff --git a/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java b/workspace/TrainDelayed/src/com/td/service/SchedulerTest.java
index 8da4e73..8219593 100644 (file)
--- 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();\r
                \r
                for (int i = 0; i < 5; i++){\r
-                       t = sc.calcSchedule(t);\r
+                       t = sc.calcSchedule(t, DateUtil.LEN);\r
                        Date d = DateUtil.getDate(t);\r
                        String ymd = DateUtil.formattedYmd(DateUtil.getYmd(d));\r
                        String hm = DateUtil.formattedHm(DateUtil.getHm(d));\r
@@ -162,7 +162,7 @@ public class SchedulerTest {
                                break;\r
                        }\r
                        \r
-                       next = sc.nextSchedule(now);\r
+                       next = sc.nextSchedule(now, DateUtil.LEN);\r
                        if (next < 0){\r
                                throw new TestException();\r
                        }\r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
index 80925c1..d38d881 100644 (file)
--- 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;\r
 import com.td.db.Keyword;\r
 import com.td.db.Train;\r
+import com.td.utility.ConfUtil;\r
 import com.td.utility.DateUtil;\r
 import com.td.utility.Debug;\r
 import com.td.utility.EditPrefUtil;\r
@@ -157,7 +158,8 @@ public class TrainDelayedServiceImpl extends Service {
                                                }\r
                                        }\r
 \r
-                                       long next = scheduler.calcSchedule(now);\r
+                                       int len = ConfUtil.getLen(pref);\r
+                                       long next = scheduler.calcSchedule(now, len);\r
                                        String nextStr = DateUtil.formatted(next);\r
                                        Debug.t(TrainDelayedServiceImpl.this, "\8e\9f\89ñ\8bN\93®\8e\9e\8d\8f " + nextStr);\r
                                        Debug.d(this, "\8e\9f\89ñ\8bN\93®\8e\9e\8d\8f " + nextStr);\r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
index cdc2c4d..261c782 100644 (file)
--- 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;\r
 import com.td.db.Keyword;\r
 import com.td.db.Train;\r
+import com.td.utility.ConfUtil;\r
 import com.td.utility.DateUtil;\r
 import com.td.utility.Debug;\r
+import com.td.utility.EditPrefUtil;\r
 \r
 public class TrainTwitterAdapter extends TwitterAdapter {\r
        public static final long START_ID = Long.MAX_VALUE;\r
        public static final long ERROR_ID = START_ID - 1;\r
        \r
        private TrainDelayedServiceImpl context;\r
+       private EditPrefUtil pref;\r
+\r
        private Calendar cal;\r
 \r
        public TrainTwitterAdapter(TrainDelayedServiceImpl context) {\r
                this.context = context;\r
+               pref = new EditPrefUtil(context);\r
        }\r
 \r
        public void setCalender(Calendar cal) {\r
@@ -39,6 +44,8 @@ public class TrainTwitterAdapter extends TwitterAdapter {
                super.searched(result);\r
 \r
                try {\r
+                       int len = ConfUtil.getLen(pref);\r
+                       \r
                        long min = Long.MAX_VALUE;\r
                        long max = 0;\r
 \r
@@ -47,7 +54,7 @@ public class TrainTwitterAdapter extends TwitterAdapter {
                        Date curDate = cal.getTime();\r
 \r
                        long cur = curDate.getTime();\r
-                       long from = cur - DateUtil.LEN * 60 * 1000;\r
+                       long from = cur - len * 60 * 1000;\r
                        int count = 0;\r
                        long diff = 0;\r
 \r
@@ -78,7 +85,7 @@ public class TrainTwitterAdapter extends TwitterAdapter {
                        }\r
                        diff = 0;\r
                        if (minDate != null && maxDate != null) {\r
-                               diff = DateUtil.LEN;\r
+                               diff = len;\r
                        }\r
 \r
                        String query = result.getQuery();\r

diff --git a/workspace/TrainDelayed/src/com/td/utility/ConfUtil.java b/workspace/TrainDelayed/src/com/td/utility/ConfUtil.java
new file mode 100644 (file)
index 0000000..c794533
--- /dev/null
+++ b/workspace/TrainDelayed/src/com/td/utility/ConfUtil.java
@@ -0,0 +1,13 @@
+package com.td.utility;\r
+\r
+\r
+public class ConfUtil {\r
+       public static final String PREF_CNF_LEN = "CNF_LEN";\r
+       public static final String PREF_CNF_WIDTH = "CNF_WIDTH";\r
+       public static final String PREF_CNF_HEIGHT = "CNF_HEIGHT";\r
+\r
+       public static int getLen(PrefUtil pref){\r
+               return pref.getInt(PREF_CNF_LEN, DateUtil.LEN);\r
+       }\r
+\r
+}\r

diff --git a/workspace/TrainDelayed/src/com/td/utility/PrefUtil.java b/workspace/TrainDelayed/src/com/td/utility/PrefUtil.java
index 9ddcbbe..0e0c056 100644 (file)
--- 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;\r
 \r
-interface PrefUtil {\r
+public interface PrefUtil {\r
        void put(String key, String value);\r
        void put(String key, int value);\r
        String get(String key);\r