定位数据本地化保存

app/build.gradle

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

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <!-- 录音 -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <!--播音-->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -268,7 +269,8 @@
             android:value="${GAODEKEY}" />
 <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
-        <service android:name="com.amap.api.location.APSService"></service>
+        <service android:name="com.amap.api.location.APSService"
+            android:foregroundServiceType="location"></service>
 
         <!--百度地图-->
         <meta-data
@@ -380,27 +382,6 @@
             </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)) {
@@ -78,29 +78,30 @@ public class App extends Application {
             }
         }
 
-//        PendingIntent pendingIntent =
+        PendingIntent pendingIntent =
-//                PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
-//        Cactus.getInstance()
+        Cactus.getInstance()
-//                .isDebug(true)
+                .isDebug(true)
-//                //可选，设置通知栏点击事件
+                //可选，设置通知栏点击事件
-//                .setPendingIntent(pendingIntent)
+                .setPendingIntent(pendingIntent)
-////                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
+                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
-////                .setMusicId(R.raw.main) //可选，设置音乐
+                .setMusicId(R.raw.main) //可选，设置音乐
-////                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
+//                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
-////                .addCallback(new CactusCallback())//可选，运行时回调
+//                .addCallback(new CactusCallback())//可选，运行时回调
-//                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                .setTitle("大河好运")
+                .setTitle("大河好运")
-//                .setSmallIcon(R.drawable.diver_logo)
+                .setContent("大河好运司机端为您提供服务")
-//                .addBackgroundCallback(new CactusBackgroundCallback() {
+                .setSmallIcon(R.drawable.diver_logo)
-//                    @Override
+                .addBackgroundCallback(new CactusBackgroundCallback() {
-//                    public void onBackground(boolean b) {
+                    @Override
-//                        if (b){
+                    public void onBackground(boolean b) {
-//                            getBillLocation();
+                        if (b){
-//                        }
+                            getBillLocation();
-//                    }
+                        }
-//                })
+                    }
-//                .register(this);
+                })
+                .register(this);
     }
 
     public static App getApp() {

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

@@ -3,7 +3,6 @@ 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;
@@ -41,12 +40,10 @@ 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;
@@ -76,38 +73,25 @@ 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 {
@@ -116,10 +100,6 @@ public class H5Activity extends AppCompatActivity {
         });
 
         close.setOnClickListener(v -> {
-            if (isOk){
-                ActivityUtils.finishToActivity(MainActivity.class,false);
-                return;
-            }
             if (mWebView.canGoBack()) {
                 mWebView.goBack();
             } else {
@@ -134,9 +114,6 @@ 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);
@@ -203,7 +180,6 @@ 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) {
@@ -249,17 +225,6 @@ 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")) {
@@ -296,12 +261,6 @@ 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();
@@ -319,12 +278,6 @@ 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

@@ -1,485 +0,0 @@
-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

@@ -1,157 +0,0 @@
-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/CarInfoBean2.java

@@ -1,386 +0,0 @@
-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,15 +57,12 @@ 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;//身份证认证状态；-1未提交 0待认证 1认证通过 2认证失败
+        private int idCardStatus;
         private int driverLicenseStatus;
         private int qualificationCertificateStatus;
         private String idCardReason;
@@ -144,30 +141,6 @@ 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/DriverUpBean.java

@@ -1,328 +0,0 @@
-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,33 +55,6 @@ 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,33 +60,6 @@ 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,51 +63,6 @@ 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,42 +58,6 @@ 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,70 +68,6 @@ 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

@@ -1,200 +0,0 @@
-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

@@ -1,177 +0,0 @@
-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

@@ -71,114 +71,6 @@ 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;

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

@@ -63,96 +63,6 @@ public class OCRVehicleLicenseBean {
         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;

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

@@ -1,56 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,7 +6,6 @@ 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
 
 
 /**
@@ -18,14 +17,10 @@ import org.bouncycastle.jcajce.provider.symmetric.Rijndael
 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,titleLeft:String = "取消",titleRight: String = "去注册") : this(context) {
+    constructor(context: Context, message: String) : this(context) {
         content = message
-        this.titleReft = titleRight
-        this.titleLeft = titleLeft
     }
 
 
@@ -33,8 +28,6 @@ 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

@@ -1,36 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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/WalletEvent.java

@@ -1,22 +0,0 @@
-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,7 +13,6 @@ 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;
@@ -43,10 +42,6 @@ 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,7 +3,6 @@ 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;
@@ -79,9 +78,6 @@ 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()));
@@ -147,9 +143,6 @@ 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()));
@@ -183,9 +176,6 @@ 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()));
@@ -218,9 +208,6 @@ 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,7 +4,6 @@ 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;
@@ -75,22 +74,6 @@ 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 + "\"}";
@@ -169,7 +152,6 @@ 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,6 +1,5 @@
 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;
@@ -73,17 +72,6 @@ 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<>();
@@ -91,13 +79,6 @@ 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);
@@ -161,32 +142,6 @@ 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,132 +3,65 @@ 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, boolean isSave) {
+    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, isSave);
+        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){
-    public void OCRVehicleLicenseZj(Context con, Handler hd, String imgUrl) {
+        Request re = OkHttpUtil.postFile(new OkDate(RequestConstant.getPlateLicense2()),getToken(con),file);
-        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getVehicleLicense() + "?faceDataUrl=" + imgUrl, ""), getToken(con), con);
+        RequestUtil.start(12, "carNum",re,con,hd);
-        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/grabDriverOrdersContructV2";
+    private static final String AGREE_ORDER = "/app/driver/waybill/grabDriverOrdersContruct";
     //获取正在执行的运单/运单详情
     private static final String GET_START_ORDER = "/app/driver/waybill/getExecuteWaybill";
     //查看承运合同
@@ -81,8 +81,6 @@ 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";
     //车辆详情
@@ -100,21 +98,17 @@ 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";
     //身份证认证信息
@@ -130,7 +124,6 @@ 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";
     //车辆等级证书
@@ -169,16 +162,11 @@ 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;
     }
@@ -338,14 +326,6 @@ 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;
     }

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

@@ -10,7 +10,6 @@ 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;
@@ -119,14 +118,6 @@ 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";
@@ -163,7 +154,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) {
@@ -178,8 +169,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);
     }
@@ -230,18 +221,7 @@ 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,123 +16,8 @@ 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

@@ -62,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

@@ -3,12 +3,15 @@ package com.arpa.hndahesudintocctmsdriver.service;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.IBinder;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.amap.api.location.AMapLocation;
+import com.arpa.hndahesudintocctmsdriver.util.FileIOUtils;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
@@ -18,8 +21,13 @@ import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Filter;
 
 /**
  * @author hlh
@@ -30,28 +38,51 @@ 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;
-    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");
                 }
                 break;
             case LocationGDUtil.RES:
-                genzong();
+                if(CacheGroup.cacheList.get("getLocation")!=null){
+                    AMapLocation location = gson.fromJson(CacheGroup.cacheList.get("getLocation"), AMapLocation.class);
+                    String time2  = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+                    String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+                    //                    当前时间:${time2},经纬度:${it.latitude}:${it.longitude}
+                    FileIOUtils.writeFileFromString(
+                            Environment.getExternalStorageDirectory()
+                                    .toString() + "/crashinfo/" + "crash-"+time+".txt",
+                            "当前时间:"+time2+",经纬度:"+location.getLatitude()+":"+location.getLongitude(),
+                            true
+                    );
+//                    genzong(location);
+                    CacheGroup.cacheList.remove("getLocation");
+                }
+                break;
+            case 16:
+                String time2  = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+                String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+                FileIOUtils.writeFileFromString(
+                        Environment.getExternalStorageDirectory()
+                                .toString() + "/crashinfo/" + "crash-"+time+".txt",
+                        "当前时间:"+time2+",定位失败",
+                        true
+                );
                 break;
         }
         return false;
@@ -59,34 +90,32 @@ public class TrackService extends Service {
 
     @Nullable
     @Override
-    public IBinder onBind(Intent intent) {
+    public IBinder onBind(Intent intent) {return null; }
-        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;
 
     }
@@ -96,19 +125,16 @@ public class TrackService extends Service {
         super.onDestroy();
     }
 
-    public void genzong() {
+    public void genzong(AMapLocation location){
-        if (l == null || l.getLatitude() == 0d) {
+            //经度
-            return;
+            tib.setLatitude(location.getLatitude()+"");
-        }
+            //纬度
-        //经度
+            tib.setLongitude(location.getLongitude()+"");
-        tib.setLatitude(l.getLatitude() + "");
+            Log.e("经度",location.getLatitude()+"");
-        //纬度
+            Log.e("维度",location.getLongitude()+"");
-        tib.setLongitude(l.getLongitude() + "");
+            //单号
-        Log.e("经度", l.getLatitude() + "");
+            tib.setShippingNoteNumber(snn);
-        Log.e("维度", l.getLongitude() + "");
+            hyr.trackTracking(tib);
-        //单号
-        tib.setShippingNoteNumber(snn);
-        hyr.trackTracking(tib);
     }
 
 }

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

@@ -10,7 +10,6 @@ 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
@@ -24,7 +23,6 @@ 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")
@@ -95,7 +93,6 @@ 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
@@ -129,9 +126,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,7 +4,6 @@ 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;
@@ -39,8 +38,7 @@ 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

@@ -20,12 +20,9 @@ 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;
@@ -86,10 +83,6 @@ 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);
@@ -97,24 +90,6 @@ 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);
@@ -144,12 +119,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);
@@ -157,6 +132,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                         }
 
 
+
                         Toast.makeText(con, "资格证上传成功", Toast.LENGTH_SHORT).show();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -229,7 +205,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)) {
@@ -241,9 +217,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);
         }
     }
@@ -324,6 +300,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         tvSkip.setOnClickListener(v -> {
 
 
+
             if (type.equals("0")) {
 //                finish();
                 if (key) {

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

@@ -23,16 +23,12 @@ 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;
@@ -41,9 +37,6 @@ 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;
@@ -90,12 +83,10 @@ 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 {
@@ -112,14 +103,13 @@ 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;
@@ -177,15 +167,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             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();
@@ -221,13 +205,7 @@ 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) {
-                            Intent intent = new Intent(this, H5Activity.class);
+                            EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
-                            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"));
@@ -354,92 +332,6 @@ 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) {
@@ -459,58 +351,18 @@ 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) {
-                        Intent intent = new Intent(this, H5Activity.class);
+                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
-                        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 {
-                    pathOrcRes();
                     //重复代码?
                     initView(null);
                     if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) {
                         initData();
                     }
-
+                    pathOrcRes();
                 }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
@@ -627,12 +479,10 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         img1.setImageResource(typeImgOne[index]);
         img2.setImageResource(typeImgTwo[index]);
         if (!url1.equals("")) {
-            ImageLoader.getInstance().loadImage(con, url1, img1, typeImgOne[index]);
+            Glide.with(con).load(url1).into(img1);
-//            Glide.with(con).load(url1).into(img1);
         }
         if (!url2.equals("")) {
-            ImageLoader.getInstance().loadImage(con, url2, img2, typeImgTwo[index]);
+            Glide.with(con).load(url2).into(img2);
-//            Glide.with(con).load(url2).into(img2);
         }
         //查看第一张照片
         img1.setOnClickListener(v -> {
@@ -729,14 +579,9 @@ 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:
                         //传驾驶证信息页面 跳转实名认证
@@ -915,12 +760,14 @@ 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 && ocb.getData() != null) {
+                    if (ocb.getCode() == 200) {
-//                        url1 = ocb.getData().getUrl();
+                        url1 = ocb.getData().getUrl();
                         value1.setText(ocb.getData().getName());
-                        value2.setText(ocb.getData().getIdcard());
+                        value2.setText(ocb.getData().getCardId());
                         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();
                     }
@@ -928,10 +775,14 @@ 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 && ocbb.getData() != null) {
+                    if (ocbb.getCode() == 200) {
-                        value4.setText(ocbb.getData().getValidTo());
+                        url2 = ocbb.getData().getUrl();
+                        value4.setText(ocbb.getData().getEndTime());
+//                        Glide.with(con).load(url2).into(img2);
                         Glide.with(con).load(path).into(img2);
-                        startTime = ocbb.getData().getValidFrom();
+                        startTime = ocbb.getData().getStartTime();
+                        backId = ocbb.getData().getId();
+
                         //自动调取提交功能，实现页面自动跳转
                         subimt();
                     } else {
@@ -944,15 +795,17 @@ 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 && odl.getData() != null) {
+                    if (odl.getCode() == 200) {
                         OCRDrivingLicenseBean.DataDTO od = odl.getData();
-//                        url1 = odl.getData().getUrl();
+                        url1 = odl.getData().getUrl();
                         value7.setText(StringUtil.isNull(od.getName(), "识别异常"));
-                        value1.setText(StringUtil.isNull(od.getIdcard(), "识别异常"));
+                        value1.setText(StringUtil.isNull(od.getNumber(), "识别异常"));
-                        value2.setText(StringUtil.isNull(od.getFirstGetDocDate(), "识别异常"));
+                        value2.setText(StringUtil.isNull(od.getStartTime(), "识别异常"));
-                        value3.setText(StringUtil.isNull(od.getQuasiDriveType(), "识别异常"));
+                        value3.setText(StringUtil.isNull(od.getAllowType(), "识别异常"));
-                        value4.setText(StringUtil.isNull(od.getEndDate(), "识别异常"));
+                        value4.setText(StringUtil.isNull(od.getEndTime(), "识别异常"));
+//                        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();
                     }
@@ -960,7 +813,10 @@ 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 && odlb.getData() != null) {
+                    if (odlb.getCode() == 200) {
+                        url2 = odlb.getData().getUrl();
+                        backId = odlb.getData().getId();
+//                        Glide.with(con).load(url2).into(img2);
                         Glide.with(con).load(path).into(img2);
                         //自动调取提交功能，实现页面自动跳转
                         subimt();
@@ -976,55 +832,56 @@ 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 (2==index&&olb.getData().getVclN().contains("挂")){
+                    if (olb.getCode() == 200) {
-                        Toast.makeText(con,"该证件为挂车,请上传行驶证证件",Toast.LENGTH_SHORT).show();
+                        if (olb.getData().isCarExist()) {
-                        return;
+                            value1.setEnabled(false);
-                    }
+                            Glide.with(con).load(olb.getData().getExistCarInfo().getBackImage()).into(img2);
-
+                            url2 = olb.getData().getExistCarInfo().getBackImage();
-                    if (3==index&&!olb.getData().getVclN().contains("挂")){
+                            ToastUtils.showLongToast(con, "该车辆已存在,请仔细核对相关信息");
-                        Toast.makeText(con,"未识别到挂车相关信息,请上传挂车行驶证证件",Toast.LENGTH_SHORT).show();
+                        } else {
-                        return;
+                            value1.setEnabled(true);
-                    }
+                        }
-                    if (olb.getCode() == 200 && olb.getData() != null) {
+                        url1 = olb.getData().getUrl();
-                        carExistCarId = "";
+                        value1.setText(olb.getData().getCarNumber());
-                        value1.setEnabled(true);
+                        value2.setText(olb.getData().getType());
-                        value2.setEnabled(true);
+                        value3.setText(olb.getData().getOwner());
-                        value3.setEnabled(true);
+                        value4.setText(olb.getData().getVehicleNumber());
-                        value4.setEnabled(true);
+                        fontId = olb.getData().getId();
-                        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, "识别失败", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con, olb.getMsg(), 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 && oblb.getData() != null) {
+                    if (oblb.getCode() == 200) {
-//                        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(path).into(img2);
                         //自动调取提交功能，实现页面自动跳转实现页面自动跳转
                         subimt();
                     } else {
-                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con, oblb.getMsg(), 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);
+                        Glide.with(con).load(path).into(img3);
+                    } else {
+                        Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove("upload");
+                }
                 break;
             default:
                 break;
@@ -1041,35 +898,29 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         switch (index) {
             case 0:
                 if (keys[0]) {
-                    new AuthRequest().upload(con, hd, new File(path));
+                    new OCRRequest().OCRCard(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 AuthRequest().upload(con, hd, new File(path));
+                    new OCRRequest().OCRDrivingLicense(con, hd, new File(path));
-//                    new OCRRequest().OCRDrivingLicense(con, hd, new File(path));
                 } else {
-                    new AuthRequest().upload(con, hd, new File(path));
+                    new OCRRequest().OCRDrivingLicenseBack(con, hd, new File(path));
-//                    new OCRRequest().OCRDrivingLicenseBack(con, hd, new File(path));
                 }
                 break;
             case 2:
                 if (keys[0]) {
-                    new AuthRequest().upload(con, hd, new File(path));
+                    new OCRRequest().OCRVehicleLicense(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 AuthRequest().upload(con, hd, new File(path));
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
-//                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
 
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
@@ -1078,8 +929,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
             case 3:
                 Log.e("添加挂车", "挂车" + oCrcarId);
                 if (keys[0]) {
-                    new AuthRequest().upload(con, hd, new File(path));
+                    new OCRRequest().OCRVehicleLicense(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();
@@ -1095,8 +945,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             isExist = true;
                         }
                     }
-                    new AuthRequest().upload(con, hd, new File(path));
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, isExist);
-//                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, isExist);
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
                 }
@@ -1133,7 +982,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     } else {
                         ib.setIdcardSex(2);
                     }
-                    ib.setIdcardValidity("长期".equals(ocbb.getData().getValidTo()) ? "2999-12-31" : ocbb.getData().getValidTo());
+                    ib.setIdcardValidity(ocbb.getData().getEndTime());
                     new AuthRequest().driverAuthIdCard(con, hd, ib);
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();
@@ -1147,36 +996,20 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     customDialog.show();
                     Log.e("ocr", new Gson().toJson(odl));
                     LicenseInputBean iib = new LicenseInputBean();
-                    iib.setArchivesName(odlb.getData().getFileNumber());
+                    iib.setArchivesName(str1);
                     iib.setDriverLicenseName(value7.getText().toString());
                     iib.setAllowType(str3);
-                    iib.setDriverLicense(str1);
+                    iib.setDriverLicense(odl.getData().getNumber());
                     iib.setDriverLicenseBackPhoto(backId);
                     iib.setDriverLicensePhoto(fontId);
-                    iib.setEndTime("长期".equals(odl.getData().getEndDate()) ? "2999-12-31" : odl.getData().getEndDate());
+                    iib.setEndTime(odl.getData().getEndTime());
-                    iib.setFirstTime(odl.getData().getFirstGetDocDate());
+                    iib.setFirstTime(odl.getData().getFirstTime());
-
-
-//                    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 (!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();
@@ -1188,100 +1021,17 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-//                    map.put("licenseId", olb.getData().isCarExist() ? olb.getData().getExistCarInfo().getLicenseId() : oblb.getData().getLicenseId());
+                    map.put("licenseId", olb.getData().isCarExist() ? olb.getData().getExistCarInfo().getLicenseId() : oblb.getData().getLicenseId());
-//                    map.put("vclN", str1);
+                    map.put("carNumber", str1);
-//                    map.put("vcltype", str2);
+                    map.put("type", str2);
-//                    map.put("ownerName", str3);
+                    map.put("owner", str3);
-//                    map.put("vin", str4);//车辆识别代号
+                    map.put("vehicleNumber", str4);
-
+//                    if (olb.getData().isCarExist()) {
-                    String carLong = "";
+//                        map.put("carId", olb.getData().getCarId());
-                    String carWidth = "";
+//                    }
-                    String carHeight = "";
+//                    map.put("carPlateColor", curColor.getValue());
-                    String carPlateColor = "302003";
+//                    map.put("carEnergyTyp", curEnergy.getValue());
-                    String carEnergyTyp = "303002";
+                    new AuthRequest().saveVehicleLicense(con, hd, MapUtil.mapJson(map));
-                    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();
                 }
@@ -1294,114 +1044,21 @@ public class CertificatesActivity extends BaseAppCompatActivity {
 //                    }
                     customDialog = new CustomDialog(con, "网络请求中...");
                     customDialog.show();
-//                    Map<String, Object> map = new HashMap<>();
+                    Map<String, Object> map = new HashMap<>();
-//                    if ("".equals(url3)) {
+                    if ("".equals(url3)) {
-//                        map.put("imgId", fid);
+                        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());
-                    try {
+                    map.put("carId", carId);
-                        String inNote = oblb.getData().getNote();
+                    map.put("carNumberDraw", str1);
-                        if (inNote.contains("：")) {
+                    map.put("type", str2);
-                            String[] split = inNote.split("：");
+                    map.put("owner", str3);
-                            if (split.length == 2) {
+//                    map.put("carEnergyTyp", curEnergy.getValue());
-                                note = split[1];
+                    map.put("vehicleNumber", str4);
-                            }
+                    if (cdb != null && cdb.getRes() == 1 && cdb.getData() != null && cdb.getData().getTrailerResVo() != null) {
-                        }
+                        map.put("oldTrailerNumber", cdb.getData().getTrailerResVo().getCarNumber());
-                    } catch (Exception e) {
-
                     }
-
+                    new AuthRequest().saveDrawCar(con, hd, MapUtil.mapJson(map));
-
-                    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();
                 }
@@ -1423,11 +1080,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,12 +1,9 @@
 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;
@@ -19,14 +16,9 @@ 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;
@@ -50,7 +42,6 @@ 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;
@@ -107,18 +98,11 @@ 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);
-//                        intent.putExtra("isGoCar", true);
+//                        startActivity(intent);
-                        startActivity(intent);
+                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
-
-//                        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"));
@@ -184,25 +168,13 @@ 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) {
-                PermissionX.init(this)
+//                EsignSdk.getInstance().startH5Activity(act, "");
-                        .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);
             }
         });
         //头像
@@ -304,8 +276,6 @@ 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,14 +20,10 @@ 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;
@@ -36,7 +32,6 @@ 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;
@@ -103,22 +98,6 @@ 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) {
@@ -134,29 +113,22 @@ 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(path).into(img);
 
-
+                    if (customDialog != null && customDialog.isShowing())
+                        customDialog.dismiss();
                     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) {
@@ -170,7 +142,6 @@ 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:
@@ -389,7 +360,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
      * 展示大图片
      */
     private void showBigImg() {
-        if ((type == 3 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
+        if ((type == 0 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
             choicePhoto();
             return;
         }
@@ -434,8 +405,8 @@ 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())) {
@@ -447,8 +418,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 //                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
 //                            .show();
 
+                    break;
                 }
-                break;
         }
     }
 

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

@@ -55,7 +55,6 @@ 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;

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

@@ -1,17 +1,12 @@
 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;
@@ -28,7 +23,6 @@ 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;
@@ -42,28 +36,18 @@ 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;
@@ -111,11 +95,8 @@ 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
@@ -136,11 +117,7 @@ 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, llCurWay;
+    private LinearLayout order_all;
-
-    private TextView tvWaybill, tvGo, tvZX;
-
-    private ImageView ivType;
     private HuoYuanListBean uab;
     private List<Marker> list = new ArrayList<>();
     private HuoYuanListDealBean hdb;
@@ -149,8 +126,6 @@ public class HomeFragment extends BaseFragment {
     private ImageConfig ic;
     private DriverExpireBean deb;
 
-    private XToast xToast;
-
 
     @Override
     public void msgMethod(Message m) {
@@ -164,23 +139,6 @@ 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) {
@@ -188,13 +146,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();
                     }
@@ -207,24 +165,8 @@ 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 && !sob.getData().getWaybillStatus().equals("已取消")) {
+                        if (sob.getData() != null) {
-                            StartOrderBean.DataDTO.WayChildrenDTO xData = null;
+                            ur.getJtts(sob.getData().getShippingNoteNumber());
-                            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();
@@ -258,35 +200,6 @@ 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();
@@ -328,15 +241,11 @@ public class HomeFragment extends BaseFragment {
                                 in.putExtra("url", deb.getData().getIdCardUpdateUrl());
                             }
                         }
-                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl()) ||
+                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl())||
-                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl()) ||
+                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl())||!TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl())||
                                 !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) {
-                            if (xToast == null) {
+                            new XToast<>(act)
-                                xToast = new XToast(act);
+                                    .setContentView(R.layout.view_bc)
-                            } else if (xToast != null && xToast.isShow()) {
-                                xToast.cancel();
-                            }
-                            xToast.setContentView(R.layout.view_bc)
                                     // 设置成可拖拽的
                                     .setDraggable()
                                     // 设置显示时长
@@ -351,22 +260,6 @@ 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");
                     }
