From db26bdf173e4a9e9a24d7422e7bf7c4ab3bf20fc Mon Sep 17 00:00:00 2001
From: mReturn <1058851652@qq.com>
Date: Mon, 16 Nov 2020 09:53:08 +0800
Subject: [PATCH] 服务工单添加紧急状态标识
---
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java | 9 +++++++++
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java | 2 ++
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java | 1 +
orderCenter/src/main/res/layout/fragment_multi_detail.xml | 26 ++++++++++++++++++++++++--
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml | 11 +++++++++++
userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java | 8 ++++++++
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java | 1 +
7 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java b/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
index 5c61748..f2daef2 100644
--- a/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
+++ b/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
@@ -82,6 +82,15 @@ public class OrderDetail implements Serializable {
private double subsidyPrice;
private int createProviderId;
private int version;
+ private int alerted;
+
+ public int getAlerted() {
+ return alerted;
+ }
+
+ public void setAlerted(int alerted) {
+ this.alerted = alerted;
+ }
public int getVersion() {
return version;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java b/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
index 799b2e4..c223292 100755
--- a/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
@@ -345,7 +345,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (item.getAlerted() == 2){
holder.itemTody.setTextColor(Color.parseColor("#FF5A4B"));
holder.itemTime.setTextColor(Color.parseColor("#FF5A4B"));
+ holder.tvAlert.setVisibility(View.VISIBLE);
}else{
+ holder.tvAlert.setVisibility(View.GONE);
long timeDiff = CommonUtils.caluteTimeDiff(time);
double timeMin = timeDiff / 60000.0; //相差分钟数
if (timeMin < 0) {
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
index fdebef1..4c866b4 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
@@ -92,6 +92,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
initInfoView(detail);
getShowPriceData();
}
+ mBind.tvAlert.setText(detail.getAlerted() == 2 ? "紧急" : "正常");
mServerAdapter = new CoreAdapter<>(false);
mBind.rlServerContent.setLayoutManager(new LinearLayoutManager(mActivity));
mServerAdapter.setViewType(R.layout.item_detail_server_info);
diff --git a/orderCenter/src/main/res/layout/fragment_multi_detail.xml b/orderCenter/src/main/res/layout/fragment_multi_detail.xml
index c66822c..e012f4f 100644
--- a/orderCenter/src/main/res/layout/fragment_multi_detail.xml
+++ b/orderCenter/src/main/res/layout/fragment_multi_detail.xml
@@ -86,10 +86,32 @@
android:textSize="14sp" />
<TextView
- android:id="@+id/tv_content"
+ android:id="@+id/tv_alert0"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/tv_state"
+ android:layout_marginTop="15dp"
+ android:text="优 先 级"
+ android:textColor="@color/tv_cl"
+ android:textSize="14sp" />
+
+ <TextView
+ android:id="@+id/tv_alert"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_state"
+ android:layout_marginLeft="19dp"
+ android:textColor="@color/common_text_color"
+ android:layout_marginTop="@dimen/dp_15"
+ android:layout_toRightOf="@+id/tv_alert0"
+ android:text="正常"
+ android:textSize="14sp" />
+
+ <TextView
+ android:id="@+id/tv_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/tv_alert0"
android:layout_marginTop="15dp"
android:text="@string/server_content"
android:textColor="@color/tv_cl"
@@ -99,7 +121,7 @@
android:id="@+id/ll_server_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/tv_state"
+ android:layout_below="@id/tv_alert0"
android:layout_marginLeft="19dp"
android:layout_marginTop="15dp"
android:layout_toRightOf="@+id/tv_content">
diff --git a/orderCenter/src/main/res/layout/fragment_orderdoing_item.xml b/orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
index efb30a5..d3eb79a 100755
--- a/orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
+++ b/orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
@@ -69,6 +69,17 @@
android:textColor="@color/cl_tab_read"
android:textSize="14sp"
android:visibility="gone" />
+ <TextView
+ android:id="@+id/tv_alert"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:layout_marginTop="3dp"
+ android:textColor="@color/cl_tab_read"
+ android:text="紧急"
+ android:textSize="14sp"
+ android:visibility="gone"
+ />
</LinearLayout>
<ImageView
diff --git a/userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java b/userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
index f583832..613639d 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
@@ -37,7 +37,15 @@ public class EngineerInfo extends BaseObservable implements Serializable {
private int liveStatus;
private int lianmaiStatus;
private String nickName;
+ private int detectStatus;
+ public int getDetectStatus() {
+ return detectStatus;
+ }
+
+ public void setDetectStatus(int detectStatus) {
+ this.detectStatus = detectStatus;
+ }
public String getNickName() {
return nickName;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
index 4cb2c28..f3a7484 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
@@ -218,6 +218,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
private void saveUserInfo(EngineerInfo info) {
UserInfo userInfo = UserManager.getInstance().getUser();
if (userInfo != null) {
+ userInfo.setDetectStatus(info.getDetectStatus());
userInfo.setAccountName(info.getRealName());
userInfo.setHeaderImg(info.getAccountUrl());
userInfo.setNickName(info.getNickName());
--
libgit2 0.25.0