From cb42d536ce9a5e45bb45628c8b62812a50478480 Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Thu, 4 Aug 2011 23:37:55 +0900
Subject: [PATCH] =?utf8?q?=E5=B1=A5=E6=AD=B4=E3=81=AB=E8=B5=B7=E5=8B=95?=
 =?utf8?q?=E3=80=81=E3=82=A8=E3=83=A9=E3=83=BC=E6=8C=BF=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 workspace/SelfStalker/bin/SelfStalker.apk          | Bin 16293 -> 16293 bytes
 workspace/SelfStalker/bin/resources.ap_            | Bin 11544 -> 11544 bytes
 workspace/TrainDelayed/AndroidManifest.xml         |   4 +-
 workspace/TrainDelayed/gen/com/td/R.java           | 157 +++++++++++----------
 workspace/TrainDelayed/res/layout/history_list.xml |   1 +
 .../res/layout/history_list_item_1.xml             |  10 +-
 .../src/com/td/HistoryListActivity.java            |  59 ++++++--
 .../src/com/td/HistoryListViewArrayAdapter.java    |   2 +-
 .../TrainDelayed/src/com/td/db/HistoryDao.java     |  13 ++
 .../com/td/service/TrainDelayedServiceImpl.java    |   8 ++
 .../src/com/td/service/TrainTwitterAdapter.java    |  15 +-
 11 files changed, 165 insertions(+), 104 deletions(-)

diff --git a/workspace/SelfStalker/bin/SelfStalker.apk b/workspace/SelfStalker/bin/SelfStalker.apk
index 93e2be3feabc6e1c5737b49bfa0639688843ea15..2e09045adaebcde1d0259bd2ffb70403b6558f45 100644
GIT binary patch
delta 200
zcmZ2lzqFn=z?+#xgn<JHE7@5#@=jx92GX0CF_u6Wvdkx#z#=bL53+$7Yj`&EgBeLO
zW)P9tN@qF1BH7x>++fB<v-uG1#TGju41KE^U~?v)vT*__napo%52gcc?ZEUTTT3u~
g&ej!7i`hZwI4Hf$&I~Mm-wvWr(cT)&kGFRN0C*cTPyhe`

delta 200
zcmZ2lzqFn=z?+#xgn<JHm+fZU$UBXZ8Axwl##jPj$TFW`V(tfuykI@Z24<|`*~|}S
zB*~aTL}n|U<pAr-)=uUIGcKCVhiEUh*a>0iTg_ksNliXw;{>MpZSBEypsgLqw8@if
lEy46TTURhGW(T3;fHX+oGCMOcecukEPto2Q%#XKs0{|mzMyvn;

diff --git a/workspace/SelfStalker/bin/resources.ap_ b/workspace/SelfStalker/bin/resources.ap_
index a6b5f8c23fab5ff2e317711754d8f560a6ff7168..622774da686e3faa934fac312ced1d5818f77d2b 100644
GIT binary patch
delta 132
zcmbOcH6w~Qz?+#xgn@~HgQ1e0Wg~ABBQucRJc%&{!uZLwg9$9Mh4mmCm{GyAnIFv1
qlQDycq${200EtYt)V2fDRoeDodJmNUSKAUIuj2})8=>?`9e)6UJ0Z>h

delta 132
zcmbOcH6w~Qz?+#xgn@~HgQ0&n<3`>lMrI(rc@kp^gz=MU2NPIi3+q8PFr$KJGe4N2
qCu0T?Nmn}00TP*Psci?QtF-OG^d2bxueK#bUdI(oH$v%?I{p9-_bjjg

