Ray Zhang 12 年 前
コミット
82b03496a7

+ 7 - 2
Apex/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.usai.apex"
-    android:versionCode="4"
-    android:versionName="A140418" >
+    android:versionCode="5"
+    android:versionName="A140429" >
 
     <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
     <uses-sdk
@@ -244,6 +244,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+                
             </intent-filter>
         </receiver>
         <receiver android:name="com.usai.apex.Alarmreceiver" >
@@ -283,6 +284,10 @@
             android:label="@string/title_activity_settings"
             android:screenOrientation="portrait"  >
         </activity>
+                <service
+            android:name="com.usai.apex.ApexBackgroundService"
+            android:label="Apex Mobile Background Service" >
+        </service>
     </application>
 
 </manifest>

+ 7 - 7
Apex/proguard-project.txt

@@ -26,13 +26,13 @@
 
 
 # Remove all Verbose/Debug logging
--optimizations code/removal/simple,code/removal/advanced
--dontobfuscate
--assumenosideeffects class android.util.Log {
-    public static *** d(...);
-    public static *** v(...);
-    public static *** i(...);
-}
+#-optimizations code/removal/simple,code/removal/advanced
+#-dontobfuscate
+#-assumenosideeffects class android.util.Log {
+#    public static *** d(...);
+#    public static *** v(...);
+#    public static *** i(...);
+#}
 
 
 -keep class com.baidu.** {*;}

ファイルの差分が大きいため隠しています
+ 337 - 492
Apex/proguard/dump.txt


+ 48 - 23
Apex/proguard/mapping.txt

@@ -259,6 +259,7 @@ android.support.v4.app.FragmentActivity -> android.support.v4.app.g:
     void dumpViewHierarchy(java.lang.String,java.io.PrintWriter,android.view.View) -> a
     void doReallyStop(boolean) -> a
     void onAttachFragment$65850823() -> c
+    android.support.v4.app.FragmentManager getSupportFragmentManager() -> d
     void startActivityForResult(android.content.Intent,int) -> startActivityForResult
     void startActivityFromFragment(android.support.v4.app.Fragment,android.content.Intent,int) -> a
     void invalidateSupportFragment(java.lang.String) -> a
@@ -7553,6 +7554,14 @@ com.usai.apex.ApexActivity -> com.usai.apex.ApexActivity:
     android.widget.TabHost mTabHost -> o
     boolean onKeyDown(int,android.view.KeyEvent) -> onKeyDown
     void onCreate(android.os.Bundle) -> onCreate
+com.usai.apex.ApexBackgroundService -> com.usai.apex.ApexBackgroundService:
+    com.usai.apex.ApexTrackingApplication app -> a
+    void onCreate() -> onCreate
+    void onStart(android.content.Intent,int) -> onStart
+    int onStartCommand(android.content.Intent,int,int) -> onStartCommand
+    android.os.IBinder onBind(android.content.Intent) -> onBind
+com.usai.apex.ApexHistoryActivity -> com.usai.apex.ApexHistoryActivity:
+    void onCreate(android.os.Bundle) -> onCreate
 com.usai.apex.ApexTrackingApplication -> com.usai.apex.ApexTrackingApplication:
     com.usai.apex.ApexTrackingApplication instance -> b
     java.lang.String m_sessionid -> c
@@ -7560,16 +7569,20 @@ com.usai.apex.ApexTrackingApplication -> com.usai.apex.ApexTrackingApplication:
     java.lang.String m_password -> e
     int ncount -> a
     boolean m_bauthorized -> f
+    long LastAlermTime -> g
+    void UpdateLastCheckMessageTime() -> a
+    long getLastCheckMessageTime() -> b
     void onCreate() -> onCreate
-    com.usai.apex.ApexTrackingApplication get_instance() -> a
+    com.usai.apex.ApexTrackingApplication get_instance() -> c
     void startalarm(java.lang.String) -> a
-    void cancelalarm() -> b
-    void logout() -> c
+    void cancelalarm() -> d
+    void logout() -> e
+    void SetAuthorizeStatus$1385ff() -> f
     void login(java.lang.String,java.lang.String,java.lang.String) -> a
-    boolean get_authorization() -> d
-    java.lang.String get_sessionid() -> e
-    java.lang.String get_user() -> f
-    java.lang.String get_pass() -> g
+    boolean get_authorization() -> g
+    java.lang.String get_sessionid() -> h
+    java.lang.String get_user() -> i
+    java.lang.String get_pass() -> j
 com.usai.apex.BaiduMapFragment -> com.usai.apex.f:
     com.usai.apex.BaiduMapFragment$SearchTask m_task -> g
     java.lang.String fragment_content -> a
@@ -7696,7 +7709,7 @@ com.usai.apex.DetailActivity -> com.usai.apex.DetailActivity:
     android.view.View createTabContent(java.lang.String) -> createTabContent
     void onSaveInstanceState(android.os.Bundle) -> onSaveInstanceState
     boolean onKeyUp(int,android.view.KeyEvent) -> onKeyUp
-    void setupTabs() -> d
+    void setupTabs() -> e
     boolean onCreateOptionsMenu(android.view.Menu) -> onCreateOptionsMenu
     boolean onOptionsItemSelected(android.view.MenuItem) -> onOptionsItemSelected
 com.usai.apex.DetailActivity$1 -> com.usai.apex.v:
@@ -7824,6 +7837,8 @@ com.usai.apex.FavoritesFragment$SearchResult -> com.usai.apex.am:
     void add_records(android.database.Cursor) -> a
 com.usai.apex.FunctionSelectActivity -> com.usai.apex.FunctionSelectActivity:
     android.widget.ArrayAdapter adapter -> n
