From fafdeae594f79bad8133837e5cde239afca4da54 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 06 十二月 2024 16:13:02 +0800
Subject: [PATCH] 1.优化工单列表状态显示 2.接口添加token失效判断，失效后跳转到登录界面。
---
app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
index 9d7f7e9..2c6dad0 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
@@ -4,9 +4,12 @@
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
+import android.view.View;
import androidx.annotation.Nullable;
+import com.dayu.pipirrapp.R;
+import com.dayu.pipirrapp.bean.net.DealDetailResult;
import com.dayu.pipirrapp.bean.net.OrderDetailResult;
import com.dayu.pipirrapp.databinding.ActivityOrderDetailBinding;
import com.dayu.pipirrapp.net.ApiManager;
@@ -30,6 +33,7 @@
public class OrderDetailActivity extends BaseActivity {
ActivityOrderDetailBinding binding;
String workOrderId;
+ String proResultId;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -43,12 +47,18 @@
void initView() {
workOrderId = this.getIntent().getStringExtra("workOrderId");
+ if (this.getIntent().hasExtra("proResultId")) {
+ proResultId = this.getIntent().getStringExtra("proResultId");
+ getHandleData(proResultId);
+ }
if (!TextUtils.isEmpty(workOrderId)) {
getMarkerData(workOrderId);
} else {
this.finish();
ToastUtil.showToastLong(this, "褰撳墠workOrderId涓虹┖");
}
+
+
binding.setItemclidk(OrderDetailActivity.this);
}
@@ -59,13 +69,70 @@
private void getMarkerData(String workOrderId) {
Map<String, Object> params = new HashMap<>();
params.put("workOrderId", workOrderId);
- ApiManager.getInstance().requestGetHideLoading(this, Constants.BASE_URL + "/app/workOrder/getOneWorkOrder", OrderDetailResult.class, params, new SubscriberListener<BaseResponse<OrderDetailResult>>() {
+ ApiManager.getInstance().requestGet(this, Constants.BASE_URL + "/app/workOrder/getOneWorkOrder", OrderDetailResult.class, params, new SubscriberListener<BaseResponse<OrderDetailResult>>() {
@Override
public void onNext(BaseResponse<OrderDetailResult> t) {
if (t.isSuccess()) {
if (t.isSuccess()) {
if (t.getContent() != null) {
- binding.setData(t.getContent());
+ OrderDetailResult orderDetailResult = t.getContent();
+ binding.setData(orderDetailResult);
+ if (!TextUtils.isEmpty(t.getContent().getProResultId()) && TextUtils.isEmpty(proResultId)) {
+ getHandleData(orderDetailResult.getProResultId());
+ }
+ switch (orderDetailResult.getProResultStateId()) {
+ case 0://鏈笂鎶�
+ binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.black));
+ binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_no_bg));
+ break;
+ case 1://宸蹭笂鎶�
+ binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white));
+ binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_wait_bg));
+ binding.dealButton.setVisibility(View.GONE);
+ break;
+ case 2://宸插畬鎴�
+ binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white));
+ binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_finish_bg));
+ binding.dealButton.setVisibility(View.GONE);
+ break;
+ case 3://琚┏鍥�
+ binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white));
+ binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_reject_bg));
+ break;
+
+ }
+ } else {
+ ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
+ }
+ }
+ } else {
+ ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
+ }
+ }
+
+ @Override
+ public void onCloose() {
+ super.onCloose();
+ }
+
+ });
+ }
+
+
+ /**
+ * 鑾峰彇澶勭悊璇︽儏
+ */
+ private void getHandleData(String proResultId) {
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("proResultId", proResultId);
+ ApiManager.getInstance().requestGet(this, Constants.BASE_URL + "/app/workOrder/getProResult", DealDetailResult.class, params, new SubscriberListener<BaseResponse<DealDetailResult>>() {
+ @Override
+ public void onNext(BaseResponse<DealDetailResult> t) {
+ if (t.isSuccess()) {
+ if (t.isSuccess()) {
+ if (t.getContent() != null) {
+ binding.setDealData(t.getContent());
} else {
ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
}
@@ -87,7 +154,7 @@
public void startDealActivity() {
Intent intent = new Intent(this, OrderDealActivity.class);
intent.putExtra("workOrderId", workOrderId);
- startActivity(intent);
+ startActivityForResult(intent, 1);
}
}
--
Gitblit v1.8.0