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="3"
-    android:versionName="A1403114" >
+    android:versionCode="4"
+    android:versionName="A140411" >
 
     <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
     <uses-sdk

Apex/proguard/mapping.txt

@@ -7571,26 +7571,34 @@ com.usai.apex.ApexTrackingApplication -> com.usai.apex.ApexTrackingApplication:
     java.lang.String get_user() -> f
     java.lang.String get_pass() -> g
 com.usai.apex.BaiduMapFragment -> com.usai.apex.f:
-    com.usai.apex.BaiduMapFragment$SearchTask m_task -> e
+    com.usai.apex.BaiduMapFragment$SearchTask m_task -> g
     java.lang.String fragment_content -> a
-    com.baidu.mapapi.map.MapView mMapView -> f
-    com.usai.apex.BaiduMapFragment$MyOverlay mOverlay -> g
-    java.util.ArrayList mItems -> h
+    com.baidu.mapapi.map.MapView mMapView -> h
+    com.usai.apex.BaiduMapFragment$MyOverlay mOverlay -> i
+    java.util.ArrayList mItems -> j
+    com.baidu.mapapi.map.PopupOverlay pop -> k
     com.baidu.mapapi.map.SupportMapFragment fragment -> b
     com.baidu.mapapi.BMapManager mBMapManager -> c
     boolean m_bKeyRight -> d
+    java.util.HashMap marker_detail -> e
+    com.baidu.mapapi.map.OverlayItem m_curitem -> f
     void AddMarker() -> a
     void onActivityCreated(android.os.Bundle) -> onActivityCreated
     android.view.View onCreateView(android.view.LayoutInflater,android.view.ViewGroup,android.os.Bundle) -> onCreateView
     void onResume() -> onResume
-    void access$0$14e09c0e(com.usai.apex.BaiduMapFragment) -> a
-com.usai.apex.BaiduMapFragment$MyGeneralListener -> com.usai.apex.g:
+    com.baidu.mapapi.map.PopupOverlay access$0(com.usai.apex.BaiduMapFragment) -> a
+    void access$1$14e09c0e(com.usai.apex.BaiduMapFragment) -> b
+    com.baidu.mapapi.map.MapView access$2(com.usai.apex.BaiduMapFragment) -> c
+com.usai.apex.BaiduMapFragment$1 -> com.usai.apex.g:
+    com.usai.apex.BaiduMapFragment this$0 -> a
+    void onClickedPopup(int) -> onClickedPopup
+com.usai.apex.BaiduMapFragment$MyGeneralListener -> com.usai.apex.h:
     void onGetNetworkState(int) -> onGetNetworkState
     void onGetPermissionState(int) -> onGetPermissionState
-com.usai.apex.BaiduMapFragment$MyOverlay -> com.usai.apex.h:
+com.usai.apex.BaiduMapFragment$MyOverlay -> com.usai.apex.i:
     com.usai.apex.BaiduMapFragment this$0 -> d
     boolean onTap(int) -> onTap
-com.usai.apex.BaiduMapFragment$SearchTask -> com.usai.apex.i:
+com.usai.apex.BaiduMapFragment$SearchTask -> com.usai.apex.j:
     int errorcode -> a
     com.usai.apex.BaiduMapFragment this$0 -> b
     java.lang.Boolean doInBackground$5f8445a4() -> a
@@ -7620,34 +7628,34 @@ com.usai.apex.ChangePasswordActivity -> com.usai.apex.ChangePasswordActivity:
     android.widget.EditText access$4(com.usai.apex.ChangePasswordActivity) -> e
     android.view.View access$5(com.usai.apex.ChangePasswordActivity) -> f
     android.view.View access$6(com.usai.apex.ChangePasswordActivity) -> g
-com.usai.apex.ChangePasswordActivity$1 -> com.usai.apex.j:
+com.usai.apex.ChangePasswordActivity$1 -> com.usai.apex.k:
     com.usai.apex.ChangePasswordActivity this$0 -> a
     boolean onEditorAction(android.widget.TextView,int,android.view.KeyEvent) -> onEditorAction
-com.usai.apex.ChangePasswordActivity$2 -> com.usai.apex.k:
+com.usai.apex.ChangePasswordActivity$2 -> com.usai.apex.l:
     com.usai.apex.ChangePasswordActivity this$0 -> a
     void onClick(android.view.View) -> onClick
-com.usai.apex.ChangePasswordActivity$3 -> com.usai.apex.l:
+com.usai.apex.ChangePasswordActivity$3 -> com.usai.apex.m:
     com.usai.apex.ChangePasswordActivity this$0 -> a
     void onClick(android.view.View) -> onClick
