简体一次翻译至繁体前

WeiChat/src/main/AndroidManifest.xml

@@ -889,7 +889,7 @@
             android:label="@string/navigation" />
         <activity
             android:name="com.xzjmyk.pm.newpedo.view.NewStepActivity"
-            android:label="UU运动" />
+            android:label="@string/set_sport" />
         <activity
             android:name="com.xzjmyk.pm.newpedo.view.NewStepListActivity"
             android:label="@string/sports_recode_more"/>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterUserBasicInfoActivity.java

@@ -228,7 +228,7 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 
 	private void showSelectSexDialog() {
 		String[] sexs = new String[] { getString(R.string.sex_man), getString(R.string.sex_woman) };
-		new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex))
+		new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex_title))
 				.setSingleChoiceItems(sexs, mTempData.getSex() == 1 ? 0 : 1, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/UserSearchActivity.java

@@ -121,7 +121,7 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
         } else if (mSex == 0) {
             mSex = 2;
         }
-        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex))
+        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex_title))
                 .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DetailTaskActivity.java

@@ -109,7 +109,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                     JSONObject object = JSON.parseObject(result);
                     Boolean falg = object.getBoolean("success");
                     if (falg) {
-                        ViewUtil.ShowMessageTitle(ct, "操作成功！");
+                        ViewUtil.ShowMessageTitle(ct, getString(R.string.make_adeal_success));
                         Intent intent = new Intent();
                         String task = tv_task_emcode.getText().toString();
                         int type = 0;
@@ -120,7 +120,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                         setResult(0x20, intent);
                         goBackMenu();
                     } else {
-                        ViewUtil.ShowMessageTitle(ct, "操作失败！");
+                        ViewUtil.ShowMessageTitle(ct, getString(R.string.make_adeal_failed));
                     }
                     break;
                 case LOAD_EM_NAME:
@@ -181,7 +181,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         setContentView(R.layout.act_task_detail);
         ViewUtils.inject(this);
         ct = this;
-        getSupportActionBar().setTitle("任务处理");
+        getSupportActionBar().setTitle(getString(R.string.taskdetail_title));
         TAG = "DetailTask";
         bt_task_bohui.setOnClickListener(this);
         bt_task_huifu.setOnClickListener(this);
@@ -201,22 +201,22 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         super.onResume();
         Intent intent = getIntent();
 
-        tv_task_name.setText(intent.getStringExtra("taskname") == null ? "未填写" : intent.getStringExtra("taskname"));
+        tv_task_name.setText(intent.getStringExtra("taskname") == null ? getString(R.string.common_noinput) : intent.getStringExtra("taskname"));
         // 提出人
         tv_task_emcode
-                .setText(intent.getStringExtra("taskemcode") == null ? "未填写" : intent.getStringExtra("taskemcode"));
+                .setText(intent.getStringExtra("taskemcode") == null ? getString(R.string.common_noinput) : intent.getStringExtra("taskemcode"));
         // 执行人performer
         tv_task_performer
-                .setText(intent.getStringExtra("performer") == null ? "未填写" : intent.getStringExtra("performer"));
-        tv_task_status.setText(intent.getStringExtra("status") == null ? "未填写" : intent.getStringExtra("status"));
-        tv_task_duration.setText(intent.getStringExtra("duration") == null ? "未填写" : intent.getStringExtra("duration"));
+                .setText(intent.getStringExtra("performer") == null ? getString(R.string.common_noinput) : intent.getStringExtra("performer"));
+        tv_task_status.setText(intent.getStringExtra("status") == null ? getString(R.string.common_noinput) : intent.getStringExtra("status"));
+        tv_task_duration.setText(intent.getStringExtra("duration") == null ? getString(R.string.common_noinput) : intent.getStringExtra("duration"));
         tv_task_describe
-                .setText(intent.getStringExtra("description") == null ? "未填写" : intent.getStringExtra("description"));
+                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) : intent.getStringExtra("description"));
         tv_task_starttime
-                .setText(intent.getStringExtra("tasktime") == null ? "未填写" : intent.getStringExtra("tasktime"));
+                .setText(intent.getStringExtra("tasktime") == null ? getString(R.string.common_noinput) : intent.getStringExtra("tasktime"));
         taskId = intent.getStringExtra("taskid");
         tv_task_endtime.
-                setText(intent.getStringExtra("endtime") == null ? "未填写" :
+                setText(intent.getStringExtra("endtime") == null ? getString(R.string.common_noinput) :
                         TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
         String ra_taskid = intent.getStringExtra("ra_taskid");
         // String taskcode=intent.getStringExtra("taskcode");
@@ -288,7 +288,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                     param.put("record", et_task_name.getText().toString());
                     sendDataToServer("plm/record/endBillTask.action", param);
                 } else {
-                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                    ViewUtil.ShowMessageTitle(ct,getString(R.string.task_input_detail_info));
                 }
                 break;
             case R.id.bt_task_bohui:
@@ -298,7 +298,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                     param.put("record", et_task_name.getText().toString());
                     sendDataToServer("plm/record/noConfirmBillTask.action", param);
                 } else {
-                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
                 }
 
                 break;
@@ -309,7 +309,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                     param.put("record", et_task_name.getText().toString());
                     sendDataToServer("plm/record/confirmBillTask.action", param);
                 } else {
-                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
                 }
                 break;
             case R.id.iv_recode:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TaskActivity.java

@@ -113,11 +113,11 @@ public class TaskActivity extends BaseActivity implements OnClickListener, Recog
                     } else {
                         adapter = new NewSchedultAdapter(TaskActivity.this, allList);
                         listview_main.setAdapter(adapter);
-                        ToastMessage("想要查看具体任务情况，请点击进入");
+//                        ToastMessage("想要查看具体任务情况，请点击进入");
                     }
                     listview_main.onRefreshComplete();
                 } else if (msg.what == 0) {
-                    mEmptyLayout.setErrorMessage("网络未连接！");
+                    mEmptyLayout.setErrorMessage(getString(R.string.common_notlinknet));
                     mEmptyLayout.showError();
                     listview_main.onRefreshComplete();
                 }
@@ -179,7 +179,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener, Recog
                 //请求超时  全局返回异常
                 if (msg.what == Constants.APP_SOCKETIMEOUTEXCEPTION) {
                     String exception = msg.getData().getString("result");
-                    mEmptyLayout.setErrorMessage(exception + ",请刷新重试！");
+                    mEmptyLayout.setErrorMessage(exception + ","+getString(R.string.task_refresh_again));
                     mEmptyLayout.showError();
                     listview_main.onRefreshComplete();
                     ViewUtil.AutoLoginErp(TaskActivity.this);
@@ -196,9 +196,9 @@ public class TaskActivity extends BaseActivity implements OnClickListener, Recog
     private void doClassifyAllList(List<AllProcess> allList) {
         if (mCurrentPage == 1) {
             if (!ListUtils.isEmpty(real_List)) real_List.clear();
-            ToastMessage("刷新成功");
+            ToastMessage(getString(R.string.common_refresh_finish));
         } else {
-            ToastMessage("加载完毕");
+            ToastMessage(getString(R.string.common_up_finish));
         }
         listview_main.onRefreshComplete();
         if (ListUtils.isEmpty(allList)) return;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -92,7 +92,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 case http_commit:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
-                    Toast.makeText(getApplicationContext(), "问题提交成功", Toast.LENGTH_LONG);
+                    Toast.makeText(getApplicationContext(), getString(R.string.ask_submit_success), Toast.LENGTH_LONG);
                     finish();
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
@@ -120,7 +120,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         }
         mPhotoList = new ArrayList<String>();
         mAdapter = new GridViewAdapter();
-        mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
+        mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_waitting));
         initView();
     }
 
@@ -132,9 +132,9 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.display_rl).setOnClickListener(this);
 
         if (mType == 0) {
-            getSupportActionBar().setTitle(R.string.send_text);
+            getSupportActionBar().setTitle(getString(R.string.send_words));
         } else {
-            getSupportActionBar().setTitle("用户反馈");
+            getSupportActionBar().setTitle(getString(R.string.set_suggest));
         }
         mTextEdit = (EditText) findViewById(R.id.text_edit);
         mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
@@ -192,7 +192,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void showPictureActionDialog(final int position) {
-        String[] items = new String[]{getString(R.string.look_over), getString(R.string.delete)};
+        String[] items = new String[]{getString(R.string.look_over), getString(R.string.common_delete)};
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.pictures)
                 .setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
                     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java

@@ -109,7 +109,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     if (currentId != 0) {
                         mList.getRefreshableView().setSelection(currentId);
                     }