@@ -427,8 +320,8 @@ public class HomeFragment extends BaseFragment {
         EventBus.getDefault().register(this);
         hyr = new HuoYuanRequset(con, hd);
         ur = new UserRequset(con, hd);
-        initView(null);
         initRefreshLoad();
+        initView(null);
         btn_news.setOnClickListener(v -> {
 
         });
@@ -534,13 +427,6 @@ 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)));
@@ -595,35 +481,18 @@ public class HomeFragment extends BaseFragment {
             v1.setOnClickListener(v2 -> {
                 switch (position) {
                     case 0:
-                        PermissionUtils.Companion.getInstance().showPermissionMessage(getActivity(), "位置权限使用说明", "用于向您推荐可能感兴趣的住宿、饮食、加油站、汽车维修等",
+                        //startActivity(new Intent(con, OrderListActivity.class));
-                                new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
+                        PermissionX.init(getActivity())
-                                (allGranted, grantedList, deniedList) -> {
+                                .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 {
-                                        new MessageUtils().showSimCenPop(con, "缺少定位权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
+                                        Toast.makeText(act.getBaseContext(), "请先开启定位权限", Toast.LENGTH_LONG).show();
-                                            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:
@@ -647,11 +516,6 @@ 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;
@@ -662,100 +526,6 @@ 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 "已完成";
-    }
-
     /**
      *
      */
@@ -775,18 +545,12 @@ 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(curWaybillId == -1 ? 0 : curWaybillId);
+            hyr.startOrder(0);
-//            hyr.startOrder(0);
-            //获取权限  应用市场审核不通过
             ur.driverAuthData();
         }
 //            oldTime= Calendar.getInstance().getTimeInMillis();
@@ -845,13 +609,8 @@ public class HomeFragment extends BaseFragment {
                 Log.e("开始轨迹上传服务", "-----");
                 orderNum.setText("运单号:" + sob.getData().getShippingNoteNumber());
                 order_state.setText("" + sob.getData().getWaybillStatus());
-                try {
+                Intent serviceIn = new Intent(con, TrackService.class);
-                    Intent serviceIn = new Intent(con, TrackService.class);
+                getActivity().startService(serviceIn);
-                    getActivity().startService(serviceIn);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
             } else {
                 SPUtil.insSP(con, "order", "ShippingNoteNumber", "");
                 order_start.setVisibility(View.GONE);
@@ -1141,64 +900,29 @@ public class HomeFragment extends BaseFragment {
 //    }
 
     public void initAlct() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        PermissionX.init(getActivity())
-//            if (!OneDayShowUtils.getInstance().todayIsShowQx(con)){
+                .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
-//            boolean b = EasyPermissions.hasPermissions(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
-//                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.RECORD_AUDIO)
-//                    Manifest.permission.ACCESS_FINE_LOCATION,
+                .request((allGranted, grantedList, deniedList) -> {
-//                    Manifest.permission.ACCESS_COARSE_LOCATION);
+                    if (allGranted) {
-//            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));
+            }
 
-//        ALProcess.verification(con);
+            @Override
-//        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
+            public void onFailure(String s, String s1) {
-//            @Override
+                Log.e("--失败信息--", s + s1);
-//            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;//地图定位样式
@@ -1274,18 +998,6 @@ 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,26 +1,16 @@
 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;
@@ -32,18 +22,14 @@ 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;
@@ -74,7 +60,6 @@ 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;
@@ -118,17 +103,16 @@ 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()) {
+                        if (null==bb.getData()){
                             UiAuxiliary.homeRequest("接单");
                             Intent in = new Intent(con, StartYunDanActivity.class);
                             in.putExtra("id", "0");
                             startActivity(in);
                             finish();
-                        } else {
+                        }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();
@@ -150,38 +134,6 @@ 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);
@@ -189,18 +141,16 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                 car.setText("选择车辆:" + clb.getData().get(index).getCarNumber());
                 cid = clb.getData().get(index).getCarId();
                 break;
-
             case 1111://安联用户验证通过，接单
-                hyr.getOrderStatus(id);
+                new XPopup.Builder(con)
-//                new XPopup.Builder(con)
+                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-//                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+                        .asConfirm("请确认接单", "是否确定承运此运单？",
-//                        .asConfirm("请确认接单", "是否确定承运此运单？",
+                                "取消", "确认",
-//                                "取消", "确认",
+                                () -> {
-//                                () -> {
+                                    Log.e("--id--", "cid:" + cid + "---wid:" + id);
-//                                    Log.e("--id--", "cid:" + cid + "---wid:" + id);
+                                    hyr.confirm(cid, id);
-//                                    hyr.confirm(cid, id);
+                                }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
-//                                }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
+                        .show();
-//                        .show();
                 break;
             case 2222://安联用户验证不通过
                 customDialog.dismiss();
@@ -250,8 +200,6 @@ 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);
@@ -262,15 +210,6 @@ 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));
@@ -419,6 +358,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
 //        }, 2500);
 
 
+
 //        new Handler().postDelayed(() -> {
 //
 //
@@ -483,53 +423,10 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
      * 先判断安联用户信息验证，随后接单
      */
     private void reOrder() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        customDialog = new CustomDialog(con, "正在接单...");
-            try {
+        customDialog.show();
-                PermissionX.init(this)
+        //验证安联用户是否通过
-                        .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        ALProcess.verification(con, hd);
-                                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,11 +186,9 @@ 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,7 +3,6 @@ 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;
@@ -41,7 +40,6 @@ 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;
@@ -75,7 +73,6 @@ 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 {
 
@@ -107,14 +104,11 @@ public class StartYunDanActivity extends BaseActivity {
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 //获取页面数据
-                if (CacheGroup.cacheList.get("refreshorderDetail") != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) {
+                if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER) != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) {
                     Log.e("-评论-", CacheGroup.cacheList.get(GET_EVALUTE));
-                    Log.e("-运单-", CacheGroup.cacheList.get("refreshorderDetail"));
+                    Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
-                    sob = gson.fromJson(CacheGroup.cacheList.get("refreshorderDetail"), StartOrderBean.class);
+                    sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), 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);
@@ -126,7 +120,7 @@ public class StartYunDanActivity extends BaseActivity {
                     } else {
                         Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show();
                     }
-                    CacheGroup.cacheList.remove("refreshorderDetail");
+                    CacheGroup.cacheList.remove(HuoYuanFragmengt.START_ORDER);
                     CacheGroup.cacheList.remove(GET_EVALUTE);
                 }
                 //保存评价
@@ -208,30 +202,6 @@ 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);
@@ -476,23 +446,13 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
-    private CustomDialog customDialog;
-
     @Override
     protected void onResume() {
         super.onResume();
         if (map != null) {
             map.onResume();
         }
-        if (customDialog==null){
+        hyr.startOrder(id);
-            customDialog = new CustomDialog(con, "网络请求中...");
-            customDialog.show();
-        }else{
-            if (!customDialog.isShowing()){
-                customDialog.show();
-            }
-        }
-        hyr.startOrder2(id);
         hyr.getEvaluate(id);
     }
 
@@ -603,10 +563,6 @@ 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,12 +1,8 @@
 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;
@@ -19,31 +15,24 @@ 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.bean.WaybillStatusBean;
+import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
-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;
@@ -67,8 +56,6 @@ 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;
@@ -101,15 +88,13 @@ 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()) {
+                    if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                         customDialog.dismiss();
                     }
                     Log.e("upload", CacheGroup.cacheList.get("upload"));
@@ -127,53 +112,20 @@ 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 (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
+                            customDialog.dismiss();
+                        }
                         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]);
@@ -198,16 +150,13 @@ 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()) {
+                        if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                             customDialog.dismiss();
                         }
                         if (index == 0) {//装卸货车辆需要识别车牌号){
@@ -222,7 +171,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("定位成功");
@@ -232,21 +181,12 @@ 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;
@@ -271,7 +211,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
         }
     }
-
     private LatLng latLng;
 
     public LatLng convertGPSToBaidu(LatLng srLatLng) {
@@ -310,7 +249,6 @@ 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();
@@ -355,9 +293,7 @@ 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();
             }
@@ -403,7 +339,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             Log.e("图片地址:", path);
             gia.dis();
 
-            if (customDialog != null && !customDialog.isShowing()) {
+            if (customDialog!=null&&!customDialog.isShowing()){
                 customDialog = new CustomDialog(con, "网络请求中...");
                 customDialog.show();
             }
@@ -422,7 +358,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 Log.e("图片地址:", path);
                 gia.dis();
 
-                if (customDialog != null && !customDialog.isShowing()) {
+                if (customDialog!=null&&!customDialog.isShowing()){
                     customDialog = new CustomDialog(con, "网络请求中...");
                     customDialog.show();
                 }
@@ -440,12 +376,12 @@ 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:
+                if (customDialog!=null&&!customDialog.isShowing()){
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
+                }
                 //装货
                 if (imgIds != null && imgIds.size() > 0) {
                     lub.setLatitude(lgdu.getLatitude() + "");
@@ -456,47 +392,16 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--装货信息", gson.toJson(lub));
                     if (locationKey) {//高德定位
                         if (keys) {
-                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
+                            nfc();
-                                @Override
+                            loadInfo();
-                                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;
@@ -511,45 +416,16 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--卸货信息", gson.toJson(lub));
                     if (locationKey) {
                         if (keys) {
-                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
+                            nfc();
-                                @Override
+                            uploadInfo();
-                                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;
@@ -574,15 +450,9 @@ 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;
@@ -693,10 +563,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                     customDialog.dismiss();
                 }
-                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "装货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -729,10 +598,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                     customDialog.dismiss();
                 }
-                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "卸货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -741,9 +609,6 @@ 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);
@@ -769,11 +634,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                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();
@@ -821,6 +684,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     }
 
 
+
+
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -849,7 +714,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(装货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                         customDialog.dismiss();
                     }
                     new MessageUtils().showCenMessage(con, s1);
@@ -889,7 +754,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                         customDialog.dismiss();
                     }
                     new MessageUtils().showCenMessage(con, s1);

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

@@ -16,8 +16,6 @@ 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;
@@ -26,7 +24,6 @@ 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;
@@ -74,7 +71,8 @@ public class LoginActivity extends BaseActivity {
     private LoginBean loginBean;
     private TimerTask tt;
     private int timer_sum = 60;
-    private CheckBox cb;
+    private ImageButton agree_btn;
+    private CardView no_btn;
     private UserRequset ur;
 
     @Override
@@ -97,22 +95,15 @@ 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);
@@ -134,7 +125,8 @@ public class LoginActivity extends BaseActivity {
         input_phone = findViewById(R.id.input_phone);
         input_code = findViewById(R.id.input_code);
         getCode = findViewById(R.id.getCode);
-        cb = findViewById(R.id.cb);
+        agree_btn = findViewById(R.id.agree_btn);
+        no_btn = findViewById(R.id.no_btn);
         ur = new UserRequset(con, hd);
         initView(null);
     }
@@ -147,18 +139,21 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        cb.setOnCheckedChangeListener((buttonView, isChecked) -> {
+        agree_btn.setOnClickListener(v -> {
-            if (isChecked) {
+            agree_btn.setVisibility(View.GONE);
-                key = true;
+            no_btn.setVisibility(View.VISIBLE);
-            } else {
+            key = false;
-                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/currency/#/";
+            url2 = "http://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,12 +30,10 @@ 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;
@@ -161,16 +159,6 @@ 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,
@@ -343,8 +331,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/SetupActivity.java

@@ -127,8 +127,8 @@ public class SetupActivity extends BaseActivity {
                 startActivity(in);
             });
             r6.setOnClickListener(v12 -> {
-                String[] title={"平台客服:"+kefu};
+                String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
-                String[] value={kefu};
+                String[] value={kefu,"95528","13460042961"};
                 new XPopup.Builder(con)
                         .isDarkTheme(false)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

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

@@ -13,14 +13,6 @@ 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;
@@ -41,8 +33,6 @@ 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;
@@ -57,17 +47,13 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
 
     private ImageView up_bank_img;
     private EditText bank_name, bank_number;
-    private TextView submit, skip;
+    private TextView submit;
     private ImageView return_btn;
     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) {
@@ -76,45 +62,19 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("OCR_BANK") != null) {
                     ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class);
-                    customDialog.dismiss();
+                    if (ib.getCode() == 200) {
-                    if (ib.getCode() == 200&&ib.getData()!=null) {
                         initView(null);
+                        customDialog.dismiss();
                         WalletFragment.isInsBank = true;
                     } 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(WoDeFragment.AUTH_DATA) != null) {
-                    dad = new Gson().fromJson(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA), DriverAuthDataBean.class);
-                    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) {
+                        customDialog.dismiss();
-                            Intent in = new Intent(con, CertificatesActivity.class);
-                            in.putExtra("index", 1);
-                            startActivity(in);
-                        }
                         Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
                         finish();
                     } else {
@@ -122,39 +82,18 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
                     }
                     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.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);
@@ -162,47 +101,27 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
         setContentView(R.layout.activity_bank_auth);
         act = this;
         con = this;
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            type = getIntent().getExtras().getInt("type");
-        }
         up_bank_img = findViewById(R.id.up_bank_img);
         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 -> {
-            if (isAuth) {
+            gia.showPopueWindow(this);
-                new XPopup.Builder(con)
-                        .asImageViewer(up_bank_img, dad.getData().getBankImgUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher_round))
-                        .show();
-            } else {
-                gia.showPopueWindow(this);
-            }
         });
         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().getCardNumber());
+        bank_number.setText(ib.getData().getBankCardNumber());
-        Glide.with(con).load(path).into(up_bank_img);
+        Glide.with(con).load(ib.getData().getUrl()).into(up_bank_img);
     }
 
     @Override
@@ -241,11 +160,10 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
         }
         InsBankInputBean ibib = new InsBankInputBean();
         ibib.setCardNo(bankNumber);
-//        ibib.setCardType(Integer.parseInt(ib.getData().getType()));
+        ibib.setCardType(Integer.parseInt(ib.getData().getBankCardType()));
-        ibib.setCardType(1);
         ibib.setBankName(bankName);
         ibib.setCardUserType(1);
-        ibib.setImageId(Integer.parseInt(imageId));
+        ibib.setImageId(ib.getData().getId());
         Log.e("-res-", new Gson().toJson(ibib));
         qr.insBankCard(ibib);
     }