-com.usai.apex.ChangePasswordActivity$4 -> com.usai.apex.m:
+com.usai.apex.ChangePasswordActivity$4 -> com.usai.apex.n:
     com.usai.apex.ChangePasswordActivity this$0 -> a
     boolean val$show -> b
     void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-com.usai.apex.ChangePasswordActivity$5 -> com.usai.apex.n:
+com.usai.apex.ChangePasswordActivity$5 -> com.usai.apex.o:
     com.usai.apex.ChangePasswordActivity this$0 -> a
     boolean val$show -> b
     void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-com.usai.apex.ChangePasswordActivity$UserLoginTask -> com.usai.apex.o:
+com.usai.apex.ChangePasswordActivity$UserLoginTask -> com.usai.apex.p:
     int errorcode -> a
     com.usai.apex.ChangePasswordActivity this$0 -> b
     void onCancelled() -> onCancelled
     void onPostExecute(java.lang.Object) -> onPostExecute
     java.lang.Object doInBackground(java.lang.Object[]) -> doInBackground
     com.usai.apex.ChangePasswordActivity access$2(com.usai.apex.ChangePasswordActivity$UserLoginTask) -> a
-com.usai.apex.ChangePasswordActivity$UserLoginTask$1 -> com.usai.apex.p:
+com.usai.apex.ChangePasswordActivity$UserLoginTask$1 -> com.usai.apex.q:
     com.usai.apex.ChangePasswordActivity$UserLoginTask this$1 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.ChangePasswordActivity$UserLoginTask$2 -> com.usai.apex.q:
+com.usai.apex.ChangePasswordActivity$UserLoginTask$2 -> com.usai.apex.r:
     com.usai.apex.ChangePasswordActivity$UserLoginTask this$1 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
 com.usai.apex.CustomizeFieldsActivity -> com.usai.apex.CustomizeFieldsActivity:
@@ -7662,14 +7670,14 @@ com.usai.apex.CustomizeFieldsActivity -> com.usai.apex.CustomizeFieldsActivity:
     void onCreate(android.os.Bundle) -> onCreate
     boolean onOptionsItemSelected(android.view.MenuItem) -> onOptionsItemSelected
     void onClick(android.view.View) -> onClick
-com.usai.apex.CustomizeFieldsActivity$1 -> com.usai.apex.r:
+com.usai.apex.CustomizeFieldsActivity$1 -> com.usai.apex.s:
     com.usai.apex.CustomizeFieldsActivity this$0 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.CustomizeFieldsActivity$DragListAdapter -> com.usai.apex.s:
+com.usai.apex.CustomizeFieldsActivity$DragListAdapter -> com.usai.apex.t:
     boolean isEnabled(int) -> isEnabled
     int switchpos() -> a
     android.view.View getView(int,android.view.View,android.view.ViewGroup) -> getView
-com.usai.apex.CustomizeFieldsActivity$fieldedit -> com.usai.apex.t:
+com.usai.apex.CustomizeFieldsActivity$fieldedit -> com.usai.apex.u:
     java.lang.String name -> a
     int _id -> b
     com.usai.apex.CustomizeFieldsActivity this$0 -> c
@@ -7690,14 +7698,14 @@ com.usai.apex.DetailActivity -> com.usai.apex.DetailActivity:
     void setupTabs() -> d
     boolean onCreateOptionsMenu(android.view.Menu) -> onCreateOptionsMenu
     boolean onOptionsItemSelected(android.view.MenuItem) -> onOptionsItemSelected
-com.usai.apex.DetailActivity$1 -> com.usai.apex.u:
+com.usai.apex.DetailActivity$1 -> com.usai.apex.v:
     com.usai.apex.DetailActivity this$0 -> a
     android.view.View val$edit -> b
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.DetailActivity$2 -> com.usai.apex.v:
+com.usai.apex.DetailActivity$2 -> com.usai.apex.w:
     com.usai.apex.DetailActivity this$0 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.DetailFragment -> com.usai.apex.w:
+com.usai.apex.DetailFragment -> com.usai.apex.x:
     android.widget.LinearLayout ll_root -> a
     android.widget.ScrollView sl_root -> b
     java.lang.String mimeType -> c
@@ -7719,37 +7727,37 @@ com.usai.apex.DetailFragment -> com.usai.apex.w:
     void access$0$5aaa0612(com.usai.apex.DetailFragment) -> a
     void access$1$2d182c5d(com.usai.apex.DetailFragment) -> b
     android.view.View access$2(com.usai.apex.DetailFragment) -> c
-com.usai.apex.DetailFragment$1 -> com.usai.apex.x:
+com.usai.apex.DetailFragment$1 -> com.usai.apex.y:
     com.usai.apex.DetailFragment this$0 -> a
     boolean val$show -> b
     void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-com.usai.apex.DetailFragment$2 -> com.usai.apex.y:
