Skip to content

android / dayu

Go to a project
Commit 784415bd by mReturn
Options

工单列表添加预警状态判断

parent 341e10f4
Inline Side-by-side
Showing with 54 additions and 40 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -60,19 +60,19 @@ public class Constants {
/**
* uat测试环境配置.
*/
// public static String ENVIROMENT = "uat";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.95.223.6:3112";
// public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
// public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 14; //小绿人商家id
public static String ENVIROMENT = "uat";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.95.223.6:3112";
public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 14; //小绿人商家id
......@@ -80,19 +80,19 @@ public class Constants {
/**
* 正式环境.
*/
public static String ENVIROMENT = "release";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.kf.ai";
public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id
// public static String ENVIROMENT = "release";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.kf.ai";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
......@@ -63,6 +63,15 @@ public class Order implements Serializable{
private int version;
private String greenManStatus;
private int createProviderId;
private int alerted; //2开启预警 1或者空为未开启预警
public int getAlerted() {
return alerted;
}
public void setAlerted(int alerted) {
this.alerted = alerted;
}
public int getCreateProviderId() {
return createProviderId;
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -148,7 +148,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment));
time = item.getAppointmentTime();
setTimeStatus(holder, time);
setTimeStatus(holder,item, time);
break;
case 3://待服务
holder.tvItemProcess.setVisibility(View.GONE);
......@@ -170,7 +170,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
}
time = item.getConfirmDoorTime();
setTimeStatus(holder, time);
setTimeStatus(holder, item, time);
break;
case 4://待处理
holder.tvItemProcess.setVisibility(View.GONE);
......@@ -206,7 +206,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.orderLineTwo.setVisibility(View.VISIBLE);
}
time = item.getConfirmDoorTime();
setTimeStatus(holder, time);
setTimeStatus(holder, item, time);
break;
case 5://已完成
// holder.tvErrorState.setText(mContext.getString(R.string.order_finish));
......@@ -340,20 +340,25 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
}
//根据时间状态设置不同颜色
private void setTimeStatus(FragmentOrderdoingItemBinding holder, String time) {
long timeDiff = CommonUtils.caluteTimeDiff(time);
double timeMin = timeDiff / 60000.0; //相差分钟数
if (timeMin < 0) {
private void setTimeStatus(FragmentOrderdoingItemBinding holder, Order item, String time) {
if (item.getAlerted() == 2){
holder.itemTody.setTextColor(Color.parseColor("#FF5A4B"));
holder.itemTime.setTextColor(Color.parseColor("#FF5A4B"));
} else if (timeMin < 120) {
holder.itemTody.setTextColor(Color.parseColor("#ffbe2d"));
holder.itemTime.setTextColor(Color.parseColor("#ffbe2d"));
} else {
holder.itemTody.setTextColor(Color.parseColor("#FF3FAAFC"));
holder.itemTime.setTextColor(Color.parseColor("#FF3FAAFC"));
}else{
long timeDiff = CommonUtils.caluteTimeDiff(time);
double timeMin = timeDiff / 60000.0; //相差分钟数
if (timeMin < 0) {
holder.itemTody.setTextColor(Color.parseColor("#FF5A4B"));
holder.itemTime.setTextColor(Color.parseColor("#FF5A4B"));
} else if (timeMin < 120) {
holder.itemTody.setTextColor(Color.parseColor("#ffbe2d"));
holder.itemTime.setTextColor(Color.parseColor("#ffbe2d"));
} else {
holder.itemTody.setTextColor(Color.parseColor("#FF3FAAFC"));
holder.itemTime.setTextColor(Color.parseColor("#FF3FAAFC"));
}
}
}
......
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