From 2fb397e4a31d14880ed2524f898ae67a0d664c06 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 17 十二月 2024 11:24:29 +0800
Subject: [PATCH] 1.在地图中心显示中心点。 2.优化地图覆盖物显示,使显示的图标正对坐标。 3.优化地图覆盖物文字居中显示。

---
 app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 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 9bcd497..9fad7c6 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
@@ -9,6 +9,7 @@
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
@@ -131,26 +132,26 @@
                             ProResultStateId = orderDetailResult.getProResultStateId();
                             switch (ProResultStateId) {
                                 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));
-                                    binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color));
+                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.black, null));
+                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_no_bg, null));
+                                    binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color, null));
                                     binding.dealButton.setVisibility(View.VISIBLE);
                                     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.setBackgroundColor(getResources().getColor(R.color.delete_color));
+                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
+                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_wait_bg, null));
+                                    binding.dealButton.setBackgroundColor(getResources().getColor(R.color.delete_color, null));
                                     binding.dealButton.setVisibility(View.VISIBLE);
                                     binding.dealButton.setText("鍒犻櫎澶勭悊缁撴灉");
                                     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.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
+                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_finish_bg, null));
                                     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));
+                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
+                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_reject_bg, null));
                                     binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color));
                                     binding.dealButton.setVisibility(View.VISIBLE);
                                     break;
@@ -159,6 +160,16 @@
                         } else {
                             ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
                         }
+                    } else if (t.DATA_NULL.equals(t.getCode())) {
+                        //宸ュ崟宸茶鍒犻櫎
+                        ToastUtil.showToast(OrderDetailActivity.this, "璁㈠崟宸茶鍒犻櫎锛�");
+                        setResult(OrderFragment.RESULT_REFRESH);
+                        OrderDetailActivity.this.finish();
+
+                    } else {
+
+                        ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
+                        OrderDetailActivity.this.finish();
                     }
                 } else {
                     ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
@@ -170,6 +181,12 @@
                 super.onCloose();
             }
 
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                ToastUtil.showToastLong(OrderDetailActivity.this, "鑾峰彇璇︽儏澶辫触锛岃绋嶅悗鍐嶈瘯");
+                OrderDetailActivity.this.finish();
+            }
         });
     }
 

--
Gitblit v1.8.0