18:57，翻译commit

app_core/common/src/main/res/values-en/strings.xml

@@ -1379,14 +1379,14 @@
     <string name = "change_style"> Change Style </string>
     <string name = "save_to_MBphone"> Save to Phone </string>
     <string name = "scan_2dcode"> Scan QR Code </string>
-    <string name="common_title">Title</string>
-    <string name="Reimbursement_type">Reimbursement type</string>
-    <string name="Consumer_details">Consumer details</string>
-    <string name="Add_invoice">Add invoice</string>
+    <string name="common_title">topic</string>
+    <string name="Reimbursement_type">type</string>
+    <string name="Consumer_details">detail</string>
+    <string name="Add_invoice">add invoice</string>
     <string name="Results_of_scan">Results</string>
-    <string name="Expense_reimbursement">Expense Reimbursement</string>
+    <string name="Expense_reimbursement">Reimbursement</string>
     <string name="RMB">RMB</string>
-    <string name="currency">currency</string>
+    <string name="currency">Currency</string>
     <string name="more_length">size exceeds the maximum length</string>
     <string name="work_name_not_be_null">Flight name cannot be empty</string>
 
@@ -1477,5 +1477,34 @@
     <string name="str_clear">清空</string>
     <string name="str_company_salary">Payroll</string>
     <!--工作台菜单-->
-
+    <string name="who_is_champion">is the champion</string>
+    <string name="all_Amount_of_money">total amount</string>
+
+    <string name="get_again">重新获取</string>
+    <string name="msg_send_success">短信发送成功,请在一分钟内完成输入查询</string>
+    <string name="input_search_date">请输入查询日期</string>
+    <string name="input_search_ycode">请输入验证码</string>
+    <string name="input_search_password">请输入查询密码</string>
+    <string name="please_settting_password">请设置至少6位数查询密码</string>
+    <string name="setting_password_success">设置密码成功</string>
+    <string name="code_outtime">验证码超时，请重新获取</string>
+    <string name="please_settting_password1">请输入6位数验证码</string>
+    <string name="get_code">获取验证码</string>
+    <string name="salary_search">工资查询</string>
+    <string name="cannot_sign">工资数据为空，无法签字</string>
+    <string name="input_your_error">请输入你的报错问题</string>
+    <string name="not_sign">您没有签名</string>
+    <string name="salary">工资</string>
+    <string name="send_error_ok">报错成功</string>
+    <string name="ss_send_success">工资条签名提交成功</string>
+    <string name="no_salary_data">暂无工资信息</string>
+    <string name="error_msg">报错信息</string>
+    <string name="salary_sign">签名</string>
+    <string name="confirm_phone">请确认手机号</string>
+    <string name="code_send_phone">验证码已发送至手机</string>
+    <string name="please_set_pw">请设置密码</string>
+    <string name="password">密码</string>
+    <string name="input_6_pw">请输入新密码(限6-20位)</string>
+    <string name="need_6_str">需6-20位字符</string>
+</resources>
 </resources>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1591,5 +1591,32 @@
     <string name="str_clear">清空</string>
     <string name="str_company_salary">工资条</string>
     <!--工作台菜单-->
-
+    <string name="who_is_champion">占领了封面</string>
+    <string name="get_again">重新获取</string>
+    <string name="msg_send_success">短信发送成功,请在一分钟内完成输入查询</string>
+    <string name="input_search_date">请输入查询日期</string>
+    <string name="input_search_ycode">请输入验证码</string>
+    <string name="input_search_password">请输入查询密码</string>
+    <string name="please_settting_password">请设置至少6位数查询密码</string>
+    <string name="setting_password_success">设置密码成功</string>
+    <string name="code_outtime">验证码超时，请重新获取</string>
+    <string name="please_settting_password1">请输入6位数验证码</string>
+    <string name="get_code">获取验证码</string>
+    <string name="salary_search">工资查询</string>
+    <string name="cannot_sign">工资数据为空，无法签字</string>
+    <string name="input_your_error">请输入你的报错问题</string>
+    <string name="not_sign">您没有签名</string>
+    <string name="salary">工资</string>
+    <string name="send_error_ok">报错成功</string>
+    <string name="ss_send_success">工资条签名提交成功</string>
+    <string name="no_salary_data">暂无工资信息</string>
+    <string name="error_msg">报错信息</string>
+    <string name="salary_sign">签名</string>
+    <string name="confirm_phone">请确认手机号</string>
+    <string name="code_send_phone">验证码已发送至手机</string>
+    <string name="please_set_pw">请设置密码</string>
+    <string name="password">密码</string>
+    <string name="input_6_pw">请输入新密码(限6-20位)</string>
+    <string name="need_6_str">需6-20位字符</string>
+</resources>
 </resources>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1578,5 +1578,34 @@
     <string name="str_clear">清空</string>
     <string name="str_company_salary">工資條</string>
     <!--工作台菜单-->
