1.修改Android Apex Drivers国际化。

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/MainActivity.java

@@ -282,16 +282,16 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
             int required = aps.optInt("required");
             String msg = aps.optString("message");
             if (TextUtils.isEmpty(msg)) {
-                msg = orderID + " status changed,view detail?";
+                msg = orderID + getString(R.string.notification_order_change_msg);
             }
 
             android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(this);
-            builder.setTitle("Message");
+            builder.setTitle(getString(R.string.message));
             builder.setMessage(msg);
             if (required == 0) {
-                builder.setNegativeButton("Cancel",null);
+                builder.setNegativeButton(getString(R.string.btn_cancel),null);
             }
-            builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+            builder.setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     showDetailByNotification(aps);
@@ -347,16 +347,16 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
 
             String msg=null;
             if(request)
-                msg="Apex & Drivers needs some essential permissions.";
+                msg=getString(R.string.app_name) + getString(R.string.permission_request_msg);
             else
-                msg="Apex & Drivers will quit because missing some essential permissions.\nPlease check your system setting.";
+                msg=getString(R.string.app_name) + getString(R.string.permission_deny_msg);
 
             if(missing) {
                 final boolean finalRequest = request;
                 new AlertDialog.Builder(this)
-                        .setTitle("Warning")
+                        .setTitle(getString(R.string.warning))
                         .setMessage(msg)
-                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                        .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
 //                                checkAllPermission();
@@ -412,9 +412,9 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
         if (!enable) {
 
             new AlertDialog.Builder(this)
-                    .setTitle("Warning")
-                    .setMessage("you should enable notification")
-                    .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                    .setTitle(getString(R.string.warning))
+                    .setMessage(getString(R.string.notification_enable_msg))
+                    .setPositiveButton(getString(R.id.btn_ok), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             openSystemSetting();
@@ -482,7 +482,7 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
 
         invalidateOptionsMenu();
 
-        setTitle("Login");
+        setTitle(getString(R.string.login_title));
     }
 
     private void initView() {
@@ -570,7 +570,7 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
 
         if (ApexDriverApplication.sharedApplication().isLogin()) {
 
-            MenuItem uploadItem = menu.add(0, 0, 0, "Upload List");
+            MenuItem uploadItem = menu.add(0, 0, 0, getString(R.string.main_menu_upload_title));
 
             Drawable drawable = getResources().getDrawable(R.drawable.upload_list);
             ImageUtil.renderingDrawable(drawable,getResources(),R.color.ApexDriverWhite);
@@ -623,7 +623,7 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
     private void showProgressDialog() {
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(this);
-            mProgressDialog.setMessage("loading...");
+            mProgressDialog.setMessage(getString(R.string.loading));
             mProgressDialog.setCancelable(false);
             mProgressDialog.show();
         }

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/detail/DetailActivity.java

@@ -121,7 +121,7 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        setTitle("Order Detail");
+        setTitle(getString(R.string.detail_title));
 
         if (getIntent() != null) {
             mOrderID = getIntent().getStringExtra(IntentOrderIDKey);
@@ -153,7 +153,7 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
         });
 
         mEmptyView = findViewById(R.id.detail_empty_btn);
-        mEmptyView.setText("There is no data\nPlease click to reload");
+        mEmptyView.setText(getString(R.string.empty_msg));
         mEmptyView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -285,7 +285,7 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
     private void showProgressDialog() {
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(this);
-            mProgressDialog.setMessage("loading...");
+            mProgressDialog.setMessage(getString(R.string.loading));
             mProgressDialog.setCancelable(false);
             mProgressDialog.show();
         }
@@ -303,9 +303,9 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
             return;
         }
 
-        new AlertDialog.Builder(mCtx).setTitle("Warning")
+        new AlertDialog.Builder(mCtx).setTitle(getString(R.string.warning))
                 .setMessage(msg)
-                .setPositiveButton("Ok",null)
+                .setPositiveButton(getString(R.string.btn_ok),null)
                 .show();
     }
 
@@ -423,8 +423,8 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
             new AlertDialog.Builder(mCtx)
                     .setTitle(actionModel.alertTitle)
                     .setMessage(actionModel.alertMsg)
-                    .setNegativeButton("Cancel",null)
-                    .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+                    .setNegativeButton(getString(R.string.btn_cancel),null)
+                    .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             handleAction(view,actionModel);
@@ -449,7 +449,7 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
             if (mapIntent.resolveActivity(getPackageManager()) != null) {
                 startActivity(mapIntent);
             } else {
-                Toast.makeText(mCtx,"There is no google map",Toast.LENGTH_LONG).show();
+                Toast.makeText(mCtx,getString(R.string.alert_no_google_map),Toast.LENGTH_LONG).show();
             }
         }
 
@@ -465,7 +465,7 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
             if (mapIntent.resolveActivity(getPackageManager()) != null) {
                 startActivity(mapIntent);
             } else {
-                Toast.makeText(mCtx,"There is no google map",Toast.LENGTH_LONG).show();
+                Toast.makeText(mCtx,getString(R.string.alert_no_google_map),Toast.LENGTH_LONG).show();
             }
 
         }
@@ -542,7 +542,7 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
                                 // error
                                 String errMsg = json.optString("err_msg");
                                 if (errMsg == null || errMsg.length() == 0) {
-                                    errMsg = "Sorry,there is something wrong";
+                                    errMsg = activity.getString(R.string.sorry);
                                 }
                                 activity.showWarningMsg(errMsg);
                             }
@@ -550,12 +550,12 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
                         } catch (JSONException e) {
                             e.printStackTrace();
                             // error
-                            String errMsg = "Sorry,there is something wrong";
+                            String errMsg = activity.getString(R.string.sorry);
                             activity.showWarningMsg(errMsg);
                         }
                     } else {
                         // error
-                        String errMsg = "Sorry,there is something wrong";
+                        String errMsg = activity.getString(R.string.sorry);
                         activity.showWarningMsg(errMsg);
                     }
                     activity.changeData();