+    boolean onOptionsItemSelected(android.view.MenuItem) -> onOptionsItemSelected
+    boolean onCreateOptionsMenu(android.view.Menu) -> onCreateOptionsMenu
     void onCreate(android.os.Bundle) -> onCreate
     void onActivityResult(int,int,android.content.Intent) -> onActivityResult
     void onDestroy() -> onDestroy
@@ -8158,8 +8173,16 @@ com.usai.apex.SearchActivity$RecordsAdapter -> com.usai.apex.cg:
     void bindView(android.view.View,android.content.Context,android.database.Cursor) -> bindView
 com.usai.apex.SearchHistoryActivity -> com.usai.apex.SearchHistoryActivity:
     android.widget.TabHost mTabHost -> n
+    boolean onCreateOptionsMenu(android.view.Menu) -> onCreateOptionsMenu
+    boolean onOptionsItemSelected(android.view.MenuItem) -> onOptionsItemSelected
     void onCreate(android.os.Bundle) -> onCreate
     boolean onKeyDown(int,android.view.KeyEvent) -> onKeyDown
+com.usai.apex.SearchHistoryActivity$1 -> com.usai.apex.ch:
+    com.usai.apex.SearchHistoryActivity this$0 -> a
+    void onClick(android.content.DialogInterface,int) -> onClick
+com.usai.apex.SearchHistoryActivity$2 -> com.usai.apex.ci:
+    com.usai.apex.SearchHistoryActivity this$0 -> a
+    void onClick(android.content.DialogInterface,int) -> onClick
 com.usai.apex.SearchListActivity -> com.usai.apex.SearchListActivity:
     android.widget.LinearLayout ll_list -> a
     java.lang.String user -> b
@@ -8172,58 +8195,58 @@ com.usai.apex.SearchListActivity -> com.usai.apex.SearchListActivity:
     void onSaveInstanceState(android.os.Bundle) -> onSaveInstanceState
     void onClick(android.view.View) -> onClick
     boolean onOptionsItemSelected(android.view.MenuItem) -> onOptionsItemSelected
-com.usai.apex.SearchListActivity$1 -> com.usai.apex.ch:
+com.usai.apex.SearchListActivity$1 -> com.usai.apex.cj:
     com.usai.apex.SearchListActivity this$0 -> a
     java.lang.String val$name -> b
     void onItemSelected(android.widget.AdapterView,android.view.View,int,long) -> onItemSelected
     void onNothingSelected(android.widget.AdapterView) -> onNothingSelected
-com.usai.apex.SearchListActivity$2 -> com.usai.apex.ci:
+com.usai.apex.SearchListActivity$2 -> com.usai.apex.ck:
     com.usai.apex.SearchListActivity this$0 -> a
     android.widget.EditText val$edit_from -> b
     java.lang.String val$name -> c
     void onClick(android.view.View) -> onClick
-com.usai.apex.SearchListActivity$3 -> com.usai.apex.cj:
+com.usai.apex.SearchListActivity$3 -> com.usai.apex.cl:
     com.usai.apex.SearchListActivity this$0 -> a
     android.widget.EditText val$edit_to -> b
     java.lang.String val$name -> c
     void onClick(android.view.View) -> onClick
-com.usai.apex.SearchListActivity$4 -> com.usai.apex.ck:
+com.usai.apex.SearchListActivity$4 -> com.usai.apex.cm:
     com.usai.apex.SearchListActivity this$0 -> a
     java.util.Calendar val$c -> b
     android.widget.EditText val$edit_from -> c
     java.lang.String val$name -> d
     void onClick(android.view.View) -> onClick
     com.usai.apex.SearchListActivity access$0(com.usai.apex.SearchListActivity$4) -> a
-com.usai.apex.SearchListActivity$4$1 -> com.usai.apex.cl:
+com.usai.apex.SearchListActivity$4$1 -> com.usai.apex.cn:
     com.usai.apex.SearchListActivity$4 this$1 -> a
     android.widget.EditText val$edit_from -> b
     java.lang.String val$name -> c
     void onDateSet(android.widget.DatePicker,int,int,int) -> onDateSet
-com.usai.apex.SearchListActivity$5 -> com.usai.apex.cm:
+com.usai.apex.SearchListActivity$5 -> com.usai.apex.co:
     com.usai.apex.SearchListActivity this$0 -> a
     java.util.Calendar val$c -> b
     android.widget.EditText val$edit_to -> c
     java.lang.String val$name -> d
     void onClick(android.view.View) -> onClick
     com.usai.apex.SearchListActivity access$0(com.usai.apex.SearchListActivity$5) -> a
-com.usai.apex.SearchListActivity$5$1 -> com.usai.apex.cn:
+com.usai.apex.SearchListActivity$5$1 -> com.usai.apex.cp:
     com.usai.apex.SearchListActivity$5 this$1 -> a
     android.widget.EditText val$edit_to -> b
     java.lang.String val$name -> c
     void onDateSet(android.widget.DatePicker,int,int,int) -> onDateSet
-com.usai.apex.SearchListActivity$6 -> com.usai.apex.co:
+com.usai.apex.SearchListActivity$6 -> com.usai.apex.cq:
     com.usai.apex.SearchListActivity this$0 -> a
     java.lang.String val$name -> b
     void onTextChanged(java.lang.CharSequence,int,int,int) -> onTextChanged
     void beforeTextChanged(java.lang.CharSequence,int,int,int) -> beforeTextChanged
     void afterTextChanged(android.text.Editable) -> afterTextChanged
