Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/src/main/res/values-zh-rCN/strings.xml
#	WeiChat/version.properties

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

@@ -208,7 +208,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="商家设置"
+                    android:text="@string/business_setting"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView

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

@@ -585,8 +585,8 @@
         <string name = "me"> Me </string>
 
         <string name = "msg_title"> message </string>
-        <string name = "msg_approval"> my reviews </string>
-        <string name = "msg_work"> undone work </string>
+        <string name = "msg_approval"> Approval Workflow </string>
+        <string name = "msg_work"> Backlog </string>
         <string name = "msg_subscribe"> Subscription </string>
         <string name = "friendly_time_just_now"> just </string>
         <string name = "mark_readed"> marked as unread </string>
@@ -1423,7 +1423,7 @@
     <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>
 
 
     //商旅服务
@@ -1451,4 +1451,106 @@
     <string name="text_cycle_count_add">add Cycle</string>
     <string name="more_info"><u>more info</u></string>
     <string name="cycle">Cycle</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>
+
+        <string name = "business_setting"> Merchant Settings </string>
+        <string name = "ranking"> leaderboard </string>
+        <string name = "information_photo"> image photo </string>
+        <string name = "set_e_relax"> Set employee rest days </string>
+        <string name = "set_c_relax"> Set business day </string>
+        <string name = "set_location"> set service / site / room </string>
+        <string name = "click_change_img"> click to change photo </string>
+        <string name = "cur_no_room"> Department / department </string> has not been obtained yet
+        <string name = "select_room"> select department </string>
+        <string name = "please_add_headerimg"> Please add photo </string>
+        <string name = "room"> department </string>
+        <string name = "tel_number"> number </string>
+        <string name = "input_name_date"> Please enter a full name / rest date </string>
+        <string name = "hava_save_detail"> There is duplicate item details </string>
+        <string name = "input_person_name"> Please enter the person name </string>
+        <string name = "cannot_select_beforedate"> Can not select past time </string>
+        <string name = "relax_time_rapeat"> rest time is not repeatable </string>
+        <string name = "input_all_date"> Please enter the complete rest date </string>
+        <string name = "update_room"> Update Service / Site / Room </string>
+        <string name = "input_name1"> Please enter a name </string>
+        <string name = "add_img"> Please add photos </string>
+        <string name = "please_input_room"> Please enter service / site / room name </string>
+        <string name = "please_input_time"> Please enter the service time / minute </string>
+        <string name = "add"> New </string>
+        <string name = "setting_worktime"> set business hours </string>
+        <string name = "setting_time_type"> Set the reservation time type </string>
+        <string name = "business_detail1"> business details </string>
+        <string name = "room_type"> Set private room reservation type </string>
+        <string name = "please_select_room_type"> Please select Private Reservation </string>
+        <string name = "please_input_bdi"> Please enter Merchant Listing </string>
+        <string name = "unlaw_str"> Contains a violation character </string>
+        <string name = "select_bookT_type"> Please select the reservation time type </string>
+        <string name = "time_canot_empty"> The time period can not be empty </string>
+        <string name = "booking_times"> time period: </string>
+        <string name = "book_time_type"> reservation time type </string>
+        <string name = "time_d"> by time </string>
+        <string name = "time_p"> by time </string>
+        <string name = "room_book_type"> </string>
+        <string name = "zzw"> early midnight </string>
+        <string name = "zw"> midnight </string>
+        <string name = "please_inpuy_bi"> Please enter the merchant details introduction limit 400 words </string>
+        <string name = "table_set"> table setting </string>
+        <string name = "net_expection"> Server Error Please try again later </string>
+        <string name = "input_all_msg"> Please drop all settings </string>
+        <string name = "table_setting"> table setting </string>
+        <string name = "pi_tablecode"> Please enter the table code </string>
+        <string name = "pi_number"> Please enter the number </string>
+        <string name = "pi_remark"> Please enter a comment </string>
+        <string name = "pi_bookdays"> Please enter the amount can be reserved / day </string>
+        <string name = "pi_seatnumber"> Please enter the maximum number of seats </string>
+        <string name = "pi_tabletype"> Please select the table type </string>
+        <string name = "b_table"> big table </string>
+        <string name = "m_table"> table </string>
+        <string name = "s_table"> little table </string>
+        <string name = "table_repeat"> table can not be set repeatedly </string>
+         <string name = "room_set"> department settings </string>
+         <string name = "person_set"> Personnel Settings </string>
+         <string name = "e_relax_set"> Staff rest day settings </string>
+         <string name = "person_list"> list of people </string>
+         <string name = "e_relaxday"> employee rest day </string>
+         <string name = "c_relaxday"> business break </string>
+         <string name = "room_location"> service / site / room </string>
+         <string name = "relax_time"> rest time </string>
+         <string name = "booking_time_set"> reservation time period setting </string>
+         <string name = "enter_details_money"> Please enter the details amount </string>
 </resources>

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

@@ -1537,6 +1537,98 @@
     <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>
+
+    <!--start 商家设置-->
+    <string name="business_setting">商家设置</string>
+    <string name="ranking">排行榜</string>
+    <string name="information_photo">形象照片</string>
+    <string name="set_e_relax">设置员工休息日</string>
+    <string name="set_c_relax">设置企业休息日</string>
+    <string name="set_location">设置服务/场地/房间</string>
+    <string name="click_change_img">点击更换照片</string>
+    <string name="cur_no_room">暂未获取到部门/科室</string>
+    <string name="select_room">选择科室</string>
+    <string name="please_add_headerimg">请添加头像照片</string>
+    <string name="room">科室</string>
+    <string name="tel_number">号码</string>
+    <string name="input_name_date">请输入完整姓名/休息日期</string>
+    <string name="hava_save_detail">存在重复的条目明细</string>
+    <string name="input_person_name">请输入人员名称</string>
+    <string name="cannot_select_beforedate">不可选择过去时间</string>
+    <string name="relax_time_rapeat">休息时间不可重复</string>
+    <string name="input_all_date">请输入完整休息日期</string>
+    <string name="update_room">更新服务/场地/房间</string>
+    <string name="input_name1">请输入名称</string>
+    <string name="add_img">请添加照片</string>
+    <string name="please_input_room">请输入服务/场地/房间名称</string>
+    <string name="please_input_time">请输入服务时间/分钟</string>
+    <string name="setting_worktime">设置营业时间</string>
+    <string name="setting_time_type">设置预约时间类型</string>
+    <string name="business_detail1">商家详情</string>
+    <string name="room_type">设置包房预订类型</string>
+    <string name="please_select_room_type">请选择包房预订类型</string>
+    <string name="please_input_bdi">请输入商家详情介绍</string>
+    <string name="unlaw_str">含违规字符</string>
+    <string name="select_bookT_type">请选择预约时间类型</string>
+    <string name="time_canot_empty">时间段不能为空</string>
+    <string name="booking_times">时间段：</string>
+    <string name="book_time_type">预约时间类型</string>
+    <string name="time_d">按时间段</string>
+    <string name="time_p">按时间点</string>
+    <string name="room_book_type"></string>
+    <string name="zzw">早中晚</string>
+    <string name="zw">中晚</string>
+    <string name="please_inpuy_bi">请输入商家详情介绍限400字</string>
+    <string name="table_set">桌位设置</string>
+    <string name="net_expection">服务器异常请稍后再试</string>
+    <string name="input_all_msg">请输全设置信息</string>
+    <string name="table_setting">桌位设置</string>
+    <string name="pi_tablecode">请输入桌位代码</string>
+    <string name="pi_number">请输入数量</string>
+    <string name="pi_remark">请输入备注</string>
+    <string name="pi_bookdays">请输入可被预约量/天</string>
+    <string name="pi_seatnumber">请输入最多可坐人数</string>
+    <string name="pi_tabletype">请选择桌位类型</string>
+    <string name="b_table">大桌</string>
+    <string name="m_table">中桌</string>
+    <string name="s_table">小桌</string>
+    <string name="table_repeat">桌位不可重复设置</string>
+    <string name="room_set">科室设置</string>
+    <string name="person_set">人员设置</string>
+    <string name="e_relax_set">员工休息日设置</string>
+    <string name="change_qpw">修改查询密码</string>
+
     //商旅服务
     <string name="business_services">商旅服务</string>
 </resources>

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