@@ -582,13 +582,13 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
                             // error;
                             String errMsg = json.optString("err_msg");
                             if (errMsg == null || errMsg.length() == 0) {
-                                errMsg = "Sorry,there is something wrong";
+                                errMsg = activity.getString(R.string.sorry);
                             }
                             activity.showWarningMsg(errMsg);
                         }
                     } else {
                         // error
-                        String errMsg = "Sorry,there is something wrong";
+                        String errMsg = activity.getString(R.string.sorry);
                         activity.showWarningMsg(errMsg);
                     }
 
@@ -651,10 +651,10 @@ public class DetailActivity extends BasicActivity implements DetailAdapter.Detai
                     DetailActionSelectionModel currentModel = models.get(0);
 
                     new AlertDialog.Builder(mCtx)
-                            .setTitle("Warning")
-                            .setMessage("the " + currentModel.actionTitle + " is not done,are you sure to update " + model.actionTitle + " now?")
-                            .setNegativeButton("Cancel",null)
-                            .setPositiveButton("YES", new DialogInterface.OnClickListener() {
+                            .setTitle(getString(R.string.warning))
+                            .setMessage(String.format(getString(R.string.not_done),currentModel.actionTitle,model.actionTitle))
+                            .setNegativeButton(getString(R.string.btn_cancel),null)
+                            .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
                                     if (popupWindow != null) {

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/filter/OrderFilterActivity.java

@@ -40,9 +40,9 @@ public class OrderFilterActivity extends BasicActivity {
 
         if (filter.length() == 0) {
             new AlertDialog.Builder(ctx)
-                    .setTitle("Warning")
-                    .setMessage("There is no filter data")
-                    .setPositiveButton("Ok",null)
+                    .setTitle(ctx.getString(R.string.warning))
+                    .setMessage(ctx.getString(R.string.filter_empty))
+                    .setPositiveButton(ctx.getString(R.string.btn_ok),null)
                     .show();
             return null;
         }
@@ -69,6 +69,8 @@ public class OrderFilterActivity extends BasicActivity {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
+        setTitle(getString(R.string.filter_title));
+
         mFilterListView = findViewById(R.id.order_filter_listView);
         mFilterListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
             @Override
@@ -148,7 +150,7 @@ public class OrderFilterActivity extends BasicActivity {
 
         menu.clear();
 
-        menu.add(0,0,0,"Search");
+        menu.add(0,0,0,getString(R.string.filter_btn_search));
         MenuItem item = menu.findItem(0);
         if (item != null) {
             item.setShowAsAction(SHOW_AS_ACTION_ALWAYS);

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/home/HomeFragment.java

@@ -141,7 +141,7 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
 
         mEmptyContainer = view.findViewById(R.id.home_empty_view);
         mEmptyView = view.findViewById(R.id.home_empty_btn);
-        mEmptyView.setText("There is no data\nPlease click to reload");
+        mEmptyView.setText(getString(R.string.empty_msg));
         mEmptyView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -256,7 +256,7 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
     private void showProgressDialog() {
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(mCtx);
-            mProgressDialog.setMessage("loading...");
+            mProgressDialog.setMessage(getString(R.string.loading));
             mProgressDialog.setCancelable(false);
             mProgressDialog.show();
         }
@@ -274,9 +274,9 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
             return;
         }
 
-        new AlertDialog.Builder(mCtx).setTitle("Warning")
+        new AlertDialog.Builder(mCtx).setTitle(getString(R.string.warning))
                 .setMessage(msg)
-                .setPositiveButton("Ok",null)
+                .setPositiveButton(getString(R.string.btn_ok),null)
                 .show();
     }
 
@@ -352,7 +352,7 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
 
                             String errMsg = json.optString("err_msg");
                             if (errMsg == null || errMsg.length() == 0) {
-                                errMsg = "Sorry,there is something wrong";
+                                errMsg = getString(R.string.sorry);
                             }
                             msg.obj = errMsg;
 
@@ -366,7 +366,7 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
                         Message msg = new Message();
                         msg.what = HomeHandler.HomeActionError;
 
-                        String errMsg = "Sorry,there is something wrong";
+                        String errMsg = getString(R.string.sorry);
                         msg.obj = errMsg;
 
                         mHandler.sendMessage(msg);
@@ -376,7 +376,7 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
                     Message msg = new Message();
                     msg.what = HomeHandler.HomeActionError;
 
-                    String errMsg = "Sorry,there is something wrong";
+                    String errMsg = getString(R.string.sorry);
                     msg.obj = errMsg;
 
                     mHandler.sendMessage(msg);
@@ -415,12 +415,12 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
                     } else {
                         String errMsg = json.optString("err_msg");
                         if (errMsg == null || errMsg.length() == 0) {
-                            errMsg = "Sorry,there is something wrong";
+                            errMsg = getString(R.string.sorry);
                         }
                         showWarningMsg(errMsg);
                     }
                 } else {
-                    String errMsg = "Sorry,there is something wrong";
+                    String errMsg = getString(R.string.sorry);
 
                     showWarningMsg(errMsg);
                 }
@@ -439,17 +439,17 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
 
     @Override
     public void newCountClick() {
-        startMoreActivity("New Order",HomeOrderModel.OrderStatusNew);
+        startMoreActivity(getString(R.string.new_order_title),HomeOrderModel.OrderStatusNew);
     }
 
     @Override
     public void processingCountClick() {
-        startMoreActivity("Processing Order",HomeOrderModel.OrderStatusProcessing);
+        startMoreActivity(getString(R.string.processing_order_title),HomeOrderModel.OrderStatusProcessing);
     }
 
     @Override
     public void finishedCountClick() {
-        startMoreActivity("Finished Order",HomeOrderModel.OrderStatusFinish);
+        startMoreActivity(getString(R.string.finished_order_title),HomeOrderModel.OrderStatusFinish);
     }
 
     @Override
@@ -466,17 +466,17 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
     public void availableClick() {
 
         final boolean available = mHeaderView.isAvailable();
-        String msg = "are you sure to change status to " + (available ? "Unavailable" : "Available");
+        String msg = getString(R.string.user_state_change_tip) + (available ? getString(R.string.user_state_unavailable) : getString(R.string.user_state_available));
         new AlertDialog.Builder(mCtx)
-                .setTitle("Warning")
+                .setTitle(getString(R.string.warning))
                 .setMessage(msg)
-                .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         updateDriverAvailable(!available);
                     }
                 })
-                .setNegativeButton("Cancel",null)
+                .setNegativeButton(getString(R.string.btn_cancel),null)
                 .show();
 
     }
