Skip to content

android / dayu

Go to a project
Commit 860f7c8e by 罗翻
Options

将代码中汉子写到string中

parent 273f74dc
Inline Side-by-side
Showing with 117 additions and 60 deletions
app/src/main/java/com/dayu/bigfish/api/ServerException.java
package com.dayu.bigfish.api;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
/**
* Created by luofan on 2017/11/15.
* 错误码统一处理类.
......@@ -18,10 +21,10 @@ public class ServerException extends Exception {
private void processCode(String code) {
switch (code) {
case "ORDER0001":
message = "该订单不存在";
message = MyApplication.getContext().getString(R.string.order_not_exite);
break;
default:
message = "获取数据失败";
message = MyApplication.getContext().getString(R.string.get_info_failed);
break;
}
}
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderDoingAdapter.java
......@@ -72,15 +72,15 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
holder.getView(R.id.tv_item_process).setVisibility(View.VISIBLE);
final int id = item.getId();
if (TextUtils.isEmpty(item.getAppointmentTime())) {
holder.setText(R.id.item_tody, "无预期");
holder.setText(R.id.item_tody, mContext.getString(R.string.no_appointment));
holder.getView(R.id.item_time).setVisibility(View.GONE);
} else {
String dateMD = UtilsDate.changeFormat(item.getAppointmentTime(), FORMAT_ONE, SHORT_DATE_FORMAT);
String dateTime = UtilsDate.changeFormat(item.getAppointmentTime(), FORMAT_ONE, LONG_TIME_FORMAT_TWO);
if (UtilsDate.IsToday(item.getAppointmentTime())) {
holder.setText(R.id.item_tody, "今天");
holder.setText(R.id.item_tody, mContext.getString(R.string.today));
} else if (UtilsDate.IsNextday(item.getAppointmentTime())) {
holder.setText(R.id.item_tody, "明天");
holder.setText(R.id.item_tody, mContext.getString(R.string.tomorrow));
} else {
holder.setText(R.id.item_tody, dateMD);
}
......@@ -88,7 +88,7 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
holder.getView(R.id.item_time).setVisibility(View.VISIBLE);
}
if (item.getAnyContacts() == 0) {
holder.setText(R.id.item_text_user_name, "无联系人");
holder.setText(R.id.item_text_user_name, mContext.getString(R.string.no_customer));
holder.getView(R.id.item_text_user_phone).setVisibility(View.GONE);
haveCustomer = false;
} else if (item.getAnyContacts() == 1) {
......@@ -98,7 +98,7 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
haveCustomer = true;
}
if (TextUtils.isEmpty(item.getSpuName())) {
holder.setText(R.id.tv_order_detail, "无服务要求");
holder.setText(R.id.tv_order_detail, mContext.getString(R.string.no_server));
} else {
holder.setText(R.id.tv_order_detail, item.getSpuName());
}
......@@ -108,9 +108,9 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
holder.getView(R.id.item_updata_time).setVisibility(View.GONE);
holder.getView(R.id.order_line_two).setVisibility(View.GONE);
holder.getView(R.id.order_line_one).setVisibility(View.GONE);
holder.setText(R.id.item_text_phone, "接单");
holder.setText(R.id.item_text_phone, mContext.getString(R.string.receive_order));
holder.addOnClickListener(R.id.item_text_phone);
holder.setText(R.id.tv_order_time, "客户预期");
holder.setText(R.id.tv_order_time, mContext.getString(R.string.have_appointment));
break;
case 2://待预约
if (!haveCustomer) {
......@@ -122,8 +122,8 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
}
holder.getView(R.id.tv_item_process).setVisibility(View.GONE);
holder.getView(R.id.order_line_two).setVisibility(View.GONE);
holder.setText(R.id.item_updata_time, "预约时间");
holder.setText(R.id.tv_order_time, "客户预期");
holder.setText(R.id.item_updata_time, mContext.getString(R.string.appointment_time));
holder.setText(R.id.tv_order_time, mContext.getString(R.string.have_appointment));
break;
case 3://待服务
if (!haveCustomer) {
......@@ -133,16 +133,16 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
holder.getView(R.id.item_text_phone).setVisibility(View.VISIBLE);
holder.getView(R.id.order_line_one).setVisibility(View.VISIBLE);
}
holder.setText(R.id.item_updata_time, "修改预约时间");
holder.setText(R.id.item_updata_time, mContext.getString(R.string.modify_appointment_time));
if (item.getSubStatus() == 1) {
holder.setText(R.id.tv_item_process, "我已出发");
holder.setText(R.id.tv_item_process, mContext.getString(R.string.have_go_on));
} else if (item.getSubStatus() == 2) {
holder.setText(R.id.tv_item_process, "开始服务");
holder.setText(R.id.tv_item_process, mContext.getString(R.string.begain_server));
}
break;
case 4://待处理
holder.setText(R.id.item_updata_time, "需要再次上门");
holder.setText(R.id.tv_item_process, "处理工单");
holder.setText(R.id.item_updata_time, mContext.getString(R.string.need_again_door));
holder.setText(R.id.tv_item_process, mContext.getString(R.string.process_order));
if (!haveCustomer) {
holder.getView(R.id.item_text_phone).setVisibility(View.GONE);
holder.getView(R.id.order_line_one).setVisibility(View.GONE);
......@@ -151,7 +151,7 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
holder.getView(R.id.order_line_one).setVisibility(View.VISIBLE);
}
if (item.getSubStatus() == 6) {
holder.setText(R.id.tv_error_state, "[等待验收]");
holder.setText(R.id.tv_error_state, mContext.getString(R.string.check_upon_delivery));
holder.setTextColor(R.id.tv_error_state, mActivity.getResources().getColor(R.color.cl_tab_line));
holder.getView(R.id.tv_error_state).setVisibility(View.VISIBLE);
holder.getView(R.id.item_updata_time).setVisibility(View.GONE);
......@@ -168,7 +168,7 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
}
break;
case 5://已完成
holder.setText(R.id.tv_error_state, "[已完成]");
holder.setText(R.id.tv_error_state, mContext.getString(R.string.order_finish));
holder.setTextColor(R.id.tv_error_state, mActivity.getResources().getColor(R.color.cl_tab_line));
holder.getView(R.id.tv_error_state).setVisibility(View.VISIBLE);
holder.getView(R.id.item_updata_time).setVisibility(View.GONE);
......@@ -187,13 +187,13 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
break;
}
if (item.getExcptionCode() == 1) {
holder.setText(R.id.tv_error_state, "[接单超时]");
holder.setText(R.id.tv_error_state, mContext.getString(R.string.delivery_time_out));
holder.getView(R.id.tv_error_state).setVisibility(View.VISIBLE);
} else if (item.getExcptionCode() == 2) {
holder.setText(R.id.tv_error_state, "[预约超时]");
holder.setText(R.id.tv_error_state, mContext.getString(R.string.appointment_time_out));
holder.getView(R.id.tv_error_state).setVisibility(View.VISIBLE);
} else if (item.getExcptionCode() == 3) {
holder.setText(R.id.tv_error_state, "[验收超时]");
holder.setText(R.id.tv_error_state, mContext.getString(R.string.delivery_time_out));
holder.getView(R.id.tv_error_state).setVisibility(View.VISIBLE);
}
holder.getView(R.id.tv_item_process).setOnClickListener(v ->
......@@ -248,7 +248,7 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
LocationUtils.stop();
ProgressUtil.stopLoad();
mItem.setSubStatus(2);
mHolder.setText(R.id.tv_item_process, "开始服务");
mHolder.setText(R.id.tv_item_process, mContext.getString(R.string.begain_server));
}
}));
} else if (mItem.getSubStatus() == 2) {
......@@ -261,8 +261,8 @@ public class OrderDoingAdapter extends BaseQuickAdapter<Order, BaseViewHolder> {
ProgressUtil.stopLoad();
mItem.setStatus(4);
mItem.setSubStatus(integer);
mHolder.setText(R.id.tv_item_process, "处理工单");
mHolder.setText(R.id.item_updata_time, "需要再次上门");
mHolder.setText(R.id.tv_item_process, mContext.getString(R.string.process_order));
mHolder.setText(R.id.item_updata_time, mContext.getString(R.string.need_again_door));
}
}));
}
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderFourTabAdapter.java
......@@ -45,15 +45,15 @@ public class OrderFourTabAdapter extends BaseQuickAdapter<Order, BaseViewHolder>
private void initData(BaseViewHolder helper, Order item) {
try {
if (TextUtils.isEmpty(item.getCreateTime())) {
helper.setText(R.id.item_tody, "无预期");
helper.setText(R.id.item_tody, mContext.getString(R.string.no_appointment));
helper.getView(R.id.item_time).setVisibility(View.GONE);
} else {
String dateMD = UtilsDate.changeFormat(item.getAppointmentTime(), FORMAT_ONE, SHORT_DATE_FORMAT);
String dateTime = UtilsDate.changeFormat(item.getAppointmentTime(), FORMAT_ONE, LONG_TIME_FORMAT_TWO);
if (UtilsDate.IsToday(item.getAppointmentTime())) {
helper.setText(R.id.item_tody, "今天");
helper.setText(R.id.item_tody, mContext.getString(R.string.today));
} else if (UtilsDate.IsNextday(item.getAppointmentTime())) {
helper.setText(R.id.item_tody, "明天");
helper.setText(R.id.item_tody, mContext.getString(R.string.tomorrow));
} else {
helper.setText(R.id.item_tody, dateMD);
}
......@@ -67,7 +67,7 @@ public class OrderFourTabAdapter extends BaseQuickAdapter<Order, BaseViewHolder>
helper.setText(R.id.item_text_weixiu, item.getProviderName());
helper.setText(R.id.item_text_dizhi, item.getProvinceName() + item.getCityName() +
item.getDistrictName() + item.getAddress());
helper.setText(R.id.error_state,"[已取消]");
helper.setText(R.id.error_state,mContext.getString(R.string.order_cancle));
} catch (Exception e) {
e.printStackTrace();
}
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderThreeTabAdapter.java
......@@ -35,15 +35,15 @@ public class OrderThreeTabAdapter extends BaseQuickAdapter<ErrorOrder, BaseViewH
private void initData(BaseViewHolder helper, ErrorOrder item) {
try {
if (TextUtils.isEmpty(item.getCreateTime())) {
helper.setText(R.id.item_tody, "无预期");
helper.setText(R.id.item_tody, mContext.getString(R.string.no_appointment));
helper.getView(R.id.item_time).setVisibility(View.GONE);
} else {
String dateMD = UtilsDate.changeFormat(item.getAppointmentTime(), FORMAT_ONE, SHORT_DATE_FORMAT);
String dateTime = UtilsDate.changeFormat(item.getAppointmentTime(), FORMAT_ONE, LONG_TIME_FORMAT_TWO);
if (UtilsDate.IsToday(item.getAppointmentTime())) {
helper.setText(R.id.item_tody, "今天");
helper.setText(R.id.item_tody, mContext.getString(R.string.today));
} else if (UtilsDate.IsNextday(item.getAppointmentTime())) {
helper.setText(R.id.item_tody, "明天");
helper.setText(R.id.item_tody, mContext.getString(R.string.tomorrow));
} else {
helper.setText(R.id.item_tody, dateMD);
}
......@@ -63,13 +63,13 @@ public class OrderThreeTabAdapter extends BaseQuickAdapter<ErrorOrder, BaseViewH
int errorState = item.getExcptionCode();
if (errorState == 1) {
helper.setText(R.id.error_state,"[" + "接单超时" + "]");
helper.setText(R.id.error_state, mContext.getString(R.string.receive_time_out));
} else if (errorState == 2) {
helper.setText(R.id.error_state,"[" + "预约超时" + "]");
helper.setText(R.id.error_state, mContext.getString(R.string.appointment_time_out));
} else if (errorState == 3) {
helper.setText(R.id.error_state,"[" + "服务超时" + "]");
helper.setText(R.id.error_state, mContext.getString(R.string.server_time_out));
} else if (errorState == 4) {
helper.setText(R.id.error_state,"[" + "验收超时" + "]");
helper.setText(R.id.error_state, mContext.getString(R.string.delivery_time_out));
}
}
......
app/src/main/java/com/dayu/bigfish/ui/adapter/SystemMessageAdapter.java
......@@ -40,9 +40,9 @@ public class SystemMessageAdapter extends BaseQuickAdapter<NewMessage, BaseViewH
String dateMD = UtilsDate.changeFormat(item.getCreateTime(), FORMAT_ONE, SHORT_DATE_FORMAT);
String dateTime = UtilsDate.changeFormat(item.getCreateTime(), FORMAT_ONE, LONG_TIME_FORMAT_TWO);
if (UtilsDate.IsToday(item.getCreateTime())) {
helper.setText(R.id.message_date, "今天");
helper.setText(R.id.message_date, mContext.getString(R.string.today));
} else if (UtilsDate.IsNextday(item.getCreateTime())) {
helper.setText(R.id.message_date, "明天");
helper.setText(R.id.message_date, mContext.getString(R.string.tomorrow));
} else {
helper.setText(R.id.message_date, dateMD);
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageTabFragment.java
......@@ -62,8 +62,8 @@ public class HomeMessageTabFragment extends BaseFragment<HomeMessagePresenter> i
messageViewPager.setAdapter(fragmentAdapter);
messageTablayout.setupWithViewPager(messageViewPager);
messageTablayout.removeAllTabs();
messageTablayout.addTab(messageTablayout.newTab().setText("系统通知"));
messageTablayout.addTab(messageTablayout.newTab().setText("大鱼通知"));
messageTablayout.addTab(messageTablayout.newTab().setText(mActivity.getString(R.string.message_system)));
messageTablayout.addTab(messageTablayout.newTab().setText(mActivity.getString(R.string.message_dayu)));
messageTablayout.setTabMode(TabLayout.MODE_FIXED);
TabLayoutUtils.setIndicator(messageTablayout, 60, 60, R.color.cl_receiving_order_item_data, getActivity());
if (mIndex != -1) {
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java
......@@ -51,7 +51,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
private int userId;
private TextView mTabNumTv;
private TextView mTabTextTv;
private int mSelectedTab;
private boolean isFirstAddTab = true;
public final static int SUBCRIBE_TIME = 2;//预约上门时间
public final static int ORDER_YUYUE = 3;//修改预约时间
......@@ -60,7 +59,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
public final static int ORDER_FINISH = 6;//已完成
public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成
private int mTabIndex;
private String[] tabDesc = new String[]{"待预约", "待服务", "异常单", "已取消"};
private String[] tabDesc;
public static HomeOrderFragment newInstance() {
Bundle args = new Bundle();
......@@ -92,6 +91,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
}
public void init() {
tabDesc = new String[]{mActivity.getString(R.string.waite_appointemnt), mActivity.getString(R.string.waite_server), mActivity.getString(R.string.order_exception), mActivity.getString(R.string.cancle_order)};
userId = GetUserInfo.getACCOUNT_ID(mActivity);
EventBus.getDefault().register(this);
}
......@@ -120,7 +120,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter> implemen
@Override
public void onTabSelected(TabLayout.Tab tab) {
int temp = tab.getPosition();
mSelectedTab = temp;
if (tab.getCustomView() == null) {
return;
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
......@@ -149,20 +149,20 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen
personName.setText(userName);
SPUtils.put(mActivity, "USER_NAME", userName);
if (info.getGender() == 1) {
personSex.setText("男");
personSex.setText(mActivity.getString(R.string.man));
} else if (info.getGender() == 0) {
personSex.setText("女");
personSex.setText(mActivity.getString(R.string.female));
} else {
personSex.setText("未知");
personSex.setText(mActivity.getString(R.string.unknown));
}
personAge.setText(info.getAge() + "岁");
personAge.setText(info.getAge() + mActivity.getString(R.string.age));
userPhone = info.getMobile();
personPhone.setText(userPhone);
SPUtils.put(mActivity, "USER_PHONE", userPhone);
}
private void showAlertDialog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, "您还没有设置账户"
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, mActivity.getString(R.string.not_set_account)
, new CustomDialog.OnCloseListener() {
@Override
public void onClick(Dialog dialog, boolean confirm) {
......@@ -175,9 +175,9 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen
dialog.dismiss();
}
});
dialog.setTitle("提示")
.setNegativeButton("暂不设置")
.setPositiveButton("前往设置");
dialog.setTitle(mActivity.getString(R.string.notice))
.setNegativeButton(mActivity.getString(R.string.not_set_account))
.setPositiveButton(mActivity.getString(R.string.go_set_up));
dialog.show();
}
......@@ -198,7 +198,7 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter> implemen
//工单记录
textGongdanNum.setText(record.getOrderRecord() + "");
//个人评分
personEvaluate.setText(record.getScore() + "分");
personEvaluate.setText(record.getScore() + mActivity.getString(R.string.score));
evaluate = record.getScore() + "";
drawStars(personEvaluateXing, evaluate, "5");
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsFragment.java
......@@ -123,19 +123,19 @@ public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter> imp
// status 工单状态 1未接单2未预约3已预约4进行中5已完成6已取消7订单关闭
orderStatu = dataBean.getStatus();
if (orderStatu == 1) {
textTwoTwo.setText("未接单");
textTwoTwo.setText(mActivity.getString(R.string.message_dayu));
} else if (orderStatu == 2) {
textTwoTwo.setText("未预约");
textTwoTwo.setText(mActivity.getString(R.string.not_appointment_already));
} else if (orderStatu == 3) {
textTwoTwo.setText("已预约");
textTwoTwo.setText(mActivity.getString(R.string.appointment_already));
} else if (orderStatu == 4) {
textTwoTwo.setText("进行中");
textTwoTwo.setText(mActivity.getString(R.string.order_doing));
} else if (orderStatu == 5) {
textTwoTwo.setText("已完成");
textTwoTwo.setText(mActivity.getString(R.string.finish_order));
} else if (orderStatu == 6) {
textTwoTwo.setText("已取消");
textTwoTwo.setText(mActivity.getString(R.string.order_cancle));
} else if (orderStatu == 7) {
textTwoTwo.setText("订单关闭");
textTwoTwo.setText(mActivity.getString(R.string.order_close));
}
//服务商名称
if (!TextUtils.isEmpty(dataBean.getSpuName())) {
......
app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java
......@@ -81,9 +81,9 @@ public class HxManager {
info.setCustomJson(customJsonBean);
String title = "";
if (info.getCategory() == 1) {
title = "系统通知";
title = mContext.getString(R.string.message_system);
} else if (info.getCategory() == 2) {
title = "大鱼通知";
title = mContext.getString(R.string.message_dayu);
}
Intent intent = new Intent(mContext, MainActivity.class);
intent.putExtra(Constants.MESSAGE_INFO, info);
......
app/src/main/res/values/strings.xml
......@@ -129,6 +129,61 @@
<string name="order_title">我的工单</string>
<string name="order_history">工单历史</string>
<string name="webview_title">sop</string>
<string name="order_not_exite">该订单不存在</string>
<string name="get_info_failed">获取数据失败</string>
<string name="no_appointment">无预期</string>
<string name="have_appointment">客户预期</string>
<string name="no_customer">无联系人</string>
<string name="no_server">无服务要求</string>
<string name="today">今天</string>
<string name="tomorrow">明天</string>
<string name="receive_order">接单</string>
<string name="not_receive_order">未接单</string>
<string name="appointment_time">预约时间</string>
<string name="modify_appointment_time">修改预约时间</string>
<string name="have_go_on">我已出发</string>
<string name="begain_server">开始服务</string>
<string name="process_order">处理工单</string>
<string name="check_upon_delivery">[等待验收]</string>
<string name="order_finish">[已完成]</string>
<string name="order_cancle">[已取消]</string>
<string name="receive_time_out">[接单超时]</string>
<string name="appointment_time_out">[预约超时]</string>
<string name="delivery_time_out">[验收超时]</string>
<string name="server_time_out">[服务超时]</string>
<string name="need_again_door">需要再次上门</string>
<string name="waite_appointemnt">待预约</string>
<string name="waite_server">待服务</string>
<string name="order_exception">异常单</string>
<string name="cancle_order">已取消</string>
<string name="appointment_already">已预约</string>
<string name="not_appointment_already">未预约</string>
<string name="order_doing">进行中</string>
<string name="finish_order">已完成</string>
<string name="order_close">订单关闭</string>
<string name="personal_customer">个人客户</string>
<string name="enterprise_customer">企业客户</string>
<string name="no_branch">暂无品牌</string>
<string name="no_model">暂无型号</string>
<string name="honai">保内</string>
<string name="warranty">保外</string>
<string name="element">元</string>
<string name="remarks">暂无备注</string>
<string name="stop">收起</string>
<string name="look_more">查看更多</string>
<!--消息-->
<string name="message_system">系统通知</string>
<string name="message_dayu">大鱼通知</string>
<!--我的-->
<string name="man">男</string>
<string name="female">女</string>
<string name="unknown">未知</string>
<string name="age">岁</string>
<string name="score">分</string>
<string name="not_set_account">您还没有设置账户</string>
<string name="not_set_up">暂不设置</string>
<string name="go_set_up">前往设置</string>
<string name="agreement">
特别提示：\n
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment