履歴に起動、エラー挿入

diff --git a/workspace/SelfStalker/bin/SelfStalker.apk b/workspace/SelfStalker/bin/SelfStalker.apk
index 93e2be3..2e09045 100644 (file)
Binary files a/workspace/SelfStalker/bin/SelfStalker.apk and b/workspace/SelfStalker/bin/SelfStalker.apk differ

diff --git a/workspace/SelfStalker/bin/resources.ap_ b/workspace/SelfStalker/bin/resources.ap_
index a6b5f8c..622774d 100644 (file)
Binary files a/workspace/SelfStalker/bin/resources.ap_ and b/workspace/SelfStalker/bin/resources.ap_ differ

diff --git a/workspace/TrainDelayed/AndroidManifest.xml b/workspace/TrainDelayed/AndroidManifest.xml
index 0fd08fa..5ea39b8 100644 (file)
--- a/workspace/TrainDelayed/AndroidManifest.xml
+++ b/workspace/TrainDelayed/AndroidManifest.xml
@@ -25,9 +25,9 @@
                <activity android:name=".HistoryListActivity" />
 
 <!--           
-       <service android:enabled="true" android:name="com.td.service.TrainDelayedServiceImpl" />
--->
        <service android:enabled="true" android:name="com.td.service.TrainDelayedServiceImpl" android:process=":service" />
+-->
+       <service android:enabled="true" android:name="com.td.service.TrainDelayedServiceImpl" />
        <service android:enabled="true" android:name=".service.TrainService" />
 
  