@@ -1525,5 +1525,106 @@
     <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>
+
+    <!--start 商家設置-->
+        <string name="business_setting">商家設置</string>
+        <string name="ranking">排行榜</string>
+        <string name="information_photo">形象照片</string>
+        <string name="set_e_relax">設置員工休息日</string>
+        <string name="set_c_relax">設置企業休息日</string>
+        <string name="set_location">設置服務/場地/房間</string>
+        <string name="click_change_img">點擊更換照片</string>
+        <string name="cur_no_room">暫未獲取到部門/科室</string>
+        <string name="select_room">選擇科室</string>
+        <string name="please_add_headerimg">請添加頭像照片</string>
+        <string name="room">科室</string>
+        <string name="tel_number">號碼</string>
+        <string name="input_name_date">請輸入完整姓名/休息日期</string>
+        <string name="hava_save_detail">存在重複的條目明細</string>
+        <string name="input_person_name">請輸入人員名稱</string>
+        <string name="cannot_select_beforedate">不可選擇過去時間</string>
+        <string name="relax_time_rapeat">休息時間不可重複</string>
+        <string name="input_all_date">請輸入完整休息日期</string>
+        <string name="update_room">更新服務/場地/房間</string>
+        <string name="input_name1">請輸入名稱</string>
+        <string name="add_img">請添加照片</string>
+        <string name="please_input_room">請輸入服務/場地/房間名稱</string>
+        <string name="please_input_time">請輸入服務時間/分鐘</string>
+        <string name="add">新增</string>
+        <string name="setting_worktime">設置營業時間</string>
+        <string name="setting_time_type">設置預約時間類型</string>
+        <string name="business_detail1">商家詳情</string>
+        <string name="room_type">設置包房預訂類型</string>
+        <string name="please_select_room_type">請選擇包房預訂類型</string>
+        <string name="please_input_bdi">請輸入商家詳情介紹</string>
+        <string name="unlaw_str">含違規字符</string>
+        <string name="select_bookT_type">請選擇預約時間類型</string>
+        <string name="time_canot_empty">時間段不能為空</string>
+        <string name="booking_times">時間段：</string>
+        <string name="book_time_type">預約時間類型</string>
+        <string name="time_d">按時間段</string>
+        <string name="time_p">按時間點</string>
+        <string name="room_book_type"></string>
+        <string name="zzw">早中晚</string>
+        <string name="zw">中晚</string>
+        <string name="please_inpuy_bi">請輸入商家詳情介紹限400字</string>
+        <string name="table_set">桌位設置</string>
+        <string name="net_expection">服務器異常請稍後再試</string>
+        <string name="input_all_msg">請輸全設置信息</string>
+        <string name="table_setting">桌位設置</string>
+        <string name="pi_tablecode">請輸入桌位代碼</string>
+        <string name="pi_number">請輸入數量</string>
+        <string name="pi_remark">請輸入備註</string>
+        <string name="pi_bookdays">請輸入可被預約量/天</string>
+        <string name="pi_seatnumber">請輸入最多可坐人數</string>
+        <string name="pi_tabletype">請選擇桌位類型</string>
+        <string name="b_table">大桌</string>
+        <string name="m_table">中桌</string>
+        <string name="s_table">小桌</string>
+        <string name="table_repeat">桌位不可重複設置</string>
+        <string name="room_set">科室設置</string>
+        <string name="person_set">人員設置</string>
+        <string name="e_relax_set">員工休息日設置</string>
+        <string name="person_list">人員列表</string>
+        <string name="e_relaxday">員工休息日</string>
+        <string name="c_relaxday">企業休息日</string>
+        <string name="room_location">服務/場地/房間</string>
+        <string name="relax_time">休息時間</string>
+        <string name="enter_details_money">請輸入明細金額</string>
+    <!--end s商家设置-->
 </resources>

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

@@ -1837,7 +1837,6 @@
     <string name="booking_me">我的预约</string>
     <string name="booking_shared">预约共享</string>
     <string name="booking_time_set">预约时间段设置</string>
-    <string name="booking_times">时间段：</string>
 
     <string name="booking_add">预约计划</string>
     <string name="select_share_friend">分享好友</string>
@@ -1898,4 +1897,103 @@
     <string name="text_cycle_count_add">添加盘点</string>
     <string name="more_info"><u>详细信息</u></string>
     <string name="cycle">盘点</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>
+
+
+    <!--start 商家设置-->
+    <string name="business_setting">商家设置</string>
+    <string name="ranking">排行榜</string>
+    <string name="information_photo">形象照片</string>
+    <string name="set_e_relax">设置员工休息日</string>
+    <string name="set_c_relax">设置企业休息日</string>
+    <string name="set_location">设置服务/场地/房间</string>
+    <string name="click_change_img">点击更换照片</string>
+    <string name="cur_no_room">暂未获取到部门/科室</string>
+    <string name="select_room">选择科室</string>
+    <string name="please_add_headerimg">请添加头像照片</string>
+    <string name="room">科室</string>
+    <string name="tel_number">号码</string>
+    <string name="input_name_date">请输入完整姓名/休息日期</string>
+    <string name="hava_save_detail">存在重复的条目明细</string>
+    <string name="input_person_name">请输入人员名称</string>
+    <string name="cannot_select_beforedate">不可选择过去时间</string>
+    <string name="relax_time_rapeat">休息时间不可重复</string>
+    <string name="input_all_date">请输入完整休息日期</string>
+    <string name="update_room">更新服务/场地/房间</string>
+    <string name="input_name1">请输入名称</string>
+    <string name="add_img">请添加照片</string>
+    <string name="please_input_room">请输入服务/场地/房间名称</string>
+    <string name="please_input_time">请输入服务时间/分钟</string>
+    <string name="setting_worktime">设置营业时间</string>
+    <string name="setting_time_type">设置预约时间类型</string>
+    <string name="business_detail1">商家详情</string>
+    <string name="room_type">设置包房预订类型</string>
+    <string name="please_select_room_type">请选择包房预订类型</string>
+    <string name="please_input_bdi">请输入商家详情介绍</string>
+    <string name="unlaw_str">含违规字符</string>
+    <string name="select_bookT_type">请选择预约时间类型</string>
+    <string name="time_canot_empty">时间段不能为空</string>
+    <string name="booking_times">时间段：</string>
+    <string name="book_time_type">预约时间类型</string>
+    <string name="time_d">按时间段</string>
+    <string name="time_p">按时间点</string>
+    <string name="room_book_type"></string>
+    <string name="zzw">早中晚</string>
+    <string name="zw">中晚</string>
+    <string name="please_inpuy_bi">请输入商家详情介绍限400字</string>
+    <string name="table_set">桌位设置</string>
+    <string name="net_expection">服务器异常请稍后再试</string>
+    <string name="input_all_msg">请输全设置信息</string>
+    <string name="table_setting">桌位设置</string>
+    <string name="pi_tablecode">请输入桌位代码</string>
+    <string name="pi_number">请输入数量</string>
+    <string name="pi_remark">请输入备注</string>
+    <string name="pi_bookdays">请输入可被预约量/天</string>
+    <string name="pi_seatnumber">请输入最多可坐人数</string>
+    <string name="pi_tabletype">请选择桌位类型</string>
+    <string name="b_table">大桌</string>
+    <string name="m_table">中桌</string>
+    <string name="s_table">小桌</string>
+    <string name="table_repeat">桌位不可重复设置</string>
+    <string name="room_set">科室设置</string>
+    <string name="person_set">人员设置</string>
+    <string name="e_relax_set">员工休息日设置</string>
+    <string name="person_list">人员列表</string>
+    <string name="e_relaxday">员工休息日</string>
+    <string name="c_relaxday">企业休息日</string>
+    <string name="room_location">服务/场地/房间</string>
+    <string name="relax_time">休息时间</string>
 </resources>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 08 15:59:40 CST 2018
-debugName=242
-versionName=619
-debugCode=242
-versionCode=158
+#Thu Feb 08 15:51:55 CST 2018
+debugName=238
+versionName=620
+debugCode=238
+versionCode=159

app_core/common/src/main/res/layout/activity_setting.xml