-                    ToastMessage("数据加载完成");
+                    ToastMessage(getString(R.string.common_up_finish));
                     progressDialog.dismiss();
                     break;
                 case SUSSCESS_already:
@@ -130,7 +130,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     if (currentId != 0) {
                         mList.getRefreshableView().setSelection(currentId);
                     }
-                    ToastMessage("数据加载完成");
+                    ToastMessage(getString(R.string.common_up_finish));
                     progressDialog.dismiss();
                     break;
                 case SUSSCESS_me:
@@ -150,7 +150,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     if (currentId != 0) {
                         mList.getRefreshableView().setSelection(currentId);
                     }
-                    ToastMessage("数据加载完成");
+                    ToastMessage(getString(R.string.common_up_finish));
                     progressDialog.dismiss();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -176,7 +176,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     break;
                 case Constants.APP_NOTNETWORK:
                     progressDialog.dismiss();
-                    ToastMessage("网络未连接！");
+                    ToastMessage(getString(R.string.common_notlinknet));
                     break;
             }
         }
@@ -196,7 +196,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
         if (CommonUtil.isNetWorkConnected(mContext)) {
             loadProcessToDo(page);
         } else {
-            mEmptyLayout.setErrorMessage("网络未连接!");
+            mEmptyLayout.setErrorMessage(getString(R.string.common_notlinknet));
             mEmptyLayout.showError();
         }
 
@@ -525,11 +525,11 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     model.date.setText(jn_dealtime);
                     if (!StringUtils.isEmpty(jn_dealresult)) {
                         if ("不同意".equals(jn_dealresult)) {
-                            CommonUtil.textSpanForStyle(model.status, "已审批(" + jn_dealresult + ")",
+                            CommonUtil.textSpanForStyle(model.status, getString(R.string.status_approved)+"(" + jn_dealresult + ")",
                                     jn_dealresult, mContext.getResources().getColor(R.color.red));
 
                         } else {
-                            CommonUtil.textSpanForStyle(model.status, "已审批(" + jn_dealresult + ")",
+                            CommonUtil.textSpanForStyle(model.status, getString(R.string.status_approved)+"(" + jn_dealresult + ")",
                                     jn_dealresult, mContext.getResources().getColor(R.color.light_gray));
                         }
                     }
@@ -551,10 +551,10 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         String codename = jsonArray.getJSONObject(position).getString("JP_NODENAME");
                         if (!StringUtils.isEmpty(status)) {
                             if (status.equals("待审批")) {
-                                status = "等待" + nodename + "(" + codename + ")审批";
+                                status = getString(R.string.watting) + nodename + "(" + codename + ")"+getString(R.string.approvel);
                             }
                             if (status.equals("未通过")) {
-                                status = "未通过" + nodename + "(" + codename + ")审批";
+                                status = getString(R.string.Did_not_pass) + nodename + "(" + codename + ")"+getString(R.string.approvel);
                             }
                         } else {
                             status = " ";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/FlihtsDateSelectActivity.java

@@ -112,7 +112,7 @@ public class FlihtsDateSelectActivity extends BaseActivity implements DatePicker
         ((MyListView) contentView.findViewById(R.id.flihts_list)).setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                ToastMessage(models.get(position).getName() + "班次");
+                ToastMessage(models.get(position).getName() + getString(R.string.sign_flights));
                 daDateUpdate(models, date, position);
                 popupWindow.dismiss();
             }
@@ -121,7 +121,7 @@ public class FlihtsDateSelectActivity extends BaseActivity implements DatePicker
         rest_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ToastMessage("休息");
+                ToastMessage(getString(R.string.rest));
                 popupWindow.dismiss();
             }
         });

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatContactAddPeopleActivity.java

@@ -51,15 +51,17 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
     @ViewInject(R.id.btn_save)
     private Button btn_save;
     private int mSex = 1;
-    private String[] mDepartment = {"总经办", "采购部","销售部","财务部", "人事行政部", "研发部"};
-    private String [][] mJobs = {
-            {"总经理","副总经理","秘书"},
-            {"经理","采购员"},
-            {"经理","业务员"},
-            {"经理","会计","出纳"},
-            {"经理","人事专员","行政专员"},
-            {"经理","工程师"}
-    };
+    private String[] mDepartment;
+    private String[] mJobs;
+//    private String [][] mJobs;
+//            {
+//            {"总经理","副总经理","秘书"},
+//            {"经理","采购员"},
+//            {"经理","业务员"},
+//            {"经理","会计","出纳"},
+//            {"经理","人事专员","行政专员"},
+//            {"经理","工程师"}
+//    };
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -82,6 +84,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
         user_job_tv.setOnClickListener(this);
         btn_save.setOnClickListener(this);
 
+        mDepartment = getResources().getStringArray(R.array.plat_department_list);
     }
 
     @Override
@@ -98,7 +101,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
                 break;
             case R.id.user_job_tv:
                 if (StringUtils.isEmpty(user_department_tv.getText().toString())){
-                    ToastMessage("请先选择部门");
+                    ToastMessage(getString(R.string.select_department_first));
                 }else {
                     doSelectJob();
                 }
@@ -110,8 +113,21 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
     private void doSelectJob() {
         ArrayList<SelectBean> formBeaan = new ArrayList<>();
         SelectBean selectBean;
-        int item = -1;
-        switch (user_department_tv.getText().toString()){
+//        int item = -1;
+        String choice_department = user_department_tv.getText().toString();
+        if (getString(R.string.plat_department1).equals(choice_department))
+            mJobs = getResources().getStringArray(R.array.plat_job1);
+        if (getString(R.string.plat_department2).equals(choice_department))
+            mJobs = getResources().getStringArray(R.array.plat_job2);
+        if (getString(R.string.plat_department3).equals(choice_department))
+            mJobs = getResources().getStringArray(R.array.plat_job3);
+        if (getString(R.string.plat_department4).equals(choice_department))
+            mJobs = getResources().getStringArray(R.array.plat_job4);
+        if (getString(R.string.plat_department5).equals(choice_department))
+            mJobs = getResources().getStringArray(R.array.plat_job5);
+        if (getString(R.string.plat_department6).equals(choice_department))
+            mJobs = getResources().getStringArray(R.array.plat_job6);
+        /*switch (user_department_tv.getText().toString()){
             case "总经办":
                 item = 0;
                 break;
@@ -131,17 +147,17 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
                 item = 5;
                 break;
             default:
-        }
-        for (int i = 0; i < mJobs[item].length; i++) {
+        }*/
+        for (int i = 0; i < mJobs.length; i++) {
             selectBean = new SelectBean();
-            selectBean.setName(mJobs[item][i]);
+            selectBean.setName(mJobs[i]);
             formBeaan.add(selectBean);
         }
 
         Intent intent = new Intent();
         intent.setClass(this, SelectActivity.class);
         intent.putExtra("type", 2);
-        intent.putExtra("title", "选择岗位");
+        intent.putExtra("title", getString(R.string.select_jobs));
         intent.putParcelableArrayListExtra("data", formBeaan);
         startActivityForResult(intent, 0x12);
     }
@@ -157,7 +173,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
         Intent intent = new Intent();
         intent.setClass(this, SelectActivity.class);
         intent.putExtra("type", 2);
-        intent.putExtra("title", "选择部门");
+        intent.putExtra("title", getString(R.string.select_department));
         intent.putParcelableArrayListExtra("data", formBeaan);
         startActivityForResult(intent, 0x11);
     }
@@ -191,7 +207,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
             if (user_email_tv.getText().toString().contains("@")){
                 saveRequest();
             }else {
-                ToastMessage("请输入正确的邮箱格式");
+                ToastMessage(getString(R.string.Please_imput_the_correct_email_format));
             }
 
         }
@@ -202,7 +218,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
         btn_save.setEnabled(false);
         Map<String,Object> formStoreMap = new HashMap<>();
         formStoreMap.put("userName",user_name_tv.getText().toString());
-        formStoreMap.put("userSex","男".equals(user_sex_tv.getText().toString()) ? "M" : "F");
+        formStoreMap.put("userSex",getString(R.string.user_body).equals(user_sex_tv.getText().toString()) ? "M" : "F");
         formStoreMap.put("userTel",user_tel_tv.getText().toString());
         formStoreMap.put("userEmail",user_email_tv.getText().toString());
 
