From 964c186bb477e7a31fc017cb048e47ca3ce1625e Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Sat, 23 Jul 2011 16:46:44 +0900
Subject: [PATCH] =?utf8?q?t25799=E5=AF=BE=E7=AD=96=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 workspace/TrainDelayed/gen/com/td/R.java           | 38 ++++-----
 .../gen/com/td/service/ITrainService.java          | 23 ++++++
 workspace/TrainDelayed/res/layout/wait.xml         | 14 +++-
 workspace/TrainDelayed/res/values/strings.xml      |  3 +-
 .../TrainDelayed/src/com/td/HistoryActivity.java   |  2 +-
 .../src/com/td/TrainDelayedActivity.java           |  9 +++
 .../TrainDelayed/src/com/td/WaitActivity.java      | 32 +++++++-
 workspace/TrainDelayed/src/com/td/WaitView.java    | 89 ++++++++++++++++++++++
 .../src/com/td/service/ITrainService.aidl          |  1 +
 .../src/com/td/service/TrainService.java           | 39 ++++++++--
 .../src/com/td/utility/BaseActivity.java           |  6 ++
 .../TrainDelayed/src/com/td/utility/Debug.java     |  1 +
 12 files changed, 225 insertions(+), 32 deletions(-)
 create mode 100644 workspace/TrainDelayed/src/com/td/WaitView.java

diff --git a/workspace/TrainDelayed/gen/com/td/R.java b/workspace/TrainDelayed/gen/com/td/R.java
index d135fdd..9a2f62c 100644
--- a/workspace/TrainDelayed/gen/com/td/R.java
+++ b/workspace/TrainDelayed/gen/com/td/R.java
@@ -44,7 +44,7 @@ public final class R {
         public static final int button84=0x7f05003b;
         public static final int button85=0x7f05003c;
         public static final int button86=0x7f05003d;
-        public static final int buttona1=0x7f050045;
+        public static final int buttona1=0x7f050046;
         public static final int checkBox=0x7f050000;
         public static final int checkBox61=0x7f050022;
         public static final int checkBox62=0x7f050023;
@@ -86,6 +86,7 @@ public final class R {
         public static final int textView51=0x7f05003e;
         public static final int textView81=0x7f050035;
         public static final int textViewa1=0x7f050044;
+        public static final int waitViewa1=0x7f050045;
     }
     public static final class layout {
         public static final int check_list_item_1=0x7f030000;
@@ -101,50 +102,51 @@ public final class R {
         public static final int wait=0x7f03000a;
     }
     public static final class string {
-        public static final int add_button=0x7f040028;
+        public static final int add_button=0x7f040029;
         public static final int app_name=0x7f040001;
-        public static final int cancel_button=0x7f04002b;
+        public static final int cancel_button=0x7f04002c;
         public static final int comma_msg=0x7f04001a;
-        public static final int conf_button=0x7f040027;
+        public static final int conf_button=0x7f040028;
         public static final int conf_route_msg=0x7f040017;
         public static final int conf_time_msg=0x7f040018;
         public static final int conf_title=0x7f040005;
         public static final int date_title=0x7f040002;
-        public static final int def_button=0x7f040025;
-        public static final int delete_button=0x7f04002a;
+        public static final int def_button=0x7f040026;
+        public static final int delete_button=0x7f04002b;
         public static final int do_service_msg=0x7f04001b;
+        public static final int end_rouote_msg=0x7f04001d;
         public static final int end_service_qmsg=0x7f040015;
         public static final int end_time_title=0x7f040004;
-        public static final int exit_button=0x7f040024;
+        public static final int exit_button=0x7f040025;
         public static final int friday_title=0x7f04000c;
         public static final int hello=0x7f040000;
-        public static final int history_button=0x7f040022;
+        public static final int history_button=0x7f040023;
         public static final int history_tite=0x7f040010;
-        public static final int keyword_button=0x7f040023;
+        public static final int keyword_button=0x7f040024;
         public static final int keyword_title=0x7f04000e;
         public static final int monday_title=0x7f040008;
-        public static final int monitor_button=0x7f04001f;
-        public static final int return_button=0x7f040026;
-        public static final int route_button=0x7f04001e;
+        public static final int monitor_button=0x7f040020;
+        public static final int return_button=0x7f040027;
+        public static final int route_button=0x7f04001f;
         public static final int route_title=0x7f04000f;
         public static final int saturday_title=0x7f04000d;
-        public static final int start_service_button=0x7f040020;
+        public static final int start_rouote_msg=0x7f04001c;
+        public static final int start_service_button=0x7f040021;
         public static final int start_service_msg=0x7f040019;
         public static final int start_service_qmsg=0x7f040014;
         public static final int start_time_title=0x7f040003;
-        public static final int stop_service_button=0x7f040021;
+        public static final int stop_service_button=0x7f040022;
         public static final int sunday_title=0x7f040007;
         public static final int thursday_title=0x7f04000b;
         public static final int time_title=0x7f040011;
         public static final int tpm_title=0x7f040012;
         public static final int tuesday_title=0x7f040009;
-        public static final int update_button=0x7f040029;
-        public static final int update_route_button=0x7f04001d;
+        public static final int update_button=0x7f04002a;
+        public static final int update_route_button=0x7f04001e;
         public static final int update_route_msg=0x7f040016;
-        public static final int wait_rouote_msg=0x7f04001c;
         public static final int warn_dialog_title=0x7f040013;
         public static final int wednesday_title=0x7f04000a;
         public static final int week_title=0x7f040006;
-        public static final int yes_button=0x7f04002c;
+        public static final int yes_button=0x7f04002d;
     }
 }
diff --git a/workspace/TrainDelayed/gen/com/td/service/ITrainService.java b/workspace/TrainDelayed/gen/com/td/service/ITrainService.java
index 11a1588..8eea7e9 100644
--- a/workspace/TrainDelayed/gen/com/td/service/ITrainService.java
+++ b/workspace/TrainDelayed/gen/com/td/service/ITrainService.java
@@ -61,6 +61,13 @@ this.setListener(_arg0);
 reply.writeNoException();
 return true;
 }