@@ -573,7 +573,7 @@ public class HomeFragment extends Fragment implements HomeHeaderView.HomeHeaderD
                 badgeView.setBackgroundColor(getResources().getColor(R.color.ApexDriverRedColor));
                 expandBtn = view.findViewById(R.id.section_switch_btn);
                 expandBtn.setOnClickListener(this);
-                expandBtn.setText("More");
+                expandBtn.setText(getString(R.string.btn_more));
 
                 view.setTag(this);
             }

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/home/HomeHeaderView.java

@@ -195,12 +195,12 @@ public class HomeHeaderView extends RelativeLayout {
         if (available) {
 
             availableBtn.setImageResource(R.drawable.action_available);
-            availableTv.setText("Available");
+            availableTv.setText(mCtx.getString(R.string.user_state_available));
 
         } else {
 
             availableBtn.setImageResource(R.drawable.action_unavailable);
-            availableTv.setText("Unavailable");
+            availableTv.setText(mCtx.getString(R.string.user_state_unavailable));
         }
     }
 

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/home/HomeMoreActivity.java

@@ -312,7 +312,7 @@ public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScr
         });
 
         mEmptyView = findViewById(R.id.home_more_empty_btn);
-        mEmptyView.setText("There is no data\nPlease click to reload");
+        mEmptyView.setText(getString(R.string.empty_msg));
         mEmptyView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -357,7 +357,7 @@ public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScr
     private void showProgressDialog() {
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(mContext);
-            mProgressDialog.setMessage("loading...");
+            mProgressDialog.setMessage(getString(R.string.loading));
             mProgressDialog.setCancelable(false);
             mProgressDialog.show();
         }
@@ -375,9 +375,9 @@ public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScr
             return;
         }
 
-        new AlertDialog.Builder(mContext).setTitle("Warning")
+        new AlertDialog.Builder(mContext).setTitle(getString(R.string.warning))
                 .setMessage(msg)
-                .setPositiveButton("Ok",null)
+                .setPositiveButton(getString(R.string.btn_ok),null)
                 .show();
     }
 
@@ -515,7 +515,7 @@ public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScr
 
                             String errMsg = json.optString("err_msg");
                             if (errMsg == null || errMsg.length() == 0) {
-                                errMsg = "Sorry,there is something wrong";
+                                errMsg = getString(R.string.sorry);
                             }
                             msg.obj = errMsg;
 
@@ -529,7 +529,7 @@ public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScr
                         Message msg = new Message();
                         msg.what = HomeMoreHandler.HomeActionError;
 
-                        String errMsg = "Sorry,there is something wrong";
+                        String errMsg = getString(R.string.sorry);
                         msg.obj = errMsg;
 
                         mHandler.sendMessage(msg);
@@ -539,7 +539,7 @@ public class HomeMoreActivity extends BasicActivity implements AbsListView.OnScr
                     Message msg = new Message();
                     msg.what = HomeMoreHandler.HomeActionError;
 
-                    String errMsg = "Sorry,there is something wrong";
+                    String errMsg = getString(R.string.sorry);
                     msg.obj = errMsg;
 
                     mHandler.sendMessage(msg);

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/login/LoginFragment.java

@@ -351,7 +351,7 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 
 					String msg = json.optString("err_msg");
 					if (msg == null || msg.length() == 0) {
-						msg = "Sorry,there is something wrong";
+						msg = getString(R.string.sorry);
 					}
 
 					Toast toast = Toast.makeText(getActivity().getApplicationContext(),
@@ -364,7 +364,7 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 				}
 			} else {
 
-				String msg = "Sorry,there is something wrong";
+				String msg = getString(R.string.sorry);
 				Toast toast = Toast.makeText(getActivity().getApplicationContext(),
 						msg,
 						Toast.LENGTH_LONG);

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/login/RetrievePasswordActivity.java

@@ -78,8 +78,8 @@ public class RetrievePasswordActivity extends BasicActivity
 		View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);
 
 		TextView titleview = mActionBarView.findViewById(R.id.title);
-		titleview.setText("Retrieve Password");
-		setTitle("Retrieve Password");
+		titleview.setText(getString(R.string.retrieve_title));
+		setTitle(R.string.retrieve_title);
 
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setCustomView(mActionBarView, lp);

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/message/MessageActivity.java

@@ -82,6 +82,8 @@ public class MessageActivity extends BasicActivity implements AbsListView.OnScro
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
+        setTitle(getString(R.string.message_title));
+
         mAdapter = new MessageAdapter();
 
         mRefresh = findViewById(R.id.message_refresh_view);
@@ -126,12 +128,12 @@ public class MessageActivity extends BasicActivity implements AbsListView.OnScro
 
         if (mUnread) {
 
-            menu.add(0,0,0,"All");
+            menu.add(0,0,0,getString(R.string.message_all));
             menu.getItem(0).setShowAsAction(SHOW_AS_ACTION_ALWAYS);
 
         } else {
 
-            menu.add(0,1,0,"Unread");
+            menu.add(0,1,0,getString(R.string.message_unread));
             menu.getItem(0).setShowAsAction(SHOW_AS_ACTION_ALWAYS);
         }
 