diff --git a/workspace/TrainDelayed/AndroidManifest.xml b/workspace/TrainDelayed/AndroidManifest.xml
index 0fd08fa..5ea39b8 100644
--- 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
--- 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;
     }
     public static final class id {
-        public static final int LinearLayout34=0x7f050052;
-        public static final int LinearLayout64=0x7f050037;
+        public static final int LinearLayout34=0x7f050053;
+        public static final int LinearLayout64=0x7f050038;
         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 LinearLayout84=0x7f050045;
+        public static final int LinearLayout94=0x7f050012;
+        public static final int button01=0x7f05001a;
+        public static final int button02=0x7f05001c;
+        public static final int button03=0x7f05001e;
+        public static final int button04=0x7f050020;
+        public static final int button05=0x7f050022;
+        public static final int button06=0x7f050024;
+        public static final int button07=0x7f050026;
+        public static final int button09=0x7f05002c;
+        public static final int button0f=0x7f050028;
+        public static final int button0z=0x7f05002a;
         public static final int button11=0x7f050005;
         public static final int button12=0x7f050006;
         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 button31=0x7f050054;
+        public static final int button32=0x7f050055;
+        public static final int button33=0x7f050052;
+        public static final int button41=0x7f050041;
+        public static final int button51=0x7f050058;
+        public static final int button61=0x7f050039;
+        public static final int button62=0x7f05003a;
+        public static final int button63=0x7f05003b;
+        public static final int button64=0x7f05003c;
+        public static final int button65=0x7f05003d;
+        public static final int button66=0x7f05003e;
         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 button81=0x7f050046;
+        public static final int button82=0x7f050047;
+        public static final int button83=0x7f050048;
+        public static final int button84=0x7f050049;
+        public static final int button85=0x7f05004a;
+        public static final int button86=0x7f05004b;
+        public static final int button91=0x7f050013;
+        public static final int buttona1=0x7f05005e;
         public static final int checkBox=0x7f050000;
-        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 checkBox31=0x7f050050;
+        public static final int checkBox32=0x7f050051;
+        public static final int checkBox61=0x7f05002f;
+        public static final int checkBox62=0x7f050030;
+        public static final int checkBox63=0x7f050031;
+        public static final int checkBox64=0x7f050032;
+        public static final int checkBox65=0x7f050033;
+        public static final int checkBox66=0x7f050034;
+        public static final int checkBox67=0x7f050035;
+        public static final int editText31=0x7f05004e;
+        public static final int editText32=0x7f05004f;
+        public static final int editText61=0x7f050036;
+        public static final int editText62=0x7f050037;
         public static final int editText71=0x7f050009;
         public static final int editText72=0x7f05000a;
-        public static final int editText81=0x7f050043;
+        public static final int editText81=0x7f050044;
         public static final int historyView11=0x7f050004;
-        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 imageView1=0x7f050059;
+        public static final int linearLayout00=0x7f050016;
+        public static final int linearLayout01=0x7f050019;
+        public static final int linearLayout02=0x7f05001b;
+        public static final int linearLayout03=0x7f05001d;
+        public static final int linearLayout04=0x7f05001f;
+        public static final int linearLayout05=0x7f050021;
+        public static final int linearLayout06=0x7f050023;
+        public static final int linearLayout07=0x7f050025;
+        public static final int linearLayout09=0x7f05002b;
+        public static final int linearLayout0f=0x7f050027;
+        public static final int linearLayout0z=0x7f050029;
+        public static final int linearLayout30=0x7f05004c;
+        public static final int linearLayouta0=0x7f05005b;
+        public static final int listView61=0x7f05002d;
+        public static final int listView81=0x7f050043;
+        public static final int listView91=0x7f050011;
+        public static final int menu41=0x7f050040;
+        public static final int menu51=0x7f050057;
+        public static final int scrollView01=0x7f050018;
         public static final int scrollView11=0x7f050003;
-        public static final int scrollView61=0x7f05002d;
+        public static final int scrollView61=0x7f05002e;
         public static final int spinner71=0x7f050008;
         public static final int spinner91=0x7f05000f;
         public static final int text2=0x7f050001;
-        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 text911=0x7f050014;
+        public static final int text912=0x7f050015;
+        public static final int textView01=0x7f050017;
+        public static final int textView1=0x7f05005a;
         public static final int textView11=0x7f050002;
-        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 textView31=0x7f05004d;
+        public static final int textView41=0x7f05003f;
+        public static final int textView51=0x7f050056;
+        public static final int textView81=0x7f050042;
         public static final int textView91=0x7f05000e;
-        public static final int textViewa1=0x7f05005b;
-        public static final int waitViewa1=0x7f05005c;
+        public static final int textView92=0x7f050010;
+        public static final int textViewa1=0x7f05005c;
+        public static final int waitViewa1=0x7f05005d;
     }
     public static final class layout {
         public static final int check_list_item_1=0x7f030000;
diff --git a/workspace/TrainDelayed/res/layout/history_list.xml b/workspace/TrainDelayed/res/layout/history_list.xml
index 3f4914b..584a61c 100644
--- 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">
 <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>
+<TextView android:text="@+string/keyword_title" android:id="@+id/textView92" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
 <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" /> 
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
--- a/workspace/TrainDelayed/res/layout/history_list_item_1.xml
+++ b/workspace/TrainDelayed/res/layout/history_list_item_1.xml
@@ -7,20 +7,18 @@
 >
 	<TextView
 		android:id="@+id/text911"
-		android:layout_width="fill_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
 		android:gravity="center_vertical"
 		android:paddingLeft="2dip"
-		android:minHeight="?android:attr/listPreferredItemHeight"
+		android:layout_weight="1"
 	/>
 	<TextView
 		android:id="@+id/text912"
-		android:layout_width="fill_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
 		android:gravity="center_vertical"
 		android:paddingLeft="2dip"
-		android:minHeight="?android:attr/listPreferredItemHeight"
+		android:layout_weight="1"
 	/>
 </LinearLayout>
diff --git a/workspace/TrainDelayed/src/com/td/HistoryListActivity.java b/workspace/TrainDelayed/src/com/td/HistoryListActivity.java
index 38d08e2..ca485c1 100644
--- 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;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
 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.Train;
 import com.td.db.TrainDao;
+import com.td.service.TrainTwitterAdapter;
 import com.td.utility.BaseActivity;
+import com.td.utility.Debug;
 import com.td.utility.EditPrefUtil;
 
 public class HistoryListActivity extends BaseActivity {
     private ListView listView;
     private Spinner spinner;
     private Button button;
-
+    private List<Train> trainList;
+    
     private EditPrefUtil pref = new EditPrefUtil(this);
 
 	@Override
@@ -36,7 +43,37 @@ public class HistoryListActivity extends BaseActivity {
 				HistoryListActivity.this.finish();
 			}});
 		
