提交分类： 打包版本；

提交内容：  打包发布
当前版本：  正式版本6.1.6
是否冲突：  否

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

@@ -46,7 +46,7 @@
 
     <!-- start行政办公OA界面-->
     <string name = "oamain_title"> OA </string>
-         <string name = "oasign_title"> Sign in </string>
+         <string name = "oasign_title"> check in </string>
          <string name = "oaoutplan_title">Outwork </string>
          <string name = "oaworkdaily_title"> Daily </string>
          <string name = "oapackup_title"> Retract </string>
@@ -1423,6 +1423,68 @@
     <string name = "input_phone_number"> Please enter the phone number </string>
     <string name = "input_name"> Please enter a name </string>
 
-    <string name="sales_statistics">销售看板</string>
+    <string name="sales_statistics">Sales kanban</string>
 
+
+    //商旅服务
+    <string name="business_services">business services</string>
+
+    <!--一元捐项目新-->
+    <string name="charitable">Love donation</string>
+    <string name="charitable_user_agreement"><u>《UU User protocol》</u></string>
+    <string name="new_select_pay">select</string>
+    <string name="input_two_double">Less than two double</string>
+    <string name="not_more_pay">Amount Less than 99999</string>
+    <string name="not_pay_num_can">pay Amount Non conformity</string>
+    <string name="find_num_project">find<b>%1$d</b>project</string>
+    <string name="regx_operator">\\%1$s</string>
+
+    //设备管理项目
+    <string name="title_device_manage">Device management</string>
+    <string name="text_scan_device">scan</string>
+    <string name="text_device_query">device inquiry</string>
+    <string name="text_application_use">using application</string>
+    <string name="text_scrap_application">Scrap application</string>
+    <string name="text_maintenance">Maintenance</string>
+    <string name="text_fault_inspection">Fault submission</string>
+    <string name="text_cycle_count">Cycle inventory</string>
+    <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>
 </resources>

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

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

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

@@ -1525,5 +1525,39 @@
     <string name="input_name">請輸入姓名</string>
 
     <string name="sales_statistics">销售看板</string>
+    <string name="who_is_champion">佔領了封面</string>
+    <string name="all_Amount_of_money">總金額</string>
 
+
+    <string name="get_again">重新獲取</string>
+    <string name="msg_send_success">短信發送成功,請在一分鐘內完成輸入查詢</string>
+    <string name="input_search_date">請輸入查詢日期</string>
+    <string name="input_search_ycode">請輸入驗證碼</string>
+    <string name="input_search_password">請輸入查詢密碼</string>
+    <string name="please_settting_password">請設置至少6位數查詢密碼</string>
+    <string name="setting_password_success">設置密碼成功</string>
+    <string name="code_outtime">驗證碼超時，請重新獲取</string>
+    <string name="please_settting_password1">請輸入6位數驗證碼</string>
+    <string name="get_code">獲取驗證碼</string>
+    <string name="salary_search">工資查詢</string>
+    <string name="cannot_sign">工資數據為空，無法簽字</string>
+    <string name="input_your_error">請輸入你的報錯問題</string>
+    <string name="not_sign">您沒有簽名</string>
+    <string name="salary">工資</string>
+    <string name="send_error_ok">報錯成功</string>
+    <string name="ss_send_success">工資條簽名提交成功</string>
+    <string name="no_salary_data">暫無工資信息</string>
+    <string name="error_msg">報錯信息</string>
+    <string name="salary_sign">簽名</string>
+    <string name="confirm_phone">請確認手機號</string>
+    <string name="code_send_phone">驗證碼已發送至手機</string>
+    <string name="please_set_pw">請設置密碼</string>
+    <string name="password">密碼</string>
+    <string name="input_6_pw">請輸入新密碼(限6-20位)</string>
+    <string name="need_6_str">需6-20位字符</string>
+    <string name="firstused_setpw">首次使用，請設置密碼</string>
+    <string name="input_qpw">請輸入查詢密碼(限20位)</string>
+    <string name="next_step">下一步</string>
+    <string name="change_qpw">修改查询密码</string>
+    <string name="telephone">手機號碼</string>
 </resources>

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

@@ -1870,4 +1870,66 @@
     <string name="input_name">请输入姓名</string>
 
     <string name="sales_statistics">销售看板</string>