+com.usai.apex.DetailFragment$2 -> com.usai.apex.z:
     com.usai.apex.DetailFragment this$0 -> a
     boolean val$show -> b
     void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-com.usai.apex.DetailFragment$3 -> com.usai.apex.z:
+com.usai.apex.DetailFragment$3 -> com.usai.apex.aa:
     com.usai.apex.DetailFragment this$0 -> a
     void onClick(android.view.View) -> onClick
-com.usai.apex.DetailFragment$4 -> com.usai.apex.aa:
+com.usai.apex.DetailFragment$4 -> com.usai.apex.ab:
     com.usai.apex.DetailFragment this$0 -> a
     void onDownloadStart(java.lang.String,java.lang.String,java.lang.String,java.lang.String,long) -> onDownloadStart
-com.usai.apex.DetailFragment$4$1 -> com.usai.apex.ab:
+com.usai.apex.DetailFragment$4$1 -> com.usai.apex.ac:
     com.usai.apex.DetailFragment$4 this$1 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.DetailFragment$4$2 -> com.usai.apex.ac:
+com.usai.apex.DetailFragment$4$2 -> com.usai.apex.ad:
     com.usai.apex.DetailFragment$4 this$1 -> a
     android.app.DownloadManager val$downloadManager -> b
     android.app.DownloadManager$Request val$request -> c
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.DetailFragment$4$3 -> com.usai.apex.ad:
+com.usai.apex.DetailFragment$4$3 -> com.usai.apex.ae:
     com.usai.apex.DetailFragment$4 this$1 -> a
     void onClick(android.content.DialogInterface,int) -> onClick
-com.usai.apex.DetailFragment$MyWebViewClient -> com.usai.apex.ae:
+com.usai.apex.DetailFragment$MyWebViewClient -> com.usai.apex.af:
     com.usai.apex.DetailFragment this$0 -> a
     void onPageStarted(android.webkit.WebView,java.lang.String,android.graphics.Bitmap) -> onPageStarted
     void onPageFinished(android.webkit.WebView,java.lang.String) -> onPageFinished
     void onReceivedError(android.webkit.WebView,int,java.lang.String,java.lang.String) -> onReceivedError
-com.usai.apex.DetailFragment$SearchTask -> com.usai.apex.af:
+com.usai.apex.DetailFragment$SearchTask -> com.usai.apex.ag:
     int errorcode -> a
     com.usai.apex.DetailFragment this$0 -> b
     void onCancelled() -> onCancelled
@@ -7757,7 +7765,7 @@ com.usai.apex.DetailFragment$SearchTask -> com.usai.apex.af:
     java.lang.Object doInBackground(java.lang.Object[]) -> doInBackground
 com.usai.apex.DocumentsActivity -> com.usai.apex.DocumentsActivity:
     void onCreate(android.os.Bundle) -> onCreate
-com.usai.apex.DocumentsFragment -> com.usai.apex.ag:
+com.usai.apex.DocumentsFragment -> com.usai.apex.ah:
     java.util.List getData() -> b
     void onActivityCreated(android.os.Bundle) -> onActivityCreated
     void onListItemClick$42a3bb55(int,long) -> a
@@ -7782,10 +7790,10 @@ com.usai.apex.DragListView -> com.usai.apex.DragListView:
     long access$1(com.usai.apex.DragListView) -> b
     void access$2(com.usai.apex.DragListView,int) -> a
     void access$3(com.usai.apex.DragListView,long) -> a
-com.usai.apex.DragListView$1 -> com.usai.apex.ah:
+com.usai.apex.DragListView$1 -> com.usai.apex.ai:
     com.usai.apex.DragListView this$0 -> a
     void onItemClick(android.widget.AdapterView,android.view.View,int,long) -> onItemClick
-com.usai.apex.FavoritesFragment -> com.usai.apex.ai:
+com.usai.apex.FavoritesFragment -> com.usai.apex.aj:
     com.usai.apex.FavoritesFragment$SearchResult searchresult -> i
     android.widget.BaseAdapter adapter -> j
     int pointX -> k
@@ -7799,17 +7807,17 @@ com.usai.apex.FavoritesFragment -> com.usai.apex.ai:
     void onListItemClick$42a3bb55(int,long) -> a
     boolean onTouch(android.view.View,android.view.MotionEvent) -> onTouch
     int access$0(com.usai.apex.FavoritesFragment) -> a
-com.usai.apex.FavoritesFragment$1 -> com.usai.apex.aj:
+com.usai.apex.FavoritesFragment$1 -> com.usai.apex.ak:
     com.usai.apex.FavoritesFragment this$0 -> a
     void onClick(android.view.View) -> onClick