diff --git a/workspace/TrainDelayed/gen/com/td/R.java b/workspace/TrainDelayed/gen/com/td/R.java
index 241bc6f..967a9ea 100644 (file)
--- a/workspace/TrainDelayed/gen/com/td/R.java
+++ b/workspace/TrainDelayed/gen/com/td/R.java
@@ -16,100 +16,101 @@ public final class R {
         public static final int on=0x7f020002;\r
     }\r
     public static final class id {\r
-        public static final int LinearLayout34=0x7f050052;\r
-        public static final int LinearLayout64=0x7f050037;\r
+        public static final int LinearLayout34=0x7f050053;\r
+        public static final int LinearLayout64=0x7f050038;\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 LinearLayout84=0x7f050045;\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 button11=0x7f050005;\r
         public static final int button12=0x7f050006;\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 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 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 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 button91=0x7f050013;\r
+        public static final int buttona1=0x7f05005e;\r
         public static final int checkBox=0x7f050000;\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 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 editText71=0x7f050009;\r
         public static final int editText72=0x7f05000a;\r
-        public static final int editText81=0x7f050043;\r
+        public static final int editText81=0x7f050044;\r
         public static final int historyView11=0x7f050004;\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 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 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 scrollView11=0x7f050003;\r
-        public static final int scrollView61=0x7f05002d;\r
+        public static final int scrollView61=0x7f05002e;\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=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 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 textView11=0x7f050002;\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 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 textView91=0x7f05000e;\r
-        public static final int textViewa1=0x7f05005b;\r
-        public static final int waitViewa1=0x7f05005c;\r
+        public static final int textView92=0x7f050010;\r
+        public static final int textViewa1=0x7f05005c;\r
+        public static final int waitViewa1=0x7f05005d;\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 3f4914b..584a61c 100644 (file)
--- a/workspace/TrainDelayed/res/layout/history_list.xml
+++ b/workspace/TrainDelayed/res/layout/history_list.xml
@@ -2,6 +2,7 @@
 <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
+<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

diff --git a/workspace/TrainDelayed/res/layout/history_list_item_1.xml b/workspace/TrainDelayed/res/layout/history_list_item_1.xml
index dc47293..11be5e1 100644 (file)
--- a/workspace/TrainDelayed/res/layout/history_list_item_1.xml
+++ b/workspace/TrainDelayed/res/layout/history_list_item_1.xml
@@ -7,20 +7,18 @@
 >\r
        <TextView\r
                android:id="@+id/text911"\r
-               android:layout_width="fill_parent"\r
+               android:layout_width="wrap_content"\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
+               android:layout_weight="1"\r
        />\r
        <TextView\r
                android:id="@+id/text912"\r
-               android:layout_width="fill_parent"\r
+               android:layout_width="wrap_content"\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
+               android:layout_weight="1"\r
        />\r
 </LinearLayout>\r

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

diff --git a/workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java b/workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java
index 8a1eda2..f61ae63 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryListViewArrayAdapter.java
@@ -25,7 +25,7 @@ public class HistoryListViewArrayAdapter extends ArrayAdapter<History> {
     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
+            view = inflater.inflate(R.layout.history_list_item_1, null);  \r
         }      \r
 \r
         History item = getItem(position);\r

diff --git a/workspace/TrainDelayed/src/com/td/db/HistoryDao.java b/workspace/TrainDelayed/src/com/td/db/HistoryDao.java
index bc8b882..3395c90 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/db/HistoryDao.java
+++ b/workspace/TrainDelayed/src/com/td/db/HistoryDao.java
@@ -57,6 +57,19 @@ public class HistoryDao {
         return list;\r
        }\r
 \r
+       public List<History> search(Context context, long routeId, int ymd, int startHm, int endHm){\r
+               // TODO\r
+               //      status\82Í?\r
+               String selection = "YMD = ? AND ? <= HM AND HM <= ? AND ROUTE_ID = ?";\r
+               String[] selectionArgs = new String[4];\r
+               selectionArgs[0] = String.valueOf(ymd);\r
+               selectionArgs[1] = String.valueOf(startHm);\r
+               selectionArgs[2] = String.valueOf(endHm);\r
+               selectionArgs[3] = String.valueOf(routeId);\r
+               \r
+               return search(context, selection, selectionArgs);\r
+       }\r
+\r
        public List<History> search(Context context, int ymd, int startHm, int endHm){\r
                // TODO\r
                //      status\82Í?\r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
index 2350e12..80925c1 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
@@ -141,6 +141,14 @@ public class TrainDelayedServiceImpl extends Service {
                                                        }\r
                                                        scheduler.init();\r
                                                        schedule(-1);\r
+                                                       \r
+                                                       if (Debug.isDebug()){\r
+                                                               TrainTwitterAdapter.insert(\r
+                                                                               TrainDelayedServiceImpl.this,\r
+                                                                               Calendar.getInstance(),\r
+                                                                               TrainTwitterAdapter.START_ID, -1, (int)id,\r
+                                                                               -1);\r
+                                                       }\r
                                                } catch (Exception e) {\r
                                                        // TODO\r
                                                        Debug.t(TrainDelayedServiceImpl.this,\r

diff --git a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
index 2fdf709..cdc2c4d 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
@@ -10,6 +10,7 @@ import twitter4j.TwitterAdapter;
 import twitter4j.TwitterException;\r
 import twitter4j.TwitterMethod;\r
 import android.content.ContentValues;\r
+import android.content.Context;\r
 import android.net.Uri;\r
 \r
 import com.td.HistoryContentProvider;\r
@@ -19,6 +20,9 @@ import com.td.utility.DateUtil;
 import com.td.utility.Debug;\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 Calendar cal;\r
 \r
@@ -117,13 +121,17 @@ public class TrainTwitterAdapter extends TwitterAdapter {
        }\r
 \r
        private void insert(long routeId, long diff, int count, int status) {\r
+               insert(context, cal, routeId, diff, count, status);\r
+       }\r
+       \r
+       public static void insert(Context context, Calendar cal, long routeId, long diff, int count, int status) {\r
                Date date = cal.getTime();\r
 \r
                int ymd = DateUtil.getYmd(date);\r
                int hm = DateUtil.getHm(date);\r
                int w = cal.get(Calendar.DAY_OF_WEEK) - 1;\r
 \r
-               Debug.d(this, "insert " + ymd, "/" + hm, "/" + w);\r
+               Debug.d(context, "insert " + ymd, "/" + hm, "/" + w);\r
 \r
                ContentValues values = new ContentValues();\r
                values.put(HistoryContentProvider.Fields.ROUTE_ID, routeId);\r
@@ -136,11 +144,14 @@ public class TrainTwitterAdapter extends TwitterAdapter {
 \r
                Uri uri = context.getContentResolver().insert(\r
                                HistoryContentProvider.CONTENT_URI, values);\r
-               Debug.d(this, uri.toString());\r
+               Debug.d(context, uri.toString());\r
        }\r
 \r
        @Override\r
        public void onException(TwitterException e, TwitterMethod method) {\r
                Debug.d(this, null, e);\r
+               if (Debug.isDebug()){\r
+                       insert(ERROR_ID, -1, -1, -1);\r
+               }\r
        }\r
 }\r