fff

app/build.gradle

@@ -35,18 +35,17 @@ android {
 
     defaultConfig {
         applicationId "com.arpa.hndahesudintocctmsdriver"
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 30
-        versionCode 68
+        versionCode 59
-        versionName "3.3.8"
+        versionName "3.2.9"
         flavorDimensions "CHANNEL_VALUE"
-        flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
 
             annotationProcessorOptions {
                 includeCompileClasspath = true
-                arguments = [moduleName: project.getName()]
+                arguments = [moduleName :project.getName() ]
             }
         }
 
@@ -57,7 +56,27 @@ 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 {
@@ -88,7 +107,7 @@ android {
         }
     }
 
-    repositories {
+    repositories{
         flatDir {
             dirs 'libs'
         }
@@ -96,29 +115,15 @@ android {
 
     productFlavors {
         qa {
-            applicationId "com.arpa.hndahesudintocctmsdriver.text"
+            manifestPlaceholders = [CHANNEL_VALUE: "好运司机测试"]
-            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", "\"https://app.test.dahehuoyun.com/api/\"")
+            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "司机测试"
         }
         product {
-            applicationId "com.arpa.hndahesudintocctmsdriver"
+            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机"]
-            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"
@@ -127,22 +132,22 @@ android {
         }
 
     }
-//    productFlavors.all { flavor ->
+    productFlavors.all { flavor ->
-//        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
+        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
-//    }
+    }
 
 
     android.applicationVariants.all { variant ->
         variant.outputs.all {
-            def date = new Date().format("MMdd_HH-mm", TimeZone.getTimeZone("GMT+08"))
+            def date = new Date().format("MMdd_HH-mm" , TimeZone.getTimeZone("GMT+08"))
-            def isText = variant.productFlavors[0].properties.get("buildConfigFields").getAt("isTest").properties.get("value")
+            def  isText = variant.productFlavors[0].properties.get("buildConfigFields").getAt("isTest").properties.get("value")
             def appName = null
-            if (isText == "true") {
+            if (isText=="true") {
                 appName = '大河好运司机测试_'
-            } else {
+            }else{
                 appName = '大河好运司机_'
             }
-            outputFileName = appName + "${variant.buildType.name}_${defaultConfig.versionName}_${date}.apk"
+            outputFileName =appName+"${variant.buildType.name}_${defaultConfig.versionName}_${date}.apk"
         }
     }
     lintOptions {
@@ -166,10 +171,10 @@ dependencies {
     //角标
     implementation 'com.haozhang.libary:android-slanted-textview:1.2'
     //刷新头部，底部样式
-    implementation 'com.scwang.smart:refresh-layout-kernel:2.0.1'
+    implementation  'com.scwang.smart:refresh-layout-kernel:2.0.1'
-    implementation 'com.scwang.smart:refresh-header-material:2.0.1'
+    implementation  'com.scwang.smart:refresh-header-material:2.0.1'
-    implementation 'com.scwang.smart:refresh-footer-ball:2.0.1'        //球脉冲加载
+    implementation  'com.scwang.smart:refresh-footer-ball:2.0.1'        //球脉冲加载
-    implementation 'com.scwang.smart:refresh-footer-classics:2.0.1'    //经典加载
+    implementation  'com.scwang.smart:refresh-footer-classics:2.0.1'    //经典加载
     //更新版本
     implementation 'com.github.jenly1314.AppUpdater:app-updater:1.2.0'
     implementation 'com.github.jenly1314.AppUpdater:app-dialog:1.2.0'
@@ -184,7 +189,7 @@ dependencies {
     implementation 'com.alibaba:fastjson:1.2.61'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.55'
     implementation 'org.apache.commons:commons-lang3:3.5'
-    implementation(name: 'locationgd-androidx_2.1.0', ext: 'aar')//交通厅
+    implementation (name:'locationgd-androidx_2.1.0', ext:'aar')//交通厅
     //安联
 //    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.loopj.android:android-async-http:1.4.9'
@@ -199,10 +204,10 @@ dependencies {
     //友盟
     // 下面各SDK根据宿主App是否使用相关业务按需引入。
     // 友盟统计SDK
-    implementation 'com.umeng.umsdk:common:9.4.2'// 必选
+    implementation  'com.umeng.umsdk:common:9.4.2'// 必选
-    implementation 'com.umeng.umsdk:asms:1.4.1'// 必选
+    implementation  'com.umeng.umsdk:asms:1.4.1'// 必选
     implementation 'com.umeng.umsdk:apm:1.4.2' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
-    implementation 'com.umeng.umsdk:abtest:1.0.0'//使用U-App中ABTest能力，可选
+    implementation  'com.umeng.umsdk:abtest:1.0.0'//使用U-App中ABTest能力，可选
     //动态权限获取
     implementation "org.permissionsdispatcher:permissionsdispatcher:4.6.0"
     kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.6.0"
@@ -211,8 +216,8 @@ dependencies {
     //EventBus
     implementation 'org.greenrobot:eventbus:3.1.1'
     //易签宝
-    implementation(name: 'EsignSDK', ext: 'aar')
+    implementation(name:'EsignSDK', ext:'aar')
-    implementation 'pub.devrel:easypermissions:1.3.0'
+    implementation'pub.devrel:easypermissions:1.3.0'
 
     implementation "com.squareup.retrofit2:retrofit:2.4.0"
 //    implementation "com.squareup.retrofit2:converter-gson:2.4.0"

app/src/main/AndroidManifest.xml

@@ -44,7 +44,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 +53,7 @@
         android:name="com.arpa.hndahesudintocctmsdriver.App"
         android:allowBackup="true"
         android:excludeFromRecents="true"
-        android:icon="@mipmap/diver_logo"
+        android:icon="@drawable/diver_logo"
         android:label="@string/appName"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
@@ -93,7 +93,6 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
-            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"  />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
@@ -161,7 +160,6 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
-            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
@@ -171,7 +169,6 @@
             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" />
@@ -265,7 +262,7 @@
         <!--高德地图-->
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="${GAODEKEY}" />
+            android:value="78019612271411eca3af34db91930620" />
 <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
         <service android:name="com.amap.api.location.APSService"></service>
@@ -277,7 +274,7 @@
         <!-- 极光-->
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="fba6f55621c670d8c1fe9191" /> <!-- </>值来自开发者平台取得的AppKey -->
+            android:value="571d93ae5117da6dee848c92" /> <!-- </>值来自开发者平台取得的AppKey -->
 
         <meta-data
             android:name="JPUSH_CHANNEL"
@@ -400,7 +397,7 @@
         </receiver>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="com.arpa.hndahesudintocctmsdriver.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:ignore="WrongManifestParent">

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

@@ -9,28 +9,41 @@ 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.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 {
+public class App extends Application implements CactusCallback {
 
-//    String key = "f9d35b1133cff1f6e3960c89b249e03f";
+    //    String key = "f9d35b1133cff1f6e3960c89b249e03f";
     String key = "19ac0aa74338e487e45057faf7212401";
     String license = "HF41uGxM/1i3CtW98DimoA97BlNTAnQ+DiEAihYmZ2jR1jqC4be253joEJbOJgFDIzp5aIoeuXSWWHFaDVfaHL2Pksbq5f8M8EqsVhP9q/i1xGYSYf6MJVlHdMAVLWgR0Kra+n8dVzkSDuZeyJuDsskAmZaGFQN1CqnWYCI1tmV1Tk4A57e9LQMed0U11QWjdshdU2DGqBXKmGE419PdW3NmIxOR2u9iB1OKBmvzCUT8RAYyBzSn/yhU++YJ25g5a8Pb5kOvi+eOh+PEFEcQL6oOp/CF4Iw5nadlsLhc+XEnVJpwL2myZBoSlVcKxrJKbRn1/DIgXBueKKnqhyHKdJlpqI9eghAlRF0p2Q4f23m89mWRZf4nhKzTeXGIjCTFO4TNVucrlGU7tyJcrRCDVdfV24fziH+hB3QGckpuYzzjefr7hZalLRJ/w8dPw/8dCY1wnWq3AJ3zw2g1PzMxl51q7AgdKvwc1ERcGBns0zb8PK6vGKCnJq3uHiJEnslbTI0MEosje+h+OPO7hf2QofErewjI19wHEOv4dTvuFLh3VmGFMObAmov5kI47705fjSxCvAPGATBrfUSwim+5EQ1hanc5IcXe0/nOTiRUNEpZ+x65zVydqAs7490yqQiIUQvPazEwcal7vH2OD54lCcgpxKxqdmGc5/bp5UnqB45+n+iuInV/Q9DMOQVk15uaVZmhS8VaCqH21CmfH/ZGLb9wiEpaRLrPZLKX3bK7MT9Z0/OlDnb2QUKU8LMMIhLuQQntzsf0Wn4kA/0e9QAJJQ==";
 
@@ -41,6 +54,7 @@ public class App extends Application {
     public static int APP_STATUS = APP_STATUS_KILLED; // 记录App的启动状态
     private Context con;
     public static App mApplication = null;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -78,29 +92,34 @@ public class App extends Application {
             }
         }
 
-//        PendingIntent pendingIntent =
+        PendingIntent pendingIntent =
-//                PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
-//        Cactus.getInstance()
+        Cactus.getInstance()
-//                .isDebug(true)
+                .isDebug(true)
-//                //可选，设置通知栏点击事件
+                .setTitle("好运司机")
-//                .setPendingIntent(pendingIntent)
+                .setContent("您的接单助手!")
-////                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
+                .setChannelId("gld")
-////                .setMusicId(R.raw.main) //可选，设置音乐
+                .setChannelName("好运司机")
-////                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
+                .setServiceId(Integer.MAX_VALUE)
-////                .addCallback(new CactusCallback())//可选，运行时回调
+                //可选，设置通知栏点击事件
-//                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+                .setPendingIntent(pendingIntent)
-//                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
-//                .setTitle("大河好运")
+                .setMusicId(R.raw.main) //可选，设置音乐
-//                .setSmallIcon(R.drawable.diver_logo)
+//                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
-//                .addBackgroundCallback(new CactusBackgroundCallback() {
+//                .addCallback(new CactusCallback())//可选，运行时回调
-//                    @Override
+                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                    public void onBackground(boolean b) {
+                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                        if (b){
+                .setSmallIcon(R.drawable.diver_logo)
-//                            getBillLocation();
+                .addCallback(this)
-//                        }
+                .addBackgroundCallback(new CactusBackgroundCallback() {
-//                    }
+                    @Override
-//                })
+                    public void onBackground(boolean b) {
-//                .register(this);
+                        if (b) {
+                            getBillLocation();
+                        }
+                    }
+                })
+                .register(this);
     }
 
     public static App getApp() {
@@ -149,4 +168,62 @@ public class App extends Application {
         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

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

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

@@ -66,11 +66,6 @@ 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;
@@ -84,14 +79,6 @@ 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;
         }
@@ -108,30 +95,6 @@ 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;
         }
@@ -308,15 +271,6 @@ 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,33 +48,6 @@ 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,7 +59,6 @@ public class OCRVehicleBackLicenseBean {
         private int id;
         private String url;
         private String checkRecord;
-        private String isSave;
         private String approvedCapacity;
         private String allCapacity;
         private String size;
@@ -72,14 +71,6 @@ 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,9 +49,7 @@ 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;
@@ -62,41 +60,6 @@ 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;
@@ -210,44 +173,4 @@ 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

@@ -1,21 +0,0 @@
-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,17 +124,6 @@ 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,11 +89,6 @@ 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,boolean isSave){
+    public void OCRVehicleLicenseBack(Context con, Handler hd, File file,String carId,String carNum){
-        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()),file,getToken(con),carId,carNum,isSave);
+        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()),file,getToken(con),carId,carNum);
         RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[2],re,con,hd);
     }
 

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

@@ -4,207 +4,197 @@ import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 
 public class RequestConstant {
 
-    public static String TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzA0MDE3OTIsInVzZXJJZCI6ODAsImlhdCI6MTYyNzcyMzM5Mn0.f9Q-UZVduW6nt1s0L-3vYsrOJJ8iuSCSlJ9uu8yIxBI";
+    public static String TOKEN="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzA0MDE3OTIsInVzZXJJZCI6ODAsImlhdCI6MTYyNzcyMzM5Mn0.f9Q-UZVduW6nt1s0L-3vYsrOJJ8iuSCSlJ9uu8yIxBI";
     //域名地址http://request.one-clouds.com/api https://huoyun.mzxd56.com/api http://app.dahehuoyun.com/api
     public static String BASE_URL = BuildConfig.BASE_URL;
     //版本更新/app/check/version
-    public static String VERSION = "/app/check/version";
+    public static String VERSION ="/app/check/version";
     //全部代码
-    public static String CODE_DATA = "/common/dic/listdata";
+    public static String CODE_DATA ="/common/dic/listdata";
     //短信验证码
     private static final String SEND_CODE = "/common/sendcode";
     //登录
-    private static final String REG = "/common/register";
+    private static final String REG="/common/register";
     //注册
-    private static final String LOGIN = "/common/register";
+    private static final String LOGIN="/common/register";
     //上传文件
-    private static final String UPLOAD = "/common/resource/upload";
+    private static final String UPLOAD="/common/resource/upload";
     //配置项信息
-    private static final String CONFIG = "/common/config/list";
+    private static final String CONFIG="/common/config/list";
     //获取开屏页图片和轮播图
-    private static final String GET_IMAGE = "/common/resource/image/config";
+    private static final String GET_IMAGE="/common/resource/image/config";
     //司机认证信息
-    private static final String DRIVER_AUTH_INFO = "/app/driver/auth/authInfo";
+    private static final String DRIVER_AUTH_INFO="/app/driver/auth/authInfo";
     //货源大厅
-    private static final String GOODS_HALL = "/app/driver/order/getHallList";
+    private static final String GOODS_HALL="/app/driver/order/getHallList";
     //历史成交货源
-    private static final String GET_EXAMPLE_LIST = "/app/driver/order/getExampleList";
+    private static final String GET_EXAMPLE_LIST="/app/driver/order/getExampleList";
     //货源详情
-    private static final String GOODS_DEL = "/app/driver/order/findOrderInfoV2";
+    private static final String GOODS_DEL="/app/driver/order/findOrderInfoV2";
     //账户信息
-    private static final String USER = "/app/user/getUserInfo";
+    private static final String USER="/app/user/getUserInfo";
     //银行卡列表
-    private static final String BANK_CARD_LIST = "/app/bankCard/findPage";
+    private static final String BANK_CARD_LIST="/app/bankCard/findPage";
     //绑定银行卡
-    private static final String INS_BANKCARD = "/app/bankCard/bandCard";
+    private static final String INS_BANKCARD="/app/bankCard/bandCard";
-    //    private static final String INS_BANKCARD="/app/bankCard/save";
+//    private static final String INS_BANKCARD="/app/bankCard/save";
     //删除银行卡
 //    private static final String DELETE_BANKCARD="/app/bankCard/deleteCard";
-    private static final String DELETE_BANKCARD = "/app/bankCard/unBandCard";
+    private static final String DELETE_BANKCARD="/app/bankCard/unBandCard";
     //生成电子账户
-    private static final String ADD_CONTRACTS = "/app/bank/addContracts";
+    private static final String ADD_CONTRACTS="/app/bank/addContracts";
     //获取电子账户
-    private static final String GET_CONTRACTS = "/app/bank/getContracts";
+    private static final String GET_CONTRACTS="/app/bank/getContracts";
     //获取账户未读消息
-    private static final String XIAOXI_LIST = "/app/message/findCurrentUserNotReadCount";
+    private static final String XIAOXI_LIST="/app/message/findCurrentUserNotReadCount";
     //获取账户消息
-    private static final String XIAOXI_ALL = "/app/message/findPage";
+    private static final String XIAOXI_ALL="/app/message/findPage";
     //已读消息
-    private static final String XIAOXI_DEL = "/app/message/setReadById";
+    private static final String XIAOXI_DEL="/app/message/setReadById";
     //已读全部消息
-    private static final String XIAOXI_DEL_ALL = "/app/message/setReadAll";
+    private static final String XIAOXI_DEL_ALL="/app/message/setReadAll";
     //运单列表
-    private static final String ORDER_LIST = "/app/driver/waybill/listV2";
+    private static final String ORDER_LIST="/app/driver/waybill/listV2";
     //抢单
-    private static final String AGREE_ORDER = "/app/driver/waybill/grabDriverOrdersContruct";
+    private static final String AGREE_ORDER="/app/driver/waybill/grabDriverOrdersContruct";
     //获取正在执行的运单/运单详情
-    private static final String GET_START_ORDER = "/app/driver/waybill/getExecuteWaybill";
+    private static final String GET_START_ORDER="/app/driver/waybill/getExecuteWaybill";
     //查看承运合同
-    private static final String GET_CARRY_CONTRACT = "/common/appContract/findCarrierContract";
+    private static final String GET_CARRY_CONTRACT="/common/appContract/findCarrierContract";
     //评价信息保存
-    private static final String EVALUATIONV2 = "/app/driver/waybill/evaluationV2";
+    private static final String EVALUATIONV2="/app/driver/waybill/evaluationV2";
     //装货
-    private static final String LOADING = "/app/driver/waybill/loadingV2";
+    private static final String LOADING="/app/driver/waybill/loadingV2";
     //卸货
-    private static final String UNLOADING = "/app/driver/waybill/unloadV2";
+    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";
+    private static final String UPLOAD_RECEIPT="/app/driver/waybill/uploadReceipt";
     //轨迹跟踪
-    private static final String TRACK_TRACKING = "/app/driver/waybill/addAppLocation";
+    private static final String TRACK_TRACKING="/app/driver/waybill/addAppLocation";
     //获取评价信息
-    private static final String GET_EVALUATE = "/app/driver/waybill/listAppraises";
+    private static final String GET_EVALUATE="/app/driver/waybill/listAppraises";
     //获取投诉信息
-    private static final String GET_COMPLAINT = "/app/driver/waybill/listComplaint";
+    private static final String GET_COMPLAINT="/app/driver/waybill/listComplaint";
     //保存投诉信息
-    private static final String COMPLAINT = "/app/driver/waybill/complaintV2";
+    private static final String COMPLAINT="/app/driver/waybill/complaintV2";
     //保存评价信息
-    private static final String EVALUATION_V2 = "/app/driver/waybill/evaluationV2";
+    private static final String EVALUATION_V2="/app/driver/waybill/evaluationV2";
     //车辆列表
-    private static final String GET_CAR_LIST = "/app/carDriver/getCarList";
+    private static final String GET_CAR_LIST="/app/carDriver/getCarList";
     //车辆详情
-    private static final String GET_CAR_DEL = "/app/carDriver/getCarInfo";
+    private static final String GET_CAR_DEL="/app/carDriver/getCarInfo";
     //删除车辆
-    private static final String DEL_CAR = "/app/carDriver/unBindCar";
+    private static final String DEL_CAR="/app/carDriver/removeCar";
     //上传车辆照片
-    private static final String SAVECARIMG = "/app/carDriver/saveCarImg";
+    private static final String SAVECARIMG="/app/carDriver/saveCarImg";
     //上传头像保存
-    private static final String UPLOAD_HEAD = "/app/user/uploadHeadportrait";
+    private static final String UPLOAD_HEAD="/app/user/uploadHeadportrait";
     //获取上传失败的订单
-    private static final String GET_ERROR_ORDER = "/app/driver/waybill/getAsymmetryWaybill";
+    private static final String GET_ERROR_ORDER="/app/driver/waybill/getAsymmetryWaybill";
     //提现
-    private static final String TIXIAN = "/app/account/cashApply/bank/charge";
+    private static final String TIXIAN="/app/account/cashApply/bank/charge";
     //--ORC识别--
 
     //银行卡识别
-    private static final String ORC_BANK = "/common/ocr/bank";
+    private static final String ORC_BANK="/common/ocr/bank";
     //身份证正面
-    private static final String ID_CARD_FRONT = "/common/ocr/idCardFront";
+    private static final String ID_CARD_FRONT="/common/ocr/idCardFront";
     //身份证识别反面
-    private static final String ID_CARD_BACK = "/common/ocr/idCardBack";
+    private static final String ID_CARD_BACK="/common/ocr/idCardBack";
     //驾驶证正面
-    private static final String DRIVING_LICENSE = "/common/ocr/drivingLicense";
+    private static final String DRIVING_LICENSE="/common/ocr/drivingLicense";
     //驾驶证副页
-    private static final String DRIVING_LICENSE_BACK = "/common/ocr/drivingLicenseBack";
+    private static final String DRIVING_LICENSE_BACK="/common/ocr/drivingLicenseBack";
     //行驶证正面
-    private static final String VEHICLE_LICENSE = "/common/ocr/vehicleLicense";
+    private static final String VEHICLE_LICENSE="/common/ocr/vehicleLicense";
     //行驶证副页
-    private static final String VEHICLE_LICENSE_BACK = "/common/ocr/v2/vehicleBackLicenseV3";
+    private static final String VEHICLE_LICENSE_BACK="/common/ocr/v2/vehicleBackLicenseV3";
     //身份证认证信息
-    private static final String ISAUTH_IDCARD = "/app/driver/auth/isAuthIdCard";
+    private static final String ISAUTH_IDCARD="/app/driver/auth/isAuthIdCard";
     //驾驶证认证信息
-    private static final String ISAUTH_DRIVERAUTH_LICENSE = "/app/driver/auth/isAuthDriverAuthLicense";
+    private static final String ISAUTH_DRIVERAUTH_LICENSE="/app/driver/auth/isAuthDriverAuthLicense";
     //资格证认证信息
-    private static final String IS_AUTH_DRIVER_AUTH_QUALIFICATION = "/app/driver/auth/isAuthDriverAuthQualification";
+    private static final String IS_AUTH_DRIVER_AUTH_QUALIFICATION="/app/driver/auth/isAuthDriverAuthQualification";
     //行驶证认证信息
     //身份证认证
-    private static final String DRIVERAUTHIDCARD = "/app/driver/auth/driverAuthIdCard";
+    private static final String DRIVERAUTHIDCARD="/app/driver/auth/driverAuthIdCard";
     //驾驶证认证
-    private static final String DRIVERAUTHLICENSE = "/app/driver/auth/driverAuthLicense";
+    private static final String DRIVERAUTHLICENSE="/app/driver/auth/driverAuthLicense";
     //行驶证认证
-    private static final String SAVEVEHICLELICENSE = "/app/carDriver/saveVehicleLicense";
+    private static final String SAVEVEHICLELICENSE="/app/carDriver/saveVehicleLicense";
     //从业资格证认证
-    private static final String DRIVER_AUTH_QUALIFICATION = "/app/driver/auth/driverAuthQualification";
+    private static final String DRIVER_AUTH_QUALIFICATION="/app/driver/auth/driverAuthQualification";
     //车辆等级证书
-    private static final String DRIVER_AUTH_SAVECARREGISTERNO = "/app/carDriver/saveCarRegisterNo";
+    private static final String DRIVER_AUTH_SAVECARREGISTERNO="/app/carDriver/saveCarRegisterNo";
     //道路运输信息
-    private static final String DRIVER_AUTH_SAVECARROADLICENSENO = "/app/carDriver/saveCarRoadLicenseNo";
+    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";
+    private static final String PARTY_MEMBER="/app/user/partyMember";
     //实名认证
-    private static final String AUTH_URL = "/app/driver/auth/getAuthUrl";
+    private static final String AUTH_URL="/app/driver/auth/getAuthUrl";
     //车牌号
-    private static final String PLATE_LICENSE = "/common/ocr/plateLicense";
+    private static final String PLATE_LICENSE="/common/ocr/plateLicense";
 
     //车牌号2
-    private static final String PLATE_LICENSE2 = "/common/aliyun/ocr/RecognizeCarNumber";
+    private static final String PLATE_LICENSE2="/common/aliyun/ocr/RecognizeCarNumber";
 
     //添加挂车
-    private static final String SAVE_DRAW_CAR = "/app/carDriver/saveDrawCar";
+    private static final String SAVE_DRAW_CAR="/app/carDriver/saveDrawCar";
     //提现记录
-    private static final String CHANGE_RECORD = "/app/account/change/record";
+    private static final String CHANGE_RECORD="/app/account/change/record";
 
     //提现手续费
-    private static final String WITHDRAWALS_CHARGE = "/app/account/withdrawals/charge";
+    private static final String WITHDRAWALS_CHARGE="/app/account/withdrawals/charge";
 
     //提现配置信息
-    private static final String WITHDRAWALS_CONFIG = "/app/account/withdrawals/config";
+    private static final String WITHDRAWALS_CONFIG="/app/account/withdrawals/config";
 
     //获取车辆颜色
-    private static final String CAR_COLOR = "/app/common/carColorTypeList";
+    private static final String CAR_COLOR="/app/common/carColorTypeList";
 
     //获取车辆颜色
-    private static final String CAR_ENERGYTYPE = "/app/common/carEnergyTypeList";
+    private static final String CAR_ENERGYTYPE="/app/common/carEnergyTypeList";
 
     //车辆自动审核触发器
-    private static final String CAR_AUDIT = "/app/carDriver/carAutomaticAudit";
+    private static final String CAR_AUDIT="/app/carDriver/carAutomaticAudit";
-    private static final String APP_INFO = "/common/app/logininfor";
 
-    public static String getCarAudit() {
+    public static String getCarAudit(){
-        return BASE_URL + CAR_AUDIT;
+        return BASE_URL +CAR_AUDIT;
     }
 
-    public static String postAppInfo() {
+    public static String getCarColor(){
-        return BASE_URL + APP_INFO;
+        return BASE_URL +CAR_COLOR;
     }
 
-    public static String getCarColor() {
+    public static String getCarEnergyType(){
-        return BASE_URL + CAR_COLOR;
-    }
-
-    public static String getCarEnergyType() {
         return BASE_URL + CAR_ENERGYTYPE;
     }
 
     //app/driver/auth/driverExpire
-    public static final String GET_CERTIFICATE_EXPIRED = "/app/driver/auth/driverExpire";
+    public static final String GET_CERTIFICATE_EXPIRED="/app/driver/auth/driverExpire";
 
     public static String getSendCodeUrl() {
-        return BASE_URL + SEND_CODE;
+        return BASE_URL +SEND_CODE;
     }
 
     public static String getREGUrl() {
-        return BASE_URL + REG;
+        return BASE_URL +REG;
     }
 
     public static String getLoginUrl() {
-        return BASE_URL + LOGIN;
+        return BASE_URL +LOGIN;
     }
 
     public static String getDriverAuthInfoUrl() {
-        return BASE_URL + DRIVER_AUTH_INFO;
+        return BASE_URL +DRIVER_AUTH_INFO;
     }
 
     public static String getGoodsHallUrl() {
-        return BASE_URL + GOODS_HALL;
+        return BASE_URL +GOODS_HALL;
     }
 
     public static String getGoodsDelUrl() {
-        return BASE_URL + GOODS_DEL;
+        return BASE_URL +GOODS_DEL;
     }
 
     public static String getUserUrl() {
@@ -219,243 +209,201 @@ public class RequestConstant {
         return BASE_URL + BANK_CARD_LIST;
     }
 
-    public static String getXiaoXiListUrl() {
+    public static String getXiaoXiListUrl() { return BASE_URL + XIAOXI_LIST; }
-        return BASE_URL + XIAOXI_LIST;
-    }
 
-    public static String getXiaoxiAll() {
+    public static String getXiaoxiAll() { return BASE_URL +XIAOXI_ALL; }
-        return BASE_URL + XIAOXI_ALL;
-    }
 
     public static String getOrderList() {
-        return BASE_URL + ORDER_LIST;
+        return BASE_URL +ORDER_LIST;
     }
 
     public static String getAgreeOrder() {
-        return BASE_URL + AGREE_ORDER;
+        return BASE_URL +AGREE_ORDER;
     }
 
     public static String getGetStartOrder() {
-        return BASE_URL + GET_START_ORDER;
+        return BASE_URL +GET_START_ORDER;
     }
 
     public static String getGetCarryContract() {
-        return BASE_URL + GET_CARRY_CONTRACT;
+        return BASE_URL +GET_CARRY_CONTRACT;
     }
 
     public static String getEVALUATIONV2() {
-        return BASE_URL + EVALUATIONV2;
+        return BASE_URL +EVALUATIONV2;
     }
 
     public static String getLOADING() {
-        return BASE_URL + LOADING;
+        return BASE_URL +LOADING;
     }
 
     public static String getUNLOADING() {
-        return BASE_URL + UNLOADING;
+        return BASE_URL +UNLOADING;
-    }
-
-    public static String getUNLOADING4() {
-        return BASE_URL + UNLOADING4;
     }
 
     public static String getGetEvaluate() {
-        return BASE_URL + GET_EVALUATE;
+        return BASE_URL +GET_EVALUATE;
     }
 
     public static String getGetComplaint() {
-        return BASE_URL + GET_COMPLAINT;
+        return BASE_URL +GET_COMPLAINT;
     }
 
     public static String getOrcBank() {
-        return BASE_URL + ORC_BANK;
+        return BASE_URL +ORC_BANK;
     }
 
     public static String getIdCardFront() {
-        return BASE_URL + ID_CARD_FRONT;
+        return BASE_URL +ID_CARD_FRONT;
     }
 
     public static String getIdCardBack() {
-        return BASE_URL + ID_CARD_BACK;
+        return BASE_URL +ID_CARD_BACK;
     }
 
     public static String getDrivingLicense() {
-        return BASE_URL + DRIVING_LICENSE;
+        return BASE_URL +DRIVING_LICENSE;
     }
 
     public static String getDrivingLicenseBack() {
-        return BASE_URL + DRIVING_LICENSE_BACK;
+        return BASE_URL +DRIVING_LICENSE_BACK;
     }
 
     public static String getVehicleLicense() {
-        return BASE_URL + VEHICLE_LICENSE;
+        return BASE_URL +VEHICLE_LICENSE;
     }
 
     public static String getVehicleLicenseBack() {
-        return BASE_URL + VEHICLE_LICENSE_BACK;
+        return BASE_URL +VEHICLE_LICENSE_BACK;
     }
 
     public static String getGetCarList() {
-        return BASE_URL + GET_CAR_LIST;
+        return BASE_URL +GET_CAR_LIST;
     }
 
     public static String getGetCarDel() {
-        return BASE_URL + GET_CAR_DEL;
+        return BASE_URL +GET_CAR_DEL;
     }
 
     public static String getCodeData() {
-        return BASE_URL + CODE_DATA;
+        return BASE_URL +CODE_DATA;
     }
 
     public static String getIsauthIdcard() {
-        return BASE_URL + ISAUTH_IDCARD;
+        return BASE_URL +ISAUTH_IDCARD;
     }
 
-    public static String getIsauthDriverauthLicense() {
+    public static String getIsauthDriverauthLicense() { return BASE_URL +ISAUTH_DRIVERAUTH_LICENSE; }
-        return BASE_URL + ISAUTH_DRIVERAUTH_LICENSE;
-    }
 
-    public static String getUploadReceipt() {
+    public static String getUploadReceipt() { return BASE_URL +UPLOAD_RECEIPT; }
-        return BASE_URL + UPLOAD_RECEIPT;
-    }
 
-    public static String getUPLOAD() {
+    public static String getUPLOAD() { return BASE_URL +UPLOAD; }
-        return BASE_URL + UPLOAD;
-    }
 
-    public static String getTrackTracking() {
+    public static String getTrackTracking() {return BASE_URL +TRACK_TRACKING; }
-        return BASE_URL + TRACK_TRACKING;
-    }
 
-    public static String getEvaluationV2() {
+    public static String getEvaluationV2() { return BASE_URL +EVALUATION_V2; }
-        return BASE_URL + EVALUATION_V2;
-    }
 
     public static String getDRIVERAUTHIDCARD() {
-        return BASE_URL + DRIVERAUTHIDCARD;
+        return BASE_URL +DRIVERAUTHIDCARD;
     }
 
     public static String getDRIVERAUTHLICENSE() {
-        return BASE_URL + DRIVERAUTHLICENSE;
+        return BASE_URL +DRIVERAUTHLICENSE;
     }
 
     public static String getSAVEVEHICLELICENSE() {
-        return BASE_URL + SAVEVEHICLELICENSE;
+        return BASE_URL +SAVEVEHICLELICENSE;
     }
 
     public static String getSAVECARIMG() {
-        return BASE_URL + SAVECARIMG;
+        return BASE_URL +SAVECARIMG;
     }
 
-    public static String getUploadHead() {
+    public static String getUploadHead() { return BASE_URL +UPLOAD_HEAD; }
-        return BASE_URL + UPLOAD_HEAD;
-    }
 
     public static String getInsBankcard() {
-        return BASE_URL + INS_BANKCARD;
+        return BASE_URL +INS_BANKCARD;
     }
 
-    public static String getDelCar() {
+    public static String getDelCar() { return BASE_URL +DEL_CAR; }
-        return BASE_URL + DEL_CAR;
-    }
 
-    public static String getXiaoxiDel() {
+    public static String getXiaoxiDel() { return BASE_URL +XIAOXI_DEL; }
-        return BASE_URL + XIAOXI_DEL;
-    }
 
-    public static String getCOMPLAINT() {
+    public static String getCOMPLAINT() { return BASE_URL+COMPLAINT; }
-        return BASE_URL + COMPLAINT;
-    }
 
-    public static String getXiaoxiDelAll() {
+    public static String getXiaoxiDelAll() { return BASE_URL+XIAOXI_DEL_ALL; }
-        return BASE_URL + XIAOXI_DEL_ALL;
-    }
 
-    public static String getDriverAuthQualification() {
+    public static String getDriverAuthQualification() { return BASE_URL+DRIVER_AUTH_QUALIFICATION; }
-        return BASE_URL + DRIVER_AUTH_QUALIFICATION;
-    }
 
-    public static String getDriverSaveCarRegisterNo() {
+    public static String getDriverSaveCarRegisterNo() { return BASE_URL+DRIVER_AUTH_SAVECARREGISTERNO; }
-        return BASE_URL + DRIVER_AUTH_SAVECARREGISTERNO;
-    }
 
-    public static String getDriverSaveCarRoadLicenseNo() {
+    public static String getDriverSaveCarRoadLicenseNo() { return BASE_URL+DRIVER_AUTH_SAVECARROADLICENSENO; }
-        return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO;
-    }
 
-    public static String getTrafficInsurance() {
+    public static String getSaveDrawCar() { return BASE_URL+SAVE_DRAW_CAR; }
-        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;
+        return BASE_URL+IS_AUTH_DRIVER_AUTH_QUALIFICATION;
     }
 
     public static String getVERSION() {
-        return BASE_URL + VERSION;
+        return BASE_URL+VERSION;
     }
 
     public static String getAddContracts() {
-        return BASE_URL + ADD_CONTRACTS;
+        return BASE_URL+ADD_CONTRACTS;
     }
 
     public static String getGetContracts() {
-        return BASE_URL + GET_CONTRACTS;
+        return BASE_URL+GET_CONTRACTS;
     }
 
     public static String getTIXIAN() {
-        return BASE_URL + TIXIAN;
+        return BASE_URL+TIXIAN;
     }
 
     public static String getPartyMember() {
-        return BASE_URL + PARTY_MEMBER;
+        return BASE_URL+PARTY_MEMBER;
     }
 
     public static String getCONFIG() {
-        return BASE_URL + CONFIG;
+        return BASE_URL+CONFIG;
     }
 
     public static String getChangeRecord() {
-        return BASE_URL + CHANGE_RECORD;
+        return BASE_URL+CHANGE_RECORD;
     }
 
     public static String getChangeCharge() {
-        return BASE_URL + WITHDRAWALS_CHARGE;
+        return BASE_URL+WITHDRAWALS_CHARGE;
     }
 
     public static String getChangeConfig() {
-        return BASE_URL + WITHDRAWALS_CONFIG;
+        return BASE_URL+WITHDRAWALS_CONFIG;
     }
 
-    public static String getGetErrorOrder() {
+    public static String getGetErrorOrder() { return BASE_URL+GET_ERROR_ORDER; }
-        return BASE_URL + GET_ERROR_ORDER;
-    }
 
     public static String getGetExampleList() {
-        return BASE_URL + GET_EXAMPLE_LIST;
+        return BASE_URL+GET_EXAMPLE_LIST;
     }
 
     public static String getAuthUrl() {
-        return BASE_URL + AUTH_URL;
+        return BASE_URL+AUTH_URL;
     }
 
     public static String getPlateLicense() {
-        return BASE_URL + PLATE_LICENSE;
+        return BASE_URL+PLATE_LICENSE;
     }
 
     public static String getPlateLicense2() {
-        return BASE_URL + PLATE_LICENSE2;
+        return BASE_URL+PLATE_LICENSE2;
     }
 
     public static String getGetImage() {
-        return BASE_URL + GET_IMAGE;
+        return BASE_URL+GET_IMAGE;
     }
 
     public static String getGetCertificateExpired() {
-        return BASE_URL + GET_CERTIFICATE_EXPIRED;
+        return BASE_URL+GET_CERTIFICATE_EXPIRED;
     }
 }

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

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

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

@@ -15,15 +15,6 @@ 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,7 +10,6 @@ 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;
@@ -28,14 +27,11 @@ public class MakeUpService extends Service {
     public void palyMp3(){
         Log.e("开始播放","-----");
         try {
-            MediaPlayer mediaPlayer = MediaPlayer.create(this, R.raw.kujp9scu);
+            AssetFileDescriptor fd =getAssets().openFd("kujp9scu.mp3");
-            mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            mediaPlayer.setDataSource(fd);
-                @Override
+            mediaPlayer.setLooping(false);//设置为循环播放
-                public void onPrepared(MediaPlayer mediaPlayer) {
+            mediaPlayer.prepare();//初始化播放器MediaPlayer
-                    mediaPlayer.start();
+            mediaPlayer.start();
-                }
-            });
-            mediaPlayer.prepareAsync();
             Log.e("播放成功","-----");
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -1,9 +1,6 @@
 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;
@@ -33,11 +30,11 @@ import java.io.File;
  */
 public class UpAppAlert extends CenterPopupView {
 
-    private TextView content, vs, tvContent;
+    private TextView content,vs,tvContent;
-    private Button tv_cancel, tv_confirm, tvOk;
+    private Button tv_cancel,tv_confirm,tvOk;
     private LinearLayout up_div;
-    private String url = "";
+    private String url="";
-    private String body = "";
+    private String body="";
     private Context con;
     private ProgressBar progress_view;
     private String version;
@@ -45,20 +42,19 @@ public class UpAppAlert extends CenterPopupView {
     private LinearLayout force_box;
     private ImageButton force_btn;
 
-    public UpAppAlert(@NonNull @NotNull Context context, String url, String body, String version, String force) {
+    public UpAppAlert(@NonNull @NotNull Context context, String url, String body,String version,String force) {
         super(context);
-        con = context;
+        con=context;
-        this.url = url;
+        this.url=url;
-        this.body = body;
+        this.body=body;
-        this.version = version;
+        this.version=version;
-        this.force = force;
+        this.force=force;
     }
 
     @Override
     protected int getImplLayoutId() {
         return R.layout.alert_up_app;
     }
-
     public UpAppAlert(@NonNull @NotNull Context context) {
         super(context);
 
@@ -67,17 +63,17 @@ public class UpAppAlert extends CenterPopupView {
     @Override
     protected void onCreate() {
         super.onCreate();
-        content = findViewById(R.id.tv_content);
+        content=findViewById(R.id.tv_content);
-        tv_cancel = findViewById(R.id.tv_cancel);
+        tv_cancel=findViewById(R.id.tv_cancel);
-        tv_confirm = findViewById(R.id.tv_confirm);
+        tv_confirm=findViewById(R.id.tv_confirm);
-        tvContent = findViewById(R.id.tvContent);
+        tvContent=findViewById(R.id.tvContent);
-        tvOk = findViewById(R.id.tvOk);
+        tvOk=findViewById(R.id.tvOk);
-        up_div = findViewById(R.id.up_div);
+        up_div=findViewById(R.id.up_div);
-        progress_view = findViewById(R.id.progress);
+        progress_view=findViewById(R.id.progress);
-        content = findViewById(R.id.tv_content);
+        content=findViewById(R.id.tv_content);
-        force_box = findViewById(R.id.force_box);
+        force_box=findViewById(R.id.force_box);
-        force_btn = findViewById(R.id.force_btn);
+        force_btn=findViewById(R.id.force_btn);
-        if (force.equals("1")) {
+        if(force.equals("1")){
             force_box.setVisibility(GONE);
         }
         force_btn.setOnClickListener(v -> {
@@ -85,16 +81,16 @@ public class UpAppAlert extends CenterPopupView {
             dismiss();
             //detachFromHost();
         });
-        vs = findViewById(R.id.vs);
+        vs=findViewById(R.id.vs);
         content.setText(body);
         vs.setText(version);
         tv_cancel.setOnClickListener(v -> {
             System.exit(1);
         });
         tv_confirm.setOnClickListener(v -> {
-            new AppUpdater.Builder(con)
+            new AppUpdater.Builder()
                     .setUrl(url)
-                    .build()
+                    .build(con)
                     .setUpdateCallback(new AppUpdateCallback() {
                         @Override
                         public void onStart(String url) {
@@ -102,18 +98,17 @@ 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+"");
 //                            Log.e("total",total+"");
 //                            Log.e("isChange",isChange+"");
-                            float sum = progress;
+                            float sum=progress;
-                            float max = total;
+                            float max=total;
-                            if (progress > 0) {
+                            if(progress>0){
-                                float b = sum / max;
+                                float b=sum/max;
-                                Log.e("百分比", (100 * b) + "");
+                                Log.e("百分比",(100*b)+"");
-                                progress_view.setProgress((int) (100 * b));
+                                progress_view.setProgress((int) (100*b));
                             }
                         }
 
@@ -122,7 +117,7 @@ public class UpAppAlert extends CenterPopupView {
                             tvContent.setText("下载完成,请及时安装!");
                             tvOk.setVisibility(VISIBLE);
                             tvOk.setOnClickListener(v1 -> {
-                                AppUtils.installApk(getContext(), file, getContext().getPackageName() + Constants.DEFAULT_FILE_PROVIDER);
+                                AppUtils.installApk(getContext(),file,getContext().getPackageName() + Constants.DEFAULT_FILE_PROVIDER);
                             });
                         }
                     })

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

@@ -18,13 +18,10 @@ 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;
@@ -48,8 +45,6 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
-import org.greenrobot.eventbus.Subscribe;
-
 import java.io.File;
 import java.util.List;
 
@@ -106,7 +101,6 @@ 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)) {
                             //从业资格证->实名认证
@@ -161,7 +155,6 @@ 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");
@@ -250,14 +243,12 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             }
         });
         value2.setOnClickListener(v -> {
-            if (!isAuth) {
+            DatePicker picker = new DatePicker(this);
-                DatePicker picker = new DatePicker(this);
+            picker.setBodyWidth(300);
-                picker.setBodyWidth(300);
+            picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
-                picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
+            picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
-                picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
+            picker.getWheelLayout().setDateLabel("年", "月", "日");
-                picker.getWheelLayout().setDateLabel("年", "月", "日");
+            picker.show();
-                picker.show();
-            }
         });
         submit.setOnClickListener(v -> {
             if (!isAuth) {
@@ -388,31 +379,4 @@ 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,7 +37,6 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.dahe.mylibrary.utils.ActivityUtils;
-import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
@@ -158,9 +157,6 @@ 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();
@@ -178,9 +174,6 @@ 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();
@@ -213,9 +206,6 @@ 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();//是否需要上传从业资格证
@@ -224,19 +214,13 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             Toast.makeText(con, "车辆行驶证保存成功", Toast.LENGTH_SHORT).show();
 
                             VehicleEvent ve = new VehicleEvent(String.valueOf(czb.getData().getCarId()));
-                            EventBus.getDefault().postSticky(ve);
+                            EventBus.getDefault().post(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);
@@ -247,7 +231,6 @@ 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 {
@@ -280,9 +263,6 @@ 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) {
@@ -303,7 +283,6 @@ 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 {
@@ -357,11 +336,8 @@ 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();
-                        initData();
-                    }
                     pathOrcRes();
                 }
                 break;
@@ -439,7 +415,6 @@ 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 {
@@ -685,9 +660,7 @@ 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(), "");
@@ -696,16 +669,14 @@ 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) {
+                    u_img.setText("已上传");
-                        submit.setBackgroundResource(R.drawable.bg_btn_grey);
+                    u_img2.setText("已上传");
-                        u_img.setText("已上传");
+                    u_img3.setText("点击查看");
-                        u_img2.setText("已上传");
+                    isAuth = true;
-                        u_img3.setText("点击查看");
-                        isAuth = true;
-                    }
                 }
                 break;
             default:
@@ -765,8 +736,7 @@ 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();
@@ -778,8 +748,7 @@ 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();
 
@@ -803,8 +772,7 @@ 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();
@@ -816,8 +784,7 @@ 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 {
@@ -833,22 +800,13 @@ 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 {
@@ -861,9 +819,8 @@ 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();
@@ -875,8 +832,7 @@ 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();
                     }
@@ -920,7 +876,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
 
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
@@ -936,16 +892,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-//                   if (cdb != null && cdb.getData().getTrailerResVo() &&cdb.getRes() == 1)
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
-                    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));
                 }
@@ -968,8 +915,6 @@ 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);
@@ -992,8 +937,6 @@ 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);
@@ -1010,25 +953,20 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 2:
-                if ((olb != null && !olb.getData().isCarExist() && oblb != null) || (olb != null && olb.getData().isCarExist())) {
+                if (olb != null && oblb != null) {
 //                    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", olb.getData().isCarExist() ? olb.getData().getExistCarInfo().getLicenseId() : oblb.getData().getLicenseId());
+                    map.put("licenseId", 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));
@@ -1037,27 +975,22 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 3:
-                if (olb != null || (cdb != null && cdb.getRes() == 1)) {
+                if (olb != null && oblb != null) {
 //                    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,7 +24,6 @@ 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;
@@ -32,8 +31,6 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 import com.bumptech.glide.Glide;
-import com.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;
@@ -52,24 +49,23 @@ 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, true};
+    private Boolean[] isShowEdit = {false, false, true, true};
-    private Boolean[] isShowSkip = {true, false, false, true, true};
+    private Boolean[] isShowSkip = {true, false, false, 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, value2;
+    private TextView title1, title2, title3, zjimg_name, upload_img, tvTips, tvSkip;
     private EditText value1;
-    private LinearLayout llInfo, llDate;
+    private LinearLayout llInfo;
     private RelativeLayout up_img;
     private Button submit;
 
@@ -79,9 +75,7 @@ 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) {
@@ -98,11 +92,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     }
                     CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_DEL);
                 }
-                if (CacheGroup.cacheList.get("onlyGetDetail") != null) {
-                    Log.e("--res--", CacheGroup.cacheList.get("onlyGetDetail"));
-                    cdb = gson.fromJson(CacheGroup.cacheList.get("onlyGetDetail"), CarDelBean.class);
-                    CacheGroup.cacheList.remove("onlyGetDetail");
-                }
 
 
                 if (CacheGroup.cacheList.get("upload") != null) {
@@ -120,16 +109,10 @@ 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");
                 }
 
@@ -147,12 +130,8 @@ 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();
@@ -179,13 +158,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) && cdb.getData() != null) {
+                        if (!"".equals(carId) ){
-                            if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，并且传过挂车直接结束
+                            if (cdb.getData().getIsTrailer() == 1&&!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 && cdb.getData().getTrailerResVo() != null && TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，没传过挂车，到挂车页面
+                            }else if(cdb.getData().getIsTrailer() == 1&&TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车，没传过挂车，到挂车页面
                                 finish();
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
@@ -194,25 +173,22 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                     in.putExtra("cheData", new Gson().toJson(cdb));
                                 }
                                 startActivity(in);
-                            } else if (cdb.getData().getIsTrailer() == 0) {//不需要挂车
+                            }else if(cdb.getData().getIsTrailer() == 0){//不需要挂车
-                                if ("1".equals(cdb.getData().getNeedUpQCPhoto())) {//需要从业资格证
+                                if ("1".equals(cdb.getData().getNeedUpQCPhoto())){//需要从业资格证
                                     Intent in = new Intent(con, AuthQualificationActivity.class);
                                     in.putExtra("type", "0");
                                     in.putExtra("carId", carId);
                                     in.putExtra("isOverCar", false);
                                     startActivity(in);
-                                } else {
+                                }else{
                                     finish();
                                     Intent in = new Intent(con, AddCarSuccActivity.class);
                                     in.putExtra("type", 3);
                                     con.startActivity(in);
                                 }
                             }
-                        } else {
-                            finish();
                         }
 
-
 //                        if (!"".equals(carId) && cdb.getData().getIsTrailer() == 1) {
 //                            if (!"".equals(carId)) {
 //                                finish();
@@ -237,23 +213,8 @@ 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;
@@ -272,7 +233,6 @@ 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);
@@ -280,7 +240,6 @@ 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);
 
@@ -288,12 +247,10 @@ 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);
@@ -350,14 +307,6 @@ 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;
         }
     }
 
@@ -366,7 +315,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
      * 展示大图片
      */
     private void showBigImg() {
-        if ((type == 3 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
+        if (TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())){
             choicePhoto();
             return;
         }
@@ -374,7 +323,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
             case 0:
                 if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getCarImage().equals("")) {
                     new XPopup.Builder(con)
-                            .asImageViewer(img, cdb.getData().getCarImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                            .asImageViewer(img, cdb.getData().getCarImage(),  new SmartGlideImageLoader(R.mipmap.ic_launcher))
                             .show();
 //                    new XPopup.Builder(con)
 //                            .asImageViewer(img, cdb.getData().getCarImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
@@ -411,21 +360,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 //                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
 //                            .show();
 
+                    break;
                 }
-                break;
-
-            case 4:
-                if (cdb.getData().getPolicyPhotoUrl() != null && !"".equals(cdb.getData().getPolicyPhotoUrl())) {
-                    //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;
         }
     }
 
@@ -441,14 +377,14 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 
         switch (type) {
             case 0:
-                if (!TextUtils.isEmpty(url) || (cdb != null && !TextUtils.isEmpty(cdb.getData().getCarImage()))) {
+                if (!TextUtils.isEmpty(url)||(cdb!=null&&!TextUtils.isEmpty(cdb.getData().getCarImage()))){
                     finish();
                     Intent in = new Intent(con, PhotoCarActivity.class);
 //                    in.putExtra("type", 1);
                     in.putExtra("type", 3);
                     in.putExtra("carId", carId);
                     con.startActivity(in);
-                } else {
+                } else{
                     Toast.makeText(this, "请上传车辆照片", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -465,7 +401,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                new AuthRequest().saveCarRegisterNo(con, hd, carId, s);
+                new AuthRequest().saveCarRegisterNo(con,hd,carId,s);
                 break;
             case 3:
                 String s1 = value1.getText().toString();
@@ -473,16 +409,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                new AuthRequest().saveCarRoadLicenseNo(con, hd, carId, s1);
+                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;
         }
     }
@@ -515,17 +442,6 @@ 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("已上传");
                 }
@@ -611,10 +527,6 @@ 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,10 +14,7 @@ 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;
@@ -41,7 +38,6 @@ 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;
@@ -55,7 +51,6 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
     public  String carId="";
     public static final String DEL_CAR="delete_che";
     public static final String CAR_AUDIO="CAR_AUDIO";
-    public static final String APP_INFO="APP_INFO";
     private int submitIndex=0;
     private BaseBean bb;
     private ImageView show_img;
@@ -70,7 +65,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove(CAR_AUDIO);
                 }
                 if(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL)!=null){
-                    Log.e("--res--lijia",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
+                    Log.e("--res--",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
                     cdb=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL), CarDelBean.class);
                     if(cdb.getCode()==200){
                         initView(null);
@@ -84,8 +79,6 @@ 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();
@@ -173,13 +166,6 @@ 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);
@@ -221,12 +207,11 @@ 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);
@@ -316,17 +301,6 @@ 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) //对于只使用一次的弹窗，推荐设置这个
@@ -410,7 +384,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
         super.onResume();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    @Subscribe
     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

@@ -146,10 +146,10 @@ public class HomeFragment extends BaseFragment {
                         MsgUtil.addHdMsgWat(hd, 33);
 
                         //新用户注册，需弹窗提示注册
-                        if ("0".equals(ub.getData().getRealAuthentication())) {
+                        if ("0".equals(ub.getData().getRealAuthentication())){
                             new MessageUtils().showSimCenPop(con, "该司机还未认证，未认证无法接单。是否去注册！", () -> {
-                                Intent in = new Intent(con, CertificatesActivity.class);
+                                Intent in=new Intent(con, CertificatesActivity.class);
-                                in.putExtra("index", 0);
+                                in.putExtra("index",0);
                                 startActivity(in);
                             });
                         }
@@ -241,9 +241,7 @@ public class HomeFragment extends BaseFragment {
                                 in.putExtra("url", deb.getData().getIdCardUpdateUrl());
                             }
                         }
-                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl())||
+                        if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(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)
                                     // 设置成可拖拽的
@@ -547,6 +545,7 @@ public class HomeFragment extends BaseFragment {
         ur.getImage(1);
 
 
+
         if (UiAuxiliary.isLogin(con)) {
             ur.User();
             ur.getDriverExpire();
@@ -901,49 +900,28 @@ public class HomeFragment extends BaseFragment {
 
     public void initAlct() {
         PermissionX.init(getActivity())
-                .permissions(Manifest.permission.ACCESS_FINE_LOCATION,
+                .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.ACCESS_COARSE_LOCATION,
-                        Manifest.permission.ACCESS_BACKGROUND_LOCATION,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.CALL_PHONE,
+                        Manifest.permission.RECORD_AUDIO)
-                        Manifest.permission.RECORD_AUDIO,
-                        Manifest.permission.CAMERA)
                 .request((allGranted, grantedList, deniedList) -> {
-                    boolean isHasLocation = false;
+                    if (allGranted) {
-                    boolean isHasStor = false;
+
-                    for (int i = 0; i < grantedList.size(); i++) {
+                    } else {
-                        if (grantedList.get(i).equals(Manifest.permission.ACCESS_FINE_LOCATION)){
-                            isHasLocation = true;
-                        }
-                        if (grantedList.get(i).equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)){
-                            isHasStor = true;
-                        }
-                    }
-                    if (isHasLocation&&isHasStor){
-                        ALProcess.verification(con);
-                        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
-                            @Override
-                            public void onSuccess(Object o) {
-                                Log.e("--成功信息--", new Gson().toJson(o));
-                            }
 
-                            @Override
-                            public void onFailure(String s, String s1) {
-                                Log.e("--失败信息--", s + s1);
-                            }
-                        });
-                    }else {
-                        if (!isHasLocation){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-定位-始终允许", Toast.LENGTH_SHORT).show();
-                            return;
-                        }
-                        if (!isHasStor){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-媒体与文件-仅媒体", Toast.LENGTH_SHORT).show();
-                        }
                     }
                 });
+        ALProcess.verification(con);
+        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
+            @Override
+            public void onSuccess(Object o) {
+                Log.e("--成功信息--", new Gson().toJson(o));
+            }
 
+            @Override
+            public void onFailure(String s, String s1) {
+                Log.e("--失败信息--", s + s1);
+            }
+        });
     }
 
     private MyLocationStyle myLocationStyle;//地图定位样式

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

@@ -4,20 +4,12 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
-import android.text.Layout;
-import android.text.TextUtils;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
-import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -110,18 +102,14 @@ 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);
+                        Intent intent = new Intent(this, H5Activity.class);
-                            in.putExtra("id", "0");
+                        intent.putExtra("url", (String) bb.getData());
-                            startActivity(in);
+                        intent.putExtra("view_file", false);
-                            finish();
+                        startActivity(intent);
-                        }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();
@@ -207,8 +195,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     //2021/02/27记，类型声明错误
                     ImageButton return_btn = v.findViewById(R.id.return_btn);
                     ImageButton xuan = v.findViewById(R.id.xuan);
-                    CheckBox checkBox = v.findViewById(R.id.cb);
-                    TextView totalFreight = v.findViewById(R.id.totalFreight);
                     ImageButton btnFp = v.findViewById(R.id.btnFp);
                     TextView effectiveTime = v.findViewById(R.id.effectiveTime);
                     TextView check_contract = v.findViewById(R.id.check_contract);
@@ -219,15 +205,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     return_btn.setOnClickListener(v16 -> {
                         finish();
                     });
-                    totalFreight.setText("****");
-                    checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                        if (isChecked){
-                            totalFreight.setText(hyd.getData().getTotalFreight());
-                        }else{
-                            totalFreight.setText("****");
-                        }
-//                        totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
-                    });
 //                    String textSource = "同意在符合相关税务机关要求的情况下代开<font color='#ff0000'>增值税发票</font>";
                     String textSource = "公司已对运输合同条款充分解释说明，本人已充分理解、认可并签署；同意符合税务机关要求下<font color='#ff0000'>代开增值税发票</font>，产生的增值税及附加税本人承担。";
                     tvZzs.setText(Html.fromHtml(textSource));

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

@@ -40,7 +40,6 @@ import com.amap.api.services.route.DriveStep;
 import com.amap.api.services.route.RideRouteResult;
 import com.amap.api.services.route.RouteSearch;
 import com.amap.api.services.route.WalkRouteResult;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.bumptech.glide.Glide;
 import com.dahe.mylibrary.utils.TimeUtil;
@@ -74,7 +73,6 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Predicate;
 
 public class StartYunDanActivity extends BaseActivity {
 
@@ -111,9 +109,6 @@ public class StartYunDanActivity extends BaseActivity {
                     Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
                     sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
                     wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     if (sob.getCode() == 200 && sob.getData() != null) {
                         id = sob.getData().getWaybillId();
                         initView(null);
@@ -207,30 +202,6 @@ public class StartYunDanActivity extends BaseActivity {
                     initStartBody(v);
                     break;
                 case R.layout.item_yundan_yunxing:
-                    LinearLayout llMoney = v.findViewById(R.id.llMoney);
-                    if (!sob.getData().getWaybillStatus().equals("已装货")
-                            && !sob.getData().getWaybillStatus().equals("待装货")
-                            && !sob.getData().getWaybillStatus().equals("待接单")) {
-                        if (sob.getData().getWaybillStatus().equals("已装货")) {
-                            StartOrderBean.DataDTO.WayChildrenDTO mySdw = new StartOrderBean.DataDTO.WayChildrenDTO();
-                            for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
-                                StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
-                                if (sdw.getType() == 1) {
-                                    mySdw = sdw;
-                                    break;
-                                }
-                            }
-                            if (mySdw.getStatus() == 3) {
-                                llMoney.setVisibility(View.GONE);
-                            } else {
-                                llMoney.setVisibility(View.VISIBLE);
-                            }
-                        } else {
-                            llMoney.setVisibility(View.VISIBLE);
-                        }
-                    } else {
-                        llMoney.setVisibility(View.GONE);
-                    }
                     ImageView head_img = v.findViewById(R.id.head_img);
                     if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) {
                         Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
@@ -475,16 +446,12 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
-    private CustomDialog customDialog;
-
     @Override
     protected void onResume() {
         super.onResume();
         if (map != null) {
             map.onResume();
         }
-        customDialog = new CustomDialog(con, "网络请求中...");
-        customDialog.show();
         hyr.startOrder(id);
         hyr.getEvaluate(id);
     }

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

@@ -19,7 +19,6 @@ 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;
@@ -94,15 +93,11 @@ 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);
@@ -117,10 +112,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class);
                         if (bb.getCode() == 200) {
                             if (index == 2) {
-                                if (!keys) {//装货回单
+                                if (!keys){//装货回单
-                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                        customDialog.dismiss();
-                                    }
                                     Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
@@ -156,9 +148,6 @@ 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) {
@@ -171,9 +160,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 14://定位成功
                 locationKey = true;
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                customDialog.dismiss();
-                    customDialog.dismiss();
-                }
                 tv_loaction.setText("定位成功");
                 tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
                 latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude()));
@@ -181,9 +168,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 16://定位失败
                 locationKey = false;
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                customDialog.dismiss();
-                    customDialog.dismiss();
-                }
                 tv_loaction.setText("定位失败，点击重试");
                 tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color, null));
                 Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
@@ -201,7 +186,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //                if(index==1 || index==2){
 //                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
 //                }
-                if ((index == 0 || index == 1) && !BuildConfig.isTest) {//装卸货车辆需要识别车牌号,测试环境不校验车牌号
+                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
                     new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
                 } else {
                     hyr.uploadFile(new File(path));
@@ -211,7 +196,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
         }
     }
-
     private LatLng latLng;
 
     public LatLng convertGPSToBaidu(LatLng srLatLng) {
@@ -339,12 +323,6 @@ 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);
@@ -358,12 +336,6 @@ 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);
             }
         }