@@ -230,7 +246,7 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
                         if (!StringUtils.isEmpty(save_result)){
                             if (JSON.parseObject(save_result).containsKey("success") &&
                                     "人员添加成功".equals(JSON.parseObject(save_result).getString("success"))){
-                                Toast.makeText(getApplicationContext(), "新增成功", Toast.LENGTH_LONG);
+                                Toast.makeText(getApplicationContext(), getString(R.string.add_success), Toast.LENGTH_LONG);
                                 new Handler().postDelayed(new Runnable() {
                                     @Override
                                     public void run() {
@@ -257,16 +273,16 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
     };
     private void showSelectSexDialog() {
         // 1是男，0是女，2是全部
-        String[] sexs = new String[]{ getString(R.string.sex_man), getString(R.string.sex_woman)};
+        String[] sexs = new String[]{ getString(R.string.user_body), getString(R.string.user_girl)};
         int checkItem = 0;
-        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex))
+        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex_title))
                 .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
-                            user_sex_tv.setText(R.string.sex_man);
+                            user_sex_tv.setText(R.string.user_body);
                         } else {
-                            user_sex_tv.setText(R.string.sex_woman);
+                            user_sex_tv.setText(R.string.user_girl);
                         }
                         dialog.dismiss();
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatMsgThirdActivity.java

@@ -37,7 +37,7 @@ public class PlatMsgThirdActivity extends BaseActivity {
         String msg_context = intent.getStringExtra("msg_context");
 
         Log.i("msg_title,msg_context",msg_title + ","+msg_context);
-        if (!StringUtils.isEmpty(msg_title)) getSupportActionBar().setTitle(msg_title+"详情");
+        if (!StringUtils.isEmpty(msg_title)) getSupportActionBar().setTitle(msg_title+getString(R.string.doc_detail));
         plat_msg_third_tv.setText(Html.fromHtml(msg_context) + "");
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/NewSchedultAdapter.java

@@ -10,6 +10,7 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
@@ -142,7 +143,7 @@ public class NewSchedultAdapter extends BaseAdapter {
             if (!StringUtils.isEmpty(iSend) && "iSend".equals(iSend)){
                 recoder_name = "";
             }else {
-                recoder_name = fields_object.getRecorder()+ "发起的";
+                recoder_name = fields_object.getRecorder()+ MyApplication.getInstance().getString(R.string.task_sended);
             }
             store.tv_title.setText( recoder_name  + fields_object.getTaskname());
             store.tv_status.setText(fields_object.getMainname());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/AboutActivity.java

@@ -45,7 +45,7 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        getSupportActionBar().setTitle(R.string.about_us);
+        getSupportActionBar().setTitle(getString(R.string.set_about));
         TextView versionTv = (TextView) findViewById(R.id.version_tv);
         String appName = getString(R.string.app_name);
         String versionName = DeviceInfoUtil.getVersionName(mContext);
@@ -119,10 +119,10 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
                 ImageView imageView = new ImageView(ct);
                 imageView.setImageResource(R.drawable.ic_uu_scan_code);
                 new MaterialDialog.Builder(ct)
-                        .title("UU互联最新版二维码\n长按可识别")
-                        .customView(imageView, false)
-                        .titleGravity(GravityEnum.CENTER)
-                        .show();
+                        .title(getString(R.string.about_qcode_msg))
+                                .customView(imageView, false)
+                                .titleGravity(GravityEnum.CENTER)
+                                .show();
                 final Bitmap bitmap = ((BitmapDrawable) imageView.getDrawable()).getBitmap();
                 imageView.setOnLongClickListener(new View.OnLongClickListener() {
                     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/BasicInfoEditActivity.java

@@ -267,7 +267,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
 
     private void showSelectSexDialog() {
         String[] sexs = new String[]{getString(R.string.sex_man), getString(R.string.sex_woman)};
-        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex))
+        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex_title))
                 .setSingleChoiceItems(sexs, mTempData.getSex() == 1 ? 0 : 1, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -94,7 +94,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_setting);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle(R.string.setting);
+        getSupportActionBar().setTitle(getString(R.string.user_setting));
         initView();
 
     }
@@ -173,7 +173,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                     PushManager.stopWork(MyApplication.getInstance());
                     PreferenceUtils.putInt(MainActivity.UU_STEP, 0);
 //                    stopService(intent);
-                    Toast.makeText(mContext, "您已预关闭UU运动，下次重启应用时将不再开启UU运动", Toast.LENGTH_LONG).show();
+                    Toast.makeText(mContext, getString(R.string.set_close_step_notice1), Toast.LENGTH_LONG).show();
                     speech_recognition_rl.setVisibility(View.GONE);
                 }
             }
@@ -187,7 +187,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 if (isServiceRunning(newStep_service_name) && last_isStep == 1) {
                     startActivity(new Intent(mContext, NewStepActivity.class));
                 } else {
-                    Toast.makeText(mContext, "尚未开启UU运动,或已预关闭", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(mContext, getString(R.string.set_close_step_notice2), Toast.LENGTH_SHORT).show();
                 }
             }
         });
@@ -245,8 +245,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     }
 
     private void showExitDialog() {
-        new AlertDialog.Builder(mContext).setTitle(R.string.app_name).setMessage(R.string.exit_tips).setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+        new AlertDialog.Builder(mContext).setTitle(R.string.app_name).setMessage(R.string.exit_tips).setNegativeButton(R.string.common_cancel, null)
+                .setPositiveButton(R.string.common_sure, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         UserSp.getInstance(mContext).clearUserInfo();
@@ -307,7 +307,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 share();
                 break;
             case R.id.rl_app_update:
-                dialog.setMessage("正在检查更新,请稍等...");
+                dialog.setMessage(getString(R.string.set_check_update_wait));
                 dialog.show();
                 BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
                     @Override
@@ -327,7 +327,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                                         } else {
                                             ViewUtil.ShowMessageTitle(
                                                     SettingActivity.this,
-                                                    "已经是最新版,不需要更新");
+                                                    getString(R.string.set_isnewVersion));
                                         }
                                         dialog.dismiss();
                                     }
@@ -351,17 +351,17 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         shareIntent.setAction(Intent.ACTION_SEND);
         shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri);
         shareIntent.setType("image/*");
-        startActivity(Intent.createChooser(shareIntent, "分享到"));
+        startActivity(Intent.createChooser(shareIntent, getString(R.string.set_share_to)));
     }
 
     //确认是否清空本地缓存
     private void showclearDialog() {
         new AlertDialog
                 .Builder(mContext)
-                .setTitle("温馨提示")
-                .setMessage("是否确定清除本地缓存")
-                .setNegativeButton("取消", null)
-                .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                .setTitle(getString(R.string.common_notice))
+                .setMessage(getString(R.string.cache_msg))
+                .setNegativeButton(getString(R.string.common_cancel), null)
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
 
                     @Override
                     public void onClick(DialogInterface dialog, int which) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -625,12 +625,17 @@ public class FormDetailActivity extends BaseActivity {
                     } else if ("加班单详情".equals(doc_type)) {
                         doc_detail_key.add(getString(R.string.overwork_detail) + num);
                         doc_detail_value.add("");
-                        doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[0].toString());
+                        /*doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[0].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[0].toString());
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[1].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[1].toString());
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[2].toString());
-                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());
+                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());*/
+
+                        doc_detail_key.add(getString(R.string.start_time));doc_detail_value.add(array.getJSONObject(i).getString(getString(R.string.start_time)));
+                        doc_detail_key.add(getString(R.string.end_time));doc_detail_value.add(array.getJSONObject(i).getString(getString(R.string.end_time)));
+                        doc_detail_key.add(getString(R.string.overwork_hours));doc_detail_value.add(array.getJSONObject(i).getString(getString(R.string.overwork_hours)));
+
                     }
                 }
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -158,7 +158,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     JSONObject object = JSON.parseObject(result);
                     Boolean falg = object.getBoolean("success");
                     if (falg) {
-                        ViewUtil.ShowMessageTitle(ct, "发送成功！");
+                        ViewUtil.ShowMessageTitle(ct, getString(R.string.task_send_success));
                         new Handler().postDelayed(new Runnable() {
                             @Override
                             public void run() {
@@ -166,7 +166,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                             }
                         }, 1000);
                     } else {
-                        ViewUtil.ShowMessageTitle(ct, "保存失败！");
+                        ViewUtil.ShowMessageTitle(ct, getString(R.string.send_failed));
                     }
                     progressDialog.dismiss();
                     break;
@@ -269,7 +269,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         chaosonren_rl.setVisibility(View.GONE);  // 抄送人接口暂无参数时
         ct = this;
         TAG = "AddTaskActivity";
-        getSupportActionBar().setTitle("新增任务");
+        getSupportActionBar().setTitle(getString(R.string.task_add));
         String people = getIntent().getStringExtra("people") == null ? "" : getIntent().getStringExtra("people");
         bt_task_add.setOnClickListener(this);
         if (!StringUtils.isEmpty(people))