@@ -208,7 +208,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="商家设置"
+                    android:text="@string/business_setting"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView

app_core/common/src/main/res/layout/bsetting_activity.xml

@@ -26,7 +26,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="形象照片"
+                    android:text="@string/information_photo"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -65,7 +65,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="科室设置"
+                    android:text="@string/room_set"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -91,7 +91,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="人员设置"
+                    android:text="@string/person_set"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -117,7 +117,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="设置服务/场地/房间"
+                    android:text="@string/set_location"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -150,7 +150,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:gravity="center"
-                        android:text="员工休息日设置"
+                        android:text="@string/set_e_relax"
                         android:textColor="@color/black"
                         android:textSize="14sp" />
 
@@ -180,7 +180,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="设置员工休息日"
+                    android:text="@string/set_e_relax"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -207,7 +207,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="设置企业休息日"
+                    android:text="@string/set_c_relax"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -233,7 +233,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="设置营业时间"
+                    android:text="@string/setting_worktime"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -259,7 +259,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="设置预约时间类型"
+                    android:text="@string/setting_time_type"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -286,7 +286,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="设置包房预订类型"
+                    android:text="@string/room_type"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -314,7 +314,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="桌位设置"
+                    android:text="@string/table_set"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView
@@ -341,7 +341,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="商家详情"
+                    android:text="@string/business_detail1"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
                 <ImageView

app_core/common/src/main/res/layout/image_setting_activity.xml

@@ -16,7 +16,7 @@
         android:id="@+id/image_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="点击更换照片"
+        android:text="@string/click_change_img"
         android:textColor="@color/blue"
         android:layout_marginBottom="143dp"
         android:layout_centerHorizontal="true"
@@ -43,7 +43,7 @@
             android:layout_marginTop="10dp"
             android:background="@drawable/bg_bule_btn"
             android:padding="10dp"
-            android:text="@string/save"
+            android:text="@string/common_save_button"
             android:textColor="@color/white"
             android:textSize="@dimen/text_main" />
     </LinearLayout>

app_core/common/src/main/res/layout/person_setting_activity.xml

@@ -22,7 +22,7 @@
                 <TextView
                     style="@style/form_relative_left_text"
                     android:id="@+id/name_tv"
-                    android:text="姓名"
+                    android:text="@string/name"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
                     android:textSize="15sp"/>
@@ -56,7 +56,7 @@
                 >
                 <TextView
                     style="@style/form_relative_left_text"
-                    android:text="性别"
+                    android:text="@string/user_sex"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
@@ -88,7 +88,7 @@
                 <TextView
                     android:id="@+id/user_department_tv"
                     style="@style/form_relative_left_text"
-                    android:text="科室"
+                    android:text="@string/room"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
                     android:textSize="15sp"/>
@@ -118,7 +118,7 @@
 
                 <TextView
                     style="@style/form_relative_left_text"
-                    android:text="职位"
+                    android:text="@string/user_position"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
@@ -152,7 +152,7 @@
                 <TextView
                     android:id="@+id/tel_tv"
                     style="@style/form_relative_left_text"
-                    android:text="号码"
+                    android:text="@string/tel_number"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
                     android:textSize="15sp"/>
@@ -185,7 +185,7 @@
                 <TextView
                     android:id="@+id/email_tv"
                     style="@style/form_relative_left_text"
-                    android:text="邮箱"
+                    android:text="@string/user_email"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
                     android:textSize="15sp"/>
@@ -222,7 +222,7 @@
                 <TextView
                     android:id="@+id/image_tv"
                     style="@style/form_relative_left_text"
-                    android:text="头像"
+                    android:text="@string/user_images"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
                     android:textSize="15sp"
@@ -232,7 +232,7 @@
                     android:id="@+id/image_tv_"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="点击更换照片"
+                    android:text="@string/click_change_img"
                     android:padding="10dp"
                     android:textColor="@color/blue"
                     android:textSize="18sp"
@@ -263,7 +263,7 @@
                     android:layout_marginTop="50dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
-                    android:text="@string/save"
+                    android:text="@string/common_save_button"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_main"/>
                 <Button

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

@@ -1434,9 +1434,9 @@
     <string name="Consumer_details">Consumer details</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>
 
@@ -1529,5 +1529,108 @@
 
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">Payroll</string>
-</resources>
+    <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">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>
+
+
+    <string name = "business_setting"> Merchant Settings </string>
+        <string name = "ranking"> leaderboard </string>
+        <string name = "information_photo"> image photo </string>
+        <string name = "set_e_relax"> Set employee rest days </string>
+        <string name = "set_c_relax"> Set business day </string>
+        <string name = "set_location"> set service / site / room </string>
+        <string name = "click_change_img"> click to change photo </string>
+        <string name = "cur_no_room"> Department / department </string> has not been obtained yet
+        <string name = "select_room"> select department </string>
+        <string name = "please_add_headerimg"> Please add photo </string>
+        <string name = "room"> department </string>
+        <string name = "tel_number"> number </string>
+        <string name = "input_name_date"> Please enter a full name / rest date </string>
+        <string name = "hava_save_detail"> There is duplicate item details </string>
+        <string name = "input_person_name"> Please enter the person name </string>
+        <string name = "cannot_select_beforedate"> Can not select past time </string>
+        <string name = "relax_time_rapeat"> rest time is not repeatable </string>
+        <string name = "input_all_date"> Please enter the complete rest date </string>
+        <string name = "update_room"> Update Service / Site / Room </string>
+        <string name = "input_name1"> Please enter a name </string>
+        <string name = "add_img"> Please add photos </string>
+        <string name = "please_input_room"> Please enter service / site / room name </string>
+        <string name = "please_input_time"> Please enter the service time / minute </string>
+        <string name = "add"> New </string>
+        <string name = "setting_worktime"> set business hours </string>
+        <string name = "setting_time_type"> Set the reservation time type </string>
+        <string name = "business_detail1"> business details </string>
+        <string name = "room_type"> Set private room reservation type </string>
+        <string name = "please_select_room_type"> Please select Private Reservation </string>
+        <string name = "please_input_bdi"> Please enter Merchant Listing </string>
+        <string name = "unlaw_str"> Contains a violation character </string>
+        <string name = "select_bookT_type"> Please select the reservation time type </string>
+        <string name = "time_canot_empty"> The time period can not be empty </string>
+        <string name = "booking_times"> time period: </string>
+        <string name = "book_time_type"> reservation time type </string>
+        <string name = "time_d"> by time </string>
+        <string name = "time_p"> by time </string>
+        <string name = "room_book_type"> </string>
+        <string name = "zzw"> early midnight </string>
+        <string name = "zw"> midnight </string>
+        <string name = "please_inpuy_bi"> Please enter the merchant details introduction limit 400 words </string>
+        <string name = "table_set"> table setting </string>
+        <string name = "net_expection"> Server Error Please try again later </string>
+        <string name = "input_all_msg"> Please drop all settings </string>
+        <string name = "table_setting"> table setting </string>
+        <string name = "pi_tablecode"> Please enter the table code </string>
+        <string name = "pi_number"> Please enter the number </string>
+        <string name = "pi_remark"> Please enter a comment </string>
+        <string name = "pi_bookdays"> Please enter the amount can be reserved / day </string>
+        <string name = "pi_seatnumber"> Please enter the maximum number of seats </string>
+        <string name = "pi_tabletype"> Please select the table type </string>
+        <string name = "b_table"> big table </string>
+        <string name = "m_table"> table </string>
+        <string name = "s_table"> little table </string>
+        <string name = "table_repeat"> table can not be set repeatedly </string>
+        <string name = "room_set"> department settings </string>
+         <string name = "person_set"> Personnel Settings </string>
+         <string name = "e_relax_set"> Staff rest day settings </string>
+        <string name = "person_list"> list of people </string>
+         <string name = "e_relaxday"> employee rest day </string>
+         <string name = "c_relaxday"> business break </string>
+         <string name = "room_location"> service / site / room </string>
+         <string name = "relax_time"> rest time </string>
+         <string name = "booking_time_set"> Reservation time period setting </string>
+        <string name = "enter_details_money"> Please enter the details amount </string>
+</resources>

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