-com.usai.apex.FavoritesFragment$FavoritesAdapter -> com.usai.apex.ak:
+com.usai.apex.FavoritesFragment$FavoritesAdapter -> com.usai.apex.al:
     android.view.LayoutInflater mInflater -> b
     com.usai.apex.FavoritesFragment this$0 -> a
     android.view.View getView(int,android.view.View,android.view.ViewGroup) -> getView
     int getCount() -> getCount
     java.lang.Object getItem(int) -> getItem
     long getItemId(int) -> getItemId
-com.usai.apex.FavoritesFragment$SearchResult -> com.usai.apex.al:
+com.usai.apex.FavoritesFragment$SearchResult -> com.usai.apex.am:
     java.util.List datalist -> a
     com.usai.apex.FavoritesFragment this$0 -> b
     void add_records(android.database.Cursor) -> a
@@ -7825,7 +7833,7 @@ com.usai.apex.HelpActivity -> com.usai.apex.HelpActivity:
     void onCreate(android.os.Bundle) -> onCreate
     boolean onCreateOptionsMenu(android.view.Menu) -> onCreateOptionsMenu
     void onClick(android.view.View) -> onClick
-com.usai.apex.HistoryFragment -> com.usai.apex.am:
+com.usai.apex.HistoryFragment -> com.usai.apex.an:
     com.usai.apex.HistoryFragment$SearchResult searchresult -> i
     android.widget.BaseAdapter adapter -> j
     int pointX -> k
@@ -7839,30 +7847,24 @@ com.usai.apex.HistoryFragment -> com.usai.apex.am:
     void onListItemClick$42a3bb55(int,long) -> a
     boolean onTouch(android.view.View,android.view.MotionEvent) -> onTouch
     int access$0(com.usai.apex.HistoryFragment) -> a
-com.usai.apex.HistoryFragment$1 -> com.usai.apex.an:
+com.usai.apex.HistoryFragment$1 -> com.usai.apex.ao:
     com.usai.apex.HistoryFragment this$0 -> a
     void onClick(android.view.View) -> onClick
-com.usai.apex.HistoryFragment$HistoryAdapter -> com.usai.apex.ao:
+com.usai.apex.HistoryFragment$HistoryAdapter -> com.usai.apex.ap:
     android.view.LayoutInflater mInflater -> b
     com.usai.apex.HistoryFragment this$0 -> a
     android.view.View getView(int,android.view.View,android.view.ViewGroup) -> getView
     int getCount() -> getCount
     java.lang.Object getItem(int) -> getItem
     long getItemId(int) -> getItemId
-com.usai.apex.HistoryFragment$SearchResult -> com.usai.apex.ap:
+com.usai.apex.HistoryFragment$SearchResult -> com.usai.apex.aq:
     java.util.List datalist -> a
     com.usai.apex.HistoryFragment this$0 -> b
     void add_records(android.database.Cursor) -> a
 com.usai.apex.InnerMapActivity -> com.usai.apex.InnerMapActivity:
-    boolean m_bKeyRight -> n
-    com.baidu.mapapi.BMapManager mBMapManager -> o
-    com.baidu.mapapi.map.SupportMapFragment map -> p
-    boolean m_bhasgoogleframework -> q
+    boolean m_bhasgoogleframework -> n
     boolean onKeyDown(int,android.view.KeyEvent) -> onKeyDown
     void onCreate(android.os.Bundle) -> onCreate
-com.usai.apex.InnerMapActivity$MyGeneralListener -> com.usai.apex.aq:
-    void onGetNetworkState(int) -> onGetNetworkState
-    void onGetPermissionState(int) -> onGetPermissionState
 com.usai.apex.InnerToolsActivity -> com.usai.apex.InnerToolsActivity:
     void onCreate(android.os.Bundle) -> onCreate
 com.usai.apex.LocalDocumentActivity -> com.usai.apex.LocalDocumentActivity:
@@ -8258,6 +8260,7 @@ com.usai.apex.ServiceLocationFragment$SearchTask -> com.usai.apex.cu:
     void onPostExecute(java.lang.Object) -> onPostExecute
     java.lang.Object doInBackground(java.lang.Object[]) -> doInBackground
 com.usai.apex.ToolsFragment -> com.usai.apex.cv:
+    void onActivityResult(int,int,android.content.Intent) -> onActivityResult
     java.util.List getData() -> b
     void onActivityCreated(android.os.Bundle) -> onActivityCreated
     void onListItemClick$42a3bb55(int,long) -> a

Apex/proguard/seeds.txt

@@ -3014,6 +3014,7 @@ com.usai.apex.R$drawable: int help_search
 com.usai.apex.R$drawable: int ic_about
 com.usai.apex.R$drawable: int ic_cargo_tracking
 com.usai.apex.R$drawable: int ic_container_detail
+com.usai.apex.R$drawable: int ic_document
 com.usai.apex.R$drawable: int ic_down_doc
 com.usai.apex.R$drawable: int ic_drag
 com.usai.apex.R$drawable: int ic_exit
