From cabbe363a906dbe14f0fd9a37571846df6929465 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 28 Nov 2024 11:17:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E4=B8=9A=E8=B5=84=E6=A0=BCloading?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/auth/PhotoCarActivity.java                 | 15 +++++++++++----
 .../ui/home/HomeFragment.java                     | 13 +++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
index af5075b..e159439 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.auth;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
+import android.text.InputType;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -110,8 +111,9 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                 }
 
                 if (CacheGroup.cacheList.get("ORCRoadLicZj") != null) {
+                    if (customDialog != null && customDialog.isShowing())
+                        customDialog.dismiss();
                     OCRRoadBean ib = new Gson().fromJson(CacheGroup.cacheList.get("ORCRoadLicZj"), OCRRoadBean.class);
-                    customDialog.dismiss();
                     if (ib.getCode() == 200 && ib.getData() != null) {
                         value1.setText(PatternUtils.getNumByStr(ib.getData().getLicenseNumber()));
                     } else {
@@ -155,8 +157,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                 }
 
                 if (CacheGroup.cacheList.get("saveCarImg") != null) {
-                    if (customDialog != null && customDialog.isShowing())
-                        customDialog.dismiss();
+                    if (type!=3){
+                        if (customDialog != null && customDialog.isShowing())
+                            customDialog.dismiss();
+                    }
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("saveCarImg"), BaseBean.class);
                     if (bb.getCode() == 200) {
                         switch (type) {
@@ -171,7 +175,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                 break;
                             case 3:
                                 ur.vehicleDelTwo(carId);
-                                Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show();
+//                                Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show();
                                 break;
                             case 4:
                                 Toast.makeText(con, "交强险证件上传成功", Toast.LENGTH_SHORT).show();
@@ -635,8 +639,11 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         tvSkip.setVisibility(isShowSkip[type] ? View.GONE : View.VISIBLE);
         llInfo.setVisibility(isShowEdit[type] ? View.VISIBLE : View.GONE);
         if (type == 4) {
+            value1.setInputType(InputType.TYPE_CLASS_TEXT);
             llDate.setVisibility(View.VISIBLE);
             title3.setText("保险公司");
+        }else {
+            value1.setInputType(InputType.TYPE_CLASS_NUMBER);
         }
     }
 
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
index 182872e..79c1308 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
@@ -1274,6 +1274,19 @@ public class HomeFragment extends BaseFragment {
         initView(null);
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        refreshWaybills();
+    }
+
+    private void refreshWaybills(){
+//        if (UiAuxiliary.isLogin(con)) {
+//            int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1);
+//            hyr.startOrder(curWaybillId == -1 ? 0 : curWaybillId);
+//        }
+    }
+
     @Subscribe
     public void processResult(HomeWaybillEvent home) {
         if (home.getMessage() == 1) {