箩筐地图路径规划

app/build.gradle

@@ -35,11 +35,12 @@ android {
 
     defaultConfig {
         applicationId "com.arpa.hndahesudintocctmsdriver"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 30
-        versionCode 59
+        versionCode 67
-        versionName "3.2.9"
+        versionName "3.3.7"
         flavorDimensions "CHANNEL_VALUE"
+        flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
 
@@ -56,27 +57,7 @@ android {
             // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' , 'arm64-v8a'
 
         }
-
-        manifestPlaceholders = [
-                JPUSH_PKGNAME : applicationId,
-                JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
-                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
-                MEIZU_APPKEY : "MZ-魅族的APPKEY",
-                MEIZU_APPID : "MZ-魅族的APPID",
-                XIAOMI_APPID : "MI-小米的APPID",
-                XIAOMI_APPKEY : "MI-小米的APPKEY",
-                OPPO_APPKEY : "OP-oppo的APPKEY",
-                OPPO_APPID : "OP-oppo的APPID",
-                OPPO_APPSECRET : "OP-oppo的APPSECRET",
-                VIVO_APPKEY : "vivo的APPKEY",
-                VIVO_APPID : "vivo的APPID"
-        ]
     }
-//    sourceSets {
-//        main {
-//            jniLibs.srcDirs = ['libs']
-//        }
-//    }
 
     sourceSets {
         main {
@@ -115,15 +96,29 @@ android {
 
     productFlavors {
         qa {
-            manifestPlaceholders = [CHANNEL_VALUE: "好运司机测试"]
+            applicationId "com.arpa.hndahesudintocctmsdriver.text"
+            manifestPlaceholders = [CHANNEL_VALUE: "司机测试",
+                                    app_icon     : "@drawable/diver_logo_text",
+                                    GAODEKEY     : "6791d69f6221a0841b521763af86eb01",
+                                    JPUSH_PKGNAME: applicationId,
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
+            ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
-            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
+            buildConfigField("String", "BASE_URL", "\"https://app.test.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "司机测试"
         }
         product {
-            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机"]
+            applicationId "com.arpa.hndahesudintocctmsdriver"
+            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机",
+                                    app_icon     : "@drawable/diver_logo",
+                                    GAODEKEY     : "9480fd96746922630e9bf6c75a101059",
+                                    JPUSH_PKGNAME: applicationId,
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
+            ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")
             buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "false"
@@ -132,9 +127,9 @@ android {
         }
 
     }
-    productFlavors.all { flavor ->
+//    productFlavors.all { flavor ->
-        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
+//        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
-    }
+//    }
 
 
     android.applicationVariants.all { variant ->
@@ -233,5 +228,6 @@ dependencies {
     implementation 'com.github.getActivity:XToast:8.2'
 
     implementation project(path: ':mylibrary')
+    implementation 'com.lk.mapsdk:sdk-full:2.3.7'
 
 }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.arpa.hndahesudintocctmsdriver">
+
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <!-- 白名单 -->
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -14,6 +15,8 @@
     <!--播音-->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- 地图截屏图片保存等 -->
+    <uses-permission android:name="android.permission.READ_MEDIA_PERMISSION" />
     <!-- 极光 -->
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
@@ -44,7 +47,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.EACCES" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+
     <uses-feature
         android:name="android.hardware.nfc"
         android:required="true" />
@@ -53,7 +56,7 @@
         android:name="com.arpa.hndahesudintocctmsdriver.App"
         android:allowBackup="true"
         android:excludeFromRecents="true"
-        android:icon="@drawable/diver_logo"
+        android:icon="@mipmap/diver_logo"
         android:label="@string/appName"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
@@ -66,6 +69,11 @@
             android:name="com/alct/mdp"
             android:required="false" />
 
+        <meta-data
+            android:name="com.lk.lbsapi.API_KEY"
+            android:value="EE1721986040968235494A762772C95410D9881BB10790FC0BCRFNPFKW4K6697" />
+
+
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -93,7 +101,8 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
-            android:screenOrientation="portrait"  />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
             android:screenOrientation="portrait" />
@@ -160,7 +169,8 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
             android:screenOrientation="portrait" />
@@ -169,6 +179,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -262,7 +273,7 @@
         <!--高德地图-->
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="78019612271411eca3af34db91930620" />
+            android:value="${GAODEKEY}" />
         <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
         <service android:name="com.amap.api.location.APSService"></service>
@@ -274,7 +285,7 @@
         <!-- 极光-->
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="571d93ae5117da6dee848c92" /> <!-- </>值来自开发者平台取得的AppKey -->
+            android:value="fba6f55621c670d8c1fe9191" /> <!-- </>值来自开发者平台取得的AppKey -->
 
         <meta-data
             android:name="JPUSH_CHANNEL"
@@ -359,10 +370,11 @@
 
         <activity
             android:name=".H5Activity"
-            android:screenOrientation="portrait"
+            android:launchMode="singleTask"
-            android:launchMode="singleTask">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -397,7 +409,7 @@
         </receiver>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.arpa.hndahesudintocctmsdriver.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:ignore="WrongManifestParent">

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

@@ -9,39 +9,29 @@ import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.os.Environment;
 import android.util.Log;
 
-import androidx.core.app.ActivityCompat;
-
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.net.Api;
 import com.arpa.hndahesudintocctmsdriver.ui.MainActivity;
 import com.arpa.hndahesudintocctmsdriver.util.BillLocationUtils;
-import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
-import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil;
 import com.dahe.mylibrary.CommonBaseLibrary;
-import com.dahe.mylibrary.utils.TimeUtil;
 import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.gyf.cactus.Cactus;
 import com.gyf.cactus.callback.CactusBackgroundCallback;
 import com.gyf.cactus.callback.CactusCallback;
-import com.permissionx.guolindev.PermissionX;
+import com.lk.mapsdk.base.mapapi.initializer.InitializerOptions;
+import com.lk.mapsdk.base.mapapi.initializer.SDKInitializer;
+import com.lk.mapsdk.base.mapapi.model.CoordType;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.umeng.commonsdk.UMConfigure;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Timer;
-import java.util.TimerTask;
-
 import cn.jiguang.verifysdk.api.JVerificationInterface;
 
-public class App extends Application implements CactusCallback {
+public class App extends Application {
 
 //    String key = "f9d35b1133cff1f6e3960c89b249e03f";
     String key = "19ac0aa74338e487e45057faf7212401";
@@ -54,7 +44,6 @@ public class App extends Application implements CactusCallback {
     public static int APP_STATUS = APP_STATUS_KILLED; // 记录App的启动状态
     private Context con;
     public static App mApplication = null;
-
     @Override
     public void onCreate() {
         super.onCreate();
@@ -63,6 +52,18 @@ public class App extends Application implements CactusCallback {
         CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
         CrashReport.initCrashReport(getApplicationContext(), "0fa55ffad8", false);
         String state = SPUtil.getSP(con, "state_data", "authorization_state");
+
+        InitializerOptions options = new InitializerOptions();
+        // 设置是否使用Https网络请求,默认使用
+        options.setHttpsEnable(true);
+        // 设置坐标系,默认GCJ02
+        options.setCoordType(CoordType.GCJ02);
+        // SDK 初始化
+        SDKInitializer.initialization(getApplicationContext(), options);
+
+        // Log 开关使能
+        SDKInitializer.setLogEnable(true);
+
         if ("1".equals(state)) {
             try {
                 Context context = getApplicationContext();
@@ -92,34 +93,29 @@ public class App extends Application implements CactusCallback {
             }
         }
 
-        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)
-                .setTitle("好运司机")
+//                //可选，设置通知栏点击事件
-                .setContent("您的接单助手!")
+//                .setPendingIntent(pendingIntent)
-                .setChannelId("gld")
+////                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
-                .setChannelName("好运司机")
+////                .setMusicId(R.raw.main) //可选，设置音乐
-                .setServiceId(Integer.MAX_VALUE)
+////                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
-                //可选，设置通知栏点击事件
+////                .addCallback(new CactusCallback())//可选，运行时回调
-                .setPendingIntent(pendingIntent)
+//                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
+//                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-                .setMusicId(R.raw.main) //可选，设置音乐
+//                .setTitle("大河好运")
-//                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
+//                .setSmallIcon(R.drawable.diver_logo)
-//                .addCallback(new CactusCallback())//可选，运行时回调
+//                .addBackgroundCallback(new CactusBackgroundCallback() {
-                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+//                    @Override
-                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+//                    public void onBackground(boolean b) {
-                .setSmallIcon(R.drawable.diver_logo)
+//                        if (b){
-                .addCallback(this)
+//                            getBillLocation();
-                .addBackgroundCallback(new CactusBackgroundCallback() {
+//                        }
-                    @Override
+//                    }
-                    public void onBackground(boolean b) {
+//                })
-                        if (b) {
+//                .register(this);
-                            getBillLocation();
-                        }
-                    }
-                })
-                .register(this);
     }
 
     public static App getApp() {
@@ -168,62 +164,4 @@ public class App extends Application implements CactusCallback {
         return false;
     }
 
-    @Override
-    public void doWork(int i) {
-
-
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                FileOutputStream fos = null;
-                try {
-                    String nowString = TimeUtil.getNowString(TimeUtil.DEFAULT_FORMAT);
-                    String content = i + "当前时间："+nowString;
-                    String fileName = "location" + ".txt";
-
-                    if (Environment.getExternalStorageState().equals(
-                            Environment.MEDIA_MOUNTED)) {
-                        //获取文件输出路径
-                        String path = Environment.getExternalStorageDirectory()
-                                + "/crashinfo2/";
-                        //创建文件夹和文件
-                        File dir = new File(path);
-                        if (!dir.exists()) {
-                            dir.mkdirs();
-                        }
-//                        File file = new File(path + fileName);
-//                        if (!file.exists())
-//                            file.createNewFile();
-                        //创建输出流
-                        fos = new FileOutputStream(path + fileName,true);
-                        File file = new File(path + fileName);
-                        if (file.exists()){
-                            fos.write('\r');
-                        }
-                        //向文件中写出数据
-                        fos.write(content.toString().getBytes());
-                    }
-
-
-                    fos.flush();
-                    fos.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                } finally {
-                    try {
-                        if (fos != null) {
-                            fos.close();
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }, 100, 1000);
-    }
-
-    @Override
-    public void onStop() {
-
-    }
 }

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

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

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

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

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

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

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

@@ -59,6 +59,7 @@ public class OCRVehicleBackLicenseBean {
         private int id;
         private String url;
         private String checkRecord;
+        private String isSave;
         private String approvedCapacity;
         private String allCapacity;
         private String size;
@@ -71,6 +72,14 @@ public class OCRVehicleBackLicenseBean {
         private String carNumber;
         private int licenseId;
 
+        public String getIsSave() {
+            return isSave;
+        }
+
+        public void setIsSave(String isSave) {
+            this.isSave = isSave;
+        }
+
         public int getLicenseId() {
             return licenseId;
         }

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

@@ -49,7 +49,9 @@ public class OCRVehicleLicenseBean {
         private String address;
         private int carId;
         private String carNumber;
+        private boolean carExist;
         private String dateIssue;
+        private String backImage;
         private String engineNumber;
         private int id;
         private String model;
@@ -60,6 +62,41 @@ public class OCRVehicleLicenseBean {
         private String type;
         private String url;
         private String vehicleNumber;
+        private String licenseId;
+
+        public String getLicenseId() {
+            return licenseId;
+        }
+
+        public void setLicenseId(String licenseId) {
+            this.licenseId = licenseId;
+        }
+
+        private DataDto2 existCarInfo;
+
+        public DataDto2 getExistCarInfo() {
+            return existCarInfo;
+        }
+
+        public void setExistCarInfo(DataDto2 existCarInfo) {
+            this.existCarInfo = existCarInfo;
+        }
+
+        public boolean isCarExist() {
+            return carExist;
+        }
+
+        public String getBackImage() {
+            return backImage;
+        }
+
+        public void setBackImage(String backImage) {
+            this.backImage = backImage;
+        }
+
+        public void setCarExist(boolean carExist) {
+            this.carExist = carExist;
+        }
 
         public String getAddress() {
             return address == null ? "" : address;
@@ -173,4 +210,44 @@ public class OCRVehicleLicenseBean {
             this.vehicleNumber = vehicleNumber;
         }
     }
+
+    public static class DataDto2 {
+        private String backImage;
+        private String carId;
+        private String licenseId;
+
+        private CarDelBean.DataDTO trailerResVo;
+
+        public CarDelBean.DataDTO getTrailerResVo() {
+            return trailerResVo;
+        }
+
+        public void setTrailerResVo(CarDelBean.DataDTO trailerResVo) {
+            this.trailerResVo = trailerResVo;
+        }
+
+        public String getLicenseId() {
+            return licenseId;
+        }
+
+        public void setLicenseId(String licenseId) {
+            this.licenseId = licenseId;
+        }
+
+        public String getBackImage() {
+            return backImage == null ? "" : backImage;
+        }
+
+        public void setBackImage(String backImage) {
+            this.backImage = backImage;
+        }
+
+        public String getCarId() {
+            return carId;
+        }
+
+        public void setCarId(String carId) {
+            this.carId = carId;
+        }
+    }
 }

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

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

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

@@ -124,6 +124,17 @@ public class AuthRequest {
         RequestUtil.start(1, "saveCarRoadLicenseNo", re, con, hd);
     }
 
+    //车辆交强保险
+    public void saveTrafficInsurance(Context con, Handler hd, String id, String insuranceEndDay, String insuranceCompany) {
+        String mt = "{\n" +
+                "\t\"carId\": \"" + id + "\",\n" +
+                "\t\"insuranceEndDay\": \"" + insuranceEndDay + "\",\n" +
+                "\t\"insuranceCompany\": \"" + insuranceCompany + "\",\n" +
+                "}";
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getTrafficInsurance(), mt), getToken(con), con);
+        RequestUtil.start(1, "saveTrafficInsurance", re, con, hd);
+    }
+
     //获取资格证认证信息
     public void isDriverAuthQualification(Context con, Handler hd) {
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getIsAuthDriverAuthQualification(), ""), getToken(con), con);

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

@@ -89,6 +89,11 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING(), gson.toJson(lub)),getToken(con),con);
         RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd);
     }
+    //卸货-补传
+    public void dischargeCargo4(LUInputBean lub){
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING4(), gson.toJson(lub)),getToken(con),con);
+        RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd);
+    }
     //回单
     public void receipt(UploadReceiptInputBean urib){
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUploadReceipt(), gson.toJson(urib)),getToken(con),con);

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

@@ -49,8 +49,8 @@ public class OCRRequest {
         RequestUtil.start(12, CertificatesActivity.TYPE_NAME[2],re,con,hd);
     }
     //行驶证背面识别
-    public void OCRVehicleLicenseBack(Context con, Handler hd, File file,String carId,String carNum){
+    public void OCRVehicleLicenseBack(Context con, Handler hd, File file,String carId,String carNum,boolean isSave){
-        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()),file,getToken(con),carId,carNum);
+        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()),file,getToken(con),carId,carNum,isSave);
         RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[2],re,con,hd);
     }
 

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

@@ -67,6 +67,8 @@ public class RequestConstant {
     private static final String LOADING = "/app/driver/waybill/loadingV2";
     //卸货
     private static final String UNLOADING = "/app/driver/waybill/unloadV2";
+    //卸货-补传
+    private static final String UNLOADING4 = "/app/driver/waybill/unloadV4";
     //上传回单
     private static final String UPLOAD_RECEIPT = "/app/driver/waybill/uploadReceipt";
     //轨迹跟踪
@@ -84,7 +86,7 @@ public class RequestConstant {
     //车辆详情
     private static final String GET_CAR_DEL = "/app/carDriver/getCarInfo";
     //删除车辆
-    private static final String DEL_CAR="/app/carDriver/removeCar";
+    private static final String DEL_CAR = "/app/carDriver/unBindCar";
     //上传车辆照片
     private static final String SAVECARIMG = "/app/carDriver/saveCarImg";
     //上传头像保存
@@ -128,6 +130,9 @@ public class RequestConstant {
     private static final String DRIVER_AUTH_SAVECARREGISTERNO = "/app/carDriver/saveCarRegisterNo";
     //道路运输信息
     private static final String DRIVER_AUTH_SAVECARROADLICENSENO = "/app/carDriver/saveCarRoadLicenseNo";
+
+    //交强险
+    private static final String DRIVER_TRAFFIC_INSU = "/app/carDriver/saveCarInsurace";
     //党员认证
     private static final String PARTY_MEMBER = "/app/user/partyMember";
     //实名认证
@@ -157,11 +162,16 @@ public class RequestConstant {
 
     //车辆自动审核触发器
     private static final String CAR_AUDIT = "/app/carDriver/carAutomaticAudit";
+    private static final String APP_INFO = "/common/app/logininfor";
 
     public static String getCarAudit() {
         return BASE_URL + CAR_AUDIT;
     }
 
+    public static String postAppInfo() {
+        return BASE_URL + APP_INFO;
+    }
+
     public static String getCarColor() {
         return BASE_URL + CAR_COLOR;
     }
@@ -209,9 +219,13 @@ public class RequestConstant {
         return BASE_URL + BANK_CARD_LIST;
     }
 
-    public static String getXiaoXiListUrl() { return BASE_URL + XIAOXI_LIST; }
+    public static String getXiaoXiListUrl() {
+        return BASE_URL + XIAOXI_LIST;
+    }
 
-    public static String getXiaoxiAll() { return BASE_URL +XIAOXI_ALL; }
+    public static String getXiaoxiAll() {
+        return BASE_URL + XIAOXI_ALL;
+    }
 
     public static String getOrderList() {
         return BASE_URL + ORDER_LIST;
@@ -241,6 +255,10 @@ public class RequestConstant {
         return BASE_URL + UNLOADING;
     }
 
+    public static String getUNLOADING4() {
+        return BASE_URL + UNLOADING4;
+    }
+
     public static String getGetEvaluate() {
         return BASE_URL + GET_EVALUATE;
     }
@@ -293,15 +311,25 @@ public class RequestConstant {
         return BASE_URL + ISAUTH_IDCARD;
     }
 
-    public static String getIsauthDriverauthLicense() { return BASE_URL +ISAUTH_DRIVERAUTH_LICENSE; }
+    public static String getIsauthDriverauthLicense() {
+        return BASE_URL + ISAUTH_DRIVERAUTH_LICENSE;
+    }
 
-    public static String getUploadReceipt() { return BASE_URL +UPLOAD_RECEIPT; }
+    public static String getUploadReceipt() {
+        return BASE_URL + UPLOAD_RECEIPT;
+    }
 
-    public static String getUPLOAD() { return BASE_URL +UPLOAD; }
+    public static String getUPLOAD() {
+        return BASE_URL + UPLOAD;
+    }
 
-    public static String getTrackTracking() {return BASE_URL +TRACK_TRACKING; }
+    public static String getTrackTracking() {
+        return BASE_URL + TRACK_TRACKING;
+    }
 
-    public static String getEvaluationV2() { return BASE_URL +EVALUATION_V2; }
+    public static String getEvaluationV2() {
+        return BASE_URL + EVALUATION_V2;
+    }
 
     public static String getDRIVERAUTHIDCARD() {
         return BASE_URL + DRIVERAUTHIDCARD;
@@ -319,27 +347,49 @@ public class RequestConstant {
         return BASE_URL + SAVECARIMG;
     }
 
-    public static String getUploadHead() { return BASE_URL +UPLOAD_HEAD; }
+    public static String getUploadHead() {
+        return BASE_URL + UPLOAD_HEAD;
+    }
 
     public static String getInsBankcard() {
         return BASE_URL + INS_BANKCARD;
     }
 
-    public static String getDelCar() { return BASE_URL +DEL_CAR; }
+    public static String getDelCar() {
+        return BASE_URL + DEL_CAR;
+    }
 
-    public static String getXiaoxiDel() { return BASE_URL +XIAOXI_DEL; }
+    public static String getXiaoxiDel() {
+        return BASE_URL + XIAOXI_DEL;
+    }
 
-    public static String getCOMPLAINT() { return BASE_URL+COMPLAINT; }
+    public static String getCOMPLAINT() {
+        return BASE_URL + COMPLAINT;
+    }
 
-    public static String getXiaoxiDelAll() { return BASE_URL+XIAOXI_DEL_ALL; }
+    public static String getXiaoxiDelAll() {
+        return BASE_URL + XIAOXI_DEL_ALL;
+    }
 
-    public static String getDriverAuthQualification() { return BASE_URL+DRIVER_AUTH_QUALIFICATION; }
+    public static String getDriverAuthQualification() {
+        return BASE_URL + DRIVER_AUTH_QUALIFICATION;
+    }
 
-    public static String getDriverSaveCarRegisterNo() { return BASE_URL+DRIVER_AUTH_SAVECARREGISTERNO; }
+    public static String getDriverSaveCarRegisterNo() {
+        return BASE_URL + DRIVER_AUTH_SAVECARREGISTERNO;
+    }
 
-    public static String getDriverSaveCarRoadLicenseNo() { return BASE_URL+DRIVER_AUTH_SAVECARROADLICENSENO; }
+    public static String getDriverSaveCarRoadLicenseNo() {
+        return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO;
+    }
 
-    public static String getSaveDrawCar() { return BASE_URL+SAVE_DRAW_CAR; }
+    public static String getTrafficInsurance() {
+        return BASE_URL + DRIVER_TRAFFIC_INSU;
+    }
+
+    public static String getSaveDrawCar() {
+        return BASE_URL + SAVE_DRAW_CAR;
+    }
 
     public static String getIsAuthDriverAuthQualification() {
         return BASE_URL + IS_AUTH_DRIVER_AUTH_QUALIFICATION;
@@ -381,7 +431,9 @@ public class RequestConstant {
         return BASE_URL + WITHDRAWALS_CONFIG;
     }
 
-    public static String getGetErrorOrder() { return BASE_URL+GET_ERROR_ORDER; }
+    public static String getGetErrorOrder() {
+        return BASE_URL + GET_ERROR_ORDER;
+    }
 
     public static String getGetExampleList() {
         return BASE_URL + GET_EXAMPLE_LIST;

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

@@ -10,6 +10,7 @@ import android.provider.Settings;
 
 import androidx.annotation.RequiresApi;
 
+import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.business.Md5Util;
@@ -118,6 +119,14 @@ public class UserRequset {
         RequestUtil.start(1, WoDeFragment.VEHICLE_DEL, re, con, hd);
     }
 
+    //车辆详情
+    public void vehicleDelTwo(String id) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("carId", id);
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetCarDel(), MapUtil.mapJson(map)), getToken(con), con);
+        RequestUtil.start(1, "onlyGetDetail", re, con, hd);
+    }
+
     //司机身份证认证
     public void driverIDAuth() {
         String url = RequestConstant.BASE_URL + "/app/driver/auth/authInfo";
@@ -224,4 +233,15 @@ public class UserRequset {
         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/LUInputBean.java

@@ -15,6 +15,15 @@ public class LUInputBean {
     private String locationAddress;
     private String longitude;
     private String waybillId;
+    private String realLoadTime;
+
+    public String getRealLoadTime() {
+        return realLoadTime;
+    }
+
+    public void setRealLoadTime(String realLoadTime) {
+        this.realLoadTime = realLoadTime;
+    }
 
     public List<Integer> getImageId() {
         return imageId;

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

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

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/alert/UpAppAlert.java

@@ -1,6 +1,9 @@
 package com.arpa.hndahesudintocctmsdriver.ui.alert;
 
 import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -55,6 +58,7 @@ public class UpAppAlert extends CenterPopupView {
     protected int getImplLayoutId() {
         return R.layout.alert_up_app;
     }
+
     public UpAppAlert(@NonNull @NotNull Context context) {
         super(context);
 
@@ -88,9 +92,9 @@ public class UpAppAlert extends CenterPopupView {
             System.exit(1);
         });
         tv_confirm.setOnClickListener(v -> {
-            new AppUpdater.Builder()
+            new AppUpdater.Builder(con)
                     .setUrl(url)
-                    .build(con)
+                    .build()
                     .setUpdateCallback(new AppUpdateCallback() {
                         @Override
                         public void onStart(String url) {
@@ -98,6 +102,7 @@ public class UpAppAlert extends CenterPopupView {
                             tv_confirm.setVisibility(GONE);
                             up_div.setVisibility(VISIBLE);
                         }
+
                         @Override
                         public void onProgress(long progress, long total, boolean isChange) {
 //                            Log.e("progress",progress+"");

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

@@ -18,10 +18,13 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.bumptech.glide.Glide;
 import com.esign.esignsdk.EsignSdk;
+import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.DatePicker;
 import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
 import com.google.gson.Gson;
@@ -45,6 +48,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
+import org.greenrobot.eventbus.Subscribe;
+
 import java.io.File;
 import java.util.List;
 
@@ -101,6 +106,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthQualification"), BaseBean.class);
                     if (bb.getCode() == 200) {
 //                        initAuth();
+                        isAuth = true;
                         //判断是否从车辆进来 carId为空从个人认证进来需跳转实名认证，不为空车辆信息进入，需跳转车辆照片
                         if (TextUtils.isEmpty(carId)) {
                             //从业资格证->实名认证
@@ -155,6 +161,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
 //                        finish();
                         EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                     } else {
+                        finish();
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
@@ -243,12 +250,14 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             }
         });
         value2.setOnClickListener(v -> {
+            if (!isAuth) {
                 DatePicker picker = new DatePicker(this);
                 picker.setBodyWidth(300);
                 picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
                 picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
                 picker.getWheelLayout().setDateLabel("年", "月", "日");
                 picker.show();
+            }
         });
         submit.setOnClickListener(v -> {
             if (!isAuth) {
@@ -379,4 +388,31 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         }
     }
 
+
+    @Subscribe
+    public void processResult(AuthEvent auth) {
+        //添加实名/意愿/签署完成之后的逻辑
+        Log.e("-回调信息-", auth.result);
+        JSONObject jsonObject = JSON.parseObject(auth.result);
+        if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
+            if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "签署场景成功", Toast.LENGTH_SHORT).show();
+            } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "实名认证成功", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(con, "意愿认证成功", Toast.LENGTH_SHORT).show();
+            }
+            finish();
+        } else {
+            if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "签署场景失败", Toast.LENGTH_SHORT).show();
+            } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
+                Toast.makeText(con, "实名认证失败", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(con, "意愿认证失败", Toast.LENGTH_SHORT).show();
+            }
+            EsignSdk.getInstance().finishH5Activity();
+            finish();
+        }
+    }
 }

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

@@ -37,6 +37,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.dahe.mylibrary.utils.ActivityUtils;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
@@ -157,6 +158,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         || CacheGroup.cacheList.get("saveVehicleLicense") != null || CacheGroup.cacheList.get("authUrl") != null
                         || CacheGroup.cacheList.get("saveDrawCar") != null) {
                     if (CacheGroup.cacheList.get("driverAuthIdCard") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthIdCard"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
@@ -174,6 +178,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("driverAuthLicense") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthLicense"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
@@ -206,6 +213,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("saveVehicleLicense") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         CarZhengBean czb = gson.fromJson(CacheGroup.cacheList.get("saveVehicleLicense"), CarZhengBean.class);
                         if (czb.getCode() == 200) {
                             String needUpQCPhoto = czb.getData().getNeedUpQCPhoto();//是否需要上传从业资格证
@@ -214,13 +224,19 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             Toast.makeText(con, "车辆行驶证保存成功", Toast.LENGTH_SHORT).show();
 
                             VehicleEvent ve = new VehicleEvent(String.valueOf(czb.getData().getCarId()));
-                            EventBus.getDefault().post(ve);
+                            EventBus.getDefault().postSticky(ve);
 
                             // TODO: 2023/8/23
                             if ("1".equals(isTrailer)) {//判断是否跳转挂车行驶证
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
+                                if (olb != null && olb.getData() != null && olb.getData().isCarExist()) {
+                                    CarDelBean carDelBean = new CarDelBean();
+                                    carDelBean.setRes(1);//保留字段 1：为绑定车辆，可以进行修改挂车信息
+                                    carDelBean.setData(gson.fromJson(gson.toJson(olb.getData().getExistCarInfo()), CarDelBean.DataDTO.class));
+                                    in.putExtra("cheData", gson.toJson(carDelBean));
+                                }
                                 startActivity(in);
                             } else if ("1".equals(needUpQCPhoto)) {//判断是否跳转从业资格证
                                 Intent in = new Intent(con, AuthQualificationActivity.class);
@@ -231,6 +247,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
+                                in.putExtra("carExist", true);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
                                 startActivity(in);
                             } else {
@@ -263,6 +280,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         CacheGroup.cacheList.remove("saveVehicleLicense");
                     }
                     if (CacheGroup.cacheList.get("saveDrawCar") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         Log.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
                         CarZhengBean bb = gson.fromJson(CacheGroup.cacheList.get("saveDrawCar"), CarZhengBean.class);
                         if (bb.getCode() == 200) {
@@ -283,6 +303,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//现判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
+                                in.putExtra("carExist", true);
                                 in.putExtra("carId", carId);
                                 startActivity(in);
                             } else {
@@ -336,8 +357,11 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
                 } else {
+                    //重复代码?
                     initView(null);
+                    if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) {
                         initData();
+                    }
                     pathOrcRes();
                 }
                 break;
@@ -415,6 +439,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
 //                there_div.setVisibility(View.VISIBLE);
                 if (c_str != null && !c_str.equals("")) {
                     cdb = gson.fromJson(c_str, CarDelBean.class);
+                    oCrcarId = cdb.getData().getTrailerResVo().getTrailerLicenseId() + "";
                     initView(null);
                     initData();
                 } else {
@@ -660,7 +685,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 break;
             case 3:
                 Log.e("挂车信息", gson.toJson(cdb));
-                if (cdb != null && cdb.getData().getTrailerResVo() != null) {
+                if (cdb != null && cdb.getData().getTrailerResVo() != null
+                        && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getFrontImage())
+                        && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getBackImage())) {
                     url1 = StringUtil.isNull(cdb.getData().getTrailerResVo().getFrontImage(), "");
                     url2 = StringUtil.isNull(cdb.getData().getTrailerResVo().getBackImage(), "");
                     url3 = StringUtil.isNull(cdb.getData().getTrailerResVo().getThreeImage(), "");
@@ -669,15 +696,17 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     value3.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getOwner(), "空数据"));
                     value4.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getVehicleNumber(), "空数据"));
                     value6.setText(StringUtil.isNull(cdb.getData().getCarEnergyTypValue(), "空数据"));
-                    submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     Glide.with(con).load(url1).into(img1);
                     Glide.with(con).load(url2).into(img2);
                     Glide.with(con).load(url3).into(img3);
+                    if (cdb.getRes() != 1) {
+                        submit.setBackgroundResource(R.drawable.bg_btn_grey);
                         u_img.setText("已上传");
                         u_img2.setText("已上传");
                         u_img3.setText("点击查看");
                         isAuth = true;
                     }
+                }
                 break;
             default:
                 break;
@@ -736,7 +765,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         value1.setText(ocb.getData().getName());
                         value2.setText(ocb.getData().getCardId());
                         value3.setText(ocb.getData().getAddress());
-                        Glide.with(con).load(url1).into(img1);
+//                        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();
@@ -748,7 +778,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (ocbb.getCode() == 200) {
                         url2 = ocbb.getData().getUrl();
                         value4.setText(ocbb.getData().getEndTime());
-                        Glide.with(con).load(url2).into(img2);
+//                        Glide.with(con).load(url2).into(img2);
+                        Glide.with(con).load(path).into(img2);
                         startTime = ocbb.getData().getStartTime();
                         backId = ocbb.getData().getId();
 
@@ -772,7 +803,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         value2.setText(StringUtil.isNull(od.getStartTime(), "识别异常"));
                         value3.setText(StringUtil.isNull(od.getAllowType(), "识别异常"));
                         value4.setText(StringUtil.isNull(od.getEndTime(), "识别异常"));
-                        Glide.with(con).load(url1).into(img1);
+//                        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();
@@ -784,7 +816,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (odlb.getCode() == 200) {
                         url2 = odlb.getData().getUrl();
                         backId = odlb.getData().getId();
-                        Glide.with(con).load(url2).into(img2);
+//                        Glide.with(con).load(url2).into(img2);
+                        Glide.with(con).load(path).into(img2);
                         //自动调取提交功能，实现页面自动跳转
                         subimt();
                     } else {
@@ -800,13 +833,22 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
                     olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class);
                     if (olb.getCode() == 200) {
+                        if (olb.getData().isCarExist()) {
+                            value1.setEnabled(false);
+                            Glide.with(con).load(olb.getData().getExistCarInfo().getBackImage()).into(img2);
+                            url2 = olb.getData().getExistCarInfo().getBackImage();
+                            ToastUtils.showLongToast(con, "该车辆已存在,请仔细核对相关信息");
+                        } else {
+                            value1.setEnabled(true);
+                        }
                         url1 = olb.getData().getUrl();
                         value1.setText(olb.getData().getCarNumber());
                         value2.setText(olb.getData().getType());
                         value3.setText(olb.getData().getOwner());
                         value4.setText(olb.getData().getVehicleNumber());
                         fontId = olb.getData().getId();
-                        Glide.with(con).load(url1).into(img1);
+//                        Glide.with(con).load(url1).into(img1);
+                        Glide.with(con).load(path).into(img1);
                         oCrcarId = olb.getData().getCarId() + "";
                         Log.e("-cardId-", oCrcarId);
                     } else {
@@ -819,8 +861,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (oblb.getCode() == 200) {
                         url2 = oblb.getData().getUrl();
                         backId = oblb.getData().getId();
-                        Glide.with(con).load(url2).into(img2);
+//                        Glide.with(con).load(url2).into(img2);
-                        //自动调取提交功能，实现页面自动跳转
+                        Glide.with(con).load(path).into(img2);
+                        //自动调取提交功能，实现页面自动跳转实现页面自动跳转
                         subimt();
                     } else {
                         Toast.makeText(con, oblb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -832,7 +875,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (ub.getCode() == 200) {
                         url3 = ub.getData().getUrl();
                         fid = ub.getData().getId();
-                        Glide.with(con).load(url3).into(img3);
+//                        Glide.with(con).load(url3).into(img3);
+                        Glide.with(con).load(path).into(img3);
                     } else {
                         Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -876,7 +920,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
 
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
@@ -892,7 +936,16 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
+//                   if (cdb != null && cdb.getData().getTrailerResVo() &&cdb.getRes() == 1)
+                    boolean isExist = false;
+                    if (olb != null) {//主页识别成功后获取
+                        isExist = olb.getData().isCarExist();
+                    } else {
+                        if (cdb != null && cdb.getData().getTrailerResVo() != null && cdb.getRes() == 1) {//上个页面带来数据
+                            isExist = true;
+                        }
+                    }
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, isExist);
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
                 }
@@ -915,6 +968,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         switch (index) {
             case 0:
                 if (ocb != null && ocbb != null) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     IDInputBean ib = new IDInputBean();
                     ib.setIdcarName(str1);
                     ib.setIdcard(str2);
@@ -937,6 +992,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 //olb
                 //{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
                 if (odl != null && odlb != null) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     Log.e("ocr", new Gson().toJson(odl));
                     LicenseInputBean iib = new LicenseInputBean();
                     iib.setArchivesName(str1);
@@ -953,20 +1010,25 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 2:
-                if (olb != null && oblb != null) {
+                if ((olb != null && !olb.getData().isCarExist() && oblb != null) || (olb != null && olb.getData().isCarExist())) {
 //                    if (curColor == null || curEnergy == null) {
 //                        Toast.makeText(con, "请完善内容", Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     HashMap<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-                    map.put("licenseId", oblb.getData().getLicenseId());
+                    map.put("licenseId", olb.getData().isCarExist() ? olb.getData().getExistCarInfo().getLicenseId() : oblb.getData().getLicenseId());
                     map.put("carNumber", str1);
                     map.put("type", str2);
                     map.put("owner", str3);
                     map.put("vehicleNumber", str4);
+//                    if (olb.getData().isCarExist()) {
+//                        map.put("carId", olb.getData().getCarId());
+//                    }
 //                    map.put("carPlateColor", curColor.getValue());
 //                    map.put("carEnergyTyp", curEnergy.getValue());
                     new AuthRequest().saveVehicleLicense(con, hd, MapUtil.mapJson(map));
@@ -975,22 +1037,27 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 3:
-                if (olb != null && oblb != null) {
+                if (olb != null || (cdb != null && cdb.getRes() == 1)) {
 //                    if (curEnergy==null){
 //                        Toast.makeText(con,"请完善内容",Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     Map<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-                    map.put("licenseId", oblb.getData().getLicenseId());
+//                    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());
+                    }
                     new AuthRequest().saveDrawCar(con, hd, MapUtil.mapJson(map));
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();

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

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

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

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

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

@@ -241,7 +241,9 @@ public class HomeFragment extends BaseFragment {
                                 in.putExtra("url", deb.getData().getIdCardUpdateUrl());
                             }
                         }
-                        if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(deb.getData().getIdCardUpdateUrl())) {
+                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl())||
+                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl())||!TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl())||
+                                !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) {
                             new XToast<>(act)
                                     .setContentView(R.layout.view_bc)
                                     // 设置成可拖拽的
@@ -545,7 +547,6 @@ public class HomeFragment extends BaseFragment {
         ur.getImage(1);
 
 
-
         if (UiAuxiliary.isLogin(con)) {
             ur.User();
             ur.getDriverExpire();

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

@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -102,14 +103,18 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
 //                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
-
+                        if (null==bb.getData()){
-
+                            UiAuxiliary.homeRequest("接单");
+                            Intent in = new Intent(con, StartYunDanActivity.class);
+                            in.putExtra("id", "0");
+                            startActivity(in);
+                            finish();
+                        }else{
                             Intent intent = new Intent(this, H5Activity.class);
                             intent.putExtra("url", (String) bb.getData());
                             intent.putExtra("view_file", false);
                             startActivity(intent);
-
+                        }
-
                         //finish();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();

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

@@ -17,30 +17,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
 
+
 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.amap.api.maps.AMap;
-import com.amap.api.maps.CameraUpdateFactory;
 import com.amap.api.maps.LocationSource;
-import com.amap.api.maps.MapView;
-import com.amap.api.maps.model.BitmapDescriptorFactory;
-import com.amap.api.maps.model.LatLng;
-import com.amap.api.maps.model.LatLngBounds;
-import com.amap.api.maps.model.MarkerOptions;
-import com.amap.api.maps.model.PolylineOptions;
-
-import com.amap.api.services.core.AMapException;
 import com.amap.api.services.core.LatLonPoint;
-import com.amap.api.services.route.BusRouteResult;
-import com.amap.api.services.route.DrivePath;
-import com.amap.api.services.route.DriveRouteResult;
-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.ToastUtil;
 import com.bumptech.glide.Glide;
 import com.dahe.mylibrary.utils.TimeUtil;
 import com.dahe.mylibrary.utils.ToastUtils;
@@ -67,6 +51,27 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 import com.arpa.hndahesudintocctmsdriver.util.view.ScoreView;
+import com.lk.mapsdk.base.mapapi.initializer.InitializerOptions;
+import com.lk.mapsdk.base.mapapi.initializer.SDKInitializer;
+import com.lk.mapsdk.base.mapapi.model.CoordType;
+import com.lk.mapsdk.base.mapapi.model.LatLng;
+import com.lk.mapsdk.base.mapapi.model.LatLngBounds;
+import com.lk.mapsdk.map.mapapi.annotation.Marker;
+import com.lk.mapsdk.map.mapapi.annotation.Polyline;
+import com.lk.mapsdk.map.mapapi.annotation.options.MarkerOptions;
+import com.lk.mapsdk.map.mapapi.annotation.options.PolylineOptions;
+import com.lk.mapsdk.map.mapapi.annotation.util.BitmapDescriptorFactory;
+import com.lk.mapsdk.map.mapapi.camera.MapStatusUpdateFactory;
+import com.lk.mapsdk.map.mapapi.map.LKMap;
+import com.lk.mapsdk.map.mapapi.map.MapView;
+import com.lk.mapsdk.map.platform.style.layers.Property;
+import com.lk.mapsdk.route.mapapi.base.AutoInfo;
+import com.lk.mapsdk.route.mapapi.base.DrivingCostingOptionsInfo;
+import com.lk.mapsdk.route.mapapi.base.LocationsInfo;
+import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlan;
+import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlanOptions;
+import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlanResult;
+import com.lk.mapsdk.route.mapapi.driving.OnDrivingRoutePlanListener;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -82,7 +87,7 @@ public class StartYunDanActivity extends BaseActivity {
 
     private String TAG = "StartYunDanActivity";
     private NestedScrollView bottomSheet;
-    private MapView map;
+    private MapView mapView;
     private BaseRecyclerView brv;
     private AlphaAnimation mShowAnim, mHiddenAmin;//控件的显示和隐藏动画
     private LinearLayout protect;
@@ -144,7 +149,6 @@ public class StartYunDanActivity extends BaseActivity {
     }
 
     private UserBean ub;
-    private AMap aMap;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -152,6 +156,10 @@ public class StartYunDanActivity extends BaseActivity {
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_yundan_start);
         con = this;
+        mapView = findViewById(R.id.map);
+        mapView.onCreate(savedInstanceState);
+        mLKMap = mapView.getMap();
+        initMap();
         id = getIntent().getExtras().getInt("id");
         brv = findViewById(R.id.brv);
         protect = findViewById(R.id.protect);
@@ -161,12 +169,10 @@ public class StartYunDanActivity extends BaseActivity {
         mBottomSheetBehavior.setHideable(false);
         mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
         //mBottomSheetBehavior.set
-        map = findViewById(R.id.map);
+
-        map.onCreate(savedInstanceState);
+
-        if (aMap == null) {
+//        initLoaction();
-            aMap = map.getMap();
+
-            initLoaction();
-        }
         Log.e("--id--", "" + id);
         String userdata = SPUtil.getSP(con, "data", "userdata");
         if (!userdata.equals("")) {
@@ -315,7 +321,8 @@ public class StartYunDanActivity extends BaseActivity {
             }
             initZX(upkey, v15, position, o, 1);
         });
-        search();
+//        search();
+        doSearch();
     }
 
     public void initZX(boolean key, View v, int position, Object o, int type) {
@@ -449,8 +456,8 @@ public class StartYunDanActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (map != null) {
+        if (mapView != null) {
-            map.onResume();
+            mapView.onResume();
         }
         hyr.startOrder(id);
         hyr.getEvaluate(id);
@@ -459,223 +466,352 @@ public class StartYunDanActivity extends BaseActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        if (map != null) {
+        if (mapView != null) {
-            map.onPause();
+            mapView.onPause();
         }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (map != null) {
+        if (mapView != null) {
-            map.onDestroy();
+            mapView.onDestroy();
         }
     }
 
     @Override
     protected void onSaveInstanceState(@NonNull @NotNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        map.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
     }
 
     LocationSource.OnLocationChangedListener mListener;
     AMapLocationClient mlocationClient;
     AMapLocationClientOption mLocationOption;
 
-    public void initLoaction() {
+//    public void initLoaction() {
-        // 设置定位监听
+//        // 设置定位监听
-        aMap.setLocationSource(new LocationSource() {
+//        aMap.setLocationSource(new LocationSource() {
-            @Override
+//            @Override
-            public void activate(OnLocationChangedListener onLocationChangedListener) {
+//            public void activate(OnLocationChangedListener onLocationChangedListener) {
-                mListener = onLocationChangedListener;
+//                mListener = onLocationChangedListener;
-                if (mlocationClient == null) {
+//                if (mlocationClient == null) {
-                    //初始化定位
+//                    //初始化定位
-                    try {
-                        mlocationClient = new AMapLocationClient(con);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    //初始化定位参数
-                    mLocationOption = new AMapLocationClientOption();
-                    //设置定位回调监听
-                    mlocationClient.setLocationListener(new AMapLocationListener() {
-                        @Override
-                        public void onLocationChanged(AMapLocation aMapLocation) {
-                            if (mListener != null && aMapLocation != null) {
-                                if (aMapLocation != null
-                                        && aMapLocation.getErrorCode() == 0) {
-                                    mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
-                                } else {
-                                    String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
-                                    Log.e("AmapErr", errText);
-                                }
-                            }
-                        }
-                    });
-                    //设置为高精度定位模式
-                    mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
-                    // mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);
-                    //设置定位模式为AMapLocationMode.Device_Sensors，仅设备模式。
-                    //mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Device_Sensors);
-                    //获取一次定位结果：
-                    //该方法默认为false。
-                    mLocationOption.setOnceLocation(true);
-                    //获取最近3s内精度最高的一次定位结果：
-                    //设置setOnceLocationLatest(boolean b)接口为true，启动定位时SDK会返回最近3s内精度最高的一次定位结果。如果设置其为true，setOnceLocation(boolean b)接口也会被设置为true，反之不会，默认为false。
-                    mLocationOption.setOnceLocationLatest(true);
-                    //设置是否返回地址信息（默认返回地址信息）
-                    mLocationOption.setNeedAddress(true);
-                    //设置是否允许模拟位置,默认为true，允许模拟位置
-                    mLocationOption.setMockEnable(true);
-                    //单位是毫秒，默认30000毫秒，建议超时时间不要低于8000毫秒。
-                    mLocationOption.setHttpTimeOut(20000);
-                    //关闭缓存机制
-                    mLocationOption.setLocationCacheEnable(false);
-                    //设置定位参数
-                    mlocationClient.setLocationOption(mLocationOption);
-                    // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
-                    // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
-                    // 在定位结束后，在合适的生命周期调用onDestroy()方法
-                    // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
-                    mlocationClient.startLocation();//启动定位
-                }
-            }
-
-            @Override
-            public void deactivate() {
-                mListener = null;
-                if (mlocationClient != null) {
-                    mlocationClient.stopLocation();
-                    mlocationClient.onDestroy();
-                }
-                mlocationClient = null;
-            }
-        });
-        // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
-        aMap.setMyLocationEnabled(true);
-//        ld=new LocationGDUtil(con,hd);
-//        ld.onCreate();
-    }
-
-
-    private RouteSearch mRouteSearch;//路线查询器
-    private List<LatLonPoint> lists = new ArrayList<>();
-
-
-    public void search() {
 //                    try {
-//            AMapLocationClient.updatePrivacyShow(con,true,true);
+//                        mlocationClient = new AMapLocationClient(con);
-//            AMapLocationClient.updatePrivacyAgree(con,true);
+//                    } catch (Exception e) {
-        mRouteSearch = new RouteSearch(this);
-//        } catch (AMapException e) {
 //                        e.printStackTrace();
 //                    }
-        //设置数据回调监听器
+//                    //初始化定位参数
-        mRouteSearch.setRouteSearchListener(new OnRouteSearchListener());
+//                    mLocationOption = new AMapLocationClientOption();
-        //设置开始位置坐标点(注意经纬度不能写反,会报错1800(只能规划到中国区域里的地图路线))
+//                    //设置定位回调监听
-        LatLonPoint startPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                    mlocationClient.setLocationListener(new AMapLocationListener() {
-                Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
+//                        @Override
-        //设置目的地坐标点
+//                        public void onLocationChanged(AMapLocation aMapLocation) {
-        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+//                            if (mListener != null && aMapLocation != null) {
-                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+//                                if (aMapLocation != null
-        //查询信息对象
+//                                        && aMapLocation.getErrorCode() == 0) {
-        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+//                                    mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
-            if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+//                                } else {
-                LatLonPoint sp = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
+//                                    String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
-                        Double.parseDouble(sob.getData().getWayChildren().get((i)).getLongitude()));
+//                                    Log.e("AmapErr", errText);
-                lists.add(sp);
+//                                }
-            }
+//                            }
-        }
+//                        }
-        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint, endPoint);
+//                    });
-        //设置搜索参数 1.fromAndTo 路径的起点终点  2.路径规划的策略(这里是驾车模式,具体看高德API) 3.途
+//                    //设置为高精度定位模式
-        //经点，可选 4.避让区域，可选， 5.避让道路 ,可选
+//                    mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
-        RouteSearch.DriveRouteQuery query = new
+//                    // mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);
-                RouteSearch.DriveRouteQuery(fromAndTo, RouteSearch.DRIVING_SINGLE_DEFAULT, lists, null, "");
+//                    //设置定位模式为AMapLocationMode.Device_Sensors，仅设备模式。
-        //开始异步查询
+//                    //mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Device_Sensors);
-        mRouteSearch.calculateDriveRouteAsyn(query);
+//                    //获取一次定位结果：
+//                    //该方法默认为false。
+//                    mLocationOption.setOnceLocation(true);
+//                    //获取最近3s内精度最高的一次定位结果：
+//                    //设置setOnceLocationLatest(boolean b)接口为true，启动定位时SDK会返回最近3s内精度最高的一次定位结果。如果设置其为true，setOnceLocation(boolean b)接口也会被设置为true，反之不会，默认为false。
+//                    mLocationOption.setOnceLocationLatest(true);
+//                    //设置是否返回地址信息（默认返回地址信息）
+//                    mLocationOption.setNeedAddress(true);
+//                    //设置是否允许模拟位置,默认为true，允许模拟位置
+//                    mLocationOption.setMockEnable(true);
+//                    //单位是毫秒，默认30000毫秒，建议超时时间不要低于8000毫秒。
+//                    mLocationOption.setHttpTimeOut(20000);
+//                    //关闭缓存机制
+//                    mLocationOption.setLocationCacheEnable(false);
+//                    //设置定位参数
+//                    mlocationClient.setLocationOption(mLocationOption);
+//                    // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
+//                    // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
+//                    // 在定位结束后，在合适的生命周期调用onDestroy()方法
+//                    // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
+//                    mlocationClient.startLocation();//启动定位
+//                }
+//            }
+//
+//            @Override
+//            public void deactivate() {
+//                mListener = null;
+//                if (mlocationClient != null) {
+//                    mlocationClient.stopLocation();
+//                    mlocationClient.onDestroy();
+//                }
+//                mlocationClient = null;
+//            }
+//        });
+//        // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
+////        aMap.setMyLocationEnabled(true);
+////        ld=new LocationGDUtil(con,hd);
+////        ld.onCreate();
+//    }
+
+    private void initMap(){
+        // 通过InitializerOptions指定初始化配置参数
+        InitializerOptions options = new InitializerOptions();
+        // 设置是否使用Https网络请求,默认使用
+//        options.setIsHttpsEnable(true);
+        // 设置坐标系,默认GCJ02
+//        options.setCoorType(CoordType.GCJ02);
+
+        SDKInitializer.initialization(getApplicationContext(),options);
     }
 
+    private DrivingRoutePlanOptions drivingRoutePlanOptions;
+    private List<LocationsInfo> locationsInfos;
 
-    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener {
+    private List<Polyline> polylines = new ArrayList<>();
+    private List<Marker> markers = new ArrayList<>();
+
+    private LKMap mLKMap;
+
+    private void doSearch() {
+        DrivingRoutePlan search = new DrivingRoutePlan();
+
+        drivingRoutePlanOptions = new DrivingRoutePlanOptions();
+        locationsInfos = new ArrayList<>();
+        // 设置开始坐标
+        LocationsInfo origin = new LocationsInfo();
+        origin.setLat(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()));
+        origin.setLon(Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
+        // 设置结束坐标
+        LocationsInfo dest = new LocationsInfo();
+        dest.setLat(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()));
+        dest.setLon(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+        locationsInfos.add(origin);
+        locationsInfos.add(dest);
+        drivingRoutePlanOptions.setLocations(locationsInfos);
+        AutoInfo autoInfo = new AutoInfo();
+        DrivingCostingOptionsInfo drivingCostingOptionsInfo = new DrivingCostingOptionsInfo();
+        drivingCostingOptionsInfo.setAuto(autoInfo);
+        drivingRoutePlanOptions.setDrivingCostingOptions(drivingCostingOptionsInfo);
+
+        search.drivingRoutePlanRequest(drivingRoutePlanOptions, new OnDrivingRoutePlanListener() {
 
             @Override
-        public void onBusRouteSearched(BusRouteResult busRouteResult, int i) {
+            public void onGetDrivingRoutePlanResult(DrivingRoutePlanResult routePlanResult) {
-
+                addRoutePlanLine(routePlanResult);
+                addRouteMarker();
+            }
+        });
+    }
+
+    /**
+     * 添加线路规划路线
+     *
+     * @param routePlanResult
+     */
+    private void addRoutePlanLine(DrivingRoutePlanResult routePlanResult) {
+        if (routePlanResult == null) {
+            Toast.makeText(this, "没有检索到结果", Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        if (routePlanResult.getRouteInfos() == null || routePlanResult.getRouteInfos().isEmpty()) {
+            Toast.makeText(this, "没有检索到结果", Toast.LENGTH_LONG).show();
+            return;
         }
 
-        @Override
-        public void onDriveRouteSearched(DriveRouteResult driveRouteResult, int rCode) {
-            if (rCode == 1000) {//获取规划路线成功,获取到的是了,路线坐标点的集合
-                List<DrivePath> paths = driveRouteResult.getPaths();
-                //创建存储坐标点的集合
         List<LatLng> latLngs = new ArrayList<>();
-                //遍历获取规划的所有路线坐标点
+        List<LatLng> all = new ArrayList<>();
-                for (DrivePath mDrivePath : paths) {
+        mLKMap.removeOverlay(polylines);
-                    for (DriveStep mDriveStep : mDrivePath.getSteps()) {
+        polylines.clear();
-                        for (LatLonPoint mLatLonPoint : mDriveStep.getPolyline()) {
+
-                            latLngs.add(new
+        if (routePlanResult.getRouteInfos().size()>0){
-                                    LatLng(mLatLonPoint.getLatitude(), mLatLonPoint.getLongitude()));
+            latLngs.clear();
+            latLngs.addAll(routePlanResult.getRouteInfos().get(0).getGeometry());
+            PolylineOptions options = new PolylineOptions();
+            options.width(8f)
+                    .joinStyle(Property.LINE_JOIN_ROUND)
+                    .points(latLngs)
+                    .color(getResources().getColor(R.color.theme_color));
+            all.addAll(latLngs);
+            polylines.add((Polyline) mLKMap.addOverlay(options));
         }
+
+
+
+
+//        for (int i = 0;i < routePlanResult.getRouteInfos().size();i ++){
+//            latLngs.clear();
+//            latLngs.addAll(routePlanResult.getRouteInfos().get(i).getGeometry());
+//            PolylineOptions options = new PolylineOptions();
+//            if(i == routePlanResult.getRouteInfos().size() - 1){
+//                options.width(8f)
+////                        .pattern(BitmapDescriptorFactory.fromResource(R.drawable.icon_roud_type))
+//                        .joinStyle(Property.LINE_JOIN_ROUND)
+//                        .points(latLngs)
+//                        .color(getResources().getColor(R.color.theme_color));
+//            }else{
+//                options.width(8f)
+////                        .joinStyle(Property.LINE_JOIN_ROUND)
+//                        .points(latLngs)
+//                        .color(getResources().getColor(R.color.theme_color));
+//            }
+//            all.addAll(latLngs);
+//            polylines.add((Polyline) mLKMap.addOverlay(options));
+//        }
+        mLKMap.setMapStatus(MapStatusUpdateFactory.buildUpdateByLatLngBounds(new LatLngBounds(all),100,100,100,100));
     }
-                }
+
-                //先清除一下,避免重复显示
+    /**
-                aMap.clear();
+     * 添加起始点标记
-                //绘制起始位置和目的地marker
+     */
-                aMap.addMarker(new MarkerOptions()
+    private void addRouteMarker() {
+        mLKMap.removeOverlay(markers);
+        markers.clear();
+        MarkerOptions originOptions = new MarkerOptions()
+                .position(new LatLng(locationsInfos.get(0).getLat(),locationsInfos.get(0).getLon()))
                 .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
-                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                                Double.parseDouble(sob.getData().getWayChildren().get(0).getLongitude()))));
+                .iconScale(0.5f);
-                for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+        markers.add((Marker) mLKMap.addOverlay(originOptions));
-                    if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+
-                        StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+        MarkerOptions destinationOptions = new MarkerOptions()
-                        int icon = 0;
+                .position(new LatLng(locationsInfos.get(1).getLat(),locationsInfos.get(1).getLon()))
-                        if (sdw.getType() == 1) {
-                            icon = R.mipmap.z_loc;
-                        } else {
-                            icon = R.mipmap.x_loc;
-                        }
-                        aMap.addMarker(new MarkerOptions()
-                                .icon(BitmapDescriptorFactory.fromResource(icon))
-                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()), Double.parseDouble(sdw.getLongitude()))));
-                    }
-                }
-                aMap.addMarker(new MarkerOptions()
                 .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
-                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()))));
+                .iconScale(0.5f);
-                //绘制规划路径路线
+        markers.add((Marker) mLKMap.addOverlay(destinationOptions));
-                aMap.addPolyline(new PolylineOptions()
-                        //路线坐标点的集合
-                        .addAll(latLngs)
-                        //线的宽度
-                        .width(8)
-                        .color(getResources().getColor(R.color.theme_color)));
-                //设置画线的颜色
-
-                //显示完整包含所有marker地图路线
-                LatLngBounds.Builder builder = LatLngBounds.builder();
-                for (int i = 0; i < latLngs.size(); i++) {
-                    builder.include(latLngs.get(i));
-                }
-                //显示全部marker,第二个参数是四周留空宽度
-                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 200));
-                LatLng latLng = new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
-                        Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));//构造一个位置
-                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 6));
-            }
     }
 
-        @Override
-        public void onWalkRouteSearched(WalkRouteResult walkRouteResult, int i) {
 
-        }
+//    private RouteSearch mRouteSearch;//路线查询器
+//    private List<LatLonPoint> lists = new ArrayList<>();
 
-        @Override
-        public void onRideRouteSearched(RideRouteResult rideRouteResult, int i) {
 
-        }
+//    public void search() {
+////        try {
+////            AMapLocationClient.updatePrivacyShow(con,true,true);
+////            AMapLocationClient.updatePrivacyAgree(con,true);
+//        mRouteSearch = new RouteSearch(this);
+////        } catch (AMapException e) {
+////            e.printStackTrace();
+////        }
+//        //设置数据回调监听器
+//        mRouteSearch.setRouteSearchListener(new OnRouteSearchListener());
+//        //设置开始位置坐标点(注意经纬度不能写反,会报错1800(只能规划到中国区域里的地图路线))
+//        LatLonPoint startPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
+//        //设置目的地坐标点
+//        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+//                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+//        //查询信息对象
+//        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+//            if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+//                LatLonPoint sp = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
+//                        Double.parseDouble(sob.getData().getWayChildren().get((i)).getLongitude()));
+//                lists.add(sp);
+//            }
+//        }
+//        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint, endPoint);
+//        //设置搜索参数 1.fromAndTo 路径的起点终点  2.路径规划的策略(这里是驾车模式,具体看高德API) 3.途
+//        //经点，可选 4.避让区域，可选， 5.避让道路 ,可选
+//        RouteSearch.DriveRouteQuery query = new
+//                RouteSearch.DriveRouteQuery(fromAndTo, RouteSearch.DRIVING_SINGLE_DEFAULT, lists, null, "");
+//        //开始异步查询
+//        mRouteSearch.calculateDriveRouteAsyn(query);
+//    }
 
-    }
+
+//    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener {
+//
+//        @Override
+//        public void onBusRouteSearched(BusRouteResult busRouteResult, int i) {
+//
+//        }
+//
+//        @Override
+//        public void onDriveRouteSearched(DriveRouteResult driveRouteResult, int rCode) {
+//            if (rCode == 1000) {//获取规划路线成功,获取到的是了,路线坐标点的集合
+//                List<DrivePath> paths = driveRouteResult.getPaths();
+//                //创建存储坐标点的集合
+//                List<LatLng> latLngs = new ArrayList<>();
+//                //遍历获取规划的所有路线坐标点
+//                for (DrivePath mDrivePath : paths) {
+//                    for (DriveStep mDriveStep : mDrivePath.getSteps()) {
+//                        for (LatLonPoint mLatLonPoint : mDriveStep.getPolyline()) {
+//                            latLngs.add(new
+//                                    LatLng(mLatLonPoint.getLatitude(), mLatLonPoint.getLongitude()));
+//                        }
+//                    }
+//                }
+//                //先清除一下,避免重复显示
+//                aMap.clear();
+//                //绘制起始位置和目的地marker
+//                aMap.addMarker(new MarkerOptions()
+//                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
+//                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                                Double.parseDouble(sob.getData().getWayChildren().get(0).getLongitude()))));
+//                for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+//                    if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+//                        StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+//                        int icon = 0;
+//                        if (sdw.getType() == 1) {
+//                            icon = R.mipmap.z_loc;
+//                        } else {
+//                            icon = R.mipmap.x_loc;
+//                        }
+//                        aMap.addMarker(new MarkerOptions()
+//                                .icon(BitmapDescriptorFactory.fromResource(icon))
+//                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()), Double.parseDouble(sdw.getLongitude()))));
+//                    }
+//                }
+//                aMap.addMarker(new MarkerOptions()
+//                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
+//                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+//                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()))));
+//                //绘制规划路径路线
+//                aMap.addPolyline(new PolylineOptions()
+//                        //路线坐标点的集合
+//                        .addAll(latLngs)
+//                        //线的宽度
+//                        .width(8)
+//                        .color(getResources().getColor(R.color.theme_color)));
+//                //设置画线的颜色
+//
+//                //显示完整包含所有marker地图路线
+//                LatLngBounds.Builder builder = LatLngBounds.builder();
+//                for (int i = 0; i < latLngs.size(); i++) {
+//                    builder.include(latLngs.get(i));
+//                }
+//                //显示全部marker,第二个参数是四周留空宽度
+//                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 200));
+//                LatLng latLng = new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                        Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));//构造一个位置
+//                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 6));
+//            }
+//        }
+//
+//        @Override
+//        public void onWalkRouteSearched(WalkRouteResult walkRouteResult, int i) {
+//
+//        }
+//
+//        @Override
+//        public void onRideRouteSearched(RideRouteResult rideRouteResult, int i) {
+//
+//        }
+//
+//    }
 
     public void up_traffic() {
 //        ShippingNoteInfo[] snis=new ShippingNoteInfo[1];
@@ -697,4 +833,25 @@ public class StartYunDanActivity extends BaseActivity {
 //        });
     }
 
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mapView.onStart();
+    }
+
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mapView.onStop();
+    }
+
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapView.onDestroy();
+    }
+
 }

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

@@ -19,6 +19,7 @@ import com.alct.mdp.callback.OnResultListener;
 import com.alct.mdp.model.Goods;
 import com.alct.mdp.model.Image;
 import com.alct.mdp.model.Location;
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
@@ -93,11 +94,15 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("upload") != null) {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     Log.e("upload", CacheGroup.cacheList.get("upload"));
                     ub = gson.fromJson(CacheGroup.cacheList.remove("upload"), UploadBean.class);
                     if (ub.getCode() == 200) {
                         imgIds.add(ub.getData().getId());
-                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
+//                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
+                        Glide.with(con).load(path).into(res_img);
                         res_img.setVisibility(View.VISIBLE);
                         img_delete.setVisibility(View.VISIBLE);
                         img_icon.setVisibility(View.GONE);
@@ -113,6 +118,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                         if (bb.getCode() == 200) {
                             if (index == 2) {
                                 if (!keys) {//装货回单
+                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                        customDialog.dismiss();
+                                    }
                                     Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
@@ -148,6 +156,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                             hyr.uploadFile(new File(path));
                         }
                     } else {//识别失败后返回code500
+                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                            customDialog.dismiss();
+                        }
                         if (index == 0) {//装卸货车辆需要识别车牌号){
                             Toast.makeText(con, "装货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
                         } else if (index == 1) {
@@ -160,7 +171,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 14://定位成功
                 locationKey = true;
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                     customDialog.dismiss();
+                }
                 tv_loaction.setText("定位成功");
                 tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
                 latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude()));
@@ -168,7 +181,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 16://定位失败
                 locationKey = false;
+                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();
@@ -186,7 +201,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //                if(index==1 || index==2){
 //                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
 //                }
-                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
+                if ((index == 0 || index == 1) && !BuildConfig.isTest) {//装卸货车辆需要识别车牌号,测试环境不校验车牌号
                     new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
                 } else {
                     hyr.uploadFile(new File(path));
@@ -196,6 +211,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
         }
     }
+
     private LatLng latLng;
 
     public LatLng convertGPSToBaidu(LatLng srLatLng) {
@@ -323,6 +339,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             path = gia.getFile().getPath();
             Log.e("图片地址:", path);
             gia.dis();
+
+            if (customDialog != null && !customDialog.isShowing()) {
+                customDialog = new CustomDialog(con, "网络请求中...");
+                customDialog.show();
+            }
+
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
@@ -336,6 +358,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 path = paths;
                 Log.e("图片地址:", path);
                 gia.dis();
+
+                if (customDialog != null && !customDialog.isShowing()) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
+                }
+
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
         }
@@ -349,6 +377,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //        for(int i=0;i<imgIds.size();i++){
 //            Log.e("--imgIds--",imgIds.get(i)+"");
 //        }
+        if (customDialog != null && !customDialog.isShowing()) {
+            customDialog = new CustomDialog(con, "网络请求中...");
+            customDialog.show();
+        }
         switch (index) {
             case 0:
                 //装货
@@ -532,6 +564,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
                 Log.e("上报安联", "装货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -564,6 +599,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
                 Log.e("上报安联", "卸货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -572,6 +610,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             @Override
             public void onFailure(String s, String s1) {
                 Log.e("上报安联失败(卸货照片):", s + s1);
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
 //                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
 //                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -597,6 +638,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
                 Log.e("上报安联", "回单照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -644,8 +688,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     }
 
 
-
-
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -674,6 +716,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(装货):", s + s1);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });
@@ -711,6 +756,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });

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

@@ -7,8 +7,11 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -19,6 +22,17 @@ 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.amap.api.maps.CameraUpdateFactory;
+import com.amap.api.services.core.AMapException;
+import com.amap.api.services.core.LatLonPoint;
+import com.amap.api.services.geocoder.GeocodeAddress;
+import com.amap.api.services.geocoder.GeocodeQuery;
+import com.amap.api.services.geocoder.GeocodeResult;
+import com.amap.api.services.geocoder.GeocodeSearch;
+import com.amap.api.services.geocoder.RegeocodeResult;
+import com.amap.api.services.help.Inputtips;
+import com.amap.api.services.help.InputtipsQuery;
+import com.amap.api.services.help.Tip;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
@@ -47,22 +61,35 @@ import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.CoordinateConverter;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.ToastUtils;
+import com.github.gzuliyujiang.wheelpicker.DatePicker;
+import com.github.gzuliyujiang.wheelpicker.DatimePicker;
+import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
+import com.github.gzuliyujiang.wheelpicker.annotation.TimeMode;
+import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener;
+import com.github.gzuliyujiang.wheelpicker.contract.OnDatimePickedListener;
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity;
+import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity;
 import com.google.gson.Gson;
 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.interfaces.OnSelectListener;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
-public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
+public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements Inputtips.InputtipsListener {
 
-    private TextView submit, name_top, name_body, address, tips, tips_x;
+    private TextView submit, name_top, name_body, address, tips, tips_x,tvDate,tvLocation;
     private RelativeLayout getImg;
+    private EditText etAddress;
+    private Button btnOk;
     private ImageView res_img, img_icon, img_delete;
     private String[] names = {"装货", "卸货", "回单"};
     public static String[] TYPE_NAME = {"zhuanghuo", "xiehuo", "huidan"};
@@ -86,7 +113,64 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
     private boolean locationKey = false;
     private TextView tv_loaction;
 
-    private TempLoca tempLoca = new TempLoca(36.11944878,120.10315118,"中国山东省青岛市黄岛区铁峰山路","2023-09-23 11:19");
+
+    private String selDate;
+    private GeocodeSearch geocoderSearch;
+
+    private TempLoca tempLoca = new TempLoca();
+    private TempLoca tempLocaBd = new TempLoca();
+
+
+    @Override
+    public void onGetInputtips(List<Tip> tipList, int rCode) {
+        if (rCode == AMapException.CODE_AMAP_SUCCESS) {
+            List<String> names = new ArrayList<String>();
+            if(tipList != null) {
+                int size = tipList.size();
+                for (int i = 0; i < size; i++) {
+                    Tip tip = tipList.get(i);
+                    if(tip != null) {
+                        names.add(tip.getDistrict()+tip.getName());
+                    }
+                }
+
+                new XPopup.Builder(this)
+                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+                        .hasShadowBg(false) // 去掉半透明背景
+                        .atView(etAddress)
+                        .asAttachList(names.toArray(new String[0]), new int[]{}, new OnSelectListener() {
+                            @Override
+                            public void onSelect(int position, String text) {
+                                Tip tip = tipList.get(position);
+                                etAddress.setText(tip.getDistrict()+tip.getAddress()+tip.getName());
+                                LatLonPoint latLonPoint = tip.getPoint();
+                                tempLoca.setAddress(etAddress.getText().toString());
+                                tempLoca.setLatitude(latLonPoint.getLatitude());
+                                tempLoca.setLongitude(latLonPoint.getLongitude());
+                                tempLoca.setTime(tvDate.getText().toString());
+
+                                LatLng latLng = convertGPSToBaidu(new LatLng(latLonPoint.getLatitude(), latLonPoint.getLongitude()));
+                                tempLocaBd.setLongitude(latLng.longitude);
+                                tempLocaBd.setLatitude(latLng.latitude);
+                                tempLocaBd.setAddress(etAddress.getText().toString());
+                                tempLocaBd.setTime(tvDate.getText().toString());
+
+                            }
+                        })
+                        .show();
+
+
+
+//                SimpleAdapter aAdapter = new SimpleAdapter(getApplicationContext(), listString, R.layout.item_layout,
+//                        new String[]{"name", "address"}, new int[]{R.id.poi_field_id, R.id.poi_value_id});
+//
+//                minputlist.setAdapter(aAdapter);
+//                aAdapter.notifyDataSetChanged();
+            }
+
+        } else {
+        }
+    }
 
     class TempLoca{
         private double latitude;
@@ -275,6 +359,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
         img_icon = findViewById(R.id.img_icon);
         img_delete = findViewById(R.id.img_delete);
         tv_loaction = findViewById(R.id.tv_loaction);
+        btnOk = findViewById(R.id.btnOk);
+        etAddress = findViewById(R.id.etAddress);
+        tvDate = findViewById(R.id.tvDate);
+        tvLocation = findViewById(R.id.tvLocation);
         tips = findViewById(R.id.tips);
         tips_x = findViewById(R.id.tips_x);
         Bundle ins = getIntent().getExtras();
@@ -297,6 +385,44 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
                 lgdu.onCreate();
             }
         });
+
+        btnOk.setOnClickListener(v -> {
+            String s = etAddress.getText().toString();
+            if (TextUtils.isEmpty(selDate)){
+                ToastUtils.showToast(this,"请先选择时间");
+                return;
+            }
+            if (!TextUtils.isEmpty(s)&&s.length()>=4){
+
+                InputtipsQuery inputquery = new InputtipsQuery(s, "");
+//                inputquery.setCityLimit(true);
+                Inputtips inputTips = new Inputtips(this, inputquery);
+                inputTips.setInputtipsListener(this);
+                inputTips.requestInputtipsAsyn();
+
+
+//                GeocodeQuery query = new GeocodeQuery(s, "100000");// 第一个参数表示地址，第二个参数表示查询城市，中文或者中文全拼，citycode、adcode，
+//                geocoderSearch.getFromLocationNameAsyn(query);// 设置同步地理编码请求
+            }else{
+                ToastUtils.showToast(this,"请输入地址且长度大于4");
+            }
+        });
+
+        tvDate.setOnClickListener(v -> {
+
+            DatimePicker datimePicker = new DatimePicker(this);
+            datimePicker.setBodyWidth(300);
+            datimePicker.getWheelLayout().setRange(DatimeEntity.yearOnFuture(-1),DatimeEntity.yearOnFuture(10),DatimeEntity.now());
+            datimePicker.setOnDatimePickedListener((year, month, day, hour, minute, second) -> {
+                selDate = year+"-"+month+"-"+day+" "+ hour+":"+minute;
+                tvDate.setText(selDate);
+            });
+            datimePicker.getWheelLayout().setDateLabel("年", "月", "日");
+            datimePicker.getWheelLayout().setTimeLabel("时","分","");
+            datimePicker.getWheelLayout().setTimeMode(TimeMode.HOUR_24_NO_SECOND);
+            datimePicker.show();
+        });
+
         hyr = new HuoYuanRequset(con, hd);
     }
 
@@ -391,9 +517,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
             case 0:
                 //装货
                 if (imgIds != null && imgIds.size() > 0) {
-                    lub.setLatitude(lgdu.getLatitude() + "");
+                    lub.setLatitude(tempLoca.getLatitude() + "");
-                    lub.setLongitude(lgdu.getLongitude() + "");
+                    lub.setLongitude(tempLoca.getLongitude() + "");
-                    lub.setLocationAddress(lgdu.getAddress());
+                    lub.setLocationAddress(tempLoca.getAddress());
                     lub.setImageId(imgIds);
                     lub.setWaybillId(wid);
                     Log.e("--装货信息", gson.toJson(lub));
@@ -420,8 +546,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
                     lub.setLocationAddress(tempLoca.getAddress());
                     lub.setImageId(imgIds);
                     lub.setWaybillId(wid);
+                    lub.setRealLoadTime(tempLoca.getTime());
                     Log.e("--卸货信息", gson.toJson(lub));
-                    if (locationKey) {
+                    if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) {
                         if (keys) {
                             nfc();
                             uploadInfo();
@@ -450,7 +577,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
                     urib.setWaybillId(wid);
                     Log.e("--回单信息", gson.toJson(urib));
                     if (locationKey) {
-                        if (index == 2 && keys) {
+                        if (index == 2 && keys && !TextUtils.isEmpty(tempLoca.address)) {
                             up_trafficSign();
                             up_trafficReceipt();
                             receipt_image();
@@ -495,10 +622,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
     public void up_trafficSign() {
         //安联
         Location l = new Location();
-        l.setBaiduLongitude(tempLoca.longitude);
+        l.setBaiduLongitude(tempLocaBd.longitude);
-        l.setBaiduLatitude(tempLoca.latitude);
+        l.setBaiduLatitude(tempLocaBd.latitude);
-        l.setLocation(tempLoca.getAddress());
+        l.setLocation(tempLocaBd.getAddress());
-        l.setTime(tempLoca.getTime());
+        l.setTime(tempLocaBd.getTime());
         List<Goods> gs = new ArrayList<>();
         for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
             if (wid.equals(wayChild.getId() + "")) {
@@ -535,10 +662,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
     public void up_trafficReceipt() {
         //安联
         Location l = new Location();
-        l.setBaiduLongitude(tempLoca.longitude);
+        l.setBaiduLongitude(tempLocaBd.longitude);
-        l.setBaiduLatitude(tempLoca.latitude);
+        l.setBaiduLatitude(tempLocaBd.latitude);
-        l.setLocation(tempLoca.getAddress());
+        l.setLocation(tempLocaBd.getAddress());
-        l.setTime(tempLoca.getTime());
+        l.setTime(tempLocaBd.getTime());
         MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
 
             @Override
@@ -563,9 +690,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
-        image.setBaiduLongitude(latLng.longitude);
+        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(latLng.latitude);
+        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(lgdu.getAddress());
+        image.setLocation(tempLocaBd.getAddress());
         MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
 
             @Override
@@ -594,10 +721,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
         image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(tempLoca.getTime());
+        image.setImageTakenDate(tempLocaBd.getTime());
-        image.setBaiduLongitude(tempLoca.longitude);
+        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLoca.latitude);
+        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLoca.getAddress());
+        image.setLocation(tempLocaBd.getAddress());
         MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
 
             @Override
@@ -627,10 +754,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
         image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(tempLoca.getTime());
+        image.setImageTakenDate(tempLocaBd.getTime());
-        image.setBaiduLongitude(tempLoca.longitude);
+        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLoca.latitude);
+        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLoca.getAddress());
+        image.setLocation(tempLocaBd.getAddress());
         MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
 
             @Override
@@ -691,10 +818,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
         //安联
         if (sob.getData().getReportAlct() == 1) {
             Location l = new Location();
-            l.setBaiduLongitude(latLng.longitude);
+            l.setBaiduLongitude(tempLocaBd.longitude);
-            l.setBaiduLatitude(latLng.latitude);
+            l.setBaiduLatitude(tempLocaBd.latitude);
-            l.setLocation(lgdu.getAddress());
+            l.setLocation(tempLocaBd.getAddress());
-            l.setTime(Timer.getTimerT());
+            l.setTime(tempLocaBd.getTime());
             MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
                 @Override
                 public void onSuccess() {
@@ -727,10 +854,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
         //安联
         if (sob.getData().getReportAlct() == 1) {
             Location l = new Location();
-            l.setBaiduLongitude(tempLoca.longitude);
+            l.setBaiduLongitude(tempLocaBd.longitude);
-            l.setBaiduLatitude(tempLoca.latitude);
+            l.setBaiduLatitude(tempLocaBd.latitude);
-            l.setLocation(tempLoca.getAddress());
+            l.setLocation(tempLocaBd.getAddress());
-            l.setTime(tempLoca.getTime());
+            l.setTime(tempLocaBd.getTime());
             Log.e("-安联卸货信息-", gson.toJson(l));
             MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
                 @Override
@@ -741,7 +868,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
                         JTTProcess.stop(con, sob, "");
                     }
                     //卸货状态-平台
-                    hyr.dischargeCargo(lub);
+                    hyr.dischargeCargo4(lub);
                     //卸货照片-安联
                     up_image();
                 }
@@ -749,7 +876,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
-                    new MessageUtils().showCenMessage(con, s1);
+//                    new MessageUtils().showCenMessage(con, s1);
+                    //运单状态不一致，平台更新状态
+                    hyr.dischargeCargo4(lub);
                 }
             });
         }

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

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

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

@@ -30,10 +30,12 @@ import androidx.core.app.ActivityCompat;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.arpa.hndahesudintocctmsdriver.BuildConfig;
+import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
+import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
 import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
@@ -138,8 +140,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
             new XPopup.Builder(con)
                     .dismissOnBackPressed(false)
                     .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/huawei/#/private",
+                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/currency/#/",
-                            "http://agreement.dahehuoyun.com/#/user", hd))
+                            "https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
                     .show();
         }
         Glide.with(con)
@@ -159,6 +161,16 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 initRequest();
             }
         }, 1000);
