From 7d62e8848cf01a4f6f9e9f675ac54b5a74482edd Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 16 Jan 2025 16:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E7=BB=9C=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8D=95=E5=80=92=E8=AE=A1=E6=97=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java | 6 ++++++
 .../hndahesudintocctmsdriver/util/http/RequestUtil.java     | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
index b56e07f..e9783ea 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
@@ -46,6 +46,7 @@ import com.arpa.hndahesudintocctmsdriver.ui.MainActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.PersonalAuthActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
+import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.img.ImageGetUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
@@ -200,6 +201,11 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove("orderStatus");
                 }
                 break;
+            case RequsetCodeConstants.ERROR:
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                break;
             case 13:
                 int index = Integer.valueOf((String) m.obj);
                 Log.e("--选择车辆--", clb.getData().get(index).getCarNumber());
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/RequestUtil.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/RequestUtil.java
index a969bc5..1fd055c 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/RequestUtil.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/RequestUtil.java
@@ -16,6 +16,7 @@ import com.arpa.hndahesudintocctmsdriver.util.time.Timer;
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -48,7 +49,7 @@ public class RequestUtil {
 
     public static void a1(final String name, Request re, Context con, final Handler hd){
         Log.e("请求开始","........");
-        OkHttpClient client = new OkHttpClient().newBuilder()
+        OkHttpClient client = new OkHttpClient().newBuilder().connectTimeout(30, TimeUnit.SECONDS)
                 .build();
         client.newCall(re).enqueue( new Callback() {
             @Override
@@ -96,7 +97,7 @@ public class RequestUtil {
     }
     public static void a1s(final String name, Request re, Context con, final Handler hd){
         Log.e("请求开始","........");
-        OkHttpClient client = new OkHttpClient().newBuilder()
+        OkHttpClient client = new OkHttpClient().newBuilder().connectTimeout(30, TimeUnit.SECONDS)
                 .build();
         client.newCall(re).enqueue( new Callback() {
             @Override