From f352932fa940cbe2288bd1ce6a65a3386995652d Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 9 Nov 2023 14:54:09 +0800
Subject: [PATCH] =?UTF-8?q?3.3.3=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 ++--
 .../ui/home/HuoYunDelActivity.java            | 21 ++++++++++++-------
 .../shangchuan/ShangChuangImgActivity.java    |  3 ++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c5ecccb..67eacea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId "com.arpa.hndahesudintocctmsdriver"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 62
-        versionName "3.3.2"
+        versionCode 63
+        versionName "3.3.3"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
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 c5db3a2..72addce 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
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -102,14 +103,18 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
 //                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
-
-
-                        Intent intent = new Intent(this, H5Activity.class);
-                        intent.putExtra("url", (String) bb.getData());
-                        intent.putExtra("view_file", false);
-                        startActivity(intent);
-
-
+                        if (null==bb.getData()){
+                            UiAuxiliary.homeRequest("接单");
+                            Intent in = new Intent(con, StartYunDanActivity.class);
+                            in.putExtra("id", "0");
+                            startActivity(in);
+                            finish();
+                        }else{
+                            Intent intent = new Intent(this, H5Activity.class);
+                            intent.putExtra("url", (String) bb.getData());
+                            intent.putExtra("view_file", false);
+                            startActivity(intent);
+                        }
                         //finish();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
index 78047ab..9106336 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
@@ -19,6 +19,7 @@ import com.alct.mdp.callback.OnResultListener;
 import com.alct.mdp.model.Goods;
 import com.alct.mdp.model.Image;
 import com.alct.mdp.model.Location;
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
@@ -190,7 +191,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //                if(index==1 || index==2){
 //                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
 //                }
-                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
+                if ((index == 0 || index == 1) && !BuildConfig.isTest) {//装卸货车辆需要识别车牌号,测试环境不校验车牌号
                     new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
                 } else {
                     hyr.uploadFile(new File(path));