+case TRANSACTION_stop:
+{
+data.enforceInterface(DESCRIPTOR);
+this.stop();
+reply.writeNoException();
+return true;
+}
 }
 return super.onTransact(code, data, reply, flags);
 }
@@ -112,10 +119,26 @@ _reply.recycle();
 _data.recycle();
 }
 }
+public void stop() throws android.os.RemoteException
+{
+android.os.Parcel _data = android.os.Parcel.obtain();
+android.os.Parcel _reply = android.os.Parcel.obtain();
+try {
+_data.writeInterfaceToken(DESCRIPTOR);
+mRemote.transact(Stub.TRANSACTION_stop, _data, _reply, 0);
+_reply.readException();
+}
+finally {
+_reply.recycle();
+_data.recycle();
+}
+}
 }
 static final int TRANSACTION_doExecute = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
 static final int TRANSACTION_setListener = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
+static final int TRANSACTION_stop = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
 }
 public int doExecute(java.lang.String msg) throws android.os.RemoteException;
 public void setListener(com.td.service.ITrainServiceCallback callback) throws android.os.RemoteException;
+public void stop() throws android.os.RemoteException;
 }
diff --git a/workspace/TrainDelayed/res/layout/wait.xml b/workspace/TrainDelayed/res/layout/wait.xml
index 3c3d4f9..52fdea3 100644
--- a/workspace/TrainDelayed/res/layout/wait.xml
+++ b/workspace/TrainDelayed/res/layout/wait.xml
@@ -8,17 +8,23 @@
 	        android:id="@+id/linearLayouta0"
 	        android:layout_height="wrap_content"
 	        android:background="#999999"
+	        android:layout_weight="0"
 	        android:padding="3dip"
 	        android:layout_width="fill_parent">