-com.usai.apex.SearchListActivity$7 -> com.usai.apex.cp:
+com.usai.apex.SearchListActivity$7 -> com.usai.apex.cr:
     com.usai.apex.SearchListActivity this$0 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.SearchListActivity$8 -> com.usai.apex.cq:
+com.usai.apex.SearchListActivity$8 -> com.usai.apex.cs:
     com.usai.apex.SearchListActivity this$0 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.SearchResult -> com.usai.apex.cr:
+com.usai.apex.SearchResult -> com.usai.apex.ct:
     int total_count -> a
     int offset -> b
     java.util.ArrayList records -> c
@@ -8234,7 +8257,7 @@ com.usai.apex.SearchResult -> com.usai.apex.cr:
     void put_totalcount(int) -> b
     int get_offset() -> c
     void set_offset(int) -> c
-com.usai.apex.ServiceLocationFragment -> com.usai.apex.cs:
+com.usai.apex.ServiceLocationFragment -> com.usai.apex.cu:
     com.usai.apex.ServiceLocationFragment$SearchTask m_task -> d
     java.lang.String fragment_content -> a
     java.util.HashMap marker_detail -> b
@@ -8249,18 +8272,20 @@ com.usai.apex.ServiceLocationFragment -> com.usai.apex.cs:
     void onResume() -> onResume
     void onInfoWindowClick(com.google.android.gms.maps.model.Marker) -> a
     void access$0$a8c76aa(com.usai.apex.ServiceLocationFragment) -> a
-com.usai.apex.ServiceLocationFragment$CustomWindowAdapter -> com.usai.apex.ct:
+com.usai.apex.ServiceLocationFragment$CustomWindowAdapter -> com.usai.apex.cv:
     android.view.View mContents -> a
     com.usai.apex.ServiceLocationFragment this$0 -> b
     android.view.View getInfoContents(com.google.android.gms.maps.model.Marker) -> a
-com.usai.apex.ServiceLocationFragment$SearchTask -> com.usai.apex.cu:
+com.usai.apex.ServiceLocationFragment$SearchTask -> com.usai.apex.cw:
     int errorcode -> a
     com.usai.apex.ServiceLocationFragment this$0 -> b
     java.lang.Boolean doInBackground$5f8445a4() -> a
     void onCancelled() -> onCancelled
     void onPostExecute(java.lang.Object) -> onPostExecute
     java.lang.Object doInBackground(java.lang.Object[]) -> doInBackground
-com.usai.apex.ToolsFragment -> com.usai.apex.cv:
+com.usai.apex.SettingsActivity -> com.usai.apex.SettingsActivity:
+    void onCreate(android.os.Bundle) -> onCreate
+com.usai.apex.ToolsFragment -> com.usai.apex.cx:
     void onActivityResult(int,int,android.content.Intent) -> onActivityResult
     java.util.List getData() -> b
     void onActivityCreated(android.os.Bundle) -> onActivityCreated

+ 2 - 0
Apex/proguard/seeds.txt

@@ -2913,6 +2913,8 @@ com.usai.apex.AnnouncementActivity
 com.usai.apex.AnnouncementActivity: AnnouncementActivity()
 com.usai.apex.ApexActivity
 com.usai.apex.ApexActivity: ApexActivity()
+com.usai.apex.ApexBackgroundService
+com.usai.apex.ApexBackgroundService: ApexBackgroundService()
 com.usai.apex.ApexHistoryActivity
 com.usai.apex.ApexHistoryActivity: ApexHistoryActivity()
 com.usai.apex.ApexTrackingApplication

+ 1 - 1
Apex/res/values/strings.xml

@@ -56,7 +56,7 @@
     <string name="str_true">true</string>
     <string name="str_false">false</string>
     <string name="str_cancel">Cancel</string>
-    <string name="str_createname">Create a tag to save detail</string>
+    <string name="str_createname">Create a tag to save</string>
     <string name="str_search">Search</string>
     <string name="str_clear">Clear</string>
     <string name="str_ver">ver:</string>

+ 29 - 16
Apex/src/com/usai/apex/Alarmreceiver.java

@@ -6,6 +6,7 @@ import org.json.JSONObject;
 import com.usai.util.Crypto;
 import com.usai.util.Network;
 import com.usai.util.dbUtil;