@@ -1594,4 +1594,93 @@
     <string name="str_search_history">搜索历史</string>
     <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>
+    <string name="firstused_setpw">首次使用，请设置密码</string>
+    <string name="input_qpw">请输入查询密码(限20位)</string>
+    <string name="change_qpw">修改查詢密碼</string>
+    <string name="next_step">下一步</string>
+
+    <!--start 商家设置-->
+    <string name="business_setting">商家设置</string>
+    <string name="ranking">排行榜</string>
+    <string name="information_photo">形象照片</string>
+    <string name="set_e_relax">设置员工休息日</string>
+    <string name="set_c_relax">设置企业休息日</string>
+    <string name="set_location">设置服务/场地/房间</string>
+    <string name="click_change_img">点击更换照片</string>
+    <string name="cur_no_room">暂未获取到部门/科室</string>
+    <string name="select_room">选择科室</string>
+    <string name="please_add_headerimg">请添加头像照片</string>
+    <string name="room">科室</string>
+    <string name="tel_number">号码</string>
+    <string name="input_name_date">请输入完整姓名/休息日期</string>
+    <string name="hava_save_detail">存在重复的条目明细</string>
+    <string name="input_person_name">请输入人员名称</string>
+    <string name="cannot_select_beforedate">不可选择过去时间</string>
+    <string name="relax_time_rapeat">休息时间不可重复</string>
+    <string name="input_all_date">请输入完整休息日期</string>
+    <string name="update_room">更新服务/场地/房间</string>
+    <string name="input_name1">请输入名称</string>
+    <string name="add_img">请添加照片</string>
+    <string name="please_input_room">请输入服务/场地/房间名称</string>
+    <string name="please_input_time">请输入服务时间/分钟</string>
+    <string name="setting_worktime">设置营业时间</string>
+    <string name="setting_time_type">设置预约时间类型</string>
+    <string name="business_detail1">商家详情</string>
+    <string name="room_type">设置包房预订类型</string>
+    <string name="please_select_room_type">请选择包房预订类型</string>
+    <string name="please_input_bdi">请输入商家详情介绍</string>
+    <string name="unlaw_str">含违规字符</string>
+    <string name="select_bookT_type">请选择预约时间类型</string>
+    <string name="time_canot_empty">时间段不能为空</string>
+    <string name="booking_times">时间段：</string>
+    <string name="book_time_type">预约时间类型</string>
+    <string name="time_d">按时间段</string>
+    <string name="time_p">按时间点</string>
+    <string name="room_book_type"></string>
+    <string name="zzw">早中晚</string>
+    <string name="zw">中晚</string>
+    <string name="please_inpuy_bi">请输入商家详情介绍限400字</string>
+    <string name="table_set">桌位设置</string>
+    <string name="net_expection">服务器异常请稍后再试</string>
+    <string name="input_all_msg">请输全设置信息</string>
+    <string name="table_setting">桌位设置</string>
+    <string name="pi_tablecode">请输入桌位代码</string>
+    <string name="pi_number">请输入数量</string>
+    <string name="pi_remark">请输入备注</string>
+    <string name="pi_bookdays">请输入可被预约量/天</string>
+    <string name="pi_seatnumber">请输入最多可坐人数</string>
+    <string name="pi_tabletype">请选择桌位类型</string>
+    <string name="b_table">大桌</string>
+    <string name="m_table">中桌</string>
+    <string name="s_table">小桌</string>
+    <string name="table_repeat">桌位不可重复设置</string>
+    <string name="booking_time_set">预约时间段设置</string>
 </resources>

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

@@ -1581,4 +1581,108 @@
     <string name="str_search_history">搜索歷史</string>
     <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>
+    <string name="firstused_setpw">首次使用，請設置密碼</string>
+    <string name="input_qpw">請輸入查詢密碼(限20位)</string>
+    <string name="next_step">下一步</string>
+
+
+    <!--start 商家設置-->
+        <string name="business_setting">商家設置</string>
+        <string name="ranking">排行榜</string>
+        <string name="information_photo">形象照片</string>
+        <string name="set_e_relax">設置員工休息日</string>
+        <string name="set_c_relax">設置企業休息日</string>
+        <string name="set_location">設置服務/場地/房間</string>
+        <string name="click_change_img">點擊更換照片</string>
+        <string name="cur_no_room">暫未獲取到部門/科室</string>
+        <string name="select_room">選擇科室</string>
+        <string name="please_add_headerimg">請添加頭像照片</string>
+        <string name="room">科室</string>
+        <string name="tel_number">號碼</string>
+        <string name="input_name_date">請輸入完整姓名/休息日期</string>
+        <string name="hava_save_detail">存在重複的條目明細</string>
+        <string name="input_person_name">請輸入人員名稱</string>
+        <string name="cannot_select_beforedate">不可選擇過去時間</string>
+        <string name="relax_time_rapeat">休息時間不可重複</string>
+        <string name="input_all_date">請輸入完整休息日期</string>
+        <string name="update_room">更新服務/場地/房間</string>
+        <string name="input_name1">請輸入名稱</string>
+        <string name="add_img">請添加照片</string>
+        <string name="please_input_room">請輸入服務/場地/房間名稱</string>
+        <string name="please_input_time">請輸入服務時間/分鐘</string>
+        <string name="add">新增</string>
+        <string name="setting_worktime">設置營業時間</string>
+        <string name="setting_time_type">設置預約時間類型</string>
+        <string name="business_detail1">商家詳情</string>
+        <string name="room_type">設置包房預訂類型</string>
+        <string name="please_select_room_type">請選擇包房預訂類型</string>
+        <string name="please_input_bdi">請輸入商家詳情介紹</string>
+        <string name="unlaw_str">含違規字符</string>
+        <string name="select_bookT_type">請選擇預約時間類型</string>
+        <string name="time_canot_empty">時間段不能為空</string>
+        <string name="booking_times">時間段：</string>
+        <string name="book_time_type">預約時間類型</string>
+        <string name="time_d">按時間段</string>
+        <string name="time_p">按時間點</string>
+        <string name="room_book_type"></string>
+        <string name="zzw">早中晚</string>
+        <string name="zw">中晚</string>
+        <string name="please_inpuy_bi">請輸入商家詳情介紹限400字</string>
+        <string name="table_set">桌位設置</string>
+        <string name="net_expection">服務器異常請稍後再試</string>
+        <string name="input_all_msg">請輸全設置信息</string>
+        <string name="table_setting">桌位設置</string>
+        <string name="pi_tablecode">請輸入桌位代碼</string>
+        <string name="pi_number">請輸入數量</string>
+        <string name="pi_remark">請輸入備註</string>
+        <string name="pi_bookdays">請輸入可被預約量/天</string>
+        <string name="pi_seatnumber">請輸入最多可坐人數</string>
+        <string name="pi_tabletype">請選擇桌位類型</string>
+        <string name="b_table">大桌</string>
+        <string name="m_table">中桌</string>
+        <string name="s_table">小桌</string>
+        <string name="table_repeat">桌位不可重複設置</string>
+    <string name="room_set">科室設置</string>
+        <string name="person_set">人員設置</string>
+        <string name="e_relax_set">員工休息日設置</string>
+        <string name="person_list">人員列表</string>
+        <string name="e_relaxday">員工休息日</string>
+        <string name="c_relaxday">企業休息日</string>
+        <string name="room_location">服務/場地/房間</string>
+        <string name="relax_time">休息時間</string>
+    <string name="booking_time_set">預約時間段設置</string>
+    <string name="enter_details_money">請輸入明細金額</string>
+    <!--end s商家设置-->
+
 </resources>

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

@@ -111,7 +111,6 @@
     <string name="save_success">保存成功</string>
     <string name="save_failed">保存失败</string>
     <string name="delete">删除</string>
-    <string name="add">新增</string>
     <string name="add_friend">添加好友</string>
     <string name="next_step">下一步</string>
 
@@ -1841,7 +1840,6 @@
     <string name="booking_me">我的预约</string>
     <string name="booking_shared">预约共享</string>
     <string name="booking_time_set">预约时间段设置</string>
-    <string name="booking_times">时间段：</string>
 
     <string name="booking_add">预约计划</string>
     <string name="select_share_friend">分享好友</string>