-		<TextView android:text="@+string/wait_rouote_msg"
+		<TextView android:text="@+string/start_rouote_msg"
 			android:textAppearance="?android:attr/textAppearanceMedium"
 	        android:background="#cccccc"
 			android:id="@+id/textViewa1"
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content">
-			</TextView>
+			android:layout_height="wrap_content" />
 	</LinearLayout>
-	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+    <com.td.WaitView
+              android:id="@+id/waitViewa1"
+              android:layout_margin="0dip"
+		      android:layout_weight="1"
+              android:layout_width="fill_parent"
+              android:layout_height="0dip" />
+	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0" >
 		<Button android:text="@+string/return_button" android:layout_weight="1" android:id="@+id/buttona1" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
 	</LinearLayout>
 </LinearLayout>
diff --git a/workspace/TrainDelayed/res/values/strings.xml b/workspace/TrainDelayed/res/values/strings.xml
index d208d13..258b8f2 100644
--- a/workspace/TrainDelayed/res/values/strings.xml
+++ b/workspace/TrainDelayed/res/values/strings.xml
@@ -30,7 +30,8 @@
     <string name="start_service_msg">監視を開始してください</string>
     <string name="comma_msg">、</string>
     <string name="do_service_msg">を監視しています。</string>
-    <string name="wait_rouote_msg">路線の情報を更新しています。しばらくお待ちください。</string>
+    <string name="start_rouote_msg">路線の情報を更新しています。</string>
+    <string name="end_rouote_msg">路線の情報を更新しました。メニューに戻って、監視する路線を設定してください。</string>
 
     <string name="update_route_button">路線の情報を更新する</string>
     <string name="route_button">監視する路線を設定する</string>
diff --git a/workspace/TrainDelayed/src/com/td/HistoryActivity.java b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
index f559dbd..e75ef9b 100644
--- a/workspace/TrainDelayed/src/com/td/HistoryActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
@@ -88,7 +88,7 @@ public class HistoryActivity extends BaseActivity {
 		}
 	}
 