+
+
+    <!--一元捐项目新-->
+    <string name="charitable">一元捐</string>
+    <string name="charitable_user_agreement"><u>《优软一元捐用户协议》</u></string>
+    <string name="new_select_pay">当前选择</string>
+    <string name="input_two_double">只能键入两位小数</string>
+    <string name="not_more_pay">金额不能大于99999</string>
+    <string name="not_pay_num_can">支付金额不符合标准</string>
+    <string name="find_num_project">查到<b>%1$d</b>个相关项目</string>
+    <string name="regx_operator">\\%1$s</string>
+
+
+    //商旅服务
+    <string name="business_services">商旅服务</string>
+
+    //设备管理项目
+    <string name="title_device_manage">设备管理</string>
+    <string name="text_scan_device">扫一扫</string>
+    <string name="text_device_query">设备查询</string>
+    <string name="text_application_use">使用申请</string>
+    <string name="text_scrap_application">报废申请</string>
+    <string name="text_maintenance">养护管理</string>
+    <string name="text_fault_inspection">故障送检</string>
+    <string name="text_cycle_count">周期盘点</string>
+    <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>
 </resources>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Feb 06 16:45:55 CST 2018
-debugName=213
+#Tue Feb 06 16:12:31 CST 2018
+debugName=210
 versionName=616
-debugCode=213
+debugCode=210
 versionCode=155

app_core/common/src/main/java/com/common/data/JSONUtil.java

@@ -22,7 +22,9 @@ public class JSONUtil {
             builder.append("\"" + e.getKey() + "\":");
             if (e.getValue() instanceof String || e.getValue() instanceof CharSequence) {
                 builder.append("\"" + e.getValue() + "\",\n");
-            } else {
+            }else if (e.getValue() instanceof Map) {
+                builder.append( map2JSON((Map)e.getValue()) + ",\n");
+            }  else {
                 builder.append(e.getValue() + ",\n");
             }
         }

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

@@ -1594,4 +1594,36 @@
     <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>
 </resources>

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

@@ -1581,4 +1581,38 @@
     <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>
 </resources>

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

@@ -1927,9 +1927,43 @@
     <string name="str_work_b2b_commerce">B2B商务</string>
     <string name="str_work_usoft_mall">优软商城</string>
     <string name="str_work_charitable_donations">一元捐</string>
+    //商旅服务
+    <string name="business_services">商旅服务</string>
     <!--工作台菜单-->
 
     <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>
 </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

@@ -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/CheckWagesActivity.java

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

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

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

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

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

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

@@ -14,7 +14,7 @@
         android:layout_marginRight="10dp"
         android:drawableRight="@drawable/oa_next"
         android:textSize="15sp"
-        android:hint="请选择查询日期"
+        android:hint="@string/input_search_date"
         android:textColor="#333333"/>
     <View
         android:layout_width="match_parent"
@@ -28,7 +28,7 @@
         android:padding="10dp"
         android:layout_centerVertical="true"
         android:background="@null"
-        android:hint="请输入手机号码"
+        android:hint="@string/please_input_phone_number"
         android:textSize="15sp"
         android:gravity="center_vertical"
         android:inputType="number"
@@ -65,7 +65,7 @@
             android:padding="10dp"
             android:layout_centerVertical="true"
             android:background="@null"
-            android:hint="请输入查询密码"
+            android:hint="@string/input_search_password"
             android:textSize="15sp"
             android:gravity="center_vertical"
             android:inputType="textPassword"
@@ -91,7 +91,7 @@
             android:padding="10dp"
             android:layout_centerVertical="true"
             android:background="@null"
-            android:hint="请输入6位数验证码"
+            android:hint="@string/please_settting_password1"
             android:textSize="15sp"
             android:gravity="center_vertical"
             android:maxLength="6"
@@ -100,7 +100,7 @@
         <Button
             android:id="@+id/wages_code_btn"
             android:padding="2dp"
-            android:text="获取验证码"
+            android:text="@string/get_code"
             android:textColor="@color/white"
             android:textSize="13sp"
             android:layout_alignParentRight="true"
@@ -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/set_wage_password.xml

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

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

@@ -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/please_input_auth_code"
                     android:textSize="16sp"
                     android:maxLength="11"
                     android:inputType="number"