+    <string name="who_is_champion">佔領了封面</string>
+    <string name="all_Amount_of_money">總金額</string>
 
+
+    <string name="get_again">重新獲取</string>
+    <string name="msg_send_success">短信發送成功,請在一分鐘內完成輸入查詢</string>
+    <string name="input_search_date">請輸入查詢日期</string>
+    <string name="input_search_ycode">請輸入驗證碼</string>
+    <string name="input_search_password">請輸入查詢密碼</string>
+    <string name="please_settting_password">請設置至少6位數查詢密碼</string>
+    <string name="setting_password_success">設置密碼成功</string>
+    <string name="code_outtime">驗證碼超時，請重新獲取</string>
+    <string name="please_settting_password1">請輸入6位數驗證碼</string>
+    <string name="get_code">獲取驗證碼</string>
+    <string name="salary_search">工資查詢</string>
+    <string name="cannot_sign">工資數據為空，無法簽字</string>
+    <string name="input_your_error">請輸入你的報錯問題</string>
+    <string name="not_sign">您沒有簽名</string>
+    <string name="salary">工資</string>
+    <string name="send_error_ok">報錯成功</string>
+    <string name="ss_send_success">工資條簽名提交成功</string>
+    <string name="no_salary_data">暫無工資信息</string>
+    <string name="error_msg">報錯信息</string>
+    <string name="salary_sign">簽名</string>
+    <string name="confirm_phone">請確認手機號</string>
+    <string name="code_send_phone">驗證碼已發送至手機</string>
+    <string name="please_set_pw">請設置密碼</string>
+    <string name="password">密碼</string>
+    <string name="input_6_pw">請輸入新密碼(限6-20位)</string>
+    <string name="need_6_str">需6-20位字符</string>
 </resources>

app_core/common/src/main/res/values/strings.xml

@@ -1929,5 +1929,33 @@
     <string name="str_clear">清空</string>
     <string name="str_company_salary">工资条</string>
     <!--工作台菜单-->
-
+    <string name="who_is_champion">占领了封面</string>
+
+
+    <string name="get_again">重新获取</string>
+    <string name="msg_send_success">短信发送成功,请在一分钟内完成输入查询</string>
+    <string name="input_search_date">请输入查询日期</string>
+    <string name="input_search_ycode">请输入验证码</string>
+    <string name="input_search_password">请输入查询密码</string>
+    <string name="please_settting_password">请设置至少6位数查询密码</string>
+    <string name="setting_password_success">设置密码成功</string>
+    <string name="code_outtime">验证码超时，请重新获取</string>
+    <string name="please_settting_password1">请输入6位数验证码</string>
+    <string name="get_code">获取验证码</string>
+    <string name="salary_search">工资查询</string>
+    <string name="cannot_sign">工资数据为空，无法签字</string>
+    <string name="input_your_error">请输入你的报错问题</string>
+    <string name="not_sign">您没有签名</string>
+    <string name="salary">工资</string>
+    <string name="send_error_ok">报错成功</string>
+    <string name="ss_send_success">工资条签名提交成功</string>
+    <string name="no_salary_data">暂无工资信息</string>
+    <string name="error_msg">报错信息</string>
+    <string name="salary_sign">签名</string>
+    <string name="confirm_phone">请确认手机号</string>
+    <string name="code_send_phone">验证码已发送至手机</string>
+    <string name="please_set_pw">请设置密码</string>
+    <string name="password">密码</string>
+    <string name="input_6_pw">请输入新密码(限6-20位)</string>
+    <string name="need_6_str">需6-20位字符</string>
 </resources>

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -408,7 +408,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         String first_ranking_name = mStepsRankingBean.getToalrank().get(0).getAs_username();
         if (!StringUtil.isEmpty(first_ranking_imid) && !StringUtil.isEmpty(first_ranking_name)){
             AvatarHelper.getInstance().display(CommonUtil.getNumByString(first_ranking_imid) + "", first_ranking_im, true, false);//显示圆角图片
-            first_ranking_tv.setText(first_ranking_name+"获得了排行榜第一");
+            first_ranking_tv.setText(first_ranking_name+"\t" + getString(R.string.who_is_champion));
         }
         doPositionFocus();
     }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/CheckWagesActivity.java