@@ -3036,6 +3037,9 @@ com.usai.apex.R$drawable: int ic_plusone_tall_off_client
 com.usai.apex.R$drawable: int ic_service_location
 com.usai.apex.R$drawable: int ic_test
 com.usai.apex.R$drawable: int ic_tools
+com.usai.apex.R$drawable: int pop_bg9
+com.usai.apex.R$drawable: int popup_down
+com.usai.apex.R$drawable: int popup_middle
 com.usai.apex.R$drawable: int tablehead
 com.usai.apex.R$drawable: int tableitem
 com.usai.apex.R$id: int action_addto_favorite
@@ -3105,6 +3109,7 @@ com.usai.apex.R$id: int none
 com.usai.apex.R$id: int normal
 com.usai.apex.R$id: int old_password
 com.usai.apex.R$id: int password
+com.usai.apex.R$id: int popinfo
 com.usai.apex.R$id: int progressbar
 com.usai.apex.R$id: int radio0
 com.usai.apex.R$id: int radio1
@@ -3142,6 +3147,7 @@ com.usai.apex.R$id: int tv_empty
 com.usai.apex.R$id: int tv_exit
 com.usai.apex.R$id: int tv_fax
 com.usai.apex.R$id: int tv_group
+com.usai.apex.R$id: int tv_hint
 com.usai.apex.R$id: int tv_info
 com.usai.apex.R$id: int tv_item
 com.usai.apex.R$id: int tv_key
@@ -3200,6 +3206,7 @@ com.usai.apex.R$layout: int keymapping_item
 com.usai.apex.R$layout: int list_content
 com.usai.apex.R$layout: int list_item
 com.usai.apex.R$layout: int marker_info
+com.usai.apex.R$layout: int marker_view
 com.usai.apex.R$layout: int message_detail_item
 com.usai.apex.R$layout: int message_list
 com.usai.apex.R$layout: int message_list_item
@@ -3246,6 +3253,7 @@ com.usai.apex.R$string: int auth_client_needs_update_title
 com.usai.apex.R$string: int auth_client_play_services_err_notification_msg
 com.usai.apex.R$string: int auth_client_requested_by_msg
 com.usai.apex.R$string: int auth_client_using_bad_version_title
+com.usai.apex.R$string: int baidu_key
 com.usai.apex.R$string: int common_google_play_services_enable_button
 com.usai.apex.R$string: int common_google_play_services_enable_text
 com.usai.apex.R$string: int common_google_play_services_enable_title
@@ -3270,6 +3278,7 @@ com.usai.apex.R$string: int error_field_required
 com.usai.apex.R$string: int error_incorrect_password
 com.usai.apex.R$string: int error_invalid_email
 com.usai.apex.R$string: int error_invalid_password
+com.usai.apex.R$string: int login_progress_processing
 com.usai.apex.R$string: int login_progress_signing_in
 com.usai.apex.R$string: int msg_connection_none
 com.usai.apex.R$string: int msg_net_error
@@ -3285,7 +3294,9 @@ com.usai.apex.R$string: int str_0
 com.usai.apex.R$string: int str_2000
 com.usai.apex.R$string: int str_Loading
 com.usai.apex.R$string: int str_cancel
+com.usai.apex.R$string: int str_change_success
 com.usai.apex.R$string: int str_clear
+com.usai.apex.R$string: int str_click_for_more
 com.usai.apex.R$string: int str_confirmdelete
 com.usai.apex.R$string: int str_confirmdownload
 com.usai.apex.R$string: int str_containerstatus
@@ -3296,9 +3307,13 @@ com.usai.apex.R$string: int str_detail
 com.usai.apex.R$string: int str_displayitem
 com.usai.apex.R$string: int str_download
 com.usai.apex.R$string: int str_downloadmessage
+com.usai.apex.R$string: int str_email_sent
+com.usai.apex.R$string: int str_failed_to_changepassword
 com.usai.apex.R$string: int str_false
 com.usai.apex.R$string: int str_from
 com.usai.apex.R$string: int str_hideitem
+com.usai.apex.R$string: int str_invalid_password
+com.usai.apex.R$string: int str_invalid_pore
 com.usai.apex.R$string: int str_localdir_error
 com.usai.apex.R$string: int str_location
 com.usai.apex.R$string: int str_mnotification_title
@@ -3306,9 +3321,12 @@ com.usai.apex.R$string: int str_nextpage
 com.usai.apex.R$string: int str_notification_text
 com.usai.apex.R$string: int str_notification_title
 com.usai.apex.R$string: int str_openfile
+com.usai.apex.R$string: int str_password_changed
 com.usai.apex.R$string: int str_prepage
 com.usai.apex.R$string: int str_records
 com.usai.apex.R$string: int str_reset