@@ -1934,4 +1932,102 @@
     <string name="str_search_history">搜索历史</string>
     <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>
+    <string name="firstused_setpw">首次使用，请设置密码</string>
+    <string name="input_qpw">请输入查询密码(限20位)</string>
+
+    <!--start 商家设置-->
+    <string name="business_setting">商家设置</string>
+    <string name="ranking">排行榜</string>
+    <string name="information_photo">形象照片</string>
+    <string name="set_e_relax">设置员工休息日</string>
+    <string name="set_c_relax">设置企业休息日</string>
+    <string name="set_location">设置服务/场地/房间</string>
+    <string name="click_change_img">点击更换照片</string>
+    <string name="cur_no_room">暂未获取到部门/科室</string>
+    <string name="select_room">选择科室</string>
+    <string name="please_add_headerimg">请添加头像照片</string>
+    <string name="room">科室</string>
+    <string name="tel_number">号码</string>
+    <string name="input_name_date">请输入完整姓名/休息日期</string>
+    <string name="hava_save_detail">存在重复的条目明细</string>
+    <string name="input_person_name">请输入人员名称</string>
+    <string name="cannot_select_beforedate">不可选择过去时间</string>
+    <string name="relax_time_rapeat">休息时间不可重复</string>
+    <string name="input_all_date">请输入完整休息日期</string>
+    <string name="update_room">更新服务/场地/房间</string>
+    <string name="input_name1">请输入名称</string>
+    <string name="add_img">请添加照片</string>
+    <string name="please_input_room">请输入服务/场地/房间名称</string>
+    <string name="please_input_time">请输入服务时间/分钟</string>
+    <string name="add">新增</string>
+    <string name="setting_worktime">设置营业时间</string>
+    <string name="setting_time_type">设置预约时间类型</string>
+    <string name="business_detail1">商家详情</string>
+    <string name="room_type">设置包房预订类型</string>
+    <string name="please_select_room_type">请选择包房预订类型</string>
+    <string name="please_input_bdi">请输入商家详情介绍</string>
+    <string name="unlaw_str">含违规字符</string>
+    <string name="select_bookT_type">请选择预约时间类型</string>
+    <string name="time_canot_empty">时间段不能为空</string>
+    <string name="booking_times">时间段：</string>
+    <string name="book_time_type">预约时间类型</string>
+    <string name="time_d">按时间段</string>
+    <string name="time_p">按时间点</string>
+    <string name="room_book_type"></string>
+    <string name="zzw">早中晚</string>
+    <string name="zw">中晚</string>
+    <string name="please_inpuy_bi">请输入商家详情介绍限400字</string>
+    <string name="table_set">桌位设置</string>
+    <string name="net_expection">服务器异常请稍后再试</string>
+    <string name="input_all_msg">请输全设置信息</string>
+    <string name="table_setting">桌位设置</string>
+    <string name="pi_tablecode">请输入桌位代码</string>
+    <string name="pi_number">请输入数量</string>
+    <string name="pi_remark">请输入备注</string>
+    <string name="pi_bookdays">请输入可被预约量/天</string>
+    <string name="pi_seatnumber">请输入最多可坐人数</string>
+    <string name="pi_tabletype">请选择桌位类型</string>
+    <string name="b_table">大桌</string>
+    <string name="m_table">中桌</string>
+    <string name="s_table">小桌</string>
+    <string name="table_repeat">桌位不可重复设置</string>
+    <string name="room_set">科室设置</string>
+    <string name="person_set">人员设置</string>
+    <string name="e_relax_set">员工休息日设置</string>
+    <string name="person_list">人员列表</string>
+    <string name="e_relaxday">员工休息日</string>
+    <string name="c_relaxday">企业休息日</string>
+    <string name="room_location">服务/场地/房间</string>
+    <string name="relax_time">休息时间</string>
+    <!--end s商家设置-->
 </resources>

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/CompanyContactsActivity.java

@@ -52,7 +52,6 @@ import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.CustomerListView;
 import com.core.widget.VoiceSearchView;
-import com.core.xmpp.FriendHelper;
 import com.core.xmpp.dao.FriendDao;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;

app_modular/appme/src/main/AndroidManifest.xml

@@ -37,7 +37,7 @@
             android:name="com.uas.appme.other.activity.SelectAreaActivity"
             android:screenOrientation="portrait" />
         <activity android:name=".pedometer.view.UURanking"
-            android:label="排行榜">
+            android:label="@string/ranking">
             <intent-filter>
                 <action android:name="com.modular.appme.UURanking"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -45,29 +45,29 @@
         </activity>
         <activity android:name=".pedometer.view.PersonalPageActivity"/>
         <activity android:name=".pedometer.view.ShareStepsActivity"
-            android:label="分享"/>
+            android:label="@string/share"/>
         <activity android:name=".settings.activity.BSettingActivity"
-            android:label="商家设置"/>
+            android:label="@string/business_setting"/>
         <activity android:name=".settings.activity.ImageSettingActivity"
-            android:label="形象照片"/>
+            android:label="@string/information_photo"/>
         <activity android:name=".settings.activity.PersonSettingActivity"
-            android:label="新增人员"
+            android:label="@string/add_new_people"
             android:windowSoftInputMode="adjustPan"/>
         <activity android:name=".settings.activity.PersonSettingListActivity"
             />
         <activity android:name=".settings.activity.BComSetEmployeeRestActivity"
-            android:label="设置员工休息日"/>
+            android:label="@string/set_e_relax"/>
         <activity android:name=".settings.activity.BComSetCompanyRestActivity"
-            android:label="设置企业休息日"/>
+            android:label="@string/set_c_relax"/>
         <activity android:name=".settings.activity.BSettingLocationActivity"
-            android:label="设置服务/场地/房间"/>
+            android:label="@string/set_location"/>
         <activity android:name=".settings.activity.BRestActivity" />
         <activity android:name=".settings.activity.BSetComRestListActivity" />
         <activity android:name=".settings.activity.BusinessHoursSetting"
             android:windowSoftInputMode="stateUnspecified|adjustNothing"/>
         <activity android:name=".settings.activity.SigatureActivity"/>
         <activity android:name=".settings.handwritedemo.LandscapeActivity"
-            android:label="签名"
+            android:label="@string/salary_sign"
             android:screenOrientation="landscape"
             />
         <activity android:name=".settings.activity.CheckWagesActivity"
@@ -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/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/BComSetCompanyRestActivity.java