@@ -74,7 +74,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
             super.handleMessage(msg);
             if (msg.what==1212){
                 SecondT--;
-                seconds_tv.setText("重新获取("+SecondT+"s)");
+                seconds_tv.setText(getString(R.string.get_again)+"("+SecondT+"s)");
                 if (SecondT==0) {
                     codeTimeOut = true;
                     seconds_tv.setVisibility(View.GONE);
@@ -242,7 +242,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                     LogUtil.prinlnLongMsg("verificationCode", o.toString()+"");
                     if (!JSONUtil.validate(o.toString()) || o == null) return;
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
-                        Toast.makeText(ct,"短信发送成功,请在一分钟内完成输入查询",Toast.LENGTH_LONG).show();
+                        Toast.makeText(ct,getString(R.string.msg_send_success),Toast.LENGTH_LONG).show();
                         codeTimeOut = false;
                         mWagesCodeBtn.setVisibility(View.GONE);
                         seconds_tv.setVisibility(View.VISIBLE);
@@ -255,13 +255,13 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
             }));
         }else if (id == R.id.check_btn){
             if (StringUtil.isEmpty(checkYear) || StringUtil.isEmpty(checkMonth)){
-                ToastMessage("请输入查询日期");
+                ToastMessage(getString(R.string.input_search_date));
                 return;
             }else if (StringUtil.isEmpty(mWagesCodeEt.getText().toString())){
-                ToastMessage("请输入验证码");
+                ToastMessage(getString(R.string.input_search_ycode));
                 return;
             }else if (StringUtil.isEmpty(mWagesPasswordEt.getText().toString())){
-                ToastMessage("请输入查询密码");
+                ToastMessage(getString(R.string.input_search_password));
                 return;
             }
             if (!CommonUtil.isNetWorkConnected(ct)){
@@ -273,11 +273,11 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
             popupWindow.dismiss();
         }else if (id == R.id.sure_btn){
             if (StringUtil.isEmpty(inputPSEt.getText().toString())){
-                ToastMessage("请输入查询密码");
+                ToastMessage(getString(R.string.input_search_password));
                 return;
             }
             if (inputPSEt.getText().toString().length()<6){
-                ToastMessage("请设置至少6位数查询密码");
+                ToastMessage(getString(R.string.please_settting_password));
                 return;
             }
             doSavePW();
@@ -315,7 +315,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
 
                 if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
-                    Toast.makeText(ct, "设置密码成功", Toast.LENGTH_LONG).show();
+                    Toast.makeText(ct, getString(R.string.setting_password_success), Toast.LENGTH_LONG).show();
                     popupWindow.dismiss();
                 }
 
@@ -325,7 +325,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
 
     private void searchWage() {
         if (codeTimeOut){
-            ToastMessage("验证码超时，请重新获取");
+            ToastMessage(getString(R.string.code_outtime));
             return;
         }
                 HttpClient httpClient = new HttpClient.Builder(CommonUtil.getAppBaseUrl(ct)).isDebug(true).build(true);

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FindWagePWActivity.java

@@ -130,7 +130,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                     LogUtil.prinlnLongMsg("verificationCode", o.toString()+"");
                     if (!JSONUtil.validate(o.toString()) || o == null) return;
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
-                        Toast.makeText(ct,"短信发送成功,请在一分钟内完成输入验证",Toast.LENGTH_LONG).show();
+                        Toast.makeText(ct,getString(R.string.msg_send_success),Toast.LENGTH_LONG).show();
 //                        mCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
                         showStepView(2);
                     }
@@ -139,17 +139,17 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
             }));
         }else if (id == R.id.next2_btn){
             if (StringUtil.isEmpty(mCodeEt.getText().toString())){
-                ToastMessage("请输入验证码");
+                ToastMessage(getString(R.string.input_search_ycode));
                 return;
             }
             showStepView(3);
         }else if (id == R.id.next3_btn){
             if (StringUtil.isEmpty(mSetpwEt.getText().toString())){
-                ToastMessage("请输入新密码");
+                ToastMessage(getString(R.string.please_input_new_password));
                 return;
             }
             if (mSetpwEt.getText().toString().length()<6){
-                ToastMessage("请设置至少6位数查询密码");
+                ToastMessage(getString(R.string.please_settting_password));
                 return;
             }
                 doChangePW();
@@ -188,7 +188,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
 
                 if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
-                    Toast.makeText(ct, "设置密码成功", Toast.LENGTH_LONG).show();
+                    Toast.makeText(ct, getString(R.string.setting_password_success), Toast.LENGTH_LONG).show();
                     finish();
                 }
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -214,7 +214,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 //        emcode = "U0747";
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
 
-        getSupportActionBar().setTitle("工资查询");
+        getSupportActionBar().setTitle(getString(R.string.salary_search));
 
         mWagesLv = (MyListView) findViewById(R.id.wages_lv);
         wages_ll = (LinearLayout) findViewById(R.id.wages_ll);
@@ -263,7 +263,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     public void onClick(View v) {
         if (v.getId() == R.id.btn_signature){
             if (!haveData){
-                ToastMessage("工资数据为空，无法签字");
+                ToastMessage(getString(R.string.cannot_sign));
                 return;
             }
             if (needSignature == 1)
@@ -293,11 +293,11 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     e.printStackTrace();
                 }
             }else {
-                Toast.makeText(this,"您没有签名~", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this,getString(R.string.not_sign)+"~", Toast.LENGTH_SHORT).show();
             }
         }else if (v.getId() == R.id.sure_tv){
             if (StringUtil.isEmpty(msg_et.getText().toString())){
-                ToastMessage("请输入你的报错问题");
+                ToastMessage(getString(R.string.input_your_error));
                 return;
             }
             if (!CommonUtil.isNetWorkConnected(ct)){
@@ -317,7 +317,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     String myearmonth =  year + "年" + month+"月";
                     checkYear = year;
                     checkMonth = month;
-                    wageDateTv.setText(myearmonth+"工资");
+                    wageDateTv.setText(myearmonth+getString(R.string.salary));
                     searchWage();
                 }
             });
@@ -383,7 +383,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("salaryWrong", o.toString()+"");
                 if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
-                    ToastMessage("报错成功");
+                    ToastMessage(getString(R.string.send_error_ok));
                     mBtnSignature.setVisibility(View.GONE);
                     error_ll.setVisibility(View.VISIBLE);
                     error_tv.setText(msg_et.getText().toString());
@@ -427,7 +427,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
                 Log.i("doNewSubmit",JSON.parseObject(responseInfo.result).toJSONString());
                 if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
-                    Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
+                    Toast.makeText(ct,getString(R.string.ss_send_success),Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
                     mBtnSignature.setVisibility(View.GONE);
                     errorgone = true;
@@ -473,7 +473,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 LogUtil.prinlnLongMsg("salaryBack", o.toString()+"");
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 if (JSONUtil.validate(o.toString()) && o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
-                    Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
+                    Toast.makeText(ct,getString(R.string.ss_send_success),Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
                     mBtnSignature.setVisibility(View.GONE);
                     errorgone = true;

app_modular/appme/src/main/res/layout/check_wages_activity.xml

@@ -14,7 +14,7 @@
         android:layout_marginRight="10dp"
         android:drawableRight="@drawable/oa_next"
         android:textSize="15sp"
-        android:hint="请选择查询日期"
+        android:hint="@string/input_search_date"
         android:textColor="#333333"/>
     <View
         android:layout_width="match_parent"
@@ -28,7 +28,7 @@
         android:padding="10dp"
         android:layout_centerVertical="true"
         android:background="@null"
-        android:hint="请输入手机号码"
+        android:hint="@string/please_input_phone_number"
         android:textSize="15sp"
         android:gravity="center_vertical"
         android:inputType="number"
@@ -65,7 +65,7 @@
             android:padding="10dp"
             android:layout_centerVertical="true"
             android:background="@null"
-            android:hint="请输入查询密码"
+            android:hint="@string/input_search_password"
             android:textSize="15sp"
             android:gravity="center_vertical"
             android:inputType="textPassword"
@@ -91,7 +91,7 @@
             android:padding="10dp"
             android:layout_centerVertical="true"
             android:background="@null"
-            android:hint="请输入6位数验证码"
+            android:hint="@string/please_settting_password1"
             android:textSize="15sp"
             android:gravity="center_vertical"
             android:maxLength="6"
@@ -100,7 +100,7 @@
         <Button
             android:id="@+id/wages_code_btn"
             android:padding="2dp"
-            android:text="获取验证码"
+            android:text="@string/get_code"
             android:textColor="@color/white"
             android:textSize="13sp"
             android:layout_alignParentRight="true"
@@ -139,7 +139,7 @@
         android:layout_width="wrap_content"
         android:layout_height="45dp"
         android:padding="10dp"
-        android:text="忘记密码?"
+        android:text="@string/login_losspwd"
         android:textColor="#2f95dd"
         android:textSize="12sp"
         android:layout_alignParentRight="true"
@@ -155,7 +155,7 @@
         android:layout_alignParentBottom="true"
         android:background="@drawable/bg_bule_btn"
         android:padding="10dp"
-        android:text="查询"
+        android:text="@string/client_search"
         android:textColor="@color/white"
         android:textSize="@dimen/text_main"
         android:visibility="visible"/>

app_modular/appme/src/main/res/layout/wage_forgetps.xml

@@ -21,14 +21,14 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="请确认手机号"
+                    android:text="@string/confirm_phone"
                     android:textSize="20sp"
                     android:textColor="@color/black"/>
                 <TextView
                     android:layout_marginTop="30dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="手机号码"/>
+                    android:text="@string/telephone"/>
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -40,7 +40,7 @@
                         android:background="@null"
                         android:layout_width="250dp"
                         android:layout_height="wrap_content"
-                        android:hint="请输入手机号"
+                        android:hint="@string/input_phone_number"
                         android:padding="1dp"
                         android:textSize="16sp"
                         android:maxLength="11"
@@ -84,7 +84,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="请输入验证码"
+                    android:text="@string/input_search_ycode"
                     android:textSize="20sp"
                     android:textColor="@color/black"/>
                 <LinearLayout
@@ -94,7 +94,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="验证码已发送至手机："/>
+                        android:text="@string/code_send_phone"/>
                     <TextView
                         android:id="@+id/tel_tv"
                         android:layout_marginLeft="10dp"
@@ -109,7 +109,7 @@
                     android:background="@null"
                     android:layout_width="250dp"
                     android:layout_height="wrap_content"
-                    android:hint="请输入验证码"
+                    android:hint="@string/please_input_auth_code"
                     android:textSize="16sp"
                     android:maxLength="11"
                     android:inputType="number"
@@ -122,7 +122,7 @@
                 <Button
                     android:id="@+id/next2_btn"
                     android:layout_marginTop="20dp"
-                    android:text="下一步"
+                    android:text="@string/next_step"
                     android:layout_gravity="center_horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
@@ -141,14 +141,14 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="请设置密码"
+                    android:text="@string/delete"
                     android:textSize="20sp"
                     android:textColor="@color/black"/>
                 <TextView
                     android:layout_marginTop="30dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="密码"/>
+                    android:text="@string/password"/>
 
                 <RelativeLayout
                     android:layout_marginTop="10dp"
@@ -159,7 +159,7 @@
                         android:background="@null"
                         android:layout_width="250dp"
                         android:layout_height="wrap_content"
-                        android:hint="请输入新密码(限6-20位)"
+                        android:hint="@string/input_6_pw"
                         android:textSize="16sp"
                         android:maxLength="15"
                         android:inputType="textPassword"
@@ -186,11 +186,11 @@
                     android:textColor="@color/titleBlue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="需6-20位字符"/>
+                    android:text="@string/need_6_str"/>
                 <Button
                     android:id="@+id/next3_btn"
                     android:layout_marginTop="20dp"
-                    android:text="下一步"
+                    android:text="@string/next_step"
                     android:layout_gravity="center_horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"

app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -123,7 +123,7 @@
                     />
                 <TextView
                     android:padding="5dp"
-                    android:text="暂无工资信息"
+                    android:text="@string/no_salary_data"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>
@@ -137,7 +137,7 @@
                 android:background="@color/white"
                 >
                 <TextView
-                    android:text="报错信息"
+                    android:text="@string/error_msg"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
@@ -168,7 +168,7 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
-                    android:text="签名"
+                    android:text="@string/salary_sign"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_main"
                     android:layout_weight="1"

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ProcessMsgActivity.java

@@ -33,7 +33,6 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;