From c1355629eb7f4073a1c24345880ce1476754ae44 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Wed, 10 Jul 2024 17:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BAbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/auth/CertificatesActivity.java          |  7 +++++--
 .../util/http/OkHttpUtil.java                  |  4 ++++
 .../com/dahe/mylibrary/utils/ToastUtils.java   | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
index 9eba911..99a89ef 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
@@ -37,6 +37,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.dahe.mylibrary.utils.ActivityUtils;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
@@ -356,8 +357,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
                 } else {
-                    initView(null);
-                    initData();
+                    //重复代码
+//                    initView(null);
+//                    initData();
                     pathOrcRes();
                 }
                 break;
@@ -832,6 +834,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             value1.setEnabled(false);
                             Glide.with(con).load(olb.getData().getExistCarInfo().getBackImage()).into(img2);
                             url2 = olb.getData().getExistCarInfo().getBackImage();
+                            ToastUtils.showLongToast(con,"该车辆已存在,请仔细核对相关信息");
                         } else {
                             value1.setEnabled(true);
                         }
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/OkHttpUtil.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/OkHttpUtil.java
index b43e05e..990e1c9 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/OkHttpUtil.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/OkHttpUtil.java
@@ -103,6 +103,7 @@ public class OkHttpUtil {
         Request request = new Request.Builder()
                 .url(od.getUrl())
                 .addHeader("Authorization", token)
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .get()
                 .headers(hb.build())
                 .build();
@@ -133,6 +134,7 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .method("POST", body)
                 .addHeader("Authorization", token)
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .addHeader("Cookie", "JSESSIONID=NqpqKQstwceQurcNK5hjl4GnTgiF4eSzZSo5a1rz")
                 .build();
         return request;
@@ -149,6 +151,7 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .method("POST", body)
                 .addHeader("Authorization", token)
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .addHeader("Cookie", "JSESSIONID=NqpqKQstwceQurcNK5hjl4GnTgiF4eSzZSo5a1rz")
                 .build();
         return request;
@@ -167,6 +170,7 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .method("POST", body)
                 .addHeader("Authorization", token)
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .addHeader("Cookie", "JSESSIONID=NqpqKQstwceQurcNK5hjl4GnTgiF4eSzZSo5a1rz")
                 .build();
         return request;
diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/utils/ToastUtils.java b/mylibrary/src/main/java/com/dahe/mylibrary/utils/ToastUtils.java
index 5b03d72..fcea2c4 100644
--- a/mylibrary/src/main/java/com/dahe/mylibrary/utils/ToastUtils.java
+++ b/mylibrary/src/main/java/com/dahe/mylibrary/utils/ToastUtils.java
@@ -29,6 +29,24 @@ public class ToastUtils {
         }
     }
 
+    public static void showLongToast(Context mContext, String message) {
+        if (!TextUtils.isEmpty(message)) {
+
+//            if ( mToast != null) {
+//                mToast.cancel();
+//            }
+//            mToast = Toast.makeText(mContext, message, Toast.LENGTH_SHORT);
+//            mToast.show();
+
+            if (mToast == null) {
+                mToast = Toast.makeText(mContext, message, Toast.LENGTH_LONG);
+            } else {
+                mToast.setText(message);
+            }
+            mToast.show();
+        }
+    }
+
     public static void cancelToast(){
         if (mToast!=null)
             mToast.cancel();