@@ -103,7 +103,7 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
 
             for (int i = 0; i < mList.size(); i++) {
                 if (StringUtil.isEmpty(mList.get(i).getSc_date())){
-                    ToastMessage("请输入完整休息日期");
+                    ToastMessage(getString(R.string.input_all_date));
                     break;
                 }
                 if (i==mList.size()-1)
@@ -223,11 +223,11 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
             public void setTime(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
                 if (current_date.compareTo(time) > 0) {
-                    ToastMessage("不可选择过去时间");
+                    ToastMessage(getString(R.string.cannot_select_beforedate));
                     return;
                 }else {
                     if (JSON.toJSONString(mList).contains(time)){
-                        ToastMessage("休息时间不可重复");
+                        ToastMessage(getString(R.string.relax_time_rapeat));
                         return;
                     }
                     mList.get(pos).setSc_date(time);

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

@@ -177,7 +177,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             if (ListUtils.isEmpty(mList)) return;
             for (int i = 0; i < mList.size(); i++) {
                 if (StringUtil.isEmpty(mList.get(i).getSf_username()) || StringUtil.isEmpty(mList.get(i).getSf_date())){
-                    ToastMessage("请输入完整姓名/休息日期");
+                    ToastMessage(getString(R.string.input_name_date));
                     break;
                 }
                 if (i==mList.size()-1)
@@ -193,7 +193,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                 for (int j = i+1;j < mList.size();j++){
                     if (mList.get(i).getSf_username().equals(mList.get(j).getSf_username()) &&
                             mList.get(i).getSf_date().equals(mList.get(j).getSf_date())){
-                        ToastMessage("存在重复的条目明细");
+                        ToastMessage(getString(R.string.hava_save_detail));
                         LogUtil.prinlnLongMsg("fanglh",mList.get(i).getSf_username()+","+
                                 mList.get(j).getSf_username() +","+
                                 mList.get(i).getSf_date()+","+
@@ -297,7 +297,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                     } else{
                             Intent intent = new Intent(ct, SelectActivity.class)
                                     .putExtra("type", 2)
-                                    .putExtra("title", "选择人员")
+                                    .putExtra("title", getString(R.string.select_user))
                                     .putParcelableArrayListExtra("data", selectBeens);
                             startActivityForResult(intent, 0x02);
 
@@ -391,7 +391,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         final EditText editname_et = (EditText) contentView.findViewById(R.id.editname_et);
         TextView cancel_tv = (TextView) contentView.findViewById(R.id.cancel_tv);
         TextView sure_tv = (TextView) contentView.findViewById(R.id.sure_tv);
-        title_tv.setText("请输入人员名称");
+        title_tv.setText(getString(R.string.input_person_name));
 
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int w_screen = dm.widthPixels;
@@ -409,7 +409,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             @Override
             public void onClick(View view) {
                 if (StringUtil.isEmpty(editname_et.getText().toString())){
-                    ToastMessage("请输入人员名称");
+                    ToastMessage(getString(R.string.input_person_name));
                     return;
                 }else {
                     mList.get(position).setSf_username(editname_et.getText().toString());
@@ -484,11 +484,11 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             public void setTime(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
                 if (current_date.compareTo(time) > 0) {
-                    ToastMessage("不可选择过去时间");
+                    ToastMessage(getString(R.string.cannot_select_beforedate));
                     return;
                 }else {
                     if (JSON.toJSONString(mList).contains(time)){
-                        ToastMessage("休息时间不可重复");
+                        ToastMessage(getString(R.string.relax_time_rapeat));
                         return;
                     }
                     mList.get(pos).setSf_date(time);

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

@@ -217,15 +217,15 @@ public class BSetComRestListActivity extends BaseActivity {
 
 		switch (type) {
 			case "eomployee":
-				getSupportActionBar().setTitle("员工休息日");
+				getSupportActionBar().setTitle(getString(R.string.e_relaxday));
 				psetting_list.setAdapter(emyAdapter);
 				break;
 			case "company":
-				getSupportActionBar().setTitle("企业休息日");
+				getSupportActionBar().setTitle(getString(R.string.c_relaxday));
 				psetting_list.setAdapter(cmyAdapter);
 				break;
 			case "place":
-				getSupportActionBar().setTitle("服务/场地/房间");
+				getSupportActionBar().setTitle(getString(R.string.room_location));
 				psetting_list.setAdapter(pmyAdapter);
 				break;
 		}

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

@@ -147,7 +147,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             update = true;
             save_bt.setText(getString(R.string.common_update_button));
             add_new_rl.setVisibility(View.GONE);
-            getSupportActionBar().setTitle("更新服务/场地/房间");
+            getSupportActionBar().setTitle(getString(R.string.update_room));
 
             st_id = JSON.parseObject(updateData).getString("st_id");
             BSetLocationBean model = new BSetLocationBean();
@@ -230,11 +230,11 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             LogUtil.prinlnLongMsg("mPhotoList",JSON.toJSONString(mPhotoList));
             if(!ListUtils.isEmpty(mList)){
                 if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
-                    ToastMessage("请输入名称");
+                    ToastMessage(getString(R.string.input_name1));
                     return;
                 }
                 if (mPhotoList.size() < mList.size()){
-                    ToastMessage("请添加照片");
+                    ToastMessage(getString(R.string.add_img));
                     return;
                 }
             }
@@ -253,7 +253,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             LogUtil.prinlnLongMsg("mList", JSON.toJSONString(mList));
             if (ListUtils.isEmpty(mList)) return;
             if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
-                ToastMessage("请输入名称");
+                ToastMessage(getString(R.string.input_name1));
                 return;
             }
             if (!CommonUtil.isNetWorkConnected(this)) {
@@ -312,7 +312,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
 
     private void doUpdate() {
         if (StringUtil.isEmpty(mList.get(0).getSt_name())){
-            ToastMessage("请输入名称");
+            ToastMessage(getString(R.string.input_name1));
            return;
         }else {
             Map<String,Object> param = new HashMap<>();
@@ -356,12 +356,12 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
 
     private void doSaveJudge(List<BSetLocationBean> mList) {
         if (mPhotoList.size() < mList.size()){
-            ToastMessage("请添加照片");
+            ToastMessage(getString(R.string.add_img));
             return;
         }
         for (int i = 0; i < mList.size(); i++) {
             if (StringUtil.isEmpty(mList.get(i).getSt_name())){
-                ToastMessage("请输入名称");
+                ToastMessage(getString(R.string.input_name1));
                 break;
             }else if (i==mList.size()-1){
                 if (updateChangeP)   // 更换过照片
@@ -751,11 +751,11 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         if (type==1) {
             editname_et.setVisibility(View.VISIBLE);
             editname_et2.setVisibility(View.GONE);
-            title_tv.setText("请输入服务/场地/房间名称");
+            title_tv.setText(getString(R.string.please_input_room));
         } else if(type==2) {
             editname_et.setVisibility(View.GONE);
             editname_et2.setVisibility(View.VISIBLE);
-            title_tv.setText("请输入服务时间/分钟");
+            title_tv.setText(getString(R.string.please_input_time));
         }
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
@@ -773,7 +773,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             public void onClick(View view) {
                 if (type==1){
                     if (StringUtil.isEmpty(editname_et.getText().toString())){
-                        ToastMessage("请输入服务/场地/房间名称");
+                        ToastMessage(getString(R.string.please_input_room));
                         return;
                     }else {
                         mList.get(position).setSt_name(editname_et.getText().toString());

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

@@ -90,25 +90,25 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
 
         bIntroductionEt = (FormEditText) findViewById(R.id.business_Introduction_et);
         if (setType == 1){
-            getSupportActionBar().setTitle("设置营业时间");
+            getSupportActionBar().setTitle(getString(R.string.setting_worktime));
             set_hour_ll.setVisibility(View.VISIBLE);
             set_booktype_ll.setVisibility(View.GONE);
             bIntroductionEt.setVisibility(View.GONE);
             roomType_ll.setVisibility(View.GONE);
         }else if (setType == 2){
-            getSupportActionBar().setTitle("设置预约时间类型");
+            getSupportActionBar().setTitle(getString(R.string.setting_time_type));
             set_hour_ll.setVisibility(View.GONE);
             set_booktype_ll.setVisibility(View.VISIBLE);
             bIntroductionEt.setVisibility(View.GONE);
             roomType_ll.setVisibility(View.GONE);
         }else if (setType == 3){
-            getSupportActionBar().setTitle("商家详情");
+            getSupportActionBar().setTitle(getString(R.string.business_detail1));
             set_hour_ll.setVisibility(View.GONE);
             set_booktype_ll.setVisibility(View.GONE);
             bIntroductionEt.setVisibility(View.VISIBLE);
             roomType_ll.setVisibility(View.GONE);
         }else if (setType == 4){
-            getSupportActionBar().setTitle("设置包房预订类型");
+            getSupportActionBar().setTitle(getString(R.string.room_type));
             set_hour_ll.setVisibility(View.GONE);
             set_booktype_ll.setVisibility(View.GONE);
             bIntroductionEt.setVisibility(View.GONE);
@@ -167,7 +167,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
 
     private void doSaveRoomtype() {
         if ( sc_cytype == -1){
-            ToastMessage("请选择包房预订类型");
+            ToastMessage(getString(R.string.please_select_room_type));
             return;
         }
         Map<String,Object> param = new HashMap<>();
@@ -202,11 +202,11 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
 
     private void doSaveBIntroduction() {
         if (StringUtil.isEmpty(bIntroductionEt.getText().toString())){
-            ToastMessage("请输入商家详情介绍");
+            ToastMessage(getString(R.string.please_input_bdi));
             return;
         }
         if (bIntroductionEt.getText().toString().contains("'")){
-            ToastMessage("含违规字符");
+            ToastMessage(getString(R.string.unlaw_str));
             return;
         }
 
@@ -242,7 +242,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
 
     private void doSaveTimeType() {
         if (sc_booktype == -1){
-            ToastMessage("请选择预约时间类型");
+            ToastMessage(getString(R.string.select_bookT_type));
             return;
         }
         Map<String,Object> param = new HashMap<>();
@@ -356,7 +356,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
     private void doSaveBHours() {
         if (StringUtil.isEmpty(mTvStartTime.getText().toString())||
                 StringUtil.isEmpty(mTvEndTime.getText().toString())){
-            ToastMessage("时间段不能为空！");
+            ToastMessage(getString(R.string.time_canot_empty));
             return;
         }
         if (mTvStartTime.getText().toString().compareTo(mTvEndTime.getText().toString())>=0){

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/PersonSettingActivity.java

@@ -71,6 +71,7 @@ import java.util.Map;
  * function:
  */
 
+
 public class PersonSettingActivity extends BaseActivity implements View.OnClickListener{
     private FormEditText mUserNameTv;
     private FormEditText mUserSexTv;
@@ -163,7 +164,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
       String sc_industrycode = getIntent().getStringExtra("sc_industrycode");
 
       if (!"医疗".equals(sc_industry))
-          user_department_tv.setText("部门");
+          user_department_tv.setText(getString(R.string.common_department));
 
         HttpClient httpClient =
 //                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);\
@@ -226,7 +227,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 //            String[] department = {"内科","外科","儿科","传染病科","妇产科","男科","精神心理科","皮肤性病科","中医科","肿瘤科","骨科","康复医学科","麻醉医学科","营养科","五官科","医学影像科","其他科室"};
             int requestCode = 0x01;
             if (ListUtils.isEmpty(departmentModel_list)) {
-                ToastMessage("暂未获取到部门/科室");
+                ToastMessage(getString(R.string.cur_no_room));
                 return;
             }else {
                 doSelectDepartment(departmentModel_list, requestCode);
@@ -333,9 +334,9 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         String title = null;
         if (!"医疗".equals(sc_industry))
-            title = "选择部门";
+            title = getString(R.string.select_department);
         else
-            title = "选择科室";
+            title = getString(R.string.select_room);
 
         LogUtil.prinlnLongMsg("department beans",JSON.toJSONString(beans));
         Intent intent = new Intent(ct, SelectActivity.class);
@@ -421,13 +422,13 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
     private void saveJudge() {
         if (StringUtil.isEmpty(photoselect)) {
-            ToastMessage("请添加头像照片");
+            ToastMessage(getString(R.string.please_add_headerimg));
             return;
         }
         File file=  new File(photoselect);
         if (StringUtil.isEmpty(result)){
             if (!file.exists()) {// 录入时的，且图片文件不存在
-                ToastMessage("请添加头像照片");
+                ToastMessage(getString(R.string.please_add_headerimg));
                 return;
             } else {
                 doSave();
@@ -492,7 +493,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                         if (o.toString().contains("imid")){
                             imid = JSON.parseObject(o.toString()).getString("imid");
                             if (StringUtil.isEmpty(imid)) {
-                               ToastMessage("imid获取失败，请稍后再试");
+//                               ToastMessage("imid获取失败，请稍后再试");
                                 return;
                             }
                             if (updateChangeP) {  //更换过照片

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

@@ -67,7 +67,7 @@ public class PersonSettingListActivity extends BaseActivity {
     }
     private void initData() {
         LogUtil.prinlnLongMsg("initData()","initData()");
-        getSupportActionBar().setTitle("人员列表");
+        getSupportActionBar().setTitle(getString(R.string.person_list));
         //接收商家类型
         sc_industry = getIntent().getStringExtra("sc_industry");
         sc_industrycode = getIntent().getStringExtra("sc_industrycode");

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

@@ -108,7 +108,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("桌位设置");
+        getSupportActionBar().setTitle(getString(R.string.table_setting));
 
         mComList = (MyListView) findViewById(R.id.com_list);
         mAddNewRl = (RelativeLayout) findViewById(R.id.add_new_rl);
@@ -214,7 +214,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     startActivity(new Intent(ct,TableListActivity.class));
                     finish();
                 }else{
-                    ToastMessage("服务器异常请稍后再试");
+                    ToastMessage(getString(R.string.net_expection));
                 }
             }
 
@@ -234,7 +234,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 !StringUtil.isEmpty(tableList.get(c_size-1).getAs_maxperson())){
             canOrNot = true;
         }else {
-            ToastMessage("请输全设置信息");
+            ToastMessage(getString(R.string.input_all_msg));
             canOrNot = false;
         }
         return canOrNot;
@@ -359,29 +359,29 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
         if (type == 1){
             editname_et.setVisibility(View.VISIBLE);
             editname_et2.setVisibility(View.GONE);
-            title_tv.setText("请输入桌位代码");
+            title_tv.setText(getString(R.string.pi_tablecode));
             editname_et.setText(tableList.get(position).getAs_deskcode()+"");
         } else if(type==2) {
             editname_et.setVisibility(View.GONE);
             editname_et2.setVisibility(View.VISIBLE);
-            title_tv.setText("请输入数量");
+            title_tv.setText(getString(R.string.pi_number));
             editname_et2.setHint(getString(R.string.common_input));
             editname_et2.setText(tableList.get(position).getAs_number()+"");
         } else if (type == 3){
             editname_et.setVisibility(View.VISIBLE);
             editname_et2.setVisibility(View.GONE);
-            title_tv.setText("请输入备注");
+            title_tv.setText(getString(R.string.pi_remark));
             editname_et.setText(tableList.get(position).getAs_remark()+"");
         }else if (type == 4){
             editname_et.setVisibility(View.GONE);
             editname_et2.setVisibility(View.VISIBLE);
-            title_tv.setText("请输入可被预约量/天");
+            title_tv.setText(getString(R.string.pi_bookdays));
             editname_et2.setHint(getString(R.string.common_input));
             editname_et2.setText(tableList.get(position).getAs_booknumber()+"");
         }else if (type == 5){
             editname_et.setVisibility(View.GONE);
             editname_et2.setVisibility(View.VISIBLE);
-            title_tv.setText("请输入最多可坐人数");
+            title_tv.setText(getString(R.string.pi_seatnumber));
             editname_et2.setHint(getString(R.string.common_input));
             editname_et2.setText(tableList.get(position).getAs_maxperson()+"");
         }
@@ -401,7 +401,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             public void onClick(View view) {
                 if (type==1){
                     if (StringUtil.isEmpty(editname_et.getText().toString())){
-                        ToastMessage("请输入桌位代码");
+                        ToastMessage(getString(R.string.pi_tablecode));
                         return;
                     }else {
                         tableList.get(position).setAs_deskcode(editname_et.getText().toString());
@@ -409,7 +409,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     }
                 }else if (type==2){
                     if (StringUtil.isEmpty(editname_et2.getText().toString())){
-                        ToastMessage("请输入数量");
+                        ToastMessage(getString(R.string.pi_number));
                         return;
                     }else {
                         tableList.get(position).setAs_number(editname_et2.getText().toString());
@@ -417,7 +417,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     }
                 }else if (type == 3){
                     if (StringUtil.isEmpty(editname_et.getText().toString())){
-                        ToastMessage("请输入备注");
+                        ToastMessage(getString(R.string.pi_remark));
                         return;
                     }else {
                         tableList.get(position).setAs_remark(editname_et.getText().toString());
@@ -425,7 +425,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     }
                 }else if (type == 4){
                     if (StringUtil.isEmpty(editname_et2.getText().toString())){
-                        ToastMessage("请输入可被预约量/天");
+                        ToastMessage(getString(R.string.pi_bookdays));
                         return;
                     }else {
                         tableList.get(position).setAs_booknumber(editname_et2.getText().toString());
@@ -433,7 +433,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     }
                 }else if (type == 5){
                     if (StringUtil.isEmpty(editname_et2.getText().toString())){
-                        ToastMessage("请输入最多可坐人数");
+                        ToastMessage(getString(R.string.pi_seatnumber));
                         return;
                     }else {
                         tableList.get(position).setAs_maxperson(editname_et2.getText().toString());
@@ -455,26 +455,26 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
 
     private void showSelectType(final int position) {
         // 1是男，0是女，2是全部
-        String[] sexs = new String[]{ "大桌", "中桌","小桌"};
+        String[] sexs = new String[]{ getString(R.string.b_table), getString(R.string.m_table),getString(R.string.s_table)};
         int checkItem = 0;
-        new AlertDialog.Builder(this).setTitle("请选择桌位类型")
+        new AlertDialog.Builder(this).setTitle(getString(R.string.pi_tabletype))
                 .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String ttype = null;
                         String code = null;
                         if (which == 0) {
-                            ttype =  "大桌";
+                            ttype =  getString(R.string.b_table);
                             code = "A";
                         }else if (which == 1){
-                            ttype =  "中桌";
+                            ttype =  getString(R.string.m_table);
                             code = "B";
                         }else {
-                            ttype =  "小桌";
+                            ttype =  getString(R.string.s_table);
                             code = "C";
                         }
                        if (JSON.toJSONString(tableList).contains(code)){
-                            ToastMessage("桌位不可重复设置");
+                            ToastMessage(getString(R.string.table_repeat));
                             return;
                        }
                         tableList.get(position).setAs_deskcode(code);

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/business_hours_setting_activity.xml

@@ -53,14 +53,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="预约时间类型："/>
+                    android:text="@string/book_time_type"/>
                 <TextView
                     android:id="@+id/period_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     style="@style/crm_business_btn"
-                    android:text="按时间段"
+                    android:text="@string/time_d"
                     android:gravity="center"/>
                 <TextView
                     android:id="@+id/timpoint_tv"
@@ -68,7 +68,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     style="@style/crm_business_btn"
-                    android:text="按时间点"
+                    android:text="@string/time_p"
                     android:gravity="center"/>
             </LinearLayout>
 
@@ -82,14 +82,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="包房预订类型："/>
+                    android:text="@string/room_book_type"/>
                 <TextView
                     android:id="@+id/rtype1_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     style="@style/crm_business_btn"
-                    android:text="早中晚"
+                    android:text="@string/zzw"
                     android:gravity="center"/>
                 <TextView
                     android:id="@+id/rtype2_tv"
@@ -97,7 +97,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     style="@style/crm_business_btn"
-                    android:text="中晚"
+                    android:text="@string/zw"
                     android:gravity="center"/>
             </LinearLayout>
 
@@ -108,7 +108,7 @@
                 android:layout_margin="10dp"
                 android:background="@drawable/full_edit_bg"
                 android:gravity="top"
-                android:hint="请输入商家详情介绍限400字"
+                android:hint="@string/please_inpuy_bi"
                 android:inputType="textMultiLine"
                 android:minHeight="200dp"
                 android:padding="10dp"

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"
@@ -124,7 +124,6 @@
             android:layout_marginTop="10dp"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
-            android:text="重新获取(59s)"
             />
 
 
@@ -139,7 +138,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 +154,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/com_rest_item.xml

@@ -77,7 +77,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:text="休息时间"
+                android:text="@string/relax_time"
                 android:textSize="14sp"
                 />
 

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

@@ -32,7 +32,7 @@
                 >
                 <TextView
                     android:layout_width="wrap_content"
-                    android:text="+新增"
+                    android:text="@string/add"
                     android:textColor="#2F95DD"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
@@ -56,7 +56,7 @@
                     android:layout_marginTop="50dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
-                    android:text="@string/save"
+                    android:text="@string/common_save_button"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_main"
                     />
@@ -72,7 +72,7 @@
                     android:layout_marginTop="50dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
-                    android:text="@string/delete"
+                    android:text="@string/common_delete"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_main"
                     android:visibility="gone"/>

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/table_set_activity.xml

@@ -31,7 +31,7 @@
                 >
                 <TextView
                     android:layout_width="wrap_content"
-                    android:text="+新增"
+                    android:text="@string/new_add"
                     android:textColor="#2F95DD"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
@@ -55,7 +55,7 @@
                     android:layout_marginTop="50dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
-                    android:text="@string/save"
+                    android:text="@string/common_save_button"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_main"
                     />
@@ -71,7 +71,7 @@
                     android:layout_marginTop="50dp"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
-                    android:text="@string/delete"
+                    android:text="@string/common_delete"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_main"
                     android:visibility="gone"/>

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"
@@ -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"
@@ -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/input_search_ycode"
                     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;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/WorkPresenter.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
@@ -37,8 +36,8 @@ import com.core.utils.TimeUtils;
 import com.core.utils.WorkHandlerUtil;
 import com.core.widget.view.Activity.SearchLocationActivity;
 import com.core.widget.view.model.SearchPoiParam;
-import com.uas.appworks.R;
 import com.uas.appworks.OA.erp.view.IWorkView;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.Collections;

app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessMainActivity.java

@@ -308,10 +308,11 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
             mCustomerInquiryAdapter.notifyDataSetChanged();
         } else if (requestCode == REQUEST_PUBLIC_DETAIL
                 && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY) {
-            /*B2BBusinessListBean b2BBusinessListBean = mPublicInquiryBeans.get(mSelectPosition);
+            B2BBusinessListBean b2BBusinessListBean = mPublicInquiryBeans.get(mSelectPosition);
             if (b2BBusinessListBean != null) {
                 b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
-            }*/
+            }
+            mPublicInquiryAdapter.notifyDataSetChanged();
         }
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkFuncSetActivity.java

@@ -9,7 +9,6 @@ import android.view.MenuItem;
 import com.alibaba.fastjson.JSON;
 import com.core.app.Constants;
 import com.core.base.activity.BaseMVPActivity;
-import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.me.network.app.base.HttpParams;
 import com.uas.appworks.R;
@@ -46,8 +45,6 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
         linearLayoutManager.setSmoothScrollbarEnabled(true);
         linearLayoutManager.setAutoMeasureEnabled(true);
-//        linearLayoutManager.setRecycleChildrenOnDetach(true);
-//        mFuncRecyclerView.setItemViewCacheSize(0);
         mFuncRecyclerView.setLayoutManager(linearLayoutManager);
         mFuncRecyclerView.setNestedScrollingEnabled(false);
 

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -323,11 +323,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 }
             } else if (requestCode == REQUEST_PUBLIC_DETAIL
                     && resultCode == Constants.FLAG.RESULT_PUBLIC_INQUIRY) {
-//                if (TextUtils.isEmpty(mListState)) {
-//                    mB2BBusinessListBeans.remove(mSelectPosition);
-//                } else {
-//                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
-//                }
+                    b2BBusinessListBean.setBillState(Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE);
             }
             mB2BBusinessListAdapter.notifyDataSetChanged();
         }

app_modular/appworks/src/main/res/layout/activity_invite_register.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.scwang.smartrefresh.layout.SmartRefreshLayout
+<!--<com.scwang.smartrefresh.layout.SmartRefreshLayout
     android:id="@+id/refreshLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -19,61 +19,63 @@
         android:textColor="#aaa"
         android:textSize="16sp"
         app:layout_srlBackgroundColor="#555"
-        app:layout_srlSpinnerStyle="FixedBehind" />
+        app:layout_srlSpinnerStyle="FixedBehind" />-->
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-        <com.tencent.smtt.sdk.WebView
-            android:id="@+id/invite_register_wv"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+    <com.tencent.smtt.sdk.WebView
+        android:id="@+id/invite_register_wv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
-        <LinearLayout
-            android:id="@+id/invite_register_success"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white"
-            android:clickable="true"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:visibility="gone">
+    <LinearLayout
+        android:id="@+id/invite_register_success"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:clickable="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:visibility="gone">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:text="恭喜您注册成功，我们已为您开通以下服务："
-                android:textColor="#2F95DD"
-                android:textSize="14sp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="恭喜您注册成功，我们已为您开通以下服务："
+            android:textColor="#2F95DD"
+            android:textSize="14sp" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:src="@drawable/ic_trademark_b2b" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:src="@drawable/ic_trademark_b2b" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:src="@drawable/ic_trademark_mall" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:src="@drawable/ic_trademark_mall" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:src="@drawable/ic_trademark_uu" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:src="@drawable/ic_trademark_uu" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:src="@drawable/ic_trademark_job" />
-        </LinearLayout>
-    </FrameLayout>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:src="@drawable/ic_trademark_job" />
+    </LinearLayout>
+</FrameLayout>
 
-</com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    <!--</com.scwang.smartrefresh.layout.SmartRefreshLayout>-->