@@ -210,7 +212,7 @@ public class MessageActivity extends BasicActivity implements AbsListView.OnScro
         footer = new TextView(mCtx);
         footer.setBackgroundColor(Color.WHITE);
         footer.setGravity(Gravity.CENTER);
-        footer.setText("loading...");
+        footer.setText(getString(R.string.loading));
         footer.setTextSize(sp2px(mCtx,7));
         footer.setTextColor(Color.BLACK);
         footer.setVisibility(View.INVISIBLE);
@@ -242,7 +244,7 @@ public class MessageActivity extends BasicActivity implements AbsListView.OnScro
         });
 
         mEmptyView = findViewById(R.id.message_empty_btn);
-        mEmptyView.setText("There is no data\nPlease click to reload");
+        mEmptyView.setText(getString(R.string.empty_msg));
         mEmptyView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -260,7 +262,7 @@ public class MessageActivity extends BasicActivity implements AbsListView.OnScro
     private void showProgressDialog() {
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(this);
-            mProgressDialog.setMessage("loading...");
+            mProgressDialog.setMessage(getString(R.string.loading));
             mProgressDialog.setCancelable(false);
             mProgressDialog.show();
         }
@@ -278,9 +280,9 @@ public class MessageActivity extends BasicActivity implements AbsListView.OnScro
             return;
         }
 
-        new AlertDialog.Builder(mCtx).setTitle("Warning")
+        new AlertDialog.Builder(mCtx).setTitle(getString(R.string.warning))
                 .setMessage(msg)
-                .setPositiveButton("Ok",null)
+                .setPositiveButton(getString(R.string.btn_ok),null)
                 .show();
     }
 
@@ -352,13 +354,13 @@ public class MessageActivity extends BasicActivity implements AbsListView.OnScro
 
                         String msg = json.optString("err_msg");
                         if (TextUtils.isEmpty(msg)) {
-                            msg = "Sorry,something is wrong";
+                            msg = getString(R.string.sorry);
                         }
                         showWarningMsg(msg);
                     }
 
                 } else {
-                    showWarningMsg("Sorry,something is wrong");
+                    showWarningMsg(getString(R.string.sorry));
                 }
 
                 footer.setVisibility(View.INVISIBLE);

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/setting/SettingActivity.java

@@ -67,6 +67,9 @@ public class SettingActivity extends BasicActivity implements SettingAdapter.Set
             actionBar.setHomeButtonEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
+
+        setTitle(getString(R.string.setting_title));
+
         mSections = new ArrayList<>();
         loadData();
 
@@ -224,16 +227,16 @@ public class SettingActivity extends BasicActivity implements SettingAdapter.Set
         }
 
         new AlertDialog.Builder(mCtx)
-                .setTitle("Warning")
-                .setMessage("are you sure to clean cached file")
-                .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                .setTitle(getString(R.string.warning))
+                .setMessage(getString(R.string.clean_ask))
+                .setNegativeButton(getString(R.string.btn_cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
 
                     }
                 })
-                .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
@@ -257,7 +260,7 @@ public class SettingActivity extends BasicActivity implements SettingAdapter.Set
                                     @Override
                                     public void run() {
                                         model.setActive(false);
-                                        Toast.makeText(mCtx,"Clean Success",Toast.LENGTH_LONG).show();
+                                        Toast.makeText(mCtx,getString(R.string.clean_success),Toast.LENGTH_LONG).show();
                                     }
                                 },1000);
 

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/setting/changepassword/ChangePasswordDialog.java