-
+	// TODO w
 	public static int W = 0;
 	@Override
 	public void onWindowFocusChanged(boolean hasFocus) {
diff --git a/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java b/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
index ed641bb..68231c9 100644
--- a/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
+++ b/workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
@@ -226,6 +226,15 @@ public class TrainDelayedActivity extends BaseActivity {
 	}
 
 	@Override
+	protected void onDestroy() {
+		if (receiver != null){
+			unregisterReceiver(receiver);
+		}
+		
+		super.onDestroy();
+	}
+	
+	@Override
 	protected void onStart() {
 		super.onStart();
 		
diff --git a/workspace/TrainDelayed/src/com/td/WaitActivity.java b/workspace/TrainDelayed/src/com/td/WaitActivity.java
index 7757d96..7e7fcfc 100644
--- a/workspace/TrainDelayed/src/com/td/WaitActivity.java
+++ b/workspace/TrainDelayed/src/com/td/WaitActivity.java
@@ -11,6 +11,7 @@ import android.os.RemoteException;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.td.service.ITrainService;
@@ -21,6 +22,8 @@ import com.td.utility.BaseActivity;
 public class WaitActivity extends BaseActivity implements ServiceConnection {
     private static final int ID = 100;
 	private ITrainService serviceImpl;
+	private TextView textView;
+    private WaitView waitView;
     private Button button;
     
     @Override
@@ -28,8 +31,11 @@ public class WaitActivity extends BaseActivity implements ServiceConnection {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.wait);
         
+        textView = (TextView)findViewById(R.id.textViewa1);
+        waitView = (WaitView)findViewById(R.id.waitViewa1);
         button = (Button)findViewById(R.id.buttona1);
-		button.setOnClickListener(new OnClickListener() {
+
+        button.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				WaitActivity.this.finish();
 			}
@@ -51,7 +57,23 @@ public class WaitActivity extends BaseActivity implements ServiceConnection {
     	// Activity‚ªŽ€‚ñ‚Å‚àƒT[ƒrƒX‚ðI—¹‚³‚¹‚È‚¢‚½‚ß
     	startService(intent);
     }
+    
+	@Override
+	protected void onStop() {
+		unbindService(this);
+		
+		// ƒT[ƒrƒX‚́A’âŽ~‚³‚¹‚È‚¢(stopService‚ðŒÄ‚΂Ȃ¢)
+		//stopService(new Intent(this, TrainService.class));
+
+		super.onStop();
+	}
+	
 
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+	}
+	
 	public void onServiceConnected(ComponentName name, IBinder service) {
 		serviceImpl = ITrainService.Stub.asInterface(service);
 		try {
@@ -99,6 +121,9 @@ public class WaitActivity extends BaseActivity implements ServiceConnection {
 //				final String minute = Integer.toString(msg.arg1/60000);
 //				final String second = Integer.toString(msg.arg1%60000/1000);
 //				text.setText(minute+":"+second);
+				// TODO ƒvƒƒZƒX‚̍ċN“®‚ɂ͑Ήž‚Å‚«‚È‚¢
+				waitView.stop();
+				textView.setText(getString(R.string.end_rouote_msg));
 				button.setEnabled(true);
 				break;
 			default:
@@ -106,4 +131,7 @@ public class WaitActivity extends BaseActivity implements ServiceConnection {
 				break;
 			}
 		}
-	};}
+	};
+
+
+}
diff --git a/workspace/TrainDelayed/src/com/td/WaitView.java b/workspace/TrainDelayed/src/com/td/WaitView.java
new file mode 100644
index 0000000..4334b0c
--- /dev/null
+++ b/workspace/TrainDelayed/src/com/td/WaitView.java
@@ -0,0 +1,89 @@
+package com.td;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Handler;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class WaitView extends View {
+	private static final String MESSAGE = "‚µ‚΂炭‚¨‘Ò‚¿‚­‚¾‚³‚¢B";
+
+	private boolean flag = false;
+	private int x = 0;
+	private int y = 0;
+	private Thread thread = null;
+	private Paint paint = new Paint();
+
+	public WaitView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+
+		initialize();
+	}
+
+	public void stop(){
+		if (thread != null){
+			thread.stop();
+			thread = null;
+		}
+	}
+	
+	private void initialize() {
+		final Handler handler = new Handler();
+		thread = new Thread() {
+			public void run() {
+				while (thread != null) {
+					try {
+						handler.post(new Runnable() {
+							public void run() {
+								WaitView.this.invalidate();
+							}
+						});
+						Thread.sleep(100);
+					} catch (InterruptedException e) {
+						;
+					}
+				}
+				handler.post(new Runnable() {
+					public void run() {
+						WaitView.this.invalidate();
+					}
+				});
+			}
+		};
+		thread.start();
+	}
+
+	@Override
+	protected void onDraw(Canvas canvas) {
+		if (thread == null){
+			return;
+		}
+		int h = getHeight();
+		paint.setColor(Color.BLACK);
+		paint.setTextSize(h / 10);
+		int w = (int)paint.measureText(MESSAGE);
+
+		if (!flag) {
+			x = getWidth();
+			y = getHeight() / 2;
+			flag = true;
+		}
+		else if (x < -w){
+			x = getWidth();			
+		}
+		canvas.drawText(MESSAGE, x, y, paint);
+		x -= 5;
+	}
+
+	@Override
+	protected void onDetachedFromWindow() {
+		super.onDetachedFromWindow();
+		
+		stop();
+	}
+	
+	
+}
diff --git a/workspace/TrainDelayed/src/com/td/service/ITrainService.aidl b/workspace/TrainDelayed/src/com/td/service/ITrainService.aidl
index c9f4144..0c63d9e 100644
--- a/workspace/TrainDelayed/src/com/td/service/ITrainService.aidl
+++ b/workspace/TrainDelayed/src/com/td/service/ITrainService.aidl
@@ -8,4 +8,5 @@ import com.td.service.ITrainServiceCallback;
 interface ITrainService {
 	int doExecute(in String msg);
 	void setListener(in ITrainServiceCallback callback);
+	void stop();
 }