+com.usai.apex.R$string: int str_retrieve_failed
+com.usai.apex.R$string: int str_retrieve_success
 com.usai.apex.R$string: int str_retrievepass
 com.usai.apex.R$string: int str_savepass
 com.usai.apex.R$string: int str_search

Apex/proguard/usage.txt

@@ -3402,8 +3402,6 @@ com.google.android.gms.wallet.WalletConstants
 com.usai.apex.ApexPushService
 com.usai.apex.ApexTrackingApplication:
     static final java.lang.String TAG
-com.usai.apex.BaiduMapFragment:
-    public static final java.lang.String strKey
 com.usai.apex.BuildConfig
 com.usai.apex.CustomizeFieldsActivity:
     48:48:static synthetic java.util.List access$0()
@@ -3416,11 +3414,13 @@ com.usai.apex.DetailFragment:
 com.usai.apex.DetailFragment$MyWebViewClient:
     688:689:public boolean shouldOverviewUrlLoading(android.webkit.WebView,java.lang.String)
 com.usai.apex.FunctionSelectActivity:
+    static final int PASSWORD_CHANGED
     private static final int REQUEST_LOGINACTIVITY
     private static final int REQUEST_CHANGEPASSWORD_ACTIVITY
+    private static final int REQUEST_TOOLS_ACTIVITY
 com.usai.apex.InnerMapActivity:
-    public static final java.lang.String strKey
     private static final java.lang.String LTAG
+    com.baidu.mapapi.map.SupportMapFragment map
 com.usai.apex.LocalDocumentActivity:
     public static final java.lang.String FILETYPE
 com.usai.apex.LocationDetail:
@@ -3445,8 +3445,11 @@ com.usai.apex.ResultActivity:
 com.usai.apex.SearchResult:
     private static final long serialVersionUID
 com.usai.apex.ToolsFragment:
-    28:46:private void delShortcut()
-    50:70:private void addShortcut()
+    static final int PASSWORD_CHANGED
+    private static final int REQUEST_CHANGEPASSWORD_ACTIVITY
+    private static final int REQUEST_LOGINACTIVITY
+    34:52:private void delShortcut()
+    56:76:private void addShortcut()
 com.usai.util.Crypto:
     private static final java.lang.String HEX
     21:21:public Crypto()

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

@@ -11,13 +11,16 @@
     <string name="action_custom_fields">自定义字段</string>
     <string name="action_sign_in_register"><b>登录</b></string>
     <string name="action_sign_in_short">登录</string>
+    <string name="action_search_history">搜索历史</string>
+    <string name="action_saved_detail">保存的Detail</string>
     <string name="action_forgot_password">Recover lost password</string>
     <string name="action_help">帮助</string>
     <string name="error_invalid_email">email地址无效</string>
     <string name="error_invalid_password">密码太短</string>
     <string name="error_incorrect_password">密码错误</string>
-    <string name="error_field_required">This field is required</string>
+    <string name="error_field_required">此项不能为空</string>
     <string name="login_progress_signing_in">正在登录&#8230;</string>
+    <string name="login_progress_processing">处理中，请稍候&#8230;</string>
     <string name="msg_net_resulterror">通信错误，请联系sales。CODE</string>
     <string name="msg_net_passwordchangedremote">密码在其他设备上修改过，请重新登录。</string>
     <string name="msg_net_error">无法连接服务器</string>
@@ -28,6 +31,14 @@
     <string name="prompt_user">用户名</string>
     <string name="prompt_password">密码</string>
     <string name="search">搜索</string>
+    <string name="str_failed_to_changepassword">操作失败</string>
+    <string name="str_invalid_password">密码无效</string>
+    <string name="str_password_changed">密码已修改</string>
+    <string name="str_change_success">操作成功</string>
+    <string name="str_retrieve_success">操作成功</string>
+    <string name="str_retrieve_failed">操作失败</string>
+    <string name="str_invalid_pore">用户名或Email无效</string>
+    <string name="str_email_sent">找回密码邮件已发送。</string>
     <string name="str_click_for_more">单击查看更多信息</string>
     <string name="str_del">删除</string>
     <string name="str_tool">工具</string>

Apex/res/values/strings.xml

@@ -11,6 +11,8 @@
     <string name="action_custom_fields">Customize Fields</string>
     <string name="action_sign_in_register"><b>Login</b></string>
     <string name="action_sign_in_short">Sign in</string>
+    <string name="action_search_history">Search history</string>
+    <string name="action_saved_detail">Saved Detail</string>
     <string name="action_forgot_password">Recover lost password</string>
     <string name="action_help">Help</string>
     <string name="error_invalid_email">This email address is invalid</string>
@@ -18,6 +20,7 @@
     <string name="error_incorrect_password">This password is incorrect</string>
     <string name="error_field_required">This field is required</string>
     <string name="login_progress_signing_in">Signing in&#8230;</string>