+import com.usai.util.dbgUtil;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -85,7 +86,8 @@ public class Alarmreceiver extends BroadcastReceiver
 		@Override
 		protected void onPostExecute(Boolean success)
 		{
-			Log.i("onPostExecute", "entry");
+			String tag = "onPostExecute@Alarmreceiver";
+			Log.i( tag, "entry");
 			m_task = null;
 			// showProgress(false);
 
@@ -162,11 +164,13 @@ public class Alarmreceiver extends BroadcastReceiver
 							0).getBoolean("notifications_new_message", true);
 					if (bnotify)
 					{
-						
-						boolean bsound = mcontext.getSharedPreferences("setting",
-								0).getBoolean("notifications_new_message_sound", true);
-						boolean bvibrate = mcontext.getSharedPreferences("setting",
-								0).getBoolean("notifications_new_message_vibrate", true);
+
+						boolean bsound = mcontext.getSharedPreferences(
+								"setting", 0).getBoolean(
+								"notifications_new_message_sound", true);
+						boolean bvibrate = mcontext.getSharedPreferences(
+								"setting", 0).getBoolean(
+								"notifications_new_message_vibrate", true);
 						NotificationManager nManager = (NotificationManager) mcontext
 								.getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -181,19 +185,22 @@ public class Alarmreceiver extends BroadcastReceiver
 						PendingIntent pintent = PendingIntent.getActivity(
 								mcontext, 0, intent,
 								PendingIntent.FLAG_UPDATE_CURRENT);
-						if(bsound&&bvibrate)
+						if (bsound && bvibrate)
 							notification.defaults = Notification.DEFAULT_ALL;
-						else if(bsound)
-							notification.defaults = Notification.DEFAULT_SOUND|Notification.DEFAULT_LIGHTS;
-						else if(bvibrate)
-							notification.defaults = Notification.DEFAULT_VIBRATE|Notification.DEFAULT_LIGHTS;
+						else if (bsound)
+							notification.defaults = Notification.DEFAULT_SOUND
+									| Notification.DEFAULT_LIGHTS;
+						else if (bvibrate)
+							notification.defaults = Notification.DEFAULT_VIBRATE
+									| Notification.DEFAULT_LIGHTS;
 						notification.flags = Notification.FLAG_AUTO_CANCEL;
 						notification.number = ApexTrackingApplication.ncount++;
 						if (notification.number > 1)
 							notification
 									.setLatestEventInfo(
 											mcontext,
-											notification.number+" "
+											notification.number
+													+ " "
 													+ ApexTrackingApplication
 															.get_instance()
 															.getString(
@@ -294,11 +301,17 @@ public class Alarmreceiver extends BroadcastReceiver
 			// Log.e(tag, key);
 			// }
 			// String s =b.getString("caller");
-			Log.d(tag,
-					"receive alarm broadcast caller =="
-							+ intent.getStringExtra("caller"));
+			Log.i( tag, "receive alarm broadcast caller =="
+					+ intent.getStringExtra("caller"));
+
+			if (SystemClock.elapsedRealtime()
+					- ApexTrackingApplication.getLastCheckMessageTime() > 120000)
+			{
+				Log.i(tag, "check messsage");
+				ApexTrackingApplication.UpdateLastCheckMessageTime();
+				checkpush(context);
 
-			checkpush(context);
+			}
 			// Intent i = new Intent();
 			// i.setClass(context, DaemonService.class);
 			// // 启动service

+ 2 - 1
Apex/src/com/usai/apex/AnnouncementActivity.java

@@ -191,7 +191,8 @@ public class AnnouncementActivity extends ListActivity
 		@Override
 		protected void onPostExecute(Boolean success)
 		{
-			Log.i("onPostExecute", "entry");
+			String tag = "onPostExecute@AnnouncementActivity";
+			Log.d("onPostExecute", "entry");
 			m_task = null;
 			// showProgress(false);
 

+ 51 - 0
Apex/src/com/usai/apex/ApexBackgroundService.java

@@ -0,0 +1,51 @@
+package com.usai.apex;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+public class ApexBackgroundService extends Service
+{
+
+	ApexTrackingApplication app = null;
+	
+	
+	
+	@Override
+	public void onCreate()
+	{
+		app = ApexTrackingApplication.get_instance();
+
+		super.onCreate();
+	}
+
+
+
+	@Override
+	public void onStart(Intent intent, int startId)
+	{
+		if(app==null)
+			Log.e("service start","app is null");
+		super.onStart(intent, startId);
+	}
+
+
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId)
+	{
+
+		return super.onStartCommand(intent, flags, startId);
+	}
+
+
+
+	@Override
+	public IBinder onBind(Intent intent)
+	{
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

+ 27 - 5
Apex/src/com/usai/apex/ApexTrackingApplication.java

@@ -25,6 +25,16 @@ public class ApexTrackingApplication extends Application
 
 	private static boolean					m_bauthorized	= false;
 
+	private static long LastAlermTime = -120000;
+	
+	public static void UpdateLastCheckMessageTime()
+	{
+		LastAlermTime = SystemClock.elapsedRealtime();
+	}
+	public static long getLastCheckMessageTime()
+	{
+		return LastAlermTime;
+	}
 	@Override
 	public void onCreate()
 	{
@@ -40,8 +50,9 @@ public class ApexTrackingApplication extends Application
 		if (autologin == true)
 		{
 
-			String u = pref.getString("user", null);
-			String p = pref.getString("password", null);
+			String u = pref.getString("user", "");
+			String p = pref.getString("password", "");
+			String s = pref.getString("sessionid", "");
 
 			try
 			{
@@ -49,6 +60,8 @@ public class ApexTrackingApplication extends Application
 					m_user = Crypto.decrypt("apexu", u);
 				if (!TextUtils.isEmpty(p))
 					m_password = Crypto.decrypt("apexp", p);
+				if (!TextUtils.isEmpty(s))
+					m_sessionid = Crypto.decrypt("apexp", s);
 			}
 			catch (Exception e)
 			{
@@ -82,7 +95,7 @@ public class ApexTrackingApplication extends Application
 
 	public static void startalarm(String caller)
 	{
-		SharedPreferences pref = ApexTrackingApplication.get_instance()
+		SharedPreferences pref = get_instance()
 				.getSharedPreferences("Apex", 0);
 		boolean autologin = pref.getBoolean("autologin", false);
 		if (autologin == false)
@@ -95,6 +108,7 @@ public class ApexTrackingApplication extends Application
 				iAlarm, PendingIntent.FLAG_UPDATE_CURRENT);
 
 		long firstime = SystemClock.elapsedRealtime();
+//		UpdateLastAlermTime();
 		AlarmManager am = (AlarmManager) get_instance().getSystemService(
 				Context.ALARM_SERVICE);
 
@@ -120,6 +134,7 @@ public class ApexTrackingApplication extends Application
 
 	public static void logout()
 	{
+		ncount = 1;
 		cancelalarm();
 		m_sessionid = "";
 		m_user = "";
@@ -134,13 +149,17 @@ public class ApexTrackingApplication extends Application
 
 	}
 
+	public static void SetAuthorizeStatus(boolean bauthorized)
+	{
+		m_bauthorized = bauthorized;
+	}
 	public static void login(String sid, String user, String pass)
 	{
 		m_sessionid = sid;
 		m_user = user;
 		m_password = pass;
 		m_bauthorized = true;
-		ncount = 1;
+		
 		SharedPreferences pref = ApexTrackingApplication.get_instance()
 				.getSharedPreferences("Apex", 0);
 		SharedPreferences.Editor editor = pref.edit();
@@ -150,18 +169,21 @@ public class ApexTrackingApplication extends Application
 			editor.putString("user", Crypto.encrypt("apexu", m_user));
 			editor.putString("password", Crypto.encrypt("apexp", m_password));
 			editor.putBoolean("autologin", true);
+			editor.putString("sessionid", Crypto.encrypt("apexp", m_sessionid));
 
 		}
 		catch (Exception e)
 		{
 			editor.putString("user", null);
 			editor.putString("password", null);
+			editor.putString("m_sessionid", null);
 			editor.putBoolean("autologin", false);
+			m_bauthorized=false;
 			e.printStackTrace();
 		}
 		editor.commit();
 
-		startalarm("app start");
+		startalarm("app Login");
 	}
 
 	// public static void put_sessionid(String id)

+ 2 - 1
Apex/src/com/usai/apex/BaiduMapFragment.java

@@ -290,7 +290,8 @@ public class BaiduMapFragment extends Fragment
 		@Override
 		protected void onPostExecute(Boolean success)
 		{
-			Log.i("onPostExecute", "entry");
+			String tag = "onPostExecute@BaiduMapFragment";
+			Log.d(tag, "entry");
 			m_task = null;
 			// showProgress(false);
 

+ 11 - 11
Apex/src/com/usai/apex/BootBroadcastReceiver.java

@@ -36,19 +36,19 @@ public class BootBroadcastReceiver extends BroadcastReceiver
 //			context.startService(intentservice);
         	ApexTrackingApplication.startalarm("boot completed");
         } 
-		else if (intent.getAction().equals(
-				ConnectivityManager.CONNECTIVITY_ACTION))
-		{
-			
-			ApexTrackingApplication.startalarm("connection change");
-			// handle auto submit ,check update etc
-//			dbgUtil.Log(Log.INFO,TAG, "ConnectivityManager.CONNECTIVITY_ACTION");
+//		else if (intent.getAction().equals(
+//				ConnectivityManager.CONNECTIVITY_ACTION))
+//		{
 //			
-//			new AutoUpdateCheckThread(context, false).start();
+//			ApexTrackingApplication.startalarm("connection change");
+//			// handle auto submit ,check update etc
+////			dbgUtil.Log(Log.INFO,TAG, "ConnectivityManager.CONNECTIVITY_ACTION");
+////			
+////			new AutoUpdateCheckThread(context, false).start();
+////
+////			new AutoSubmitThread(context).start();
 //
-//			new AutoSubmitThread(context).start();
-
-		}	       
+//		}	       
         
 	}
 

+ 1 - 1
Apex/src/com/usai/apex/ChangePasswordActivity.java

@@ -232,7 +232,7 @@ public class ChangePasswordActivity extends Activity {
 
 		@Override
 		protected void onPostExecute(final Boolean success) {
-			Log.i("onPostExecute", "entry");
+			Log.d("onPostExecute", "entry");
 			mAuthTask = null;
 			showProgress(false);
 			// if (netconnect == )

+ 1 - 1
Apex/src/com/usai/apex/DetailFragment.java

@@ -342,7 +342,7 @@ public class DetailFragment extends Fragment implements OnClickListener /*
 							filename = filename.replace("\"", "");
 							
 							Log.d("WebView", "Download Action");
-							Log.i("tag", "url=" + url);
+							Log.d("tag", "url=" + url);
 							// Log.i("tag", "userAgent="+userAgent);
 							// Log.i("tag",
 							// "contentDisposition="+contentDisposition);

+ 1 - 1
Apex/src/com/usai/apex/DocumentsFragment.java

@@ -63,7 +63,7 @@ public class DocumentsFragment extends ListFragment
 	@Override
 	public void onListItemClick(ListView l, View v, int position, long id)
 	{
-		Log.i("FragmentList", "Item clicked: " + id);
+		Log.d("FragmentList", "Item clicked: " + id);
 		
 		String title = (String) getData().get(position).get("title");
 		Intent intent = new Intent();

+ 1 - 20
Apex/src/com/usai/apex/FavoritesFragment.java

@@ -83,26 +83,7 @@ public class FavoritesFragment extends ListFragment implements OnTouchListener
 			e.printStackTrace();
 		}
 
-		// intent.setclass
-		// }
-		// // searchresult.getData().get(position).put("read", (long) 1);//
-		// .get("_id")
-		// dbUtil.CloseCursor(c);
-		// dbUtil.CloseDB(db);
-		// adapter.notifyDataSetChanged();
-		// super.onListItemClick(l, v, position, id);
-		//
-		// // Log.i("FragmentList", "Item clicked: " + id);
-		// Intent intent = new Intent();
-		// intent.putExtra("s_id", (String) searchresult.getData().get(position)
-		// .get("s_id"));
-		// intent.putExtra("e_id", (String) searchresult.getData().get(position)
-		// .get("e_id"));
-		// intent.putExtra("msgcount", (Long)
-		// searchresult.getData().get(position)
-		// .get("msgcount"));
-		//
-		// intent.setClass(this, MessageDetailActivity.class);
+
 
 	}
 

+ 1 - 0
Apex/src/com/usai/apex/FunctionSelectActivity.java

@@ -345,6 +345,7 @@ public class FunctionSelectActivity extends FragmentActivity implements
 		NotificationManager nManager = (NotificationManager) this
 				.getSystemService(Context.NOTIFICATION_SERVICE);
 		nManager.cancel(R.layout.activity_apex);
+		ApexTrackingApplication.ncount=1;
 
 		// Intent intent = new Intent();
 		// intent.setClass(ApexTrackingApplication

+ 1 - 1
Apex/src/com/usai/apex/LocalDocumentActivity.java

@@ -82,7 +82,7 @@ public class LocalDocumentActivity extends ListActivity
 	@Override
 	public void onListItemClick(ListView l, View v, int position, long id)
 	{
-		Log.i("FragmentList", "Item clicked: " + id);
+		Log.d("FragmentList", "Item clicked: " + id);
 		String filename = (String) getData().get(position).get("title");
 		Intent intent = new Intent("android.intent.action.VIEW");
 

+ 1 - 1
Apex/src/com/usai/apex/LoginFragment.java

@@ -319,7 +319,7 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 
 		@Override
 		protected void onPostExecute(final Boolean success) {
-			Log.i("onPostExecute", "entry");
+			Log.d("onPostExecute", "entry");
 			mAuthTask = null;
 			showProgress(false);
 			// if (netconnect == )

+ 5 - 0
Apex/src/com/usai/apex/MessageActivity.java

@@ -11,6 +11,7 @@ import com.usai.util.dbUtil;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ListActivity;
+import android.app.NotificationManager;
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -84,6 +85,10 @@ public class MessageActivity extends ListActivity implements OnTouchListener
 								dialog.dismiss();
 								searchresult.getData().clear();// .remove(position);
 								adapter.notifyDataSetChanged();
+								NotificationManager nManager = (NotificationManager) 
+										getSystemService(Context.NOTIFICATION_SERVICE);
+								nManager.cancel(R.layout.activity_apex);
+								ApexTrackingApplication.ncount=1;
 							}
 						});
 

+ 1 - 1
Apex/src/com/usai/apex/MessageDetailActivity.java

@@ -192,7 +192,7 @@ public class MessageDetailActivity extends ListActivity
 		@Override
 		protected void onPostExecute(Boolean success)
 		{
-			Log.i("onPostExecute", "entry");
+			Log.d("onPostExecute", "entry");
 			m_task = null;
 			// showProgress(false);
 

+ 1 - 1
Apex/src/com/usai/apex/ResultActivity.java

@@ -783,7 +783,7 @@ public class ResultActivity extends Activity
 		@Override
 		protected void onPostExecute(final Boolean success)
 		{
-			Log.i("onPostExecute", "entry");
+			Log.d("onPostExecute", "entry");
 			m_task = null;
 			showProgress(false);
 			if (ApexTrackingApplication.get_authorization() == false)

+ 1 - 1
Apex/src/com/usai/apex/RetrievePasswordActivity.java

@@ -265,7 +265,7 @@ public class RetrievePasswordActivity extends Activity
 		@Override
 		protected void onPostExecute(final Boolean success)
 		{
-			Log.i("onPostExecute", "entry");
+			Log.d("onPostExecute", "entry");
 			mAuthTask = null;
 			showProgress(false);
 			// if (netconnect == )

+ 1 - 1
Apex/src/com/usai/apex/ServiceLocationFragment.java

@@ -241,7 +241,7 @@ public class ServiceLocationFragment extends Fragment implements
 		@Override
 		protected void onPostExecute(Boolean success)
 		{
-			Log.i("onPostExecute", "entry");
+			Log.d("onPostExecute", "entry");
 			m_task = null;
 			// showProgress(false);
 

+ 1 - 1
Apex/src/com/usai/apex/ToolsFragment.java

@@ -201,7 +201,7 @@ public class ToolsFragment extends ListFragment
 	@Override
 	public void onListItemClick(ListView l, View v, int position, long id)
 	{
-		Log.i("FragmentList", "Item clicked: " + id);
+		Log.d("FragmentList", "Item clicked: " + id);
 
 		String title = (String) getData().get(position).get("title");
 		Intent intent = new Intent();

+ 72 - 55
Apex/src/com/usai/util/Network.java

@@ -148,7 +148,7 @@ public class Network
 		parms.putString("action_type", "search");
 		parms.putString("id", id + "");
 		parms.putString("limit", limit + "");
-		String jstr = getJson(Network.URL_ANNOUNCEMENTS, parms);
+		String jstr = getJson(Network.URL_NEWS, parms);
 		if (jstr == null || jstr.length() <= 0)
 		{
 			Log.d(TAG, "json is wrong");
@@ -244,7 +244,7 @@ public class Network
 				int iresult = jsobj.getInt("result");
 				if (iresult == Network.AP_SESSION_EXPIRED)
 				{
-
+					Log.e(TAG, "AP_SESSION_EXPIRED");
 					Network.get_Auth(user, oldpass);
 					jstr = getJson(Network.URL_RETRIEVE_PASS, parms);
 					jsobj = new JSONObject(jstr);
@@ -258,8 +258,11 @@ public class Network
 									+ jsobj.getInt("result"));
 					return RESULT_FALSE;
 				}
+				else
+				{
+					
 				return RESULT_TRUE;
-
+				}
 			}
 			return RESULT_NET_ERROR;
 		}
@@ -515,6 +518,7 @@ public class Network
 				int iresult = jsobj.getInt("result");
 				if (iresult == Network.AP_SESSION_EXPIRED)
 				{
+					Log.e(TAG, "AP_SESSION_EXPIRED");
 					String user, pass;
 					user = ApexTrackingApplication.get_user();
 					pass = ApexTrackingApplication.get_pass();
@@ -546,6 +550,7 @@ public class Network
 				}
 				else
 				{
+					ApexTrackingApplication.SetAuthorizeStatus(true);
 					return jsobj.getInt("count");
 				}
 			}
@@ -593,6 +598,7 @@ public class Network
 				int iresult = jsobj.getInt("result");
 				if (iresult == Network.AP_SESSION_EXPIRED)
 				{
+					Log.e(TAG, "AP_SESSION_EXPIRED");
 					String user, pass;
 					user = ApexTrackingApplication.get_user();
 					pass = ApexTrackingApplication.get_pass();
@@ -624,6 +630,7 @@ public class Network
 				}
 				else
 				{
+					ApexTrackingApplication.SetAuthorizeStatus(true);
 					return jstr;
 				}
 			}
@@ -643,48 +650,51 @@ public class Network
 		// return RESULT_ERROR;
 	}
 
-	public static String get_push(String e_id,String s_id,int limit,int offset)
+	public static String get_push(String e_id, String s_id, int limit,
+			int offset)
 	{
 		String TAG = "net_dbg@get_push";
 		Bundle parms = new Bundle();
 		parms.putString("action", "handset_search");
 		parms.putString("e_id", e_id);
 		parms.putString("s_id", s_id);
-		parms.putString("limit", limit+"");
-		parms.putString("offset", offset+"");
+		parms.putString("limit", limit + "");
+		parms.putString("offset", offset + "");
 		parms.putString("action_type", "detail");
 		parms.putString("module_name", "Pull Message");
 		parms.putString("uuid", commonUtil.getDUID());
 		String sessionid = ApexTrackingApplication.get_sessionid();
-//		if (TextUtils.isEmpty(sessionid))
-//		{
-//
-//			Log.d(TAG, "no sessionid return!");
-//			return null;
-//
-//		}
+		// if (TextUtils.isEmpty(sessionid))
+		// {
+		//
+		// Log.d(TAG, "no sessionid return!");
+		// return null;
+		//
+		// }
 		String user = ApexTrackingApplication.get_user();
-//		if (TextUtils.isEmpty(user))
-//		{
-//
-//			Log.d(TAG, "no user name return!");
-//			return null;
-//
-//		}
+		// if (TextUtils.isEmpty(user))
+		// {
+		//
+		// Log.d(TAG, "no user name return!");
+		// return null;
+		//
+		// }
 		parms.putString("sessionid", sessionid);
 		parms.putString("user", user);
-//		SQLiteDatabase db = dbUtil.OpenDB(ApexTrackingApplication.get_instance(), null, false);
-//		Cursor cursor = db.query("push_message", new String[] {"MAX(e_id)"}, "user = '"+ApexTrackingApplication.get_user()+"'", null, null, null,
-//				null, null);
-//		if (cursor.moveToNext())
-//		{
-//			String maxid = cursor.getString(0);
-//			if(!TextUtils.isEmpty(maxid))
-//				parms.putString("id", maxid);
-//		}
-//		dbUtil.CloseCursor(cursor);
-//		dbUtil.CloseDB(db);
-		
+		// SQLiteDatabase db =
+		// dbUtil.OpenDB(ApexTrackingApplication.get_instance(), null, false);
+		// Cursor cursor = db.query("push_message", new String[] {"MAX(e_id)"},
+		// "user = '"+ApexTrackingApplication.get_user()+"'", null, null, null,
+		// null, null);
+		// if (cursor.moveToNext())
+		// {
+		// String maxid = cursor.getString(0);
+		// if(!TextUtils.isEmpty(maxid))
+		// parms.putString("id", maxid);
+		// }
+		// dbUtil.CloseCursor(cursor);
+		// dbUtil.CloseDB(db);
+
 		String jstr = getJson(Network.URL_PUSH, parms);
 		if (jstr == null || jstr.length() <= 0)
 		{
@@ -702,6 +712,7 @@ public class Network
 				int iresult = jsobj.getInt("result");
 				if (iresult == Network.AP_SESSION_EXPIRED)
 				{
+					Log.e(TAG, "AP_SESSION_EXPIRED");
 					String pass;
 
 					pass = ApexTrackingApplication.get_pass();
@@ -750,7 +761,8 @@ public class Network
 		return null;
 
 		// return RESULT_ERROR;
-	}	
+	}
+
 	public static String check_push()
 	{
 		String TAG = "net_dbg@check_push";
@@ -759,13 +771,13 @@ public class Network
 		parms.putString("module_name", "Pull Message");
 		parms.putString("uuid", commonUtil.getDUID());
 		String sessionid = ApexTrackingApplication.get_sessionid();
-//		if (TextUtils.isEmpty(sessionid))
-//		{
-//
-//			Log.d(TAG, "no sessionid return!");
-//			return null;
-//
-//		}
+		// if (TextUtils.isEmpty(sessionid))
+		// {
+		//
+		// Log.d(TAG, "no sessionid return!");
+		// return null;
+		//
+		// }
 		String user = ApexTrackingApplication.get_user();
 		if (TextUtils.isEmpty(user))
 		{
@@ -774,20 +786,22 @@ public class Network
 			return null;
 
 		}
-		parms.putString("sessionid", sessionid);
+		// parms.putString("sessionid", sessionid);
 		parms.putString("user", user);
-		SQLiteDatabase db = dbUtil.OpenDB(ApexTrackingApplication.get_instance(), null, false);
-		Cursor cursor = db.query("push_message", new String[] {"MAX(e_id)"}, "user = '"+ApexTrackingApplication.get_user()+"'", null, null, null,
-				null, null);
+		SQLiteDatabase db = dbUtil.OpenDB(
+				ApexTrackingApplication.get_instance(), null, false);
+		Cursor cursor = db.query("push_message", new String[] { "MAX(e_id)" },
+				"user = '" + ApexTrackingApplication.get_user() + "'", null,
+				null, null, null, null);
 		if (cursor.moveToNext())
 		{
 			String maxid = cursor.getString(0);
-			if(!TextUtils.isEmpty(maxid))
+			if (!TextUtils.isEmpty(maxid))
 				parms.putString("id", maxid);
 		}
 		dbUtil.CloseCursor(cursor);
 		dbUtil.CloseDB(db);
-		
+
 		String jstr = getJson(Network.URL_PUSH, parms);
 		if (jstr == null || jstr.length() <= 0)
 		{
@@ -805,11 +819,12 @@ public class Network
 				int iresult = jsobj.getInt("result");
 				if (iresult == Network.AP_SESSION_EXPIRED)
 				{
+					Log.e(TAG, "AP_SESSION_EXPIRED");
 					String pass;
 
 					pass = ApexTrackingApplication.get_pass();
 					Network.get_Auth(user, pass);
-					jstr = getJson(Network.URL_REQUEST_RECORDS, parms);
+					jstr = getJson(Network.URL_PUSH, parms);
 					jsobj = new JSONObject(jstr);
 					iresult = jsobj.getInt("result");
 				}
@@ -877,6 +892,7 @@ public class Network
 				int iresult = jsobj.getInt("result");
 				if (iresult == Network.AP_SESSION_EXPIRED)
 				{
+					Log.e(TAG, "AP_SESSION_EXPIRED");
 					String user, pass;
 					user = ApexTrackingApplication.get_user();
 					pass = ApexTrackingApplication.get_pass();
@@ -885,7 +901,7 @@ public class Network
 					jsobj = new JSONObject(jstr);
 					iresult = jsobj.getInt("result");
 				}
-				if (iresult != Network.AP_USER_AUTH)
+				 if (iresult != Network.AP_USER_AUTH)
 				{
 					// session expired
 					Log.d(TAG,
@@ -908,6 +924,7 @@ public class Network
 				}
 				else
 				{
+					ApexTrackingApplication.SetAuthorizeStatus(true);
 					return jstr;
 				}
 			}
@@ -999,13 +1016,13 @@ public class Network
 				// id
 				// on
 				// server;
-//				ApexTrackingApplication.put_sessionid(objheader
-//						.getString("sessionid"));
-//				ApexTrackingApplication.put_user(user);
-//				ApexTrackingApplication.put_password(pass);
-//				ApexTrackingApplication.put_authorization(true);
-				ApexTrackingApplication.login(objheader
-						.getString("sessionid"),user,pass);
+				// ApexTrackingApplication.put_sessionid(objheader
+				// .getString("sessionid"));
+				// ApexTrackingApplication.put_user(user);
+				// ApexTrackingApplication.put_password(pass);
+				// ApexTrackingApplication.put_authorization(true);
+				ApexTrackingApplication.login(objheader.getString("sessionid"),
+						user, pass);
 				Log.d(TAG, "sessionid=" + objheader.getString("sessionid"));
 				// JSONObject objupdate = array.getJSONObject(3); // whether
 				// need

+ 15 - 10
Apex/src/com/usai/util/dbgUtil.java

@@ -6,10 +6,10 @@ import android.util.Log;
 
 public class dbgUtil
 {
-	static boolean ENABLE_DEBUG = true;
-	static boolean ENABLE_SQL_DEBUG = true;
-	final int DEBUG_LEVEL_NONE = 8;
-	static int DEBUG_LEVEL = Log.VERBOSE;
+//	static boolean ENABLE_DEBUG = true;
+//	static boolean ENABLE_SQL_DEBUG = true;
+//	final int DEBUG_LEVEL_NONE = 8;
+//	static int DEBUG_LEVEL = Log.VERBOSE;
 
 	// private static boolean m_dbgFlag = true;
 	/*
@@ -23,12 +23,17 @@ public class dbgUtil
 	 * Boolean.parseBoolean(context.getString(R.string.flag_debug)); return
 	 * this; }
 	 */
+	public static void Logd(String tag,String msg)
+	{
+		String pos = getTracePos();
+		Log.d(tag,msg+pos);
+	}
 //	public static void Log(int type, String tag, String msg)
 //	{
-//		if (ENABLE_DEBUG == false)
-//			return;
-//		if (type < DEBUG_LEVEL)
-//			return;
+////		if (ENABLE_DEBUG == false)
+////			return;
+////		if (type < DEBUG_LEVEL)
+////			return;
 //		String pos= getTracePos();
 //		switch (type)
 //		{
@@ -72,8 +77,8 @@ public class dbgUtil
 																	 * TracePos
 																	 */)
 	{
-		if (ENABLE_SQL_DEBUG == false)
-			return;
+//		if (ENABLE_SQL_DEBUG == false)
+//			return;
 
 		// ----------------------debug cursor-----------------------------------
 		Log.d("sql_dbg@dbgCursorInfo", getTracePos() + "Cursor size:	" + cursor.getCount()

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません