16:22

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

@@ -1423,6 +1423,42 @@
     <string name = "input_phone_number"> Please enter the phone number </string>
     <string name = "input_name"> Please enter a name </string>
 
-    <string name="sales_statistics">销售看板</string>
+    <string name="sales_statistics">Sales kanban</string>
 
+    <string name="who_is_champion">is the champion</string>
+    <string name="all_Amount_of_money">total amount</string>
+
+    <string name="get_again">get again</string>
+    <string name="msg_send_success">SMS sent successfully, please complete the query within one minute</string>
+    <string name="input_search_date">Please enter the inquiry date</string>
+    <string name="input_search_ycode">please enter verification code</string>
+    <string name="input_search_password">please input the query password</string>
+    <string name="please_settting_password">Please set at least 6 digits to check the password</string>
+    <string name="setting_password_success">Set the password successfully</string>
+    <string name="code_outtime">Verification code timeout, please obtain again</string>
+    <string name="please_settting_password1">Please input the 6 digit verification code
+</string>
+    <string name="get_code">get VCode</string>
+    <string name="salary_search">Salary inquiry</string>
+    <string name="cannot_sign">Wage data is blank and can not be signed</string>
+    <string name="input_your_error">Please enter your error problem</string>
+    <string name="not_sign">You do not have a signature</string>
+    <string name="salary">wage</string>
+    <string name="send_error_ok">Error reported</string>
+    <string name="ss_send_success">Payroll signature submitted successfully</string>
+    <string name="no_salary_data">No salary information</string>
+    <string name="error_msg">No salary information</string>
+    <string name="salary_sign">sign</string>
+    <string name="confirm_phone">Please confirm the phone number</string>
+    <string name="code_send_phone">The verification code has been sent to the cell phone</string>
+    <string name="please_set_pw">Please set a password</string>
+    <string name="password">password</string>
+    <string name="input_6_pw">Please enter a new password (6-20 limit)</string>
+    <string name="need_6_str">6-20 characters are required</string>
+    <string name="firstused_setpw">for the first time, please set the password
+</string>
+    <string name="input_qpw">please input the query password(limit 20 characters)</string>
+    <string name="next_step">next step</string>
+    <string name="change_qpw">modify the query password </string>
+    <string name = "telephone"> phone number </ string>
 </resources>

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

@@ -1537,5 +1537,35 @@
     <string name="input_name">请输入姓名</string>
 
     <string name="sales_statistics">销售看板</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>
+    <string name="firstused_setpw">首次使用，请设置密码</string>
+    <string name="input_qpw">请输入查询密码(限20位)</string>
 </resources>

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

@@ -1525,5 +1525,39 @@
     <string name="input_name">請輸入姓名</string>
 
     <string name="sales_statistics">销售看板</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>
+    <string name="firstused_setpw">首次使用，請設置密碼</string>
+    <string name="input_qpw">請輸入查詢密碼(限20位)</string>
+    <string name="next_step">下一步</string>
+    <string name="change_qpw">修改查询密码</string>
+    <string name="telephone">手機號碼</string>
 </resources>

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

@@ -1870,4 +1870,38 @@
     <string name="input_name">请输入姓名</string>
 
     <string name="sales_statistics">销售看板</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>
+    <string name="firstused_setpw">首次使用，请设置密码</string>
+    <string name="input_qpw">请输入查询密码(限20位)</string>
 </resources>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Feb 02 16:15:26 CST 2018
-debugName=201
+#Tue Feb 06 16:12:31 CST 2018
+debugName=210
 versionName=616
-debugCode=201
+debugCode=210
 versionCode=155

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

@@ -1480,31 +1480,38 @@
     <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>