@@ -89,9 +89,9 @@ public class ChangePasswordDialog extends Dialog {
         if (TextUtils.isEmpty(oldPass) && TextUtils.isEmpty(newPass) && TextUtils.isEmpty(confirmPass)) {
 
             new AlertDialog.Builder(mCtx)
-                    .setTitle("Warning")
-                    .setMessage("Required fields can not be empty!")
-                    .setPositiveButton("Ok",null)
+                    .setTitle(mCtx.getString(R.string.warning))
+                    .setMessage(mCtx.getString(R.string.change_pwd_required_empty))
+                    .setPositiveButton(mCtx.getString(R.string.btn_ok),null)
                     .show();
 
             return;
@@ -100,9 +100,9 @@ public class ChangePasswordDialog extends Dialog {
         if (!newPass.equals(confirmPass)) {
 
             new AlertDialog.Builder(mCtx)
-                    .setTitle("Warning")
-                    .setMessage("New password not equal confirm password!")
-                    .setPositiveButton("Ok",null)
+                    .setTitle(mCtx.getString(R.string.warning))
+                    .setMessage(mCtx.getString(R.string.change_pwd_new_not_equal_confirm))
+                    .setPositiveButton(mCtx.getString(R.string.btn_ok),null)
                     .show();
 
             return;
@@ -130,7 +130,7 @@ public class ChangePasswordDialog extends Dialog {
                     int result = json.optInt("result");
                     if (result == com.usai.redant.rautils.utils.Network.RESULT_TRUE) {
 
-                        showWarningMsg("change password success");
+                        showWarningMsg(mCtx.getString(R.string.change_pwd_success_msg));
                         ApexDriverApplication.sharedApplication().updatePassword(newPass);
 
                         dismiss();
@@ -138,13 +138,13 @@ public class ChangePasswordDialog extends Dialog {
                     } else {
                         String msg = json.optString("err_msg");
                         if (TextUtils.isEmpty(msg)) {
-                            msg = "Sorry,something is wrong";
+                            msg = mCtx.getString(R.string.sorry);
                         }
                         showWarningMsg(msg);
                     }
 
                 } else {
-                    showWarningMsg("Sorry,something is wrong");
+                    showWarningMsg(mCtx.getString(R.string.sorry));
                 }
 
             }
@@ -166,7 +166,7 @@ public class ChangePasswordDialog extends Dialog {
     private void showProgressDialog() {
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(mCtx);
-            mProgressDialog.setMessage("loading...");
+            mProgressDialog.setMessage(mCtx.getString(R.string.loading));
             mProgressDialog.setCancelable(false);
             mProgressDialog.show();
         }
@@ -184,9 +184,9 @@ public class ChangePasswordDialog extends Dialog {
             return;
         }
 
-        new AlertDialog.Builder(mCtx).setTitle("Warning")
+        new AlertDialog.Builder(mCtx).setTitle(mCtx.getString(R.string.warning))
                 .setMessage(msg)
-                .setPositiveButton("Ok",null)
+                .setPositiveButton(mCtx.getString(R.string.btn_ok),null)
                 .show();
     }
 

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/setting/model/AboutModel.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
+import com.usai.redant.apexdrivers.ApexDriverApplication;
 import com.usai.redant.apexdrivers.R;
 import com.usai.redant.rautils.utils.RAUtil;
 
@@ -26,7 +27,7 @@ public class AboutModel extends BaseModel {
             String ver_name = pi.versionName;
             int ver_code = pi.versionCode;
 
-            return "Ver: " + ver_name + " " + ver_code;
+            return ApexDriverApplication.sharedApplication().getString(R.string.about_ver) + ver_name + " " + ver_code;
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -39,7 +40,7 @@ public class AboutModel extends BaseModel {
     }
 
     public String appSupport() {
-        return "redantsupport@united-us.net";
+        return ApexDriverApplication.sharedApplication().getString(R.string.about_support_email);
     }
 
     public int appIcon() {

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/update/UpdateActivity.java

@@ -182,7 +182,7 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
         });
 
         mEmptyView = findViewById(R.id.update_empty_btn);
-        mEmptyView.setText("There is no data\nPlease click to reload");
+        mEmptyView.setText(getString(R.string.empty_msg));
         mEmptyView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -450,7 +450,7 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
     private void showProgressDialog() {
         if (mProgressDialog == null) {
             mProgressDialog = new ProgressDialog(this);
-            mProgressDialog.setMessage("loading...");
+            mProgressDialog.setMessage(getString(R.string.loading));
             mProgressDialog.setCancelable(false);
             mProgressDialog.show();
         }
@@ -468,9 +468,9 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
             return;
         }
 
-        new android.support.v7.app.AlertDialog.Builder(mCtx).setTitle("Warning")
+        new android.support.v7.app.AlertDialog.Builder(mCtx).setTitle(getString(R.string.warning))
                 .setMessage(msg)
-                .setPositiveButton("Ok",null)
+                .setPositiveButton(getString(R.string.btn_ok),null)
                 .show();
     }
 
@@ -586,12 +586,12 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
 
         if (emptyArr.size() > 0) {
 
-            String msg = "please complete missing field:\n" + list2String(emptyArr,"\n");
+            String msg = getString(R.string.update_complete) + "\n" + list2String(emptyArr,"\n");
 
             new AlertDialog.Builder(mCtx)
-                    .setTitle("Warning")
+                    .setTitle(getString(R.string.warning))
                     .setMessage(msg)
-                    .setPositiveButton("Ok",null)
+                    .setPositiveButton(getString(R.string.btn_ok),null)
                     .show();
 
             return;
@@ -629,14 +629,14 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
                                 // error
                                 String errMsg = json.optString("err_msg");
                                 if (errMsg == null || errMsg.length() == 0) {
-                                    errMsg = "Sorry,there is something wrong";
+                                    errMsg = getString(R.string.sorry);
                                 }
                                 showWarningMsg(errMsg);
                             }
                         } else {
                             dismissProgressDialog();
                             // error
-                            String errMsg = "Sorry,there is something wrong";
+                            String errMsg = getString(R.string.sorry);
                             showWarningMsg(errMsg);
                         }
                     }
@@ -715,9 +715,9 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
                         if (uploadFaildArr.size() > 0) {
 
                             mDialog = new AlertDialog.Builder(mCtx)
-                                    .setTitle("Warning")
-                                    .setMessage("upload the photos failed,would you like to retry or do it background?")
-                                    .setPositiveButton("Background", new DialogInterface.OnClickListener() {
+                                    .setTitle(getString(R.string.warning))
+                                    .setMessage(getString(R.string.upload_background_ask))
+                                    .setPositiveButton(getString(R.string.btn_background), new DialogInterface.OnClickListener() {
                                         @Override
                                         public void onClick(DialogInterface dialog, int which) {
 
@@ -725,7 +725,7 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
                                             goHome();
                                         }
                                     })
-                                    .setNegativeButton("Retry", new DialogInterface.OnClickListener() {
+                                    .setNegativeButton(getString(R.string.btn_retry), new DialogInterface.OnClickListener() {
                                         @Override
                                         public void onClick(DialogInterface dialog, int which) {
                                             syncUploadPhotos(uploadFaildArr,json);
@@ -925,7 +925,7 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
 
         if (PermissionChecker.checkSelfPermission(mCtx,Manifest.permission.CAMERA)!= PermissionChecker.PERMISSION_GRANTED) {
 
-            Toast.makeText(mCtx,"please allow app use camera",Toast.LENGTH_LONG).show();
+            Toast.makeText(mCtx,getString(R.string.allow_camera),Toast.LENGTH_LONG).show();
 
             return;
         }
@@ -1023,7 +1023,7 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
 
         if (!cameraPermission || !storageReadPermission || !storageWritePermission) {
 
-            Toast.makeText(mCtx,"please allow app use camera and storage",Toast.LENGTH_LONG).show();
+            Toast.makeText(mCtx,getString(R.string.allow_camera_and_storage),Toast.LENGTH_LONG).show();
 
             return;
         }
@@ -1155,7 +1155,7 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
                                 // error
                                 String errMsg = json.optString("err_msg");
                                 if (errMsg == null || errMsg.length() == 0) {
-                                    errMsg = "Sorry,there is something wrong";
+                                    errMsg = activity.getString(R.string.sorry);
                                 }
                                 activity.showWarningMsg(errMsg);
                             }
@@ -1163,12 +1163,12 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
                         } catch (JSONException e) {
                             e.printStackTrace();
                             // error
-                            String errMsg = "Sorry,there is something wrong";
+                            String errMsg = activity.getString(R.string.sorry);
                             activity.showWarningMsg(errMsg);
                         }
                     } else {
                         // error
-                        String errMsg = "Sorry,there is something wrong";
+                        String errMsg = activity.getString(R.string.sorry);
                         activity.showWarningMsg(errMsg);
                     }
 

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/upload/UploadListActivity.java

@@ -164,7 +164,7 @@ public class UploadListActivity extends BasicActivity {
         ActionBar mActionBar = getSupportActionBar();
         mActionBar.setHomeButtonEnabled(true);
         mActionBar.setDisplayHomeAsUpEnabled(true);
-        mActionBar.setTitle("Apex Drivers");
+        mActionBar.setTitle(getString(R.string.app_name));
 
 
         // 初始化视图
@@ -232,17 +232,17 @@ public class UploadListActivity extends BasicActivity {
     private void clearUploadList() {
         if (displaylist.size() == 0) {
             new AlertDialog.Builder(this)
-                    .setTitle("Warning")
-                    .setMessage("Upload list is empty.")
-                    .setPositiveButton("OK",null)
+                    .setTitle(getString(R.string.warning))
+                    .setMessage(getString(R.string.upload_empty))
+                    .setPositiveButton(getString(R.string.btn_ok),null)
                     .show();
             return;
         }
 
         new AlertDialog.Builder(this)
-                .setTitle("Clear upload list")
-                .setMessage("Are you sure remove all error/finish task?")
-                .setPositiveButton("YES", new DialogInterface.OnClickListener() {
+                .setTitle(getString(R.string.clear_title))
+                .setMessage(getString(R.string.clear_ask))
+                .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         // clear
@@ -253,7 +253,7 @@ public class UploadListActivity extends BasicActivity {
 
                     }
                 })
-                .setNegativeButton("NO", new DialogInterface.OnClickListener() {
+                .setNegativeButton(getString(R.string.btn_cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 

ApexDrivers/apexdriverslib/src/main/res/layout/change_password_dialog.xml

@@ -21,7 +21,7 @@
             android:textSize="18sp"
             android:textStyle="bold"
             android:textAlignment="center"
-            android:text="Change Password"
+            android:text="@string/change_password_title"
             android:textColor="#000000"
             />
 
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_margin="10dp"
-            android:hint="Old password *required"
+            android:hint="@string/change_password_old"
             android:maxLines="1"
             android:singleLine="true"
             android:inputType="textPassword"
@@ -41,7 +41,7 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_margin="10dp"
-            android:hint="New password *required"
+            android:hint="@string/change_password_new"
             android:maxLines="1"
             android:singleLine="true"
             android:inputType="textPassword"
@@ -52,7 +52,7 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_margin="10dp"
-            android:hint="Confirm new password *required"
+            android:hint="@string/change_password_confirm"
             android:maxLines="1"
             android:singleLine="true"
             android:inputType="textPassword"
@@ -77,7 +77,7 @@
                     android:layout_centerInParent="true"
                     android:background="@drawable/btn_bg"
                     android:layout_margin="5dp"
-                    android:text="Cancel"
+                    android:text="@string/btn_cancel"
                     />
 
             </RelativeLayout>
@@ -95,7 +95,7 @@
                     android:layout_centerInParent="true"
                     android:background="@drawable/btn_bg"
                     android:layout_margin="5dp"
-                    android:text="Change"
+                    android:text="@string/btn_change"
                     />
 
             </RelativeLayout>

ApexDrivers/apexdriverslib/src/main/res/layout/filter_search_footer.xml

@@ -11,7 +11,7 @@
         android:layout_centerInParent="true"
         android:layout_margin="5dp"
         android:background="@drawable/round_corner_bg"
-        android:text="Search"
+        android:text="@string/filter_btn_search"
         android:textAllCaps="false"
         />
 

ApexDrivers/apexdriverslib/src/main/res/layout/home_header_view.xml

@@ -53,7 +53,7 @@
                     android:textAlignment="center"
                     android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
-                    android:text="New"
+                    android:text="@string/home_new_title"
                     />
 
             </LinearLayout>
@@ -97,7 +97,7 @@
                     android:textAlignment="center"
                     android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
-                    android:text="Processing"
+                    android:text="@string/home_processing_title"
                     />
 
             </LinearLayout>
@@ -141,7 +141,7 @@
                     android:textAlignment="center"
                     android:textSize="17sp"
                     android:textColor="@color/ApexDriverWhite"
-                    android:text="Finished"
+                    android:text="@string/home_finished_title"
                     />
 
             </LinearLayout>
@@ -188,7 +188,7 @@
                     android:layout_marginBottom="2dp"
                     android:textAlignment="center"
                     android:textSize="15sp"
-                    android:text="Sign Out"
+                    android:text="@string/home_sign_out"
                     android:textColor="#000000"
                     />
 
@@ -222,7 +222,7 @@
                     android:layout_marginBottom="2dp"
                     android:textAlignment="center"
                     android:textSize="15sp"
-                    android:text="Setting"
+                    android:text="@string/home_setting"
                     android:textColor="#000000"
                     />
 
@@ -256,7 +256,7 @@
                     android:layout_marginBottom="2dp"
                     android:textAlignment="center"
                     android:textSize="15sp"
-                    android:text="Available"
+                    android:text="@string/user_state_unavailable"
                     android:textColor="#000000"
                     />
 
@@ -311,7 +311,7 @@
                     android:layout_marginBottom="2dp"
                     android:textAlignment="center"
                     android:textSize="15sp"
-                    android:text="Message"
+                    android:text="@string/home_message"
                     android:textColor="#000000"
                     />
 

ApexDrivers/apexdriverslib/src/main/res/layout/home_more_order_cell.xml

@@ -61,7 +61,7 @@
                 android:layout_marginRight="2dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Order No.:"
+                android:text="@string/order_no_title"
                 />
 
             <TextView
@@ -89,7 +89,7 @@
                 android:layout_marginTop="5dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Container No.:"
+                android:text="@string/container_no_title"
                 />
 
             <TextView
@@ -118,7 +118,7 @@
                 android:layout_marginTop="5dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Order Type:"
+                android:text="@string/order_type_title"
                 />
 
             <TextView
@@ -147,7 +147,7 @@
                 android:layout_marginTop="5dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Date:"
+                android:text="@string/date"
                 />
 
             <TextView

ApexDrivers/apexdriverslib/src/main/res/layout/home_order_cell.xml

@@ -58,7 +58,7 @@
                 android:layout_marginRight="2dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Order No.:"
+                android:text="@string/order_no_title"
                 />
 
             <TextView
@@ -86,7 +86,7 @@
                 android:layout_marginTop="5dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Container No.:"
+                android:text="@string/container_no_title"
                 />
 
             <TextView
@@ -115,7 +115,7 @@
                 android:layout_marginTop="5dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Order Type:"
+                android:text="@string/order_type_title"
                 />
 
             <TextView
@@ -144,7 +144,7 @@
                 android:layout_marginTop="5dp"
                 android:textSize="17sp"
                 android:textColor="#000000"
-                android:text="Date:"
+                android:text="@string/date"
                 />
 
             <TextView

ApexDrivers/apexdriverslib/src/main/res/layout/section_header.xml

@@ -24,7 +24,7 @@
             android:textSize="17sp"
             android:background="@drawable/clear_bg"
             android:textColor="@color/ApexDriverOrange"
-            android:text="Hide"
+            android:text="@string/btn_more"
             android:textAllCaps="false"
             />
 

ApexDrivers/apexdriverslib/src/main/res/layout/setting_about_cell.xml

@@ -48,7 +48,7 @@
         android:textColor="#000000"
         android:textSize="20sp"
         android:textStyle="bold"
-        android:text="Apex Drivers"
+        android:text="@string/app_name"
         />
 
     <TextView
@@ -78,7 +78,7 @@
         android:textColor="#000000"
         android:textSize="18sp"
         android:textStyle="bold"
-        android:text="Support:"
+        android:text="@string/about_support_title"
         />
 
     <TextView
@@ -91,7 +91,7 @@
         android:textColor="#000000"
         android:textSize="16sp"
         android:autoLink="email"
-        android:text="redantsupport@united-us.net"
+        android:text="@string/about_support_email"
         />
 
 </RelativeLayout>

ApexDrivers/apexdriverslib/src/main/res/menu/photo_preview_menu.xml

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/delete_btn"
-        android:title="Delete"
+        android:title="@string/photo_delete"
         app:showAsAction="always"
         >
 

ApexDrivers/apexdriverslib/src/main/res/menu/update_menu.xml

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/update_btn"
-        android:title="Update"
+        android:title="@string/btn_update"
         app:showAsAction="always"
         >
 

ApexDrivers/apexdriverslib/src/main/res/menu/upload_list_menu.xml

@@ -5,7 +5,7 @@
     <item
         android:id="@+id/clear_upload_list_btn"
         app:showAsAction="always"
-        android:title="Clear"
+        android:title="@string/upload_menu_clear"
         />
 
 </menu>

ApexDrivers/apexdriverslib/src/main/res/values-zh/strings.xml

@@ -71,10 +71,96 @@
     <string name="message">消息</string>
     <string name="btn_cancel">取消</string>
     <string name="sorry">对不起，发生未知错误.</string>
+    <string name="empty_msg">暂时没有数据
+        请点击刷新</string>
 
     <!--Retrive Password-->
     <string name="btn_close">取消</string>
     <string name="btn_ok">确定</string>
+    <string name="retrieve_title">找回密码</string>
 
 
+    <!--Main-->
+    <string name="notification_order_change_msg"> 状态改变了，是否查看详情？</string>
+    <string name="permission_request_msg"> 需要一些必要的权限。</string>
+    <string name="permission_deny_msg"> 将退出，因为缺少一些基本权限。
+请检查您的系统设置。</string>
+    <string name="notification_enable_msg">你应该启用通知</string>
+    <string name="login_title">登陆</string>
+    <string name="main_menu_upload_title">上传列表</string>
+
+    <!--Home-->
+    <string name="btn_more">更多</string>
+
+    <string name="new_order_title">新订单</string>
+    <string name="processing_order_title">进行中的订单</string>
+    <string name="finished_order_title">已完成的订单</string>
+    <string name="user_state_available">可接单</string>
+    <string name="user_state_unavailable">停止接单</string>
+    <string name="user_state_change_tip">你确定要修改用户状态为</string>
+
+    <string name="order_no_title">订单号:</string>
+    <string name="container_no_title">货柜号:</string>
+    <string name="order_type_title">订单类型:</string>
+    <string name="date">日期:</string>
+
+    <string name="home_new_title">新订单</string>
+    <string name="home_processing_title">处理中</string>
+    <string name="home_finished_title">已完成</string>
+
+    <string name="home_sign_out">登出</string>
+    <string name="home_setting">设置</string>
+    <string name="home_message">消息</string>
+
+    <!--Message-->
+    <string name="message_title">消息</string>
+    <string name="message_all">所有</string>
+    <string name="message_unread">未读</string>
+
+    <!--Setting-->
+    <string name="setting_title">设置</string>
+    <string name="about_ver">版本:</string>
+    <string name="about_support_title">技术支持:</string>
+    <string name="about_support_email">redantsupport@united-us.net</string>
+    <string name="clean_success">清除成功</string>
+    <string name="clean_ask">你确定要清除缓存文件吗?</string>
+
+    <!--Change Password-->
+    <string name="change_password_title">修改密码</string>
+    <string name="change_password_old">旧密码（必填）</string>
+    <string name="change_password_new">新密码（必填）</string>
+    <string name="change_password_confirm">确认密码（必填）</string>
+    <string name="btn_change">修改</string>
+    <string name="change_pwd_required_empty">必填项不能为空</string>
+    <string name="change_pwd_new_not_equal_confirm">请确认两次输入到密码是否一致</string>
+    <string name="change_pwd_success_msg">修改密码成功</string>
+
+    <!--Filter-->
+    <string name="filter_title">订单查询</string>
+    <string name="filter_empty">没有查询项</string>
+    <string name="filter_btn_search">搜索</string>
+
+    <!--Order Detail-->
+    <string name="detail_title">订单详情</string>
+    <string name="alert_no_google_map">没有安装谷歌地图</string>
+    <string name="not_done">当前操作 %s 还没有完成，你确定要现在做 %s 操作吗?</string>
+
+    <!--Update-->
+    <string name="update_complete">请完成以下内容:</string>
+    <string name="upload_background_ask">上传图片失败,是否重试或者将任务提交到后台上传?</string>
+    <string name="btn_background">后台上传</string>
+    <string name="btn_retry">重试</string>
+    <string name="allow_camera">请检查相机权限是否打开</string>
+    <string name="allow_camera_and_storage">请检查相机权限和存储权限是否打开</string>
+    <string name="btn_update">提交</string>
+
+    <!--Preview-->
+    <string name="photo_delete">删除</string>
+
+    <!--Upload List-->
+    <string name="upload_menu_clear">清除</string>
+    <string name="upload_empty">上传列表为空</string>
+    <string name="clear_title">清空上传列表</string>
+    <string name="clear_ask">你确定要删除所有出错和完成的任务吗?</string>
+
 </resources>

ApexDrivers/apexdriverslib/src/main/res/values/strings.xml

@@ -72,7 +72,94 @@
     <string name="sorry">Sorry,there is something wrong</string>
 
     <!--Retrive Password-->
-    <string name="btn_close">取消</string>
-    <string name="btn_ok">确定</string>
+    <string name="btn_close">Cancel</string>
+    <string name="btn_ok">Ok</string>
+    <string name="retrieve_title">Retrieve Password</string>
+
+
+    <!--Main-->
+    <string name="notification_order_change_msg"> status changed,view detail?</string>
+    <string name="permission_request_msg"> needs some essential permissions.</string>
+    <string name="permission_deny_msg"> will quit because missing some essential permissions.
+Please check your system setting.</string>
+    <string name="notification_enable_msg">you should enable notification</string>
+    <string name="login_title">Login</string>
+    <string name="main_menu_upload_title">Upload List</string>
+
+    <!--Home-->
+    <string name="btn_more">More</string>
+    <string name="empty_msg">There is no data
+Please click to reload</string>
+    <string name="new_order_title">New Order</string>
+    <string name="processing_order_title">Processing Order</string>
+    <string name="finished_order_title">Finished Order</string>
+    <string name="user_state_available">Available</string>
+    <string name="user_state_unavailable">Unavailable</string>
+    <string name="user_state_change_tip">are you sure to change status to </string>
+
+    <string name="order_no_title">Order NO.:</string>
+    <string name="container_no_title">Container No.:</string>
+    <string name="order_type_title">Order Type:</string>
+    <string name="date">Date:</string>
+
+    <string name="home_new_title">New</string>
+    <string name="home_processing_title">Processing</string>
+    <string name="home_finished_title">Finished</string>
+
+    <string name="home_sign_out">Sign Out</string>
+    <string name="home_setting">Setting</string>
+    <string name="home_message">Message</string>
+
+    <!--Message-->
+    <string name="message_title">Message</string>
+    <string name="message_all">All</string>
+    <string name="message_unread">Unread</string>
+
+    <!--Setting-->
+    <string name="setting_title">Setting</string>
+    <string name="about_ver">Ver:</string>
+    <string name="about_support_title">Support:</string>
+    <string name="about_support_email">redantsupport@united-us.net</string>
+    <string name="clean_success">Clean Success</string>
+    <string name="clean_ask">are you sure to clean cached file?</string>
+
+    <!--Change Password-->
+    <string name="change_password_title">Change Password</string>
+    <string name="change_password_old">Old password *required</string>
+    <string name="change_password_new">New password *required</string>
+    <string name="change_password_confirm">Confirm new password *required</string>
+    <string name="btn_change">Change</string>
+    <string name="change_pwd_required_empty">Required fields can not be empty!</string>
+    <string name="change_pwd_new_not_equal_confirm">"New password not equal confirm password!"</string>
+    <string name="change_pwd_success_msg">change password success</string>
+
+    <!--Filter-->
+    <string name="filter_title">Order Filter</string>
+    <string name="filter_empty">There is no filter data</string>
+    <string name="filter_btn_search">Search</string>
+
+    <!--Order Detail-->
+    <string name="detail_title">Order Detail</string>
+    <string name="alert_no_google_map">There is no google map</string>
+    <string name="not_done">the %s is not done,are you sure to update %s now?</string>
+
+    <!--Update-->
+    <string name="update_complete">please complete missing field:</string>
+    <string name="upload_background_ask">upload the photos failed,would you like to retry or do it background?</string>
+    <string name="btn_background">Background</string>
+    <string name="btn_retry">Retry</string>
+    <string name="allow_camera">please allow app use camera</string>
+    <string name="allow_camera_and_storage">please allow app use camera and storage</string>
+    <string name="btn_update">Update</string>
+
+    <!--Preview-->
+    <string name="photo_delete">Delete</string>
+
+    <!--Upload List-->
+    <string name="upload_menu_clear">Clear</string>
+    <string name="upload_empty">Upload list is empty.</string>
+    <string name="clear_title">Clear upload list</string>
+    <string name="clear_ask">Are you sure remove all error/finish task?</string>
+
 
 </resources>