@@ -254,26 +172,12 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
     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,8 +15,6 @@ 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;
@@ -34,8 +32,6 @@ 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;
 
 
@@ -127,7 +123,6 @@ 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);
@@ -236,7 +231,6 @@ 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);
         }
@@ -322,14 +316,5 @@ 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,12 +5,9 @@ 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;
@@ -84,11 +81,6 @@ 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资源
@@ -119,12 +111,6 @@ 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);
@@ -163,12 +149,6 @@ 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();
-            }
         });
     }
 
@@ -203,8 +183,7 @@ 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();
         }
 
@@ -212,11 +191,7 @@ 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/FileIOUtils.java

@@ -0,0 +1,240 @@
+package com.arpa.hndahesudintocctmsdriver.util;
+
+import com.arpa.hndahesudintocctmsdriver.FileUtils;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+
+/**
+ * @ClassName FileIOUtils
+ * @Author john
+ * @Date 2024/3/29 09:50
+ * @Description TODO
+ */
+public class FileIOUtils {
+
+    private FileIOUtils() {
+        throw new UnsupportedOperationException("u can't instantiate me...");
+    }
+
+    private static final String LINE_SEP = System.getProperty("line.separator");
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param filePath 路径
+     * @param is       输入流
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(String filePath, final InputStream is) {
+        return writeFileFromIS(FileUtils.getFileByPath(filePath), is, false);
+    }
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param filePath 路径
+     * @param is       输入流
+     * @param append   是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(String filePath, final InputStream is, boolean append) {
+        return writeFileFromIS(FileUtils.getFileByPath(filePath), is, append);
+    }
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param file 文件
+     * @param is   输入流
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(File file, final InputStream is) {
+        return writeFileFromIS(file, is, false);
+    }
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param file   文件
+     * @param is     输入流
+     * @param append 是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(File file, final InputStream is, boolean append) {
+        if (!FileUtils.createOrExistsFile(file) || is == null) return false;
+        OutputStream os = null;
+        try {
+            os = new BufferedOutputStream(new FileOutputStream(file, append));
+            byte data[] = new byte[1024];
+            int len;
+            while ((len = is.read(data, 0, 1024)) != -1) {
+                os.write(data, 0, len);
+            }
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            try {
+                is.close();
+                os.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param filePath 文件路径
+     * @param content  写入内容
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(String filePath, String content) {
+        return writeFileFromString(FileUtils.getFileByPath(filePath), content, false);
+    }
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param filePath 文件路径
+     * @param content  写入内容
+     * @param append   是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(String filePath, String content, boolean append) {
+        return writeFileFromString(FileUtils.getFileByPath(filePath), content, append);
+    }
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param file    文件
+     * @param content 写入内容
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(File file, String content) {
+        return writeFileFromString(file, content, false);
+    }
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param file    文件
+     * @param content 写入内容
+     * @param append  是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(File file, String content, boolean append) {
+        if (file == null || content == null) return false;
+        if (!FileUtils.createOrExistsFile(file)) return false;
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter(file, append));
+            bw.write(content);
+            bw.newLine();
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            try {
+                bw.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param filePath 文件路径
+     * @return 字符串
+     */
+    public static String readFile2String(String filePath) {
+        return readFile2String(FileUtils.getFileByPath(filePath), null);
+    }
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param filePath    文件路径
+     * @param charsetName 编码格式
+     * @return 字符串
+     */
+    public static String readFile2String(String filePath, String charsetName) {
+        return readFile2String(FileUtils.getFileByPath(filePath), charsetName);
+    }
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param file 文件
+     * @return 字符串
+     */
+    public static String readFile2String(File file) {
+        return readFile2String(file, null);
+    }
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param file        文件
+     * @param charsetName 编码格式
+     * @return 字符串
+     */
+    public static String readFile2String(File file, String charsetName) {
+        if (!FileUtils.isFileExists(file)) return null;
+        BufferedReader reader = null;
+        try {
+            StringBuilder sb = new StringBuilder();
+            if (isSpace(charsetName)) {
+                reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+            } else {
+                reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), charsetName));
+            }
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append(LINE_SEP);
+            }
+            // delete the last line separator
+            return sb.delete(sb.length() - LINE_SEP.length(), sb.length()).toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    private static boolean isSpace(String s) {
+        if (s == null) return true;
+        for (int i = 0, len = s.length(); i < len; ++i) {
+            if (!Character.isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+}

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

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

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

@@ -1,76 +0,0 @@
-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

@@ -1,137 +0,0 @@
-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

@@ -81,39 +81,6 @@ public class OkHttpUtil {
         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))
-                .build();
-        return request;
-    }
-
     public static Request get(OkDate od){
         Headers.Builder hb=new Headers.Builder();
         hb.add("Content-Type","application/json");

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

@@ -1,11 +1,6 @@
 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;
@@ -18,7 +13,6 @@ 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;
 
@@ -62,17 +56,12 @@ public class GetCarImageAlert {
         }
         btn_xiangce.setOnClickListener(v -> {
             PermissionX.init(act)
-                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
                             PicturlUtil.selectPicter(act, new ArrayList<>(), 1);
                         } else {
-                            new MessageUtils().showSimCenPop(act, "缺少媒体和文件权限,将无法选择照片,去开启！", "取消", "确认", () -> {
+                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
-                                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                                Uri uri = Uri.fromParts("package", getPackageName(), null);
-                                intent.setData(uri);
-                                act.startActivity(intent);
-                            });
                         }
                     });
         });
@@ -85,12 +74,7 @@ public class GetCarImageAlert {
 //                            file=ImageGetUtil.createImageFile(act);
 //                            ImageGetUtil.cameraAlbumGetImage(act,file);
                         } else {
-                            new MessageUtils().showSimCenPop(act, "缺少相机权限,将无法进行拍照或选择照片,去开启！", "取消", "确认", () -> {
+                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
-                                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                                Uri uri = Uri.fromParts("package", getPackageName(), null);
-                                intent.setData(uri);
-                                act.startActivity(intent);
-                            });
                         }
                     });
         });