+    <string name="get_again">get again</string>
+    <string name="msg_send_success">SMS sent successfully, please complete the query within one minute</string>
+    <string name="input_search_date">Please enter the inquiry date</string>
+    <string name="input_search_ycode">please enter verification code</string>
+    <string name="input_search_password">please input the query password</string>
+    <string name="please_settting_password">Please set at least 6 digits to check the password</string>
+    <string name="setting_password_success">Set the password successfully</string>
+    <string name="code_outtime">Verification code timeout, please obtain again</string>
+    <string name="please_settting_password1">Please input the 6 digit verification code
+</string>
+    <string name="get_code">get VCode</string>
+    <string name="salary_search">Salary inquiry</string>
+    <string name="cannot_sign">Wage data is blank and can not be signed</string>
+    <string name="input_your_error">Please enter your error problem</string>
+    <string name="not_sign">You do not have a signature</string>
+    <string name="salary">wage</string>
+    <string name="send_error_ok">Error reported</string>
+    <string name="ss_send_success">Payroll signature submitted successfully</string>
+    <string name="no_salary_data">No salary information</string>
+    <string name="error_msg">No salary information</string>
+    <string name="salary_sign">sign</string>
+    <string name="confirm_phone">Please confirm the phone number</string>
+    <string name="code_send_phone">The verification code has been sent to the cell phone</string>
+    <string name="please_set_pw">Please set a password</string>
+    <string name="password">password</string>
+    <string name="input_6_pw">Please enter a new password (6-20 limit)</string>
+    <string name="need_6_str">6-20 characters are required</string>
+    <string name="firstused_setpw">for the first time, please set the password
+</string>
+    <string name="input_qpw">please input the query password(limit 20 characters)</string>
+    <string name="next_step">next step</string>
+    <string name="change_qpw">modify the query password </string>
+    <string name = "telephone"> phone number </ string>
+
 </resources>
-</resources>

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

@@ -1618,5 +1618,8 @@
     <string name="password">密码</string>
     <string name="input_6_pw">请输入新密码(限6-20位)</string>
     <string name="need_6_str">需6-20位字符</string>
+    <string name="firstused_setpw">首次使用，请设置密码</string>
+    <string name="input_qpw">请输入查询密码(限20位)</string>
+    <string name="change_qpw">修改查詢密碼</string>
+    <string name="next_step">下一步</string>
 </resources>
-</resources>

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

@@ -1608,4 +1608,7 @@
     <string name="password">密碼</string>
     <string name="input_6_pw">請輸入新密碼(限6-20位)</string>
     <string name="need_6_str">需6-20位字符</string>
+    <string name="firstused_setpw">首次使用，請設置密碼</string>
+    <string name="input_qpw">請輸入查詢密碼(限20位)</string>
+    <string name="next_step">下一步</string>
 </resources>

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

@@ -1958,4 +1958,6 @@
     <string name="password">密码</string>
     <string name="input_6_pw">请输入新密码(限6-20位)</string>
     <string name="need_6_str">需6-20位字符</string>
+    <string name="firstused_setpw">首次使用，请设置密码</string>
+    <string name="input_qpw">请输入查询密码(限20位)</string>
 </resources>

app_modular/appme/src/main/AndroidManifest.xml

@@ -82,6 +82,6 @@
         <activity android:name=".settings.activity.TableSetActivity"/>
         <activity android:name=".settings.activity.TableListActivity"/>
         <activity android:name=".settings.activity.FindWagePWActivity"
-            android:label="修改查询密码"/>
+            android:label="@string/change_qpw"/>
     </application>
 </manifest>

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

@@ -124,7 +124,6 @@
             android:layout_marginTop="10dp"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
-            android:text="重新获取(59s)"
             />
 
 

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

@@ -13,7 +13,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="首次使用，请设置密码"
+            android:text="@string/firstused_setpw"
             android:textSize="16sp"
             />
 
@@ -38,7 +38,7 @@
             android:background="@null"
             android:layout_width="250dp"
             android:layout_height="wrap_content"
-            android:hint="请输入查询密码(限20位)"
+            android:hint="@string/input_qpw"
             android:textSize="16sp"
             android:maxLength="20"
             android:inputType="textPassword"
@@ -61,7 +61,7 @@
    <Button
        android:layout_marginTop="10dp"
        android:id="@+id/sure_btn"
-       android:text="确认"
+       android:text="@string/app_dialog_ok"
        android:layout_gravity="center_horizontal"
        android:layout_width="150dp"
        android:layout_height="40dp"

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

@@ -65,7 +65,7 @@
                 <Button
                     android:id="@+id/next1_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"