@@ -122,7 +122,7 @@
                 <Button
                     android:id="@+id/next2_btn"
                     android:layout_marginTop="20dp"
-                    android:text="下一步"
+                    android:text="@string/next_step"
                     android:layout_gravity="center_horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
@@ -141,14 +141,14 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="请设置密码"
+                    android:text="@string/delete"
                     android:textSize="20sp"
                     android:textColor="@color/black"/>
                 <TextView
                     android:layout_marginTop="30dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="密码"/>
+                    android:text="@string/password"/>
 
                 <RelativeLayout
                     android:layout_marginTop="10dp"
@@ -159,7 +159,7 @@
                         android:background="@null"
                         android:layout_width="250dp"
                         android:layout_height="wrap_content"
-                        android:hint="请输入新密码(限6-20位)"
+                        android:hint="@string/input_6_pw"
                         android:textSize="16sp"
                         android:maxLength="15"
                         android:inputType="textPassword"
@@ -186,11 +186,11 @@
                     android:textColor="@color/titleBlue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="需6-20位字符"/>
+                    android:text="@string/need_6_str"/>
                 <Button
                     android:id="@+id/next3_btn"
                     android:layout_marginTop="20dp"
-                    android:text="下一步"
+                    android:text="@string/next_step"
                     android:layout_gravity="center_horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"

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

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

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

@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -314,18 +315,22 @@ public class ApprovalListActivity extends BaseNetActivity implements View.OnClic
             for (int i = 0; i < array.size(); i++) {
                 object = array.getJSONObject(i);
                 e = new ApprovalList();
-                e.setCaller(JSONUtil.getText(object, "JP_CALLER"));
-                e.setLauncherName(JSONUtil.getText(object, "JP_LAUNCHERNAME"));
-                e.setName(JSONUtil.getText(object, "JP_NAME"));
-                e.setNodeId(JSONUtil.getText(object, "JP_NODEID"));
-                e.setDealTime(JSONUtil.getTime(object, "JP_LAUNCHTIME", "JN_DEALTIME"));
                 e.setStatus(JSONUtil.getText(object, "JP_STATUS"));
-                e.setMaster(JSONUtil.getText(object, "CURRENTMASTER"));
-                e.setImid(JSONUtil.getText(object, "EM_IMID"));
-                e.setDealResult(JSONUtil.getText(object, "JN_DEALRESULT"));
-                e.setNodeDealMan(JSONUtil.getText(object, "JP_NODEDEALMANNAME"));
-                e.setOperatedDescription(JSONUtil.getText(object, "JN_OPERATEDDESCRIPTION"));
-                approvalLists.add(e);
+                if (tab != 1 || e.getStatus().equals("待审批")) {
+                    LogUtil.i("e.getStatus()=" + e.getStatus());
+                    LogUtil.i("tab=" + tab);
+                    e.setCaller(JSONUtil.getText(object, "JP_CALLER"));
+                    e.setLauncherName(JSONUtil.getText(object, "JP_LAUNCHERNAME"));
+                    e.setName(JSONUtil.getText(object, "JP_NAME"));
+                    e.setNodeId(JSONUtil.getText(object, "JP_NODEID"));
+                    e.setDealTime(JSONUtil.getTime(object, "JP_LAUNCHTIME", "JN_DEALTIME"));
+                    e.setMaster(JSONUtil.getText(object, "CURRENTMASTER"));
+                    e.setImid(JSONUtil.getText(object, "EM_IMID"));
+                    e.setDealResult(JSONUtil.getText(object, "JN_DEALRESULT"));
+                    e.setNodeDealMan(JSONUtil.getText(object, "JP_NODEDEALMANNAME"));
+                    e.setOperatedDescription(JSONUtil.getText(object, "JN_OPERATEDDESCRIPTION"));
+                    approvalLists.add(e);
+                }
             }
             showAdapter(approvalLists);
         }
@@ -427,10 +432,16 @@ public class ApprovalListActivity extends BaseNetActivity implements View.OnClic
             ApprovalList model = getItem(position);
 
             String jpName = model.getName() == null ? "" : (model.getName().replace("流程", ""));