@@ -102,12 +86,7 @@ public class GetCarImageAlert {
                             if (allGranted) {
                                 openCam(act);
                             } else {
-                                new MessageUtils().showSimCenPop(act, "缺少相机权限,将无法进行拍照或选择照片,去开启！", "取消", "确认", () -> {
+                                Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
-                                    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,11 +1,6 @@
 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;
@@ -15,7 +10,6 @@ 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;
@@ -51,37 +45,25 @@ public class GetImageAlert {
 
         btn_xiangce.setOnClickListener(v -> {
             PermissionX.init(act)
-                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)
+                    .permissions(Manifest.permission.READ_EXTERNAL_STORAGE)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
                             PicturlUtil.selectPicter(act, new ArrayList<>(), 1);
                         } else {
-                            new MessageUtils().showSimCenPop(act, "缺少相机,媒体权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
+                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
-                                            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.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)
+                    .permissions(Manifest.permission.CAMERA)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
                             file = ImageGetUtil.createImageFile(act);
                             ImageGetUtil.cameraAlbumGetImage(act, file);
                         } else {
-                            new MessageUtils().showSimCenPop(act, "缺少相机,媒体权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
+                            Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
-                                            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/location/LocationGDUtil.java

@@ -8,7 +8,9 @@ import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.location.AMapLocationListener;
+import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
+import com.google.gson.Gson;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -74,6 +76,7 @@ public class LocationGDUtil {
                     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Date date = new Date(aMapLocation.getTime());
                     df.format(date);
+                    CacheGroup.cacheList.put("getLocation",new Gson().toJson(aMapLocation));
                     MsgUtil.addHdMsgWat(hd,RES);
                     if (mLocationClient!=null) {
                         mLocationClient.onDestroy();

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

@@ -1,101 +0,0 @@
-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/res/drawable/bg_round2.xml

@@ -1,5 +0,0 @@
-<?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

@@ -1,6 +0,0 @@
-<?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

@@ -1,6 +0,0 @@
-<?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

@@ -1,7 +0,0 @@
-<?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_bank_auth.xml

@@ -5,50 +5,34 @@
     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:layout_marginLeft="@dimen/dp_20"
+                android:src="@mipmap/return_lefts"
                 android:padding="@dimen/dp_10"
-                android:scaleType="fitXY"
+                android:scaleType="fitXY"/>
-                android:src="@mipmap/return_lefts" />
+            <TextView
-
+                android:layout_marginTop="@dimen/dp_10"
-<!--            <TextView-->
+                android:id="@+id/submit"
-<!--                android:id="@+id/skip"-->
+                android:layout_marginRight="@dimen/dp_30"
-<!--                android:layout_width="wrap_content"-->
+                android:layout_alignParentRight="true"
-<!--                android:layout_height="wrap_content"-->
+                android:layout_width="wrap_content"
-<!--                android:layout_marginTop="@dimen/dp_10"-->
+                android:layout_height="wrap_content"
-<!--                android:layout_marginRight="@dimen/dp_30"-->
+                android:text="提交"
-<!--                android:layout_toLeftOf="@+id/submit"-->
+                android:textColor="@color/theme_color"
-<!--                android:text="跳过"-->
+                android:textSize="@dimen/sp_15"
-<!--                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"
@@ -57,52 +41,47 @@
             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:layout_marginLeft="@dimen/dp_38"
+            android:textColor="@color/red"
-            android:layout_marginTop="@dimen/dp_20"
             android:text="*注意: 请添加本人银行卡, 否则无法提现成功"
-            android:textColor="@color/red"></TextView>
+            ></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:id="@+id/up_bank_img"
-                    android:layout_width="@dimen/dp_249"
-                    android:layout_height="@dimen/dp_138"
                     android:layout_centerHorizontal="true"
                     android:layout_centerVertical="true"
-                    android:scaleType="fitXY"
+                    android:id="@+id/up_bank_img"
-                    android:src="@mipmap/bank_img" />
+                    android:src="@mipmap/bank_img"
-
+                    android:layout_width="@dimen/dp_249"
+                    android:layout_height="@dimen/dp_138"
+                    android:scaleType="fitXY"/>
                 <TextView
+                    android:layout_marginBottom="@dimen/dp_21"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
+                    android:text="点击上传银行卡正面照"
                     android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="@dimen/dp_21"
+                    android:layout_alignParentBottom="true"/>
-                    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"
@@ -113,122 +92,85 @@
                 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: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:orientation="vertical"
-            android:padding="@dimen/dp_14">
+            android:background="@drawable/bg_bai"
-
+            android:elevation="@dimen/dp_1">
-<!--            <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView-->
+            <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
-<!--                android:id="@+id/brv"-->
+                android:id="@+id/brv"
-<!--                android:layout_width="match_parent"-->
+                android:layout_width="match_parent"
-<!--                android:layout_height="wrap_content" />-->
+                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:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10"
                     android:text="银行名称"
                     android:textColor="#ffc4c4ce"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/sp_13"
-
+                    />
                 <EditText
-                    android:id="@+id/bank_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    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:id="@+id/bank_name"
+                    android:layout_alignParentRight="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:textColor="#ff000000"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/sp_13"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:inputType="text"
+                    android:layout_marginLeft="@dimen/dp_30"
+                    android:background="@null"
+                    />
             </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:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10"
                     android:text="银行卡号"
                     android:textColor="#ffc4c4ce"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/sp_13"
-
+                    />
                 <EditText
-                    android:id="@+id/bank_number"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    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:id="@+id/bank_number"
+                    android:layout_alignParentRight="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:textColor="#ff000000"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/sp_13"
+                    android:inputType="number"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:layout_marginLeft="@dimen/dp_30"
+                    android:background="@null"
+                    />
             </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_login.xml

@@ -47,7 +47,6 @@
         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"
@@ -66,7 +65,6 @@
         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"
@@ -106,15 +104,35 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-
+        <androidx.cardview.widget.CardView
-        <CheckBox
+            android:padding="@dimen/dp_7"
-            android:layout_marginTop="@dimen/dp_3"
+            android:layout_marginTop="@dimen/dp_2"
-            android:id="@+id/cb"
+            android:layout_width="@dimen/dp_14"
-            android:layout_width="@dimen/dp_28"
+            android:layout_height="@dimen/dp_14"
-            android:layout_height="@dimen/dp_34"
+            app:cardCornerRadius="@dimen/dp_7"
-            android:button="@null"
+            app:cardBackgroundColor="@color/theme_color"
-            android:checked="false"
+            app:cardElevation="@dimen/dp_0">
-            android:drawableStart="@drawable/select_read"/>
+        <androidx.cardview.widget.CardView
+            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/huoyuan_xq.xml

@@ -1,54 +1,47 @@
 <?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"
-    android:background="#fff"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-    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:layout_alignParentRight="true"
-                    android:layout_marginRight="@dimen/dp_38"
-                    android:background="@null"
-                    android:scaleType="fitXY"
                     android:src="@mipmap/share2"
-                    android:visibility="gone" />
+                    android:layout_alignParentRight="true"
+                    android:scaleType="fitXY"
+                    android:background="@null"
+                    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"
@@ -56,102 +49,73 @@
                     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_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:layout_alignParentRight="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     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
+                <TextView
-                    android:layout_gravity="center"
+                    android:id="@+id/totalFreight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
+                    android:layout_gravity="center"
-                    android:orientation="horizontal">
+                    android:text="0000"
-
+                    android:textColor="#ffffffff"
-                    <TextView
+                    android:textSize="@dimen/sp_40" />
-                        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:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
                     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:layout_marginTop="@dimen/dp_16"
+                    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"
                         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"
@@ -164,12 +128,10 @@
                             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"
@@ -196,17 +158,14 @@
                             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"
@@ -232,12 +191,10 @@
                             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"
@@ -267,67 +224,59 @@
                             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_width="wrap_content"
+                            android:layout_marginLeft="@dimen/dp_7"
-                        android:layout_height="wrap_content"
+                            android:id="@+id/requirement"
-                        android:layout_centerVertical="true"
+                            android:layout_width="wrap_content"
-                        android:layout_gravity="center"
+                            android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/dp_5"
+                            android:layout_marginRight="@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:background="@drawable/bg_bai"
+        android:orientation="vertical"
-        android:orientation="vertical">
+        android:background="@drawable/bg_bai">
-
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_39"
             android:layout_marginTop="@dimen/dp_17"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             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"
@@ -336,48 +285,42 @@
                 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"
-            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:cardBackgroundColor="#fff"
             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"
@@ -385,8 +328,8 @@
                 android:layout_height="@dimen/dp_29"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="@dimen/dp_38"
-                android:background="@null"
                 android:padding="@dimen/dp_5"
+                android:background="@null"
                 android:scaleType="fitXY"
                 android:src="@mipmap/add1" />
         </RelativeLayout>
@@ -403,37 +346,39 @@
                 android:layout_height="@dimen/dp_25"
                 android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_38"
-                android:background="@null"
                 android:padding="@dimen/dp_5"
+                android:background="@null"
                 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"
@@ -442,39 +387,38 @@
                 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:visibility="gone" />
+                android:layout_gravity="center"/>
 
         </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,114 +168,6 @@
             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="wrap_content"
+                            android:layout_width="@dimen/dp_120"
                             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="wrap_content"
+                            android:layout_width="@dimen/dp_120"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
@@ -140,7 +140,6 @@
                 </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,7 +123,6 @@
                     </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,7 +52,6 @@
                         />
                 </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

@@ -1,26 +0,0 @@
-<?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/test/java/com/arpa/hndahesudintocctmsdriver/ExampleUnitTest.kt

@@ -0,0 +1,14 @@
+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() {
+    }
+}

mylibrary/build.gradle

@@ -79,8 +79,6 @@ 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,6 +1,5 @@
 package com.dahe.mylibrary.utils;
 
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class PatternUtils {
@@ -26,13 +25,4 @@ 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 "";
-    }
 }