-		updateList();
+		spinner.setOnItemSelectedListener(new OnItemSelectedListener(){
+			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+				 //Spinner spinner = (Spinner) parent;
+				updateList();
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}});
+		
+		trainList = TrainDao.getInstance().search(true);
+		if (Debug.isDebug()){
+			Train t;
+			t = new Train(TrainTwitterAdapter.START_ID, "ŠJŽn");
+			trainList.add(t);
+			t = new Train(TrainTwitterAdapter.ERROR_ID, "ƒGƒ‰[");
+			trainList.add(t);
+		}
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item);
+		for (Train train : trainList){
+			adapter.add(train.getName());
+		}
+		spinner.setAdapter(adapter);
+		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		
+		int n = 0;
+		if (trainList.size() > 0){
+			spinner.setSelection(n);
+			updateList();
+		}
 	}
 	
 	private void updateList(){
@@ -47,22 +84,14 @@ public class HistoryListActivity extends BaseActivity {
 		HistoryDao hisDao = HistoryDao.getInstance();
 		TrainDao traDao = TrainDao.getInstance();
 
-		List<History> list = hisDao.search(this, ymd, from, to);
+		int n  = spinner.getSelectedItemPosition();
+		Train train = trainList.get(n);
+		long id = train.getId();
+		
+		List<History> list = hisDao.search(this, id, 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
index 8a1eda2..f61ae63 100644
--- 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){
         View view = convertView;  
         if(view == null){  
-            view = inflater.inflate(R.layout.check_list_item_1, null);  
+            view = inflater.inflate(R.layout.history_list_item_1, null);  
         }      
 
         History item = getItem(position);
diff --git a/workspace/TrainDelayed/src/com/td/db/HistoryDao.java b/workspace/TrainDelayed/src/com/td/db/HistoryDao.java
index bc8b882..3395c90 100644
--- 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;
 	}
 
+	public List<History> search(Context context, long routeId, int ymd, int startHm, int endHm){
+		// TODO
+		// 	status‚Í?
+		String selection = "YMD = ? AND ? <= HM AND HM <= ? AND ROUTE_ID = ?";
+		String[] selectionArgs = new String[4];
+		selectionArgs[0] = String.valueOf(ymd);
+		selectionArgs[1] = String.valueOf(startHm);
+		selectionArgs[2] = String.valueOf(endHm);
+		selectionArgs[3] = String.valueOf(routeId);
+		
+		return search(context, selection, selectionArgs);
+	}
+
 	public List<History> search(Context context, int ymd, int startHm, int endHm){
 		// TODO
 		// 	status‚Í?
diff --git a/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java b/workspace/TrainDelayed/src/com/td/service/TrainDelayedServiceImpl.java
index 2350e12..80925c1 100644
--- 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 {
 							}
 							scheduler.init();
 							schedule(-1);
+							
+							if (Debug.isDebug()){
+								TrainTwitterAdapter.insert(
+										TrainDelayedServiceImpl.this,
+										Calendar.getInstance(),
+										TrainTwitterAdapter.START_ID, -1, (int)id,
+										-1);
+							}
 						} catch (Exception e) {
 							// TODO
 							Debug.t(TrainDelayedServiceImpl.this,
diff --git a/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java b/workspace/TrainDelayed/src/com/td/service/TrainTwitterAdapter.java
index 2fdf709..cdc2c4d 100644
--- 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;
 import twitter4j.TwitterMethod;
 import android.content.ContentValues;
+import android.content.Context;
 import android.net.Uri;
 
 import com.td.HistoryContentProvider;
@@ -19,6 +20,9 @@ import com.td.utility.DateUtil;
 import com.td.utility.Debug;
 
 public class TrainTwitterAdapter extends TwitterAdapter {
+	public static final long START_ID = Long.MAX_VALUE;
+	public static final long ERROR_ID = START_ID - 1;
+	
 	private TrainDelayedServiceImpl context;
 	private Calendar cal;
 
@@ -117,13 +121,17 @@ public class TrainTwitterAdapter extends TwitterAdapter {
 	}
 
 	private void insert(long routeId, long diff, int count, int status) {
+		insert(context, cal, routeId, diff, count, status);
+	}
+	
+	public static void insert(Context context, Calendar cal, long routeId, long diff, int count, int status) {
 		Date date = cal.getTime();
 
 		int ymd = DateUtil.getYmd(date);
 		int hm = DateUtil.getHm(date);
 		int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
 
-		Debug.d(this, "insert " + ymd, "/" + hm, "/" + w);
+		Debug.d(context, "insert " + ymd, "/" + hm, "/" + w);
 
 		ContentValues values = new ContentValues();
 		values.put(HistoryContentProvider.Fields.ROUTE_ID, routeId);
@@ -136,11 +144,14 @@ public class TrainTwitterAdapter extends TwitterAdapter {
 
 		Uri uri = context.getContentResolver().insert(
 				HistoryContentProvider.CONTENT_URI, values);
-		Debug.d(this, uri.toString());
+		Debug.d(context, uri.toString());
 	}
 
 	@Override
 	public void onException(TwitterException e, TwitterMethod method) {
 		Debug.d(this, null, e);
+		if (Debug.isDebug()){
+			insert(ERROR_ID, -1, -1, -1);
+		}
 	}
 }
-- 
2.11.0