Skip to content

android / dayu

Go to a project
Commit 398a05f3 by mReturn
Options

工单收发货显示具体时间

parents a3b12e00 784415bd
Inline Side-by-side
Showing with 16 additions and 20 deletions
.idea/modules.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" /> <module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/beauty/beauty.iml" filepath="$PROJECT_DIR$/beauty/beauty.iml" /> <module fileurl="file://$PROJECT_DIR$/beauty/beauty.iml" filepath="$PROJECT_DIR$/beauty/beauty.iml" />
<module fileurl="file://$PROJECT_DIR$/camera/camera.iml" filepath="$PROJECT_DIR$/camera/camera.iml" /> <module fileurl="file://$PROJECT_DIR$/camera/camera.iml" filepath="$PROJECT_DIR$/camera/camera.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" /> <module fileurl="file://$PROJECT_DIR$/dayu-saas-android00.iml" filepath="$PROJECT_DIR$/dayu-saas-android00.iml" />
<module fileurl="file://$PROJECT_DIR$/learnCenter/learnCenter.iml" filepath="$PROJECT_DIR$/learnCenter/learnCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/learnCenter/learnCenter.iml" filepath="$PROJECT_DIR$/learnCenter/learnCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/liveModule/liveModule.iml" filepath="$PROJECT_DIR$/liveModule/liveModule.iml" /> <module fileurl="file://$PROJECT_DIR$/liveModule/liveModule.iml" filepath="$PROJECT_DIR$/liveModule/liveModule.iml" />
<module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" /> <module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" />
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
...@@ -63,23 +63,14 @@ public class Order implements Serializable{ ...@@ -63,23 +63,14 @@ public class Order implements Serializable{
private int version; private int version;
private String greenManStatus; private String greenManStatus;
private int createProviderId; private int createProviderId;
private double latitude; private int alerted; //2开启预警 1或者空为未开启预警
private double longitude;
public double getLatitude() { public int getAlerted() {
return latitude; return alerted;
} }
public void setLatitude(double latitude) { public void setAlerted(int alerted) {
this.latitude = latitude; this.alerted = alerted;
}
public double getLongitude() {
return longitude;
}
public void setLongitude(double longitude) {
this.longitude = longitude;
} }
public int getCreateProviderId() { public int getCreateProviderId() {
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -149,7 +149,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -149,7 +149,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment)); holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment));
time = item.getAppointmentTime(); time = item.getAppointmentTime();
setTimeStatus(holder, time); setTimeStatus(holder,item, time);
break; break;
case 3://待服务 case 3://待服务
holder.tvItemProcess.setVisibility(View.GONE); holder.tvItemProcess.setVisibility(View.GONE);
...@@ -171,7 +171,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -171,7 +171,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server)); holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
} }
time = item.getConfirmDoorTime(); time = item.getConfirmDoorTime();
setTimeStatus(holder, time); setTimeStatus(holder, item, time);
break; break;
case 4://待处理 case 4://待处理
holder.tvItemProcess.setVisibility(View.GONE); holder.tvItemProcess.setVisibility(View.GONE);
...@@ -207,7 +207,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -207,7 +207,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.orderLineTwo.setVisibility(View.VISIBLE); holder.orderLineTwo.setVisibility(View.VISIBLE);
} }
time = item.getConfirmDoorTime(); time = item.getConfirmDoorTime();
setTimeStatus(holder, time); setTimeStatus(holder, item, time);
break; break;
case 5://已完成 case 5://已完成
// holder.tvErrorState.setText(mContext.getString(R.string.order_finish)); // holder.tvErrorState.setText(mContext.getString(R.string.order_finish));
...@@ -341,7 +341,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -341,7 +341,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} }
//根据时间状态设置不同颜色 //根据时间状态设置不同颜色
private void setTimeStatus(FragmentOrderdoingItemBinding holder, String time) { 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{
long timeDiff = CommonUtils.caluteTimeDiff(time); long timeDiff = CommonUtils.caluteTimeDiff(time);
double timeMin = timeDiff / 60000.0; //相差分钟数 double timeMin = timeDiff / 60000.0; //相差分钟数
if (timeMin < 0) { if (timeMin < 0) {
...@@ -353,10 +357,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -353,10 +357,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else { } else {
holder.itemTody.setTextColor(Color.parseColor("#FF3FAAFC")); holder.itemTody.setTextColor(Color.parseColor("#FF3FAAFC"));
holder.itemTime.setTextColor(Color.parseColor("#FF3FAAFC")); holder.itemTime.setTextColor(Color.parseColor("#FF3FAAFC"));
} }
} }
}
private void processClickNew(Order it, FragmentOrderdoingItemBinding h, int posiiton) { private void processClickNew(Order it, FragmentOrderdoingItemBinding h, int posiiton) {
mItem = it; mItem = it;
......
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