-            mViewHodler.tv_name.setText(model.getLauncherName() + "的" + jpName);
-            mViewHodler.tv_date.setText(DateFormatUtil.long2Str(model.getDealTime(), "MM-dd HH:mm") + "");
 
 
+            String name = "";
+            if (tab == 3) {
+                name = "我" + "的" + jpName;
+            } else {
+                name = model.getLauncherName() + "的" + jpName;
+            }
+            mViewHodler.tv_name.setText(name);
+            mViewHodler.tv_date.setText(DateFormatUtil.long2Str(model.getDealTime(), "MM-dd HH:mm") + "");
             String jpStatus = "等待我审批";
             int statusColor = R.color.approvaling;
             switch (tab) {

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

@@ -54,7 +54,7 @@ public class MsgThirdWebActivity extends MessageWebActivity {
         startActivity(new Intent(ct, CommonDocDetailsActivity.class)
                 .putExtra("caller", caller)
                 .putExtra("keyValue", keyValue)
-                .putExtra("device", true)
+                .putExtra("device", false)
                 .putExtra("message", true)
                 .putExtra("status", "已审批"));
     }

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/appmessages/src/main/res/values-en/strings.xml

@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">AppMessages</string>
+    <string name="uu_helper">UU assistant</string>
     <string name="real_time_form">实时看板</string>
     <string name="industry_access_failure">所属行业获取失败</string>
     <string name="company_business_targets">商家营业指标</string>

app_modular/appworks/src/main/AndroidManifest.xml

@@ -357,7 +357,8 @@
             android:name=".CRM.erp.activity.DeviceCycleCountAddActivity"
             android:label="@string/text_cycle_count_add"
             />
-        <activity android:name=".OA.platform.activity.BusinessTravelActivity">
+        <activity android:name=".OA.platform.activity.BusinessTravelActivity"
+            android:label="@string/business_services">
             <intent-filter>
                 <action android:name="com.modular.work.BusinessTravelActivity" />
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkActivity.java

@@ -1,5 +1,6 @@
 package com.uas.appworks.OA.erp.activity;
 
+import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1258,7 +1258,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "3000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);

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

@@ -256,6 +256,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
                 if (distance == -1 || distance > Double.valueOf(dis)) {
                     distance = Double.valueOf(dis);
                     companyLocation = b;
+
                 }
             }
             return distance;

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -10,14 +10,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
-import com.common.data.ListUtils;
 import com.core.utils.CommonUtil;
 import com.me.network.app.http.Method;
 import com.modular.apputils.activity.BaseNetActivity;
 import com.modular.apputils.listener.OnSmartHttpListener;
 import com.modular.apputils.network.Parameter;
 import com.modular.apputils.network.Tags;
-import com.modular.apputils.utils.TestStr;
 import com.modular.apputils.widget.SpaceItemDecoration;
 import com.module.recyclerlibrary.ui.refresh.BaseRefreshLayout;
 import com.uas.appworks.OA.platform.adapter.BusinessTravelAdapter;
@@ -44,7 +42,6 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
     }
 
 
-
     @Override
     protected String getBaseUrl() {
         return CommonUtil.getAppBaseUrl(BaseConfig.getContext());
@@ -106,10 +103,7 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         String cttpid = JSONUtil.getText(object, "em_cttpid");
         for (int i = 0; i < listdata.size(); i++) {
             JSONObject data = listdata.getJSONObject(i);
-            model = new BusinessTravel();
-            model.setType(BusinessTravel.TITLE);
-            model.setCode(JSONUtil.getText(data, "FP_ID"));
-            models.add(model);
+            models.add(new BusinessTravel(JSONUtil.getText(data, "FP_ID")));
             JSONArray reimbursements = JSONUtil.getJSONArray(data, "reimbursement");
             for (int j = 0; j < reimbursements.size(); j++) {
                 models.add(new BusinessTravel(cttpid, reimbursements.getJSONObject(j)));

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/BusinessTravelAdapter.java

@@ -69,14 +69,15 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        if (viewType == BusinessTravel.TITLE) {
-            return new TitleViewHolder(parent);
-        } else if (viewType == BusinessTravel.AIR) {
-            return new AirViewHolder(parent);
-        } else if (viewType == BusinessTravel.HOTEL) {
-            return new HotelViewHolder(parent);
+        switch (viewType) {
+            case BusinessTravel.AIR:
+            case BusinessTravel.TRAIN:
+                return new AirViewHolder(parent);
+            case BusinessTravel.HOTEL:
+                return new HotelViewHolder(parent);
+            default:
+                return new TitleViewHolder(parent);
         }
-        return null;
     }
 
     @Override
@@ -116,7 +117,7 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.expecteFeeTv.setText(model.getExpecteFee());
         holder.idTypeTv.setText("二代身份证");
         holder.dateTv.setText(model.getDate());
-        if (StringUtil.isEmpty(model.getCode())) {
+        if (StringUtil.isEmpty(model.getStatus()) || StringUtil.isEmpty(model.getCode())) {
             holder.doneTv.setText(DONE_SUBMIT);
             holder.doneTv.setBackgroundResource(R.drawable.text_frame_radian_hint_bg);
             holder.doneTv.setTextColor(ct.getResources().getColor(R.color.text_hine));
@@ -148,7 +149,7 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.toTimeTv.setText(DateFormatUtil.long2Str(model.getEndTime(), "HH:mm"));
         //行程
         holder.tripTv.setText(fromCity + "-" + toCity);
-        holder.mTravelDirectionView.setData(model.getSeat(), model.getAllTime());
+        holder.mTravelDirectionView.setData(model.getFlightCode(), model.getAllTime());
         //改签
         if (StringUtil.getText(holder.doneTv).equals(DONE_CANCEL) && 1 == 2) {
             holder.changeTv.setVisibility(View.VISIBLE);
@@ -167,8 +168,10 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.whenLongTv.setText(whenLongTv);
         holder.businessNameTv.setText(model.getBusinessName());
         holder.numberTv.setText(model.getNumber() + "人");
-        holder.roomsTv.setText(model.getNumber() + "1间");
-        holder.addressTv.setText(model.getAddress());
+        if (!StringUtil.isEmpty(model.getCode()) && !StringUtil.isEmpty(model.getStatus())) {
+            holder.roomsTv.setText("1间");
+        }
+        holder.addressTv.setText(model.getHotelAddress());
         holder.dateTv.setText(DateFormatUtil.long2Str(DateFormatUtil.YMD));
         holder.numberSubTv.setText(model.getNumber() + "人");
     }
@@ -316,20 +319,41 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     private void reserve(BusinessTravel model) {
         Map<String, Object> map = new HashMap<>();
         map.put("traverorderno", "RES56884");
-        map.put("product", model.getTitleCode());
+        map.put("product", model.getProduct());
         map.put("costname", "成本中心");
         map.put("proname", "所属项目");
-
-        //飞机
+        String from = "";
+        String fromcode = "";
+        String arrive = "";
+        String arrivecode = "";
+        switch (model.getType()) {
+            case BusinessTravel.AIR:
+                from = model.getAirStarting();
+                fromcode = model.getAirStartingCode();
+                arrive = model.getAirDestination();
+                arrivecode = model.getAirDestinationCode();
+                break;
+            case BusinessTravel.TRAIN:
+                from = model.getTrainStarting();
+                fromcode = model.getTrainStartingCode();
+                arrive = model.getTrainDestination();
+                arrivecode = model.getTrainDestinationCode();
+                break;
+
+            case BusinessTravel.HOTEL:
+                from = model.getHotelCity();
+                fromcode = model.getHotelCityCode();
+                break;
+        }
         Map<String, String> routeMap = new HashMap<>();
-        routeMap.put("from", model.getStarting());
-        routeMap.put("fromcode", model.getStarting());
-        routeMap.put("arrive", model.getDestination());
-        routeMap.put("arrivecode", model.getDestination());
-        routeMap.put("startdata", DateFormatUtil.long2Str(model.getStartTime(), DateFormatUtil.YMD));
+        routeMap.put("from", from);
+        routeMap.put("fromcode", fromcode);
+        routeMap.put("arrive", arrive);
+        routeMap.put("arrivecode", arrivecode);
+        routeMap.put("startdate", DateFormatUtil.long2Str(model.getStartTime(), DateFormatUtil.YMD));
         routeMap.put("arrivedate", DateFormatUtil.long2Str(model.getEndTime(), DateFormatUtil.YMD));
         routeMap.put("isCanModify", "0");
-        map.put("route", JSON.toJSONString(routeMap));
+        map.put("route", routeMap);
 
         //个人中心
         Map<String, String> custinfoMap = new HashMap<>();
@@ -338,10 +362,9 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         custinfoMap.put("cusCode", CommonUtil.getMaster());
         custinfoMap.put("emCode", CommonUtil.getEmcode());
         custinfoMap.put("outOrderno", String.valueOf(model.getId()));
-        map.put("custinfo", JSON.toJSONString(routeMap));
-
+        map.put("custinfo", custinfoMap);
         String p = JSONUtil.map2JSON(map);
-        LogUtil.i("p="+p);
+        LogUtil.i("p=" + p);
         turn2Web(p);
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/model/BusinessTravel.java

@@ -16,7 +16,8 @@ import com.common.data.TextUtil;
 public class BusinessTravel {
     public static final int TITLE = 1;
     public static final int AIR = 2;
-    public static final int HOTEL = 3;
+    public static final int TRAIN = 3;
+    public static final int HOTEL = 4;
     private boolean expand;
     private int id;//明细id
     private int type;
@@ -37,38 +38,57 @@ public class BusinessTravel {
     private String title;
     private String cttpid;
 
-    private String city;
-    private String address;
-    private String starting;
-    private String destination;
-
     private String airStarting;
     private String airStartingCode;
     private String airDestination;
     private String airDestinationCode;
+
     private String trainStarting;
     private String trainStartingCode;
     private String trainDestination;
     private String trainDestinationCode;
+
     private String hotelCity;
     private String hotelCityCode;
     private String flightCode;
-
-
-
-
+    private String hotelAddress;
 
     public BusinessTravel() {
     }
 
+    public BusinessTravel(String titleCode) {
+        this.type = TITLE;
+        code = titleCode;
+    }
+
     public BusinessTravel(String cttpid, JSONObject reimbursement) {
         try {
-            this.cttpid = cttpid;
-            id = JSONUtil.getInt(reimbursement, "FPD_ID");
             title = JSONUtil.getText(reimbursement, "FPD_RES_TYPE");
-            code = JSONUtil.getText(reimbursement, "FPD_ORDER_CODE");
-            starting = JSONUtil.getText(reimbursement, "FPD_STARTING");
-            destination = JSONUtil.getText(reimbursement, "FPD_DESTINATION");
+            switch (title) {
+                case "火车票":
+                    this.type = TRAIN;
+                    trainStarting = JSONUtil.getText(reimbursement, "FPD_TRAIN_STARTING");
+                    trainDestination = JSONUtil.getText(reimbursement, "FPD_TRAIN_DESTINATION");
+                    trainStartingCode = JSONUtil.getText(reimbursement, "FPD_CITYCODE1");
+                    trainDestinationCode = JSONUtil.getText(reimbursement, "FPD_CITYCODE2");
+                    break;
+                case "飞机票":
+                    this.type = AIR;
+                    airStarting = JSONUtil.getText(reimbursement, "FPD_AIR_STARTING");
+                    airStartingCode = JSONUtil.getText(reimbursement, "FPD_CITYCODE3");
+                    airDestination = JSONUtil.getText(reimbursement, "FPD_AIR_DESTINATION");
+                    airDestinationCode = JSONUtil.getText(reimbursement, "FPD_CITYCODE4");
+                    break;
+                case "住宿":
+                    this.type = HOTEL;
+                    hotelCity = JSONUtil.getText(reimbursement, "FPD_HOTEL_CITY");
+                    hotelCityCode = JSONUtil.getText(reimbursement, "FPD_CITYCODE5");
+                    hotelAddress = JSONUtil.getText(reimbursement, "FPD_HOTEL_ADDRESS");
+                    break;
+                default:
+                    this.type = TITLE;
+            }
+            flightCode = JSONUtil.getText(reimbursement, "FPD_FLIGHT_CODE");
             startTime = JSONUtil.getLong(reimbursement, "FPD_START_TIME");
             endTime = JSONUtil.getLong(reimbursement, "FPD_END_TIME");
             status = JSONUtil.getText(reimbursement, "FPD_STATUS");
@@ -77,39 +97,54 @@ public class BusinessTravel {
             realFee = JSONUtil.getText(reimbursement, "FPD_REAL_FEE");
             expecteFee = JSONUtil.getText(reimbursement, "FPD_EXPECTE_FEE");
             level = JSONUtil.getText(reimbursement, "FPD_LEVEL");
-            city = JSONUtil.getText(reimbursement, "FPD_CITY");
-            address = JSONUtil.getText(reimbursement, "FPD_ADDRESS");
             number = JSONUtil.getInt(reimbursement, "FPD_NUMBER");
             payType = JSONUtil.getText(reimbursement, "FPD_PAY_TYPE");
             businessName = JSONUtil.getText(reimbursement, "FPD_BUSINESS_NAME");
             remark = JSONUtil.getText(reimbursement, "FPD_REMARK");
             allTime = JSONUtil.getText(reimbursement, "FPD_ALL_TIME");
-            if (StringUtil.isEmpty(title)) {
-                title = "飞机票";
-            }
+            this.cttpid = cttpid;
+            id = JSONUtil.getInt(reimbursement, "FPD_ID");
+            code = JSONUtil.getText(reimbursement, "FPD_ORDER_CODE");
             if (TextUtils.isEmpty(allTime)) {
                 allTime = longTime2Time(endTime - startTime);
             }
-            switch (title) {
-                case "火车票":
-                case "飞机票":
-                    this.type = AIR;
-                    break;
-                case "住宿":
-                    if (TextUtils.isEmpty(allTime)) {
-                        allTime = "0天";
-                    } else {
-                        allTime += "天";
-                    }
-                    this.type = HOTEL;
-                    break;
-                default:
-                    this.type = TITLE;
-            }
+
+
         } catch (Exception e) {
         }
     }
 
+
+    public String getProduct() {
+        switch (title) {
+            case "火车票":
+                return "train";
+            case "住宿":
+                return "hotel";
+            case "飞机票":
+                return "air";
+            default:
+                return "center";
+        }
+    }
+
+    public String getStarting() {
+        return type == AIR ? StringUtil.getMessage(airStarting) : StringUtil.getMessage(trainStarting);
+    }
+
+
+    public String getDestination() {
+        return type == AIR ? StringUtil.getMessage(airDestination) : StringUtil.getMessage(trainDestination);
+    }
+
+    public String getDate() {
+        return type == AIR ? (DateFormatUtil.long2Str(endTime, "yyyy-MM-dd")) : (DateFormatUtil.long2Str(startTime, "yyyy-MM-dd") + "-" + DateFormatUtil.long2Str(endTime, "yyyy-MM-dd"));
+    }
+
+    public String getTitleAndCode() {
+        return title + "   " + (StringUtil.isEmpty(code) ? "未订票" : code);
+    }
+
     private String longTime2Time(long time) {
         long second = time / 1000;
         long hh = second / 3600;
@@ -117,219 +152,150 @@ public class BusinessTravel {
         return hh + "小时" + mm + "分钟";
     }
 
-    public boolean isExpand() {
-        return expand;
-    }
-
     public void setExpand(boolean expand) {
         this.expand = expand;
     }
 
-    public int getId() {
-        return id;
+    public boolean isExpand() {
+        return expand;
     }
 
-    public void setId(int id) {
-        this.id = id;
+    public int getId() {
+        return id;
     }
 
     public int getType() {
         return type;
     }
 
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public String getAllTime() {
-        return allTime;
-    }
-
-    public String getCttpid() {
-        return StringUtil.isEmpty(cttpid) ? "****" : cttpid;
-    }
-
-    public void setAllTime(String allTime) {
-        this.allTime = allTime;
+    public int getNumber() {
+        return number;
     }
 
     public long getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-    }
-
     public long getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(long endTime) {
-        this.endTime = endTime;
+    public String getAllTime() {
+        return allTime;
     }
 
     public String getCode() {
-        return code == null ? "" : code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getStarting() {
-        return starting;
-    }
-
-    public void setStarting(String starting) {
-        this.starting = starting;
-    }
-
-    public String getDestination() {
-        return destination;
-    }
-
-    public void setDestination(String destination) {
-        this.destination = destination;
+        return code;
     }
 
     public String getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public String getOrderType() {
         return orderType;
     }
 
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
     public String getSeat() {
         return seat;
     }
 
-    public void setSeat(String seat) {
-        this.seat = seat;
-    }
-
     public String getRealFee() {
         return realFee;
     }
 
-    public void setRealFee(String realFee) {
-        this.realFee = realFee;
-    }
-
     public String getExpecteFee() {
         return expecteFee;
     }
 
-    public void setExpecteFee(String expecteFee) {
-        this.expecteFee = expecteFee;
-    }
-
     public String getLevel() {
         return level;
     }
 
-    public void setLevel(String level) {
-        this.level = level;
+    public String getPayType() {
+        return payType;
     }
 
-    public String getCity() {
-        return city;
+    public String getBusinessName() {
+        return businessName;
     }
 
-    public void setCity(String city) {
-        this.city = city;
+    public String getRemark() {
+        return remark;
     }
 
-    public String getAddress() {
-        return address == null ? "" : address;
+    public String getTitle() {
+        return title;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public String getCttpid() {
+        return cttpid;
     }
 
-    public String getPayType() {
-        return payType;
+    public String getAirStarting() {
+        return airStarting;
     }
 
-    public void setPayType(String payType) {
-        this.payType = payType;
+    public String getAirStartingCode() {
+        return StringUtil.isEmpty(airStartingCode)?(getTestAir(airStarting)):airStartingCode;
     }
 
-    public String getBusinessName() {
-        return businessName == null ? "" : businessName;
+    //TODO 测试数据
+    private String getTestAir(String air){
+        if (air.equals("南宁")){
+            return "NNG";
+        }else if (air.equals("深圳")){
+            return "SZX";
+        }
+        return "";
     }
 
-    public void setBusinessName(String businessName) {
-        this.businessName = businessName;
+    public String getAirDestination() {
+        return airDestination;
     }
 
-    public int getNumber() {
-        return number;
+    public String getAirDestinationCode() {
+        return StringUtil.isEmpty(airDestinationCode)?(getTestAir(airDestination)):airDestinationCode;
     }
 
-    public void setNumber(int number) {
-        this.number = number;
+    public String getTrainStarting() {
+        return trainStarting;
     }
 
-    public String getRemark() {
-        return remark;
+    public String getTrainStartingCode() {
+        return StringUtil.isEmpty(trainStartingCode)?(getTestTrain(trainStarting)):trainStartingCode;
     }
 
-    public void setRemark(String remark) {
-        this.remark = remark;
+    public String getTrainDestination() {
+        return trainDestination;
     }
 
-    public boolean canChange() {
-        return true;
+    public String getTrainDestinationCode() {
+        return StringUtil.isEmpty(trainDestinationCode)?(getTestTrain(trainDestination)):trainDestinationCode;
     }
 
-    public String getTitle() {
-        return title;
+    private String getTestTrain(String train){
+        if (train.equals("南宁")){
+            return "2102";
+        }else if (train.equals("深圳")){
+            return "2003";
+        }
+        return "";
     }
 
-    public String getTitleCode() {
-        String product = "";
-        switch (title) {
-            case "火车票":
-                product = "train";
-                break;
-            case "住宿":
-                product = "hotel";
-                break;
-            case "飞机票":
-                product = "air";
-                break;
-            default:
-                product = "center";
-                break;
-        }
-//        if (status != null) switch (status) {
-//            case "待改签":
-//                product += "gq";
-//                break;
-//            case "待退票":
-//                product += "tp";aQaqaaq
-//                break;
-//        }
-        return product;
+    public String getHotelCity() {
+        return hotelCity;
     }
 
+    public String getHotelCityCode() {
+        return hotelCityCode;
+    }
 
-    public String getTitleAndCode() {
-        return title + "   " + (StringUtil.isEmpty(code) ? "未订票" : code);
+    public String getFlightCode() {
+        return flightCode;
     }
 
-    public String getDate() {
-        return type == AIR ? (DateFormatUtil.long2Str(endTime, "yyyy-MM-dd")) : (DateFormatUtil.long2Str(startTime, "yyyy-MM-dd") + "-" + DateFormatUtil.long2Str(endTime, "yyyy-MM-dd"));
+    public String getHotelAddress() {
+        return hotelAddress;
     }
 }