@@ -326,7 +326,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
             case R.id.iv_find:
                 Intent intent = new Intent(ct, SelectCollisionActivity.class);
                 SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
-                        .setTitle("选择执行人")
+                        .setTitle(getString(R.string.select_doman))
                         .setSingleAble(false)
                         .setSelectCode(selectCode);
                 intent.putExtra(OAConfig.MODEL_DATA, bean);
@@ -393,11 +393,11 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
 
     private void saveTask(String id) {
         if (StringUtils.isEmpty(et_title.getText().toString())) {
-            ToastMessage("任务标题为必填项");
+            ToastMessage(getString(R.string.task_title_must_input));
             return;
         }
         if (StringUtils.isEmpty(et_task_remark.getText().toString())) {
-            ToastMessage("任务详情为必填项");
+            ToastMessage(getString(R.string.task_detail_must_input));
             return;
         }
 
@@ -407,27 +407,27 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 resourcename = getResourceName(tagValues);
             } catch (Exception e) {
                 if (StringUtils.isEmpty(et_task_people.getInputTagText().toString())){
-                    ToastMessage("执行人为必选项");
+                    ToastMessage(getString(R.string.task_doman_must_input));
                     return;
                 }else if (et_task_people.getInputTagText().toString().length() > 1000){
-                    ToastMessage("执行人数量过多,超限1000字符了");
+                    ToastMessage(getString(R.string.task_limit_doman));
                     return;
                 }
             }
         } else {
-            ToastMessage("执行人为必填项");
+            ToastMessage(getString(R.string.task_doman_must_input));
             return;
         }
         if (StringUtils.isEmpty(et_startime.getText().toString())) {
-            ToastMessage("开始时间为必填项");
+            ToastMessage(getString(R.string.task_startT_must_input));
             return;
         }
         if (StringUtils.isEmpty(et_task_startime.getText().toString())) {
-            ToastMessage("结束时间为必填项");
+            ToastMessage(getString(R.string.task_endT_must_input));
             return;
         }
         if (et_startime.getText().toString().compareTo(et_task_startime.getText().toString()) >= 0) {
-            ToastMessage("开始时间必须小于截止时间");
+            ToastMessage(getString(R.string.endT_large_startT));
             return;
         }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -72,7 +72,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         ViewUtils.inject(this);
         ct = this;
         TAG = "TaskAddErpActivity";
-        getSupportActionBar().setTitle("新增任务");
+        getSupportActionBar().setTitle(getString(R.string.task_add));
 
         iv_find.setOnClickListener(this);
         et_startime.setOnClickListener(this);
@@ -89,7 +89,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             case R.id.iv_find:
                 Intent intent = new Intent(ct, SelectCollisionActivity.class);
                 SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
-                        .setTitle("选择执行人")
+                        .setTitle(getString(R.string.select_doman))
                         .setSingleAble(false)
                         .setSelectCode(selectCode);
                 intent.putExtra(OAConfig.MODEL_DATA, bean);
@@ -183,31 +183,31 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     }
     private void dosaveJudge() {
         if (StringUtils.isEmpty(et_title.getText().toString())) {
-            ToastMessage("任务标题为必填项");
+            ToastMessage(getString(R.string.task_title_must_input));
             return;
         }
         if (StringUtils.isEmpty(et_task_detail.getText().toString())) {
-            ToastMessage("任务详情为必填项");
+            ToastMessage(getString(R.string.task_detail_must_input));
             return;
         }
         if (StringUtils.isEmpty(selectNames)){
-            ToastMessage("执行人为必选项");
+            ToastMessage(getString(R.string.task_doman_must_input));
             return;
         }
         if (selectNames.length() > 1000){
-            ToastMessage("执行人数量过多,超限1000字符了");
+            ToastMessage(getString(R.string.task_limit_doman));
             return;
         }
         if (StringUtils.isEmpty(et_startime.getText().toString())) {
-            ToastMessage("开始时间为必选项");
+            ToastMessage(getString(R.string.task_startT_must_input));
             return;
         }
         if (StringUtils.isEmpty(et_endtime.getText().toString())) {
-            ToastMessage("结束时间为必选项");
+            ToastMessage(getString(R.string.task_endT_must_input));
             return;
         }
         if (et_startime.getText().toString().compareTo(et_endtime.getText().toString()) >= 0) {
-            ToastMessage("开始时间必须小于截止时间");
+            ToastMessage(getString(R.string.endT_large_startT));
             return;
         }
 
@@ -262,7 +262,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
                         String task_erp_result = msg.getData().getString("result");
                         Log.i("task_erp_result", task_erp_result+"");
                         if (JSON.parseObject(task_erp_result).containsKey("success") && JSON.parseObject(task_erp_result).getBoolean("success")) {
-                            Toast.makeText(mContext, "发送成功", Toast.LENGTH_LONG).show();
+                            Toast.makeText(mContext, getString(R.string.task_send_success), Toast.LENGTH_LONG).show();
                             finish();
                         }
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskDetailB2BActivity.java

@@ -110,7 +110,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                         JSONObject object = JSON.parseObject(result);
                         Boolean falg = object.getBoolean("success");
                         if (falg) {
-                            ViewUtil.ShowMessageTitle(ct, "操作成功！");
+                            ViewUtil.ShowMessageTitle(ct, getString(R.string.make_adeal_success));
                             Intent intent = new Intent();
                             String task = tv_task_emcode.getText().toString();
                             int type = 0;
@@ -122,7 +122,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
 //                        goBackMenu();
                             finish();
                         } else {
-                            ViewUtil.ShowMessageTitle(ct, "操作失败！");
+                            ViewUtil.ShowMessageTitle(ct, getString(R.string.make_adeal_failed));
                         }
                         break;
                     case LOAD_EM_NAME:
@@ -184,7 +184,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
         setContentView(R.layout.act_task_detail);
         ViewUtils.inject(this);
         ct = this;
-        getSupportActionBar().setTitle("任务处理");
+        getSupportActionBar().setTitle(getString(R.string.taskdetail_title));
         TAG = "DetailTask";
         bt_task_bohui.setOnClickListener(this);
         bt_task_huifu.setOnClickListener(this);
@@ -204,24 +204,24 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
         super.onResume();
         Intent intent = getIntent();
 
-        tv_task_name.setText(intent.getStringExtra("taskname") == null ? "未填写" : intent.getStringExtra("taskname"));
+        tv_task_name.setText(intent.getStringExtra("taskname") == null ? getString(R.string.common_noinput) : intent.getStringExtra("taskname"));
         // 提出人
         tv_task_emcode
-                .setText(intent.getStringExtra("taskemcode") == null ? "未填写" : intent.getStringExtra("taskemcode"));
+                .setText(intent.getStringExtra("taskemcode") == null ? getString(R.string.common_noinput) : intent.getStringExtra("taskemcode"));
         // 执行人performer
         tv_task_performer
-                .setText(intent.getStringExtra("performer") == null ? "未填写" : intent.getStringExtra("performer"));
-        tv_task_status.setText(intent.getStringExtra("status") == null ? "未填写" : intent.getStringExtra("status"));
-        tv_task_duration.setText(intent.getStringExtra("duration") == null ? "未填写" : intent.getStringExtra("duration"));
+                .setText(intent.getStringExtra("performer") == null ? getString(R.string.common_noinput) : intent.getStringExtra("performer"));
+        tv_task_status.setText(intent.getStringExtra("status") == null ? getString(R.string.common_noinput) : intent.getStringExtra("status"));
+        tv_task_duration.setText(intent.getStringExtra("duration") == null ? getString(R.string.common_noinput) : intent.getStringExtra("duration"));
         tv_task_describe
-                .setText(intent.getStringExtra("description") == null ? "未填写" : intent.getStringExtra("description"));
+                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) : intent.getStringExtra("description"));
         tv_task_starttime
-                .setText(intent.getStringExtra("tasktime") == null ? "未填写" : intent.getStringExtra("tasktime"));
+                .setText(intent.getStringExtra("tasktime") == null ? getString(R.string.common_noinput) : intent.getStringExtra("tasktime"));
 //                .setText(intent.getStringExtra("tasktime") == null ? "未填写" :
 //                        TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
         taskId = intent.getStringExtra("taskid");
         tv_task_endtime.
