release ver:a140418

Apex/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.usai.apex"
     android:versionCode="4"
-    android:versionName="A140417" >
+    android:versionName="A140418" >
 
     <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
     <uses-sdk

Apex/res/values-zh-rCN/strings.xml

@@ -74,7 +74,7 @@
     <string name="str_mnotification_title">条来自Apex的新消息</string>
     <string name="str_notification_text">集装箱状态改变</string>
     <string name="str_from">起始日期</string>
-    <string name="str_to">结束日志</string>
+    <string name="str_to">结束日期</string>
     <string name="str_reset">全部清除</string>
     <string name="str_displayitem">显示字段</string>
     <string name="str_hideitem">不显示字段</string>

Apex/res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="actoin_add_favorite">Save Detail</string>
     <string name="actoin_save_search">Save search</string>
     <string name="action_deleteall">Delete all</string>
-    <string name="action_markallread">Mark all read</string>
+    <string name="action_markallread">Mark all as read</string>
     <string name="action_forget_password">Forget password</string>
     <string name="action_custom_fields">Customize Fields</string>
     <string name="action_sign_in_register"><b>Login</b></string>
@@ -60,8 +60,8 @@
     <string name="str_search">Search</string>
     <string name="str_clear">Clear</string>
     <string name="str_ver">ver:</string>
-    <string name="str_notification_title">New message from Apex</string>
-    <string name="str_mnotification_title"> new messages from Apex</string>
+    <string name="str_notification_title">New Apex message</string>
+    <string name="str_mnotification_title">new Apex message</string>
     <string name="str_notification_text">Container status changed</string>
     <string name="str_tool">Tools</string>
     <string name="str_location">Service Location</string>

Apex/src/com/usai/apex/Alarmreceiver.java

@@ -193,7 +193,7 @@ public class Alarmreceiver extends BroadcastReceiver
 							notification
 									.setLatestEventInfo(
 											mcontext,
-											notification.number
+											notification.number+" "
 													+ ApexTrackingApplication
 															.get_instance()
 															.getString(

Apex/src/com/usai/apex/FunctionSelectActivity.java

@@ -339,7 +339,7 @@ public class FunctionSelectActivity extends FragmentActivity implements
 	protected void onResume()
 	{
 		SQLiteDatabase db = dbUtil.OpenDB(this, null, false);
-		int count = dbUtil.get_count(db, "push_message", "read = 0");
+		int count = dbUtil.get_count(db, "push_message", "read = 0 and user = '"+ApexTrackingApplication.get_user()+"'");
 
 		dbUtil.CloseDB(db);
 		NotificationManager nManager = (NotificationManager) this