+        AppInfoBean appInfoBean = new AppInfoBean();
+
+        if (!UiAuxiliary.isLogin(con)) {
+            ur.postAppInfo(appInfoBean, "post");
+        }else{
+            String sp = SPUtil.getSP(con, LoginActivity.USER, LoginActivity.USER_UNAME);
+            appInfoBean.setUserPhone(sp);
+            appInfoBean.setStatus("0");
+            ur.postAppInfo(appInfoBean, "post");
+        }
 
 //        String[] permissions=new String[]{
 //                Manifest.permission.ACCESS_FINE_LOCATION,

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

@@ -18,12 +18,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
+import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
-import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
@@ -170,12 +170,14 @@ public class MyFragment extends BaseFragment {
                         startActivity(in);
                     });
                     break;
-                default:break;
+                default:
+                    break;
             }
         });
     }
 
-    class Model{ }
+    class Model {
+    }
 
     public void getRequest() {
         sob = StartOrderParts.getStartOrder(con);
@@ -296,6 +298,13 @@ public class MyFragment extends BaseFragment {
             ur.vehicleList("1");
         }
     }
+
+    @Subscribe
+    public void refreshCarListEvent(RefreshCarListEvent event) {
+        Log.e("-msg-", event.getMessage());
+        ur.vehicleList("1");
+    }
+
     @Subscribe
     public void personResult(PersonEvent home) {
         Log.e("-res-", home.getMessage());

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

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

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewActivity.java

@@ -1,21 +1,14 @@
 package com.arpa.hndahesudintocctmsdriver.ui.news;
 
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
-import android.provider.Settings;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.arpa.hndahesudintocctmsdriver.R;
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BottomTabUtil;
-import com.dahe.mylibrary.utils.ToastUtils;
 
 /**
  * @author hlh
@@ -34,33 +27,6 @@ public class NewActivity extends BaseAppCompatActivity {
         fs[0] =new NewsFragment();
         BottomTabUtil bt =new BottomTabUtil(this,R.id.body, fs);
         bt.selectItem(fs[0]);
-
-
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (!Environment.isExternalStorageManager()) {
-                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
-                intent.setData(Uri.parse("package:" + getPackageName()));
-                this.startActivityForResult(intent, 1024);
-            }
-        }
     }
 
-    private boolean isRefuse = false;
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 1024 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            // 检查是否有权限
-            if (Environment.isExternalStorageManager()) {
-                isRefuse = false;
-                ToastUtils.showToast(this,"授权成功");
-                // 授权成功
-            } else {
-                isRefuse = true;
-                ToastUtils.showToast(this,"授权失败");
-                // 授权失败
-            }
-        }
-    }
 }

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -12,6 +13,8 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickListener;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -40,7 +43,7 @@ import java.util.List;
  * @date 2021/8/26 19:06
  * @description:
  */
-public class UpBankActivity extends BaseAppCompatActivity {
+public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClickListener {
 
     private ImageView up_bank_img;
     private EditText bank_name, bank_number;
@@ -71,6 +74,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
                 if (CacheGroup.cacheList.get("insBank") != null) {
                     BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class);
                     if (bb.getCode() == 200) {
+                        customDialog.dismiss();
                         Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
                         finish();
                     } else {
@@ -106,13 +110,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
         up_bank_img.setOnClickListener(v -> {
             gia.showPopueWindow(this);
         });
-        submit.setOnClickListener(v -> {
+        submit.setOnClickListener(new OnLimitClickHelper(this));
-            if(ib!=null){
-                submit();
-            }else{
-                Toast.makeText(con,"请先上传图片",Toast.LENGTH_SHORT).show();
-            }
-        });
         return_btn.setOnClickListener(v -> {
             finish();
         });
@@ -152,6 +150,8 @@ public class UpBankActivity extends BaseAppCompatActivity {
     }
 
     public void submit() {
+        customDialog = new CustomDialog(con, "上传中,请稍后...");
+        customDialog.show();
         String bankName = bank_name.getText().toString().trim();
         String bankNumber = bank_number.getText().toString().trim();
         if ("".equals(bankName) || "".equals(bankNumber)) {
@@ -168,4 +168,16 @@ public class UpBankActivity extends BaseAppCompatActivity {
         qr.insBankCard(ibib);
     }
 
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.submit:
+                if (ib != null) {
+                    submit();
+                } else {
+                    Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show();
+                }
+                break;
+        }
+    }
 }

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

@@ -231,6 +231,7 @@ public class WalletFragment extends BaseFragment{
             bank_remove.setVisibility(View.VISIBLE);
         } else{
             bank_number.setVisibility(View.GONE);
+            bank_title_1.setText("未添加银行卡");
             bank_add.setVisibility(View.VISIBLE);
             bank_remove.setVisibility(View.GONE);
         }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -104,35 +104,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <androidx.cardview.widget.CardView
+
-            android:padding="@dimen/dp_7"
+        <CheckBox
-            android:layout_marginTop="@dimen/dp_2"
+            android:layout_marginTop="@dimen/dp_3"
-            android:layout_width="@dimen/dp_14"
+            android:id="@+id/cb"
-            android:layout_height="@dimen/dp_14"
+            android:layout_width="@dimen/dp_28"
-            app:cardCornerRadius="@dimen/dp_7"
+            android:layout_height="@dimen/dp_34"
-            app:cardBackgroundColor="@color/theme_color"
+            android:button="@null"
-            app:cardElevation="@dimen/dp_0">
+            android:checked="false"
-        <androidx.cardview.widget.CardView
+            android:drawableStart="@drawable/select_read"/>
-            android:padding="@dimen/dp_7"
-            android:id="@+id/no_btn"
-            android:layout_width="@dimen/dp_12"
-            android:layout_height="@dimen/dp_12"
-            app:cardCornerRadius="@dimen/dp_6"
-            app:cardBackgroundColor="#fff"
-            android:layout_gravity="center"
-            app:cardElevation="@dimen/dp_0">
-        </androidx.cardview.widget.CardView>
-            <ImageButton
-                android:id="@+id/agree_btn"
-                android:layout_width="@dimen/dp_14"
-                android:layout_height="@dimen/dp_14"
-                android:src="@mipmap/choice"
-                android:scaleType="fitXY"
-                android:background="#fff"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                />
-        </androidx.cardview.widget.CardView>
         <TextView
             android:id="@+id/tv_content"
             android:layout_width="wrap_content"

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

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

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

@@ -1,142 +1,190 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/activity_shangchuan"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/bg_theme">
-    android:background="@drawable/bg_theme"
+
-    android:id="@+id/activity_shangchuan">
     <ImageView
-        android:layout_marginTop="@dimen/dp_16"
         android:layout_width="@dimen/dp_300"
         android:layout_height="@dimen/dp_207"
-        android:src="@mipmap/top_creativity"
+        android:layout_centerHorizontal="true"
-        android:layout_centerHorizontal="true"/>
+        android:layout_marginTop="@dimen/dp_16"
+        android:src="@mipmap/top_creativity" />
+
     <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_30"
                 android:layout_width="@dimen/dp_40"
                 android:layout_height="@dimen/dp_31"
-                android:src="@mipmap/return_lefts"
+                android:layout_marginLeft="@dimen/dp_30"
                 android:padding="@dimen/dp_10"
-                android:scaleType="fitXY"/>
+                android:scaleType="fitXY"
+                android:src="@mipmap/return_lefts" />
 
             <TextView
                 android:id="@+id/tv_loaction"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/sp_14"
-                android:text="定位成功"
                 android:layout_alignParentRight="true"
-                android:layout_marginRight="@dimen/dp_30"
                 android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/dp_30"
                 android:padding="@dimen/dp_5"
-                android:textColor="@color/theme_color"/>
+                android:text="定位成功"
+                android:textColor="@color/theme_color"
+                android:textSize="@dimen/sp_14" />
 
         </RelativeLayout>
 
         <TextView
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_8"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_8"
             android:text="补传"
             android:textColor="#ff000000"
-            android:textSize="@dimen/sp_23"
+            android:textSize="@dimen/sp_23" />
-            />
+
+        <TextView
+            android:id="@+id/tvDate"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_50"
+            android:gravity="center_vertical"
+            android:hint="请选择时间"></TextView>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+            <EditText
+                android:layout_weight="1"
+                android:id="@+id/etAddress"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_50"
+                android:hint="请输入地址"></EditText>
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="确定"
+                android:id="@+id/btnOk"
+                ></Button>
+        </LinearLayout>
+
+
+
+
+
+        <TextView
+            android:id="@+id/tvLocation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            ></TextView>
 
         <TextView
             android:id="@+id/name_top"
-        android:layout_marginLeft="@dimen/dp_38"
-        android:layout_marginTop="@dimen/dp_8"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_8"
             android:text="上传卸货照片"
             android:textColor="#ff000000"
-        android:textSize="@dimen/sp_23"
+            android:textSize="@dimen/sp_23" />
-        />
+
         <androidx.cardview.widget.CardView
             android:id="@+id/getImg1"
-            android:layout_marginTop="@dimen/dp_33"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_33"
             android:layout_marginRight="@dimen/dp_38"
             app:cardCornerRadius="@dimen/dp_8">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <RelativeLayout
                     android:id="@+id/getImg"
+                    android:layout_width="@dimen/dp_90"
+                    android:layout_height="@dimen/dp_90"
                     android:layout_marginLeft="@dimen/dp_11"
                     android:layout_marginTop="@dimen/dp_13"
                     android:layout_marginBottom="@dimen/dp_13"
-                    android:layout_width="@dimen/dp_90"
-                    android:layout_height="@dimen/dp_90"
                     android:background="#EEEEEE">
 
                     <ImageView
                         android:id="@+id/res_img"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
+
                     <ImageView
                         android:id="@+id/img_icon"
                         android:layout_width="@dimen/dp_23"
                         android:layout_height="@dimen/dp_23"
-                        android:layout_centerVertical="true"
                         android:layout_centerHorizontal="true"
+                        android:layout_centerVertical="true"
                         android:src="@mipmap/up_img" />
+
                     <ImageView
                         android:id="@+id/img_delete"
-                        android:layout_alignParentRight="true"
                         android:layout_width="@dimen/dp_25"
                         android:layout_height="@dimen/dp_25"
-                        android:src="@mipmap/icon_delete"
+                        android:layout_alignParentRight="true"
                         android:padding="@dimen/dp_3"
+                        android:src="@mipmap/icon_delete"
                         android:visibility="gone" />
                 </RelativeLayout>
+
                 <LinearLayout
-                    android:layout_marginTop="@dimen/dp_13"
-                    android:layout_marginLeft="@dimen/dp_8"
-                    android:layout_marginRight="@dimen/dp_10"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_8"
+                    android:layout_marginTop="@dimen/dp_13"
+                    android:layout_marginRight="@dimen/dp_10"
                     android:orientation="vertical">
+
                     <TextView
-                        android:layout_marginTop="@dimen/dp_7"
                         android:id="@+id/name_body"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_7"
                         android:text="卸货照片"
                         android:textColor="#ff000000"
-                        android:textSize="@dimen/sp_13"
+                        android:textSize="@dimen/sp_13" />
-                        />
+
                     <TextView
-                        android:layout_marginTop="@dimen/dp_13"
                         android:id="@+id/address"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#ff999999"
+                        android:layout_marginTop="@dimen/dp_13"
                         android:text=""
+                        android:textColor="#ff999999"
                         android:textSize="@dimen/sp_13" />
                 </LinearLayout>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginRight="@dimen/dp_38"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_38">
+
             <TextView
                 android:id="@+id/tips_x"
                 android:layout_width="wrap_content"
@@ -144,6 +192,7 @@
                 android:text="*"
                 android:textColor="#E61829"
                 android:visibility="gone" />
+
             <TextView
                 android:id="@+id/tips"
                 android:layout_width="wrap_content"
@@ -152,24 +201,25 @@
                 android:textColor="#E61829"
                 android:visibility="gone" />
         </LinearLayout>
+
         <androidx.cardview.widget.CardView
-            android:layout_marginTop="@dimen/dp_33"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginRight="@dimen/dp_38"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_42"
-            app:cardCornerRadius="@dimen/dp_21"
+            android:layout_marginLeft="@dimen/dp_38"
-            app:cardBackgroundColor="@color/red">
+            android:layout_marginTop="@dimen/dp_33"
+            android:layout_marginRight="@dimen/dp_38"
+            app:cardBackgroundColor="@color/red"
+            app:cardCornerRadius="@dimen/dp_21">
+
             <TextView
                 android:id="@+id/submit"
-                android:layout_alignParentRight="true"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:gravity="center"
                 android:text="提交"
                 android:textColor="#fff"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/sp_15" />
-                android:gravity="center"
-                />
         </androidx.cardview.widget.CardView>
     </LinearLayout>
 </RelativeLayout>

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

@@ -4,7 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.amap.api.maps.MapView
+<!--    <com.amap.api.maps.MapView-->
+<!--        android:id="@+id/map"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"/>-->
+
+    <com.lk.mapsdk.map.mapapi.map.MapView
         android:id="@+id/map"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

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

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

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

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

build.gradle

@@ -12,6 +12,7 @@ buildscript {
         maven {
             url 'https://maven.aliyun.com/repository/releases'
         }
+        maven { url 'http://lbs-sdk.luokuang.com/repository/maven-releases/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.2'
@@ -31,6 +32,7 @@ allprojects {
         maven {
             url 'https://maven.aliyun.com/repository/releases'
         }
+        maven { url 'http://lbs-sdk.luokuang.com/repository/maven-releases/' }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -176,7 +176,7 @@ public final class TimeUtil {
      * 注意：SimpleDateFormat不是线程安全的，线程安全需用{@code ThreadLocal<SimpleDateFormat>}
      */
 
-    public static final DateFormat DEFAULT_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
+    private static final DateFormat DEFAULT_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
     private static final DateFormat DEFAULT_FORMAT2 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZSS:SS", Locale.getDefault());
     private static final DateFormat DEFAULT_FORMAT3 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault());
     public static final DateFormat DEFAULT_FORMAT4 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault());

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

@@ -29,6 +29,24 @@ public class ToastUtils {
         }
     }
 
+    public static void showLongToast(Context mContext, String message) {
+        if (!TextUtils.isEmpty(message)) {
+
+//            if ( mToast != null) {
+//                mToast.cancel();
+//            }
+//            mToast = Toast.makeText(mContext, message, Toast.LENGTH_SHORT);
+//            mToast.show();
+
+            if (mToast == null) {
+                mToast = Toast.makeText(mContext, message, Toast.LENGTH_LONG);
+            } else {
+                mToast.setText(message);
+            }
+            mToast.show();
+        }
+    }
+
     public static void cancelToast(){
         if (mToast!=null)
             mToast.cancel();