-                setText(intent.getStringExtra("endtime") == null ? "未填写" :
+                setText(intent.getStringExtra("endtime") == null ? getString(R.string.common_noinput) :
                         TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
 
         String ra_taskid = intent.getStringExtra("ra_taskid");
@@ -307,7 +307,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
 //                    sendDataToServer("plm/record/endBillTask.action", param);
                     sendDataToB2BServer(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_change, param);
                 } else {
-                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
                 }
                 break;
             case R.id.bt_task_bohui:
@@ -331,7 +331,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
 //                    sendDataToServer("plm/record/endBillTask.action", param);
                     sendDataToB2BServer(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_change, param);
                 } else {
-                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
                 }
 
                 break;
@@ -356,7 +356,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
 //                    sendDataToServer("plm/record/endBillTask.action", param);
                     sendDataToB2BServer(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_change, param);
                 } else {
-                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
                 }
                 break;
             case R.id.iv_recode:

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/service/StepService.java

@@ -24,6 +24,7 @@ import android.os.Messenger;
 import android.os.RemoteException;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 import com.xzjmyk.pm.newpedo.constant.Constant;
 import com.xzjmyk.pm.newpedo.db.StepDataDao;
@@ -107,9 +108,9 @@ public class StepService extends Service implements SensorEventListener {
         nfIntent = new Intent(this, StepSplashActivity.class);
         builder.setContentIntent(PendingIntent.getActivity(this, 0, nfIntent, 0)) // 设置PendingIntent
                // .setLargeIcon(BitmapFactory.decodeResource(this.getResources(), R.drawable.uuu)) // 设置下拉列表中的图标(大图标)
-                .setContentTitle("UU运动正在后台运行") // 设置下拉列表里的标题
+                .setContentTitle(getString(R.string.uu_step_Running_in_the_background)) // 设置下拉列表里的标题
                 .setSmallIcon(R.drawable.uuu) // 设置状态栏内的小图标
-                .setContentText("加油,要记得勤加运动"); // 设置上下文内容
+                .setContentText(getString(R.string.comeon_more_sport)); // 设置上下文内容
         // 获取构建好的Notification
         if (VERSION_CODES > 15) {
             Notification stepNotification = builder.build();
@@ -212,7 +213,8 @@ public class StepService extends Service implements SensorEventListener {
      */
     private void initTodayData() {
         //获取当前时间
-        CURRENT_DATE = TimeUtil.getCurrentDate();
+//        CURRENT_DATE = TimeUtil.getCurrentDate();
+        CURRENT_DATE = TimeUtils.s_long_2_str(System.currentTimeMillis());
         //获取数据库
         stepDataDao = new StepDataDao(getApplicationContext());
         //获取当天的数据，用于展示
@@ -362,14 +364,17 @@ public class StepService extends Service implements SensorEventListener {
 
         builder.setContentIntent(PendingIntent.getActivity(this, 0, nfIntent, 0)) // 设置PendingIntent
                 .setLargeIcon(BitmapFactory.decodeResource(this.getResources(), R.drawable.uuu)) // 设置下拉列表中的图标(大图标)
-                .setContentTitle("UU运动正在后台运行") // 设置下拉列表里的标题
+                .setContentTitle(getString(R.string.uu_step_Running_in_the_background)) // 设置下拉列表里的标题
                 .setSmallIcon(R.drawable.uuu) // 设置状态栏内的小图标
-                .setContentText("加油,要记得勤加运动"); // 设置上下文内容　
+                .setContentText(getString(R.string.comeon_more_sport)); // 设置上下文内容　
+
+        if (VERSION_CODES > 15){
+            // 获取构建好的Notification
+            Notification stepNotification = builder.build();
+            //调用更新
+            notificationManager.notify(110,stepNotification);
+        }
 
-        // 获取构建好的Notification
-        Notification stepNotification = builder.build();
-        //调用更新
-        notificationManager.notify(110,stepNotification);
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepActivity.java

@@ -89,6 +89,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     private void initView() {
         steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
         curSelDate = TimeUtil.getCurrentDate();
+//        curSelDate = TimeUtils.s_long_2_str(System.currentTimeMillis());
         support_step = StepCountCheckUtil.isSupportStepCountSensor(this);
     }
 
@@ -111,7 +112,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
             setupService();
 //            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 0);
 //            PushManager.resumeWork(MyApplication.getInstance());
-            ToastMessage("小提示:UU在关闭后无法继续统计您的步数数据");
+            ToastMessage(getString(R.string.close_step_notice3));
 //            Toast.makeText(mContext, "您已开启UU运动", Toast.LENGTH_LONG).show();
             initListener();
         } else {

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepListActivity.java

@@ -67,9 +67,9 @@ public class NewStepListActivity extends BaseActivity {
 
     private void showNotice() {
         new AlertDialog.Builder(mContext)
-                .setTitle("小UU友情提示")
-                .setMessage("\t\t\t如果想要我和微信一样准确的记录您的运动步数,请保持我和微信一样一直在后台运行哦,主人,>O_O< !")
-                .setPositiveButton("我知道了",null)
+                .setTitle(getString(R.string.uu_friend_notice))
+                .setMessage(getString(R.string.uu_love_notice))
+                .setPositiveButton(getString(R.string.i_known),null)
                 .show();
     }
 

WeiChat/src/main/res/layout/act_task_detail.xml

@@ -31,14 +31,14 @@
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:layout_marginTop="10dp"
-                    android:hint="回复您的任务完成情况..." />
+                    android:hint="@string/task_Reply_to_your_task_completiong" />
 
                 <Button
                     android:id="@+id/bt_task_huifu"
                     style="@style/button_style_one"
                     android:layout_marginBottom="10dp"
                     android:layout_marginTop="10dp"
-                    android:text="回复" />
+                    android:text="@string/task_reply" />
 
                 <LinearLayout
                     android:id="@+id/ll_bt_task"
@@ -55,7 +55,7 @@
                         android:layout_marginBottom="10dp"
                         android:layout_marginTop="10dp"
                         android:layout_weight="1.0"
-                        android:text="确认" />
+                        android:text="@string/common_sure" />
 
                     <Button
                         android:id="@+id/bt_task_bohui"
@@ -64,7 +64,7 @@
                         android:layout_marginBottom="10dp"
                         android:layout_marginTop="10dp"
                         android:layout_weight="1.0"
-                        android:text="驳回" />
+                        android:text="@string/task_turn_down" />
                 </LinearLayout>
             </LinearLayout>
             <LinearLayout
@@ -86,7 +86,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="任务信息"
+                    android:text="@string/taskdetail_info"
                     android:textColor="@color/yellow_home"
                     android:textSize="16sp" />
 
@@ -118,14 +118,14 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1.0"
                             android:gravity="right"
-                            android:text="任务名称"
+                            android:text="@string/taskdetail_name"
                             android:textColor="@color/black" />
 
                         <TextView
                             android:id="@+id/tv_task_name"
                             style="@style/task_text_right"
                             android:layout_marginLeft="10dp"
-                            android:text="未填写" />
+                            android:text="@string/common_noinput" />
                     </LinearLayout>
 
                     <View style="@style/line_horizontal_style_one" />
@@ -142,7 +142,7 @@
                             android:layout_marginTop="5dp"
                             android:layout_weight="1.0"
                             android:gravity="right"
-                            android:text="提出人"
+                            android:text="@string/taskdetail_sponsor"
                             android:textColor="@color/black" />
 
                         <TextView
@@ -165,7 +165,7 @@
                             android:layout_marginTop="5dp"
                             android:layout_weight="1.0"
                             android:gravity="right"
-                            android:text="执行人"
+                            android:text="@string/taskdetail_executor"
                             android:textColor="@color/black" />
 
                         <TextView
@@ -187,7 +187,7 @@
                             android:layout_marginTop="5dp"
                             android:layout_weight="1.0"
                             android:gravity="right"
-                            android:text="开始时间"
+                            android:text="@string/taskdetail_startime"
                             android:textColor="@color/black" />
 
                         <TextView
@@ -209,7 +209,7 @@
                             android:layout_marginTop="5dp"
                             android:layout_weight="1.0"
                             android:gravity="right"
-                            android:text="结束时间"
+                            android:text="@string/taskdetail_endtime"
                             android:textColor="@color/black" />
 
                         <TextView
@@ -232,7 +232,7 @@
                             android:layout_marginTop="5dp"
                             android:layout_weight="1.0"
                             android:gravity="right"
-                            android:text="持续时间"
+                            android:text="@string/task_go_on_time"
                             android:textColor="@color/black" />
 
                         <TextView
@@ -256,7 +256,7 @@
                             android:layout_marginTop="5dp"
                             android:layout_weight="1.0"
                             android:gravity="right"
-                            android:text="状态"
+                            android:text="@string/taskdetail_state"
                             android:textColor="@color/black" />
 
                         <TextView
@@ -281,7 +281,7 @@
                             android:layout_marginTop="5dp"
                             android:gravity="right|center"
                             android:singleLine="true"
-                            android:text="任务描述"
+                            android:text="@string/taskdetail_desc"
                             android:textColor="@color/black" />
 
                         <TextView
@@ -367,7 +367,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="回复内容"
+                    android:text="@string/taskdetail_content_title"
                     android:textColor="@color/yellow_home"
                     android:textSize="16sp" />
 

WeiChat/src/main/res/layout/act_taskb2b_add.xml

@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="任务标题" />
+                android:text="@string/task_title" />
 
             <EditText
                 android:id="@+id/et_title"
@@ -30,7 +30,7 @@
                 android:layout_toRightOf="@+id/tv_title"
                 android:background="@null"
                 android:gravity="right|center_vertical"
-                android:hint="请输入(必填)" />
+                android:hint="@string/common_input" />
         </RelativeLayout>
         <RelativeLayout
             style="@style/form_relative_customer"
@@ -42,7 +42,7 @@
                 android:layout_height="match_parent" 
                android:gravity="bottom"
                 android:layout_marginLeft="10dp"
-                android:text="任务详情"/>
+                android:text="@string/task_detail"/>
             <ImageView
                 android:id="@+id/voice_search_iv"
                 android:background="@drawable/btn_yuyin_nor"
@@ -62,7 +62,7 @@
             android:layout_height="100dp"
             android:paddingLeft="10dp"
             android:layout_marginBottom="10dp"
-            android:hint="请输入(必填)" />
+            android:hint="@string/common_input" />
         
         <RelativeLayout
             style="@style/form_relative_customer"
@@ -75,7 +75,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="   执行人" />
+                android:text="@string/task_executor" />
 
             <ScrollView
                 android:layout_width="wrap_content"
@@ -122,7 +122,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="开始时间" />
+                android:text="@string/task_starttime" />
 
             <TextView
                 android:id="@+id/et_startime"
@@ -131,7 +131,7 @@
                 android:layout_toRightOf="@+id/tv_startime"
                 android:background="@null"
                 android:gravity="right"
-                android:hint="请选择(必填)" />
+                android:hint="@string/common_select" />
         </RelativeLayout>
         <View
             android:layout_width="match_parent"
@@ -151,7 +151,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="截止时间" />
+                android:text="@string/task_endtime" />
 
             <TextView
                 android:id="@+id/et_task_startime"
@@ -160,7 +160,7 @@
                 android:layout_toRightOf="@+id/tv_task_startime"
                 android:background="@null"
                 android:gravity="right"
-                android:hint="请选择(必填)" />
+                android:hint="@string/common_select" />
 
         </RelativeLayout>
 

WeiChat/src/main/res/layout/act_taskerp_add.xml

@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="任务标题" />
+                android:text="@string/task_title" />
 
             <EditText
                 android:id="@+id/et_title"
@@ -30,7 +30,7 @@
                 android:layout_toRightOf="@+id/tv_title"
                 android:background="@null"
                 android:gravity="right|center_vertical"
-                android:hint="请输入(必填)" />
+                android:hint="@string/common_input" />
         </RelativeLayout>
         <RelativeLayout
             style="@style/form_relative_customer"
@@ -41,7 +41,7 @@
                 android:layout_height="match_parent" 
                android:gravity="bottom"
                 android:layout_marginLeft="10dp"
-                android:text="任务详情"/>
+                android:text="@string/task_detail"/>
             </RelativeLayout>
         <EditText
             android:id="@+id/et_task_detail"
@@ -51,7 +51,7 @@
             android:layout_height="100dp"
             android:paddingLeft="10dp"
             android:layout_marginBottom="10dp"
-            android:hint="请输入(必填)" />
+            android:hint="@string/common_input" />
         
         <RelativeLayout
             style="@style/form_relative_customer"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="   执行人" />
+                android:text="@string/task_executor" />
 
             <ScrollView
                 android:layout_width="wrap_content"
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="开始时间" />
+                android:text="@string/task_starttime" />
 
             <TextView
                 android:id="@+id/et_startime"
@@ -120,7 +120,7 @@
                 android:layout_toRightOf="@+id/tv_startime"
                 android:background="@null"
                 android:gravity="right"
-                android:hint="请选择(必选)" />
+                android:hint="@string/common_select" />
         </RelativeLayout>
         <View
             android:layout_width="match_parent"
@@ -140,7 +140,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:text="截止时间" />
+                android:text="@string/task_endtime" />
 
             <TextView
                 android:id="@+id/et_endtime"
@@ -149,7 +149,7 @@
                 android:layout_toRightOf="@+id/tv_task_startime"
                 android:background="@null"
                 android:gravity="right"
-                android:hint="请选择(必选)" />
+                android:hint="@string/common_select" />
 
         </RelativeLayout>
 

WeiChat/src/main/res/layout/activity_about.xml

@@ -70,7 +70,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:gravity="center"
-                android:text="去评价"
+                android:text="@string/about_remark"
                 android:textColor="@color/grgray"
                 android:textSize="16sp" />
             <TextView
@@ -104,7 +104,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:gravity="center"
-                android:text="新功能介绍"
+                android:text="@string/about_function"
                 android:textColor="@color/grgray"
                 android:textSize="16sp" />
             <TextView
@@ -138,7 +138,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:gravity="center"
-                android:text="二维码"
+                android:text="@string/about_qcode"
                 android:textColor="@color/grgray"
                 android:textSize="16sp"/>
             <TextView

WeiChat/src/main/res/layout/activity_newstep.xml

@@ -33,7 +33,7 @@
             android:layout_marginTop="15dp"
             android:layout_marginBottom="15dp"
             android:textColor="@color/main_text_color"
-            android:text="运动记录"/>
+            android:text="@string/sports_recode"/>
 
         <RelativeLayout
             android:background="@drawable/ic_small_blue_rectangular"
@@ -46,7 +46,7 @@
                 android:textColor="@color/white"
                 android:textSize="18sp"
                 android:layout_margin="10dp"
-                android:text="步行+跑步距离(估算)"/>
+                android:text="@string/sports_recode_distance"/>
 
             <LinearLayout
                 android:layout_margin="10dp"
@@ -76,7 +76,7 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textColor="@color/white"
-                        android:text="公里"/>
+                        android:text="@string/sports_kilometre"/>
 
                 </LinearLayout>
 
@@ -113,7 +113,7 @@
                 android:textColor="@color/white"
                 android:textSize="18sp"
                 android:layout_margin="10dp"
-                android:text="今日步数"/>
+                android:text="@string/sports_step_tody"/>
 
             <LinearLayout
                 android:layout_margin="10dp"
@@ -143,7 +143,7 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textColor="@color/white"
-                        android:text="步"/>
+                        android:text="@string/sports_step"/>
 
                 </LinearLayout>
 
@@ -174,7 +174,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="设该备不支持UU计步,抱歉"
+            android:text="@string/device_nosupport_step"
             android:textColor="@color/red"/>
 
     </LinearLayout>
@@ -195,7 +195,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="更多历史记录"
+            android:text="@string/sports_recode_more"
             android:textColor="#288af8"
             android:textSize="16sp"
             android:layout_marginLeft="10dp"

WeiChat/src/main/res/layout/activity_process_msg.xml

@@ -22,7 +22,7 @@
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
-            android:hint="@string/search"
+            android:hint="@string/common_search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />

WeiChat/src/main/res/layout/activity_setting.xml

@@ -119,7 +119,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text=" UU 运动"
+                    android:text="@string/set_sport"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
@@ -169,7 +169,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="@string/push_setting"
+                    android:text="@string/set_push"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
@@ -197,7 +197,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="@string/clear_cache"
+                    android:text="@string/set_clear"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
@@ -234,7 +234,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="@string/use_help"
+                    android:text="@string/set_suggest"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
@@ -265,7 +265,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="@string/about_us"
+                    android:text="@string/set_about"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
@@ -321,7 +321,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="@string/app_version"
+                    android:text="@string/set_version"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
@@ -357,7 +357,7 @@
                 android:layout_marginTop="30dp"
                 android:background="@drawable/bg_bule_btn"
                 android:padding="10dp"
-                android:text="@string/exit_current_account"
+                android:text="@string/set_login_out"
                 android:textColor="@color/white"
                 android:textSize="@dimen/text_main" />
         </LinearLayout>

WeiChat/src/main/res/layout/newstep_data.xml

@@ -12,7 +12,7 @@
         android:layout_gravity="center"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="20dp"
-        android:orientation="vertical">
+        android:orientation="horizontal">
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="更多历史记录"
+            android:text="@string/sports_recode_more"
             android:textColor="#288af8"
             android:textSize="16sp"
             android:layout_marginLeft="10dp"

WeiChat/src/main/res/layout/process_header.xml

@@ -34,7 +34,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
             android:gravity="center"
-            android:text="待审批"
+            android:text="@string/status_pending"
             android:textColor="@color/selector_schedule_text" />
 
         <TextView
@@ -45,7 +45,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
             android:gravity="center"
-            android:text="已审批"
+            android:text="@string/status_approved"
             android:textColor="@color/selector_schedule_text" />
 
         <TextView
@@ -56,7 +56,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
             android:gravity="center"
-            android:text="我发起的"
+            android:text="@string/task_request_me"
             android:textColor="@color/selector_schedule_text" />
 
     </LinearLayout>

WeiChat/src/main/res/layout/task_header.xml

@@ -33,7 +33,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
             android:gravity="center"
-            android:text="待处理"
+            android:text="@string/task_wait_todo"
             android:textColor="@color/selector_schedule_text" />
 
         <TextView
@@ -45,7 +45,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
             android:gravity="center"
-            android:text="已处理"
+            android:text="@string/task_done_deal"
             android:textColor="@color/selector_schedule_text" />
 
         <TextView
@@ -56,7 +56,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
             android:gravity="center"
-            android:text="我发起的"
+            android:text="@string/task_request_me"
             android:textColor="@color/selector_schedule_text" />
 
     </LinearLayout>

WeiChat/src/main/res/layout/task_listview.xml

@@ -23,7 +23,7 @@
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
-            android:hint="@string/search"
+            android:hint="@string/common_search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />

WeiChat/src/main/res/menu/menu_about.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/app_about"
         android:icon="@drawable/icon_app_share"
-        android:title="@string/share"
+        android:title="@string/about_share"
         app:showAsAction="ifRoom"/>
 
 </menu>

WeiChat/src/main/res/menu/menu_add_icon.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/add_item"
         android:icon="@drawable/more"
-        android:title="新增"
+        android:title="@string/new_add"
         app:showAsAction="ifRoom"/>
 
 </menu>

WeiChat/src/main/res/menu/menu_visit_save.xml

@@ -4,6 +4,6 @@
 
     <item
         android:id="@+id/save"
-        android:title="发送"
+        android:title="@string/common_send"
         app:showAsAction="always" />
 </menu>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -92,75 +92,20 @@
 
 
     <string-array name="late_time">
-        <item>0分钟</item>
-        <item>1分钟</item>
-        <item>2分钟</item>
-        <item>3分钟</item>
-        <item>4分钟</item>
-        <item>5分钟</item>
-        <item>6分钟</item>
-        <item>7分钟</item>
-        <item>8分钟</item>
-        <item>9分钟</item>
-        <item>10分钟</item>
-        <item>11分钟</item>
-        <item>12分钟</item>
-        <item>13分钟</item>
-        <item>14分钟</item>
-        <item>15分钟</item>
-        <item>16分钟</item>
-        <item>17分钟</item>
-        <item>18分钟</item>
-        <item>19分钟</item>
-        <item>20分钟</item>
-        <item>21分钟</item>
-        <item>22分钟</item>
-        <item>23分钟</item>
-        <item>24分钟</item>
-        <item>25分钟</item>
-        <item>26分钟</item>
-        <item>27分钟</item>
-        <item>28分钟</item>
-        <item>29分钟</item>
-        <item>30分钟</item>
+        <item>0分钟</item><item>1分钟</item><item>2分钟</item><item>3分钟</item><item>4分钟</item><item>5分钟</item>
+        <item>6分钟</item><item>7分钟</item><item>8分钟</item><item>9分钟</item><item>10分钟</item><item>11分钟</item>
+        <item>12分钟</item><item>13分钟</item><item>14分钟</item><item>15分钟</item><item>16分钟</item><item>17分钟</item>
+        <item>18分钟</item><item>19分钟</item><item>20分钟</item><item>21分钟</item><item>22分钟</item><item>23分钟</item>
+        <item>24分钟</item><item>25分钟</item><item>26分钟</item><item>27分钟</item><item>28分钟</item><item>29分钟</item><item>30分钟</item>
     </string-array>
     <string-array name="serious_late_time">
-        <item>10分钟</item>
-        <item>15分钟</item>
-        <item>20分钟</item>
-        <item>25分钟</item>
-        <item>30分钟</item>
-        <item>35分钟</item>
-        <item>40分钟</item>
-        <item>45分钟</item>
-        <item>50分钟</item>
-        <item>55分钟</item>
-        <item>60分钟</item>
+        <item>10分钟</item><item>15分钟</item><item>20分钟</item><item>25分钟</item><item>30分钟</item><item>35分钟</item><item>40分钟</item><item>45分钟</item><item>50分钟</item><item>55分钟</item><item>60分钟</item>
     </string-array>
     <string-array name="serious_leave_early_time">
-        <item>10分钟</item>
-        <item>15分钟</item>
-        <item>20分钟</item>
-        <item>25分钟</item>
-        <item>30分钟</item>
-        <item>35分钟</item>
-        <item>40分钟</item>
-        <item>45分钟</item>
-        <item>50分钟</item>
-        <item>55分钟</item>
-        <item>60分钟</item>
+        <item>10分钟</item><item>15分钟</item><item>20分钟</item><item>25分钟</item><item>30分钟</item><item>35分钟</item><item>40分钟</item><item>45分钟</item><item>50分钟</item><item>55分钟</item><item>60分钟</item>
     </string-array>
     <string-array name="absenteeism_time">
-        <item>30分钟</item>
-        <item>40分钟</item>
-        <item>50分钟</item>
-        <item>60分钟</item>
-        <item>70分钟</item>
-        <item>80分钟</item>
-        <item>90分钟</item>
-        <item>100分钟</item>
-        <item>110分钟</item>
-        <item>120分钟</item>
+        <item>30分钟</item><item>40分钟</item><item>50分钟</item><item>60分钟</item><item>70分钟</item><item>80分钟</item><item>90分钟</item><item>100分钟</item><item>110分钟</item><item>120分钟</item>
     </string-array>
     <!-- end -高级设置-->
 
@@ -956,6 +901,85 @@
     <string name="oacreat_calender">创建日程</string>
     <string name="account_notice1">当前账号没有下属,如有问题请联系系统管理员</string>
     <string name="nothing_now">暂无更多</string>
+    <string name="set_close_step_notice1">您已预关闭UU运动，下次重启应用时将不再开启UU运动</string>
+    <string name="set_close_step_notice2">尚未开启UU运动,或已预关闭</string>
+    <string name="close_step_notice3">小提示:UU在关闭后无法继续统计您的步数数据</string>
+    <string name="set_check_update_wait">正在检查更新,请稍等...</string>
+    <string name="set_isnewVersion">已经是最新版,不需要更新</string>
+    <string name="set_share_to">分享到</string>
+    <string name="device_nosupport_step">设该备不支持UU计步,抱歉</string>
+    <string name="uu_step_Running_in_the_background">UU运动正在后台运行</string>
+    <string name="comeon_more_sport">加油,要记得勤加运动</string>
+    <string name="uu_friend_notice">小UU友情提示</string>
+    <string name="uu_love_notice">如果想要我和微信一样准确的记录您的运动步数,请保持我和微信一样一直在后台运行哦,主人,O_O!</string>
+    <string name="i_known">我知道了</string>
+    <string name="send_words">发表文字</string>
+    <string name="please_waitting">请稍等</string>
+    <string name="ask_submit_success">问题提交成功</string>
+    <string name="look_over">查看</string>
+    <string name="pictures">图片</string>
+    <!-- 调用系统拍照的字符串 -->
+    <string name="c_take_picture">拍照</string>
+    <string name="c_take_picture_failed">拍照失败</string>
+    <string name="c_photo_album">相册</string>
+    <string name="c_photo_album_failed">选择失败</string>
+    <string name="c_crop_failed">裁减失败</string>
+    <string name="exit_tips">确定要退出此账号吗？</string>
+    <string name="watting">等待</string>
+    <string name="approvel">审批</string>
+    <string name="Did_not_pass">未通过</string>
+    <string name="task_done_deal">已处理</string>
+    <string name="task_wait_todo">待处理</string>
+    <string name="task_refresh_again">请刷新重试</string>
+    <string name="new_add">新增</string>
+    <string name="task_sended">发起的</string>
+    <string name="task_Reply_to_your_task_completiong">回复您的任务完成情况...</string>
+    <string name="task_reply">回复</string>
+    <string name="task_turn_down">驳回</string>
+    <string name="task_go_on_time">持续时间</string>
+    <string name="task_input_detail_info">输入完整信息</string>
+    <string name="task_title_must_input">任务标题为必填项</string>
+    <string name="task_detail_must_input">任务详情为必填项</string>
+    <string name="task_doman_must_input">执行人为必选项</string>
+    <string name="task_limit_doman">执行人数量过多,超限1000字符了</string>
+    <string name="task_startT_must_input">开始时间为必选项</string>
+    <string name="task_endT_must_input">结束时间为必选项</string>
+    <string name="task_send_success">发送成功</string>
+    <string name="common_send">发送</string>
+    <string name="make_adeal_failed">操作失败</string>
+    <string name="rest">休息</string>
+    <string name="sign_flights">班次</string>
+    <string name="select_department_first">请先选择部门</string>
+    <string name="select_jobs">选择岗位</string>
+    <string name="select_department">选择部门</string>
+    <string name="Please_imput_the_correct_email_format">请输入正确的邮箱格式</string>
+    <string name="people_add_success">人员添加成功</string>
+    <string name="add_success">新增成功</string>
+    <string-array name="plat_department_list">
+        <item>总经办</item>
+        <item>采购部</item>
+        <item>销售部</item>
+        <item>财务部</item>
+        <item>人事行政部</item>
+        <item>研发部</item>
+    </string-array>
+
+    <string name="plat_department1">总经办</string>
+    <string name="plat_department2">采购部</string>
+    <string name="plat_department3">销售部</string>
+    <string name="plat_department4">财务部</string>
+    <string name="plat_department5">人事行政部</string>
+    <string name="plat_department6">研发部</string>
+    <string-array name="plat_job1">
+        <item>总经理</item>
+        <item>副总经理</item>
+        <item>秘书</item>
+    </string-array>
+    <string-array name="plat_job2"><item>经理</item><item>采购员</item></string-array>
+    <string-array name="plat_job3"><item>经理</item><item>业务员</item></string-array>
+    <string-array name="plat_job4"><item>经理</item><item>会计</item><item>出纳</item></string-array>
+    <string-array name="plat_job5"><item>经理</item><item>人事专员</item><item>行政专员</item></string-array>
+    <string-array name="plat_job6"><item>经理</item><item>工程师</item></string-array>
 
     <!-- end平台考勤单据部分-->
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -665,7 +665,7 @@
     <string name="set_suggest">用戶回饋</string>
     <string name="set_about">關於UU互聯</string>
     <string name="set_version">當前版本</string>
-    <string name="set_login_out">登出</string>
+    <string name="set_login_out">退出登錄</string>
     <!--更新版本检测-->
     <!--  <string name="update_load">当前版本</string>-->
     <string name="update_msg">已經是最新版，不需要更新</string>
@@ -825,5 +825,98 @@
     <string name="complaint_addres">申訴地址</string>
     <string name="approvel_detail">審批語詳情</string>
     <string name="update_failed">更新失敗</string>
+
+    <string name="Subordinates_visit">下屬拜訪</string>
+    <string name="my_visit">我的拜訪</string>
+    <string name="talking_lost">會話已斷開</string>
+    <string name="Program_error">程序錯誤</string>
+    <string name="error_notice1">數據獲取失敗，請稍後重試，请稍后重试</string>
+    <string name="outplan_undone">外勤計劃尚未完成</string>
+    <string name="work_calender">工作日曆</string>
+    <string name="done">已完成</string>
+    <string name="undone">未完成</string>
+    <string name="oacreat_task">創建任務</string>
+    <string name="oacreat_calender">創建日程</string>
+    <string name="account_notice1">當前賬號沒有下屬,如有問題請聯繫系統管理員</string>
+    <string name="nothing_now">暫無更多</string>
+    <string name="set_close_step_notice1">您已預關閉UU運動，下次重啟應用時將不再開啟UU運動</string>
+    <string name="set_close_step_notice2">尚未開啟UU運動,或已預關閉</string>
+    <string name="close_step_notice3">小提示:UU在關閉後無法繼續統計您的步數數據</string>
+    <string name="set_check_update_wait">正在檢查更新,請稍等</string>
+    <string name="set_isnewVersion">已經是最新版,不需要更新</string>
+    <string name="set_share_to">分享到</string>
+    <string name="device_nosupport_step">設該備不支持UU計步,抱歉</string>
+    <string name="uu_step_Running_in_the_background">UU運動正在後台運行</string>
+    <string name="comeon_more_sport">加油,要記得勤加運動</string>
+    <string name="uu_friend_notice">小UU友情提示</string>
+    <string name="uu_love_notice">如果想要我和微信一樣準確的記錄您的運動步數,請保持我和微信一樣一直在後台運行哦,主人,O_O!</string>
+    <string name="i_known">我知道了</string>
+    <string name="send_words">發表文字</string>
+    <string name="please_waitting">請稍等</string>
+    <string name="ask_submit_success">問題提交成功</string>
+    <string name="look_over">查看</string>
+    <string name="pictures">圖片</string>
+    <!-- 调用系统拍照的字符串 -->
+    <string name="c_take_picture">拍照</string>
+    <string name="c_take_picture_failed">拍照失敗</string>
+    <string name="c_photo_album">相册</string>
+    <string name="c_photo_album_failed">選擇失敗</string>
+    <string name="c_crop_failed">裁剪失敗</string>
+    <string name="exit_tips">確定要退出此賬號嗎？</string>
+    <string name="watting">等待</string>
+    <string name="approvel">審批</string>
+    <string name="Did_not_pass">未通過</string>
+    <string name="task_done_deal">已處理</string>
+    <string name="task_wait_todo">待處理</string>
+    <string name="task_refresh_again">請刷新重試</string>
+    <string name="new_add">新增</string>
+    <string name="task_sended">發起的</string>
+    <string name="task_Reply_to_your_task_completiong">回复您的任務完成情況...</string>
+    <string name="task_reply">回复</string>
+    <string name="task_turn_down">駁回</string>
+    <string name="task_go_on_time">持續時間</string>
+    <string name="task_input_detail_info">輸入完整信息</string>
+    <string name="task_title_must_input">任務標題為必填項</string>
+    <string name="task_detail_must_input">任務詳情為必填項</string>
+    <string name="task_doman_must_input">執行人為必選項</string>
+    <string name="task_limit_doman">執行人數量過多,超限1000字符了</string>
+    <string name="task_startT_must_input">開始時間為必選項</string>
+    <string name="task_endT_must_input">結束時間為必選項</string>
+    <string name="task_send_success">發送成功</string>
+    <string name="common_send">發送</string>
+    <string name="make_adeal_failed">操作失敗</string>
+    <string name="rest">休息</string>
+    <string name="sign_flights">班次</string>
+    <string name="select_department_first">請先選擇部門</string>
+    <string name="select_jobs">選擇崗位</string>
+    <string name="select_department">選擇部門</string>
+    <string name="Please_imput_the_correct_email_format">請輸入正確的郵箱格式</string>
+    <string name="people_add_success">人員添加成功</string>
+    <string name="add_success">新增成功</string>
+    <string-array name="plat_department_list">
+        <item>總經辦</item>
+        <item>採購部</item>
+        <item>銷售部</item>
+        <item>財務部</item>
+        <item>人事行政部</item>
+        <item>研發部</item>
+    </string-array>
+
+    <string name="plat_department1">總經辦</string>
+    <string name="plat_department2">採購部</string>
+    <string name="plat_department3">銷售部</string>
+    <string name="plat_department4">財務部</string>
+    <string name="plat_department5">人事行政部</string>
+    <string name="plat_department6">研發部</string>
+    <string-array name="plat_job1">
+            <item>總經理</item>
+            <item>副總經理</item>
+            <item>秘書</item>
+    </string-array>
+    <string-array name="plat_job2"><item>經理</item><item>採購員</item></string-array>
+    <string-array name="plat_job3"><item>經理</item><item>業務員</item></string-array>
+    <string-array name="plat_job4"><item>經理</item><item>會計</item><item>出納</item></string-array>
+    <string-array name="plat_job5"><item>經理</item><item>人事專員</item><item>行政專員</item></string-array>
+    <string-array name="plat_job6"><item>經理</item><item>工程師</item></string-array>
     <!-- end平台考勤单据部分-->
 </resources>

WeiChat/src/main/res/values/strings.xml

@@ -408,7 +408,6 @@
     <string name="residence_align">居&#160;&#160;住&#160;&#160;地</string>
     <string name="telephone">手机号码</string>
     <string name="email">邮箱地址</string>
-    <string name="select_sex">选择性别</string>
     <string name="select_avatar">选择头像</string>
     <string name="sex_man">男</string>
     <string name="sex_woman">女</string>