+    <string name="login_progress_processing">Processing,please wait&#8230;</string>
     <string name="msg_net_resulterror">An error occur on server,please contact our sales.CODE</string>
     <string name="msg_net_passwordchangedremote">Password changed on other device,please relogin.</string>
     <string name="msg_net_error">Can not connect to server</string>
@@ -29,6 +32,14 @@
     <string name="prompt_password">Password</string>
     <string name="search">Search</string>
     <string name="str_click_for_more">Click for more info</string>
+    <string name="str_failed_to_changepassword">Failed to change password</string>
+    <string name="str_invalid_password">Invalid password</string>
+    <string name="str_password_changed">Password changed</string>
+    <string name="str_change_success">Success</string>
+    <string name="str_retrieve_success">Retrieve successfully!</string>
+    <string name="str_retrieve_failed">Retrieve failed</string>
+    <string name="str_invalid_pore">Invalid user name or email</string>
+    <string name="str_email_sent">Email has been sent.</string>
     <string name="str_del">del</string>
     <string name="str_true">true</string>
     <string name="str_false">false</string>

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

@@ -54,7 +54,8 @@ public class BaiduMapFragment extends Fragment
 	BMapManager						mBMapManager		= null;
 	public static boolean			m_bKeyRight			= true;
 	HashMap<String, LocationDetail>	marker_detail		= new HashMap<String, LocationDetail>();
-	OverlayItem m_curitem = null;
+	OverlayItem						m_curitem			= null;
+
 	public class MyOverlay extends ItemizedOverlay
 	{
 
@@ -83,15 +84,18 @@ public class BaiduMapFragment extends Fragment
 			return true;
 		}
 
-//		 @Override
-//		 public boolean onTap(GeoPoint pt , MapView mMapView){
-//		  if (pop != null){
-//			  pop.
-//		  pop.hidePop();
-////		  mMapView.removeView(button);
-//		  }
-//		 return false;
-//		 }
+		@Override
+		public boolean onTap(GeoPoint pt, MapView mMapView)
+		{
+			Log.d("baidu map demo ", "hide pop");
+			if (pop != null)
+			{
+
+				pop.hidePop();
+				// mMapView.removeView(button);
+			}
+			return false;
+		}
 
 	}
 
@@ -144,7 +148,6 @@ public class BaiduMapFragment extends Fragment
 						(int) (Double.parseDouble(longitude) * 1E6));
 				OverlayItem item1 = new OverlayItem(p1, company, city + "\n"
 						+ area);