diff --git a/workspace/TrainDelayed/src/com/td/service/TrainService.java b/workspace/TrainDelayed/src/com/td/service/TrainService.java
index f54f9a9..ca63aa2 100644
--- a/workspace/TrainDelayed/src/com/td/service/TrainService.java
+++ b/workspace/TrainDelayed/src/com/td/service/TrainService.java
@@ -1,25 +1,46 @@
 package com.td.service;
 
-import com.td.utility.Debug;
-import com.td.webapi.RouteUpdater;
+import java.lang.ref.WeakReference;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.RemoteException;
 
+import com.td.utility.Debug;
+import com.td.webapi.RouteUpdater;
+
 public class TrainService extends Service {
-	private ITrainServiceCallback callback;
+	private WeakReference<ITrainServiceCallback> callbackRef;
+	private Thread thread = null;
+	// 2d‹N“®—}Ž~
+	private boolean isStart = false;
+	
+//	public TrainService(){
+//		Debug.t(this, "TrainService create");		
+//	}
 	
 	private ITrainService.Stub impl = new ITrainService.Stub(){
 		public int doExecute(String branch) throws RemoteException {
-			Thread thread = new Thread(){
+			if (isStart){
+				return -1;
+			}
+			thread = new Thread(){
 				public void run(){
+					if (isStart){
+						return;
+					}
+					isStart = true;
 					try {
 						Debug.t(TrainService.this, "TrainService start");
 						RouteUpdater ru = new RouteUpdater();
 						ru.update();
-						callback.notify("msg");
+						ITrainServiceCallback callback = callbackRef.get();
+						if (callback != null){
+							callbackRef.clear();
+							callback.notify("msg");
+							callback = null;
+						}
 						Debug.t(TrainService.this, "TrainService end");
 					} catch (RemoteException e) {
 						// TODO Auto-generated catch block
@@ -29,6 +50,7 @@ public class TrainService extends Service {
 						e.printStackTrace();
 					}
 					TrainService.this.stopSelf();
+					thread = null;
 				}
 			};
 			thread.start();
@@ -37,7 +59,12 @@ public class TrainService extends Service {
 
 		public void setListener(ITrainServiceCallback callback)
 				throws RemoteException {
-			TrainService.this.callback = callback;
+			TrainService.this.callbackRef = new WeakReference<ITrainServiceCallback>(
+					callback);
+		}
+
+		public void stop() throws RemoteException {
+			TrainService.this.stopSelf();
 		}
 	};
 	
diff --git a/workspace/TrainDelayed/src/com/td/utility/BaseActivity.java b/workspace/TrainDelayed/src/com/td/utility/BaseActivity.java
index e32af7d..0d1642e 100644
--- a/workspace/TrainDelayed/src/com/td/utility/BaseActivity.java
+++ b/workspace/TrainDelayed/src/com/td/utility/BaseActivity.java
@@ -48,6 +48,12 @@ public class BaseActivity extends Activity {
 	}
 
 	@Override
+	protected void onPause() {
+		super.onPause();
+		Debug.d(this, Debug.ON_PAUSE);
+	}
+
+	@Override
 	protected void onStop() {
 		super.onStop();
 		Debug.d(this, Debug.ON_STOP);
diff --git a/workspace/TrainDelayed/src/com/td/utility/Debug.java b/workspace/TrainDelayed/src/com/td/utility/Debug.java
index f74e93c..d649b02 100644
--- a/workspace/TrainDelayed/src/com/td/utility/Debug.java
+++ b/workspace/TrainDelayed/src/com/td/utility/Debug.java
@@ -11,6 +11,7 @@ public class Debug {
 	public static final String ON_DESTROY = "onDestroy";
 	public static final String ON_START = "onStart";
 	public static final String ON_STOP = "onStop";
+	public static final String ON_PAUSE = "onPause";
 	public static final String ON_RESTART = "onRestart";
 	public static final String ON_RESUME = "onResume";
 	public static final String ON_REBIND = "onRebind";
-- 
2.11.0