@@ -377,10 +349,6 @@ 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:
                 //装货
@@ -564,9 +532,6 @@ 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();
@@ -599,9 +564,6 @@ 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();
@@ -610,9 +572,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             @Override
             public void onFailure(String s, String s1) {
                 Log.e("上报安联失败(卸货照片):", s + s1);
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
 //                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
 //                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -638,9 +597,6 @@ 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();
@@ -688,6 +644,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     }
 
 
+
+
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -716,9 +674,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(装货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });
@@ -756,9 +711,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });

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

@@ -7,11 +7,8 @@ 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;
 
@@ -22,17 +19,6 @@ 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;
@@ -61,35 +47,22 @@ 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 implements Inputtips.InputtipsListener {
+public class ShangChuangImgActivityBC extends BaseAppCompatActivity {
 
-    private TextView submit, name_top, name_body, address, tips, tips_x,tvDate,tvLocation;
+    private TextView submit, name_top, name_body, address, tips, tips_x;
     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"};
@@ -113,64 +86,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
     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;
@@ -359,10 +275,6 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
         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();
@@ -385,44 +297,6 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                 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);
     }
 
@@ -517,9 +391,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
             case 0:
                 //装货
                 if (imgIds != null && imgIds.size() > 0) {
-                    lub.setLatitude(tempLoca.getLatitude() + "");
+                    lub.setLatitude(lgdu.getLatitude() + "");
-                    lub.setLongitude(tempLoca.getLongitude() + "");
+                    lub.setLongitude(lgdu.getLongitude() + "");
-                    lub.setLocationAddress(tempLoca.getAddress());
+                    lub.setLocationAddress(lgdu.getAddress());
                     lub.setImageId(imgIds);
                     lub.setWaybillId(wid);
                     Log.e("--装货信息", gson.toJson(lub));
@@ -546,9 +420,8 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                     lub.setLocationAddress(tempLoca.getAddress());
                     lub.setImageId(imgIds);
                     lub.setWaybillId(wid);
-                    lub.setRealLoadTime(tempLoca.getTime());
                     Log.e("--卸货信息", gson.toJson(lub));
-                    if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) {
+                    if (locationKey) {
                         if (keys) {
                             nfc();
                             uploadInfo();
@@ -577,7 +450,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                     urib.setWaybillId(wid);
                     Log.e("--回单信息", gson.toJson(urib));
                     if (locationKey) {
-                        if (index == 2 && keys && !TextUtils.isEmpty(tempLoca.address)) {
+                        if (index == 2 && keys) {
                             up_trafficSign();
                             up_trafficReceipt();
                             receipt_image();
@@ -622,10 +495,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
     public void up_trafficSign() {
         //安联
         Location l = new Location();
-        l.setBaiduLongitude(tempLocaBd.longitude);
+        l.setBaiduLongitude(tempLoca.longitude);
-        l.setBaiduLatitude(tempLocaBd.latitude);
+        l.setBaiduLatitude(tempLoca.latitude);
-        l.setLocation(tempLocaBd.getAddress());
+        l.setLocation(tempLoca.getAddress());
-        l.setTime(tempLocaBd.getTime());
+        l.setTime(tempLoca.getTime());
         List<Goods> gs = new ArrayList<>();
         for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
             if (wid.equals(wayChild.getId() + "")) {
@@ -662,10 +535,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
     public void up_trafficReceipt() {
         //安联
         Location l = new Location();
-        l.setBaiduLongitude(tempLocaBd.longitude);
+        l.setBaiduLongitude(tempLoca.longitude);
-        l.setBaiduLatitude(tempLocaBd.latitude);
+        l.setBaiduLatitude(tempLoca.latitude);
-        l.setLocation(tempLocaBd.getAddress());
+        l.setLocation(tempLoca.getAddress());
-        l.setTime(tempLocaBd.getTime());
+        l.setTime(tempLoca.getTime());
         MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
 
             @Override
@@ -690,9 +563,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
-        image.setBaiduLongitude(tempLocaBd.longitude);
+        image.setBaiduLongitude(latLng.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
+        image.setBaiduLatitude(latLng.latitude);
-        image.setLocation(tempLocaBd.getAddress());
+        image.setLocation(lgdu.getAddress());
         MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
 
             @Override
@@ -721,10 +594,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
         image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(tempLocaBd.getTime());
+        image.setImageTakenDate(tempLoca.getTime());
-        image.setBaiduLongitude(tempLocaBd.longitude);
+        image.setBaiduLongitude(tempLoca.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
+        image.setBaiduLatitude(tempLoca.latitude);
-        image.setLocation(tempLocaBd.getAddress());
+        image.setLocation(tempLoca.getAddress());
         MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
 
             @Override
@@ -754,10 +627,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
         image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(tempLocaBd.getTime());
+        image.setImageTakenDate(tempLoca.getTime());
-        image.setBaiduLongitude(tempLocaBd.longitude);
+        image.setBaiduLongitude(tempLoca.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
+        image.setBaiduLatitude(tempLoca.latitude);
-        image.setLocation(tempLocaBd.getAddress());
+        image.setLocation(tempLoca.getAddress());
         MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
 
             @Override
@@ -818,10 +691,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
         //安联
         if (sob.getData().getReportAlct() == 1) {
             Location l = new Location();
-            l.setBaiduLongitude(tempLocaBd.longitude);
+            l.setBaiduLongitude(latLng.longitude);
-            l.setBaiduLatitude(tempLocaBd.latitude);
+            l.setBaiduLatitude(latLng.latitude);
-            l.setLocation(tempLocaBd.getAddress());
+            l.setLocation(lgdu.getAddress());
-            l.setTime(tempLocaBd.getTime());
+            l.setTime(Timer.getTimerT());
             MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
                 @Override
                 public void onSuccess() {
@@ -854,10 +727,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
         //安联
         if (sob.getData().getReportAlct() == 1) {
             Location l = new Location();
-            l.setBaiduLongitude(tempLocaBd.longitude);
+            l.setBaiduLongitude(tempLoca.longitude);
-            l.setBaiduLatitude(tempLocaBd.latitude);
+            l.setBaiduLatitude(tempLoca.latitude);
-            l.setLocation(tempLocaBd.getAddress());
+            l.setLocation(tempLoca.getAddress());
-            l.setTime(tempLocaBd.getTime());
+            l.setTime(tempLoca.getTime());
             Log.e("-安联卸货信息-", gson.toJson(l));
             MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
                 @Override
@@ -868,7 +741,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                         JTTProcess.stop(con, sob, "");
                     }
                     //卸货状态-平台
-                    hyr.dischargeCargo4(lub);
+                    hyr.dischargeCargo(lub);
                     //卸货照片-安联
                     up_image();
                 }
@@ -876,9 +749,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I
                 @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,14 +1,8 @@
 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;
@@ -16,8 +10,6 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -26,7 +18,6 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 
-import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.request.net.BaseObserver;
 import com.arpa.hndahesudintocctmsdriver.request.net.DataManager;
@@ -47,7 +38,6 @@ 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;
@@ -74,7 +64,8 @@ public class LoginActivity extends BaseActivity {
     private LoginBean loginBean;
     private TimerTask tt;
     private int timer_sum = 60;
-    private CheckBox cb;
+    private ImageButton agree_btn;
+    private CardView no_btn;
     private UserRequset ur;
 
     @Override
@@ -97,22 +88,15 @@ public class LoginActivity extends BaseActivity {
                     //存储登录记录
                     loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
                     Log.e("--登录信息--", new Gson().toJson(loginBean));
-                    AppInfoBean appInfoBean = new AppInfoBean();
                     if (loginBean.getCode() == 200) {
                         SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken());
                         SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
                         SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname());
                         SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + "");
                         JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
-                        appInfoBean.setStatus("0");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean,"post");
                         UiAuxiliary.homeRequest("登录成功");
                         finish();
                     } else {
-                        appInfoBean.setStatus("1");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean,"post");
                         Toast.makeText(con, loginBean.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(LOGIN_RESULT);
@@ -134,7 +118,8 @@ public class LoginActivity extends BaseActivity {
         input_phone = findViewById(R.id.input_phone);
         input_code = findViewById(R.id.input_code);
         getCode = findViewById(R.id.getCode);
-        cb = findViewById(R.id.cb);
+        agree_btn = findViewById(R.id.agree_btn);
+        no_btn = findViewById(R.id.no_btn);
         ur = new UserRequset(con, hd);
         initView(null);
     }
@@ -147,18 +132,21 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        cb.setOnCheckedChangeListener((buttonView, isChecked) -> {
+        agree_btn.setOnClickListener(v -> {
-            if (isChecked) {
+            agree_btn.setVisibility(View.GONE);
-                key = true;
+            no_btn.setVisibility(View.VISIBLE);
-            } else {
+            key = false;
-                key = false;
-            }
         });
+        no_btn.setOnClickListener(v -> {
+            agree_btn.setVisibility(View.VISIBLE);
+            no_btn.setVisibility(View.GONE);
+            key = true;
 
+        });
         ConfigBean cb = ConfigParts.getConfigParts(con);
         if (cb != null) {
             url1 = cb.getData().getUserUrl();
-            url2 = "https://agreement.dahehuoyun.com/currency/#/";
+            url2 = "https://agreement.dahehuoyun.com/huawei/#/private";
         }
         TextView tv_content = findViewById(R.id.tv_content);
         String str = "我已阅读并同意相关服务条款和隐私政策《用户服务协议》和《隐私政策》";

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

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

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

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

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

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

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

@@ -1,14 +1,21 @@
 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
@@ -27,6 +34,33 @@ 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,7 +5,6 @@ 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;
@@ -13,8 +12,6 @@ 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;
@@ -43,13 +40,13 @@ import java.util.List;
  * @date 2021/8/26 19:06
  * @description:
  */
-public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClickListener {
+public class UpBankActivity extends BaseAppCompatActivity {
 
     private ImageView up_bank_img;
-    private EditText bank_name, bank_number;
+    private EditText bank_name,bank_number;
     private TextView submit;
     private ImageView return_btn;
-    public GetImageAlert gia = new GetImageAlert();
+    public GetImageAlert gia=new GetImageAlert();
     String path;
     private OCRBankBean ib;
     private WalletRequest qr;
@@ -58,36 +55,35 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what) {
+        switch (m.what){
             case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("OCR_BANK") != null) {
+                if (CacheGroup.cacheList.get("OCR_BANK")!=null) {
-                    ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class);
+                    ib=new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"),OCRBankBean.class);
-                    if (ib.getCode() == 200) {
+                    if(ib.getCode()==200){
                         initView(null);
                         customDialog.dismiss();
-                        WalletFragment.isInsBank = true;
+                        WalletFragment.isInsBank=true;
-                    } else {
+                    }else{
-                        Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,ib.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("OCR_BANK");
                 }
-                if (CacheGroup.cacheList.get("insBank") != null) {
+                if(CacheGroup.cacheList.get("insBank")!=null){
-                    BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class);
+                    BaseBean bb=new Gson().fromJson(CacheGroup.cacheList.get("insBank"),BaseBean.class);
-                    if (bb.getCode() == 200) {
+                    if(bb.getCode()==200){
-                        customDialog.dismiss();
+                        Toast.makeText(con,"绑定成功",Toast.LENGTH_SHORT).show();
-                        Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
                         finish();
-                    } else {
+                    }else{
-                        Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,bb.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("insBank");
                 }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                customDialog = new CustomDialog(con, "上传识别中...");
+                customDialog=new CustomDialog(con, "上传识别中...");
                 customDialog.show();
                 path = (String) m.obj;
-                new OCRRequest().ORCBank(con, hd, new File(path));
+                new OCRRequest().ORCBank(con,hd,new File(path));
                 break;
         }
     }
@@ -99,18 +95,24 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_bank_auth);
-        act = this;
+        act=this;
-        con = this;
+        con=this;
-        up_bank_img = findViewById(R.id.up_bank_img);
+        up_bank_img=findViewById(R.id.up_bank_img);
-        bank_name = findViewById(R.id.bank_name);
+        bank_name=findViewById(R.id.bank_name);
-        bank_number = findViewById(R.id.bank_number);
+        bank_number=findViewById(R.id.bank_number);
-        submit = findViewById(R.id.submit);
+        submit=findViewById(R.id.submit);
-        return_btn = findViewById(R.id.return_btn);
+        return_btn=findViewById(R.id.return_btn);
-        qr = new WalletRequest(con, hd);
+        qr=new WalletRequest(con,hd);
         up_bank_img.setOnClickListener(v -> {
             gia.showPopueWindow(this);
         });
-        submit.setOnClickListener(new OnLimitClickHelper(this));
+        submit.setOnClickListener(v -> {
+            if(ib!=null){
+                submit();
+            }else{
+                Toast.makeText(con,"请先上传图片",Toast.LENGTH_SHORT).show();
+            }
+        });
         return_btn.setOnClickListener(v -> {
             finish();
         });
@@ -127,11 +129,11 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 12 && resultCode == RESULT_OK) {
+         if (requestCode == 12 && resultCode == RESULT_OK) {
-            path = gia.getFile().getPath();
+            path=gia.getFile().getPath();
-            Log.e("图片地址:", path);
+            Log.e("图片地址:",path);
             gia.dis();
-            ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
+            ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
             if (imgs != null && imgs.size() > 0) {
@@ -141,43 +143,29 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
                 if (TextUtils.isEmpty(paths)) {
                     paths = image.getPath();
                 }
-                path = paths;
+                path=paths;
-                Log.e("图片地址:", path);
+                Log.e("图片地址:",path);
                 gia.dis();
-                ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
+                ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
             }
         }
     }
 
-    public void submit() {
+    public void submit(){
-        customDialog = new CustomDialog(con, "上传中,请稍后...");
+        String bankName=bank_name.getText().toString().trim();
-        customDialog.show();
+        String bankNumber=bank_number.getText().toString().trim();
-        String bankName = bank_name.getText().toString().trim();
+        if("".equals(bankName) || "".equals(bankNumber)){
-        String bankNumber = bank_number.getText().toString().trim();
+            Toast.makeText(con,"请先补充完整的银行卡信息",Toast.LENGTH_LONG).show();
-        if ("".equals(bankName) || "".equals(bankNumber)) {
-            Toast.makeText(con, "请先补充完整的银行卡信息", Toast.LENGTH_LONG).show();
             return;
         }
-        InsBankInputBean ibib = new InsBankInputBean();
+        InsBankInputBean ibib =new InsBankInputBean();
         ibib.setCardNo(bankNumber);
         ibib.setCardType(Integer.parseInt(ib.getData().getBankCardType()));
         ibib.setBankName(bankName);
         ibib.setCardUserType(1);
         ibib.setImageId(ib.getData().getId());
-        Log.e("-res-", new Gson().toJson(ibib));
+        Log.e("-res-",new Gson().toJson(ibib));
         qr.insBankCard(ibib);
     }
 
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.submit:
-                if (ib != null) {
-                    submit();
-                } else {
-                    Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show();
-                }
-                break;
-        }
-    }
 }

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

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

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

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

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

@@ -3,7 +3,6 @@ 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;
 
@@ -42,7 +41,6 @@ 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))
@@ -73,40 +71,6 @@ 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))
@@ -122,7 +86,6 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .get()
                 .headers(hb.build())
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .build();
         return request;
     }
@@ -136,7 +99,6 @@ 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();
@@ -167,7 +129,6 @@ 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;
@@ -184,26 +145,23 @@ 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,boolean isSave) {
+    public static Request postFiles(OkDate od,File file,String token,String carId,String carNum) {
         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,8 +9,6 @@ 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;
@@ -41,7 +39,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(), AppUtils.getAppPackageName()+".fileprovider",imageFile);
+                    uri = FileProvider.getUriForFile(act.getApplicationContext(),"com.arpa.hndahesudintocctmsdriver.fileprovider",imageFile);
                 }else {
                     /*7.0以下则直接使用Uri的fromFile方法将File转化为Uri*/
                     uri = Uri.fromFile(imageFile);

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

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

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

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

@@ -1,17 +0,0 @@
-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_eye.xml

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

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

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

app/src/main/res/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:layout_alignParentRight="true"
+                    android:textColor="#ff999999"
-                    android:layout_marginLeft="@dimen/dp_30"
+                    android:textSize="@dimen/sp_13"
-                    android:background="@null"
+                    android:maxLines="1"
+                    android:hint="点击进行手动输入"
                     android:ellipsize="end"
                     android:gravity="right"
-                    android:hint="点击进行手动输入"
+                    android:layout_marginLeft="@dimen/dp_30"
-                    android:maxLines="1"
+                    android:background="@null"
-                    android:textColor="#ff999999"
+                    />
-                    android:textSize="@dimen/sp_13" />
             </RelativeLayout>
         </LinearLayout>
         <TextView

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

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

app/src/main/res/layout/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_16"
+                        android:layout_marginTop="@dimen/dp_19"
                         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_16"
+                        android:layout_marginBottom="@dimen/dp_19"
                         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,8 +137,6 @@
                 android:orientation="vertical"
                 android:padding="@dimen/dp_14">
 
-
-
                 <RelativeLayout
                     android:id="@+id/cow1"
 
@@ -164,55 +162,10 @@
                         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,225 +1,175 @@
 <?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"
-    android:background="@drawable/bg_theme">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-
+    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:layout_centerHorizontal="true"
+        android:src="@mipmap/top_creativity"
-        android:layout_marginTop="@dimen/dp_16"
+        android:layout_centerHorizontal="true"/>
-        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:layout_marginLeft="@dimen/dp_30"
+                android:src="@mipmap/return_lefts"
                 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:layout_alignParentRight="true"
+                android:textSize="@dimen/sp_14"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="@dimen/dp_30"
-                android:padding="@dimen/dp_5"
                 android:text="定位成功"
-                android:textColor="@color/theme_color"
+                android:layout_alignParentRight="true"
-                android:textSize="@dimen/sp_14" />
+                android:layout_marginRight="@dimen/dp_30"
+                android:layout_centerVertical="true"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/theme_color"/>
 
         </RelativeLayout>
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_38"
             android:layout_marginTop="@dimen/dp_8"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             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_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" />
 
+    <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:text="上传卸货照片"
+        android:textColor="#ff000000"
+        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_centerHorizontal="true"
                         android:layout_centerVertical="true"
-                        android:src="@mipmap/up_img" />
+                        android:layout_centerHorizontal="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:layout_alignParentRight="true"
-                        android:padding="@dimen/dp_3"
                         android:src="@mipmap/icon_delete"
-                        android:visibility="gone" />
+                        android:padding="@dimen/dp_3"
+                        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:layout_marginTop="@dimen/dp_13"
-                        android:text=""
                         android:textColor="#ff999999"
+                        android:text=""
                         android:textSize="@dimen/sp_13" />
                 </LinearLayout>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-
         <LinearLayout
-            android:layout_width="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">
+            android:layout_marginLeft="@dimen/dp_38"
-
+            android:layout_marginRight="@dimen/dp_38"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
             <TextView
                 android:id="@+id/tips_x"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="*"
                 android:textColor="#E61829"
-                android:visibility="gone" />
+                android:visibility="gone"/>
-
             <TextView
                 android:id="@+id/tips"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="卸货照片包含车牌号、三分之二车身或者卸货场景"
                 android:textColor="#E61829"
-                android:visibility="gone" />
+                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"
-            android:layout_marginLeft="@dimen/dp_38"
+            app:cardCornerRadius="@dimen/dp_21"
-            android:layout_marginTop="@dimen/dp_33"
+            app:cardBackgroundColor="@color/red">
-            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/huoyuan_xq.xml

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

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

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

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

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

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

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

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

@@ -103,7 +103,6 @@
         </LinearLayout>
 
         <LinearLayout
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_30"
@@ -132,7 +131,6 @@
         </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,35 +146,6 @@
                         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"
@@ -304,19 +275,11 @@
                         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>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Jul 12 10:16:49 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/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>}
      */
 
-    private static final DateFormat DEFAULT_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
+    public 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,24 +29,6 @@ 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();