-				
 
 				/**
 				 * 将item 添加到overlay中 注意： 同一个itme只能add一次
@@ -172,12 +175,11 @@ public class BaiduMapFragment extends Fragment
 				{
 					Log.d("baidu map.......", "popup on click");
 					pop.hidePop();
-					
+
 					mMapView.refresh();
 					Intent intent = new Intent();
 					intent.setClass(getActivity(), LocationDetailActivity.class);
 
-
 					String markertext = m_curitem.getTitle();
 
 					intent.putExtra("detail", marker_detail.get(markertext));
@@ -370,7 +372,8 @@ public class BaiduMapFragment extends Fragment
 
 	public void initEngineManager(Context context)
 	{
-		String strKey = ApexTrackingApplication.get_instance().getString(R.string.baidu_key);
+		String strKey = ApexTrackingApplication.get_instance().getString(
+				R.string.baidu_key);
 		if (mBMapManager == null)
 		{
 			mBMapManager = new BMapManager(context);
@@ -378,8 +381,8 @@ public class BaiduMapFragment extends Fragment
 
 		if (!mBMapManager.init(strKey, new MyGeneralListener()))
 		{
-			Toast.makeText(getActivity().getApplicationContext(),
-					"BMapManager  初始化错误!", Toast.LENGTH_LONG).show();
+			// Toast.makeText(getActivity().getApplicationContext(),
+			// "BMapManager  初始化错误!", Toast.LENGTH_LONG).show();
 		}
 	}
 
@@ -392,17 +395,17 @@ public class BaiduMapFragment extends Fragment
 		{
 			if (iError == MKEvent.ERROR_NETWORK_CONNECT)
 			{
-				Toast.makeText(
-						ApexTrackingApplication.get_instance()
-								.getApplicationContext(), "您的网络出错啦！",
-						Toast.LENGTH_LONG).show();
+				// Toast.makeText(
+				// ApexTrackingApplication.get_instance()
+				// .getApplicationContext(), "您的网络出错啦！",
+				// Toast.LENGTH_LONG).show();
 			}
 			else if (iError == MKEvent.ERROR_NETWORK_DATA)
 			{
-				Toast.makeText(
-						ApexTrackingApplication.get_instance()
-								.getApplicationContext(), "输入正确的检索条件！",
-						Toast.LENGTH_LONG).show();
+				// Toast.makeText(
+				// ApexTrackingApplication.get_instance()
+				// .getApplicationContext(), "输入正确的检索条件！",
+				// Toast.LENGTH_LONG).show();
 			}
 			// ...
 		}
@@ -414,20 +417,20 @@ public class BaiduMapFragment extends Fragment
 			if (iError != 0)
 			{
 				// 授权Key错误：
-				Toast.makeText(
-						ApexTrackingApplication.get_instance()
-								.getApplicationContext(),
-						"请在 DemoApplication.java文件输入正确的授权Key,并检查您的网络连接是否正常！error: "
-								+ iError, Toast.LENGTH_LONG).show();
+				// Toast.makeText(
+				// ApexTrackingApplication.get_instance()
+				// .getApplicationContext(),
+				// "请在 DemoApplication.java文件输入正确的授权Key,并检查您的网络连接是否正常！error: "
+				// + iError, Toast.LENGTH_LONG).show();
 				m_bKeyRight = false;
 			}
 			else
 			{
 				m_bKeyRight = true;
-				Toast.makeText(
-						ApexTrackingApplication.get_instance()
-								.getApplicationContext(), "key认证成功",
-						Toast.LENGTH_LONG).show();
+				// Toast.makeText(
+				// ApexTrackingApplication.get_instance()
+				// .getApplicationContext(), "key认证成功",
+				// Toast.LENGTH_LONG).show();
 			}
 		}
 	}

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

@@ -242,11 +242,11 @@ public class ChangePasswordActivity extends Activity {
 
 			if (success) {
 				AlertDialog.Builder builder = new Builder(ChangePasswordActivity.this);
-				builder.setMessage("Password changed.");
+				builder.setMessage(getString(R.string.str_password_changed));
 
-				builder.setTitle("Change successed");
+				builder.setTitle(getString(R.string.str_change_success));
 
-				builder.setPositiveButton("Ok", new OnClickListener() {
+				builder.setPositiveButton(getString(android.R.string.ok), new OnClickListener() {
 
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
@@ -291,11 +291,11 @@ public class ChangePasswordActivity extends Activity {
 
 				case Network.RESULT_FALSE: {
 					AlertDialog.Builder builder = new Builder(ChangePasswordActivity.this);
-					builder.setMessage("Invalid password.");
+					builder.setMessage(getString(R.string.str_invalid_password));
 
-					builder.setTitle("Change failed");
+					builder.setTitle(getString(R.string.str_failed_to_changepassword));
 
-					builder.setPositiveButton("Ok", new OnClickListener() {
+					builder.setPositiveButton(getString(android.R.string.ok), new OnClickListener() {
 
 						@Override
 						public void onClick(DialogInterface dialog, int which) {

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

@@ -277,11 +277,11 @@ public class RetrievePasswordActivity extends Activity
 			{
 				AlertDialog.Builder builder = new Builder(
 						RetrievePasswordActivity.this);
-				builder.setMessage("Email has been sent.");
+				builder.setMessage(getString(R.string.str_email_sent));
 
-				builder.setTitle("Retrieve successfully!");
+				builder.setTitle(getString(R.string.str_retrieve_success));
 
-				builder.setPositiveButton("Ok", new OnClickListener()
+				builder.setPositiveButton(getString(android.R.string.ok), new OnClickListener()
 				{
 
 					@Override
@@ -341,11 +341,11 @@ public class RetrievePasswordActivity extends Activity
 					{
 						AlertDialog.Builder builder = new Builder(
 								RetrievePasswordActivity.this);
-						builder.setMessage("Invalid user name or email.");
+						builder.setMessage(getString(R.string.str_invalid_pore));
 
-						builder.setTitle("Retrieve failed");
+						builder.setTitle(getString(R.string.str_retrieve_failed));
 
-						builder.setPositiveButton("Ok", new OnClickListener()
+						builder.setPositiveButton(getString(android.R.string.ok), new OnClickListener()
 						{
 
 							@Override

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

@@ -45,12 +45,12 @@ public class SearchHistoryActivity extends FragmentActivity
 		mTabHost.setup();
 
 		mTabHost.addTab(mTabHost
-				.newTabSpec(getString(R.string.action_sign_in_short))
-				.setIndicator(getString(R.string.action_sign_in_short))
+				.newTabSpec(getString(R.string.action_search_history))
+				.setIndicator(getString(R.string.action_search_history))
 				.setContent(R.id.tab1));
 
-		mTabHost.addTab(mTabHost.newTabSpec(getString(R.string.str_tool))
-				.setIndicator(getString(R.string.str_tool))
+		mTabHost.addTab(mTabHost.newTabSpec(getString(R.string.action_saved_detail))
+				.setIndicator(getString(R.string.action_saved_detail))
 				.setContent(R.id.tab2));