h5title优化

app/build.gradle

@@ -33,12 +33,13 @@ android {
 //        }
     }
 
+
     defaultConfig {
         applicationId "com.arpa.hndahesudintocctmsdriver"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 30
-        versionCode 60
+        versionCode 72
-        versionName "3.3.0"
+        versionName "3.4.2"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -101,11 +102,12 @@ android {
                                     app_icon     : "@drawable/diver_logo_text",
                                     GAODEKEY     : "6791d69f6221a0841b521763af86eb01",
                                     JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
                                     JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
             ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
-            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
+            buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:8080/api/\"")
+//            buildConfigField("String", "BASE_URL", "\"http://linux.local:8080/api/\"")
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "司机测试"
@@ -114,9 +116,9 @@ android {
             applicationId "com.arpa.hndahesudintocctmsdriver"
             manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机",
                                     app_icon     : "@drawable/diver_logo",
-                                    GAODEKEY     : "78019612271411eca3af34db91930620",
+                                    GAODEKEY     : "9480fd96746922630e9bf6c75a101059",
                                     JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
                                     JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
             ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")

app/src/main/AndroidManifest.xml

@@ -53,7 +53,7 @@
         android:name="com.arpa.hndahesudintocctmsdriver.App"
         android:allowBackup="true"
         android:excludeFromRecents="true"
-        android:icon="${app_icon}"
+        android:icon="@mipmap/diver_logo"
         android:label="@string/appName"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
@@ -93,6 +93,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"  />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
@@ -160,6 +161,7 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
@@ -169,6 +171,7 @@
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -274,7 +277,7 @@
         <!-- 极光-->
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="571d93ae5117da6dee848c92" /> <!-- </>值来自开发者平台取得的AppKey -->
+            android:value="fba6f55621c670d8c1fe9191" /> <!-- </>值来自开发者平台取得的AppKey -->
 
         <meta-data
             android:name="JPUSH_CHANNEL"
@@ -377,6 +380,27 @@
             </intent-filter>
         </activity>
 
+
+        <activity
+            android:name=".H5Activity2"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="demo"
+                    android:path="/signBack"
+                    android:scheme="esign" />
+                <data
+                    android:host="demo"
+                    android:path="/realBack"
+                    android:scheme="esign" />
+            </intent-filter>
+        </activity>
+
         <service
             android:name="com.arpa.hndahesudintocctmsdriver.push.XService"
             android:enabled="true"

app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java

@@ -63,8 +63,8 @@ public class App extends Application {
                 }
                 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
                 // 路由初始化
-                JVerificationInterface.setDebugMode(true);
+//                JVerificationInterface.setDebugMode(true);
-                JVerificationInterface.init(this, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+//                JVerificationInterface.init(this, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
                 //友盟
                 //设置非debug版本开启
                 if (!isDebugVersion(con)) {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java

@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver;
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -40,10 +41,12 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop;
 import com.arpa.hndahesudintocctmsdriver.event.FaceEvent;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
+import com.arpa.hndahesudintocctmsdriver.ui.MainActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.dahe.mylibrary.utils.ActivityUtils;
 import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.h5.base.WBH5FaceVerifySDK;
@@ -73,25 +76,38 @@ public class H5Activity extends AppCompatActivity {
 
     String curUrl = null;
     boolean viewFile = false;
+    boolean isGoCar = false;
 
     long time = System.currentTimeMillis();
 
     ValueCallback<Uri> uploadMessage;
     private ValueCallback<Uri[]> uploadMessageAboveL;
     private final static int FILE_CHOOSER_RESULT_CODE = 10000;
+    private Context ctx;
+    private boolean isOk = false;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.setContentView(R.layout.activity_h5);
-
+        ctx = this;
 
         mWebView = findViewById(R.id.webview);
         ImageView back = findViewById(R.id.back);
         TextView close = findViewById(R.id.close);
+        TextView tvTitle = findViewById(R.id.tv_title);
         WebSettings webSetting = mWebView.getSettings();
 
+        String title = getIntent().getStringExtra("title");
+        if (!TextUtils.isEmpty(title)){
+            tvTitle.setText(title);
+        }
+
         back.setOnClickListener(v -> {
+            if (isOk){
+                ActivityUtils.finishToActivity(MainActivity.class,false);
+                return;
+            }
             if (mWebView.canGoBack()) {
                 mWebView.goBack();
             } else {
@@ -100,6 +116,10 @@ public class H5Activity extends AppCompatActivity {
         });
 
         close.setOnClickListener(v -> {
+            if (isOk){
+                ActivityUtils.finishToActivity(MainActivity.class,false);
+                return;
+            }
             if (mWebView.canGoBack()) {
                 mWebView.goBack();
             } else {
@@ -114,6 +134,9 @@ public class H5Activity extends AppCompatActivity {
         webSetting.setLoadWithOverviewMode(true);
         webSetting.setAllowFileAccess(true);
         webSetting.setAppCacheEnabled(true);
+        webSetting.setAllowContentAccess(true);
+        webSetting.setLoadsImagesAutomatically(true);
+        webSetting.setMediaPlaybackRequiresUserGesture(true);
         String appCachePath = getApplication().getCacheDir().getAbsolutePath();
         webSetting.setAppCachePath(appCachePath);
         webSetting.setDatabaseEnabled(true);
@@ -180,6 +203,7 @@ public class H5Activity extends AppCompatActivity {
     private void processExtraData() {
 
         Intent intent = getIntent();
+        isGoCar = intent.getBooleanExtra("isGoCar", false);
         Uri uri = intent.getData();
         Log.e("test", "===" + uri);
         if (uri != null) {
@@ -225,6 +249,17 @@ public class H5Activity extends AppCompatActivity {
             Uri uri = Uri.parse(url);
             Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " ");
             if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) {
+                if (isGoCar&&url.startsWith("http://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")){
+                    isOk = true;
+                    view.loadUrl(url);
+                    new MessageUtils().showSimCenPop(ctx, "个人信息上传成功，请添加车辆信息!", "去添加",() -> {
+                        Intent in = new Intent(ctx, CertificatesActivity.class);
+                        in.putExtra("index", 2);
+                        startActivity(in);
+                        ActivityUtils.finishToActivity(MainActivity.class,false);
+                    });
+                    return true;
+                }
                 view.loadUrl(url);
                 return true;
             } else if (uri.getScheme().equals("js") || uri.getScheme().equals("jsbridge")) {
@@ -261,6 +296,12 @@ public class H5Activity extends AppCompatActivity {
                     // 实名认证结束 返回按钮/倒计时返回/暂不认证
                     boolean status = uri.getBooleanQueryParameter("status", false);
                     if (status) {
+                        //认证成功返回
+                        new Handler().postDelayed(() -> {
+                            FaceEvent he = new FaceEvent("刷脸成功");
+                            EventBus.getDefault().post(he);
+                            finish();
+                        }, 800);
                         //认证成功返回
                         Toast.makeText(H5Activity.this, "认证成功", Toast.LENGTH_LONG).show();
                         finish();
@@ -278,6 +319,12 @@ public class H5Activity extends AppCompatActivity {
                 boolean status = uri.getBooleanQueryParameter("status", false);
                 if (status) {
                     //认证成功返回
+                    //认证成功返回
+                    new Handler().postDelayed(() -> {
+                        FaceEvent he = new FaceEvent("刷脸成功");
+                        EventBus.getDefault().post(he);
+                        finish();
+                    }, 800);
                     Toast.makeText(H5Activity.this, "认证成功", Toast.LENGTH_LONG).show();
                     finish();
                 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity2.java

@@ -0,0 +1,485 @@
+package com.arpa.hndahesudintocctmsdriver;
+
+import static android.webkit.WebSettings.LOAD_NO_CACHE;
+
+import android.Manifest;
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.net.http.SslError;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.webkit.ConsoleMessage;
+import android.webkit.CookieManager;
+import android.webkit.CookieSyncManager;
+import android.webkit.JsPromptResult;
+import android.webkit.JsResult;
+import android.webkit.PermissionRequest;
+import android.webkit.SslErrorHandler;
+import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
+import com.arpa.hndahesudintocctmsdriver.event.FaceEvent;
+import com.arpa.hndahesudintocctmsdriver.util.statusbar.StatusBar;
+import com.esign.esignsdk.h5.base.WBH5FaceVerifySDK;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import pub.devrel.easypermissions.EasyPermissions;
+import qiu.niorgai.StatusBarCompat;
+
+/**
+ * @author xingtian on 2019/3/25
+ */
+public class H5Activity2 extends AppCompatActivity {
+
+    public static final int REQUEST_PERMISSION_STORAGE = 0x00;
+    public static final int REQUEST_PERMISSION_CAMERA = 0x01;
+
+    public final static String SCHEMA_REAL = "esign://demo/realBack";
+
+    public final static String SCHEMA_SIGN = "esign://demo/signBack";
+
+    private WebView mWebView;
+
+    String curUrl = null;
+    boolean viewFile = false;
+
+    long time = System.currentTimeMillis();
+
+    ValueCallback<Uri> uploadMessage;
+    private ValueCallback<Uri[]> uploadMessageAboveL;
+    private final static int FILE_CHOOSER_RESULT_CODE = 10000;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        super.setContentView(R.layout.activity_h5);
+        StatusBarCompat.setStatusBarColor(this, ContextCompat.getColor(this, R.color.white), 0);
+        StatusBar.changeToLightStatusBar(this);  //黑色 下边白色
+
+        mWebView = findViewById(R.id.webview);
+//        ImageView back = findViewById(R.id.back);
+//        TextView close = findViewById(R.id.close);
+        WebSettings webSetting = mWebView.getSettings();
+
+//        back.setOnClickListener(v -> {
+//            if (mWebView.canGoBack()) {
+//                mWebView.goBack();
+//            } else {
+//                finish();
+//            }
+//        });
+//
+//        close.setOnClickListener(v -> {
+//            if (mWebView.canGoBack()) {
+//                mWebView.goBack();
+//            } else {
+//                finish();
+//            }
+//        });
+
+        webSetting.setJavaScriptEnabled(true);
+        webSetting.setDomStorageEnabled(true);
+//        webSetting.setAppCacheMaxSize(1024 * 1024 * 8);
+        webSetting.setUseWideViewPort(true);
+        webSetting.setLoadWithOverviewMode(true);
+        webSetting.setAllowFileAccess(true);
+//        webSetting.setAppCacheEnabled(true);
+        String appCachePath = getApplication().getCacheDir().getAbsolutePath();
+//        webSetting.setAppCachePath(appCachePath);
+        webSetting.setDatabaseEnabled(true);
+        webSetting.setCacheMode(LOAD_NO_CACHE);
+        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            WebView.setWebContentsDebuggingEnabled(true);
+        }
+
+        CookieSyncManager.createInstance(this);
+        CookieManager cookieManager = CookieManager.getInstance();
+        if (Build.VERSION.SDK_INT >= 21) {
+            cookieManager.setAcceptThirdPartyCookies(mWebView, true);
+        }
+        cookieManager.setAcceptCookie(true);
+
+
+        mWebView.setWebViewClient(new MyWebViewClient());
+        mWebView.setWebChromeClient(new H5FaceWebChromeClient(this));
+
+        WBH5FaceVerifySDK.getInstance().setWebViewSettings(mWebView, getApplicationContext());
+
+        processExtraData();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mWebView.onPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mWebView.onResume();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mWebView.stopLoading();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        try {
+            if (mWebView != null) {
+                mWebView.removeAllViews();
+                mWebView.destroy();
+            }
+        } catch (Exception e) {
+        }
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        processExtraData();
+    }
+
+    private void processExtraData() {
+
+        Intent intent = getIntent();
+        Uri uri = intent.getData();
+        Log.e("test", "===" + uri);
+        if (uri != null) {
+            // 芝麻认证刷脸结束返回获取后续操作页面地址
+//            String callbackUrl = uri.getQueryParameter("callback");
+
+            String callbackUrl = uri.getQueryParameter("realnameUrl");
+            if (!TextUtils.isEmpty(callbackUrl)) {
+                try {
+                    mWebView.loadUrl(URLDecoder.decode(callbackUrl, "utf-8"));
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+            }
+
+        } else {
+            String url = intent.getStringExtra("url");
+            viewFile = intent.getBooleanExtra("view_file", false);
+            if (url.startsWith("alipay")) {
+
+                try {
+                    Intent intent2 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                    startActivity(intent2);
+                    return;
+                } catch (Exception e) {
+                }
+            }
+            if (curUrl == null) {
+                curUrl = url;
+            }
+            mWebView.loadUrl(url);
+        }
+
+    }
+
+    private class MyWebViewClient extends WebViewClient {
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            if (url == null) {
+                return false;
+            }
+
+            Uri uri = Uri.parse(url);
+            Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " ");
+            if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) {
+                view.loadUrl(url);
+                return true;
+            } else if (uri.getScheme().equals("js") || uri.getScheme().equals("jsbridge")) {
+
+                // js://signCallback?signResult=true  签署结果
+                if (uri.getAuthority().equals("signCallback")) {
+                    if (viewFile) {
+                        view.loadUrl(curUrl);
+                        return true;
+                    } else {
+                        if (url.contains("signResult")) {
+                            boolean signResult = uri.getBooleanQueryParameter("signResult", false);
+                            Toast.makeText(H5Activity2.this, "签署结果： " + " signResult = " + signResult, Toast.LENGTH_LONG).show();
+                        } else {
+                            String tsignCode = uri.getQueryParameter("tsignCode");
+                            if ("0".equals(tsignCode)) {
+                                tsignCode = "签署成功";
+                            } else {
+                                tsignCode = "签署失败";
+                            }
+                            Toast.makeText(H5Activity2.this, "签署结果： " + tsignCode, Toast.LENGTH_LONG).show();
+                        }
+                    }
+                    finish();
+                }
+
+                //js://tsignRealBack?esignAppScheme=esign://app/callback&serviceId=854677892133554052&verifycode=4a52e2af0d0abfb7b285c4f05b5af133&status=true&passed=true
+                //实名结果
+                if (uri.getAuthority().equals("tsignRealBack")) {
+                    //实名结果字段
+                    if (uri.getQueryParameter("verifycode") != null) {
+                        String realVerifyCode = uri.getQueryParameter("verifycode");
+                    }
+                    // 实名认证结束 返回按钮/倒计时返回/暂不认证
+                    boolean status = uri.getBooleanQueryParameter("status", false);
+                    if (status) {
+                        //认证成功返回
+                        new Handler().postDelayed(() -> {
+                            FaceEvent he = new FaceEvent("刷脸成功");
+                            EventBus.getDefault().post(he);
+                            finish();
+                        }, 800);
+                        Toast.makeText(H5Activity2.this, "认证成功", Toast.LENGTH_LONG).show();
+//                        finish();
+                    }
+                }
+                return true;
+            } else if (url.startsWith(SCHEMA_REAL)) {
+                //esign://app/realBack&serviceId=854677892133554052&verifycode=4a52e2af0d0abfb7b285c4f05b5af133&status=true&passed=true
+
+                //实名结果
+                if (uri.getQueryParameter("verifycode") != null) {
+                    String realVerifyCode = uri.getQueryParameter("verifycode");
+                }
+                // 实名认证结束 返回按钮/倒计时返回/暂不认证
+                boolean status = uri.getBooleanQueryParameter("status", false);
+                if (status) {
+                    //认证成功返回
+                    new Handler().postDelayed(() -> {
+                        FaceEvent he = new FaceEvent("刷脸成功");
+                        EventBus.getDefault().post(he);
+                        finish();
+                    }, 800);
+                    Toast.makeText(H5Activity2.this, "认证成功", Toast.LENGTH_LONG).show();
+//                    finish();
+                }
+
+                return true;
+            } else if (url.startsWith(SCHEMA_SIGN)) {
+                // js://signCallback?signResult=true  签署结果
+                if (url.contains("signResult")) {
+                    boolean signResult = uri.getBooleanQueryParameter("signResult", false);
+                    Toast.makeText(H5Activity2.this, "签署结果： " + " signResult = " + signResult, Toast.LENGTH_LONG).show();
+                } else {
+                    String tsignCode = uri.getQueryParameter("tsignCode");
+                    if ("0".equals(tsignCode)) {
+                        //延时1.5秒跳转运单详情页面
+//                        new Handler().postDelayed(() -> {
+//                            FaceEvent he = new FaceEvent("刷脸成功");
+//                            EventBus.getDefault().post(he);
+//                            finish();
+//                        }, 800);
+                        tsignCode = "签署成功";
+                    } else {
+                        tsignCode = "签署失败";
+                    }
+                    Toast.makeText(H5Activity2.this, "签署结果： " + tsignCode, Toast.LENGTH_LONG).show();
+                }
+//                finish();
+                return true;
+            } else if (uri.getScheme().equals("alipays")) {
+                // 跳转到支付宝刷脸
+                // alipays://platformapi/startapp?appId=20000067&pd=NO&url=https%3A%2F%2Fzmcustprod.zmxy.com.cn%2Fcertify%2Fbegin.htm%3Ftoken%3DZM201811133000000050500431389414
+                try {
+                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                    startActivity(intent);
+                    return true;
+                } catch (Exception e) {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+            super.onReceivedError(view, request, error);
+        }
+
+        @Override
+        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+//            super.onReceivedSslError(view, handler, error);
+            handler.proceed();
+        }
+
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            super.onPageStarted(view, url, favicon);
+            time = System.currentTimeMillis();
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            super.onPageFinished(view, url);
+        }
+
+        @Override
+        public void onLoadResource(WebView view, String url) {
+            super.onLoadResource(view, url);
+        }
+    }
+
+
+    public class H5FaceWebChromeClient extends WebChromeClient {
+        private Activity activity;
+
+        public H5FaceWebChromeClient(Activity mActivity) {
+            this.activity = mActivity;
+        }
+
+
+        @Override
+        public void onReceivedTitle(WebView view, String title) {
+        }
+
+        @Override
+        public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
+            return super.onJsPrompt(view, url, message, defaultValue, result);
+        }
+
+        @Override
+        public boolean onJsConfirm(WebView view, String url, String message, JsResult result) {
+            return super.onJsConfirm(view, url, message, result);
+        }
+
+        @TargetApi(8)
+        @Override
+        public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
+            return super.onConsoleMessage(consoleMessage);
+        }
+
+        public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType) {
+            if (WBH5FaceVerifySDK.getInstance().recordVideoForApiBelow21(uploadMsg, acceptType, activity)) {
+                return;
+            }
+            uploadMessage = uploadMsg;
+        }
+
+        public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
+            if (WBH5FaceVerifySDK.getInstance().recordVideoForApiBelow21(uploadMsg, acceptType, activity)) {
+                return;
+            }
+            uploadMessage = uploadMessage;
+        }
+
+        @TargetApi(21)
+        @Override
+        public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+            if (WBH5FaceVerifySDK.getInstance().recordVideoForApi21(webView, filePathCallback, activity, fileChooserParams)) {
+                return true;
+            }
+            uploadMessageAboveL = filePathCallback;
+            recordVideo(H5Activity2.this);
+            return true;
+        }
+
+        @Override
+        public void onPermissionRequest(PermissionRequest request) {
+            request.grant(request.getResources());
+            request.getOrigin();
+        }
+    }
+
+    public void recordVideo(Activity activity) {
+        if (EasyPermissions.hasPermissions(activity, Manifest.permission.CAMERA)) {
+            try {
+                Intent intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
+                intent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1);
+                intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                intent.putExtra("android.intent.extras.CAMERA_FACING", 1); // 调用前置摄像头
+                activity.startActivityForResult(intent, FILE_CHOOSER_RESULT_CODE);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            EasyPermissions.requestPermissions(activity, "请同意使用相机功能", REQUEST_PERMISSION_CAMERA, Manifest.permission.CAMERA);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (mWebView.canGoBack()) {
+                mWebView.goBack();
+            } else {
+                finish();
+            }
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (WBH5FaceVerifySDK.getInstance().receiveH5FaceVerifyResult(requestCode, resultCode, data)) {
+            return;
+        }
+
+        if (requestCode == FILE_CHOOSER_RESULT_CODE) {
+            if (null == uploadMessage && null == uploadMessageAboveL) {
+                return;
+            }
+            Uri result = data == null || resultCode != RESULT_OK ? null : data.getData();
+            if (uploadMessageAboveL != null) {
+                if (resultCode == RESULT_OK) {
+                    uploadMessageAboveL.onReceiveValue(new Uri[]{result});
+                    uploadMessageAboveL = null;
+                } else {
+                    uploadMessageAboveL.onReceiveValue(new Uri[]{});
+                    uploadMessageAboveL = null;
+                }
+            } else if (uploadMessage != null) {
+                if (resultCode == RESULT_OK) {
+                    uploadMessage.onReceiveValue(result);
+                    uploadMessage = null;
+                } else {
+                    uploadMessage.onReceiveValue(Uri.EMPTY);
+                    uploadMessage = null;
+                }
+            }
+        }
+
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        WBH5FaceVerifySDK.getInstance().recordVideo(this);
+    }
+
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/AppInfoBean.java

@@ -0,0 +1,157 @@
+package com.arpa.hndahesudintocctmsdriver.bean;
+
+import android.os.Build;
+import android.provider.Settings;
+
+import androidx.activity.result.contract.ActivityResultContracts;
+
+import com.arpa.hndahesudintocctmsdriver.App;
+import com.dahe.mylibrary.utils.AppUtils;
+
+import java.util.Locale;
+
+/**
+ * @ClassName AppInfoBean
+ * @Author john
+ * @Date 2024/7/22 15:31
+ * @Description TODO
+ */
+public class AppInfoBean {
+    private String userPhone;
+    private String macIpaddr = Settings.Secure.getString(App.getApp().getContentResolver(),Settings.Secure.ANDROID_ID);
+//    private String macIpaddr = android.os.Build.ID;
+    private String clientSource = "driver";
+    private String status = "";
+    private String mobilePhoneManufacturerName = android.os.Build.BRAND;
+    private String mobilePhoneProductName = android.os.Build.MODEL;
+    private String mobilePhoneMotherboardName = android.os.Build.BOARD;
+    private String mobilePhoneHardwareName = android.os.Build.DEVICE;
+    private String mobilePhoneMachineSystemLanguage = Locale.getDefault().getLanguage();
+    private String androidVersion=android.os.Build.VERSION.RELEASE;
+    private String androidSystemSdk = android.os.Build.VERSION.SDK_INT+"";
+    private String appVersionName = AppUtils.getAppVersionName();
+    private String appVersionNumber = AppUtils.getAppVersionCode()+"";
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getMacIpaddr() {
+        return macIpaddr;
+    }
+
+    public void setMacIpaddr(String macIpaddr) {
+        this.macIpaddr = macIpaddr;
+    }
+
+    public String getClientSource() {
+        return clientSource;
+    }
+
+    public void setClientSource(String clientSource) {
+        this.clientSource = clientSource;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getMobilePhoneManufacturerName() {
+        return mobilePhoneManufacturerName;
+    }
+
+    public void setMobilePhoneManufacturerName(String mobilePhoneManufacturerName) {
+        this.mobilePhoneManufacturerName = mobilePhoneManufacturerName;
+    }
+
+    public String getMobilePhoneProductName() {
+        return mobilePhoneProductName;
+    }
+
+    public void setMobilePhoneProductName(String mobilePhoneProductName) {
+        this.mobilePhoneProductName = mobilePhoneProductName;
+    }
+
+    public String getMobilePhoneMotherboardName() {
+        return mobilePhoneMotherboardName;
+    }
+
+    public void setMobilePhoneMotherboardName(String mobilePhoneMotherboardName) {
+        this.mobilePhoneMotherboardName = mobilePhoneMotherboardName;
+    }
+
+    public String getMobilePhoneHardwareName() {
+        return mobilePhoneHardwareName;
+    }
+
+    public void setMobilePhoneHardwareName(String mobilePhoneHardwareName) {
+        this.mobilePhoneHardwareName = mobilePhoneHardwareName;
+    }
+
+    public String getMobilePhoneMachineSystemLanguage() {
+        return mobilePhoneMachineSystemLanguage;
+    }
+
+    public void setMobilePhoneMachineSystemLanguage(String mobilePhoneMachineSystemLanguage) {
+        this.mobilePhoneMachineSystemLanguage = mobilePhoneMachineSystemLanguage;
+    }
+
+    public String getAndroidVersion() {
+        return androidVersion;
+    }
+
+    public void setAndroidVersion(String androidVersion) {
+        this.androidVersion = androidVersion;
+    }
+
+    public String getAndroidSystemSdk() {
+        return androidSystemSdk;
+    }
+
+    public void setAndroidSystemSdk(String androidSystemSdk) {
+        this.androidSystemSdk = androidSystemSdk;
+    }
+
+    public String getAppVersionName() {
+        return appVersionName;
+    }
+
+    public void setAppVersionName(String appVersionName) {
+        this.appVersionName = appVersionName;
+    }
+
+    public String getAppVersionNumber() {
+        return appVersionNumber;
+    }
+
+    public void setAppVersionNumber(String appVersionNumber) {
+        this.appVersionNumber = appVersionNumber;
+    }
+
+    @Override
+    public String toString() {
+        return "AppInfoBean{" +
+                "userPhone='" + userPhone + '\'' +
+                ", macIpaddr='" + macIpaddr + '\'' +
+                ", clientSource='" + clientSource + '\'' +
+                ", status='" + status + '\'' +
+                ", mobilePhoneManufacturerName='" + mobilePhoneManufacturerName + '\'' +
+                ", mobilePhoneProductName='" + mobilePhoneProductName + '\'' +
+                ", mobilePhoneMotherboardName='" + mobilePhoneMotherboardName + '\'' +
+                ", mobilePhoneHardwareName='" + mobilePhoneHardwareName + '\'' +
+                ", mobilePhoneMachineSystemLanguage='" + mobilePhoneMachineSystemLanguage + '\'' +
+                ", androidVersion='" + androidVersion + '\'' +
+                ", androidSystemSdk='" + androidSystemSdk + '\'' +
+                ", appVersionName='" + appVersionName + '\'' +
+                ", appVersionNumber='" + appVersionNumber + '\'' +
+                '}';
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarDelBean.java

@@ -66,6 +66,11 @@ public class CarDelBean {
         private String owner;
         private String roadLicense;
         private String roadLicensePhoto;
+        private String trailerLicenseId;
+
+        private String policyPhotoUrl;
+        private String insuranceCompany;
+        private String insuranceEndDay;
         private String roadLicenseSend;
         private String roadLicenseValidity;
         private String threeImage;
@@ -79,6 +84,14 @@ public class CarDelBean {
         private String carPlateColorValue;
         private String needUpQCPhoto;
 
+        public String getTrailerLicenseId() {
+            return trailerLicenseId;
+        }
+
+        public void setTrailerLicenseId(String trailerLicenseId) {
+            this.trailerLicenseId = trailerLicenseId;
+        }
+
         public String getNeedUpQCPhoto() {
             return needUpQCPhoto;
         }
@@ -95,6 +108,30 @@ public class CarDelBean {
             this.carPlateColorValue = carPlateColorValue;
         }
 
+        public String getPolicyPhotoUrl() {
+            return policyPhotoUrl == null ? "" : policyPhotoUrl;
+        }
+
+        public void setPolicyPhotoUrl(String policyPhotoUrl) {
+            this.policyPhotoUrl = policyPhotoUrl;
+        }
+
+        public String getInsuranceCompany() {
+            return insuranceCompany == null ? "" : insuranceCompany;
+        }
+
+        public void setInsuranceCompany(String insuranceCompany) {
+            this.insuranceCompany = insuranceCompany;
+        }
+
+        public String getInsuranceEndDay() {
+            return insuranceEndDay == null ? "" : insuranceEndDay;
+        }
+
+        public void setInsuranceEndDay(String insuranceEndDay) {
+            this.insuranceEndDay = insuranceEndDay;
+        }
+
         public String getCarEnergyTypValue() {
             return carEnergyTypValue;
         }
@@ -271,6 +308,15 @@ public class CarDelBean {
             private String threeImage;
             private String type;
             private String vehicleNumber;
+            private String trailerLicenseId;
+
+            public String getTrailerLicenseId() {
+                return trailerLicenseId;
+            }
+
+            public void setTrailerLicenseId(String trailerLicenseId) {
+                this.trailerLicenseId = trailerLicenseId;
+            }
 
             public String getBackImage() {
                 return backImage == null ? "" : backImage;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarInfoBean2.java

@@ -0,0 +1,386 @@
+package com.arpa.hndahesudintocctmsdriver.bean;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName CarInfoBean2
+ * @Author john
+ * @Date 2024/11/20 15:43
+ * @Description TODO
+ */
+public class CarInfoBean2 implements Serializable {
+
+
+    private int code;
+    private DataDTO data;
+    private String msg;
+    private String remark;
+    private int res;
+    private boolean success;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public DataDTO getData() {
+        return data;
+    }
+
+    public void setData(DataDTO data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getRes() {
+        return res;
+    }
+
+    public void setRes(int res) {
+        this.res = res;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public static class DataDTO {
+        private String allAuality;
+        private String allCapacity;
+        private String approvedCapacity;
+        private String auditStatus;
+        private String auditTime;
+        private String backImage;
+        private String backStatus;
+        private String backTime;
+        private String carId;
+        private String carNumber;
+        private String checkRecord;
+        private String createTime;
+        private String dateIssue;
+        private String engineNumber;
+        private String fileNumber;
+        private String frontImage;
+        private String frontStatus;
+        private String frontTime;
+        private String fuelType;
+        private String id;
+        private String model;
+        private String nature;
+        private String organizationName;
+        private String owner;
+        private String personCapacity;
+        private String registerDate;
+        private String remark;
+        private String size;
+        private String threeImage;
+        private String threeImageStatus;
+        private String towAuality;
+        private String trailer;
+        private String type;
+        private String vehicleAxis;
+        private String vehicleNumber;
+
+        public String getAllAuality() {
+            return allAuality;
+        }
+
+        public void setAllAuality(String allAuality) {
+            this.allAuality = allAuality;
+        }
+
+        public String getAllCapacity() {
+            return allCapacity;
+        }
+
+        public void setAllCapacity(String allCapacity) {
+            this.allCapacity = allCapacity;
+        }
+
+        public String getApprovedCapacity() {
+            return approvedCapacity;
+        }
+
+        public void setApprovedCapacity(String approvedCapacity) {
+            this.approvedCapacity = approvedCapacity;
+        }
+
+        public String getAuditStatus() {
+            return auditStatus;
+        }
+
+        public void setAuditStatus(String auditStatus) {
+            this.auditStatus = auditStatus;
+        }
+
+        public String getAuditTime() {
+            return auditTime;
+        }
+
+        public void setAuditTime(String auditTime) {
+            this.auditTime = auditTime;
+        }
+
+        public String getBackImage() {
+            return backImage;
+        }
+
+        public void setBackImage(String backImage) {
+            this.backImage = backImage;
+        }
+
+        public String getBackStatus() {
+            return backStatus;
+        }
+
+        public void setBackStatus(String backStatus) {
+            this.backStatus = backStatus;
+        }
+
+        public String getBackTime() {
+            return backTime;
+        }
+
+        public void setBackTime(String backTime) {
+            this.backTime = backTime;
+        }
+
+        public String getCarId() {
+            return carId;
+        }
+
+        public void setCarId(String carId) {
+            this.carId = carId;
+        }
+
+        public String getCarNumber() {
+            return carNumber;
+        }
+
+        public void setCarNumber(String carNumber) {
+            this.carNumber = carNumber;
+        }
+
+        public String getCheckRecord() {
+            return checkRecord;
+        }
+
+        public void setCheckRecord(String checkRecord) {
+            this.checkRecord = checkRecord;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getDateIssue() {
+            return dateIssue;
+        }
+
+        public void setDateIssue(String dateIssue) {
+            this.dateIssue = dateIssue;
+        }
+
+        public String getEngineNumber() {
+            return engineNumber;
+        }
+
+        public void setEngineNumber(String engineNumber) {
+            this.engineNumber = engineNumber;
+        }
+
+        public String getFileNumber() {
+            return fileNumber;
+        }
+
+        public void setFileNumber(String fileNumber) {
+            this.fileNumber = fileNumber;
+        }
+
+        public String getFrontImage() {
+            return frontImage;
+        }
+
+        public void setFrontImage(String frontImage) {
+            this.frontImage = frontImage;
+        }
+
+        public String getFrontStatus() {
+            return frontStatus;
+        }
+
+        public void setFrontStatus(String frontStatus) {
+            this.frontStatus = frontStatus;
+        }
+
+        public String getFrontTime() {
+            return frontTime;
+        }
+
+        public void setFrontTime(String frontTime) {
+            this.frontTime = frontTime;
+        }
+
+        public String getFuelType() {
+            return fuelType;
+        }
+
+        public void setFuelType(String fuelType) {
+            this.fuelType = fuelType;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getModel() {
+            return model;
+        }
+
+        public void setModel(String model) {
+            this.model = model;
+        }
+
+        public String getNature() {
+            return nature;
+        }
+
+        public void setNature(String nature) {
+            this.nature = nature;
+        }
+
+        public String getOrganizationName() {
+            return organizationName;
+        }
+
+        public void setOrganizationName(String organizationName) {
+            this.organizationName = organizationName;
+        }
+
+        public String getOwner() {
+            return owner;
+        }
+
+        public void setOwner(String owner) {
+            this.owner = owner;
+        }
+
+        public String getPersonCapacity() {
+            return personCapacity;
+        }
+
+        public void setPersonCapacity(String personCapacity) {
+            this.personCapacity = personCapacity;
+        }
+
+        public String getRegisterDate() {
+            return registerDate;
+        }
+
+        public void setRegisterDate(String registerDate) {
+            this.registerDate = registerDate;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public String getSize() {
+            return size;
+        }
+
+        public void setSize(String size) {
+            this.size = size;
+        }
+
+        public String getThreeImage() {
+            return threeImage;
+        }
+
+        public void setThreeImage(String threeImage) {
+            this.threeImage = threeImage;
+        }
+
+        public String getThreeImageStatus() {
+            return threeImageStatus;
+        }
+
+        public void setThreeImageStatus(String threeImageStatus) {
+            this.threeImageStatus = threeImageStatus;
+        }
+
+        public String getTowAuality() {
+            return towAuality;
+        }
+
+        public void setTowAuality(String towAuality) {
+            this.towAuality = towAuality;
+        }
+
+        public String getTrailer() {
+            return trailer;
+        }
+
+        public void setTrailer(String trailer) {
+            this.trailer = trailer;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getVehicleAxis() {
+            return vehicleAxis;
+        }
+
+        public void setVehicleAxis(String vehicleAxis) {
+            this.vehicleAxis = vehicleAxis;
+        }
+
+        public String getVehicleNumber() {
+            return vehicleNumber;
+        }
+
+        public void setVehicleNumber(String vehicleNumber) {
+            this.vehicleNumber = vehicleNumber;
+        }
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverAuthDataBean.java

@@ -57,12 +57,15 @@ public class DriverAuthDataBean {
         private String idcardValidity;
         private String dirverAllowType;
         private int idcardPhoto;
+        private String bankImgUrl;
+        private String bankName;
+        private String cardNo;
         private int idcardBackPhoto;
         private Object idcardPhotoHold;
         private String idcardAddress;
         private String idcardName;
         private int idcardSex;
-        private int idCardStatus;
+        private int idCardStatus;//身份证认证状态；-1未提交 0待认证 1认证通过 2认证失败
         private int driverLicenseStatus;
         private int qualificationCertificateStatus;
         private String idCardReason;
@@ -141,6 +144,30 @@ public class DriverAuthDataBean {
         private Object mbindStatus;
         private Object mreason;
 
+        public String getBankImgUrl() {
+            return bankImgUrl;
+        }
+
+        public void setBankImgUrl(String bankImgUrl) {
+            this.bankImgUrl = bankImgUrl;
+        }
+
+        public String getBankName() {
+            return bankName;
+        }
+
+        public void setBankName(String bankName) {
+            this.bankName = bankName;
+        }
+
+        public String getCardNo() {
+            return cardNo;
+        }
+
+        public void setCardNo(String cardNo) {
+            this.cardNo = cardNo;
+        }
+
         public int getId() {
             return id;
         }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverExpireBean.java

@@ -48,6 +48,33 @@ public class DriverExpireBean {
     public static class DataDTO {
         private String driverLicenseUpdateUrl;
         private String idCardUpdateUrl;
+        private String qualificationUpdateUrl;
+        private String roadLicenseUpdateUrl;
+        private String insuranceUpdateUrl;
+
+        public String getRoadLicenseUpdateUrl() {
+            return roadLicenseUpdateUrl;
+        }
+
+        public void setRoadLicenseUpdateUrl(String roadLicenseUpdateUrl) {
+            this.roadLicenseUpdateUrl = roadLicenseUpdateUrl;
+        }
+
+        public String getInsuranceUpdateUrl() {
+            return insuranceUpdateUrl;
+        }
+
+        public void setInsuranceUpdateUrl(String insuranceUpdateUrl) {
+            this.insuranceUpdateUrl = insuranceUpdateUrl;
+        }
+
+        public String getQualificationUpdateUrl() {
+            return qualificationUpdateUrl;
+        }
+
+        public void setQualificationUpdateUrl(String qualificationUpdateUrl) {
+            this.qualificationUpdateUrl = qualificationUpdateUrl;
+        }
 
         public String getDriverLicenseUpdateUrl() {
             return driverLicenseUpdateUrl;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverUpBean.java

@@ -0,0 +1,328 @@
+package com.arpa.hndahesudintocctmsdriver.bean;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName DriverUpBean
+ * @Author john
+ * @Date 2024/11/20 09:20
+ * @Description TODO
+ */
+public class DriverUpBean implements Serializable {
+
+    private String frontImageUrl;
+    private String backImageUrl;
+    private String carNumber;
+    private String type;
+    private String owner;
+    private String vehicleNumber;
+    private String carLong;
+    private String carWidth;
+    private String carHeight;
+    private String carId;
+    private String carPlateColor;
+    private String carEnergyTyp;
+
+    private DataDTO zjObj;
+
+    public String getCarId() {
+        return carId;
+    }
+
+    public void setCarId(String carId) {
+        this.carId = carId;
+    }
+
+    public String getFrontImageUrl() {
+        return frontImageUrl;
+    }
+
+    public void setFrontImageUrl(String frontImageUrl) {
+        this.frontImageUrl = frontImageUrl;
+    }
+
+    public String getBackImageUrl() {
+        return backImageUrl;
+    }
+
+    public void setBackImageUrl(String backImageUrl) {
+        this.backImageUrl = backImageUrl;
+    }
+
+    public String getCarNumber() {
+        return carNumber;
+    }
+
+    public void setCarNumber(String carNumber) {
+        this.carNumber = carNumber;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public String getVehicleNumber() {
+        return vehicleNumber;
+    }
+
+    public void setVehicleNumber(String vehicleNumber) {
+        this.vehicleNumber = vehicleNumber;
+    }
+
+    public String getCarLong() {
+        return carLong;
+    }
+
+    public void setCarLong(String carLong) {
+        this.carLong = carLong;
+    }
+
+    public String getCarWidth() {
+        return carWidth;
+    }
+
+    public void setCarWidth(String carWidth) {
+        this.carWidth = carWidth;
+    }
+
+    public String getCarHeight() {
+        return carHeight;
+    }
+
+    public void setCarHeight(String carHeight) {
+        this.carHeight = carHeight;
+    }
+
+    public String getCarPlateColor() {
+        return carPlateColor;
+    }
+
+    public void setCarPlateColor(String carPlateColor) {
+        this.carPlateColor = carPlateColor;
+    }
+
+    public String getCarEnergyTyp() {
+        return carEnergyTyp;
+    }
+
+    public void setCarEnergyTyp(String carEnergyTyp) {
+        this.carEnergyTyp = carEnergyTyp;
+    }
+
+    public DataDTO getZjObj() {
+        return zjObj;
+    }
+
+    public void setZjObj(DataDTO zjObj) {
+        this.zjObj = zjObj;
+    }
+
+    public static class DataDTO {
+
+        private String approveTon;
+        private String recordId;
+        private String note;
+        private String passengers;
+        private String vclDrwTn;
+        private String overallDimen;
+        private String vclN;
+        private String enTn;
+        private String loadTon;
+        private String inspectionRecord;
+        private String barCode;
+        private String issuingAuthority;
+        private String regTime;
+        private String address;
+        private String ownerName;
+        private String engine;
+        private String vin;
+        private String licensedateOfissue;
+        private String vcltype;
+        private String vclBrand;
+        private String natureOfUsage;
+
+        public String getApproveTon() {
+            return approveTon;
+        }
+
+        public void setApproveTon(String approveTon) {
+            this.approveTon = approveTon;
+        }
+
+        public String getRecordId() {
+            return recordId;
+        }
+
+        public void setRecordId(String recordId) {
+            this.recordId = recordId;
+        }
+
+        public String getNote() {
+            return note;
+        }
+
+        public void setNote(String note) {
+            this.note = note;
+        }
+
+        public String getPassengers() {
+            return passengers;
+        }
+
+        public void setPassengers(String passengers) {
+            this.passengers = passengers;
+        }
+
+        public String getVclDrwTn() {
+            return vclDrwTn;
+        }
+
+        public void setVclDrwTn(String vclDrwTn) {
+            this.vclDrwTn = vclDrwTn;
+        }
+
+        public String getOverallDimen() {
+            return overallDimen;
+        }
+
+        public void setOverallDimen(String overallDimen) {
+            this.overallDimen = overallDimen;
+        }
+
+        public String getVclN() {
+            return vclN;
+        }
+
+        public void setVclN(String vclN) {
+            this.vclN = vclN;
+        }
+
+        public String getEnTn() {
+            return enTn;
+        }
+
+        public void setEnTn(String enTn) {
+            this.enTn = enTn;
+        }
+
+        public String getLoadTon() {
+            return loadTon;
+        }
+
+        public void setLoadTon(String loadTon) {
+            this.loadTon = loadTon;
+        }
+
+        public String getInspectionRecord() {
+            return inspectionRecord;
+        }
+
+        public void setInspectionRecord(String inspectionRecord) {
+            this.inspectionRecord = inspectionRecord;
+        }
+
+        public String getBarCode() {
+            return barCode;
+        }
+
+        public void setBarCode(String barCode) {
+            this.barCode = barCode;
+        }
+
+        public String getIssuingAuthority() {
+            return issuingAuthority;
+        }
+
+        public void setIssuingAuthority(String issuingAuthority) {
+            this.issuingAuthority = issuingAuthority;
+        }
+
+        public String getRegTime() {
+            return regTime;
+        }
+
+        public void setRegTime(String regTime) {
+            this.regTime = regTime;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        public void setAddress(String address) {
+            this.address = address;
+        }
+
+        public String getOwnerName() {
+            return ownerName;
+        }
+
+        public void setOwnerName(String ownerName) {
+            this.ownerName = ownerName;
+        }
+
+        public String getEngine() {
+            return engine;
+        }
+
+        public void setEngine(String engine) {
+            this.engine = engine;
+        }
+
+        public String getVin() {
+            return vin;
+        }
+
+        public void setVin(String vin) {
+            this.vin = vin;
+        }
+
+        public String getLicensedateOfissue() {
+            return licensedateOfissue;
+        }
+
+        public void setLicensedateOfissue(String licensedateOfissue) {
+            this.licensedateOfissue = licensedateOfissue;
+        }
+
+        public String getVcltype() {
+            return vcltype;
+        }
+
+        public void setVcltype(String vcltype) {
+            this.vcltype = vcltype;
+        }
+
+        public String getVclBrand() {
+            return vclBrand;
+        }
+
+        public void setVclBrand(String vclBrand) {
+            this.vclBrand = vclBrand;
+        }
+
+        public String getNatureOfUsage() {
+            return natureOfUsage;
+        }
+
+        public void setNatureOfUsage(String natureOfUsage) {
+            this.natureOfUsage = natureOfUsage;
+        }
+    }
+
+
+}
+
+

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRBankBean.java

@@ -55,6 +55,33 @@ public class OCRBankBean {
         private String validDate;
         private String bankCardType;
         private String bankName;
+        private String expiryDate;
+        private String type;
+        private String cardNumber;
+
+        public String getExpiryDate() {
+            return expiryDate;
+        }
+
+        public void setExpiryDate(String expiryDate) {
+            this.expiryDate = expiryDate;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getCardNumber() {
+            return cardNumber;
+        }
+
+        public void setCardNumber(String cardNumber) {
+            this.cardNumber = cardNumber;
+        }
 
         public int getId() {
             return id;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRCardBackBean.java

@@ -60,6 +60,33 @@ public class OCRCardBackBean {
         private String startTime;
         private String endTime;
         private String organizationName;
+        private String validFrom;
+        private String validTo;
+        private String issue;
+
+        public String getIssue() {
+            return issue;
+        }
+
+        public void setIssue(String issue) {
+            this.issue = issue;
+        }
+
+        public String getValidFrom() {
+            return validFrom;
+        }
+
+        public void setValidFrom(String validFrom) {
+            this.validFrom = validFrom;
+        }
+
+        public String getValidTo() {
+            return validTo;
+        }
+
+        public void setValidTo(String validTo) {
+            this.validTo = validTo;
+        }
 
         public int getId() {
             return id;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRCardBean.java

@@ -63,6 +63,51 @@ public class OCRCardBean {
         private String cardId;
         private String birthday;
         private String sex;
+        private String ethnicity;
+        private String idcard;
+        private String birth;
+        private String validFrom;
+        private String validTo;
+
+        public String getEthnicity() {
+            return ethnicity;
+        }
+
+        public void setEthnicity(String ethnicity) {
+            this.ethnicity = ethnicity;
+        }
+
+        public String getIdcard() {
+            return idcard;
+        }
+
+        public void setIdcard(String idcard) {
+            this.idcard = idcard;
+        }
+
+        public String getBirth() {
+            return birth;
+        }
+
+        public void setBirth(String birth) {
+            this.birth = birth;
+        }
+
+        public String getValidFrom() {
+            return validFrom;
+        }
+
+        public void setValidFrom(String validFrom) {
+            this.validFrom = validFrom;
+        }
+
+        public String getValidTo() {
+            return validTo;
+        }
+
+        public void setValidTo(String validTo) {
+            this.validTo = validTo;
+        }
 
         public int getId() {
             return id;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRDrivingLicenseBackBean.java

@@ -58,6 +58,42 @@ public class OCRDrivingLicenseBackBean {
         private int id;
         private String url;
         private String archivesName;
+        private String fileNumber;
+        private String record;
+        private String name;
+        private String issuingAuthority;
+
+        public String getFileNumber() {
+            return fileNumber;
+        }
+
+        public void setFileNumber(String fileNumber) {
+            this.fileNumber = fileNumber;
+        }
+
+        public String getRecord() {
+            return record;
+        }
+
+        public void setRecord(String record) {
+            this.record = record;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getIssuingAuthority() {
+            return issuingAuthority;
+        }
+
+        public void setIssuingAuthority(String issuingAuthority) {
+            this.issuingAuthority = issuingAuthority;
+        }
 
         public int getId() {
             return id;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRDrivingLicenseBean.java

@@ -68,6 +68,70 @@ public class OCRDrivingLicenseBean {
         private String allowType;
         private String sex;
         private String startTime;
+        private String beginDate;
+        private String endDate;
+        private String firstGetDocDate;
+        private String idcard;
+        private String quasiDriveType;
+        private String issuingAuthority;
+        private String nationality;
+
+
+        public String getBeginDate() {
+            return beginDate;
+        }
+
+        public void setBeginDate(String beginDate) {
+            this.beginDate = beginDate;
+        }
+
+        public String getEndDate() {
+            return endDate;
+        }
+
+        public void setEndDate(String endDate) {
+            this.endDate = endDate;
+        }
+
+        public String getFirstGetDocDate() {
+            return firstGetDocDate;
+        }
+
+        public void setFirstGetDocDate(String firstGetDocDate) {
+            this.firstGetDocDate = firstGetDocDate;
+        }
+
+        public String getIdcard() {
+            return idcard;
+        }
+
+        public void setIdcard(String idcard) {
+            this.idcard = idcard;
+        }
+
+        public String getQuasiDriveType() {
+            return quasiDriveType;
+        }
+
+        public void setQuasiDriveType(String quasiDriveType) {
+            this.quasiDriveType = quasiDriveType;
+        }
+
+        public String getIssuingAuthority() {
+            return issuingAuthority;
+        }
+
+        public void setIssuingAuthority(String issuingAuthority) {
+            this.issuingAuthority = issuingAuthority;
+        }
+
+        public String getNationality() {
+            return nationality;
+        }
+
+        public void setNationality(String nationality) {
+            this.nationality = nationality;
+        }
 
         public int getId() {
             return id;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRQualiBean.java

@@ -0,0 +1,200 @@
+package com.arpa.hndahesudintocctmsdriver.bean;
+
+import java.util.List;
+
+/**
+ * @ClassName OCRQualiBean
+ * @Author john
+ * @Date 2024/11/19 15:53
+ * @Description TODO
+ */
+public class OCRQualiBean {
+
+
+    private int code;
+    private DataDTO data;
+    private String msg;
+    private String remark;
+    private int res;
+    private boolean success;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public DataDTO getData() {
+        return data;
+    }
+
+    public void setData(DataDTO data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getRes() {
+        return res;
+    }
+
+    public void setRes(int res) {
+        this.res = res;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public static class DataDTO {
+        private String address;
+        private List<QualificationCategoryListDTO> qualification_category_list;
+        private String nationality;
+        private String issuing_authority;
+        private String sex;
+        private String birth_date;
+        private String integrity_assessment_info;
+        private String name;
+        private String driving_class;
+        private String certificate_number;
+        private String continuing_education_info;
+
+        public String getAddress() {
+            return address;
+        }
+
+        public void setAddress(String address) {
+            this.address = address;
+        }
+
+        public List<QualificationCategoryListDTO> getQualification_category_list() {
+            return qualification_category_list;
+        }
+
+        public void setQualification_category_list(List<QualificationCategoryListDTO> qualification_category_list) {
+            this.qualification_category_list = qualification_category_list;
+        }
+
+        public String getNationality() {
+            return nationality;
+        }
+
+        public void setNationality(String nationality) {
+            this.nationality = nationality;
+        }
+
+        public String getIssuing_authority() {
+            return issuing_authority;
+        }
+
+        public void setIssuing_authority(String issuing_authority) {
+            this.issuing_authority = issuing_authority;
+        }
+
+        public String getSex() {
+            return sex;
+        }
+
+        public void setSex(String sex) {
+            this.sex = sex;
+        }
+
+        public String getBirth_date() {
+            return birth_date;
+        }
+
+        public void setBirth_date(String birth_date) {
+            this.birth_date = birth_date;
+        }
+
+        public String getIntegrity_assessment_info() {
+            return integrity_assessment_info;
+        }
+
+        public void setIntegrity_assessment_info(String integrity_assessment_info) {
+            this.integrity_assessment_info = integrity_assessment_info;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getDriving_class() {
+            return driving_class;
+        }
+
+        public void setDriving_class(String driving_class) {
+            this.driving_class = driving_class;
+        }
+
+        public String getCertificate_number() {
+            return certificate_number;
+        }
+
+        public void setCertificate_number(String certificate_number) {
+            this.certificate_number = certificate_number;
+        }
+
+        public String getContinuing_education_info() {
+            return continuing_education_info;
+        }
+
+        public void setContinuing_education_info(String continuing_education_info) {
+            this.continuing_education_info = continuing_education_info;
+        }
+
+        public static class QualificationCategoryListDTO {
+            private String issue_date;
+            private String expiry_date;
+            private String category;
+
+            public String getIssue_date() {
+                return issue_date;
+            }
+
+            public void setIssue_date(String issue_date) {
+                this.issue_date = issue_date;
+            }
+
+            public String getExpiry_date() {
+                return expiry_date;
+            }
+
+            public void setExpiry_date(String expiry_date) {
+                this.expiry_date = expiry_date;
+            }
+
+            public String getCategory() {
+                return category;
+            }
+
+            public void setCategory(String category) {
+                this.category = category;
+            }
+        }
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRRoadBean.java

@@ -0,0 +1,177 @@
+package com.arpa.hndahesudintocctmsdriver.bean;
+
+/**
+ * @ClassName OCRRoadBean
+ * @Author john
+ * @Date 2024/11/19 17:05
+ * @Description TODO
+ */
+public class OCRRoadBean {
+
+
+    private int code;
+    private DataDTO data;
+    private String msg;
+    private String remark;
+    private int res;
+    private boolean success;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public DataDTO getData() {
+        return data;
+    }
+
+    public void setData(DataDTO data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getRes() {
+        return res;
+    }
+
+    public void setRes(int res) {
+        this.res = res;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public static class DataDTO {
+        private String vehicleWeight;
+        private String issuingAuthority;
+        private String ownerName;
+        private String businessCertificate;
+        private String economicType;
+        private String businessScope;
+        private String vehicleNumber;
+        private String licenseNumber;
+        private String vehicleSize;
+        private String ownerAddress;
+        private String issueDate;
+        private String vehicleType;
+
+        public String getVehicleWeight() {
+            return vehicleWeight;
+        }
+
+        public void setVehicleWeight(String vehicleWeight) {
+            this.vehicleWeight = vehicleWeight;
+        }
+
+        public String getIssuingAuthority() {
+            return issuingAuthority;
+        }
+
+        public void setIssuingAuthority(String issuingAuthority) {
+            this.issuingAuthority = issuingAuthority;
+        }
+
+        public String getOwnerName() {
+            return ownerName;
+        }
+
+        public void setOwnerName(String ownerName) {
+            this.ownerName = ownerName;
+        }
+
+        public String getBusinessCertificate() {
+            return businessCertificate;
+        }
+
+        public void setBusinessCertificate(String businessCertificate) {
+            this.businessCertificate = businessCertificate;
+        }
+
+        public String getEconomicType() {
+            return economicType;
+        }
+
+        public void setEconomicType(String economicType) {
+            this.economicType = economicType;
+        }
+
+        public String getBusinessScope() {
+            return businessScope;
+        }
+
+        public void setBusinessScope(String businessScope) {
+            this.businessScope = businessScope;
+        }
+
+        public String getVehicleNumber() {
+            return vehicleNumber;
+        }
+
+        public void setVehicleNumber(String vehicleNumber) {
+            this.vehicleNumber = vehicleNumber;
+        }
+
+        public String getLicenseNumber() {
+            return licenseNumber;
+        }
+
+        public void setLicenseNumber(String licenseNumber) {
+            this.licenseNumber = licenseNumber;
+        }
+
+        public String getVehicleSize() {
+            return vehicleSize;
+        }
+
+        public void setVehicleSize(String vehicleSize) {
+            this.vehicleSize = vehicleSize;
+        }
+
+        public String getOwnerAddress() {
+            return ownerAddress;
+        }
+
+        public void setOwnerAddress(String ownerAddress) {
+            this.ownerAddress = ownerAddress;
+        }
+
+        public String getIssueDate() {
+            return issueDate;
+        }
+
+        public void setIssueDate(String issueDate) {
+            this.issueDate = issueDate;
+        }
+
+        public String getVehicleType() {
+            return vehicleType;
+        }
+
+        public void setVehicleType(String vehicleType) {
+            this.vehicleType = vehicleType;
+        }
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleBackLicenseBean.java

@@ -59,6 +59,7 @@ public class OCRVehicleBackLicenseBean {
         private int id;
         private String url;
         private String checkRecord;
+        private String isSave;
         private String approvedCapacity;
         private String allCapacity;
         private String size;
@@ -70,6 +71,122 @@ public class OCRVehicleBackLicenseBean {
         private String fileNumber;
         private String carNumber;
         private int licenseId;
+        private String note;
+        private String passengers;
+        private String vclDrwTn;
+        private String overallDimen;
+        private String vclN;
+        private String enTn;
+        private String loadTon;
+        private String inspectionRecord;
+        private String barCode;
+        private String approveTon;
+        private String recordId;
+        private String issuingAuthority;
+
+        public String getNote() {
+            return note;
+        }
+
+        public void setNote(String note) {
+            this.note = note;
+        }
+
+        public String getPassengers() {
+            return passengers;
+        }
+
+        public void setPassengers(String passengers) {
+            this.passengers = passengers;
+        }
+
+        public String getVclDrwTn() {
+            return vclDrwTn;
+        }
+
+        public void setVclDrwTn(String vclDrwTn) {
+            this.vclDrwTn = vclDrwTn;
+        }
+
+        public String getOverallDimen() {
+            return overallDimen;
+        }
+
+        public void setOverallDimen(String overallDimen) {
+            this.overallDimen = overallDimen;
+        }
+
+        public String getVclN() {
+            return vclN;
+        }
+
+        public void setVclN(String vclN) {
+            this.vclN = vclN;
+        }
+
+        public String getEnTn() {
+            return enTn;
+        }
+
+        public void setEnTn(String enTn) {
+            this.enTn = enTn;
+        }
+
+        public String getLoadTon() {
+            return loadTon;
+        }
+
+        public void setLoadTon(String loadTon) {
+            this.loadTon = loadTon;
+        }
+
+        public String getInspectionRecord() {
+            return inspectionRecord;
+        }
+
+        public void setInspectionRecord(String inspectionRecord) {
+            this.inspectionRecord = inspectionRecord;
+        }
+
+        public String getBarCode() {
+            return barCode;
+        }
+
+        public void setBarCode(String barCode) {
+            this.barCode = barCode;
+        }
+
+        public String getApproveTon() {
+            return approveTon;
+        }
+
+        public void setApproveTon(String approveTon) {
+            this.approveTon = approveTon;
+        }
+
+        public String getRecordId() {
+            return recordId;
+        }
+
+        public void setRecordId(String recordId) {
+            this.recordId = recordId;
+        }
+
+        public String getIssuingAuthority() {
+            return issuingAuthority;
+        }
+
+        public void setIssuingAuthority(String issuingAuthority) {
+            this.issuingAuthority = issuingAuthority;
+        }
+
+        public String getIsSave() {
+            return isSave;
+        }
+
+        public void setIsSave(String isSave) {
+            this.isSave = isSave;
+        }
 
         public int getLicenseId() {
             return licenseId;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleLicenseBean.java

@@ -49,7 +49,9 @@ public class OCRVehicleLicenseBean {
         private String address;
         private int carId;
         private String carNumber;
+        private boolean carExist;
         private String dateIssue;
+        private String backImage;
         private String engineNumber;
         private int id;
         private String model;
@@ -60,6 +62,131 @@ public class OCRVehicleLicenseBean {
         private String type;
         private String url;
         private String vehicleNumber;
+        private String licenseId;
+        private String ownerName;
+        private String regTime;
+        private String issuingAuthority;
+        private String engine;
+        private String vclN;
+        private String licensedateOfissue;
+        private String vin;
+        private String vcltype;
+        private String vclBrand;
+        private String natureOfUsage;
+
+        public String getOwnerName() {
+            return ownerName;
+        }
+
+        public void setOwnerName(String ownerName) {
+            this.ownerName = ownerName;
+        }
+
+        public String getRegTime() {
+            return regTime;
+        }
+
+        public void setRegTime(String regTime) {
+            this.regTime = regTime;
+        }
+
+        public String getIssuingAuthority() {
+            return issuingAuthority;
+        }
+
+        public void setIssuingAuthority(String issuingAuthority) {
+            this.issuingAuthority = issuingAuthority;
+        }
+
+        public String getEngine() {
+            return engine;
+        }
+
+        public void setEngine(String engine) {
+            this.engine = engine;
+        }
+
+        public String getVclN() {
+            return vclN;
+        }
+
+        public void setVclN(String vclN) {
+            this.vclN = vclN;
+        }
+
+        public String getLicensedateOfissue() {
+            return licensedateOfissue;
+        }
+
+        public void setLicensedateOfissue(String licensedateOfissue) {
+            this.licensedateOfissue = licensedateOfissue;
+        }
+
+        public String getVin() {
+            return vin;
+        }
+
+        public void setVin(String vin) {
+            this.vin = vin;
+        }
+
+        public String getVcltype() {
+            return vcltype;
+        }
+
+        public void setVcltype(String vcltype) {
+            this.vcltype = vcltype;
+        }
+
+        public String getVclBrand() {
+            return vclBrand;
+        }
+
+        public void setVclBrand(String vclBrand) {
+            this.vclBrand = vclBrand;
+        }
+
+        public String getNatureOfUsage() {
+            return natureOfUsage;
+        }
+
+        public void setNatureOfUsage(String natureOfUsage) {
+            this.natureOfUsage = natureOfUsage;
+        }
+
+        public String getLicenseId() {
+            return licenseId;
+        }
+
+        public void setLicenseId(String licenseId) {
+            this.licenseId = licenseId;
+        }
+
+        private DataDto2 existCarInfo;
+
+        public DataDto2 getExistCarInfo() {
+            return existCarInfo;
+        }
+
+        public void setExistCarInfo(DataDto2 existCarInfo) {
+            this.existCarInfo = existCarInfo;
+        }
+
+        public boolean isCarExist() {
+            return carExist;
+        }
+
+        public String getBackImage() {
+            return backImage;
+        }
+
+        public void setBackImage(String backImage) {
+            this.backImage = backImage;
+        }
+
+        public void setCarExist(boolean carExist) {
+            this.carExist = carExist;
+        }
 
         public String getAddress() {
             return address == null ? "" : address;
@@ -173,4 +300,44 @@ public class OCRVehicleLicenseBean {
             this.vehicleNumber = vehicleNumber;
         }
     }
+
+    public static class DataDto2 {
+        private String backImage;
+        private String carId;
+        private String licenseId;
+
+        private CarDelBean.DataDTO trailerResVo;
+
+        public CarDelBean.DataDTO getTrailerResVo() {
+            return trailerResVo;
+        }
+
+        public void setTrailerResVo(CarDelBean.DataDTO trailerResVo) {
+            this.trailerResVo = trailerResVo;
+        }
+
+        public String getLicenseId() {
+            return licenseId;
+        }
+
+        public void setLicenseId(String licenseId) {
+            this.licenseId = licenseId;
+        }
+
+        public String getBackImage() {
+            return backImage == null ? "" : backImage;
+        }
+
+        public void setBackImage(String backImage) {
+            this.backImage = backImage;
+        }
+
+        public String getCarId() {
+            return carId;
+        }
+
+        public void setCarId(String carId) {
+            this.carId = carId;
+        }
+    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/WaybillStatusBean.java

@@ -0,0 +1,56 @@
+package com.arpa.hndahesudintocctmsdriver.bean;
+
+/**
+ * @ClassName WaybillStatusBean
+ * @Author john
+ * @Date 2024/10/14 15:40
+ * @Description TODO
+ */
+public class WaybillStatusBean {
+
+    private int res;
+    private int code;
+    private boolean success;
+    private String msg;
+    private String data;
+
+    public int getRes() {
+        return res;
+    }
+
+    public void setRes(int res) {
+        this.res = res;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MyRequestCallback.kt

@@ -0,0 +1,11 @@
+package com.arpa.hndahesudintocctmsdriver.cuspop
+
+/**
+ * @ClassName MyRequestCallback
+ * @Author john
+ * @Date 2024/10/28 17:19
+ * @Description TODO
+ */
+interface MyRequestCallback{
+    fun onResult(allGranted: Boolean, grantedList: List<String?>, deniedList: List<String?>)
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/SimCenterPop.kt

@@ -6,6 +6,7 @@ import com.arpa.hndahesudintocctmsdriver.R
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity
 import com.lxj.xpopup.core.CenterPopupView
 import kotlinx.android.synthetic.main.pop_sim_center.view.*
+import org.bouncycastle.jcajce.provider.symmetric.Rijndael
 
 
 /**
@@ -17,10 +18,14 @@ import kotlinx.android.synthetic.main.pop_sim_center.view.*
 class SimCenterPop(context: Context) : CenterPopupView(context), View.OnClickListener {
 
     lateinit var content: String
+    lateinit var titleLeft: String
+    lateinit var titleReft: String
     lateinit var secMessage: String
 
-    constructor(context: Context, message: String) : this(context) {
+    constructor(context: Context, message: String,titleLeft:String = "取消",titleRight: String = "去注册") : this(context) {
         content = message
+        this.titleReft = titleRight
+        this.titleLeft = titleLeft
     }
 
 
@@ -28,6 +33,8 @@ class SimCenterPop(context: Context) : CenterPopupView(context), View.OnClickLis
 
     override fun onCreate() {
         super.onCreate()
+        tvCancel.text = titleLeft
+        tvOk.text = titleReft
         tvCancel.setOnClickListener(this)
         tvOk.setOnClickListener(this)
         tvContent.text = "$content"

app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/TopMsgPopup.kt

@@ -0,0 +1,36 @@
+package com.arpa.hndahesudintocctmsdriver.cuspop
+
+import android.content.Context
+import com.arpa.hndahesudintocctmsdriver.R
+import com.lxj.xpopup.core.PositionPopupView
+import com.lxj.xpopup.enums.DragOrientation
+import kotlinx.android.synthetic.main.popup_qq_msg.view.tvMessage
+import kotlinx.android.synthetic.main.popup_qq_msg.view.tvTitle
+
+/**
+ * Description: 自定义自由定位Position弹窗
+ * Create by dance, at 2019/6/14
+ */
+class TopMsgPopup(context: Context,title:String, message: String) : PositionPopupView(context) {
+
+    private var message: String
+    private var title: String
+
+    init {
+        this.message = message
+        this.title = title
+    }
+    override fun getImplLayoutId(): Int {
+        return R.layout.popup_qq_msg
+    }
+
+    override fun getDragOrientation(): DragOrientation {
+        return DragOrientation.DragToLeft
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        tvMessage.text = message
+        tvTitle.text = title
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/event/HomeWaybillEvent.java

@@ -0,0 +1,33 @@
+package com.arpa.hndahesudintocctmsdriver.event;
+
+/**
+ * @author hlh
+ * @version 1.0.0
+ * @date 2021/10/20 14:43
+ * @description:
+ */
+public class HomeWaybillEvent {
+
+    private int message;
+
+
+    public int getMessage() {
+        return message;
+    }
+
+    public void setMessage(int message) {
+        this.message = message;
+    }
+
+    public HomeWaybillEvent() {
+
+    }
+
+    /**
+     *
+     * @param message 1:刷新运单列表
+     */
+    public HomeWaybillEvent(int message) {
+        this.message = message;
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/event/RefreshCarListEvent.java

@@ -0,0 +1,21 @@
+package com.arpa.hndahesudintocctmsdriver.event;
+
+/**
+ * @author hlh
+ * @version 1.0.0
+ * @date 2021/11/2 18:51
+ * @description:
+ */
+public class RefreshCarListEvent {
+    private String message;
+
+    public RefreshCarListEvent(String message) {
+        this.message = message;
+    }
+    public String getMessage() {
+        return message;
+    }
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/event/WalletEvent.java

@@ -0,0 +1,22 @@
+package com.arpa.hndahesudintocctmsdriver.event;
+
+/**
+ * @author hlh
+ * @version 1.0.0
+ * @date 2021/10/20 14:43
+ * @description:
+ */
+public class WalletEvent {
+
+    private String message;
+
+    public WalletEvent(String message) {
+        this.message = message;
+    }
+    public String getMessage() {
+        return message;
+    }
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java

@@ -13,6 +13,7 @@ import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.parts.AuthParts;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean;
 import com.arpa.hndahesudintocctmsdriver.bean.FqBean;
@@ -42,6 +43,10 @@ public class ALProcess {
 
     public static void verification(Context con){
         DriverAuthDataBean auth= AuthParts.getAuth(con);
+        if (auth==null){
+            return;
+        }
+
         Identity idy=new Identity();
         //企业代码
         idy.setEnterpriseCode(BuildConfig.isTest?ENTERPRISE_CODE_TEXT:ENTERPRISE_CODE);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java

@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.report;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.amap.api.location.AMapLocationClient;
@@ -78,6 +79,9 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
+        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
+            return;
+        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));
@@ -143,6 +147,9 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
+        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
+            return;
+        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));
@@ -176,6 +183,9 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
+        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
+            return;
+        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));
@@ -208,6 +218,9 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
+        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
+            return;
+        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/AuthRequest.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Handler;
 import android.util.Log;
 
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.util.map.MapUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.request.bean.IDInputBean;
@@ -74,6 +75,22 @@ public class AuthRequest {
         RequestUtil.start(1, "saveVehicleLicense", re, con, hd);
     }
 
+    //查询车辆信息-行驶证/app/carDriver/saveVehicleLicense
+    public void getCarInfo(Context con, Handler hd, String carNum) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("carNum",carNum);
+        Request re = OkHttpUtil.posts(new OkDate(BuildConfig.BASE_URL+"app/carDriver/onlyGetVehicleLicense", MapUtil.mapJson(map)), getToken(con), con);
+        RequestUtil.start(1, "getCarInfo", re, con, hd);
+    }
+
+    //绑定车辆信息-行驶证/app/carDriver/saveVehicleLicense
+    public void bindCar(Context con, Handler hd, String carId) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("carId",carId);
+        Request re = OkHttpUtil.posts(new OkDate(BuildConfig.BASE_URL+"app/carDriver/bindCar", MapUtil.mapJson(map)), getToken(con), con);
+        RequestUtil.start(1, "bindCarInfo", re, con, hd);
+    }
+
     //上传头像
     public void upHeadImg(Context con, Handler hd, String imgUrl) {
         String mt = "{\"headportrait\": \"" + imgUrl + "\"}";
@@ -124,6 +141,17 @@ public class AuthRequest {
         RequestUtil.start(1, "saveCarRoadLicenseNo", re, con, hd);
     }
 
+    //车辆交强保险
+    public void saveTrafficInsurance(Context con, Handler hd, String id, String insuranceEndDay, String insuranceCompany) {
+        String mt = "{\n" +
+                "\t\"carId\": \"" + id + "\",\n" +
+                "\t\"insuranceEndDay\": \"" + insuranceEndDay + "\",\n" +
+                "\t\"insuranceCompany\": \"" + insuranceCompany + "\",\n" +
+                "}";
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getTrafficInsurance(), mt), getToken(con), con);
+        RequestUtil.start(1, "saveTrafficInsurance", re, con, hd);
+    }
+
     //获取资格证认证信息
     public void isDriverAuthQualification(Context con, Handler hd) {
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getIsAuthDriverAuthQualification(), ""), getToken(con), con);
@@ -141,6 +169,7 @@ public class AuthRequest {
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getAuthUrl(), ""), getToken(con), con);
         RequestUtil.start(1, "authUrl", re, con, hd);
     }
+
     //获取车牌颜色
     public void getCarColor(Context con, Handler hd) {
 //        Map<String, Object> map = new HashMap<>();

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java

@@ -1,5 +1,6 @@
 package com.arpa.hndahesudintocctmsdriver.request;
 
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
 import com.arpa.hndahesudintocctmsdriver.request.bean.TrackInputBean;
@@ -72,6 +73,17 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getAgreeOrder(),MapUtil.mapJson(map)),getToken(con),con);
         RequestUtil.start(1, HuoYunDelActivity.END,re,con,hd);
     }
+
+//    public void confirm2(String cid,int wid){
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("carId",cid);
+//        map.put("orderId",wid);
+//        map.put("status",2);
+//        map.put("imgUrl","");
+//        Request re = OkHttpUtil.posts(new OkDate(BuildConfig.BASE_URL+"/app/driver/waybill/grab",MapUtil.mapJson(map)),getToken(con),con);
+//        RequestUtil.start(1, "jfaklsdjfklasjdflk",re,con,hd);
+//    }
+
     //获取执行中的运单
     public void startOrder(int id){
         Map<String,Object> map=new HashMap<>();
@@ -79,6 +91,13 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetStartOrder(),MapUtil.mapJson(map)),getToken(con),con);
         RequestUtil.start(1, HuoYuanFragmengt.START_ORDER,re,con,hd);
     }
+
+    public void startOrder2(int id){
+        Map<String,Object> map=new HashMap<>();
+        map.put("waybillId",id);
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetStartOrder(),MapUtil.mapJson(map)),getToken(con),con);
+        RequestUtil.start(1, "refreshorderDetail",re,con,hd);
+    }
     //装货
     public void loading(LUInputBean lub){
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getLOADING(), gson.toJson(lub)),getToken(con),con);
@@ -142,6 +161,32 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getEvaluationV2(),MapUtil.mapJson(map)),getToken(con),con);
         RequestUtil.start(1, StartYunDanActivity.KEEP_EVALUTE,re,con,hd);
     }
+
+    /**
+     * 获取运单状态
+     * @param waybillId
+     */
+    public void getWaybillStatus(int waybillId){
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("waybillId",waybillId);
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetWaybillStatus()+"?waybillId="+waybillId,""),getToken(con),con);
+        RequestUtil.start(1, "waybillStatus",re,con,hd);
+    }
+
+
+    /**
+     * 获取货源状态
+     * @param orderId
+     */
+    public void getOrderStatus(int orderId){
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("waybillId",waybillId);
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetOrderStatus()+"?orderId="+orderId,""),getToken(con),con);
+        RequestUtil.start(1, "orderStatus",re,con,hd);
+    }
+
+
+
     public final static String ASYMMETRYWAYBILL="waybill_getAsymmetryWaybill";
 
     //获取装货失败信息

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/OCRRequest.java

@@ -3,65 +3,132 @@ package com.arpa.hndahesudintocctmsdriver.request;
 import android.content.Context;
 import android.os.Handler;
 
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.http.OkDate;
 import com.arpa.hndahesudintocctmsdriver.util.http.OkHttpUtil;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequestUtil;
+
 import java.io.File;
+
 import okhttp3.Request;
 
 public class OCRRequest {
 
     public String getToken(Context con) {
-        return SPUtil.getSP(con, LoginActivity.USER,LoginActivity.USER_TOKEN);
+        return SPUtil.getSP(con, LoginActivity.USER, LoginActivity.USER_TOKEN);
     }
 
     //银行卡识别
-    public void ORCBank(Context con, Handler hd, File file){
+    public void ORCBank(Context con, Handler hd, File file) {
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getOrcBank()),getToken(con),file);
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getOrcBank()), getToken(con), file);
-        RequestUtil.start(12, "OCR_BANK",re,con,hd);
+        RequestUtil.start(12, "OCR_BANK", re, con, hd);
     }
+
+    //银行卡识别-中交
+    public void ORCBankZj(Context con, Handler hd, String imgUrl) {
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getOrcBank() + "?imgurl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(1, "OCR_BANK", re, con, hd);
+    }
+
+    //从业资格证-中交
+    public void ORCQualificaZj(Context con, Handler hd, String imgUrl) {
+        Request re = OkHttpUtil.posts(new OkDate(BuildConfig.BASE_URL+"sinoiov/ocr/getTransQualificationCertOCR" + "?imgurl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(1, "ORCQualificaZj", re, con, hd);
+    }
+
+    //道路运输许可证-中交
+    public void ORCRoadLicZj(Context con, Handler hd, String imgUrl) {
+        Request re = OkHttpUtil.posts(new OkDate(BuildConfig.BASE_URL+"sinoiov/ocr/getVehicleRoadLicenseOCR" + "?faceDataUrl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(1, "ORCRoadLicZj", re, con, hd);
+    }
+
     //身份证正面识别
-    public void OCRCard(Context con, Handler hd, File file){
+    public void OCRCard(Context con, Handler hd, File file) {
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getIdCardFront()),getToken(con),file);
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getIdCardFront()), getToken(con), file);
-        RequestUtil.start(12, CertificatesActivity.TYPE_NAME[0],re,con,hd);
+        RequestUtil.start(12, CertificatesActivity.TYPE_NAME[0], re, con, hd);
     }
+
     //身份证背面识别
-    public void OCRCardBack(Context con, Handler hd, File file){
+    public void OCRCardBack(Context con, Handler hd, File file) {
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getIdCardBack()),getToken(con),file);
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getIdCardBack()), getToken(con), file);
-        RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[0], re,con,hd);
+        RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[0], re, con, hd);
     }
+
+    //身份证正面识别-中交
+    public void OCRZjCard(Context con, Handler hd, String imgUrl) {
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getIdCardFront() + "?faceDataUrl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(1, CertificatesActivity.TYPE_NAME[0], re, con, hd);
+    }
+
+    //身份证背面识别-中交
+    public void OCRZjCardBack(Context con, Handler hd, String imgUrl) {
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getIdCardFront() + "?backDataUrl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(1, CertificatesActivity.TYPE_NAME_BANK[0], re, con, hd);
+    }
+
     //驾驶证正面识别
-    public void OCRDrivingLicense(Context con, Handler hd, File file){
+    public void OCRDrivingLicense(Context con, Handler hd, File file) {
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getDrivingLicense()),getToken(con),file);
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getDrivingLicense()), getToken(con), file);
-        RequestUtil.start(12, CertificatesActivity.TYPE_NAME[1],re,con,hd);
+        RequestUtil.start(12, CertificatesActivity.TYPE_NAME[1], re, con, hd);
     }
+
     //驾驶证背面识别
-    public void OCRDrivingLicenseBack(Context con, Handler hd, File file){
+    public void OCRDrivingLicenseBack(Context con, Handler hd, File file) {
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getDrivingLicenseBack()),getToken(con),file);
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getDrivingLicenseBack()), getToken(con), file);
-        RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[1],re,con,hd);
+        RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[1], re, con, hd);
     }
+
+    //驾驶证正面识别-中交
+    public void OCRDrivingLicenseZj(Context con, Handler hd, String imgUrl){
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getDrivingLicense()+"?faceDataUrl="+imgUrl,""),getToken(con),con);
+        RequestUtil.start(1, CertificatesActivity.TYPE_NAME[1],re,con,hd);
+    }
+
+    //驾驶证背面识别-中交
+    public void OCRDrivingLicenseBackZj(Context con, Handler hd, String imgUrl){
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getDrivingLicense()+"?backDataUrl="+imgUrl,""),getToken(con),con);
+        RequestUtil.start(1, CertificatesActivity.TYPE_NAME_BANK[1],re,con,hd);
+    }
+
+
+
+
     //行驶证正面识别
-    public void OCRVehicleLicense(Context con, Handler hd, File file){
+    public void OCRVehicleLicense(Context con, Handler hd, File file) {
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getVehicleLicense()),getToken(con),file);
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getVehicleLicense()), getToken(con), file);
-        RequestUtil.start(12, CertificatesActivity.TYPE_NAME[2],re,con,hd);
+        RequestUtil.start(12, CertificatesActivity.TYPE_NAME[2], re, con, hd);
     }
+
     //行驶证背面识别
-    public void OCRVehicleLicenseBack(Context con, Handler hd, File file,String carId,String carNum){
+    public void OCRVehicleLicenseBack(Context con, Handler hd, File file, String carId, String carNum, boolean isSave) {
-        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()),file,getToken(con),carId,carNum);
+        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()), file, getToken(con), carId, carNum, isSave);
-        RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[2],re,con,hd);
+        RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[2], re, con, hd);
-    }
-
-    public void OCRPlateLicense(Context con, Handler hd, File file){
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getPlateLicense()),getToken(con),file);
-        RequestUtil.start(12, "carName",re,con,hd);
     }
 
 
-    public void OCRCarPlateLicense(Context con, Handler hd, File file){
+    //行驶证正面识别-中交
-        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getPlateLicense2()),getToken(con),file);
+    public void OCRVehicleLicenseZj(Context con, Handler hd, String imgUrl) {
-        RequestUtil.start(12, "carNum",re,con,hd);
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getVehicleLicense() + "?faceDataUrl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(1, CertificatesActivity.TYPE_NAME[2], re, con, hd);
+    }
+
+    //行驶证背面识别-中交
+    public void OCRVehicleLicenseBackZj(Context con, Handler hd, String imgUrl) {
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getVehicleLicense() + "?backDataUrl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(1, CertificatesActivity.TYPE_NAME_BANK[2], re, con, hd);
+    }
+
+    public void OCRPlateLicense(Context con, Handler hd, File file) {
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getPlateLicense()), getToken(con), file);
+        RequestUtil.start(12, "carName", re, con, hd);
+    }
+
+
+    public void OCRCarPlateLicense(Context con, Handler hd, File file) {
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getPlateLicense2()), getToken(con), file);
+        RequestUtil.start(12, "carNum", re, con, hd);
     }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/RequestConstant.java

@@ -56,7 +56,7 @@ public class RequestConstant {
     //运单列表
     private static final String ORDER_LIST = "/app/driver/waybill/listV2";
     //抢单
-    private static final String AGREE_ORDER = "/app/driver/waybill/grabDriverOrdersContruct";
+    private static final String AGREE_ORDER = "/app/driver/waybill/grabDriverOrdersContructV2";
     //获取正在执行的运单/运单详情
     private static final String GET_START_ORDER = "/app/driver/waybill/getExecuteWaybill";
     //查看承运合同
@@ -81,12 +81,14 @@ public class RequestConstant {
     private static final String COMPLAINT = "/app/driver/waybill/complaintV2";
     //保存评价信息
     private static final String EVALUATION_V2 = "/app/driver/waybill/evaluationV2";
+    private static final String GET_WAYBILL_STATUS = "/app/driver/waybill/getWaybillStatus";
+    private static final String GET_ORDER_STATUS = "/app/driver/order/getOrderStatus";
     //车辆列表
     private static final String GET_CAR_LIST = "/app/carDriver/getCarList";
     //车辆详情
     private static final String GET_CAR_DEL = "/app/carDriver/getCarInfo";
     //删除车辆
-    private static final String DEL_CAR = "/app/carDriver/removeCar";
+    private static final String DEL_CAR = "/app/carDriver/unBindCar";
     //上传车辆照片
     private static final String SAVECARIMG = "/app/carDriver/saveCarImg";
     //上传头像保存
@@ -98,17 +100,21 @@ public class RequestConstant {
     //--ORC识别--
 
     //银行卡识别
-    private static final String ORC_BANK = "/common/ocr/bank";
+//    private static final String ORC_BANK = "/common/ocr/bank";
+    private static final String ORC_BANK = "sinoiov/ocr/getBankcardOCR";
     //身份证正面
-    private static final String ID_CARD_FRONT = "/common/ocr/idCardFront";
+//    private static final String ID_CARD_FRONT = "/common/ocr/idCardFront";
+    private static final String ID_CARD_FRONT = "sinoiov/ocr/getIdCardLicenseV2";
     //身份证识别反面
     private static final String ID_CARD_BACK = "/common/ocr/idCardBack";
     //驾驶证正面
-    private static final String DRIVING_LICENSE = "/common/ocr/drivingLicense";
+//    private static final String DRIVING_LICENSE = "/common/ocr/drivingLicense";
+    private static final String DRIVING_LICENSE = "sinoiov/ocr/getDrivingLicenseOCRV2";
     //驾驶证副页
     private static final String DRIVING_LICENSE_BACK = "/common/ocr/drivingLicenseBack";
     //行驶证正面
-    private static final String VEHICLE_LICENSE = "/common/ocr/vehicleLicense";
+//    private static final String VEHICLE_LICENSE = "/common/ocr/vehicleLicense";
+    private static final String VEHICLE_LICENSE = "sinoiov/ocr/getVehicleLicenseOCRV2";
     //行驶证副页
     private static final String VEHICLE_LICENSE_BACK = "/common/ocr/v2/vehicleBackLicenseV3";
     //身份证认证信息
@@ -124,12 +130,16 @@ public class RequestConstant {
     private static final String DRIVERAUTHLICENSE = "/app/driver/auth/driverAuthLicense";
     //行驶证认证
     private static final String SAVEVEHICLELICENSE = "/app/carDriver/saveVehicleLicense";
+//    private static final String SAVEVEHICLELICENSE = "app/carDriver/save";
     //从业资格证认证
     private static final String DRIVER_AUTH_QUALIFICATION = "/app/driver/auth/driverAuthQualification";
     //车辆等级证书
     private static final String DRIVER_AUTH_SAVECARREGISTERNO = "/app/carDriver/saveCarRegisterNo";
     //道路运输信息
     private static final String DRIVER_AUTH_SAVECARROADLICENSENO = "/app/carDriver/saveCarRoadLicenseNo";
+
+    //交强险
+    private static final String DRIVER_TRAFFIC_INSU = "/app/carDriver/saveCarInsurace";
     //党员认证
     private static final String PARTY_MEMBER = "/app/user/partyMember";
     //实名认证
@@ -159,11 +169,16 @@ public class RequestConstant {
 
     //车辆自动审核触发器
     private static final String CAR_AUDIT = "/app/carDriver/carAutomaticAudit";
+    private static final String APP_INFO = "/common/app/logininfor";
 
     public static String getCarAudit() {
         return BASE_URL + CAR_AUDIT;
     }
 
+    public static String postAppInfo() {
+        return BASE_URL + APP_INFO;
+    }
+
     public static String getCarColor() {
         return BASE_URL + CAR_COLOR;
     }
@@ -323,6 +338,14 @@ public class RequestConstant {
         return BASE_URL + EVALUATION_V2;
     }
 
+    public static String getGetWaybillStatus() {
+        return BASE_URL + GET_WAYBILL_STATUS;
+    }
+
+    public static String getGetOrderStatus() {
+        return BASE_URL + GET_ORDER_STATUS;
+    }
+
     public static String getDRIVERAUTHIDCARD() {
         return BASE_URL + DRIVERAUTHIDCARD;
     }
@@ -375,6 +398,10 @@ public class RequestConstant {
         return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO;
     }
 
+    public static String getTrafficInsurance() {
+        return BASE_URL + DRIVER_TRAFFIC_INSU;
+    }
+
     public static String getSaveDrawCar() {
         return BASE_URL + SAVE_DRAW_CAR;
     }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/UserRequset.java

@@ -10,6 +10,7 @@ import android.provider.Settings;
 
 import androidx.annotation.RequiresApi;
 
+import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.business.Md5Util;
@@ -118,6 +119,14 @@ public class UserRequset {
         RequestUtil.start(1, WoDeFragment.VEHICLE_DEL, re, con, hd);
     }
 
+    //车辆详情
+    public void vehicleDelTwo(String id) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("carId", id);
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetCarDel(), MapUtil.mapJson(map)), getToken(con), con);
+        RequestUtil.start(1, "onlyGetDetail", re, con, hd);
+    }
+
     //司机身份证认证
     public void driverIDAuth() {
         String url = RequestConstant.BASE_URL + "/app/driver/auth/authInfo";
@@ -154,7 +163,7 @@ public class UserRequset {
     /**
      * 判断是否开启未知应用安装权限
      */
-    private void isOpenAppNoRe(){
+    private void isOpenAppNoRe() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             boolean b = con.getPackageManager().canRequestPackageInstalls();
             if (!b) {
@@ -169,8 +178,8 @@ public class UserRequset {
     @RequiresApi(api = Build.VERSION_CODES.O)
     private void startInstallPermissionSettingActivity() {
         //注意这个是8.0新API
-        Uri packageURI = Uri.parse("package:" +con.getPackageName());
+        Uri packageURI = Uri.parse("package:" + con.getPackageName());
-        Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,packageURI);
+        Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         con.startActivity(intent);
     }
@@ -221,7 +230,18 @@ public class UserRequset {
     public void carAudit(String carId) {
         Map<String, Object> map = new HashMap<>();
         map.put("carId", carId);
-        Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(),"get", Md5Util.resNoUrl(map)),getToken(con));
+        Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(), "get", Md5Util.resNoUrl(map)), getToken(con));
         RequestUtil.start(1, VehicleAuthActivity.CAR_AUDIO, re, con, hd);
     }
+
+    public void postAppInfo(AppInfoBean appInfoBean, String type) {
+//        Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(),"get", gson.toJson(appInfoBean)),getToken(con));
+        Request re;
+        if ("put".equals(type)) {
+            re = OkHttpUtil.put(new OkDate(RequestConstant.postAppInfo(), type, gson.toJson(appInfoBean)), con);
+        } else {
+            re = OkHttpUtil.post(new OkDate(RequestConstant.postAppInfo(), type, gson.toJson(appInfoBean)), con);
+        }
+        RequestUtil.start(1, VehicleAuthActivity.APP_INFO, re, con, hd);
+    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/bean/LicenseInputBean.java

@@ -16,8 +16,123 @@ public class LicenseInputBean {
     private int driverLicensePhoto;
     private String endTime;
     private String firstTime;
+    private String address;
+    private String quasiDriveType;
+    private String beginDate;
+    private String endDate;
+    private String fileNumber;
+    private String issuingAuthority;
+    private String sex;
+    private String name;
+    private String idcard;
+    private String organizationName;
+    private String startTime;
+    private String birthday;
+    private String country;
 
+    public String getBirthday() {
+        return birthday;
+    }
 
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getOrganizationName() {
+        return organizationName;
+    }
+
+    public void setOrganizationName(String organizationName) {
+        this.organizationName = organizationName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getQuasiDriveType() {
+        return quasiDriveType;
+    }
+
+    public void setQuasiDriveType(String quasiDriveType) {
+        this.quasiDriveType = quasiDriveType;
+    }
+
+    public String getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(String beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getFileNumber() {
+        return fileNumber;
+    }
+
+    public void setFileNumber(String fileNumber) {
+        this.fileNumber = fileNumber;
+    }
+
+    public String getIssuingAuthority() {
+        return issuingAuthority;
+    }
+
+    public void setIssuingAuthority(String issuingAuthority) {
+        this.issuingAuthority = issuingAuthority;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIdcard() {
+        return idcard;
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
+    }
 
     public String getAllowType() {
         return allowType;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java

@@ -10,6 +10,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
@@ -27,11 +28,14 @@ public class MakeUpService extends Service {
     public void palyMp3(){
         Log.e("开始播放","-----");
         try {
-            AssetFileDescriptor fd =getAssets().openFd("kujp9scu.mp3");
+            MediaPlayer mediaPlayer = MediaPlayer.create(this, R.raw.kujp9scu);
-            mediaPlayer.setDataSource(fd);
+            mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-            mediaPlayer.setLooping(false);//设置为循环播放
+                @Override
-            mediaPlayer.prepare();//初始化播放器MediaPlayer
+                public void onPrepared(MediaPlayer mediaPlayer) {
-            mediaPlayer.start();
+                    mediaPlayer.start();
+                }
+            });
+            mediaPlayer.prepareAsync();
             Log.e("播放成功","-----");
         } catch (Exception e) {
             e.printStackTrace();
@@ -58,14 +62,14 @@ public class MakeUpService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-        palyMp3();
+//        palyMp3();
     }
 
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.e("服务开启","-----");
-
+        palyMp3();
         return START_STICKY;
 
     }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java

@@ -30,22 +30,22 @@ import java.util.TimerTask;
 public class TrackService extends Service {
 
     private Context con;
-    private TrackInputBean tib=new TrackInputBean();
+    private TrackInputBean tib = new TrackInputBean();
     private LocationGDUtil l;
-    private int timeSum=1000*60*3;
+    private int timeSum = 1000 * 60 * 3;
-    private String snn="";
+    private String snn = "";
-    private Gson gson=new Gson();
+    private Gson gson = new Gson();
     private HuoYuanRequset hyr;
 
-    private Handler hd=new Handler(msg -> {
+    private Handler hd = new Handler(msg -> {
-        switch (msg.what){
+        switch (msg.what) {
             case RequsetCodeConstants.SUCCESS:
-                if(CacheGroup.cacheList.get("genzong")!=null){
+                if (CacheGroup.cacheList.get("genzong") != null) {
-                    BaseBean bb=gson.fromJson(CacheGroup.cacheList.get("genzong"),BaseBean.class);
+                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("genzong"), BaseBean.class);
-                    if(bb.getCode()==200){
+                    if (bb.getCode() == 200) {
-                        Log.e("--轨迹上传--","成功");
+                        Log.e("--轨迹上传--", "成功");
-                    }else{
+                    } else {
-                        Log.e("--轨迹上传失败:--",bb.getMsg());
+                        Log.e("--轨迹上传失败:--", bb.getMsg());
                     }
                     CacheGroup.cacheList.remove("genzong");
                 }
@@ -59,32 +59,34 @@ public class TrackService extends Service {
 
     @Nullable
     @Override
-    public IBinder onBind(Intent intent) {return null; }
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        con=this;
+        con = this;
-        hyr=new HuoYuanRequset(con,hd);
+        hyr = new HuoYuanRequset(con, hd);
-        Log.e("开始循环上传，等待100ms","-----");
+        Log.e("开始循环上传，等待100ms", "-----");
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
-                snn=SPUtil.getSP(con,"order","ShippingNoteNumber");
+                snn = SPUtil.getSP(con, "order", "ShippingNoteNumber");
-                if(!snn.equals("")) {
+                if (!snn.equals("")) {
                     l = new LocationGDUtil(con, hd);
                     l.onCreate();
-                }else{
+                } else {
                     onDestroy();
                 }
             }
-        },100,timeSum);
+        }, 100, timeSum);
     }
 
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.e("服务开启","-----");
+        Log.e("服务开启", "-----");
         return START_STICKY;
 
     }
@@ -94,16 +96,19 @@ public class TrackService extends Service {
         super.onDestroy();
     }
 
-    public void genzong(){
+    public void genzong() {
-            //经度
+        if (l == null || l.getLatitude() == 0d) {
-            tib.setLatitude(l.getLatitude()+"");
+            return;
-            //纬度
+        }
-            tib.setLongitude(l.getLongitude()+"");
+        //经度
-            Log.e("经度",l.getLatitude()+"");
+        tib.setLatitude(l.getLatitude() + "");
-            Log.e("维度",l.getLongitude()+"");
+        //纬度
-            //单号
+        tib.setLongitude(l.getLongitude() + "");
-            tib.setShippingNoteNumber(snn);
+        Log.e("经度", l.getLatitude() + "");
-            hyr.trackTracking(tib);
+        Log.e("维度", l.getLongitude() + "");
+        //单号
+        tib.setShippingNoteNumber(snn);
+        hyr.trackTracking(tib);
     }
 
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt

@@ -10,6 +10,7 @@ import android.view.KeyEvent
 import android.widget.*
 import androidx.fragment.app.Fragment
 import com.arpa.hndahesudintocctmsdriver.R
+import com.arpa.hndahesudintocctmsdriver.event.WalletEvent
 import com.arpa.hndahesudintocctmsdriver.ui.home.HomeFragment
 import com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity
 import com.arpa.hndahesudintocctmsdriver.ui.my.MyFragment
@@ -23,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.util.view.PanDuanUtil
 import com.google.gson.Gson
 import com.gyf.cactus.ext.cactusUpdateNotification
 import com.permissionx.guolindev.PermissionX
+import org.greenrobot.eventbus.EventBus
 
 @Suppress("DIVISION_BY_ZERO")
 @SuppressLint("SetTextI18n")
@@ -93,6 +95,7 @@ class MainActivity : BaseAppCompatActivity() {
                     bt.hide(fs[bt.index])
                     bt.selectItem(fs[1])
                 } else {
+                    EventBus.getDefault().post(WalletEvent("refresh"))
                     bt.setDefaultFragment(fs[1])
                 }
                 bt.index = 1
@@ -126,9 +129,9 @@ class MainActivity : BaseAppCompatActivity() {
                 bt.index = 3
             }
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            getPression()
+//            getPression()
-        }
+//        }
     }
 
     fun getPression() {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/UiAuxiliary.java

@@ -4,6 +4,7 @@ import android.content.Context;
 
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity;
+import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 
 import org.greenrobot.eventbus.EventBus;
@@ -38,7 +39,8 @@ public class UiAuxiliary {
     }
 
     public static void delLogin(Context con){
-        JPushInterface.deleteAlias(con,0);
+//        JPushInterface.deleteAlias(con,0);
+        SPUtils.remove(con,"curWaybillId");
         SPUtil.insSP(con,LoginActivity.USER,LoginActivity.USER_TOKEN,"");
         SPUtil.insSP(con,LoginActivity.USER,LoginActivity.USER_UNAME,"");
         SPUtil.insSP(con,LoginActivity.USER,LoginActivity.USER_RNAME,"");

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java

@@ -18,10 +18,16 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.arpa.hndahesudintocctmsdriver.bean.OCRQualiBean;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.TimeUtil;
 import com.esign.esignsdk.EsignSdk;
+import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.DatePicker;
 import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
 import com.google.gson.Gson;
@@ -45,6 +51,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
+import org.greenrobot.eventbus.Subscribe;
+
 import java.io.File;
 import java.util.List;
 
@@ -78,6 +86,10 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                 if (CacheGroup.cacheList.get("upload") != null) {
                     ub = gson.fromJson(CacheGroup.cacheList.get("upload"), UploadBean.class);
                     if (ub.getCode() == 200) {
+                        if ("0".equals(type)) {//从业资格识别，党员认证不识别
+                            new OCRRequest().ORCQualificaZj(con, hd, ub.getData().getUrl());
+                        }
+
                         url = ub.getData().getUrl();
                         Glide.with(con).load(url).into(img);
                         up_img.setVisibility(View.GONE);
@@ -85,6 +97,24 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     }
                     CacheGroup.cacheList.remove("upload");
                 }
+
+                if (CacheGroup.cacheList.get("ORCQualificaZj") != null) {
+                    OCRQualiBean ocrQualiBean = gson.fromJson(CacheGroup.cacheList.get("ORCQualificaZj"), OCRQualiBean.class);
+                    if (ocrQualiBean.getCode() == 200 && ocrQualiBean.getData() != null) {
+                        List<OCRQualiBean.DataDTO.QualificationCategoryListDTO> qualificationCategoryList = ocrQualiBean.getData().getQualification_category_list();
+                        if (qualificationCategoryList != null && qualificationCategoryList.size() > 0) {
+                            String expiryDate = qualificationCategoryList.get(0).getExpiry_date();
+                            if (expiryDate.contains("-")){
+                                value2.setText(expiryDate);
+                            }
+                        }
+                    } else {
+                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove("ORCQualificaZj");
+                }
+
+
                 if (CacheGroup.cacheList.get("isAuthDriverAuthQualification") != null) {
                     Log.e("is", CacheGroup.cacheList.get("isAuthDriverAuthQualification"));
                     ib = gson.fromJson(CacheGroup.cacheList.get("isAuthDriverAuthQualification"), IsAuthDriverAuthQualificationBean.class);
@@ -101,6 +131,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthQualification"), BaseBean.class);
                     if (bb.getCode() == 200) {
 //                        initAuth();
+                        isAuth = true;
                         //判断是否从车辆进来 carId为空从个人认证进来需跳转实名认证，不为空车辆信息进入，需跳转车辆照片
                         if (TextUtils.isEmpty(carId)) {
                             //从业资格证->实名认证
@@ -113,12 +144,12 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                             }
                         } else {
                             finish();
-                            if (isOverCar){//从业资格证=》道路运输许可证
+                            if (isOverCar) {//从业资格证=》道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
                                 in.putExtra("carId", carId);
                                 startActivity(in);
-                            }else{//资料传完  补传情况
+                            } else {//资料传完  补传情况
                                 Intent in = new Intent(con, AddCarSuccActivity.class);
                                 in.putExtra("type", 3);
                                 con.startActivity(in);
@@ -126,7 +157,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                         }
 
 
-
                         Toast.makeText(con, "资格证上传成功", Toast.LENGTH_SHORT).show();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -155,6 +185,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
 //                        finish();
                         EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                     } else {
+                        finish();
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
@@ -198,7 +229,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         data_view = findViewById(R.id.data_view);
         type = getIntent().getExtras().getString("type");
         carId = getIntent().getExtras().getString("carId", "");
-        isOverCar = getIntent().getExtras().getBoolean("isOverCar",false);
+        isOverCar = getIntent().getExtras().getBoolean("isOverCar", false);
         ur = new UserRequset(con, hd);
         initView(null);
         if ("0".equals(type)) {
@@ -210,9 +241,9 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             }
             //new RZRequest().isDriverAuthQualification(con,hd);
         }
-        if (TextUtils.isEmpty(carId)){//carId不为空 从添加车辆进入  该操作不能跳过
+        if (TextUtils.isEmpty(carId)) {//carId不为空 从添加车辆进入  该操作不能跳过
             tvSkip.setVisibility(View.VISIBLE);
-        }else{
+        } else {
             tvSkip.setVisibility(View.GONE);
         }
     }
@@ -243,12 +274,14 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             }
         });
         value2.setOnClickListener(v -> {
-            DatePicker picker = new DatePicker(this);
+            if (!isAuth) {
-            picker.setBodyWidth(300);
+                DatePicker picker = new DatePicker(this);
-            picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
+                picker.setBodyWidth(300);
-            picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
+                picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
-            picker.getWheelLayout().setDateLabel("年", "月", "日");
+                picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
-            picker.show();
+                picker.getWheelLayout().setDateLabel("年", "月", "日");
+                picker.show();
+            }
         });
         submit.setOnClickListener(v -> {
             if (!isAuth) {
@@ -291,7 +324,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         tvSkip.setOnClickListener(v -> {
 
 
-
             if (type.equals("0")) {
 //                finish();
                 if (key) {
@@ -379,4 +411,31 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         }
     }
 
+
+    @Subscribe
+    public void processResult(AuthEvent auth) {
+        //添加实名/意愿/签署完成之后的逻辑
+        Log.e("-回调信息-", auth.result);
+        JSONObject jsonObject = JSON.parseObject(auth.result);
+        if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
+            if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "签署场景成功", Toast.LENGTH_SHORT).show();
+            } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "实名认证成功", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(con, "意愿认证成功", Toast.LENGTH_SHORT).show();
+            }
+            finish();
+        } else {
+            if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "签署场景失败", Toast.LENGTH_SHORT).show();
+            } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "实名认证失败", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(con, "意愿认证失败", Toast.LENGTH_SHORT).show();
+            }
+            EsignSdk.getInstance().finishH5Activity();
+            finish();
+        }
+    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java

@@ -23,12 +23,16 @@ import androidx.cardview.widget.CardView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.arpa.hndahesudintocctmsdriver.H5Activity;
+import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean2;
 import com.arpa.hndahesudintocctmsdriver.bean.DicBean;
+import com.arpa.hndahesudintocctmsdriver.bean.DriverUpBean;
 import com.arpa.hndahesudintocctmsdriver.bean.SinglePickBean;
 import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
+import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.PickerUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
@@ -37,6 +41,10 @@ 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.ImageLoader;
+import com.dahe.mylibrary.utils.PatternUtils;
+import com.dahe.mylibrary.utils.TimeUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
@@ -82,10 +90,12 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 //修改后不可编辑
 public class CertificatesActivity extends BaseAppCompatActivity {
@@ -102,13 +112,14 @@ public class CertificatesActivity extends BaseAppCompatActivity {
     private String[] names_img3 = {"", "", "行驶证副页背面照片", "挂车行驶证副页背面照片"};
     private String[][] name = {
             {"姓名", "身份证号", "地址", "有效期至"},
-            {"档案编号", "初次领证日期", "准驾车型", "有效期限(止)"},
+            {"驾驶证号", "初次领证日期", "准驾车型", "有效期限(止)"},
             {"车牌号码", "车辆类型", "所有人", "车辆识别代码"},
             {"车牌号码", "车辆类型", "所有人", "车辆识别代码"}
     };
     private int[] typeImgOne = {R.mipmap.id, R.mipmap.license, R.mipmap.vehicle_license, R.mipmap.vehicle_license};
     private int[] typeImgTwo = {R.mipmap.id_back, R.mipmap.license_back, R.mipmap.vehicle_license_back, R.mipmap.vehicle_license_back};
     private int index = 0;
+    private String carExistCarId = "";
     private DicBean.DataDTO curColor, curEnergy;
     private TextView zj_name, zjimg_name, zjimg2_name, zj_name2, zj_name3;
     private TextView name1, name2, name3, name4, value5, value6;
@@ -157,15 +168,24 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         || CacheGroup.cacheList.get("saveVehicleLicense") != null || CacheGroup.cacheList.get("authUrl") != null
                         || CacheGroup.cacheList.get("saveDrawCar") != null) {
                     if (CacheGroup.cacheList.get("driverAuthIdCard") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthIdCard"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
                             finish();
 
                             //上传身份证信息后 跳转上传驾驶证信息页面
-                            Intent in = new Intent(con, CertificatesActivity.class);
+//                            Intent in = new Intent(con, CertificatesActivity.class);
-                            in.putExtra("index", 1);
+//                            in.putExtra("index", 1);
-                            startActivity(in);
+//                            startActivity(in);
+
+
+                            //上传身份证信息后 跳转上传银行卡信息页面
+                            Intent in333 = new Intent(con, UpBankActivity.class);
+                            in333.putExtra("type", 1);
+                            startActivity(in333);
 
                         } else {
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -174,6 +194,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("driverAuthLicense") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthLicense"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
@@ -198,7 +221,13 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         Log.e("url", CacheGroup.cacheList.get("authUrl"));
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
                         if (bb.getCode() == 200) {
-                            EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
+                            Intent intent = new Intent(this, H5Activity.class);
+                            intent.putExtra("url", (String) bb.getData());
+                            intent.putExtra("view_file", false);
+                            intent.putExtra("title", "人脸识别");
+                            intent.putExtra("isGoCar", true);
+                            startActivity(intent);
+//                            EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                         } else {
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
                         }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
@@ -206,6 +235,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("saveVehicleLicense") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         CarZhengBean czb = gson.fromJson(CacheGroup.cacheList.get("saveVehicleLicense"), CarZhengBean.class);
                         if (czb.getCode() == 200) {
                             String needUpQCPhoto = czb.getData().getNeedUpQCPhoto();//是否需要上传从业资格证
@@ -214,13 +246,19 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             Toast.makeText(con, "车辆行驶证保存成功", Toast.LENGTH_SHORT).show();
 
                             VehicleEvent ve = new VehicleEvent(String.valueOf(czb.getData().getCarId()));
-                            EventBus.getDefault().post(ve);
+                            EventBus.getDefault().postSticky(ve);
 
                             // TODO: 2023/8/23
                             if ("1".equals(isTrailer)) {//判断是否跳转挂车行驶证
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
+                                if (olb != null && olb.getData() != null && olb.getData().isCarExist()) {
+                                    CarDelBean carDelBean = new CarDelBean();
+                                    carDelBean.setRes(1);//保留字段 1：为绑定车辆，可以进行修改挂车信息
+                                    carDelBean.setData(gson.fromJson(gson.toJson(olb.getData().getExistCarInfo()), CarDelBean.DataDTO.class));
+                                    in.putExtra("cheData", gson.toJson(carDelBean));
+                                }
                                 startActivity(in);
                             } else if ("1".equals(needUpQCPhoto)) {//判断是否跳转从业资格证
                                 Intent in = new Intent(con, AuthQualificationActivity.class);
@@ -231,6 +269,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
+                                in.putExtra("carExist", true);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
                                 startActivity(in);
                             } else {
@@ -263,6 +302,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         CacheGroup.cacheList.remove("saveVehicleLicense");
                     }
                     if (CacheGroup.cacheList.get("saveDrawCar") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         Log.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
                         CarZhengBean bb = gson.fromJson(CacheGroup.cacheList.get("saveDrawCar"), CarZhengBean.class);
                         if (bb.getCode() == 200) {
@@ -283,6 +325,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//现判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
+                                in.putExtra("carExist", true);
                                 in.putExtra("carId", carId);
                                 startActivity(in);
                             } else {
@@ -311,6 +354,92 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         });
                     }
                     CacheGroup.cacheList.remove(CAR_COLOR);
+                } else if (CacheGroup.cacheList.get("upload") != null) {
+                    ub = gson.fromJson(CacheGroup.cacheList.get("upload"), UploadBean.class);
+                    if (ub.getCode() == 200) {
+//                        url3 = ub.getData().getUrl();
+//                        fid = ub.getData().getId();
+////                        Glide.with(con).load(url3).into(img3);
+//                        Glide.with(con).load(path).into(img3);
+                        String imageUrl = ub.getData().getUrl();
+                        switch (index) {
+                            case 0:
+                                if (keys[0]) {
+                                    fontId = ub.getData().getId();
+                                    url1 = imageUrl;
+                                    new OCRRequest().OCRZjCard(con, hd, imageUrl);
+                                } else {
+                                    Log.e("res" + new File(path).getName(), new File(path).getPath());
+                                    backId = ub.getData().getId();
+                                    url2 = imageUrl;
+                                    new OCRRequest().OCRZjCardBack(con, hd, imageUrl);
+                                }
+                                break;
+                            case 1:
+                                if (keys[0]) {
+                                    fontId = ub.getData().getId();
+                                    url1 = imageUrl;
+                                    new OCRRequest().OCRDrivingLicenseZj(con, hd, imageUrl);
+                                } else {
+                                    backId = ub.getData().getId();
+                                    url2 = imageUrl;
+                                    new OCRRequest().OCRDrivingLicenseBackZj(con, hd, imageUrl);
+                                }
+                                break;
+                            case 2:
+                                if (keys[0]) {
+                                    fontId = ub.getData().getId();
+                                    url1 = imageUrl;
+                                    new OCRRequest().OCRVehicleLicenseZj(con, hd, imageUrl);
+                                } else if (keys[1]) {
+                                    if ("".equals(carNum)) {
+                                        Toast.makeText(con, "车牌号不能为空", Toast.LENGTH_LONG).show();
+                                        customDialog.dismiss();
+                                        return;
+                                    }
+                                    backId = ub.getData().getId();
+                                    url2 = imageUrl;
+                                    new OCRRequest().OCRVehicleLicenseBackZj(con, hd, imageUrl);
+
+                                } else {
+                                    new AuthRequest().upload(con, hd, new File(path));
+                                }
+                                break;
+                            case 3:
+                                Log.e("添加挂车", "挂车" + oCrcarId);
+                                if (keys[0]) {
+                                    fontId = ub.getData().getId();
+                                    url1 = imageUrl;
+                                    new OCRRequest().OCRVehicleLicenseZj(con, hd, imageUrl);
+                                } else if (keys[1]) {
+                                    if ("".equals(carNum)) {
+                                        Toast.makeText(con, "车牌号不能为空", Toast.LENGTH_LONG).show();
+                                        customDialog.dismiss();
+                                        return;
+                                    }
+//                   if (cdb != null && cdb.getData().getTrailerResVo() &&cdb.getRes() == 1)
+                                    boolean isExist = false;
+                                    if (olb != null) {//主页识别成功后获取
+                                        isExist = olb.getData().isCarExist();
+                                    } else {
+                                        if (cdb != null && cdb.getData().getTrailerResVo() != null && cdb.getRes() == 1) {//上个页面带来数据
+                                            isExist = true;
+                                        }
+                                    }
+                                    backId = ub.getData().getId();
+                                    url2 = imageUrl;
+                                    new OCRRequest().OCRVehicleLicenseBackZj(con, hd, imageUrl);
+                                }
+                                break;
+                            default:
+                                break;
+                        }
+
+
+                    } else {
+                        Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove("upload");
                 } else if (CacheGroup.cacheList.get(CAR_ENERGY_TYPE) != null) {
                     DicBean bb = gson.fromJson(CacheGroup.cacheList.get(CAR_ENERGY_TYPE), DicBean.class);
                     if (bb.getCode() == 200) {
@@ -330,15 +459,58 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     Log.e("url", CacheGroup.cacheList.get("authUrl"));
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
                     if (bb.getCode() == 200) {
-                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
+                        Intent intent = new Intent(this, H5Activity.class);
+                        intent.putExtra("url", (String) bb.getData());
+                        intent.putExtra("view_file", false);
+                        intent.putExtra("title", "人脸识别");
+                        intent.putExtra("isGoCar", true);
+                        startActivity(intent);
+//                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
+                } else if (CacheGroup.cacheList.get("getCarInfo") != null) {
+                    Log.e("url", CacheGroup.cacheList.get("getCarInfo"));
+                    CarInfoBean2 bb = gson.fromJson(CacheGroup.cacheList.get("getCarInfo"), CarInfoBean2.class);
+                    if (bb.getCode() == 200 && bb.getData() != null) {
+                        if (!TextUtils.isEmpty(bb.getData().getCarId())) {
+                            carExistCarId = bb.getData().getCarId();
+                            value1.setEnabled(false);
+                            value2.setEnabled(false);
+                            value3.setEnabled(false);
+                            value4.setEnabled(false);
+//                            img2.setEnabled(false);
+                            u_img2.setEnabled(false);
+                            url2 = bb.getData().getBackImage();
+                            Glide.with(con).load(bb.getData().getBackImage()).into(img2);
+//                            url2 = olb.getData().getExistCarInfo().getBackImage();
+                            ToastUtils.showLongToast(con, "该车辆已存在,请仔细核对相关信息");
+                        }
+                    }
+                    CacheGroup.cacheList.remove("getCarInfo");
+                } else if (CacheGroup.cacheList.get("bindCarInfo") != null) {
+                    if (customDialog != null && customDialog.isShowing())
+                        customDialog.dismiss();
+                    Log.e("url", CacheGroup.cacheList.get("bindCarInfo"));
+                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("bindCarInfo"), BaseBean.class);
+                    if (bb.getCode() == 200) {
+                        VehicleEvent ve = new VehicleEvent(String.valueOf(carExistCarId));
+                        EventBus.getDefault().postSticky(ve);
+                        finish();
+                        ToastUtils.showToast(con, bb.getMsg());
+                    }else{
+                        ToastUtils.showToast(con, bb.getMsg());
+                    }
+                    CacheGroup.cacheList.remove("bindCarInfo");
                 } else {
-                    initView(null);
-                    initData();
                     pathOrcRes();
+                    //重复代码?
+                    initView(null);
+                    if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) {
+                        initData();
+                    }
+
                 }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
@@ -415,6 +587,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
 //                there_div.setVisibility(View.VISIBLE);
                 if (c_str != null && !c_str.equals("")) {
                     cdb = gson.fromJson(c_str, CarDelBean.class);
+                    oCrcarId = cdb.getData().getTrailerResVo().getTrailerLicenseId() + "";
                     initView(null);
                     initData();
                 } else {
@@ -454,10 +627,12 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         img1.setImageResource(typeImgOne[index]);
         img2.setImageResource(typeImgTwo[index]);
         if (!url1.equals("")) {
-            Glide.with(con).load(url1).into(img1);
+            ImageLoader.getInstance().loadImage(con, url1, img1, typeImgOne[index]);
+//            Glide.with(con).load(url1).into(img1);
         }
         if (!url2.equals("")) {
-            Glide.with(con).load(url2).into(img2);
+            ImageLoader.getInstance().loadImage(con, url2, img2, typeImgTwo[index]);
+//            Glide.with(con).load(url2).into(img2);
         }
         //查看第一张照片
         img1.setOnClickListener(v -> {
@@ -554,9 +729,14 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     case 0:
                         finish();
                         //上传身份证信息后 跳转上传驾驶证信息页面
-                        Intent in1 = new Intent(con, CertificatesActivity.class);
+//                        Intent in1 = new Intent(con, CertificatesActivity.class);
-                        in1.putExtra("index", 1);
+//                        in1.putExtra("index", 1);
-                        startActivity(in1);
+//                        startActivity(in1);
+
+                        //上传身份证信息后 跳转上传银行卡信息页面
+                        Intent in333 = new Intent(con, UpBankActivity.class);
+                        in333.putExtra("type", 1);
+                        startActivity(in333);
                         break;
                     case 1:
                         //传驾驶证信息页面 跳转实名认证
@@ -671,14 +851,16 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     value3.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getOwner(), "空数据"));
                     value4.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getVehicleNumber(), "空数据"));
                     value6.setText(StringUtil.isNull(cdb.getData().getCarEnergyTypValue(), "空数据"));
-                    submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     Glide.with(con).load(url1).into(img1);
                     Glide.with(con).load(url2).into(img2);
                     Glide.with(con).load(url3).into(img3);
-                    u_img.setText("已上传");
+                    if (cdb.getRes() != 1) {
-                    u_img2.setText("已上传");
+                        submit.setBackgroundResource(R.drawable.bg_btn_grey);
-                    u_img3.setText("点击查看");
+                        u_img.setText("已上传");
-                    isAuth = true;
+                        u_img2.setText("已上传");
+                        u_img3.setText("点击查看");
+                        isAuth = true;
+                    }
                 }
                 break;
             default:
@@ -733,13 +915,12 @@ public class CertificatesActivity extends BaseAppCompatActivity {
             case 0:
                 if (CacheGroup.cacheList.get(TYPE_NAME[0]) != null) {
                     ocb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[0]), OCRCardBean.class);
-                    if (ocb.getCode() == 200) {
+                    if (ocb.getCode() == 200 && ocb.getData() != null) {
-                        url1 = ocb.getData().getUrl();
+//                        url1 = ocb.getData().getUrl();
                         value1.setText(ocb.getData().getName());
-                        value2.setText(ocb.getData().getCardId());
+                        value2.setText(ocb.getData().getIdcard());
                         value3.setText(ocb.getData().getAddress());
-                        Glide.with(con).load(url1).into(img1);
+                        Glide.with(con).load(path).into(img1);
-                        fontId = ocb.getData().getId();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
                     }
@@ -747,13 +928,10 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 if (CacheGroup.cacheList.get(TYPE_NAME_BANK[0]) != null) {
                     ocbb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[0]), OCRCardBackBean.class);
-                    if (ocbb.getCode() == 200) {
+                    if (ocbb.getCode() == 200 && ocbb.getData() != null) {
-                        url2 = ocbb.getData().getUrl();
+                        value4.setText(ocbb.getData().getValidTo());
-                        value4.setText(ocbb.getData().getEndTime());
+                        Glide.with(con).load(path).into(img2);
-                        Glide.with(con).load(url2).into(img2);
+                        startTime = ocbb.getData().getValidFrom();
-                        startTime = ocbb.getData().getStartTime();
-                        backId = ocbb.getData().getId();
-
                         //自动调取提交功能，实现页面自动跳转
                         subimt();
                     } else {
@@ -766,16 +944,15 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 //{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
                 if (CacheGroup.cacheList.get(TYPE_NAME[1]) != null) {
                     odl = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[1]), OCRDrivingLicenseBean.class);
-                    if (odl.getCode() == 200) {
+                    if (odl.getCode() == 200 && odl.getData() != null) {
                         OCRDrivingLicenseBean.DataDTO od = odl.getData();
-                        url1 = odl.getData().getUrl();
+//                        url1 = odl.getData().getUrl();
                         value7.setText(StringUtil.isNull(od.getName(), "识别异常"));
-                        value1.setText(StringUtil.isNull(od.getNumber(), "识别异常"));
+                        value1.setText(StringUtil.isNull(od.getIdcard(), "识别异常"));
-                        value2.setText(StringUtil.isNull(od.getStartTime(), "识别异常"));
+                        value2.setText(StringUtil.isNull(od.getFirstGetDocDate(), "识别异常"));
-                        value3.setText(StringUtil.isNull(od.getAllowType(), "识别异常"));
+                        value3.setText(StringUtil.isNull(od.getQuasiDriveType(), "识别异常"));
-                        value4.setText(StringUtil.isNull(od.getEndTime(), "识别异常"));
+                        value4.setText(StringUtil.isNull(od.getEndDate(), "识别异常"));
-                        Glide.with(con).load(url1).into(img1);
+                        Glide.with(con).load(path).into(img1);
-                        fontId = od.getId();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
                     }
@@ -783,10 +960,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 if (CacheGroup.cacheList.get(TYPE_NAME_BANK[1]) != null) {
                     odlb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[1]), OCRDrivingLicenseBackBean.class);
-                    if (odlb.getCode() == 200) {
+                    if (odlb.getCode() == 200 && odlb.getData() != null) {
-                        url2 = odlb.getData().getUrl();
+                        Glide.with(con).load(path).into(img2);
-                        backId = odlb.getData().getId();
-                        Glide.with(con).load(url2).into(img2);
                         //自动调取提交功能，实现页面自动跳转
                         subimt();
                     } else {
@@ -801,45 +976,55 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 if (CacheGroup.cacheList.get(TYPE_NAME[2]) != null) {
                     Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
                     olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class);
-                    if (olb.getCode() == 200) {
+                    if (2==index&&olb.getData().getVclN().contains("挂")){
-                        url1 = olb.getData().getUrl();
+                        Toast.makeText(con,"该证件为挂车,请上传行驶证证件",Toast.LENGTH_SHORT).show();
-                        value1.setText(olb.getData().getCarNumber());
+                        return;
-                        value2.setText(olb.getData().getType());
+                    }
-                        value3.setText(olb.getData().getOwner());
+
-                        value4.setText(olb.getData().getVehicleNumber());
+                    if (3==index&&!olb.getData().getVclN().contains("挂")){
-                        fontId = olb.getData().getId();
+                        Toast.makeText(con,"未识别到挂车相关信息,请上传挂车行驶证证件",Toast.LENGTH_SHORT).show();
-                        Glide.with(con).load(url1).into(img1);
+                        return;
+                    }
+                    if (olb.getCode() == 200 && olb.getData() != null) {
+                        carExistCarId = "";
+                        value1.setEnabled(true);
+                        value2.setEnabled(true);
+                        value3.setEnabled(true);
+                        value4.setEnabled(true);
+                        img2.setEnabled(true);
+                        u_img2.setEnabled(true);
+//                        url1 = olb.getData().getUrl();
+                        value1.setText(olb.getData().getVclN());
+                        value2.setText(olb.getData().getVcltype());
+                        value3.setText(olb.getData().getOwnerName());
+                        value4.setText(olb.getData().getVin());
+//                        fontId = olb.getData().getId();
+//                        Glide.with(con).load(url1).into(img1);
+                        Glide.with(con).load(path).into(img1);
                         oCrcarId = olb.getData().getCarId() + "";
+                        if (!TextUtils.isEmpty(olb.getData().getVclN())&&!olb.getData().getVclN().contains("挂"))
+                            new AuthRequest().getCarInfo(con, hd, olb.getData().getVclN());
                         Log.e("-cardId-", oCrcarId);
                     } else {
-                        Toast.makeText(con, olb.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(TYPE_NAME[2]);
                 }
                 if (CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null) {
                     oblb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]), OCRVehicleBackLicenseBean.class);
-                    if (oblb.getCode() == 200) {
+                    if (oblb.getCode() == 200 && oblb.getData() != null) {
-                        url2 = oblb.getData().getUrl();
+//                        url2 = oblb.getData().getUrl();
-                        backId = oblb.getData().getId();
+//                        backId = oblb.getData().getId();
-                        Glide.with(con).load(url2).into(img2);
+//                        Glide.with(con).load(url2).into(img2);
-                        //自动调取提交功能，实现页面自动跳转
+                        Glide.with(con).load(path).into(img2);
+                        //自动调取提交功能，实现页面自动跳转实现页面自动跳转
                         subimt();
                     } else {
-                        Toast.makeText(con, oblb.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(TYPE_NAME_BANK[2]);
                 }
-                if (CacheGroup.cacheList.get("upload") != null) {
+
-                    ub = gson.fromJson(CacheGroup.cacheList.get("upload"), UploadBean.class);
-                    if (ub.getCode() == 200) {
-                        url3 = ub.getData().getUrl();
-                        fid = ub.getData().getId();
-                        Glide.with(con).load(url3).into(img3);
-                    } else {
-                        Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("upload");
-                }
                 break;
             default:
                 break;
@@ -856,29 +1041,35 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         switch (index) {
             case 0:
                 if (keys[0]) {
-                    new OCRRequest().OCRCard(con, hd, new File(path));
+                    new AuthRequest().upload(con, hd, new File(path));
+//                    new OCRRequest().OCRCard(con, hd, new File(path));
                 } else {
+                    new AuthRequest().upload(con, hd, new File(path));
                     Log.e("res" + new File(path).getName(), new File(path).getPath());
-                    new OCRRequest().OCRCardBack(con, hd, new File(path));
+//                    new OCRRequest().OCRCardBack(con, hd, new File(path));
                 }
                 break;
             case 1:
                 if (keys[0]) {
-                    new OCRRequest().OCRDrivingLicense(con, hd, new File(path));
+                    new AuthRequest().upload(con, hd, new File(path));
+//                    new OCRRequest().OCRDrivingLicense(con, hd, new File(path));
                 } else {
-                    new OCRRequest().OCRDrivingLicenseBack(con, hd, new File(path));
+                    new AuthRequest().upload(con, hd, new File(path));
+//                    new OCRRequest().OCRDrivingLicenseBack(con, hd, new File(path));
                 }
                 break;
             case 2:
                 if (keys[0]) {
-                    new OCRRequest().OCRVehicleLicense(con, hd, new File(path));
+                    new AuthRequest().upload(con, hd, new File(path));
+//                    new OCRRequest().OCRVehicleLicense(con, hd, new File(path));
                 } else if (keys[1]) {
                     if ("".equals(carNum)) {
                         Toast.makeText(con, "车牌号不能为空", Toast.LENGTH_LONG).show();
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
+                    new AuthRequest().upload(con, hd, new File(path));
+//                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
 
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
@@ -887,14 +1078,25 @@ public class CertificatesActivity extends BaseAppCompatActivity {
             case 3:
                 Log.e("添加挂车", "挂车" + oCrcarId);
                 if (keys[0]) {
-                    new OCRRequest().OCRVehicleLicense(con, hd, new File(path));
+                    new AuthRequest().upload(con, hd, new File(path));
+//                    new OCRRequest().OCRVehicleLicense(con, hd, new File(path));
                 } else if (keys[1]) {
                     if ("".equals(carNum)) {
                         Toast.makeText(con, "车牌号不能为空", Toast.LENGTH_LONG).show();
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
+//                   if (cdb != null && cdb.getData().getTrailerResVo() &&cdb.getRes() == 1)
+                    boolean isExist = false;
+                    if (olb != null) {//主页识别成功后获取
+                        isExist = olb.getData().isCarExist();
+                    } else {
+                        if (cdb != null && cdb.getData().getTrailerResVo() != null && cdb.getRes() == 1) {//上个页面带来数据
+                            isExist = true;
+                        }
+                    }
+                    new AuthRequest().upload(con, hd, new File(path));
+//                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, isExist);
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
                 }
@@ -917,6 +1119,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         switch (index) {
             case 0:
                 if (ocb != null && ocbb != null) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     IDInputBean ib = new IDInputBean();
                     ib.setIdcarName(str1);
                     ib.setIdcard(str2);
@@ -929,7 +1133,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     } else {
                         ib.setIdcardSex(2);
                     }
-                    ib.setIdcardValidity(ocbb.getData().getEndTime());
+                    ib.setIdcardValidity("长期".equals(ocbb.getData().getValidTo()) ? "2999-12-31" : ocbb.getData().getValidTo());
                     new AuthRequest().driverAuthIdCard(con, hd, ib);
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();
@@ -939,61 +1143,265 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 //olb
                 //{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
                 if (odl != null && odlb != null) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     Log.e("ocr", new Gson().toJson(odl));
                     LicenseInputBean iib = new LicenseInputBean();
-                    iib.setArchivesName(str1);
+                    iib.setArchivesName(odlb.getData().getFileNumber());
                     iib.setDriverLicenseName(value7.getText().toString());
                     iib.setAllowType(str3);
-                    iib.setDriverLicense(odl.getData().getNumber());
+                    iib.setDriverLicense(str1);
                     iib.setDriverLicenseBackPhoto(backId);
                     iib.setDriverLicensePhoto(fontId);
-                    iib.setEndTime(odl.getData().getEndTime());
+                    iib.setEndTime("长期".equals(odl.getData().getEndDate()) ? "2999-12-31" : odl.getData().getEndDate());
-                    iib.setFirstTime(odl.getData().getFirstTime());
+                    iib.setFirstTime(odl.getData().getFirstGetDocDate());
+
+
+//                    iib.setName(odl.getData().getName());
+                    iib.setOrganizationName(odl.getData().getIssuingAuthority());
+                    iib.setAddress(odl.getData().getAddress());
+                    iib.setStartTime(odl.getData().getBeginDate());
+
+                    iib.setSex(odl.getData().getSex());
+                    iib.setBirthday(odl.getData().getBirthday());
+                    iib.setCountry(odl.getData().getNationality());
                     new AuthRequest().driverAuthLicense(con, hd, iib);
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();
                 }
                 break;
             case 2:
-                if (olb != null && oblb != null) {
+                if (!TextUtils.isEmpty(carExistCarId)) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
+                    new AuthRequest().bindCar(con, hd, carExistCarId);
+                    return;
+                }
+                if ((olb != null && !olb.getData().isCarExist() && oblb != null) || (olb != null && olb.getData().isCarExist())) {
 //                    if (curColor == null || curEnergy == null) {
 //                        Toast.makeText(con, "请完善内容", Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     HashMap<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-                    map.put("licenseId", oblb.getData().getLicenseId());
+//                    map.put("licenseId", olb.getData().isCarExist() ? olb.getData().getExistCarInfo().getLicenseId() : oblb.getData().getLicenseId());
-                    map.put("carNumber", str1);
+//                    map.put("vclN", str1);
-                    map.put("type", str2);
+//                    map.put("vcltype", str2);
-                    map.put("owner", str3);
+//                    map.put("ownerName", str3);
-                    map.put("vehicleNumber", str4);
+//                    map.put("vin", str4);//车辆识别代号
-//                    map.put("carPlateColor", curColor.getValue());
+
-//                    map.put("carEnergyTyp", curEnergy.getValue());
+                    String carLong = "";
-                    new AuthRequest().saveVehicleLicense(con, hd, MapUtil.mapJson(map));
+                    String carWidth = "";
+                    String carHeight = "";
+                    String carPlateColor = "302003";
+                    String carEnergyTyp = "303002";
+                    String note = "";
+
+                    String overallDimen = oblb.getData().getOverallDimen();
+                    if (overallDimen.contains("mm")) {
+                        String[] mms = overallDimen.split("mm");
+                        String mm = mms[0];
+
+//                        String[] xes = mm.split("x");
+//                        String[] xes1 = mm.split("X");
+                        String[] xes = mm.split("×");
+                        if (xes.length == 3) {
+                            carLong = xes[0];
+                            carWidth = xes[1];
+                            carHeight = xes[2];
+                        }
+                        try {
+                            int i = Integer.parseInt(carLong);
+                            if (i < 4200) {
+                                carPlateColor = "302002";
+                                carEnergyTyp = "303001";
+                            }
+                        } catch (Exception e) {
+
+                        }
+
+                    }
+
+                    try {
+                        String inNote = oblb.getData().getNote();
+                        if (inNote.contains("：")) {
+                            String[] split = inNote.split("：");
+                            if (split.length == 2) {
+                                note = split[1];
+                            }
+                        }
+                    } catch (Exception e) {
+
+                    }
+
+
+                    DriverUpBean driverUpBean = new DriverUpBean();
+                    DriverUpBean.DataDTO dataDTO = new DriverUpBean.DataDTO();
+                    driverUpBean.setFrontImageUrl(url1);
+                    driverUpBean.setBackImageUrl(url2);
+                    driverUpBean.setCarNumber(str1);
+                    driverUpBean.setType(str2);
+                    driverUpBean.setOwner(str3);
+                    driverUpBean.setVehicleNumber(str4);
+                    driverUpBean.setCarPlateColor(carPlateColor);
+                    driverUpBean.setCarEnergyTyp(carEnergyTyp);
+                    driverUpBean.setCarLong(carLong);
+                    driverUpBean.setCarWidth(carWidth);
+                    driverUpBean.setCarHeight(carHeight);
+
+
+                    dataDTO.setVclN(str1);
+                    dataDTO.setVcltype(str2);
+                    dataDTO.setOwnerName(str3);
+                    dataDTO.setVin(str4);
+                    dataDTO.setNatureOfUsage(olb.getData().getNatureOfUsage());
+                    dataDTO.setIssuingAuthority(olb.getData().getIssuingAuthority());
+                    dataDTO.setRegTime(olb.getData().getRegTime());
+                    dataDTO.setAddress(olb.getData().getAddress());
+                    dataDTO.setEngine(olb.getData().getEngine());
+                    dataDTO.setLicensedateOfissue(olb.getData().getLicensedateOfissue());
+                    dataDTO.setVclBrand(olb.getData().getVclBrand());
+
+
+                    dataDTO.setApproveTon(oblb.getData().getApproveTon());
+                    dataDTO.setRecordId(oblb.getData().getRecordId());
+                    dataDTO.setNote(note);
+                    dataDTO.setPassengers(oblb.getData().getPassengers());
+                    dataDTO.setVclDrwTn(oblb.getData().getVclDrwTn());
+                    dataDTO.setOverallDimen(oblb.getData().getOverallDimen());
+                    dataDTO.setEnTn(oblb.getData().getEnTn());
+                    dataDTO.setLoadTon(oblb.getData().getLoadTon());
+                    dataDTO.setInspectionRecord(oblb.getData().getInspectionRecord());
+                    dataDTO.setBarCode(oblb.getData().getBarCode());
+                    driverUpBean.setZjObj(dataDTO);
+
+                    String json = gson.toJson(driverUpBean);
+
+                    new AuthRequest().saveVehicleLicense(con, hd, json);
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();
                 }
                 break;
             case 3:
-                if (olb != null && oblb != null) {
+                if (olb != null || (cdb != null && cdb.getRes() == 1)) {
 //                    if (curEnergy==null){
 //                        Toast.makeText(con,"请完善内容",Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
-                    Map<String, Object> map = new HashMap<>();
+                    customDialog = new CustomDialog(con, "网络请求中...");
-                    if ("".equals(url3)) {
+                    customDialog.show();
-                        map.put("imgId", fid);
+//                    Map<String, Object> map = new HashMap<>();
+//                    if ("".equals(url3)) {
+//                        map.put("imgId", fid);
+//                    }
+////                    map.put("licenseId", oblb.getData().getLicenseId());
+//                    map.put("carId", carId);
+//                    map.put("carNumberDraw", str1);
+//                    map.put("type", str2);
+//                    map.put("owner", str3);
+////                    map.put("carEnergyTyp", curEnergy.getValue());
+//                    map.put("vehicleNumber", str4);
+//                    if (cdb != null && cdb.getRes() == 1 && cdb.getData() != null && cdb.getData().getTrailerResVo() != null) {
+//                        map.put("oldTrailerNumber", cdb.getData().getTrailerResVo().getCarNumber());
+//                    }
+//
+//                    map.put("registerDate", olb.getData().getRegTime());//注册日期
+//                    map.put("dateIssue", olb.getData().getLicensedateOfissue());//发证日期
+//                    map.put("nature", olb.getData().getNatureOfUsage());//使用性质
+//                    map.put("model", olb.getData().getVclBrand());//品牌型号
+//                    map.put("organizationName", olb.getData().getIssuingAuthority());//发证机关
+//                    map.put("engineNumber", olb.getData().getEngine());//发动机号
+//
+//
+//                    map.put("frontImage", url1);
+//                    map.put("backImage", url2);
+//                    map.put("size", oblb.getData().getOverallDimen());//车辆尺寸
+//                    map.put("allCapacity", oblb.getData().getEnTn());//整备质量
+//                    map.put("approvedCapacity", oblb.getData().getLoadTon());//核定载质量
+//                    map.put("allAuality", oblb.getData().getApproveTon());//总质量
+//
+//                    map.put("personCapacity", oblb.getData().getPassengers());//核定载人数
+//                    map.put("fileNumber", oblb.getData().getRecordId());//档案编号
+//                    map.put("towAuality", oblb.getData().getVclDrwTn());//准牵引总质量
+
+
+                    String carLong = "";
+                    String carWidth = "";
+                    String carHeight = "";
+                    String note = "";
+                    String overallDimen = oblb.getData().getOverallDimen();
+                    if (overallDimen.contains("mm")) {
+                        String[] mms = overallDimen.split("mm");
+                        String mm = mms[0];
+
+//                        String[] xes = mm.split("x");
+//                        String[] xes1 = mm.split("X");
+                        String[] xes = mm.split("×");
+                        if (xes.length == 3) {
+                            carLong = xes[0];
+                            carWidth = xes[1];
+                            carHeight = xes[2];
+                        }
                     }
-                    map.put("licenseId", oblb.getData().getLicenseId());
+
-                    map.put("carId", carId);
+                    try {
-                    map.put("carNumberDraw", str1);
+                        String inNote = oblb.getData().getNote();
-                    map.put("type", str2);
+                        if (inNote.contains("：")) {
-                    map.put("owner", str3);
+                            String[] split = inNote.split("：");
-//                    map.put("carEnergyTyp", curEnergy.getValue());
+                            if (split.length == 2) {
-                    map.put("vehicleNumber", str4);
+                                note = split[1];
-                    new AuthRequest().saveDrawCar(con, hd, MapUtil.mapJson(map));
+                            }
+                        }
+                    } catch (Exception e) {
+
+                    }
+
+
+                    DriverUpBean driverUpBean = new DriverUpBean();
+                    DriverUpBean.DataDTO dataDTO = new DriverUpBean.DataDTO();
+                    driverUpBean.setCarId(carId);
+                    driverUpBean.setFrontImageUrl(url1);
+                    driverUpBean.setBackImageUrl(url2);
+                    driverUpBean.setCarNumber(str1);
+                    driverUpBean.setType(str2);
+                    driverUpBean.setOwner(str3);
+                    driverUpBean.setVehicleNumber(str4);
+                    driverUpBean.setCarLong(carLong);
+                    driverUpBean.setCarWidth(carWidth);
+                    driverUpBean.setCarHeight(carHeight);
+
+                    dataDTO.setNatureOfUsage(olb.getData().getNatureOfUsage());
+                    dataDTO.setVclN(str1);
+                    dataDTO.setVcltype(str2);
+                    dataDTO.setOwnerName(str3);
+                    dataDTO.setVin(str4);
+                    dataDTO.setIssuingAuthority(olb.getData().getIssuingAuthority());
+                    dataDTO.setRegTime(olb.getData().getRegTime());
+                    dataDTO.setAddress(olb.getData().getAddress());
+                    dataDTO.setEngine(olb.getData().getEngine());
+                    dataDTO.setLicensedateOfissue(olb.getData().getLicensedateOfissue());
+                    dataDTO.setVclBrand(olb.getData().getVclBrand());
+
+
+                    dataDTO.setApproveTon(oblb.getData().getApproveTon());
+                    dataDTO.setRecordId(oblb.getData().getRecordId());
+                    dataDTO.setNote(note);
+                    dataDTO.setPassengers(oblb.getData().getPassengers());
+                    dataDTO.setVclDrwTn(oblb.getData().getVclDrwTn());
+                    dataDTO.setOverallDimen(oblb.getData().getOverallDimen());
+                    dataDTO.setEnTn(oblb.getData().getEnTn());
+                    dataDTO.setLoadTon(oblb.getData().getLoadTon());
+                    dataDTO.setInspectionRecord(oblb.getData().getInspectionRecord());
+                    dataDTO.setBarCode(oblb.getData().getBarCode());
+                    driverUpBean.setZjObj(dataDTO);
+
+                    String json = gson.toJson(driverUpBean);
+
+                    new AuthRequest().saveDrawCar(con, hd, json);
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();
                 }
@@ -1015,11 +1423,11 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         JSONObject jsonObject = JSON.parseObject(auth.result);
         if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
             EsignSdk.getInstance().finishH5Activity();
-            new MessageUtils().showSimCenPop(con, "个人信息上传成功，请添加车辆信息!", () -> {
+            new MessageUtils().showSimCenPop(con, "个人信息上传成功，请添加车辆信息!", "去添加", () -> {
-                finish();
                 Intent in = new Intent(con, CertificatesActivity.class);
                 in.putExtra("index", 2);
                 startActivity(in);
+                finish();
 
             });
             if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java

@@ -1,9 +1,12 @@
 package com.arpa.hndahesudintocctmsdriver.ui.auth;
 
+import android.Manifest;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.ImageView;
@@ -16,9 +19,14 @@ import androidx.annotation.Nullable;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.H5Activity;
+import com.arpa.hndahesudintocctmsdriver.H5Activity2;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
+import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
+import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.arpa.hndahesudintocctmsdriver.util.PermissionUtils;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.ActivityUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.google.gson.Gson;
@@ -42,6 +50,7 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
+import com.permissionx.guolindev.PermissionX;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -98,11 +107,18 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
                     if (bb.getCode() == 200) {
 
-//                        Intent intent = new Intent(this, H5Activity.class);
+                        Intent intent = new Intent(this, H5Activity.class);
-//                        intent.putExtra("url", (String) bb.getData());
+                        intent.putExtra("url", (String) bb.getData());
-//                        intent.putExtra("view_file", false);
+                        intent.putExtra("view_file", false);
-//                        startActivity(intent);
+//                        intent.putExtra("isGoCar", true);
-                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
+                        startActivity(intent);
+
+//                        Bundle t = new Bundle();
+//                        t.putString("url",(String) bb.getData());
+//                        t.putBoolean("view_file", false);
+//                        ActivityUtils.startActivity(con, H5Activity2.class,t);
+
+//                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
@@ -168,13 +184,25 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
 //            startActivityForResult(in, 12);
             //EsignSdk.getInstance().startH5Activity(act,"https://smlh5.esign.cn/usercenterFront/oemAuth/v3/realName/index?contextKey=b7b103b15b866ec4c72beef1dfe20828&appId=7438873235");
             if (key) {
-//                EsignSdk.getInstance().startH5Activity(act, "");
+                PermissionX.init(this)
+                        .permissions(Manifest.permission.CAMERA)
+                        .request((allGranted, grantedList, deniedList) -> {
+                            if(allGranted) {
+                                key = false;
+                                new AuthRequest().getAuthUrl(con, hd);
+                                new Handler().postDelayed(() -> {
+                                    key = true;
+                                }, 3000);
+                            } else{
+                                new MessageUtils().showSimCenPop(con, "缺少相机权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
+                                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                    Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                    intent.setData(uri);
+                                    startActivity(intent);
+                                });
+                            }
+                        });
 
-                key = false;
-                new AuthRequest().getAuthUrl(con, hd);
-                new Handler().postDelayed(() -> {
-                    key = true;
-                }, 3000);
             }
         });
         //头像
@@ -276,6 +304,8 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
                 Toast.makeText(con, "签署场景成功", Toast.LENGTH_SHORT).show();
             } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
                 Toast.makeText(con, "实名认证成功", Toast.LENGTH_SHORT).show();
+                EsignSdk.getInstance().finishH5Activity();
+                finish();
             } else {
                 Toast.makeText(con, "意愿认证成功", Toast.LENGTH_SHORT).show();
             }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java

@@ -20,10 +20,15 @@ import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
 import com.arpa.hndahesudintocctmsdriver.bean.CarDelBean;
 import com.arpa.hndahesudintocctmsdriver.bean.IsAuthDriverAuthQualificationBean;
+import com.arpa.hndahesudintocctmsdriver.bean.OCRBankBean;
+import com.arpa.hndahesudintocctmsdriver.bean.OCRRoadBean;
 import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
 import com.arpa.hndahesudintocctmsdriver.request.AuthRequest;
+import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
 import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
+import com.arpa.hndahesudintocctmsdriver.ui.wallet.WalletFragment;
+import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetImageAlert;
@@ -31,6 +36,9 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.PatternUtils;
+import com.github.gzuliyujiang.wheelpicker.DatePicker;
+import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -49,23 +57,24 @@ import java.util.List;
  */
 public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnClickListener {
 
-    private String[] titles = {"车辆照片", "NFC照片", "车辆登记证书", "道路运输许可证"};
+    private String[] titles = {"车辆照片", "NFC照片", "车辆登记证书", "道路运输许可证", "车辆交强险"};
-    private String[] name1 = {"车辆照片", "NFC照片", "车辆登记证书照片", "道路运输许可证照片"};
+    private String[] name1 = {"车辆照片", "NFC照片", "车辆登记证书照片", "道路运输许可证照片", "车辆交强险照片"};
-    private String[] name2 = {"请上传车辆照片", "请上传NFC照片", "请上传车辆登记证书照片", "请上传道路运输许可证照片"};
+    private String[] name2 = {"请上传车辆照片", "请上传NFC照片", "请上传车辆登记证书照片", "请上传道路运输许可证照片", "请上传车辆交强险照片"};
-    private Boolean[] isShowEdit = {false, false, true, true};
+    private Boolean[] isShowEdit = {false, false, true, true, true};
-    private Boolean[] isShowSkip = {true, false, false, true};
+    private Boolean[] isShowSkip = {true, false, false, true, true};
     private String[] tips = {
             "",
             "*注意: 没有粘贴NFC芯片的车辆无需上传,可直接跳过",
             "*注意: 没有可直接跳过,等候下次上传",
-            "*注意: 4.5吨以下车辆不需要上传,可直接跳过"};
+            "*注意: 4.5吨以下车辆不需要上传,可直接跳过",
+            ""};
 
 
     private BaseRecyclerView brv;
     private ImageView img;
-    private TextView title1, title2, title3, zjimg_name, upload_img, tvTips, tvSkip;
+    private TextView title1, title2, title3, zjimg_name, upload_img, tvTips, tvSkip, value2;
     private EditText value1;
-    private LinearLayout llInfo;
+    private LinearLayout llInfo, llDate;
     private RelativeLayout up_img;
     private Button submit;
 
@@ -75,7 +84,9 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 
     private int type;//页面类型
     private String path, carId, url;//图片路径
+    private boolean carExist = false;
     private GetImageAlert gia = new GetImageAlert();
+    private CustomDialog customDialog;
 
     @Override
     public void msgMethod(Message m) {
@@ -92,6 +103,22 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     }
                     CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_DEL);
                 }
+                if (CacheGroup.cacheList.get("onlyGetDetail") != null) {
+                    Log.e("--res--", CacheGroup.cacheList.get("onlyGetDetail"));
+                    cdb = gson.fromJson(CacheGroup.cacheList.get("onlyGetDetail"), CarDelBean.class);
+                    CacheGroup.cacheList.remove("onlyGetDetail");
+                }
+
+                if (CacheGroup.cacheList.get("ORCRoadLicZj") != null) {
+                    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 {
+                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove("ORCRoadLicZj");
+                }
 
 
                 if (CacheGroup.cacheList.get("upload") != null) {
@@ -107,16 +134,29 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                             new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 5);
                             break;
                         case 3:
+                            //道路运输证ocr识别
+                            new OCRRequest().ORCRoadLicZj(con, hd, ub.getData().getUrl());
                             new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 2);
                             break;
+                        case 4:
+                            new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 7);
+                            break;
+                        default:
+                            if (customDialog != null && customDialog.isShowing())
+                                customDialog.dismiss();
+                            break;
                     }
                     url = ub.getData().getUrl();
-                    Glide.with(con).load(url).into(img);
+//                    Glide.with(con).load(url).into(img);
+                    Glide.with(con).load(path).into(img);
+
 
                     CacheGroup.cacheList.remove("upload");
                 }
 
                 if (CacheGroup.cacheList.get("saveCarImg") != null) {
+                    if (customDialog != null && customDialog.isShowing())
+                        customDialog.dismiss();
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("saveCarImg"), BaseBean.class);
                     if (bb.getCode() == 200) {
                         switch (type) {
@@ -130,8 +170,12 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                 Toast.makeText(con, "上传车辆登记证书照片", Toast.LENGTH_SHORT).show();
                                 break;
                             case 3:
+                                ur.vehicleDelTwo(carId);
                                 Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show();
                                 break;
+                            case 4:
+                                Toast.makeText(con, "交强险证件上传成功", Toast.LENGTH_SHORT).show();
+                                break;
                         }
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -158,7 +202,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRoadLicenseNo"), IsAuthDriverAuthQualificationBean.class);
                     if (ib.getCode() == 200) {
                         //判断是否需要跳转挂车行驶证页面
-                        if (!"".equals(carId)) {
+                        if (!"".equals(carId) && cdb.getData() != null) {
                             if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，并且传过挂车直接结束
                                 finish();
                                 Intent in = new Intent(con, AddCarSuccActivity.class);
@@ -187,8 +231,11 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                     con.startActivity(in);
                                 }
                             }
+                        } else {
+                            finish();
                         }
 
+
 //                        if (!"".equals(carId) && cdb.getData().getIsTrailer() == 1) {
 //                            if (!"".equals(carId)) {
 //                                finish();
@@ -213,8 +260,23 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     }
                     CacheGroup.cacheList.remove("saveCarRoadLicenseNo");
                 }
+
+                if (CacheGroup.cacheList.get("saveTrafficInsurance") != null) {
+                    Log.e("is", CacheGroup.cacheList.get("saveTrafficInsurance"));
+                    IsAuthDriverAuthQualificationBean ddb = gson.fromJson(CacheGroup.cacheList.get("saveTrafficInsurance"), IsAuthDriverAuthQualificationBean.class);
+                    if (ddb.getCode() == 200) {
+                        Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
+                        finish();
+                    } else {
+                        Toast.makeText(con, ddb.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+
+                    CacheGroup.cacheList.remove("saveTrafficInsurance");
+                }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
+                customDialog = new CustomDialog(con, "加载中...");
+                customDialog.show();
                 path = (String) m.obj;
                 new AuthRequest().upload(con, hd, new File(path));
                 break;
@@ -233,6 +295,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         title1 = findViewById(R.id.title1);
         title2 = findViewById(R.id.title2);
         title3 = findViewById(R.id.name1);
+        value2 = findViewById(R.id.value2);
         up_img = findViewById(R.id.up_img);
         img = findViewById(R.id.img);
         zjimg_name = findViewById(R.id.zjimg_name);
@@ -240,6 +303,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         tvTips = findViewById(R.id.tvTips);
         value1 = findViewById(R.id.value1);
         llInfo = findViewById(R.id.llInfo);
+        llDate = findViewById(R.id.llDate);
         tvSkip = findViewById(R.id.tvSkip);
         submit = findViewById(R.id.submit);
 
@@ -247,10 +311,12 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         submit.setOnClickListener(this);
         upload_img.setOnClickListener(this);
         img.setOnClickListener(this);
+        value2.setOnClickListener(this);
 
 
         type = getIntent().getExtras().getInt("type");
         carId = getIntent().getExtras().getString("carId", "");
+        carExist = getIntent().getExtras().getBoolean("carExist", false);
         changeViewByType(type);
 
         ur = new UserRequset(con, hd);
@@ -307,6 +373,14 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
             case R.id.img:
                 showBigImg();
                 break;
+            case R.id.value2:
+                DatePicker picker = new DatePicker(this);
+                picker.setBodyWidth(300);
+                picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
+                picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
+                picker.getWheelLayout().setDateLabel("年", "月", "日");
+                picker.show();
+                break;
         }
     }
 
@@ -315,7 +389,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
      * 展示大图片
      */
     private void showBigImg() {
-        if (TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) {
+        if ((type == 3 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
             choicePhoto();
             return;
         }
@@ -360,8 +434,21 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 //                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
 //                            .show();
 
-                    break;
                 }
+                break;
+
+            case 4:
+                if (cdb.getData().getPolicyPhotoUrl() != null && !"".equals(cdb.getData().getPolicyPhotoUrl())) {
+                    //roadLicensePhoto
+                    new XPopup.Builder(con)
+                            .asImageViewer(img, cdb.getData().getPolicyPhotoUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                            .show();
+//                    new XPopup.Builder(con)
+//                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
+//                            .show();
+
+                }
+                break;
         }
     }
 
@@ -411,6 +498,15 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                 }
                 new AuthRequest().saveCarRoadLicenseNo(con, hd, carId, s1);
                 break;
+            case 4:
+                String s2 = value1.getText().toString();
+                String v2 = value2.getText().toString();
+                if (TextUtils.isEmpty(s2) || TextUtils.isEmpty(v2)) {
+                    Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                new AuthRequest().saveTrafficInsurance(con, hd, carId, v2, s2);
+                break;
         }
     }
 
@@ -442,6 +538,17 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                 if (!TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) {
                     Glide.with(con).load(cdb.getData().getRoadLicensePhoto()).into(img);
                     value1.setText(cdb.getData().getRoadLicense());
+                    if (!carExist) {
+                        submit.setBackgroundResource(R.drawable.bg_btn_grey);
+                        upload_img.setText("已上传");
+                    }
+
+                }
+            } else if (4 == type) {
+                if (!TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl())) {
+                    Glide.with(con).load(cdb.getData().getPolicyPhotoUrl()).into(img);
+                    value1.setText(cdb.getData().getInsuranceCompany());
+                    value2.setText(cdb.getData().getInsuranceEndDay());
                     submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     upload_img.setText("已上传");
                 }
@@ -527,6 +634,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         tvTips.setText(tips[type]);
         tvSkip.setVisibility(isShowSkip[type] ? View.GONE : View.VISIBLE);
         llInfo.setVisibility(isShowEdit[type] ? View.VISIBLE : View.GONE);
+        if (type == 4) {
+            llDate.setVisibility(View.VISIBLE);
+            title3.setText("保险公司");
+        }
     }
 
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java

@@ -14,7 +14,10 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
+import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -38,6 +41,7 @@ import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -51,6 +55,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
     public  String carId="";
     public static final String DEL_CAR="delete_che";
     public static final String CAR_AUDIO="CAR_AUDIO";
+    public static final String APP_INFO="APP_INFO";
     private int submitIndex=0;
     private BaseBean bb;
     private ImageView show_img;
@@ -65,7 +70,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove(CAR_AUDIO);
                 }
                 if(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL)!=null){
-                    Log.e("--res--",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
+                    Log.e("--res--lijia",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
                     cdb=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL), CarDelBean.class);
                     if(cdb.getCode()==200){
                         initView(null);
@@ -79,6 +84,8 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     bb=gson.fromJson(CacheGroup.cacheList.get(DEL_CAR),BaseBean.class);
                     if (bb.getCode()==200) {
                         Toast.makeText(con,"删除成功",Toast.LENGTH_SHORT).show();
+                        RefreshCarListEvent ve = new RefreshCarListEvent("");
+                        EventBus.getDefault().post(ve);
                         finish();
                     }else{
                         Toast.makeText(con,"删除失败:"+bb.getMsg(),Toast.LENGTH_SHORT).show();
@@ -166,6 +173,13 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
     private GetImageAlert gia=new GetImageAlert();
     private boolean key1,key2,key3=false;
 
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
     @Override
     public void initView(Object obj) {
         super.initView(obj);
@@ -207,11 +221,12 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
             RelativeLayout r5=v.findViewById(R.id.r5);
             RelativeLayout r6=v.findViewById(R.id.r6);
             RelativeLayout r7=v.findViewById(R.id.r7);
+            RelativeLayout r8=v.findViewById(R.id.r8);
             View vs1=v.findViewById(R.id.vs1);
             View vs2=v.findViewById(R.id.vs2);
             r4.setVisibility(View.GONE);
             r5.setVisibility(View.GONE);
-            vs1.setVisibility(View.GONE);
+//            vs1.setVisibility(View.GONE);
             vs2.setVisibility(View.GONE);
             if(!"".equals(carId) && cdb.getData().getIsTrailer()==1){
                 r4.setVisibility(View.VISIBLE);
@@ -301,6 +316,17 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     Toast.makeText(con,"请先绑定挂车",Toast.LENGTH_SHORT).show();
                 }
             });
+
+            r8.setOnClickListener(v1->{
+                if(!"".equals(carId)){
+                    Intent in = new Intent(con, PhotoCarActivity.class);
+                    in.putExtra("type", 4);
+                    in.putExtra("carId", carId);
+                    con.startActivity(in);
+                }else{
+                    Toast.makeText(con,"请先绑定行驶证",Toast.LENGTH_SHORT).show();
+                }
+            });
             del.setOnClickListener(v13 -> {
                 new XPopup.Builder(con)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
@@ -384,7 +410,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
         super.onResume();
     }
 
-    @Subscribe
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     public void  processResult(VehicleEvent event) {
         Log.e("-msg-",event.getMessage());
         if(!"挂".equals(event.getMessage())) {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java

@@ -1,12 +1,18 @@
 package com.arpa.hndahesudintocctmsdriver.ui.home;
 
+import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
+
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Outline;
 import android.location.Location;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
+import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -22,6 +28,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
+import androidx.fragment.app.FragmentActivity;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.alct.mdp.callback.OnDownloadResultListener;
@@ -35,18 +42,28 @@ import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.Marker;
 import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.MyLocationStyle;
+import com.arpa.hndahesudintocctmsdriver.bean.BankCardListBean;
 import com.arpa.hndahesudintocctmsdriver.bean.DriverExpireBean;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.JTT;
 import com.arpa.hndahesudintocctmsdriver.constant.JTTConstant;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
+import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
+import com.arpa.hndahesudintocctmsdriver.request.WalletRequest;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.news.NewActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.arpa.hndahesudintocctmsdriver.util.OneDayShowUtils;
+import com.arpa.hndahesudintocctmsdriver.util.PermissionUtils;
+import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.TimeUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.gyf.cactus.Cactus;
 import com.hjq.xtoast.XToast;
@@ -94,8 +111,11 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import pub.devrel.easypermissions.EasyPermissions;
+
 /**
  * @author hlh
  * @version 1.0.0
@@ -116,7 +136,11 @@ public class HomeFragment extends BaseFragment {
     private HuoYuanListBean hb;
     private Gson gson = new Gson();
     private CardView btn_news, btn_loadin, btn_update;
-    private LinearLayout order_all;
+    private LinearLayout order_all, llCurWay;
+
+    private TextView tvWaybill, tvGo, tvZX;
+
+    private ImageView ivType;
     private HuoYuanListBean uab;
     private List<Marker> list = new ArrayList<>();
     private HuoYuanListDealBean hdb;
@@ -125,6 +149,8 @@ public class HomeFragment extends BaseFragment {
     private ImageConfig ic;
     private DriverExpireBean deb;
 
+    private XToast xToast;
+
 
     @Override
     public void msgMethod(Message m) {
@@ -138,6 +164,23 @@ public class HomeFragment extends BaseFragment {
                     refreshLayout.finishRefresh(500);
                     keys = false;
                 }
+
+                //银行卡信息接收
+                if (CacheGroup.cacheList.get(dataName2) != null) {
+                    BankCardListBean bcb = new Gson().fromJson(CacheGroup.cacheList.get(dataName2), BankCardListBean.class);
+                    if (bcb.getCode() == 200) {
+                        if (bcb.getData() == null || bcb.getData().getRecords() == null || bcb.getData().getRecords().size() < 1) {
+                            new MessageUtils().showSimCenPop(con, "缺少银行卡可能会导致运费无法结算，是否去添加！", "取消", "确认", () -> {
+                                Intent in333 = new Intent(con, UpBankActivity.class);
+                                startActivity(in333);
+                            });
+                        }
+                    } else {
+                        Toast.makeText(con, bcb.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove(dataName2);
+                }
+
                 if (CacheGroup.cacheList.get("userdata") != null) {
                     ub = gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
                     if (ub.getCode() == 200) {
@@ -145,13 +188,13 @@ public class HomeFragment extends BaseFragment {
                         MsgUtil.addHdMsgWat(hd, 33);
 
                         //新用户注册，需弹窗提示注册
-                        if ("0".equals(ub.getData().getRealAuthentication())) {
+//                        if ("0".equals(ub.getData().getRealAuthentication())) {
-                            new MessageUtils().showSimCenPop(con, "该司机还未认证，未认证无法接单。是否去注册！", () -> {
+//                            new MessageUtils().showSimCenPop(con, "该司机还未认证，未认证无法接单。是否去注册！", () -> {
-                                Intent in = new Intent(con, CertificatesActivity.class);
+//                                Intent in = new Intent(con, CertificatesActivity.class);
-                                in.putExtra("index", 0);
+//                                in.putExtra("index", 0);
-                                startActivity(in);
+//                                startActivity(in);
-                            });
+//                            });
-                        }
+//                        }
                     } else {
                         Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -164,8 +207,24 @@ public class HomeFragment extends BaseFragment {
                         SPUtil.insSP(con, JTTConstant.JTT_DATA_NAME, JTTConstant.JTT_DATA_ORDER_KEY, gson.toJson(sob));
                         initStart();
                         StartOrderParts.setStartOrder(con, sob);
-                        if (sob.getData() != null) {
+                        if (sob.getData() != null && !sob.getData().getWaybillStatus().equals("已取消")) {
-                            ur.getJtts(sob.getData().getShippingNoteNumber());
+                            StartOrderBean.DataDTO.WayChildrenDTO xData = null;
+                            for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+                                if (2 == sob.getData().getWayChildren().get(i).getType()) {
+                                    xData = sob.getData().getWayChildren().get(i);
+                                    break;
+                                }
+                            }
+                            if (xData != null && xData.getStatus() == 3) {
+                                SPUtils.remove(con, "curWaybillId");
+                                llCurWay.setVisibility(View.GONE);
+                            } else {
+                                dealCurWay(sob.getData());
+                                ur.getJtts(sob.getData().getShippingNoteNumber());
+                            }
+                        } else {
+                            SPUtils.remove(con, "curWaybillId");
+                            llCurWay.setVisibility(View.GONE);
                         }
                     } else {
                         Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show();
@@ -199,6 +258,35 @@ public class HomeFragment extends BaseFragment {
                 if (CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA) != null) {
                     DriverAuthDataBean dad = gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA), DriverAuthDataBean.class);
                     if (dad.getCode() == 200) {
+                        if (dad.getData() == null) {
+                            new MessageUtils().showSimCenPop(con, "该司机缺少身份证，未认证无法接单。是否去添加！","去添加", () -> {
+                                Intent in = new Intent(con, CertificatesActivity.class);
+                                in.putExtra("index", 0);
+                                startActivity(in);
+                            });
+                            CacheGroup.cacheList.remove(WoDeFragment.AUTH_DATA);
+                            return;
+                        }
+                        if (dad.getData() != null && TextUtils.isEmpty(dad.getData().getIdcard())) {
+                            new MessageUtils().showSimCenPop(con, "该司机缺少身份证，未认证无法接单。是否去添加！", "去添加",() -> {
+                                Intent in = new Intent(con, CertificatesActivity.class);
+                                in.putExtra("index", 0);
+                                startActivity(in);
+                            });
+                        } else if (dad.getData() != null && TextUtils.isEmpty(dad.getData().getCardNo())) {
+                            new MessageUtils().showSimCenPop(con, "该司机缺少银行卡，未认证无法接单。是否去添加！", "去添加",() -> {
+                                Intent in333 = new Intent(con, UpBankActivity.class);
+                                in333.putExtra("type", 1);
+                                startActivity(in333);
+                            });
+                        } else if (dad.getData() != null && TextUtils.isEmpty(dad.getData().getDriverLicense())) {
+                            new MessageUtils().showSimCenPop(con, "该司机缺少驾驶证，未认证无法接单。是否去添加！", "去添加",() -> {
+                                Intent in = new Intent(con, CertificatesActivity.class);
+                                in.putExtra("index", 0);
+                                startActivity(in);
+                            });
+                        }
+
                         SPUtil.insSP(con, "data", "authdata", CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA));
                         if (dad.getData() != null && 100003 == dad.getData().getAuditStatus()) {
                             initAlct();
@@ -240,9 +328,15 @@ public class HomeFragment extends BaseFragment {
                                 in.putExtra("url", deb.getData().getIdCardUpdateUrl());
                             }
                         }
-                        if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(deb.getData().getIdCardUpdateUrl())) {
+                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl()) ||
-                            new XToast<>(act)
+                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl()) ||
-                                    .setContentView(R.layout.view_bc)
+                                !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) {
+                            if (xToast == null) {
+                                xToast = new XToast(act);
+                            } else if (xToast != null && xToast.isShow()) {
+                                xToast.cancel();
+                            }
+                            xToast.setContentView(R.layout.view_bc)
                                     // 设置成可拖拽的
                                     .setDraggable()
                                     // 设置显示时长
@@ -257,6 +351,22 @@ public class HomeFragment extends BaseFragment {
                                     // 设置窗口背景阴影强度
                                     //.setBackgroundDimAmount(0.5f)
                                     .showAsDropDown(home_top, Gravity.BOTTOM, 1200, 1000);
+//                            new XToast<>(act)
+//                                    .setContentView(R.layout.view_bc)
+//                                    // 设置成可拖拽的
+//                                    .setDraggable()
+//                                    // 设置显示时长
+//                                    .setDuration(1000 * 60 * 60 * 12)
+//                                    .setOnClickListener(R.id.img_kf, (toast, view) -> {
+//                                        toast.startActivity(in);
+//                                        Log.e("-is-", view.isInTouchMode() + "");
+//                                    })
+//                                    // 设置动画样式
+//                                    //.setAnimStyle(android.R.style.Animation_Translucent)
+//                                    // 设置外层是否能被触摸
+//                                    // 设置窗口背景阴影强度
+//                                    //.setBackgroundDimAmount(0.5f)
+//                                    .showAsDropDown(home_top, Gravity.BOTTOM, 1200, 1000);
                         }
                         CacheGroup.cacheList.remove("driverExpire");
                     }
@@ -317,8 +427,8 @@ public class HomeFragment extends BaseFragment {
         EventBus.getDefault().register(this);
         hyr = new HuoYuanRequset(con, hd);
         ur = new UserRequset(con, hd);
-        initRefreshLoad();
         initView(null);
+        initRefreshLoad();
         btn_news.setOnClickListener(v -> {
 
         });
@@ -424,6 +534,13 @@ public class HomeFragment extends BaseFragment {
         order_box = v.findViewById(R.id.order_box);
         auth_box = v.findViewById(R.id.auth_box);
         order_all = v.findViewById(R.id.order_all);
+
+        llCurWay = v.findViewById(R.id.llCurWay);
+        tvWaybill = v.findViewById(R.id.tvWaybill);
+        tvGo = v.findViewById(R.id.tvGo);
+        tvZX = v.findViewById(R.id.loadingAddress);
+        ivType = v.findViewById(R.id.ivType);
+
         ImageView fun_left = v.findViewById(R.id.fun_left);
         ImageView fun_right = v.findViewById(R.id.fun_right);
         fun_left.setOnClickListener(v16 -> startActivity(new Intent(con, OrderListActivity.class)));
@@ -478,18 +595,35 @@ public class HomeFragment extends BaseFragment {
             v1.setOnClickListener(v2 -> {
                 switch (position) {
                     case 0:
-                        //startActivity(new Intent(con, OrderListActivity.class));
+                        PermissionUtils.Companion.getInstance().showPermissionMessage(getActivity(), "位置权限使用说明", "用于向您推荐可能感兴趣的住宿、饮食、加油站、汽车维修等",
-                        PermissionX.init(getActivity())
+                                new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
-                                .permissions(Manifest.permission.ACCESS_FINE_LOCATION)
+                                (allGranted, grantedList, deniedList) -> {
-                                .request((allGranted, grantedList, deniedList) -> {
                                     if (allGranted) {
                                         Intent in = new Intent(con, BusinessActivity.class);
                                         in.putExtra("type", "餐饮");
                                         startActivity(in);
                                     } else {
-                                        Toast.makeText(act.getBaseContext(), "请先开启定位权限", Toast.LENGTH_LONG).show();
+                                        new MessageUtils().showSimCenPop(con, "缺少定位权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
+                                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                            Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                            intent.setData(uri);
+                                            startActivity(intent);
+                                        });
+//                                        Toast.makeText(act.getBaseContext(), "请先开启定位权限", Toast.LENGTH_LONG).show();
                                     }
                                 });
+                        //startActivity(new Intent(con, OrderListActivity.class));
+//                        PermissionX.init(getActivity())
+//                                .permissions(Manifest.permission.ACCESS_FINE_LOCATION)
+//                                .request((allGranted, grantedList, deniedList) -> {
+//                                    if (allGranted) {
+//                                        Intent in = new Intent(con, BusinessActivity.class);
+//                                        in.putExtra("type", "餐饮");
+//                                        startActivity(in);
+//                                    } else {
+//                                        Toast.makeText(act.getBaseContext(), "请先开启定位权限", Toast.LENGTH_LONG).show();
+//                                    }
+//                                });
                         //Toast.makeText(con,"定位开启失败，请检查配置项",Toast.LENGTH_LONG).show();
                         break;
                     case 1:
@@ -513,6 +647,11 @@ public class HomeFragment extends BaseFragment {
                         in5.putExtra("url", "https://ks.wjx.top/vm/h6Jqu8A.aspx");
                         in5.putExtra("title", "知识竞猜");
                         startActivity(in5);
+
+//                        Intent in = new Intent(getContext(), WebActivity.class);
+//                        in.putExtra("url", "http://192.168.1.152:8080");
+//                        in.putExtra("title", "隐私政策");
+//                        getContext().startActivity(in);
                         break;
                     default:
                         break;
@@ -523,6 +662,100 @@ public class HomeFragment extends BaseFragment {
         initMap();
     }
 
+
+    StartOrderBean.DataDTO.WayChildrenDTO zData = new StartOrderBean.DataDTO.WayChildrenDTO();
+    StartOrderBean.DataDTO.WayChildrenDTO xData = new StartOrderBean.DataDTO.WayChildrenDTO();
+
+    /**
+     * 一装一卸逻辑
+     *
+     * @param data
+     */
+    private void dealCurWay(StartOrderBean.DataDTO data) {
+        SPUtils.put(con, "curWaybillId", data.getWaybillId());
+
+        for (int i = 0; i < data.getWayChildren().size(); i++) {
+            if (1 == data.getWayChildren().get(i).getType()) {
+                zData = data.getWayChildren().get(i);
+                break;
+            }
+        }
+
+        for (int i = 0; i < data.getWayChildren().size(); i++) {
+            if (2 == data.getWayChildren().get(i).getType()) {
+                xData = data.getWayChildren().get(i);
+                break;
+            }
+        }
+
+        llCurWay.setVisibility(View.VISIBLE);
+        tvWaybill.setText(data.getShippingNoteNumber());
+        tvGo.setText(getGoText(zData.getStatus(), xData.getStatus()));
+        if (data.getWaybillStatus().equals("待装货")) {
+            tvZX.setText(zData.getAddress());
+            ivType.setBackgroundResource(R.mipmap.zhuang);
+        } else {
+            tvZX.setText(xData.getAddress());
+            ivType.setBackgroundResource(R.mipmap.xie);
+        }
+
+        tvGo.setOnClickListener(v -> {
+            int zStatus = zData.getStatus();
+            int xStatus = xData.getStatus();
+            if (zStatus == 0) {//未装货
+                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                in.putExtra("type", 0);
+                in.putExtra("wid", zData.getId() + "");
+                in.putExtra("sob", gson.toJson(sob));
+                in.putExtra("keys", true);
+                startActivity(in);
+            } else if (zStatus == 1 && xStatus == 4) {//已装货未上传回单
+                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                in.putExtra("type", 2);
+                in.putExtra("wid", zData.getId() + "");
+                in.putExtra("h_type", 0);
+                in.putExtra("sob", gson.toJson(sob));
+                startActivity(in);
+            } else if (zStatus == 3 && xStatus == 4) {//已上传装货回单，未卸货
+                int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zData.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
+                if (dis > 5) {//大于五分钟可以接单
+                    Intent in = new Intent(con, ShangChuangImgActivity.class);
+                    in.putExtra("type", 1);
+                    in.putExtra("wid", xData.getId() + "");
+                    in.putExtra("sob", gson.toJson(sob));
+                    in.putExtra("keys", true);
+                    startActivity(in);
+                } else {
+                    ToastUtils.showToast(con, "请到卸货地再进行卸货操作!");
+                }
+
+            } else if (zStatus == 3 && xStatus == 2) {//已卸货，未上传卸货回单
+                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                in.putExtra("type", 2);
+                in.putExtra("wid", xData.getId() + "");
+                in.putExtra("h_type", 1);
+                in.putExtra("sob", gson.toJson(sob));
+                in.putExtra("keys", true);
+                startActivity(in);
+            } else {
+                ToastUtils.showToast(con, "已完成该运单");
+            }
+        });
+    }
+
+    private String getGoText(int zStatus, int xStatus) {
+        if (zStatus == 0) {//未装货
+            return "去装货";
+        } else if (zStatus == 1 && xStatus == 4) {//已装货未上传回单
+            return "装货回单";
+        } else if (zStatus == 3 && xStatus == 4) {//已上传装货回单，未卸货
+            return "去卸货";
+        } else if (zStatus == 3 && xStatus == 2) {//已卸货，未上传卸货回单
+            return "卸货回单";
+        }
+        return "已完成";
+    }
+
     /**
      *
      */
@@ -542,12 +775,18 @@ public class HomeFragment extends BaseFragment {
         ur.upApp();
         hyr.getHuoYuan(1, 100);
         ur.getImage(1);
-
+        WalletRequest qr = new WalletRequest(con, hd);
 
         if (UiAuxiliary.isLogin(con)) {
+            int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1);
             ur.User();
+//            if (!OneDayShowUtils.getInstance().todayIsShow(con)) {
+//                qr.getBankCardList();
+//            }
             ur.getDriverExpire();
-            hyr.startOrder(0);
+            hyr.startOrder(curWaybillId == -1 ? 0 : curWaybillId);
+//            hyr.startOrder(0);
+            //获取权限  应用市场审核不通过
             ur.driverAuthData();
         }
 //            oldTime= Calendar.getInstance().getTimeInMillis();
@@ -606,8 +845,13 @@ public class HomeFragment extends BaseFragment {
                 Log.e("开始轨迹上传服务", "-----");
                 orderNum.setText("运单号:" + sob.getData().getShippingNoteNumber());
                 order_state.setText("" + sob.getData().getWaybillStatus());
-                Intent serviceIn = new Intent(con, TrackService.class);
+                try {
-                getActivity().startService(serviceIn);
+                    Intent serviceIn = new Intent(con, TrackService.class);
+                    getActivity().startService(serviceIn);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
             } else {
                 SPUtil.insSP(con, "order", "ShippingNoteNumber", "");
                 order_start.setVisibility(View.GONE);
@@ -897,29 +1141,64 @@ public class HomeFragment extends BaseFragment {
 //    }
 
     public void initAlct() {
-        PermissionX.init(getActivity())
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+//            if (!OneDayShowUtils.getInstance().todayIsShowQx(con)){
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
+//            boolean b = EasyPermissions.hasPermissions(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.RECORD_AUDIO)
+//                    Manifest.permission.READ_EXTERNAL_STORAGE,
-                .request((allGranted, grantedList, deniedList) -> {
+//                    Manifest.permission.ACCESS_FINE_LOCATION,
-                    if (allGranted) {
+//                    Manifest.permission.ACCESS_COARSE_LOCATION);
+//            if (b) {
+//                ALProcess.verification(con);
+//            }
+            PermissionX.init(getActivity())
+                    .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                            Manifest.permission.READ_EXTERNAL_STORAGE,
+                            Manifest.permission.ACCESS_FINE_LOCATION,
+                            Manifest.permission.CAMERA,
+                            Manifest.permission.ACCESS_COARSE_LOCATION)
+                    .request((allGranted, grantedList, deniedList) -> {
+                        if (allGranted) {
+                            ALProcess.verification(con);
+                        } else {
+                            boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION");
+                            boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE");
+                            boolean camear = deniedList.contains("android.permission.CAMERA");
+                            if (accessCoarseLocation | contains) {
+                                new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法结算运费,去开启！", "取消", "确认", () -> {
+                                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                    Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                    intent.setData(uri);
+                                    startActivity(intent);
+                                });
+                            } else if (camear) {
+                                new MessageUtils().showSimCenPop(con, "缺少相机权限,会导致无法实名认证,去开启！", "取消", "确认", () -> {
+                                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                    Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                    intent.setData(uri);
+                                    startActivity(intent);
+                                });
+                            }
 
-                    } else {
+                        }
+                    });
+//            }
 
-                    }
+        } else {
-                });
+            ALProcess.verification(con);
-        ALProcess.verification(con);
+        }
-        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
-            @Override
-            public void onSuccess(Object o) {
-                Log.e("--成功信息--", new Gson().toJson(o));
-            }
 
-            @Override
+//        ALProcess.verification(con);
-            public void onFailure(String s, String s1) {
+//        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
-                Log.e("--失败信息--", s + s1);
+//            @Override
-            }
+//            public void onSuccess(Object o) {
-        });
+//                Log.e("--成功信息--", new Gson().toJson(o));
+//            }
+//
+//            @Override
+//            public void onFailure(String s, String s1) {
+//                Log.e("--失败信息--", s + s1);
+//            }
+//        });
     }
 
     private MyLocationStyle myLocationStyle;//地图定位样式
@@ -995,6 +1274,18 @@ public class HomeFragment extends BaseFragment {
         initView(null);
     }
 
+    @Subscribe
+    public void processResult(HomeWaybillEvent home) {
+        if (home.getMessage() == 1) {
+            hyr.getHuoYuan(1, 100);
+        } else {
+            int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1);
+            hyr.startOrder(curWaybillId == -1 ? 0 : curWaybillId);
+        }
+
+
+    }
+
     class Model {
 
         private int imageId;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java

@@ -1,15 +1,26 @@
 package com.arpa.hndahesudintocctmsdriver.ui.home;
 
+import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.provider.Settings;
 import android.text.Html;
+import android.text.Layout;
+import android.text.TextUtils;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -21,14 +32,18 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.H5Activity;
 import com.arpa.hndahesudintocctmsdriver.bean.JTT;
+import com.arpa.hndahesudintocctmsdriver.bean.WaybillStatusBean;
 import com.arpa.hndahesudintocctmsdriver.event.FaceEvent;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
+import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
+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.img.ImageGetUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
@@ -59,6 +74,7 @@ import com.arpa.hndahesudintocctmsdriver.util.time.Timer;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
+import com.permissionx.guolindev.PermissionX;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -102,14 +118,19 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
 //                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
-
+                        if (null == bb.getData()) {
-
+                            UiAuxiliary.homeRequest("接单");
-                        Intent intent = new Intent(this, H5Activity.class);
+                            Intent in = new Intent(con, StartYunDanActivity.class);
-                        intent.putExtra("url", (String) bb.getData());
+                            in.putExtra("id", "0");
-                        intent.putExtra("view_file", false);
+                            startActivity(in);
-                        startActivity(intent);
+                            finish();
-
+                        } else {
-
+                            Intent intent = new Intent(this, H5Activity.class);
+                            intent.putExtra("url", (String) bb.getData());
+                            intent.putExtra("view_file", false);
+                            intent.putExtra("title", "合同签署");
+                            startActivity(intent);
+                        }
                         //finish();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -129,6 +150,38 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     }
                     CacheGroup.cacheList.remove("jttRes");
                 }
+
+
+                if (CacheGroup.cacheList.get("orderStatus") != null) {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
+                    Log.e("orderStatus", CacheGroup.cacheList.get("orderStatus"));
+                    WaybillStatusBean status = gson.fromJson(CacheGroup.cacheList.get("orderStatus"), WaybillStatusBean.class);
+                    if (status.getCode() == 200) {
+                        if (status.getData() != null) {
+                            //执行运单下一步操作
+                            new XPopup.Builder(con)
+                                    .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+                                    .asConfirm("请确认接单", "是否确定承运此运单？",
+                                            "取消", "确认",
+                                            () -> {
+                                                Log.e("--id--", "cid:" + cid + "---wid:" + id);
+                                                hyr.confirm(cid, id);
+                                            }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
+                                    .show();
+                        } else {//订单已取消
+                            new MessageUtils().showSimCenPop(con, "运单异常将无法进行下步操作,请返回首页", "取消", "确定", () -> {
+                                SPUtils.remove(con, "curWaybillId");
+                                EventBus.getDefault().post(new HomeWaybillEvent(1));
+                                ActivityUtils.finishToActivity(MainActivity.class, false);
+                            });
+                        }
+                    } else {
+                        Toast.makeText(con, status.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove("orderStatus");
+                }
                 break;
             case 13:
                 int index = Integer.valueOf((String) m.obj);
@@ -136,16 +189,18 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                 car.setText("选择车辆:" + clb.getData().get(index).getCarNumber());
                 cid = clb.getData().get(index).getCarId();
                 break;
+
             case 1111://安联用户验证通过，接单
-                new XPopup.Builder(con)
+                hyr.getOrderStatus(id);
-                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+//                new XPopup.Builder(con)
-                        .asConfirm("请确认接单", "是否确定承运此运单？",
+//                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-                                "取消", "确认",
+//                        .asConfirm("请确认接单", "是否确定承运此运单？",
-                                () -> {
+//                                "取消", "确认",
-                                    Log.e("--id--", "cid:" + cid + "---wid:" + id);
+//                                () -> {
-                                    hyr.confirm(cid, id);
+//                                    Log.e("--id--", "cid:" + cid + "---wid:" + id);
-                                }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
+//                                    hyr.confirm(cid, id);
-                        .show();
+//                                }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
+//                        .show();
                 break;
             case 2222://安联用户验证不通过
                 customDialog.dismiss();
@@ -195,6 +250,8 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     //2021/02/27记，类型声明错误
                     ImageButton return_btn = v.findViewById(R.id.return_btn);
                     ImageButton xuan = v.findViewById(R.id.xuan);
+                    CheckBox checkBox = v.findViewById(R.id.cb);
+                    TextView totalFreight = v.findViewById(R.id.totalFreight);
                     ImageButton btnFp = v.findViewById(R.id.btnFp);
                     TextView effectiveTime = v.findViewById(R.id.effectiveTime);
                     TextView check_contract = v.findViewById(R.id.check_contract);
@@ -205,6 +262,15 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     return_btn.setOnClickListener(v16 -> {
                         finish();
                     });
+                    totalFreight.setText("****");
+                    checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                        if (isChecked) {
+                            totalFreight.setText(hyd.getData().getTotalFreight());
+                        } else {
+                            totalFreight.setText("****");
+                        }
+//                        totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
+                    });
 //                    String textSource = "同意在符合相关税务机关要求的情况下代开<font color='#ff0000'>增值税发票</font>";
                     String textSource = "公司已对运输合同条款充分解释说明，本人已充分理解、认可并签署；同意符合税务机关要求下<font color='#ff0000'>代开增值税发票</font>，产生的增值税及附加税本人承担。";
                     tvZzs.setText(Html.fromHtml(textSource));
@@ -353,7 +419,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
 //        }, 2500);
 
 
-
 //        new Handler().postDelayed(() -> {
 //
 //
@@ -418,10 +483,53 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
      * 先判断安联用户信息验证，随后接单
      */
     private void reOrder() {
-        customDialog = new CustomDialog(con, "正在接单...");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        customDialog.show();
+            try {
-        //验证安联用户是否通过
+                PermissionX.init(this)
-        ALProcess.verification(con, hd);
+                        .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                Manifest.permission.READ_EXTERNAL_STORAGE,
+                                Manifest.permission.ACCESS_FINE_LOCATION,
+                                Manifest.permission.ACCESS_COARSE_LOCATION)
+                        .request((allGranted, grantedList, deniedList) -> {
+                            if (allGranted) {
+                                customDialog = new CustomDialog(con, "正在接单...");
+                                customDialog.show();
+                                //验证安联用户是否通过
+                                ALProcess.verification(con, hd);
+                            } else {
+                                boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION");
+                                boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE");
+                                if (accessCoarseLocation | contains) {
+                                    new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法接单,去开启！", "取消", "确认", () -> {
+                                        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                        Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                        intent.setData(uri);
+                                        startActivity(intent);
+                                    });
+                                }
+
+                            }
+                        });
+            } catch (Exception e) {
+                e.printStackTrace();
+                customDialog = new CustomDialog(con, "正在接单...");
+                customDialog.show();
+                //验证安联用户是否通过
+                ALProcess.verification(con, hd);
+            }
+
+        } else {
+            customDialog = new CustomDialog(con, "正在接单...");
+            customDialog.show();
+            //验证安联用户是否通过
+            ALProcess.verification(con, hd);
+        }
+
+
+//        customDialog = new CustomDialog(con, "正在接单...");
+//        customDialog.show();
+//        //验证安联用户是否通过
+//        ALProcess.verification(con, hd);
     }
 
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java

@@ -186,9 +186,11 @@ public class OrderAllActivity extends BaseActivity {
                         case 200006:
                             state4.setTextColor(getResources().getColor(R.color.blue));
                             state4.setText(" 已评价");
-                        case 200005:
                             state3.setTextColor(getResources().getColor(R.color.blue));
                             state3.setText(" 已结算");
+                        case 200005:
+//                            state3.setTextColor(getResources().getColor(R.color.blue));
+//                            state3.setText(" 已结算");
                         case 200004:
                             state2.setTextColor(getResources().getColor(R.color.blue));
                             state2.setText(" 已卸货");

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java

@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.home;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
@@ -40,6 +41,7 @@ import com.amap.api.services.route.DriveStep;
 import com.amap.api.services.route.RideRouteResult;
 import com.amap.api.services.route.RouteSearch;
 import com.amap.api.services.route.WalkRouteResult;
+import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.bumptech.glide.Glide;
 import com.dahe.mylibrary.utils.TimeUtil;
@@ -73,6 +75,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.function.Predicate;
 
 public class StartYunDanActivity extends BaseActivity {
 
@@ -104,11 +107,14 @@ public class StartYunDanActivity extends BaseActivity {
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 //获取页面数据
-                if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER) != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) {
+                if (CacheGroup.cacheList.get("refreshorderDetail") != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) {
                     Log.e("-评论-", CacheGroup.cacheList.get(GET_EVALUTE));
-                    Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
+                    Log.e("-运单-", CacheGroup.cacheList.get("refreshorderDetail"));
-                    sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
+                    sob = gson.fromJson(CacheGroup.cacheList.get("refreshorderDetail"), StartOrderBean.class);
                     wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     if (sob.getCode() == 200 && sob.getData() != null) {
                         id = sob.getData().getWaybillId();
                         initView(null);
@@ -120,7 +126,7 @@ public class StartYunDanActivity extends BaseActivity {
                     } else {
                         Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show();
                     }
-                    CacheGroup.cacheList.remove(HuoYuanFragmengt.START_ORDER);
+                    CacheGroup.cacheList.remove("refreshorderDetail");
                     CacheGroup.cacheList.remove(GET_EVALUTE);
                 }
                 //保存评价
@@ -202,6 +208,30 @@ public class StartYunDanActivity extends BaseActivity {
                     initStartBody(v);
                     break;
                 case R.layout.item_yundan_yunxing:
+                    LinearLayout llMoney = v.findViewById(R.id.llMoney);
+                    if (!sob.getData().getWaybillStatus().equals("已装货")
+                            && !sob.getData().getWaybillStatus().equals("待装货")
+                            && !sob.getData().getWaybillStatus().equals("待接单")) {
+                        if (sob.getData().getWaybillStatus().equals("已装货")) {
+                            StartOrderBean.DataDTO.WayChildrenDTO mySdw = new StartOrderBean.DataDTO.WayChildrenDTO();
+                            for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+                                StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+                                if (sdw.getType() == 1) {
+                                    mySdw = sdw;
+                                    break;
+                                }
+                            }
+                            if (mySdw.getStatus() == 3) {
+                                llMoney.setVisibility(View.GONE);
+                            } else {
+                                llMoney.setVisibility(View.VISIBLE);
+                            }
+                        } else {
+                            llMoney.setVisibility(View.VISIBLE);
+                        }
+                    } else {
+                        llMoney.setVisibility(View.GONE);
+                    }
                     ImageView head_img = v.findViewById(R.id.head_img);
                     if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) {
                         Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
@@ -446,13 +476,23 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
+    private CustomDialog customDialog;
+
     @Override
     protected void onResume() {
         super.onResume();
         if (map != null) {
             map.onResume();
         }
-        hyr.startOrder(id);
+        if (customDialog==null){
+            customDialog = new CustomDialog(con, "网络请求中...");
+            customDialog.show();
+        }else{
+            if (!customDialog.isShowing()){
+                customDialog.show();
+            }
+        }
+        hyr.startOrder2(id);
         hyr.getEvaluate(id);
     }
 
@@ -563,6 +603,10 @@ public class StartYunDanActivity extends BaseActivity {
 
 
     public void search() {
+        String latitude = sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude();
+        if (TextUtils.isEmpty(latitude)) {
+            return;
+        }
 //        try {
 //            AMapLocationClient.updatePrivacyShow(con,true,true);
 //            AMapLocationClient.updatePrivacyAgree(con,true);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java

@@ -1,8 +1,12 @@
 package com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan;
 
+import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
+
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -15,23 +19,31 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.alct.mdp.MDPLocationCollectionManager;
+import com.alct.mdp.callback.OnDownloadResultListener;
 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.alct.mdp.model.ShipmentStatusEnum;
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
-import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
+import com.arpa.hndahesudintocctmsdriver.bean.WaybillStatusBean;
+import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
+import com.arpa.hndahesudintocctmsdriver.ui.MainActivity;
 import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
+import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.CoordinateConverter;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.ActivityUtils;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -55,6 +67,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -87,17 +101,23 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     private boolean locationKey = false;
     private TextView tv_loaction;
 
+    private boolean isFinish = false;
+
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("upload") != null) {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     Log.e("upload", CacheGroup.cacheList.get("upload"));
                     ub = gson.fromJson(CacheGroup.cacheList.remove("upload"), UploadBean.class);
                     if (ub.getCode() == 200) {
                         imgIds.add(ub.getData().getId());
-                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
+//                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
+                        Glide.with(con).load(path).into(res_img);
                         res_img.setVisibility(View.VISIBLE);
                         img_delete.setVisibility(View.VISIBLE);
                         img_icon.setVisibility(View.GONE);
@@ -107,17 +127,53 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     }
                     CacheGroup.cacheList.remove("upload");
                 }
+                if (CacheGroup.cacheList.get("waybillStatus") != null) {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
+                    Log.e("waybillStatus", CacheGroup.cacheList.get("waybillStatus"));
+                    WaybillStatusBean status = gson.fromJson(CacheGroup.cacheList.get("waybillStatus"), WaybillStatusBean.class);
+                    if (status.getCode() == 200) {
+                        if (status.getData() != null) {
+                            //执行运单下一步操作
+                            typeRequest();
+                        } else {//订单已取消
+                            new MessageUtils().showSimCenPop(con, "运单异常将无法进行下步操作,请返回首页", "取消", "确定", () -> {
+                                SPUtils.remove(con, "curWaybillId");
+                                EventBus.getDefault().post(new HomeWaybillEvent());
+                                ActivityUtils.finishToActivity(MainActivity.class, false);
+                            });
+                        }
+                    } else {
+                        Toast.makeText(con, status.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove("waybillStatus");
+                }
                 for (int i = 0; i < TYPE_NAME.length; i++) {
                     if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) {
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class);
                         if (bb.getCode() == 200) {
                             if (index == 2) {
-                                if (!keys){//装货回单
+                                if (!keys) {//装货回单
+                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                        customDialog.dismiss();
+                                    }
+                                    EventBus.getDefault().post(new HomeWaybillEvent());
                                     Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
+                            } else if ((0 == index || 1 == index) && isFinish) {
+                                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                    customDialog.dismiss();
+                                }
+                                EventBus.getDefault().post(new HomeWaybillEvent());
+                                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
+                                finish();
                             }
                         } else {
+                            if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                customDialog.dismiss();
+                            }
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
                         }
                         CacheGroup.cacheList.remove(TYPE_NAME[i]);
@@ -142,12 +198,18 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                             if (sob.getData().getCarNumber().equals(value)) {
                                 hyr.uploadFile(new File(path));
                             } else {
+                                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                    customDialog.dismiss();
+                                }
                                 new MessageUtils().showCenMessage(ShangChuangImgActivity.this, "车牌号不匹配!", "请重新拍照或联系管理员");
                             }
                         } else {
                             hyr.uploadFile(new File(path));
                         }
                     } else {//识别失败后返回code500
+                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                            customDialog.dismiss();
+                        }
                         if (index == 0) {//装卸货车辆需要识别车牌号){
                             Toast.makeText(con, "装货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
                         } else if (index == 1) {
@@ -160,7 +222,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 14://定位成功
                 locationKey = true;
-                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                     customDialog.dismiss();
                 }
                 tv_loaction.setText("定位成功");
@@ -170,12 +232,21 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 16://定位失败
                 locationKey = false;
-                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                     customDialog.dismiss();
                 }
                 tv_loaction.setText("定位失败，点击重试");
                 tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color, null));
-                Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
+
+                new MessageUtils().showSimCenPop(con, "缺少定位权限,去开启精确定位权限！", "取消", "确认", () -> {
+                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                    Uri uri = Uri.fromParts("package", getPackageName(), null);
+                    intent.setData(uri);
+                    startActivity(intent);
+                });
+
+
+//                Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
                 //定位结果接收
                 //finish();
                 break;
@@ -190,7 +261,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));
@@ -200,6 +271,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
         }
     }
+
     private LatLng latLng;
 
     public LatLng convertGPSToBaidu(LatLng srLatLng) {
@@ -238,6 +310,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         sobStr = getIntent().getExtras().getString("sob");
         //Log.e("---sdwStr--",sdwStr);
         sob = new Gson().fromJson(sobStr, StartOrderBean.class);
+
         initView(null);
         customDialog = new CustomDialog(con, "正在定位当前位置...");
         customDialog.show();
@@ -282,7 +355,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         }
         submit.setOnClickListener(v -> {
             if (imgIds.size() != 0) {
-                typeRequest();
+                //判断运单是否已取消
+                hyr.getWaybillStatus(sob.getData().getWaybillId());
+//                typeRequest();
             } else {
                 Toast.makeText(con, "请先上传一张图片", Toast.LENGTH_SHORT).show();
             }
@@ -327,6 +402,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             path = gia.getFile().getPath();
             Log.e("图片地址:", path);
             gia.dis();
+
+            if (customDialog != null && !customDialog.isShowing()) {
+                customDialog = new CustomDialog(con, "网络请求中...");
+                customDialog.show();
+            }
+
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
@@ -340,6 +421,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 path = paths;
                 Log.e("图片地址:", path);
                 gia.dis();
+
+                if (customDialog != null && !customDialog.isShowing()) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
+                }
+
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
         }
@@ -353,6 +440,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //        for(int i=0;i<imgIds.size();i++){
 //            Log.e("--imgIds--",imgIds.get(i)+"");
 //        }
+        if (customDialog != null && !customDialog.isShowing()) {
+            customDialog = new CustomDialog(con, "网络请求中...");
+            customDialog.show();
+        }
         switch (index) {
             case 0:
                 //装货
@@ -365,16 +456,47 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--装货信息", gson.toJson(lub));
                     if (locationKey) {//高德定位
                         if (keys) {
-                            nfc();
+                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
-                            loadInfo();
+                                @Override
+                                public void onSuccess(Object o) {
+
+                                    String string = o.toString();
+                                    if (string.equals("PICKUPED")) {//安联装货，单平台未装货
+                                        isFinish = true;
+                                        //平台确认装货
+                                        hyr.loading(lub);
+                                    } else {
+                                        nfc();
+                                        loadInfo();
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(String s, String s1) {
+                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                        customDialog.dismiss();
+                                    }
+                                    ToastUtils.showToast(con, s1);
+                                }
+                            });
+
+
+//                            nfc();
+//                            loadInfo();
 //                            up_traffic_start();
 //                            up_image_z();
                         }
                     } else {
+                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                            customDialog.dismiss();
+                        }
                         Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
                     }
 
                 } else {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -389,16 +511,45 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--卸货信息", gson.toJson(lub));
                     if (locationKey) {
                         if (keys) {
-                            nfc();
+                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
-                            uploadInfo();
+                                @Override
+                                public void onSuccess(Object o) {
+                                    if (o.toString().equals("UNLOADED")) {//安联装货，单平台未装货
+                                        //卸货状态-平台
+                                        isFinish = true;
+                                        hyr.dischargeCargo(lub);
+                                    } else {
+                                        nfc();
+                                        uploadInfo();
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(String s, String s1) {
+                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                        customDialog.dismiss();
+                                    }
+                                    ToastUtils.showToast(con, s1);
+                                }
+                            });
+
+
+//                            nfc();
+//                            uploadInfo();
 
                         }
 
                     } else {
+                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                            customDialog.dismiss();
+                        }
                         Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
                     }
 
                 } else {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -423,9 +574,15 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                         }
                         hyr.receipt(urib);
                     } else {
+                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                            customDialog.dismiss();
+                        }
                         Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
                     }
                 } else {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -536,6 +693,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "装货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -568,6 +729,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "卸货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -576,6 +741,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             @Override
             public void onFailure(String s, String s1) {
                 Log.e("上报安联失败(卸货照片):", s + s1);
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
 //                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
 //                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -601,6 +769,11 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                SPUtils.remove(con, "curWaybillId");
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "回单照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -648,8 +821,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     }
 
 
-
-
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -678,6 +849,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(装货):", s + s1);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });
@@ -715,6 +889,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java

@@ -1,8 +1,14 @@
 package com.arpa.hndahesudintocctmsdriver.ui.login;
 
+import android.content.Context;
 import android.content.Intent;
+import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
+import android.provider.Settings;
+import android.telecom.TelecomManager;
+import android.telephony.TelephonyManager;
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
 import android.text.method.LinkMovementMethod;
@@ -10,6 +16,8 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -18,6 +26,7 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 
+import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.request.net.BaseObserver;
 import com.arpa.hndahesudintocctmsdriver.request.net.DataManager;
@@ -38,6 +47,7 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StatusBarUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
 
+import java.util.Locale;
 import java.util.TimerTask;
 
 import cn.jiguang.verifysdk.api.AuthPageEventListener;
@@ -64,8 +74,7 @@ public class LoginActivity extends BaseActivity {
     private LoginBean loginBean;
     private TimerTask tt;
     private int timer_sum = 60;
-    private ImageButton agree_btn;
+    private CheckBox cb;
-    private CardView no_btn;
     private UserRequset ur;
 
     @Override
@@ -88,15 +97,22 @@ public class LoginActivity extends BaseActivity {
                     //存储登录记录
                     loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
                     Log.e("--登录信息--", new Gson().toJson(loginBean));
+                    AppInfoBean appInfoBean = new AppInfoBean();
                     if (loginBean.getCode() == 200) {
                         SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken());
                         SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
                         SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname());
                         SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + "");
-                        JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
+//                        JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
+                        appInfoBean.setStatus("0");
+                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
+                        ur.postAppInfo(appInfoBean,"post");
                         UiAuxiliary.homeRequest("登录成功");
                         finish();
                     } else {
+                        appInfoBean.setStatus("1");
+                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
+                        ur.postAppInfo(appInfoBean,"post");
                         Toast.makeText(con, loginBean.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(LOGIN_RESULT);
@@ -118,8 +134,7 @@ public class LoginActivity extends BaseActivity {
         input_phone = findViewById(R.id.input_phone);
         input_code = findViewById(R.id.input_code);
         getCode = findViewById(R.id.getCode);
-        agree_btn = findViewById(R.id.agree_btn);
+        cb = findViewById(R.id.cb);
-        no_btn = findViewById(R.id.no_btn);
         ur = new UserRequset(con, hd);
         initView(null);
     }
@@ -132,21 +147,18 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        agree_btn.setOnClickListener(v -> {
+        cb.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            agree_btn.setVisibility(View.GONE);
+            if (isChecked) {
-            no_btn.setVisibility(View.VISIBLE);
+                key = true;
-            key = false;
+            } else {
+                key = false;
+            }
         });
-        no_btn.setOnClickListener(v -> {
-            agree_btn.setVisibility(View.VISIBLE);
-            no_btn.setVisibility(View.GONE);
-            key = true;
 
-        });
         ConfigBean cb = ConfigParts.getConfigParts(con);
         if (cb != null) {
             url1 = cb.getData().getUserUrl();
-            url2 = "https://agreement.dahehuoyun.com/huawei/#/private";
+            url2 = "https://agreement.dahehuoyun.com/currency/#/";
         }
         TextView tv_content = findViewById(R.id.tv_content);
         String str = "我已阅读并同意相关服务条款和隐私政策《用户服务协议》和《隐私政策》";

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java

@@ -30,10 +30,12 @@ import androidx.core.app.ActivityCompat;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.arpa.hndahesudintocctmsdriver.BuildConfig;
+import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
+import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
 import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
@@ -138,8 +140,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
             new XPopup.Builder(con)
                     .dismissOnBackPressed(false)
                     .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/huawei/#/private",
+                    .asCustom(new AgreementAlert(con, "http://agreement.dahehuoyun.com/currency/#/",
-                            "http://agreement.dahehuoyun.com/#/user", hd))
+                            "http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
                     .show();
         }
         Glide.with(con)
@@ -159,6 +161,16 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 initRequest();
             }
         }, 1000);
+        AppInfoBean appInfoBean = new AppInfoBean();
+
+        if (!UiAuxiliary.isLogin(con)) {
+            ur.postAppInfo(appInfoBean, "post");
+        }else{
+            String sp = SPUtil.getSP(con, LoginActivity.USER, LoginActivity.USER_UNAME);
+            appInfoBean.setUserPhone(sp);
+            appInfoBean.setStatus("0");
+            ur.postAppInfo(appInfoBean, "post");
+        }
 
 //        String[] permissions=new String[]{
 //                Manifest.permission.ACCESS_FINE_LOCATION,
@@ -331,8 +343,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 }
                 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
                 // 路由初始化
-                JVerificationInterface.setDebugMode(true);
+//                JVerificationInterface.setDebugMode(true);
-                JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+//                JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
                 //友盟
                 //设置非debug版本开启
                 if (!isDebugVersion(con)) {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java

@@ -18,6 +18,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
+import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
@@ -63,32 +64,32 @@ public class MyFragment extends BaseFragment {
     private UserBean userBean;
     private StartOrderBean sob;
     private CarListBean clb;
-    private Gson gson=new Gson();
+    private Gson gson = new Gson();
     private UserRequset ur;
 
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what){
+        switch (m.what) {
             case 200:
                 refreshLayout.finishRefresh();
-                if(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST)!=null){
+                if (CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST) != null) {
-                    clb=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST),CarListBean.class);
+                    clb = gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST), CarListBean.class);
-                    if(clb.getCode()==200){
+                    if (clb.getCode() == 200) {
                         initVehicleList(true);
-                    }else{
+                    } else {
-                        Toast.makeText(con,clb.getRes(),Toast.LENGTH_LONG).show();
+                        Toast.makeText(con, clb.getRes(), Toast.LENGTH_LONG).show();
                         initVehicleList(false);
                     }
                     CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_LIST);
                 }
-                if (CacheGroup.cacheList.get("userdata")!=null){
+                if (CacheGroup.cacheList.get("userdata") != null) {
-                    userBean=gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
+                    userBean = gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
-                    if(userBean.getCode()==200 ){
+                    if (userBean.getCode() == 200) {
-                        SPUtil.insSP(con,"data","userdata",CacheGroup.cacheList.get("userdata"));
+                        SPUtil.insSP(con, "data", "userdata", CacheGroup.cacheList.get("userdata"));
                         initAuth();
-                    }else{
+                    } else {
-                        Toast.makeText(con,userBean.getMsg(),Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con, userBean.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("userdata");
                 }
@@ -100,12 +101,12 @@ public class MyFragment extends BaseFragment {
     @org.jetbrains.annotations.Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
-        root=inflater.inflate(R.layout.fragment_my,container,false);
+        root = inflater.inflate(R.layout.fragment_my, container, false);
-        con=root.getContext();
+        con = root.getContext();
-        brv=root.findViewById(R.id.rv);
+        brv = root.findViewById(R.id.rv);
         EventBus.getDefault().register(this);
-        userBean= UserParts.getUser(con);
+        userBean = UserParts.getUser(con);
-        ur=new UserRequset(con,hd);
+        ur = new UserRequset(con, hd);
         getRequest();
         initId();
         initRefreshLoad();
@@ -114,7 +115,7 @@ public class MyFragment extends BaseFragment {
     }
 
     public void initRefreshLoad() {
-        refreshLayout =root.findViewById(R.id.srl);
+        refreshLayout = root.findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
             getRequest();
         });
@@ -123,7 +124,7 @@ public class MyFragment extends BaseFragment {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        brv_vehicle=root.findViewById(R.id.brv_vehicle);
+        brv_vehicle = root.findViewById(R.id.brv_vehicle);
         ur.vehicleList("1");
     }
 
@@ -131,83 +132,85 @@ public class MyFragment extends BaseFragment {
     //执行中订单
 
     //车辆信息
-    public void initVehicleList(boolean isSuccess){
+    public void initVehicleList(boolean isSuccess) {
         //车辆信息
-        List<ManyBean> list_vehicle=new ArrayList<>();
+        List<ManyBean> list_vehicle = new ArrayList<>();
         for (CarListBean.DataDTO datum : clb.getData()) {
-            list_vehicle.add(new ManyBean(datum,R.layout.my_item_vehicle));
+            list_vehicle.add(new ManyBean(datum, R.layout.my_item_vehicle));
         }
-        if(list_vehicle.size()==0){
+        if (list_vehicle.size() == 0) {
-            list_vehicle.add(new ManyBean(new Model(),R.layout.my_item_vehicle_null));
+            list_vehicle.add(new ManyBean(new Model(), R.layout.my_item_vehicle_null));
         }
-        brv_vehicle.creates(con,list_vehicle).setOnItemViewListener((position, o, v, layout) -> {
+        brv_vehicle.creates(con, list_vehicle).setOnItemViewListener((position, o, v, layout) -> {
-            switch (layout){
+            switch (layout) {
                 case R.layout.my_item_vehicle:
-                    CarListBean.DataDTO cd= (CarListBean.DataDTO) o;
+                    CarListBean.DataDTO cd = (CarListBean.DataDTO) o;
-                    View br=v.findViewById(R.id.br);
+                    View br = v.findViewById(R.id.br);
-                    if(position==(clb.getData().size()-1) && position!=2){
+                    if (position == (clb.getData().size() - 1) && position != 2) {
-                        LinearLayout add_box=v.findViewById(R.id.add_box);
+                        LinearLayout add_box = v.findViewById(R.id.add_box);
-                        TextView add_no=v.findViewById(R.id.add_no);
+                        TextView add_no = v.findViewById(R.id.add_no);
                         add_no.setVisibility(View.GONE);
                         add_box.setVisibility(View.VISIBLE);
                         br.setVisibility(View.GONE);
                         add_box.setOnClickListener(v1 -> {
-                            Intent in=new Intent(con, VehicleAuthActivity.class);
+                            Intent in = new Intent(con, VehicleAuthActivity.class);
-                            in.putExtra("carId","");
+                            in.putExtra("carId", "");
                             startActivity(in);
                         });
                     }
                     v.setOnClickListener(v1 -> {
-                        Intent in=new Intent(con, VehicleAuthActivity.class);
+                        Intent in = new Intent(con, VehicleAuthActivity.class);
-                        in.putExtra("carId",cd.getCarId());
+                        in.putExtra("carId", cd.getCarId());
                         startActivity(in);
                     });
                     break;
                 case R.layout.my_item_vehicle_null:
                     v.setOnClickListener(v12 -> {
-                        Intent in=new Intent(con, VehicleAuthActivity.class);
+                        Intent in = new Intent(con, VehicleAuthActivity.class);
-                        in.putExtra("carId","");
+                        in.putExtra("carId", "");
                         startActivity(in);
                     });
                     break;
-                default:break;
+                default:
+                    break;
             }
         });
     }
 
-    class Model{ }
+    class Model {
+    }
 
-    public void getRequest(){
+    public void getRequest() {
-        sob= StartOrderParts.getStartOrder(con);
+        sob = StartOrderParts.getStartOrder(con);
         ur.User();
         ur.vehicleList("1");
     }
 
-    private LinearLayout onGetUser,onAllOrder,onAuth,onDriverHome;
+    private LinearLayout onGetUser, onAllOrder, onAuth, onDriverHome;
-    private ImageView onContact,onOpinion,onUpdate,onSetUp;
+    private ImageView onContact, onOpinion, onUpdate, onSetUp;
-    private TextView name,phone;
+    private TextView name, phone;
-    private ImageView dang_auth,no_auth,name_auth;
+    private ImageView dang_auth, no_auth, name_auth;
     private LinearLayout auth_box;
     private ImageView img_head;
 
-    public void initId(){
+    public void initId() {
         //
-        name=root.findViewById(R.id.name);
+        name = root.findViewById(R.id.name);
-        phone=root.findViewById(R.id.phone);
+        phone = root.findViewById(R.id.phone);
-        dang_auth=root.findViewById(R.id.dang_auth);
+        dang_auth = root.findViewById(R.id.dang_auth);
-        no_auth=root.findViewById(R.id.no_auth);
+        no_auth = root.findViewById(R.id.no_auth);
-        name_auth=root.findViewById(R.id.name_auth);
+        name_auth = root.findViewById(R.id.name_auth);
-        auth_box=root.findViewById(R.id.auth_box);
+        auth_box = root.findViewById(R.id.auth_box);
         //
-        onGetUser=root.findViewById(R.id.onGetUser);
+        onGetUser = root.findViewById(R.id.onGetUser);
-        onAllOrder=root.findViewById(R.id.onAllOrder);
+        onAllOrder = root.findViewById(R.id.onAllOrder);
-        onAuth=root.findViewById(R.id.onAuth);
+        onAuth = root.findViewById(R.id.onAuth);
-        onDriverHome=root.findViewById(R.id.onDriverHome);
+        onDriverHome = root.findViewById(R.id.onDriverHome);
-        onContact=root.findViewById(R.id.onContact);
+        onContact = root.findViewById(R.id.onContact);
-        onOpinion=root.findViewById(R.id.onOpinion);
+        onOpinion = root.findViewById(R.id.onOpinion);
-        onUpdate=root.findViewById(R.id.onUpdate);
+        onUpdate = root.findViewById(R.id.onUpdate);
-        onSetUp=root.findViewById(R.id.onSetUp);
+        onSetUp = root.findViewById(R.id.onSetUp);
-        img_head=root.findViewById(R.id.img_head);
+        img_head = root.findViewById(R.id.img_head);
         //认证
         no_auth.setOnClickListener(v -> startActivity(new Intent(con, PersonalAuthActivity.class)));
         //用户信息
@@ -222,27 +225,27 @@ public class MyFragment extends BaseFragment {
                     .permissions(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
-                            Intent in=new Intent(con, BusinessActivity.class);
+                            Intent in = new Intent(con, BusinessActivity.class);
-                            in.putExtra("type","餐饮");
+                            in.putExtra("type", "餐饮");
                             startActivity(in);
                         } else {
-                            Toast.makeText(getContext(),"请先开启定位权限",Toast.LENGTH_LONG).show();
+                            Toast.makeText(getContext(), "请先开启定位权限", Toast.LENGTH_LONG).show();
                         }
                     });
         });
         //联系我们
         onContact.setOnClickListener(v -> {
-            String serviceMobile="";
+            String serviceMobile = "";
-            if(ConfigParts.getConfigParts(con)!=null){
+            if (ConfigParts.getConfigParts(con) != null) {
-                serviceMobile=ConfigParts.getConfigParts(con).getData().getServiceMobile();
+                serviceMobile = ConfigParts.getConfigParts(con).getData().getServiceMobile();
-                serviceMobile=StringUtil.isNull(serviceMobile,"");
+                serviceMobile = StringUtil.isNull(serviceMobile, "");
             }
-            String[] title={"平台客服:"+serviceMobile};
+            String[] title = {"平台客服:" + serviceMobile};
-            String[] value={serviceMobile};
+            String[] value = {serviceMobile};
             new XPopup.Builder(con)
                     .isDarkTheme(false)
                     .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-                    .asCenterList("请选择",title,
+                    .asCenterList("请选择", title,
                             (position1, text) -> {
                                 Intent intent = new Intent(Intent.ACTION_DIAL);
                                 Uri data = Uri.parse("tel:" + value[position1]);
@@ -253,36 +256,36 @@ public class MyFragment extends BaseFragment {
         });
         //咨询建议
         onOpinion.setOnClickListener(v -> {
-            Intent in=new Intent(con, WebActivity.class);
+            Intent in = new Intent(con, WebActivity.class);
-            in.putExtra("title","咨询建议");
+            in.putExtra("title", "咨询建议");
-            in.putExtra("url","");
+            in.putExtra("url", "");
             startActivity(in);
         });
         //检查更新
-        onUpdate.setOnClickListener(v -> Toast.makeText(con,"当前已经是最新版本",Toast.LENGTH_LONG).show());
+        onUpdate.setOnClickListener(v -> Toast.makeText(con, "当前已经是最新版本", Toast.LENGTH_LONG).show());
         //系统设置
         onSetUp.setOnClickListener(v -> startActivity(new Intent(con, SetupActivity.class)));
     }
 
-    public void initAuth(){
+    public void initAuth() {
-        if(userBean.getData()!=null){
+        if (userBean.getData() != null) {
-            name.setText(StringUtil.isNull(userBean.getData().getUname(),"未实名"));
+            name.setText(StringUtil.isNull(userBean.getData().getUname(), "未实名"));
-            phone.setText(StringUtil.isNull(userBean.getData().getRname(),""));
+            phone.setText(StringUtil.isNull(userBean.getData().getRname(), ""));
-            if(2==userBean.getData().getPartyMemberStatus()){
+            if (2 == userBean.getData().getPartyMemberStatus()) {
 
             }
-            if("1".equals(userBean.getData().getRealAuthentication())){
+            if ("1".equals(userBean.getData().getRealAuthentication())) {
 
-            }else{
+            } else {
 
             }
-            if (!"".equals(userBean.getData().getHeadportraitUrl())){
+            if (!"".equals(userBean.getData().getHeadportraitUrl())) {
                 Glide.with(con).load(userBean.getData().getHeadportraitUrl()).into(img_head);
             }
-            if(userBean!=null && 100003==userBean.getData().getAuditStatus()){
+            if (userBean != null && 100003 == userBean.getData().getAuditStatus()) {
                 auth_box.setVisibility(View.GONE);
                 no_auth.setVisibility(View.GONE);
-            }else{
+            } else {
                 auth_box.setVisibility(View.GONE);
                 no_auth.setVisibility(View.VISIBLE);
             }
@@ -290,12 +293,19 @@ public class MyFragment extends BaseFragment {
     }
 
     @Subscribe
-    public void  processResult(VehicleEvent event) {
+    public void processResult(VehicleEvent event) {
-        Log.e("-msg-",event.getMessage());
+        Log.e("-msg-", event.getMessage());
-        if(!"挂".equals(event.getMessage())) {
+        if (!"挂".equals(event.getMessage())) {
             ur.vehicleList("1");
         }
     }
+
+    @Subscribe
+    public void refreshCarListEvent(RefreshCarListEvent event) {
+        Log.e("-msg-", event.getMessage());
+        ur.vehicleList("1");
+    }
+
     @Subscribe
     public void personResult(PersonEvent home) {
         Log.e("-res-", home.getMessage());

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java

@@ -35,7 +35,7 @@ public class SetupActivity extends BaseActivity {
     String url2="";
     String url3="";
     String kefu="";
-    private RelativeLayout r1,r2,r3,r4,r5,r6,r7;
+    private RelativeLayout r1,r2,r3,r4,r5,r6,r7,r8;
 
     @Override
     public void msgMethod(Message m) {
@@ -73,8 +73,9 @@ public class SetupActivity extends BaseActivity {
         ConfigBean cb= ConfigParts.getConfigParts(con);
         if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="https://agreement.dahehuoyun.com/huawei/#/private";
+            url1="http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
-            url2=cb.getData().getPrivateUrl();
+//            url2=cb.getData().getPrivateUrl();
+            url2="http://agreement.dahehuoyun.com/currency/#/";
             kefu=cb.getData().getServiceMobile();
             url3=cb.getData().getSecurityUrl();
         }
@@ -85,6 +86,7 @@ public class SetupActivity extends BaseActivity {
         r5=findViewById(R.id.r5);
         r6=findViewById(R.id.r6);
         r7=findViewById(R.id.r7);
+        r8=findViewById(R.id.r8);
         ur=new UserRequset(con,hd);
         initView(null);
     }
@@ -118,9 +120,15 @@ public class SetupActivity extends BaseActivity {
                 in.putExtra("url","https://smlt.esign.cn/hmfbZoeeGQqv");
                 startActivity(in);
             });
+            r8.setOnClickListener(v12 -> {
+                Intent in=new Intent(con,WebActivity.class);
+                in.putExtra("title","交易规则");
+                in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
+                startActivity(in);
+            });
             r6.setOnClickListener(v12 -> {
-                String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
+                String[] title={"平台客服:"+kefu};
-                String[] value={kefu,"95528","13460042961"};
+                String[] value={kefu};
                 new XPopup.Builder(con)
                         .isDarkTheme(false)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -12,6 +13,16 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean;
+import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
+import com.arpa.hndahesudintocctmsdriver.request.AuthRequest;
+import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
+import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
+import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickListener;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -30,6 +41,8 @@ import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.util.SmartGlideImageLoader;
 
 import java.io.File;
 import java.util.List;
@@ -40,100 +53,166 @@ import java.util.List;
  * @date 2021/8/26 19:06
  * @description:
  */
-public class UpBankActivity extends BaseAppCompatActivity {
+public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClickListener {
 
     private ImageView up_bank_img;
-    private EditText bank_name,bank_number;
+    private EditText bank_name, bank_number;
-    private TextView submit;
+    private TextView submit, skip;
     private ImageView return_btn;
-    public GetImageAlert gia=new GetImageAlert();
+    public GetImageAlert gia = new GetImageAlert();
     String path;
     private OCRBankBean ib;
+    DriverAuthDataBean dad;
+
+    boolean isAuth = false;
     private WalletRequest qr;
     private TextView tp;
+    private String imageId;
 
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what){
+        switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("OCR_BANK")!=null) {
+                if (CacheGroup.cacheList.get("OCR_BANK") != null) {
-                    ib=new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"),OCRBankBean.class);
+                    ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class);
-                    if(ib.getCode()==200){
+                    customDialog.dismiss();
+                    if (ib.getCode() == 200&&ib.getData()!=null) {
                         initView(null);
-                        customDialog.dismiss();
+                        WalletFragment.isInsBank = true;
-                        WalletFragment.isInsBank=true;
+                    } else {
-                    }else{
+                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
-                        Toast.makeText(con,ib.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("OCR_BANK");
                 }
-                if(CacheGroup.cacheList.get("insBank")!=null){
+
-                    BaseBean bb=new Gson().fromJson(CacheGroup.cacheList.get("insBank"),BaseBean.class);
+                if (CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA) != null) {
-                    if(bb.getCode()==200){
+                    dad = new Gson().fromJson(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA), DriverAuthDataBean.class);
-                        Toast.makeText(con,"绑定成功",Toast.LENGTH_SHORT).show();
+                    if (dad.getCode() == 200) {
+                        if (dad.getData() != null && !TextUtils.isEmpty(dad.getData().getCardNo())) {
+                            isAuth = true;
+                            skip.setVisibility(View.GONE);
+                            submit.setBackgroundResource(R.drawable.bg_btn_grey);
+                            bank_name.setText(dad.getData().getBankName());
+                            bank_number.setText(dad.getData().getCardNo());
+                            Glide.with(con).load(dad.getData().getBankImgUrl()).into(up_bank_img);
+                        }
+
+                    } else {
+                        Toast.makeText(con, dad.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove(WoDeFragment.AUTH_DATA);
+                }
+
+                if (CacheGroup.cacheList.get("insBank") != null) {
+                    if (customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
+                    BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class);
+                    if (bb.getCode() == 200) {
+                        if (type == 1) {
+                            Intent in = new Intent(con, CertificatesActivity.class);
+                            in.putExtra("index", 1);
+                            startActivity(in);
+                        }
+                        Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
                         finish();
-                    }else{
+                    } else {
-                        Toast.makeText(con,bb.getMsg(),Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("insBank");
                 }
+                if (CacheGroup.cacheList.get("upload") != null) {
+                    UploadBean ub = new Gson().fromJson(CacheGroup.cacheList.get("upload"), UploadBean.class);
+                    if (ub.getCode() == 200) {
+                        imageId = ub.getData().getId()+"";
+                        new OCRRequest().ORCBankZj(con, hd, ub.getData().getUrl());
+
+                    } else {
+                        Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove("upload");
+                }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                customDialog=new CustomDialog(con, "上传识别中...");
+                customDialog = new CustomDialog(con, "上传识别中...");
                 customDialog.show();
                 path = (String) m.obj;
-                new OCRRequest().ORCBank(con,hd,new File(path));
+
+                new AuthRequest().upload(con, hd, new File(path));
+
+//                new OCRRequest().ORCBank(con, hd, new File(path));
                 break;
         }
     }
 
     private CustomDialog customDialog;
 
+
+    /**
+     * 1：司机注册自动跳转
+     * 0：钱包添加银行卡
+     */
+    private int type = 0;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_bank_auth);
-        act=this;
+        act = this;
-        con=this;
+        con = this;
-        up_bank_img=findViewById(R.id.up_bank_img);
+        Bundle extras = getIntent().getExtras();
-        bank_name=findViewById(R.id.bank_name);
+        if (extras != null) {
-        bank_number=findViewById(R.id.bank_number);
+            type = getIntent().getExtras().getInt("type");
-        submit=findViewById(R.id.submit);
+        }
-        return_btn=findViewById(R.id.return_btn);
+        up_bank_img = findViewById(R.id.up_bank_img);
-        qr=new WalletRequest(con,hd);
+        bank_name = findViewById(R.id.bank_name);
+        bank_number = findViewById(R.id.bank_number);
+        submit = findViewById(R.id.submit);
+        skip = findViewById(R.id.skip);
+        return_btn = findViewById(R.id.return_btn);
+        qr = new WalletRequest(con, hd);
         up_bank_img.setOnClickListener(v -> {
-            gia.showPopueWindow(this);
+            if (isAuth) {
-        });
+                new XPopup.Builder(con)
-        submit.setOnClickListener(v -> {
+                        .asImageViewer(up_bank_img, dad.getData().getBankImgUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher_round))
-            if(ib!=null){
+                        .show();
-                submit();
+            } else {
-            }else{
+                gia.showPopueWindow(this);
-                Toast.makeText(con,"请先上传图片",Toast.LENGTH_SHORT).show();
             }
         });
+        submit.setOnClickListener(new OnLimitClickHelper(this));
+        skip.setOnClickListener(new OnLimitClickHelper(this));
         return_btn.setOnClickListener(v -> {
             finish();
         });
+
+        if (type == 1) {
+            skip.setVisibility(View.VISIBLE);
+        } else {
+            skip.setVisibility(View.GONE);
+        }
+        UserRequset ur = new UserRequset(con, hd);
+        ur.driverAuthData();
     }
 
     @Override
     public void initView(Object obj) {
         super.initView(obj);
         bank_name.setText(ib.getData().getBankName());
-        bank_number.setText(ib.getData().getBankCardNumber());
+        bank_number.setText(ib.getData().getCardNumber());
-        Glide.with(con).load(ib.getData().getUrl()).into(up_bank_img);
+        Glide.with(con).load(path).into(up_bank_img);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-         if (requestCode == 12 && resultCode == RESULT_OK) {
+        if (requestCode == 12 && resultCode == RESULT_OK) {
-            path=gia.getFile().getPath();
+            path = gia.getFile().getPath();
-            Log.e("图片地址:",path);
+            Log.e("图片地址:", path);
             gia.dis();
-            ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
+            ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
             if (imgs != null && imgs.size() > 0) {
@@ -143,29 +222,58 @@ public class UpBankActivity extends BaseAppCompatActivity {
                 if (TextUtils.isEmpty(paths)) {
                     paths = image.getPath();
                 }
-                path=paths;
+                path = paths;
-                Log.e("图片地址:",path);
+                Log.e("图片地址:", path);
                 gia.dis();
-                ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
+                ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
         }
     }
 
-    public void submit(){
+    public void submit() {
-        String bankName=bank_name.getText().toString().trim();
+        customDialog = new CustomDialog(con, "上传中,请稍后...");
-        String bankNumber=bank_number.getText().toString().trim();
+        customDialog.show();
-        if("".equals(bankName) || "".equals(bankNumber)){
+        String bankName = bank_name.getText().toString().trim();
-            Toast.makeText(con,"请先补充完整的银行卡信息",Toast.LENGTH_LONG).show();
+        String bankNumber = bank_number.getText().toString().trim();
+        if ("".equals(bankName) || "".equals(bankNumber)) {
+            Toast.makeText(con, "请先补充完整的银行卡信息", Toast.LENGTH_LONG).show();
             return;
         }
-        InsBankInputBean ibib =new InsBankInputBean();
+        InsBankInputBean ibib = new InsBankInputBean();
         ibib.setCardNo(bankNumber);
-        ibib.setCardType(Integer.parseInt(ib.getData().getBankCardType()));
+//        ibib.setCardType(Integer.parseInt(ib.getData().getType()));
+        ibib.setCardType(1);
         ibib.setBankName(bankName);
         ibib.setCardUserType(1);
-        ibib.setImageId(ib.getData().getId());
+        ibib.setImageId(Integer.parseInt(imageId));
-        Log.e("-res-",new Gson().toJson(ibib));
+        Log.e("-res-", new Gson().toJson(ibib));
         qr.insBankCard(ibib);
     }
 
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.submit:
+                if (isAuth) {
+                    Intent in = new Intent(con, CertificatesActivity.class);
+                    in.putExtra("index", 1);
+                    startActivity(in);
+                    finish();
+                    return;
+                }
+                if (ib != null) {
+                    submit();
+                } else {
+                    Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show();
+                }
+                break;
+            case R.id.skip:
+                new MessageUtils().showSimCenPop(con, "确定跳过银行卡?，可能会导致运费无法结算！", "取消", "确认", () -> {
+                    Intent in = new Intent(con, CertificatesActivity.class);
+                    in.putExtra("index", 1);
+                    startActivity(in);
+                });
+                break;
+        }
+    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java

@@ -15,6 +15,8 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
+import com.arpa.hndahesudintocctmsdriver.event.WalletEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
@@ -32,6 +34,8 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseFragment;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 import org.jetbrains.annotations.NotNull;
 
 
@@ -123,6 +127,7 @@ public class WalletFragment extends BaseFragment{
     @Override
     public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
         root=inflater.inflate(R.layout.fragmengt_qianbao,container,false);
+        EventBus.getDefault().register(this);
         dataName2="bcb";
         con=root.getContext();
         rv=root.findViewById(R.id.rv);
@@ -231,6 +236,7 @@ public class WalletFragment extends BaseFragment{
             bank_remove.setVisibility(View.VISIBLE);
         } else{
             bank_number.setVisibility(View.GONE);
+            bank_title_1.setText("未添加银行卡");
             bank_add.setVisibility(View.VISIBLE);
             bank_remove.setVisibility(View.GONE);
         }
@@ -316,5 +322,14 @@ public class WalletFragment extends BaseFragment{
 //                .show();
 //    }
 
-
+    @Subscribe
+    public void processResult(WalletEvent event) {
+        Log.e("-msg-", event.getMessage());
+        refreshLayout.autoRefresh();
+    }
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java

@@ -5,9 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.net.http.SslError;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.webkit.JavascriptInterface;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -81,6 +84,11 @@ public class WebActivity extends BaseActivity {
         webSettings.setJavaScriptEnabled(true);
         webSettings.setDomStorageEnabled(true);
         webSettings.setDefaultTextEncodingName("utf-8");
+        // 特别注意：5.1以上默认禁止了https和http混用，以下方式是开启
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+
         wv.addJavascriptInterface(new JavaScriptObject(con), "webObj");
         //PaxWebChromeClient chromeClient=new PaxWebChromeClient();
         //WebView加载web资源
@@ -111,6 +119,12 @@ public class WebActivity extends BaseActivity {
                 wv.loadUrl(url);
                 return  true;
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                super.onReceivedSslError(view, handler, error);
+                handler.proceed();
+            }
         });
         wv.setWebChromeClient(chromeClient);
         wv.loadUrl(url);
@@ -149,6 +163,12 @@ public class WebActivity extends BaseActivity {
                 view.loadUrl(url);
                 return true;
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                super.onReceivedSslError(view, handler, error);
+                handler.proceed();
+            }
         });
     }
 
@@ -183,7 +203,8 @@ public class WebActivity extends BaseActivity {
 
         @JavascriptInterface
         public String getUserToken(){
-            Log.e("-token-",UserParts.getUser(con).getData().getToken());
+//            Log.e("-token-",UserParts.getUser(con).getData().getToken());
+//            return "woshitoken-androidfasdf";
             return UserParts.getUser(con).getData().getToken();
         }
 
@@ -191,7 +212,11 @@ public class WebActivity extends BaseActivity {
         public void isSuccess(){
             finish();
         }
-
+        @JavascriptInterface
+        public void isPdfSuccess(){
+            Toast.makeText(con, "签署成功", Toast.LENGTH_SHORT).show();
+            finish();
+        }
     }
 
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt

@@ -27,7 +27,8 @@ class MessageUtils {
         XPopup.Builder(ctx) //
             .hasNavigationBar(false)
             .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
-            .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{
+            .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object :
+                MessagePop.OnMyItemClickListener {
                 override fun onItemClick(startTime: String, endTime: String) {
                 }
             }))
@@ -38,14 +39,20 @@ class MessageUtils {
         XPopup.Builder(ctx) //
             .hasNavigationBar(false)
             .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
-            .asCustom(MessagePop(ctx, message,message2).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{
+            .asCustom(MessagePop(ctx, message, message2).setOnMyItemClickListener(object :
+                MessagePop.OnMyItemClickListener {
                 override fun onItemClick(startTime: String, endTime: String) {
                 }
             }))
             .show()
     }
 
-    fun showSimCenPop(ctx: Context, message: String,onMyItemClickListener: SimCenterPop.OnMyItemClickListener){
+    fun showSimCenPop(
+        ctx: Context,
+        message: String,
+        titleRight:String = "去注册",
+        onMyItemClickListener: SimCenterPop.OnMyItemClickListener
+    ) {
 
 //        XPopup.Builder(ctx) //
 //            .hasNavigationBar(false)
@@ -62,7 +69,36 @@ class MessageUtils {
         XPopup.Builder(ctx) //
             .hasNavigationBar(false)
             .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
-            .asCustom(SimCenterPop(ctx,message).setOnMyItemClickListener(onMyItemClickListener))
+            .asCustom(SimCenterPop(ctx, message, titleRight = titleRight).setOnMyItemClickListener(onMyItemClickListener))
+            .show()
+
+    }
+
+    fun showSimCenPop(
+        ctx: Context,
+        message: String,
+        left: String,
+        right: String,
+        onMyItemClickListener: SimCenterPop.OnMyItemClickListener
+    ) {
+
+//        XPopup.Builder(ctx) //
+//            .hasNavigationBar(false)
+//            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
+//            .asCustom(SimCenterPop(ctx,message).setOnMyItemClickListener(object : SimCenterPop.OnMyItemClickListener{
+//                override fun onItemClick() {
+//                    val intent = Intent(ctx, CertificatesActivity::class.java)
+//                    intent.putExtra("index", type)
+//                    ctx.startActivity(intent)
+//                }
+//            }))
+//            .show()
+
+        XPopup.Builder(ctx) //
+            .hasNavigationBar(false)
+            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
+            .dismissOnTouchOutside(false)
+            .asCustom(SimCenterPop(ctx, message,left,right).setOnMyItemClickListener(onMyItemClickListener))
             .show()
 
     }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/OneDayShowUtils.java

@@ -0,0 +1,76 @@
+package com.arpa.hndahesudintocctmsdriver.util;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
+import com.dahe.mylibrary.utils.TimeUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+/**
+ * @ClassName OneDayShowUtils
+ * @Author john
+ * @Date 2024/9/11 15:33
+ * @Description TODO
+ */
+public class OneDayShowUtils {
+
+    private static class SingletonHolder {
+        private static final OneDayShowUtils INSTANCE = new OneDayShowUtils();
+    }
+
+    private OneDayShowUtils() {
+    }
+
+    public static final OneDayShowUtils getInstance() {
+        return OneDayShowUtils.SingletonHolder.INSTANCE;
+    }
+
+    /**
+     *
+     * @param ctx
+     * @return true:当天已弹出 false:当天未弹出
+     */
+    public boolean todayIsShow(Context ctx) {
+        String preday = (String) SPUtils.get(ctx, "PREDAY", "");
+        if (TextUtils.isEmpty(preday)) {
+            String nowString = TimeUtil.getNowString("yyyy-MM-dd");
+            SPUtils.put(ctx, "PREDAY", nowString);
+            return false;
+        } else {
+            boolean today = TimeUtil.isToday(preday, new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()));
+            if (!today) {
+                String nowString = TimeUtil.getNowString("yyyy-MM-dd");
+                SPUtils.put(ctx, "PREDAY", nowString);
+            }
+            return today;
+        }
+
+    }
+
+
+    /**
+     *
+     * @param ctx
+     * @return true:当天已弹出 false:当天未弹出
+     */
+    public boolean  todayIsShowQx(Context ctx) {
+        String preday = (String) SPUtils.get(ctx, "permission", "");
+        if (TextUtils.isEmpty(preday)) {
+            String nowString = TimeUtil.getNowString("yyyy-MM-dd");
+            SPUtils.put(ctx, "permission", nowString);
+            return false;
+        } else {
+            boolean today = TimeUtil.isToday(preday, new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()));
+            if (!today) {
+                String nowString = TimeUtil.getNowString("yyyy-MM-dd");
+                SPUtils.put(ctx, "permission", nowString);
+            }
+            return today;
+        }
+
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/PermissionUtils.kt

@@ -0,0 +1,137 @@
+package com.arpa.hndahesudintocctmsdriver.util
+
+import android.app.Activity
+import android.content.Context
+import androidx.annotation.NonNull
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
+import com.arpa.hndahesudintocctmsdriver.cuspop.MessagePop
+import com.arpa.hndahesudintocctmsdriver.cuspop.MyRequestCallback
+import com.arpa.hndahesudintocctmsdriver.cuspop.TopMsgPopup
+import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop
+import com.lxj.xpopup.XPopup
+import com.lxj.xpopup.core.BasePopupView
+import com.permissionx.guolindev.PermissionX
+import com.permissionx.guolindev.callback.RequestCallback
+
+/**
+ * @ClassName MessageUtils
+ * @Author 用户
+ * @Date 2023/8/15 09:51
+ * @Description TODO
+ */
+class PermissionUtils {
+
+    companion object {
+        fun getInstance() = InstanceHelper.sSingle
+    }
+
+    object InstanceHelper {
+        val sSingle = PermissionUtils()
+    }
+
+
+    /**
+     * 显示权限申请
+     * @param activity AppCompatActivity
+     * @param message String
+     * @param permission List<String>
+     * @param callback RequestCallback
+     * @return BasePopupView?
+     */
+    fun showPermissionMessage(activity: FragmentActivity,title:String, message: String,vararg permission:String,callback: MyRequestCallback){
+        val show = XPopup.Builder(activity)
+            .hasShadowBg(false)
+            .hasBlurBg(false)
+            .isTouchThrough(true)
+            .isCenterHorizontal(true)
+            .offsetY(140)
+            .asCustom(
+                TopMsgPopup(
+                    activity,
+                    title,
+                    message
+                )
+            )
+            .show()
+
+        PermissionX.init(activity)
+            .permissions(listOf(*permission))
+            .request { allGranted, grantedList, deniedList ->
+                show.dismiss()
+                if (callback!=null){
+                    callback.onResult(allGranted,grantedList,deniedList)
+                }
+            }
+    }
+    fun showCenMessage(ctx: Context, message: String, message2: String) {
+        XPopup.Builder(ctx) //
+            .hasNavigationBar(false)
+            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
+            .asCustom(MessagePop(ctx, message, message2).setOnMyItemClickListener(object :
+                MessagePop.OnMyItemClickListener {
+                override fun onItemClick(startTime: String, endTime: String) {
+                }
+            }))
+            .show()
+    }
+
+    fun showSimCenPop(
+        ctx: Context,
+        message: String,
+        onMyItemClickListener: SimCenterPop.OnMyItemClickListener
+    ) {
+
+//        XPopup.Builder(ctx) //
+//            .hasNavigationBar(false)
+//            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
+//            .asCustom(SimCenterPop(ctx,message).setOnMyItemClickListener(object : SimCenterPop.OnMyItemClickListener{
+//                override fun onItemClick() {
+//                    val intent = Intent(ctx, CertificatesActivity::class.java)
+//                    intent.putExtra("index", type)
+//                    ctx.startActivity(intent)
+//                }
+//            }))
+//            .show()
+
+        XPopup.Builder(ctx) //
+            .hasNavigationBar(false)
+            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
+            .asCustom(SimCenterPop(ctx, message).setOnMyItemClickListener(onMyItemClickListener))
+            .show()
+
+    }
+
+    fun showSimCenPop(
+        ctx: Context,
+        message: String,
+        left: String,
+        right: String,
+        onMyItemClickListener: SimCenterPop.OnMyItemClickListener
+    ) {
+
+//        XPopup.Builder(ctx) //
+//            .hasNavigationBar(false)
+//            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
+//            .asCustom(SimCenterPop(ctx,message).setOnMyItemClickListener(object : SimCenterPop.OnMyItemClickListener{
+//                override fun onItemClick() {
+//                    val intent = Intent(ctx, CertificatesActivity::class.java)
+//                    intent.putExtra("index", type)
+//                    ctx.startActivity(intent)
+//                }
+//            }))
+//            .show()
+
+        XPopup.Builder(ctx) //
+            .hasNavigationBar(false)
+            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
+            .asCustom(
+                SimCenterPop(ctx, message, left, right).setOnMyItemClickListener(
+                    onMyItemClickListener
+                )
+            )
+            .show()
+
+    }
+
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/OkHttpUtil.java

@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.util.http;
 import android.content.Context;
 
 import com.arpa.hndahesudintocctmsdriver.util.app.VersionUtil;
+import com.dahe.mylibrary.utils.AppUtils;
 
 import java.io.File;
 
@@ -41,6 +42,7 @@ public class OkHttpUtil {
                 .post(body)
                 .headers(hb.build())
                 .addHeader("Version", VersionUtil.getVersion(con))
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 //.addHeader("sign",sign)
                 .removeHeader("User-Agent")
                 .addHeader("User-Agent",GetUtil.getUserAgent(con))
@@ -71,6 +73,40 @@ public class OkHttpUtil {
                 .addHeader("Authorization", token)
                 .addHeader("Content-Type", "application/json")
                 .addHeader("Version", VersionUtil.getVersion(con))
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
+                //.addHeader("sign",sign)
+                .removeHeader("User-Agent")
+                .addHeader("User-Agent",GetUtil.getUserAgent(con))
+                .build();
+        return request;
+    }
+
+    public static Request put(OkDate od, Context con){
+        MediaType  mediaType = MediaType.parse("application/json");
+        if(od.getMadiaType()!=null && od.getMadiaType().equals("")){
+            od.setMadiaType("{}");
+        }
+//        JSONObject jsonObject = JSON.parseObject(od.getMadiaType());
+//        jsonObject.put("timestamp", DateUtil.current());
+//        jsonObject.put("deviceId", GetUtil.getDeviceId(con));
+//        String sign = SecureUtil.signParamsSha1(jsonObject,SIGN_PASSWORD);
+//        Log.e("jsonObject",jsonObject.toString());
+//        Log.e("sign",sign);
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("data",SecurityUtil.encrypt(jsonObject.toString()));
+//        Log.e("参数1",od.getMadiaType());
+//        Log.e("参数2",MapUtil.mapJson(map));
+        //MapUtil.mapJson(map)
+        RequestBody body = RequestBody.create(mediaType,od.getMadiaType());
+        Headers.Builder hb=new Headers.Builder();
+        hb.add("Content-Type","application/json");
+        hb.add("Cache-Control","no-cache");
+        Request request = new Request.Builder()
+                .url(od.getUrl())
+                .put(body)
+                .headers(hb.build())
+                .addHeader("Version", VersionUtil.getVersion(con))
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 //.addHeader("sign",sign)
                 .removeHeader("User-Agent")
                 .addHeader("User-Agent",GetUtil.getUserAgent(con))
@@ -86,6 +122,7 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .get()
                 .headers(hb.build())
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .build();
         return request;
     }
@@ -99,6 +136,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();
@@ -129,6 +167,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;
@@ -145,23 +184,26 @@ 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;
     }
 
-    public static Request postFiles(OkDate od,File file,String token,String carId,String carNum) {
+    public static Request postFiles(OkDate od,File file,String token,String carId,String carNum,boolean isSave) {
         MediaType mediaType = MediaType.parse("text/plain");
         RequestBody body = new MultipartBody.Builder()
                 .setType(MultipartBody.FORM)
                 .addFormDataPart("file",file.getPath(),RequestBody.create(MediaType.parse("application/octet-stream"), file))
                 .addFormDataPart("carId",carId)
                 .addFormDataPart("carNum",carNum)
+                .addFormDataPart("isSave",isSave?"0":"1")
                 .build();
         Request request = new Request.Builder()
                 .url(od.getUrl())
                 .method("POST", body)
                 .addHeader("Authorization", token)
+                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .addHeader("Cookie", "JSESSIONID=NqpqKQstwceQurcNK5hjl4GnTgiF4eSzZSo5a1rz")
                 .build();
         return request;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/GetCarImageAlert.java

@@ -1,6 +1,11 @@
 package com.arpa.hndahesudintocctmsdriver.util.img;
 
+import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
+
 import android.Manifest;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
@@ -13,6 +18,7 @@ import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.arpa.hndahesudintocctmsdriver.R;
+import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
 import com.permissionx.guolindev.PermissionX;
 
@@ -56,12 +62,17 @@ public class GetCarImageAlert {
         }
         btn_xiangce.setOnClickListener(v -> {
             PermissionX.init(act)
-                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE)
+                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
                             PicturlUtil.selectPicter(act, new ArrayList<>(), 1);
                         } else {
-                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
+                            new MessageUtils().showSimCenPop(act, "缺少媒体和文件权限,将无法选择照片,去开启！", "取消", "确认", () -> {
+                                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                intent.setData(uri);
+                                act.startActivity(intent);
+                            });
                         }
                     });
         });
@@ -74,7 +85,12 @@ public class GetCarImageAlert {
 //                            file=ImageGetUtil.createImageFile(act);
 //                            ImageGetUtil.cameraAlbumGetImage(act,file);
                         } else {
-                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
+                            new MessageUtils().showSimCenPop(act, "缺少相机权限,将无法进行拍照或选择照片,去开启！", "取消", "确认", () -> {
+                                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                intent.setData(uri);
+                                act.startActivity(intent);
+                            });
                         }
                     });
         });
@@ -86,7 +102,12 @@ public class GetCarImageAlert {
                             if (allGranted) {
                                 openCam(act);
                             } else {
-                                Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
+                                new MessageUtils().showSimCenPop(act, "缺少相机权限,将无法进行拍照或选择照片,去开启！", "取消", "确认", () -> {
+                                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                    Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                    intent.setData(uri);
+                                    act.startActivity(intent);
+                                });
                             }
                         });
             }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/GetImageAlert.java

@@ -1,6 +1,11 @@
 package com.arpa.hndahesudintocctmsdriver.util.img;
 
+import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
+
 import android.Manifest;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
@@ -10,6 +15,7 @@ import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.permissionx.guolindev.PermissionX;
@@ -45,25 +51,37 @@ public class GetImageAlert {
 
         btn_xiangce.setOnClickListener(v -> {
             PermissionX.init(act)
-                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE)
+                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
                             PicturlUtil.selectPicter(act, new ArrayList<>(), 1);
                         } else {
-                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
+                            new MessageUtils().showSimCenPop(act, "缺少相机,媒体权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
+                                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                            Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                            intent.setData(uri);
+                                            act.startActivity(intent);
+                                        });
+//                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
                         }
                     });
         });
         btn_paizhao.setOnClickListener(v -> {
 
             PermissionX.init(act)
-                    .permissions(Manifest.permission.CAMERA)
+                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
                             file = ImageGetUtil.createImageFile(act);
                             ImageGetUtil.cameraAlbumGetImage(act, file);
                         } else {
-                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
+                            new MessageUtils().showSimCenPop(act, "缺少相机,媒体权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
+                                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                                            Uri uri = Uri.fromParts("package", getPackageName(), null);
+                                            intent.setData(uri);
+                                            act.startActivity(intent);
+                                        });
+//                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
                         }
                     });
         });

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/ImageGetUtil.java

@@ -9,6 +9,8 @@ import android.provider.MediaStore;
 
 import androidx.core.content.FileProvider;
 
+import com.dahe.mylibrary.utils.AppUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -39,7 +41,7 @@ public class ImageGetUtil {
             if(imageFile!=null){
                 if(Build.VERSION.SDK_INT>= Build.VERSION_CODES.N){
                     /*7.0以上要通过FileProvider将File转化为Uri*/
-                    uri = FileProvider.getUriForFile(act.getApplicationContext(),"com.arpa.hndahesudintocctmsdriver.fileprovider",imageFile);
+                    uri = FileProvider.getUriForFile(act.getApplicationContext(), AppUtils.getAppPackageName()+".fileprovider",imageFile);
                 }else {
                     /*7.0以下则直接使用Uri的fromFile方法将File转化为Uri*/
                     uri = Uri.fromFile(imageFile);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/location/LocationManagerUtil.java

@@ -0,0 +1,101 @@
+package com.arpa.hndahesudintocctmsdriver.util.location;
+
+import static com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil.RES;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.location.Address;
+import android.location.Criteria;
+import android.location.Geocoder;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Handler;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
+import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
+import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
+import com.google.gson.Gson;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * @ClassName LocationManagerUtil
+ * @Author john
+ * @Date 2024/7/25 15:21
+ * @Description LocationManager本地定位
+ */
+public class LocationManagerUtil {
+
+    public static LocationManagerUtil mInstance = null;
+
+    public static LocationManagerUtil getInstance() {
+        if (null == mInstance) {
+            synchronized (LocationManagerUtil.class) {
+                if (null == mInstance) {
+                    mInstance = new LocationManagerUtil();
+                }
+            }
+        }
+        return mInstance;
+    }
+
+    private LocationManagerUtil() {
+    }
+
+    public void getLocation(Context ctx, Handler hd) {
+        LocationManager locationManager = (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE);
+
+        //创建定位条件器
+        Criteria criteria = new Criteria();
+        //设置精度，Criteria.ACCURACY_FINE表示精确，Criteria.ACCURACY_COARSE表示粗略
+        criteria.setAccuracy(Criteria.ACCURACY_FINE);
+        //设置是否需要海拔信息
+        criteria.setAltitudeRequired(true);
+        //设置是否需要方位信息
+        criteria.setBearingRequired(true);
+        //设置是否允许运营商扣费
+        criteria.setCostAllowed(true);
+        //设置对电源的需求
+        criteria.setPowerRequirement(Criteria.POWER_LOW);
+
+        String bestProvider = locationManager.getBestProvider(criteria, true);
+        if (bestProvider != null) {
+            if (ActivityCompat.checkSelfPermission(ctx, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(ctx, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                ToastUtils.showToast(ctx, "请查看定位权限");
+                return;
+            }
+            locationManager.requestLocationUpdates(bestProvider, 300, 0, new LocationListener() {
+                @Override
+                public void onLocationChanged(@NonNull Location location) {
+                    try {
+                        Geocoder geocoder = new Geocoder(ctx, Locale.getDefault());
+                        List<Address> fromLocation = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
+                        if (fromLocation != null && !fromLocation.isEmpty()) {
+                            Address address = fromLocation.get(0);
+                            String addressLine = address.getAddressLine(0);
+                            String adminArea = address.getAdminArea();//省
+                            String locality = address.getLocality();//市
+                            String subLocality = address.getSubLocality();//县
+                            String featureName = address.getFeatureName();//详细地址
+                            CacheGroup.cacheList.put("getLocation", new Gson().toJson(address));
+                            MsgUtil.addHdMsgWat(hd, RES);
+                            locationManager.removeUpdates(this);
+                        }
+                    } catch (Exception e) {
+
+                    }
+
+                }
+            });
+        } else {
+            ToastUtils.showToast(ctx, "定位失败,请查看定位权限");
+        }
+
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/weight/OnLimitClickHelper.java

@@ -0,0 +1,38 @@
+package com.arpa.hndahesudintocctmsdriver.weight;
+
+import android.view.View;
+import android.widget.Toast;
+
+import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
+
+import java.util.Calendar;
+
+/**
+ * @ClassName OnLimitClickHelper
+ * @Author john
+ * @Date 2024/4/22 14:28
+ * @Description TODO
+ */
+public class OnLimitClickHelper implements View.OnClickListener {
+    public static final int LIMIT_TIME = 2000;
+    private long lastClickTime = 0;
+    private OnLimitClickListener onLimitClickListener = null;
+
+    public OnLimitClickHelper(OnLimitClickListener onLimitClickListener){
+        this.onLimitClickListener = onLimitClickListener;
+    }
+
+    @Override
+    public void onClick(View v) {
+        long curTime = Calendar.getInstance().getTimeInMillis();
+        if (curTime - lastClickTime > LIMIT_TIME) {
+            lastClickTime = curTime;
+            if(onLimitClickListener != null){
+                onLimitClickListener.onClick(v);
+            }
+        }else{
+            ToastUtils.showToast(v.getContext(),"点击速度过快,请稍后重试");
+        }
+    }
+}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/weight/OnLimitClickListener.java

@@ -0,0 +1,17 @@
+package com.arpa.hndahesudintocctmsdriver.weight;
+
+import android.view.View;
+
+/**
+ * @ClassName OnLimitClickListener
+ * @Author john
+ * @Date 2024/4/22 14:28
+ * @Description TODO
+ */
+public interface OnLimitClickListener {
+    /**
+     * 按钮点击事件
+     * @param view
+     */
+    void onClick(View view);
+}

app/src/main/res/drawable/bg_round2.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="@dimen/dp_10"/>
+    <solid android:color="#fff"/>
+</shape>

app/src/main/res/drawable/select_eye.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_eye_open" android:state_checked="true"></item>
+    <item android:drawable="@drawable/icon_eye_close" android:state_checked="false"></item>
+    <item android:drawable="@drawable/icon_eye_close"></item>
+</selector>

app/src/main/res/drawable/select_read.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/read_select" android:state_checked="true"></item>
+    <item android:drawable="@drawable/read_nor" android:state_checked="false"></item>
+    <item android:drawable="@drawable/read_nor"></item>
+</selector>

app/src/main/res/drawable/shape_red_bg14.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/red" />
+    <corners
+        android:radius="@dimen/dp_14" />
+</shape>

app/src/main/res/layout/activity_auth_qualification.xml

@@ -163,20 +163,20 @@
                     android:textColor="#ffc4c4ce"
                     android:textSize="@dimen/sp_13"
                     />
+
                 <TextView
                     android:id="@+id/value2"
-                    android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="#ff999999"
+                    android:layout_alignParentRight="true"
-                    android:textSize="@dimen/sp_13"
-                    android:maxLines="1"
-                    android:hint="点击进行手动输入"
-                    android:ellipsize="end"
-                    android:gravity="right"
                     android:layout_marginLeft="@dimen/dp_30"
                     android:background="@null"
-                    />
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:hint="点击进行手动输入"
+                    android:maxLines="1"
+                    android:textColor="#ff999999"
+                    android:textSize="@dimen/sp_13" />
             </RelativeLayout>
         </LinearLayout>
         <TextView

app/src/main/res/layout/activity_bank_auth.xml

@@ -5,34 +5,50 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_theme"
     android:id="@+id/activity_bank_auth">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
+
         <RelativeLayout
-            android:layout_marginTop="@dimen/dp_58"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_58">
+
             <ImageView
                 android:id="@+id/return_btn"
-                android:layout_marginLeft="@dimen/dp_20"
                 android:layout_width="@dimen/dp_40"
                 android:layout_height="@dimen/dp_31"
-                android:src="@mipmap/return_lefts"
+                android:layout_marginLeft="@dimen/dp_20"
                 android:padding="@dimen/dp_10"
-                android:scaleType="fitXY"/>
+                android:scaleType="fitXY"
-            <TextView
+                android:src="@mipmap/return_lefts" />
-                android:layout_marginTop="@dimen/dp_10"
+
-                android:id="@+id/submit"
+<!--            <TextView-->
-                android:layout_marginRight="@dimen/dp_30"
+<!--                android:id="@+id/skip"-->
-                android:layout_alignParentRight="true"
+<!--                android:layout_width="wrap_content"-->
-                android:layout_width="wrap_content"
+<!--                android:layout_height="wrap_content"-->
-                android:layout_height="wrap_content"
+<!--                android:layout_marginTop="@dimen/dp_10"-->
-                android:text="提交"
+<!--                android:layout_marginRight="@dimen/dp_30"-->
-                android:textColor="@color/theme_color"
+<!--                android:layout_toLeftOf="@+id/submit"-->
-                android:textSize="@dimen/sp_15"
+<!--                android:text="跳过"-->
-                />
+<!--                android:textColor="@color/theme_color"-->
+<!--                android:textSize="@dimen/sp_15"-->
+<!--                android:visibility="gone" />-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/submit"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_alignParentRight="true"-->
+<!--                android:layout_marginTop="@dimen/dp_10"-->
+<!--                android:layout_marginRight="@dimen/dp_30"-->
+<!--                android:text="提交"-->
+<!--                android:textColor="@color/theme_color"-->
+<!--                android:textSize="@dimen/sp_15" />-->
         </RelativeLayout>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,47 +57,52 @@
             android:text="银行卡信息"
             android:textColor="#ff000000"
             android:textSize="@dimen/sp_23" />
+
         <TextView
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_20"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/red"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_20"
             android:text="*注意: 请添加本人银行卡, 否则无法提现成功"
-            ></TextView>
+            android:textColor="@color/red"></TextView>
 
         <androidx.cardview.widget.CardView
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginRight="@dimen/dp_38"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_163"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginRight="@dimen/dp_38"
             app:cardCornerRadius="@dimen/dp_10">
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
+
                 <ImageView
-                    android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true"
                     android:id="@+id/up_bank_img"
-                    android:src="@mipmap/bank_img"
                     android:layout_width="@dimen/dp_249"
                     android:layout_height="@dimen/dp_138"
-                    android:scaleType="fitXY"/>
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/bank_img" />
+
                 <TextView
-                    android:layout_marginBottom="@dimen/dp_21"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="点击上传银行卡正面照"
+                    android:layout_alignParentBottom="true"
                     android:layout_centerHorizontal="true"
-                    android:layout_alignParentBottom="true"/>
+                    android:layout_marginBottom="@dimen/dp_21"
+                    android:text="点击上传银行卡正面照" />
             </RelativeLayout>
         </androidx.cardview.widget.CardView>
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_15"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_15"
             android:orientation="horizontal">
+
             <TextView
                 android:id="@+id/zj_name2"
                 android:layout_width="wrap_content"
@@ -92,85 +113,122 @@
                 android:textColor="#ffc4c4ce"
                 android:textSize="@dimen/sp_13" />
         </LinearLayout>
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_13"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginRight="@dimen/dp_38"
-            android:padding="@dimen/dp_14"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_13"
+            android:layout_marginRight="@dimen/dp_38"
             android:background="@drawable/bg_bai"
-            android:elevation="@dimen/dp_1">
+            android:elevation="@dimen/dp_1"
-            <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
+            android:orientation="vertical"
-                android:id="@+id/brv"
+            android:padding="@dimen/dp_14">
-                android:layout_width="match_parent"
+
-                android:layout_height="wrap_content"/>
+<!--            <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView-->
+<!--                android:id="@+id/brv"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content" />-->
+
             <LinearLayout
-                android:layout_marginBottom="@dimen/dp_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_10"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="银行名称"
-                    android:textColor="#ffc4c4ce"
-                    android:textSize="@dimen/sp_13"
-                    />
-                <EditText
                     android:paddingTop="@dimen/dp_10"
                     android:paddingBottom="@dimen/dp_10"
+                    android:text="银行名称"
+                    android:textColor="#ffc4c4ce"
+                    android:textSize="@dimen/sp_13" />
+
+                <EditText
                     android:id="@+id/bank_name"
-                    android:layout_alignParentRight="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="#ff000000"
+                    android:layout_alignParentRight="true"
-                    android:textSize="@dimen/sp_13"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:inputType="text"
                     android:layout_marginLeft="@dimen/dp_30"
                     android:background="@null"
-                    />
+                    android:ellipsize="end"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/dp_10"
+                    android:textColor="#ff000000"
+                    android:textSize="@dimen/sp_13" />
             </LinearLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_1"
-                android:background="@drawable/bottom_xu"/>
+                android:background="@drawable/bottom_xu" />
+
             <LinearLayout
-                android:layout_marginTop="@dimen/dp_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="银行卡号"
-                    android:textColor="#ffc4c4ce"
-                    android:textSize="@dimen/sp_13"
-                    />
-                <EditText
                     android:paddingTop="@dimen/dp_10"
                     android:paddingBottom="@dimen/dp_10"
+                    android:text="银行卡号"
+                    android:textColor="#ffc4c4ce"
+                    android:textSize="@dimen/sp_13" />
+
+                <EditText
                     android:id="@+id/bank_number"
-                    android:layout_alignParentRight="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="#ff000000"
+                    android:layout_alignParentRight="true"
-                    android:textSize="@dimen/sp_13"
-                    android:inputType="number"
-                    android:maxLines="1"
-                    android:ellipsize="end"
                     android:layout_marginLeft="@dimen/dp_30"
                     android:background="@null"
-                    />
+                    android:ellipsize="end"
+                    android:inputType="number"
+                    android:maxLines="1"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/dp_10"
+                    android:textColor="#ff000000"
+                    android:textSize="@dimen/sp_13" />
             </LinearLayout>
+
+
         </LinearLayout>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            />
+
+        <Button
+            android:id="@+id/skip"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_42"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginRight="@dimen/dp_38"
+            android:background="@drawable/bg_btn_grey"
+            android:text="跳过"
+            android:textColor="#fff"
+            android:textSize="@dimen/sp_15" />
+
+        <Button
+            android:id="@+id/submit"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_42"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_22"
+            android:layout_marginRight="@dimen/dp_38"
+            android:layout_marginBottom="@dimen/dp_50"
+            android:background="@drawable/bg_btn_green"
+            android:text="下一步"
+            android:textColor="#fff"
+            android:textSize="@dimen/sp_15" />
     </LinearLayout>
 
 </RelativeLayout>

app/src/main/res/layout/activity_che_data.xml

@@ -382,5 +382,38 @@
                 />
         </LinearLayout>
 
+        <RelativeLayout
+            android:id="@+id/r8"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginBottom="@dimen/dp_20"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="交强险保单"
+                    android:textColor="#ff000000"
+                    android:textSize="@dimen/sp_15"
+                    />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="@dimen/dp_6"
+                android:layout_height="@dimen/dp_10"
+                android:src="@mipmap/chevron"
+                android:scaleType="fitXY"
+                android:background="@null"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_2"
+            android:background="#F6F6F9"/>
+
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/activity_login.xml

@@ -47,6 +47,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="请输入手机号码"
+        android:inputType="phone"
         android:textColor="#ff000000"
         android:textSize="@dimen/sp_14"
         android:maxLength="11"
@@ -65,6 +66,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <EditText
+            android:inputType="number"
             android:id="@+id/input_code"
             android:paddingTop="@dimen/dp_12"
             android:paddingBottom="@dimen/dp_12"
@@ -104,35 +106,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <androidx.cardview.widget.CardView
+
-            android:padding="@dimen/dp_7"
+        <CheckBox
-            android:layout_marginTop="@dimen/dp_2"
+            android:layout_marginTop="@dimen/dp_3"
-            android:layout_width="@dimen/dp_14"
+            android:id="@+id/cb"
-            android:layout_height="@dimen/dp_14"
+            android:layout_width="@dimen/dp_28"
-            app:cardCornerRadius="@dimen/dp_7"
+            android:layout_height="@dimen/dp_34"
-            app:cardBackgroundColor="@color/theme_color"
+            android:button="@null"
-            app:cardElevation="@dimen/dp_0">
+            android:checked="false"
-        <androidx.cardview.widget.CardView
+            android:drawableStart="@drawable/select_read"/>
-            android:padding="@dimen/dp_7"
-            android:id="@+id/no_btn"
-            android:layout_width="@dimen/dp_12"
-            android:layout_height="@dimen/dp_12"
-            app:cardCornerRadius="@dimen/dp_6"
-            app:cardBackgroundColor="#fff"
-            android:layout_gravity="center"
-            app:cardElevation="@dimen/dp_0">
-        </androidx.cardview.widget.CardView>
-            <ImageButton
-                android:id="@+id/agree_btn"
-                android:layout_width="@dimen/dp_14"
-                android:layout_height="@dimen/dp_14"
-                android:src="@mipmap/choice"
-                android:scaleType="fitXY"
-                android:background="#fff"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                />
-        </androidx.cardview.widget.CardView>
         <TextView
             android:id="@+id/tv_content"
             android:layout_width="wrap_content"

app/src/main/res/layout/activity_photo_car.xml

@@ -81,7 +81,7 @@
                         android:id="@+id/zjimg_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_19"
+                        android:layout_marginTop="@dimen/dp_16"
                         android:text="从业资格证照片"
                         android:textColor="#ff333333"
                         android:textSize="@dimen/sp_15" />
@@ -91,7 +91,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentBottom="true"
-                        android:layout_marginBottom="@dimen/dp_19"
+                        android:layout_marginBottom="@dimen/dp_16"
                         android:text="点击上传图片"
                         android:textColor="@color/theme_color"
                         android:textSize="@dimen/sp_15" />
@@ -100,7 +100,7 @@
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
-            android:visibility="gone"
+
             android:id="@+id/llInfo"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -137,6 +137,8 @@
                 android:orientation="vertical"
                 android:padding="@dimen/dp_14">
 
+
+
                 <RelativeLayout
                     android:id="@+id/cow1"
 
@@ -162,10 +164,55 @@
                         android:gravity="right"
                         android:hint="点击进行手动输入"
                         android:maxLines="1"
+                        android:singleLine="true"
                         android:textColor="#ff999999"
                         android:textSize="@dimen/sp_13" />
                 </RelativeLayout>
 
+                <LinearLayout
+                    android:id="@+id/llDate"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    >
+                    <View
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:background="@drawable/bottom_xu"/>
+                    <RelativeLayout
+                        android:id="@+id/rlDate"
+                        android:layout_marginTop="@dimen/dp_10"
+
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <TextView
+                            android:id="@+id/name2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="截止日期"
+                            android:textColor="#ffc4c4ce"
+                            android:textSize="@dimen/sp_13"
+                            />
+                        <TextView
+                            android:layout_toRightOf="@+id/name2"
+                            android:id="@+id/value2"
+                            android:layout_alignParentRight="true"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textColor="#ff999999"
+                            android:textSize="@dimen/sp_13"
+                            android:maxLines="1"
+                            android:hint="请选择截止日期"
+                            android:gravity="right"
+                            android:ellipsize="end"
+                            android:layout_marginLeft="@dimen/dp_10"
+                            />
+                    </RelativeLayout>
+
+                </LinearLayout>
+
             </LinearLayout>
         </LinearLayout>
 

app/src/main/res/layout/huoyuan_xq.xml

@@ -1,47 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/huoyuan_xq"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="#fff"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    android:id="@+id/huoyuan_xq"
+
-    android:background="#fff">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/theme_color"
         android:orientation="vertical">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_20">
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_68">
+
                 <ImageButton
-                    android:layout_marginLeft="@dimen/dp_38"
                     android:id="@+id/return_btn"
                     android:layout_width="@dimen/dp_21"
                     android:layout_height="@dimen/dp_18"
+                    android:layout_marginLeft="@dimen/dp_38"
                     android:background="@null"
                     android:scaleType="fitXY"
                     android:src="@mipmap/return_btn" />
+
                 <ImageButton
-                    android:layout_marginRight="@dimen/dp_38"
                     android:layout_width="@dimen/dp_18"
                     android:layout_height="@dimen/dp_18"
-                    android:src="@mipmap/share2"
                     android:layout_alignParentRight="true"
-                    android:scaleType="fitXY"
+                    android:layout_marginRight="@dimen/dp_38"
                     android:background="@null"
-                    android:visibility="gone"/>
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/share2"
+                    android:visibility="gone" />
             </RelativeLayout>
+
             <RelativeLayout
-                android:layout_marginTop="@dimen/dp_8"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_8">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -49,73 +56,102 @@
                     android:text="货源详情"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_23" />
+
                 <TextView
-                    android:layout_marginTop="@dimen/dp_11"
-                    android:layout_marginRight="@dimen/dp_37"
-                    android:layout_alignParentRight="true"
                     android:id="@+id/huozhu"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="@dimen/dp_11"
+                    android:layout_marginRight="@dimen/dp_37"
                     android:text="联系货主"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_13" />
+
                 <TextView
-                    android:layout_marginTop="@dimen/dp_11"
-                    android:layout_marginRight="@dimen/dp_37"
-                    android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="@dimen/dp_11"
+                    android:layout_marginRight="@dimen/dp_37"
                     android:text="拒绝"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_15"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
             </RelativeLayout>
+
             <LinearLayout
-                android:layout_marginTop="@dimen/dp_38"
-                android:layout_marginLeft="@dimen/dp_38"
-                android:layout_marginRight="@dimen/dp_38"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_38"
+                android:layout_marginTop="@dimen/dp_38"
+                android:layout_marginRight="@dimen/dp_38"
                 android:orientation="vertical">
 
+                <LinearLayout
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/totalFreight"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="****"
+                        android:textColor="#ffffffff"
+                        android:textSize="@dimen/sp_40" />
+
+                    <CheckBox
+                        android:id="@+id/cb"
+                        android:layout_width="@dimen/dp_30"
+                        android:layout_height="@dimen/dp_30"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_3"
+                        android:button="@null"
+                        android:checked="false"
+                        android:drawableStart="@drawable/select_eye"
+                        android:gravity="center">
+
+                    </CheckBox>
+
+
+                </LinearLayout>
+
                 <TextView
-                    android:id="@+id/totalFreight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="0000"
-                    android:textColor="#ffffffff"
-                    android:textSize="@dimen/sp_40" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                     android:text="净赚运费(元)"
                     android:textColor="#ffffffff"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_13" />
-                    android:layout_gravity="center"
+
-                    />
                 <View
-                    android:layout_marginTop="@dimen/dp_16"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF"/>
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:background="#EFEFEF" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
+
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
                         android:layout_weight="1">
+
                         <TextView
-                            android:layout_marginLeft="@dimen/dp_5"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="@dimen/dp_5"
                             android:text="预估里程(km)"
                             android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12"
+                            android:textSize="@dimen/sp_12" />
-                            android:layout_centerVertical="true"
-                            />
 
                         <TextView
                             android:id="@+id/distance"
@@ -128,10 +164,12 @@
                             android:textColor="#ffffffff"
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
+
                     <View
                         android:layout_width="@dimen/dp_1"
                         android:layout_height="wrap_content"
-                        android:background="#EFEFEF"/>
+                        android:background="#EFEFEF" />
+
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -158,14 +196,17 @@
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
                 </LinearLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF"/>
+                    android:background="#EFEFEF" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
+
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -191,10 +232,12 @@
                             android:textColor="#ffffffff"
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
+
                     <View
                         android:layout_width="@dimen/dp_1"
                         android:layout_height="wrap_content"
-                        android:background="#EFEFEF"/>
+                        android:background="#EFEFEF" />
+
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -224,59 +267,67 @@
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
                 </LinearLayout>
+
                 <View
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_1"
+                    android:layout_height="@dimen/dp_1"
-                android:background="#EFEFEF"/>
+                    android:background="#EFEFEF" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_5"
-                            android:text="运输要求:"
-                            android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12"
-                            android:layout_gravity="center"/>
 
-                        <TextView
+                    <TextView
-                            android:layout_marginLeft="@dimen/dp_7"
+                        android:layout_width="wrap_content"
-                            android:id="@+id/requirement"
+                        android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
+                        android:layout_centerVertical="true"
-                            android:layout_height="wrap_content"
+                        android:layout_gravity="center"
-                            android:layout_marginRight="@dimen/dp_5"
+                        android:layout_marginLeft="@dimen/dp_5"
-                            android:text=""
+                        android:text="运输要求:"
-                            android:textColor="#ffffffff"
+                        android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12"
+                        android:textSize="@dimen/sp_12" />
-                            android:layout_gravity="center"/>
+
+                    <TextView
+                        android:id="@+id/requirement"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/dp_7"
+                        android:layout_marginRight="@dimen/dp_5"
+                        android:text=""
+                        android:textColor="#ffffffff"
+                        android:textSize="@dimen/sp_12" />
                 </LinearLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF"/>
+                    android:background="#EFEFEF" />
             </LinearLayout>
+        </LinearLayout>
     </LinearLayout>
-    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:background="@drawable/bg_bai"
-        android:background="@drawable/bg_bai">
+        android:orientation="vertical">
+
         <LinearLayout
-            android:layout_marginLeft="@dimen/dp_39"
-            android:layout_marginTop="@dimen/dp_17"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_39"
+            android:layout_marginTop="@dimen/dp_17"
             android:orientation="horizontal">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="货源单号:"
                 android:textColor="#333333"
                 android:textSize="@dimen/sp_13" />
+
             <TextView
                 android:id="@+id/orderNum"
                 android:layout_width="wrap_content"
@@ -285,42 +336,48 @@
                 android:textColor="#333333"
                 android:textSize="@dimen/sp_13" />
         </LinearLayout>
+
         <androidx.cardview.widget.CardView
-            android:layout_marginLeft="@dimen/dp_15"
-            android:layout_marginRight="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_15"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardCornerRadius="@dimen/dp_14"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_15"
+            android:layout_marginRight="@dimen/dp_15"
             app:cardBackgroundColor="#fff"
+            app:cardCornerRadius="@dimen/dp_14"
             app:cardElevation="@dimen/dp_0">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
+
                 <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
                     android:id="@+id/zhuang_rv1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
+
                 <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
                     android:id="@+id/zhuang_rv2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
         </androidx.cardview.widget.CardView>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_17">
+
             <TextView
                 android:id="@+id/car"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_marginLeft="@dimen/dp_39"
                 android:text="选择车辆"
                 android:textColor="#ff000000"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/sp_13" />
-                android:layout_centerVertical="true"/>
 
             <ImageButton
                 android:id="@+id/xuanze"
@@ -328,8 +385,8 @@
                 android:layout_height="@dimen/dp_29"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="@dimen/dp_38"
-                android:padding="@dimen/dp_5"
                 android:background="@null"
+                android:padding="@dimen/dp_5"
                 android:scaleType="fitXY"
                 android:src="@mipmap/add1" />
         </RelativeLayout>
@@ -346,39 +403,37 @@
                 android:layout_height="@dimen/dp_25"
                 android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_38"
-                android:padding="@dimen/dp_5"
                 android:background="@null"
+                android:padding="@dimen/dp_5"
                 android:scaleType="fitXY"
                 android:src="@mipmap/no_xuan" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_7"
                 android:text="同意并签署"
                 android:textColor="#000000"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/sp_13" />
-                android:layout_gravity="center"/>
 
             <TextView
                 android:id="@+id/check_contract"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:text="《运输合同》"
                 android:textColor="@color/theme_color_news"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/sp_13" />
-                android:layout_gravity="center"/>
 
         </LinearLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_7"
+            android:layout_marginTop="@dimen/dp_7">
-            >
 
             <ImageButton
-                android:visibility="invisible"
                 android:id="@+id/btnFp"
                 android:layout_width="@dimen/dp_25"
                 android:layout_height="@dimen/dp_25"
@@ -387,38 +442,39 @@
                 android:background="@null"
                 android:padding="@dimen/dp_5"
                 android:scaleType="fitXY"
-                android:src="@mipmap/no_xuan" />
+                android:src="@mipmap/no_xuan"
+                android:visibility="invisible" />
 
             <TextView
-                android:layout_toRightOf="@+id/btnFp"
                 android:id="@+id/tvZzs"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_7"
+                android:layout_toRightOf="@+id/btnFp"
                 android:text="同意在符合相关税务机关要求的情况下代开增值税发票"
                 android:textColor="#000000"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/sp_13" />
-                android:layout_gravity="center"/>
 
             <TextView
-                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:text="增值税发票"
                 android:textColor="@color/red"
                 android:textSize="@dimen/sp_13"
-                android:layout_gravity="center"/>
+                android:visibility="gone" />
 
         </RelativeLayout>
 
         <Button
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginRight="@dimen/dp_38"
             android:id="@+id/confirm_btn"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_38"
             android:layout_gravity="center"
+            android:layout_marginLeft="@dimen/dp_38"
             android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginRight="@dimen/dp_38"
             android:layout_marginBottom="@dimen/dp_60"
             android:background="@drawable/bg_btn"
             android:text="确认接单"

app/src/main/res/layout/item_home.xml

@@ -168,6 +168,114 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dp_12" />
     </LinearLayout>
+
+
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/llCurWay"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_140"
+        android:layout_marginLeft="@dimen/dp_5"
+        android:layout_marginRight="@dimen/dp_5"
+        android:background="@drawable/bg_huoyuan">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_25"
+            android:layout_marginRight="@dimen/dp_25"
+            android:layout_marginBottom="@dimen/dp_22">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="运输中订单:"
+                        android:textColor="#ff333333"
+                        android:textSize="@dimen/sp_16" />
+
+                    <TextView
+                        android:id="@+id/tvWaybill"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="1321561432123156"
+                        android:textColor="#ff333333"
+                        android:textSize="@dimen/sp_16" />
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_6">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:id="@+id/ivType"
+                                android:layout_width="@dimen/dp_20"
+                                android:layout_height="@dimen/dp_20"
+                                android:layout_gravity="center"
+                                android:scaleType="fitXY"
+                                android:background="@mipmap/zhuang" />
+
+                            <TextView
+                                android:id="@+id/loadingAddress"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_marginLeft="@dimen/dp_5"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:text="郑州市市委党校郑州市市委党校郑州市市委党校郑州市市委党校"
+                                android:textColor="#ff333333"
+                                android:textSize="@dimen/sp_15" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+
+                    <TextView
+                        android:id="@+id/tvGo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_28"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentBottom="true"
+                        android:background="@drawable/shape_red_bg14"
+                        android:paddingLeft="@dimen/dp_14"
+                        android:paddingRight="@dimen/dp_14"
+                        android:text="去装货"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/sp_13" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+
     <!-- <LinearLayout
          android:layout_marginTop="@dimen/dp_4"
          android:layout_width="match_parent"

app/src/main/res/layout/item_huoyuan.xml

@@ -99,7 +99,7 @@
 
                         <TextView
                             android:id="@+id/loadingAddress"
-                            android:layout_width="@dimen/dp_120"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
@@ -125,7 +125,7 @@
 
                         <TextView
                             android:id="@+id/receiverAddress"
-                            android:layout_width="@dimen/dp_120"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
@@ -140,6 +140,7 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:visibility="gone"
                     android:layout_marginRight="@dimen/dp_10"
                     android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"

app/src/main/res/layout/item_huoyuan_deal.xml

@@ -123,6 +123,7 @@
                     </LinearLayout>
                 </LinearLayout>
                 <LinearLayout
+                    android:visibility="gone"
                     android:layout_marginRight="@dimen/dp_10"
                     android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"

app/src/main/res/layout/item_yundan_yunxing.xml

@@ -52,6 +52,7 @@
                         />
                 </LinearLayout>
                 <LinearLayout
+                    android:id="@+id/llMoney"
                     android:layout_marginTop="@dimen/dp_5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

app/src/main/res/layout/popup_qq_msg.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:background="@drawable/bg_round2"
+    android:layout_marginLeft="@dimen/dp_16"
+    android:layout_marginRight="@dimen/dp_16"
+    android:padding="20dp"
+    android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/tvTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="提示"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16"
+        android:textStyle="bold"
+        />
+    <TextView
+        android:id="@+id/tvMessage"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_14"
+        android:text=""
+        android:layout_marginTop="@dimen/dp_4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>

app/src/main/res/layout/qianbao_tixian.xml

@@ -103,6 +103,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_30"
@@ -131,6 +132,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_30"

app/src/main/res/layout/setup.xml

@@ -146,6 +146,35 @@
                         android:src="@mipmap/chevron" />
                 </RelativeLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_2"
+                    android:background="#F6F6F9" />
+
+                <RelativeLayout
+                    android:id="@+id/r8"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/dp_20"
+                    android:paddingBottom="@dimen/dp_20">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="交易规则"
+                        android:textColor="#ff000000"
+                        android:textSize="@dimen/sp_15" />
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_4"
+                        android:layout_height="@dimen/dp_8"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@null"
+                        android:scaleType="fitXY"
+                        android:src="@mipmap/chevron" />
+                </RelativeLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_2"
@@ -275,11 +304,19 @@
                         android:scaleType="fitXY"
                         android:src="@mipmap/chevron" />
                 </RelativeLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_2"
                     android:background="#F6F6F9" />
+                <TextView
+                    android:layout_marginTop="@dimen/dp_20"
+                    android:gravity="center"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="ICP备案号:豫ICP备09025418号-24A"
+                    />
+
+
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>

app/src/test/java/com/arpa/hndahesudintocctmsdriver/ExampleUnitTest.kt

@@ -1,14 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver
-
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-    }
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Jul 12 10:16:49 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

mylibrary/build.gradle

@@ -79,6 +79,8 @@ dependencies {
     api rootProject.ext.dependencies["Search"]
     api 'com.gyf.cactus:cactus:1.1.3-beta13'
 
+    api 'com.github.gcacace:signature-pad:1.3.1'
+
     //友盟基础库（必须）
 //    api 'com.umeng.umsdk:common:9.4.4'
 //    api 'com.umeng.umsdk:asms:1.4.1'

mylibrary/src/main/java/com/dahe/mylibrary/utils/PatternUtils.java

@@ -1,5 +1,6 @@
 package com.dahe.mylibrary.utils;
 
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class PatternUtils {
@@ -25,4 +26,13 @@ public class PatternUtils {
     public static boolean isLetter(String password){
         return Pattern.matches(REGEX_WORD, password);
     }
+
+    public static String getNumByStr(String str){
+        Pattern compile = Pattern.compile("\\d+");
+        Matcher matcher = compile.matcher(str);
+        while (matcher.find()) {
+            return matcher.group();
+        }
+        return "";
+    }
 }

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();