fff

app/build.gradle

@@ -33,21 +33,19 @@ android {
 //        }
     }
 
-
     defaultConfig {
         applicationId "com.arpa.hndahesudintocctmsdriver"
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 30
-        versionCode 76
+        versionCode 59
-        versionName "3.4.6"
+        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() ]
             }
         }
 
@@ -58,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 {
@@ -89,7 +107,7 @@ android {
         }
     }
 
-    repositories {
+    repositories{
         flatDir {
             dirs 'libs'
         }
@@ -97,30 +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", "\"http://192.168.1.118:8080/api/\"")
+            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
-//            buildConfigField("String", "BASE_URL", "\"http://linux.local:8080/api/\"")
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "司机测试"
         }
         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"
@@ -129,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 {
@@ -168,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'
@@ -186,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'
@@ -201,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"
@@ -213,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

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.arpa.hndahesudintocctmsdriver">
-
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <!-- 白名单 -->
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -45,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" />
@@ -54,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"
@@ -72,14 +71,14 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" ></activity>
 
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.wallet.WithdrawalActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"   />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.OrderAllActivity"
             android:screenOrientation="portrait" />
@@ -94,11 +93,10 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait"  />
-            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity"
             android:screenOrientation="portrait">
@@ -143,13 +141,13 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.GetShangChuanActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AuthQualificationActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.OrderListActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.HuoYunDelActivity"
             android:screenOrientation="portrait">
@@ -162,22 +160,15 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait"/>
-            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
-        <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.FaceSuccActivity"
-            android:exported="true"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity"
-            android:screenOrientation="portrait" />
+            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" />
@@ -198,33 +189,28 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle.VideoReleaseActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.WebPDFActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait">
 
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle.HomePageActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.alert.VehicleChoiceActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.OrderComplaintActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.web.WebActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden" />
-        <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.web.WebKfActivity"
             android:screenOrientation="portrait"
@@ -234,7 +220,7 @@
         <activity
             android:name=".ui.news.NewActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+             android:windowSoftInputMode="stateAlwaysHidden" />
 
         <service
             android:name="com.arpa.hndahesudintocctmsdriver.service.TrackService"
@@ -276,8 +262,8 @@
         <!--高德地图-->
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="${GAODEKEY}" />
+            android:value="78019612271411eca3af34db91930620" />
-        <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
+<!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
         <service android:name="com.amap.api.location.APSService"></service>
 
@@ -288,7 +274,7 @@
         <!-- 极光-->
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="fba6f55621c670d8c1fe9191" /> <!-- </>值来自开发者平台取得的AppKey -->
+            android:value="571d93ae5117da6dee848c92" /> <!-- </>值来自开发者平台取得的AppKey -->
 
         <meta-data
             android:name="JPUSH_CHANNEL"
@@ -373,39 +359,10 @@
 
         <activity
             android:name=".H5Activity"
-            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
-            android:screenOrientation="portrait">
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="demo"
-                    android:path="/signBack"
-                    android:scheme="esign" />
-                <data
-                    android:host="demo"
-                    android:path="/realBack"
-                    android:scheme="esign" />
-
-                <data
-                    android:host="driver"
-                    android:path="/realBack"
-                    android:port="8088"
-                    android:scheme="dahe" />
-            </intent-filter>
-        </activity>
-
-
-        <activity
-            android:name=".H5Activity2"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -440,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();
@@ -63,8 +77,8 @@ public class App extends Application {
                 }
                 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
                 // 路由初始化
-//                JVerificationInterface.setDebugMode(true);
+                JVerificationInterface.setDebugMode(true);
-//                JVerificationInterface.init(this, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+                JVerificationInterface.init(this, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
                 //友盟
                 //设置非debug版本开启
                 if (!isDebugVersion(con)) {
@@ -78,29 +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/H5Activity.java

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

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

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

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

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

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/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/CarInfoBean2.java

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

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

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

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/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/DriverUpBean.java

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

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

@@ -83,8 +83,6 @@ public class HuoYuanDelBean {
         private String vehicleTypeName;
         private int vehicleLength;
         private String vehicleLengthName;
-        private String carNumber;
-        private String carId;
         private String namedDrivers;
         private String requirement;
         private String totalFreight;
@@ -99,23 +97,6 @@ public class HuoYuanDelBean {
         private Object contactName;
         private Object contactPhone;
 
-
-        public String getCarNumber() {
-            return carNumber == null ? "" : carNumber;
-        }
-
-        public void setCarNumber(String carNumber) {
-            this.carNumber = carNumber;
-        }
-
-        public String getCarId() {
-            return carId == null ? "" : carId;
-        }
-
-        public void setCarId(String carId) {
-            this.carId = carId;
-        }
-
         public int getId() {
             return id;
         }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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;
@@ -71,122 +70,6 @@ public class OCRVehicleBackLicenseBean {
         private String fileNumber;
         private String carNumber;
         private int licenseId;
-        private String note;
-        private String passengers;
-        private String vclDrwTn;
-        private String overallDimen;
-        private String vclN;
-        private String enTn;
-        private String loadTon;
-        private String inspectionRecord;
-        private String barCode;
-        private String approveTon;
-        private String recordId;
-        private String issuingAuthority;
-
-        public String getNote() {
-            return note;
-        }
-
-        public void setNote(String note) {
-            this.note = note;
-        }
-
-        public String getPassengers() {
-            return passengers;
-        }
-
-        public void setPassengers(String passengers) {
-            this.passengers = passengers;
-        }
-
-        public String getVclDrwTn() {
-            return vclDrwTn;
-        }
-
-        public void setVclDrwTn(String vclDrwTn) {
-            this.vclDrwTn = vclDrwTn;
-        }
-
-        public String getOverallDimen() {
-            return overallDimen;
-        }
-
-        public void setOverallDimen(String overallDimen) {
-            this.overallDimen = overallDimen;
-        }
-
-        public String getVclN() {
-            return vclN;
-        }
-
-        public void setVclN(String vclN) {
-            this.vclN = vclN;
-        }
-
-        public String getEnTn() {
-            return enTn;
-        }
-
-        public void setEnTn(String enTn) {
-            this.enTn = enTn;
-        }
-
-        public String getLoadTon() {
-            return loadTon;
-        }
-
-        public void setLoadTon(String loadTon) {
-            this.loadTon = loadTon;
-        }
-
-        public String getInspectionRecord() {
-            return inspectionRecord;
-        }
-
-        public void setInspectionRecord(String inspectionRecord) {
-            this.inspectionRecord = inspectionRecord;
-        }
-
-        public String getBarCode() {
-            return barCode;
-        }
-
-        public void setBarCode(String barCode) {
-            this.barCode = barCode;
-        }
-
-        public String getApproveTon() {
-            return approveTon;
-        }
-
-        public void setApproveTon(String approveTon) {
-            this.approveTon = approveTon;
-        }
-
-        public String getRecordId() {
-            return recordId;
-        }
-
-        public void setRecordId(String recordId) {
-            this.recordId = recordId;
-        }
-
-        public String getIssuingAuthority() {
-            return issuingAuthority;
-        }
-
-        public void setIssuingAuthority(String issuingAuthority) {
-            this.issuingAuthority = issuingAuthority;
-        }
-
-        public String getIsSave() {
-            return isSave;
-        }
-
-        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,131 +60,6 @@ public class OCRVehicleLicenseBean {
         private String type;
         private String url;
         private String vehicleNumber;
-        private String licenseId;
-        private String ownerName;
-        private String regTime;
-        private String issuingAuthority;
-        private String engine;
-        private String vclN;
-        private String licensedateOfissue;
-        private String vin;
-        private String vcltype;
-        private String vclBrand;
-        private String natureOfUsage;
-
-        public String getOwnerName() {
-            return ownerName;
-        }
-
-        public void setOwnerName(String ownerName) {
-            this.ownerName = ownerName;
-        }
-
-        public String getRegTime() {
-            return regTime;
-        }
-
-        public void setRegTime(String regTime) {
-            this.regTime = regTime;
-        }
-
-        public String getIssuingAuthority() {
-            return issuingAuthority;
-        }
-
-        public void setIssuingAuthority(String issuingAuthority) {
-            this.issuingAuthority = issuingAuthority;
-        }
-
-        public String getEngine() {
-            return engine;
-        }
-
-        public void setEngine(String engine) {
-            this.engine = engine;
-        }
-
-        public String getVclN() {
-            return vclN;
-        }
-
-        public void setVclN(String vclN) {
-            this.vclN = vclN;
-        }
-
-        public String getLicensedateOfissue() {
-            return licensedateOfissue;
-        }
-
-        public void setLicensedateOfissue(String licensedateOfissue) {
-            this.licensedateOfissue = licensedateOfissue;
-        }
-
-        public String getVin() {
-            return vin;
-        }
-
-        public void setVin(String vin) {
-            this.vin = vin;
-        }
-
-        public String getVcltype() {
-            return vcltype;
-        }
-
-        public void setVcltype(String vcltype) {
-            this.vcltype = vcltype;
-        }
-
-        public String getVclBrand() {
-            return vclBrand;
-        }
-
-        public void setVclBrand(String vclBrand) {
-            this.vclBrand = vclBrand;
-        }
-
-        public String getNatureOfUsage() {
-            return natureOfUsage;
-        }
-
-        public void setNatureOfUsage(String natureOfUsage) {
-            this.natureOfUsage = natureOfUsage;
-        }
-
-        public String getLicenseId() {
-            return licenseId;
-        }
-
-        public void setLicenseId(String licenseId) {
-            this.licenseId = licenseId;
-        }
-
-        private DataDto2 existCarInfo;
-
-        public DataDto2 getExistCarInfo() {
-            return existCarInfo;
-        }
-
-        public void setExistCarInfo(DataDto2 existCarInfo) {
-            this.existCarInfo = existCarInfo;
-        }
-
-        public boolean isCarExist() {
-            return carExist;
-        }
-
-        public String getBackImage() {
-            return backImage;
-        }
-
-        public void setBackImage(String backImage) {
-            this.backImage = backImage;
-        }
-
-        public void setCarExist(boolean carExist) {
-            this.carExist = carExist;
-        }
 
         public String getAddress() {
             return address == null ? "" : address;
@@ -300,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/bean/WaybillStatusBean.java

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

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

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

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

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

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

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

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

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

app/src/main/java/com/arpa/hndahesudintocctmsdriver/event/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/event/WalletEvent.java

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

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

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

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

@@ -3,7 +3,6 @@ package com.arpa.hndahesudintocctmsdriver.report;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.amap.api.location.AMapLocationClient;
@@ -79,9 +78,6 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
-        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
-            return;
-        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));
@@ -119,9 +115,6 @@ public class JTTProcess {
     //参数 ShippingNoteInfo 和 start 接口中的参数 ShippingNoteInfo 相
     //同，这里 shippingNoteInfo 信息只需传入运单号和分单号即可
     public static void send(Context con,StartOrderBean sob,String remark){
-        if (sob.getData()==null){
-            return;
-        }
         ShippingNoteInfo[] snis=new ShippingNoteInfo[1];
         ShippingNoteInfo sni=new ShippingNoteInfo();
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
@@ -150,9 +143,6 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
-        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
-            return;
-        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));
@@ -186,9 +176,6 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
-        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
-            return;
-        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));
@@ -221,9 +208,6 @@ public class JTTProcess {
         ShippingNoteInfo sni=new ShippingNoteInfo();
         StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0);
         StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1);
-        if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){
-            return;
-        }
         sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
         sni.setSerialNumber("0000");
         sni.setStartLatitude(Double.parseDouble(startWay.getLatitude()));

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

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

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

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

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

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

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

@@ -4,214 +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/grabDriverOrdersContructV2";
+    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_WAYBILL_STATUS = "/app/driver/waybill/getWaybillStatus";
-    private static final String GET_ORDER_STATUS = "/app/driver/order/getOrderStatus";
     //车辆列表
-    private static final String GET_CAR_LIST = "/app/carDriver/getCarList";
+    private static final String GET_CAR_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 ORC_BANK = "sinoiov/ocr/getBankcardOCR";
     //身份证正面
-//    private static final String ID_CARD_FRONT = "/common/ocr/idCardFront";
+    private static final String ID_CARD_FRONT="/common/ocr/idCardFront";
-    private static final String ID_CARD_FRONT = "sinoiov/ocr/getIdCardLicenseV2";
     //身份证识别反面
-    private static final String ID_CARD_BACK = "/common/ocr/idCardBack";
+    private static final String ID_CARD_BACK="/common/ocr/idCardBack";
     //驾驶证正面
-//    private static final String DRIVING_LICENSE = "/common/ocr/drivingLicense";
+    private static final String DRIVING_LICENSE="/common/ocr/drivingLicense";
-    private static final String DRIVING_LICENSE = "sinoiov/ocr/getDrivingLicenseOCRV2";
     //驾驶证副页
-    private static final String DRIVING_LICENSE_BACK = "/common/ocr/drivingLicenseBack";
+    private static final String DRIVING_LICENSE_BACK="/common/ocr/drivingLicenseBack";
     //行驶证正面
-//    private static final String VEHICLE_LICENSE = "/common/ocr/vehicleLicense";
+    private static final String VEHICLE_LICENSE="/common/ocr/vehicleLicense";
-    private static final String VEHICLE_LICENSE = "sinoiov/ocr/getVehicleLicenseOCRV2";
     //行驶证副页
-    private static final String VEHICLE_LICENSE_BACK = "/common/ocr/v2/vehicleBackLicenseV3";
+    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 SAVEVEHICLELICENSE = "app/carDriver/save";
     //从业资格证认证
-    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() {
@@ -226,251 +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 getGetWaybillStatus() {
-        return BASE_URL + GET_WAYBILL_STATUS;
-    }
-
-    public static String getGetOrderStatus() {
-        return BASE_URL + GET_ORDER_STATUS;
-    }
 
     public static String getDRIVERAUTHIDCARD() {
-        return BASE_URL + DRIVERAUTHIDCARD;
+        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;
@@ -80,12 +79,6 @@ public class UserRequset {
         RequestUtil.start(1, "userdata", re, con, hd);
     }
 
-    //账户信息
-    public void User2() {
-        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUserUrl(), ""), getToken(con), con);
-        RequestUtil.start(1, "userdata2", re, con, hd);
-    }
-
     //司机认证信息
     public void driverAuthData() {
         String mt = "{}";
@@ -125,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";
@@ -169,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) {
@@ -184,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);
     }
@@ -236,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/request/bean/LicenseInputBean.java

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

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

@@ -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();
@@ -62,14 +58,14 @@ public class MakeUpService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-//        palyMp3();
+        palyMp3();
     }
 
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.e("服务开启","-----");
-        palyMp3();
+
         return START_STICKY;
 
     }

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

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

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

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

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

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

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

@@ -14,7 +14,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity;
 import com.lxj.xpopup.core.CenterPopupView;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.ui.web.WebActivity;
@@ -69,7 +68,7 @@ public class AgreementAlert extends CenterPopupView {
             @Override
             public void onClick(View widget) {
                 //用户服务协议点击事件
-                Intent in=new Intent(getContext(), WebOnlyOneActivity.class);
+                Intent in=new Intent(getContext(), WebActivity.class);
                 in.putExtra("url",url2);
                 in.putExtra("title","用户服务协议");
                 getContext().startActivity(in);
@@ -88,7 +87,7 @@ public class AgreementAlert extends CenterPopupView {
             @Override
             public void onClick(View widget) {
                 //用户服务协议点击事件
-                Intent in=new Intent(getContext(), WebOnlyOneActivity.class);
+                Intent in=new Intent(getContext(), WebActivity.class);
                 in.putExtra("url",url);
                 in.putExtra("title","隐私政策");
                 getContext().startActivity(in);

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,17 +18,10 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.arpa.hndahesudintocctmsdriver.bean.OCRQualiBean;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
-import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ImageLoader;
-import com.dahe.mylibrary.utils.TimeUtil;
 import com.esign.esignsdk.EsignSdk;
-import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.DatePicker;
 import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
 import com.google.gson.Gson;
@@ -52,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;
 
@@ -87,35 +78,13 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                 if (CacheGroup.cacheList.get("upload") != null) {
                     ub = gson.fromJson(CacheGroup.cacheList.get("upload"), UploadBean.class);
                     if (ub.getCode() == 200) {
-                        if ("0".equals(type)) {//从业资格识别，党员认证不识别
-                            new OCRRequest().ORCQualificaZj(con, hd, ub.getData().getUrl());
-                        }
-
                         url = ub.getData().getUrl();
-                        ImageLoader.getInstance().loadImage(con,url,img);
+                        Glide.with(con).load(url).into(img);
                         up_img.setVisibility(View.GONE);
                         img.setVisibility(View.VISIBLE);
                     }
                     CacheGroup.cacheList.remove("upload");
                 }
-
-                if (CacheGroup.cacheList.get("ORCQualificaZj") != null) {
-                    OCRQualiBean ocrQualiBean = gson.fromJson(CacheGroup.cacheList.get("ORCQualificaZj"), OCRQualiBean.class);
-                    if (ocrQualiBean.getCode() == 200 && ocrQualiBean.getData() != null) {
-                        List<OCRQualiBean.DataDTO.QualificationCategoryListDTO> qualificationCategoryList = ocrQualiBean.getData().getQualification_category_list();
-                        if (qualificationCategoryList != null && qualificationCategoryList.size() > 0) {
-                            String expiryDate = qualificationCategoryList.get(0).getExpiry_date();
-                            if (!TextUtils.isEmpty(expiryDate)&&expiryDate.contains("-")){
-                                value2.setText(expiryDate);
-                            }
-                        }
-                    } else {
-                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("ORCQualificaZj");
-                }
-
-
                 if (CacheGroup.cacheList.get("isAuthDriverAuthQualification") != null) {
                     Log.e("is", CacheGroup.cacheList.get("isAuthDriverAuthQualification"));
                     ib = gson.fromJson(CacheGroup.cacheList.get("isAuthDriverAuthQualification"), IsAuthDriverAuthQualificationBean.class);
@@ -132,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)) {
                             //从业资格证->实名认证
@@ -144,20 +112,21 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                                 }, 3000);
                             }
                         } else {
-                            if (isOverCar) {//从业资格证=》道路运输许可证
+                            finish();
+                            if (isOverCar){//从业资格证=》道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
                                 in.putExtra("carId", carId);
                                 startActivity(in);
-                            } else {//资料传完  补传情况
+                            }else{//资料传完  补传情况
                                 Intent in = new Intent(con, AddCarSuccActivity.class);
                                 in.putExtra("type", 3);
                                 con.startActivity(in);
                             }
-                            finish();
                         }
 
 
+
                         Toast.makeText(con, "资格证上传成功", Toast.LENGTH_SHORT).show();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -186,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");
@@ -230,7 +198,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         data_view = findViewById(R.id.data_view);
         type = getIntent().getExtras().getString("type");
         carId = getIntent().getExtras().getString("carId", "");
-        isOverCar = getIntent().getExtras().getBoolean("isOverCar", false);
+        isOverCar = getIntent().getExtras().getBoolean("isOverCar",false);
         ur = new UserRequset(con, hd);
         initView(null);
         if ("0".equals(type)) {
@@ -242,9 +210,9 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             }
             //new RZRequest().isDriverAuthQualification(con,hd);
         }
-        if (TextUtils.isEmpty(carId)) {//carId不为空 从添加车辆进入  该操作不能跳过
+        if (TextUtils.isEmpty(carId)){//carId不为空 从添加车辆进入  该操作不能跳过
             tvSkip.setVisibility(View.VISIBLE);
-        } else {
+        }else{
             tvSkip.setVisibility(View.GONE);
         }
     }
@@ -275,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) {
@@ -325,6 +291,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         tvSkip.setOnClickListener(v -> {
 
 
+
             if (type.equals("0")) {
 //                finish();
                 if (key) {
@@ -372,13 +339,13 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             value2.setText(ib.getData().getQualificationCertificateValidity());
             up_img.setVisibility(View.GONE);
             img.setVisibility(View.VISIBLE);
-            ImageLoader.getInstance().loadImage(con,url,img);
+            Glide.with(con).load(url).into(img);
             upload_img.setText("已上传");
         } else {
             submit.setBackgroundResource(R.drawable.bg_btn_grey);
             isAuth = true;
             url = userBean.getData().getPartyMemberUrl();
-            ImageLoader.getInstance().loadImage(con,url,img);
+            Glide.with(con).load(url).into(img);
             up_img.setVisibility(View.GONE);
             img.setVisibility(View.VISIBLE);
             upload_img.setText("已上传");
@@ -412,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/FaceSuccActivity.java

@@ -1,62 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.ui.auth;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-import androidx.annotation.Nullable;
-
-import com.arpa.hndahesudintocctmsdriver.R;
-import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
-import com.arpa.hndahesudintocctmsdriver.ui.MainActivity;
-import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
-import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
-import com.dahe.mylibrary.utils.ActivityUtils;
-
-import org.greenrobot.eventbus.EventBus;
-
-/**
- * @ClassName FaceSuccActivity
- * @Author john
- * @Date 2024/12/2 10:27
- * @Description TODO
- */
-public class FaceSuccActivity extends BaseAppCompatActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StateStyleUtil.stateTextColor(this);
-        setContentView(R.layout.activity_face_succ_result);
-        con = this;
-        initView(null);
-        Button btnHome = findViewById(R.id.btnHome);
-        Button btnAddCar = findViewById(R.id.btnAddCar);
-        boolean isGoCar = getIntent().getBooleanExtra("isGoCar", false);
-        if (isGoCar) {
-            btnHome.setText("返回首页");
-            btnAddCar.setVisibility(View.VISIBLE);
-        } else {
-            btnHome.setText("返回");
-            btnAddCar.setVisibility(View.GONE);
-        }
-
-        btnHome.setOnClickListener(v -> {
-            finish();
-        });
-        btnAddCar.setOnClickListener(v -> {
-            Intent in = new Intent(con, CertificatesActivity.class);
-            in.putExtra("index", 2);
-            startActivity(in);
-            finish();
-        });
-
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        EventBus.getDefault().post(new PersonEvent("刷脸成功"));
-    }
-}

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

@@ -1,14 +1,9 @@
 package com.arpa.hndahesudintocctmsdriver.ui.auth;
 
-import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
-
-import android.Manifest;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.ImageView;
@@ -21,15 +16,9 @@ import androidx.annotation.Nullable;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.H5Activity;
-import com.arpa.hndahesudintocctmsdriver.H5Activity2;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
-import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
-import com.arpa.hndahesudintocctmsdriver.util.PermissionUtils;
 import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ActivityUtils;
-import com.dahe.mylibrary.utils.ImageLoader;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.google.gson.Gson;
@@ -53,7 +42,6 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
-import com.permissionx.guolindev.PermissionX;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -77,15 +65,15 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
         super.msgMethod(m);
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("userdata2") != null) {
+                if (CacheGroup.cacheList.get("userdata") != null) {
-                    ub = gson.fromJson(CacheGroup.cacheList.get("userdata2"), UserBean.class);
+                    ub = gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
                     if (ub.getCode() == 200) {
                         initView(ub);
-                        SPUtil.insSP(con, "data", "userdata", CacheGroup.cacheList.get("userdata2"));
+                        SPUtil.insSP(con, "data", "userdata", CacheGroup.cacheList.get("userdata"));
                     } else {
                         Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
                     }
-                    CacheGroup.cacheList.remove("userdata2");
+                    CacheGroup.cacheList.remove("userdata");
                 }
                 if (CacheGroup.cacheList.get("upload") != null) {
                     upb = gson.fromJson(CacheGroup.cacheList.get("upload"), UploadBean.class);
@@ -110,18 +98,11 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
                     if (bb.getCode() == 200) {
 
-                        Intent intent = new Intent(this, H5Activity.class);
+//                        Intent intent = new Intent(this, H5Activity.class);
-                        intent.putExtra("url", (String) bb.getData());
+//                        intent.putExtra("url", (String) bb.getData());
-                        intent.putExtra("view_file", false);
+//                        intent.putExtra("view_file", false);
-//                        intent.putExtra("isGoCar", true);
+//                        startActivity(intent);
-                        startActivity(intent);
+                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
-
-//                        Bundle t = new Bundle();
-//                        t.putString("url",(String) bb.getData());
-//                        t.putBoolean("view_file", false);
-//                        ActivityUtils.startActivity(con, H5Activity2.class,t);
-
-//                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
@@ -187,45 +168,18 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
 //            startActivityForResult(in, 12);
             //EsignSdk.getInstance().startH5Activity(act,"https://smlh5.esign.cn/usercenterFront/oemAuth/v3/realName/index?contextKey=b7b103b15b866ec4c72beef1dfe20828&appId=7438873235");
             if (key) {
-                PermissionX.init(this)
+//                EsignSdk.getInstance().startH5Activity(act, "");
-                        .permissions(Manifest.permission.CAMERA)
-                        .request((allGranted, grantedList, deniedList) -> {
-                            if(allGranted) {
-                                key = false;
-                                new AuthRequest().getAuthUrl(con, hd);
-                                new Handler().postDelayed(() -> {
-                                    key = true;
-                                }, 3000);
-                            } else{
-                                new MessageUtils().showSimCenPop(con, "缺少相机权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
-                                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                                    Uri uri = Uri.fromParts("package", getPackageName(), null);
-                                    intent.setData(uri);
-                                    startActivity(intent);
-                                });
-                            }
-                        });
 
+                key = false;
+                new AuthRequest().getAuthUrl(con, hd);
+                new Handler().postDelayed(() -> {
+                    key = true;
+                }, 3000);
             }
         });
         //头像
         up_img.setOnClickListener(v -> {
-            PermissionUtils.Companion.getInstance().showPermissionMessage(this, "拍摄,媒体查询权限使用说明", "用于拍照或者选择图片用于上传头像功能",
+            gia.showPopueWindow(this);
-                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA},
-                    (allGranted, grantedList, deniedList) -> {
-                        if (allGranted) {
-                            gia.showPopueWindow(this);
-                        } else {
-                            new MessageUtils().showSimCenPop(con, "缺少拍摄,媒体查询权限,将无法为您提供服务,去开启！", "取消", "确认", () -> {
-                                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                                Uri uri = Uri.fromParts("package", getPackageName(), null);
-                                intent.setData(uri);
-                                startActivity(intent);
-                            });
-//                                        Toast.makeText(act.getBaseContext(), "请先开启定位权限", Toast.LENGTH_LONG).show();
-                        }
-                    });
-
         });
         up_head.setOnClickListener(v -> {
             if (ub.getData().getHeadportraitUrl() != null && !ub.getData().getHeadportraitUrl().equals("")) {
@@ -239,15 +193,10 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
         });
         hyr = new HuoYuanRequset(con, hd);
         ur = new UserRequset(con, hd);
+        ur.User();
         EventBus.getDefault().register(this);
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        ur.User2();
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -263,7 +212,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
         TextView name = findViewById(R.id.rname);
         name.setText(StringUtil.isNull(ub.getData().getRname(), "未实名"));
         if (ub.getData().getHeadportraitUrl() != null && !ub.getData().getHeadportraitUrl().equals("")) {
-            ImageLoader.getInstance().loadImage(con,ub.getData().getHeadportraitUrl(),up_head);
+            Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(up_head);
         }
     }
 
@@ -271,7 +220,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
     public void personResult(PersonEvent home) {
         Log.e("-res-", home.getMessage());
         if (ur != null) {
-            ur.User2();
+            ur.User();
         }
     }
 
@@ -327,8 +276,6 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
                 Toast.makeText(con, "签署场景成功", Toast.LENGTH_SHORT).show();
             } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
                 Toast.makeText(con, "实名认证成功", Toast.LENGTH_SHORT).show();
-                EsignSdk.getInstance().finishH5Activity();
-                finish();
             } else {
                 Toast.makeText(con, "意愿认证成功", Toast.LENGTH_SHORT).show();
             }

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

@@ -3,7 +3,6 @@ package com.arpa.hndahesudintocctmsdriver.ui.auth;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.text.InputType;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -21,25 +20,17 @@ import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
 import com.arpa.hndahesudintocctmsdriver.bean.CarDelBean;
 import com.arpa.hndahesudintocctmsdriver.bean.IsAuthDriverAuthQualificationBean;
-import com.arpa.hndahesudintocctmsdriver.bean.OCRBankBean;
-import com.arpa.hndahesudintocctmsdriver.bean.OCRRoadBean;
 import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
 import com.arpa.hndahesudintocctmsdriver.request.AuthRequest;
-import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
 import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
-import com.arpa.hndahesudintocctmsdriver.ui.wallet.WalletFragment;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetImageAlert;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
-import com.dahe.mylibrary.utils.ImageLoader;
+import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.PatternUtils;
-import com.github.gzuliyujiang.wheelpicker.DatePicker;
-import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -58,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;
 
@@ -85,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) {
@@ -104,23 +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("ORCRoadLicZj") != null) {
-                    if (customDialog != null && customDialog.isShowing())
-                        customDialog.dismiss();
-                    OCRRoadBean ib = new Gson().fromJson(CacheGroup.cacheList.get("ORCRoadLicZj"), OCRRoadBean.class);
-                    if (ib.getCode() == 200 && ib.getData() != null&&!TextUtils.isEmpty(ib.getData().getLicenseNumber())) {
-                        value1.setText(PatternUtils.getNumByStr(ib.getData().getLicenseNumber()));
-                    } else {
-                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("ORCRoadLicZj");
-                }
 
 
                 if (CacheGroup.cacheList.get("upload") != null) {
@@ -136,31 +107,16 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                             new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 5);
                             break;
                         case 3:
-                            //道路运输证ocr识别
-                            new OCRRequest().ORCRoadLicZj(con, hd, ub.getData().getUrl());
                             new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 2);
                             break;
-                        case 4:
-                            new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 7);
-                            break;
-                        default:
-                            if (customDialog != null && customDialog.isShowing())
-                                customDialog.dismiss();
-                            break;
                     }
                     url = ub.getData().getUrl();
-//                    Glide.with(con).load(url).into(img);
+                    Glide.with(con).load(url).into(img);
-                    ImageLoader.getInstance().loadImage(con,path,img);
-
 
                     CacheGroup.cacheList.remove("upload");
                 }
 
                 if (CacheGroup.cacheList.get("saveCarImg") != null) {
-                    if (type!=3){
-                        if (customDialog != null && customDialog.isShowing())
-                            customDialog.dismiss();
-                    }
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("saveCarImg"), BaseBean.class);
                     if (bb.getCode() == 200) {
                         switch (type) {
@@ -174,11 +130,7 @@ 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();
-//                                Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show();
-                                break;
-                            case 4:
-                                Toast.makeText(con, "交强险证件上传成功", Toast.LENGTH_SHORT).show();
                                 break;
                         }
                     } else {
@@ -190,11 +142,11 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     Log.e("is", CacheGroup.cacheList.get("saveCarRegisterNo"));
                     IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRegisterNo"), IsAuthDriverAuthQualificationBean.class);
                     if (ib.getCode() == 200) {
+                        finish();
                         Intent in = new Intent(con, PhotoCarActivity.class);
                         in.putExtra("type", 3);
                         in.putExtra("carId", carId);
                         con.startActivity(in);
-                        finish();
                     } else {
                         Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -206,13 +158,14 @@ 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&&TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车，没传过挂车，到挂车页面
                                 finish();
-                            } else if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，没传过挂车，到挂车页面
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
                                 in.putExtra("carId", carId);
@@ -220,26 +173,22 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                     in.putExtra("cheData", new Gson().toJson(cdb));
                                 }
                                 startActivity(in);
-                                finish();
+                            }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);
-                                    finish();
                                 }
                             }
-                        } else {
-                            finish();
                         }
 
-
 //                        if (!"".equals(carId) && cdb.getData().getIsTrailer() == 1) {
 //                            if (!"".equals(carId)) {
 //                                finish();
@@ -264,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;
@@ -299,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);
@@ -307,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);
 
@@ -315,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);
@@ -377,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;
         }
     }
 
@@ -393,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;
         }
@@ -401,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())
@@ -438,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;
         }
     }
 
@@ -468,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;
@@ -492,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();
@@ -500,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;
         }
     }
@@ -521,38 +421,27 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         if (null != cdb) {
             if (0 == type) {
                 if (!TextUtils.isEmpty(cdb.getData().getCarImage())) {
-                    ImageLoader.getInstance().loadImage(con,cdb.getData().getCarImage(),img);
+                    Glide.with(con).load(cdb.getData().getCarImage()).into(img);
                     submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     upload_img.setText("已上传");
                 }
             } else if (1 == type) {
                 if (!TextUtils.isEmpty(cdb.getData().getNfcImage())) {
-                    ImageLoader.getInstance().loadImage(con,cdb.getData().getNfcImage(),img);
+                    Glide.with(con).load(cdb.getData().getNfcImage()).into(img);
                     submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     upload_img.setText("已上传");
                 }
             } else if (2 == type) {
                 if (!TextUtils.isEmpty(cdb.getData().getRegisterImage())) {
-                    ImageLoader.getInstance().loadImage(con,cdb.getData().getRegisterImage(),img);
+                    Glide.with(con).load(cdb.getData().getRegisterImage()).into(img);
                     value1.setText(cdb.getData().getRegisterNo());
                     submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     upload_img.setText("已上传");
                 }
             } else if (3 == type) {
                 if (!TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) {
-                    ImageLoader.getInstance().loadImage(con,cdb.getData().getRoadLicensePhoto(),img);
+                    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())) {
-                    ImageLoader.getInstance().loadImage(con,cdb.getData().getPolicyPhotoUrl(),img);
-                    value1.setText(cdb.getData().getInsuranceCompany());
-                    value2.setText(cdb.getData().getInsuranceEndDay());
                     submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     upload_img.setText("已上传");
                 }
@@ -638,13 +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) {
-            value1.setInputType(InputType.TYPE_CLASS_TEXT);
-            llDate.setVisibility(View.VISIBLE);
-            title3.setText("保险公司");
-        }else {
-            value1.setInputType(InputType.TYPE_CLASS_NUMBER);
-        }
     }
 
 

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

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

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

@@ -1,26 +1,15 @@
 package com.arpa.hndahesudintocctmsdriver.ui.home;
 
-import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
-
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.Settings;
 import android.text.Html;
-import android.text.Layout;
-import android.text.TextUtils;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
-import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -32,18 +21,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.H5Activity;
 import com.arpa.hndahesudintocctmsdriver.bean.JTT;
-import com.arpa.hndahesudintocctmsdriver.bean.WaybillStatusBean;
 import com.arpa.hndahesudintocctmsdriver.event.FaceEvent;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
-import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
-import com.arpa.hndahesudintocctmsdriver.ui.MainActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.PersonalAuthActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
-import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.img.ImageGetUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
@@ -74,7 +59,6 @@ import com.arpa.hndahesudintocctmsdriver.util.time.Timer;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
-import com.permissionx.guolindev.PermissionX;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -118,23 +102,16 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
 //                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
-                        if (null == bb.getData()) {
+
-                            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);
-                            intent.putExtra("title", "合同签署");
-                            startActivity(intent);
-                        }
                         //finish();
                     } else {
-                        EventBus.getDefault().post(new HomeWaybillEvent(1));
-                        finish();
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
                     }
@@ -152,38 +129,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     }
                     CacheGroup.cacheList.remove("jttRes");
                 }
-
-
-                if (CacheGroup.cacheList.get("orderStatus") != null) {
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
-                    Log.e("orderStatus", CacheGroup.cacheList.get("orderStatus"));
-                    WaybillStatusBean status = gson.fromJson(CacheGroup.cacheList.get("orderStatus"), WaybillStatusBean.class);
-                    if (status.getCode() == 200) {
-                        if (status.getData() != null) {
-                            //执行运单下一步操作
-                            new XPopup.Builder(con)
-                                    .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-                                    .asConfirm("请确认接单", "是否确定承运此运单？",
-                                            "取消", "确认",
-                                            () -> {
-                                                Log.e("--id--", "cid:" + cid + "---wid:" + id);
-                                                hyr.confirm(cid, id);
-                                            }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
-                                    .show();
-                        } else {//订单已取消
-                            new MessageUtils().showSimCenPop(con, "运单异常将无法进行下步操作,请返回首页", "取消", "确定", () -> {
-                                SPUtils.remove(con, "curWaybillId");
-                                EventBus.getDefault().post(new HomeWaybillEvent(1));
-                                ActivityUtils.finishToActivity(MainActivity.class, false);
-                            });
-                        }
-                    } else {
-                        Toast.makeText(con, status.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("orderStatus");
-                }
                 break;
             case 13:
                 int index = Integer.valueOf((String) m.obj);
@@ -191,18 +136,16 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                 car.setText("选择车辆:" + clb.getData().get(index).getCarNumber());
                 cid = clb.getData().get(index).getCarId();
                 break;
-
             case 1111://安联用户验证通过，接单
-                hyr.getOrderStatus(id);
+                new XPopup.Builder(con)
-//                new XPopup.Builder(con)
+                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-//                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+                        .asConfirm("请确认接单", "是否确定承运此运单？",
-//                        .asConfirm("请确认接单", "是否确定承运此运单？",
+                                "取消", "确认",
-//                                "取消", "确认",
+                                () -> {
-//                                () -> {
+                                    Log.e("--id--", "cid:" + cid + "---wid:" + id);
-//                                    Log.e("--id--", "cid:" + cid + "---wid:" + id);
+                                    hyr.confirm(cid, id);
-//                                    hyr.confirm(cid, id);
+                                }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
-//                                }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
+                        .show();
-//                        .show();
                 break;
             case 2222://安联用户验证不通过
                 customDialog.dismiss();
@@ -252,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);
@@ -264,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));
@@ -315,11 +247,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     });
                     //
                     ImageButton xuanze = v.findViewById(R.id.xuanze);
-
+                    if (clb != null && clb.getData().size() == 1) {
-                    if (hyd!=null&&hyd.getData()!=null&& !TextUtils.isEmpty(hyd.getData().getCarNumber())){
-                        cid = hyd.getData().getCarId();
-                        car.setText("选择车辆:" + hyd.getData().getCarNumber());
-                    }else if (clb != null && clb.getData().size() == 1) {
                         cid = clb.getData().get(0).getCarId();
                         car.setText("选择车辆:" + clb.getData().get(0).getCarNumber());
                     }
@@ -412,7 +340,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
 
         UiAuxiliary.homeRequest("接单");
         Intent in = new Intent(con, StartYunDanActivity.class);
-        in.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP|Intent.FLAG_ACTIVITY_SINGLE_TOP);
         in.putExtra("id", "0");
         startActivity(in);
         finish();
@@ -426,6 +353,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
 //        }, 2500);
 
 
+
 //        new Handler().postDelayed(() -> {
 //
 //
@@ -490,58 +418,10 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
      * 先判断安联用户信息验证，随后接单
      */
     private void reOrder() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        customDialog = new CustomDialog(con, "正在接单...");
-            try {
+        customDialog.show();
-                PermissionX.init(this)
+        //验证安联用户是否通过
-                        .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        ALProcess.verification(con, hd);
-                                Manifest.permission.READ_EXTERNAL_STORAGE,
-                                Manifest.permission.ACCESS_FINE_LOCATION,
-                                Manifest.permission.ACCESS_COARSE_LOCATION)
-                        .request((allGranted, grantedList, deniedList) -> {
-                            if (allGranted) {
-                                customDialog = new CustomDialog(con, "正在接单...");
-                                customDialog.show();
-                                //验证安联用户是否通过
-                                ALProcess.verification(con, hd);
-                            } else {
-                                boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION");
-                                boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE");
-                                if (accessCoarseLocation | contains) {
-                                    new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法接单,去开启！", "取消", "确认", () -> {
-                                        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                                        Uri uri = Uri.fromParts("package", getPackageName(), null);
-                                        intent.setData(uri);
-                                        startActivity(intent);
-                                    });
-                                }
-
-                            }
-                        });
-            } catch (Exception e) {
-                e.printStackTrace();
-                customDialog = new CustomDialog(con, "正在接单...");
-                customDialog.show();
-                //验证安联用户是否通过
-                ALProcess.verification(con, hd);
-            }
-
-        } else {
-            customDialog = new CustomDialog(con, "正在接单...");
-            customDialog.show();
-            //验证安联用户是否通过
-            ALProcess.verification(con, hd);
-        }
-
-
-//        customDialog = new CustomDialog(con, "正在接单...");
-//        customDialog.show();
-//        //验证安联用户是否通过
-//        ALProcess.verification(con, hd);
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
 }

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

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

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

@@ -3,7 +3,6 @@ package com.arpa.hndahesudintocctmsdriver.ui.home;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
@@ -41,10 +40,8 @@ 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.ImageLoader;
 import com.dahe.mylibrary.utils.TimeUtil;
 import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -76,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 {
 
@@ -108,14 +104,11 @@ public class StartYunDanActivity extends BaseActivity {
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 //获取页面数据
-                if (CacheGroup.cacheList.get("refreshorderDetail") != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) {
+                if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER) != null && CacheGroup.cacheList.get(GET_EVALUTE) != null) {
                     Log.e("-评论-", CacheGroup.cacheList.get(GET_EVALUTE));
-                    Log.e("-运单-", CacheGroup.cacheList.get("refreshorderDetail"));
+                    Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
-                    sob = gson.fromJson(CacheGroup.cacheList.get("refreshorderDetail"), StartOrderBean.class);
+                    sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
                     wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     if (sob.getCode() == 200 && sob.getData() != null) {
                         id = sob.getData().getWaybillId();
                         initView(null);
@@ -127,7 +120,7 @@ public class StartYunDanActivity extends BaseActivity {
                     } else {
                         Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show();
                     }
-                    CacheGroup.cacheList.remove("refreshorderDetail");
+                    CacheGroup.cacheList.remove(HuoYuanFragmengt.START_ORDER);
                     CacheGroup.cacheList.remove(GET_EVALUTE);
                 }
                 //保存评价
@@ -209,33 +202,9 @@ 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("")) {
-                        ImageLoader.getInstance().loadImage(con,ub.getData().getHeadportraitUrl(),head_img);
+                        Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
                     }
                     break;
                 default:
@@ -477,23 +446,13 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
-    private CustomDialog customDialog;
-
     @Override
     protected void onResume() {
         super.onResume();
         if (map != null) {
             map.onResume();
         }
-        if (customDialog==null){
+        hyr.startOrder(id);
-            customDialog = new CustomDialog(con, "网络请求中...");
-            customDialog.show();
-        }else{
-            if (!customDialog.isShowing()){
-                customDialog.show();
-            }
-        }
-        hyr.startOrder2(id);
         hyr.getEvaluate(id);
     }
 
@@ -604,10 +563,6 @@ public class StartYunDanActivity extends BaseActivity {
 
 
     public void search() {
-        String latitude = sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude();
-        if (TextUtils.isEmpty(latitude)) {
-            return;
-        }
 //        try {
 //            AMapLocationClient.updatePrivacyShow(con,true,true);
 //            AMapLocationClient.updatePrivacyAgree(con,true);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/drivercircle/VideoReleaseActivity.java

@@ -21,7 +21,6 @@ import com.bumptech.glide.Glide;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
-import com.dahe.mylibrary.utils.ImageLoader;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -59,7 +58,7 @@ public class VideoReleaseActivity extends BaseActivity {
     public void initView(Object obj) {
         super.initView(obj);
         getFirstframe(videoPath);
-        ImageLoader.getInstance().loadImage(con,new File(coverPath),video_cover);
+        Glide.with(con).load(new File(coverPath)).into(video_cover);
     }
 
     public void submit(View v){

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

@@ -8,7 +8,6 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ImageLoader;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -73,7 +72,7 @@ public class GetShangChuanActivity extends BaseActivity {
         //coordinate.setText(StringUtil.isNull(sdw.getLongitude(),"")+","+StringUtil.isNull(sdw.getLatitude(),""));
         //coordinate2.setText(StringUtil.isNull(sdw.getReceiptLongitude(),"")+","+StringUtil.isNull(sdw.getReceiptLatitude(),""));
         if(sdw.getSendPutImagesUrl()!=null && sdw.getSendPutImagesUrl().size()>=1){
-            ImageLoader.getInstance().loadImage(con,sdw.getSendPutImagesUrl().get(0),img1);
+            Glide.with(con).load(sdw.getSendPutImagesUrl().get(0)).into(img1);
             img1.setOnClickListener(v -> {
                 new XPopup.Builder(con)
                         .asImageViewer(img1,sdw.getSendPutImagesUrl().get(0), new SmartGlideImageLoader(R.mipmap.ic_launcher))
@@ -84,7 +83,7 @@ public class GetShangChuanActivity extends BaseActivity {
             });
         }
         if(sdw.getReceiptUrl()!=null && sdw.getReceiptUrl().size()>=1){
-            ImageLoader.getInstance().loadImage(con,sdw.getReceiptUrl().get(0),img2);
+            Glide.with(con).load(sdw.getReceiptUrl().get(0)).into(img2);
             img2.setOnClickListener(v -> {
                 new XPopup.Builder(con)
                         .asImageViewer(img2,sdw.getReceiptUrl().get(0), new SmartGlideImageLoader(R.mipmap.ic_launcher))

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

@@ -1,12 +1,8 @@
 package com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan;
 
-import static com.sdk.base.framework.utils.app.AppUtils.getPackageName;
-
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -19,33 +15,23 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.alct.mdp.MDPLocationCollectionManager;
-import com.alct.mdp.callback.OnDownloadResultListener;
 import com.alct.mdp.callback.OnResultListener;
 import com.alct.mdp.model.Goods;
 import com.alct.mdp.model.Image;
 import com.alct.mdp.model.Location;
-import com.alct.mdp.model.ShipmentStatusEnum;
-import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
-import com.arpa.hndahesudintocctmsdriver.bean.WaybillStatusBean;
+import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
-import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
-import com.arpa.hndahesudintocctmsdriver.request.bean.TrackInputBean;
-import com.arpa.hndahesudintocctmsdriver.ui.MainActivity;
 import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
-import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.CoordinateConverter;
 import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ActivityUtils;
-import com.dahe.mylibrary.utils.ImageLoader;
-import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -69,8 +55,6 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -103,28 +87,17 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     private boolean locationKey = false;
     private TextView tv_loaction;
 
-    private boolean isFinish = false;
-
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
         switch (m.what) {
-            case RequsetCodeConstants.ERROR:
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
-                break;
             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);
-                        ImageLoader.getInstance().loadImage(con,path,res_img);
                         res_img.setVisibility(View.VISIBLE);
                         img_delete.setVisibility(View.VISIBLE);
                         img_icon.setVisibility(View.GONE);
@@ -134,64 +107,17 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     }
                     CacheGroup.cacheList.remove("upload");
                 }
-                if (CacheGroup.cacheList.get("genzong") != null) {
-                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("genzong"), BaseBean.class);
-                    if (bb.getCode() == 200) {
-                        Log.e("--轨迹上传--", "成功");
-                    } else {
-                        Log.e("--轨迹上传失败:--", bb.getMsg());
-                    }
-                    CacheGroup.cacheList.remove("genzong");
-                }
-                if (CacheGroup.cacheList.get("waybillStatus") != null) {
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
-                    Log.e("waybillStatus", CacheGroup.cacheList.get("waybillStatus"));
-                    WaybillStatusBean status = gson.fromJson(CacheGroup.cacheList.get("waybillStatus"), WaybillStatusBean.class);
-                    if (status.getCode() == 200) {
-                        if (status.getData() != null) {
-                            //执行运单下一步操作
-                            typeRequest();
-                        } else {//订单已取消
-                            new MessageUtils().showSimCenPop(con, "运单异常将无法进行下步操作,请返回首页", "取消", "确定", () -> {
-                                SPUtils.remove(con, "curWaybillId");
-                                EventBus.getDefault().post(new HomeWaybillEvent());
-                                ActivityUtils.finishToActivity(MainActivity.class, false);
-                            });
-                        }
-                    } else {
-                        Toast.makeText(con, status.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("waybillStatus");
-                }
                 for (int i = 0; i < TYPE_NAME.length; i++) {
                     if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) {
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class);
                         if (bb.getCode() == 200) {
                             if (index == 2) {
-                                if (!keys) {//装货回单
+                                if (!keys){//装货回单
-                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                        customDialog.dismiss();
-                                    }
-                                    EventBus.getDefault().post(new HomeWaybillEvent());
                                     Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
-                            } else if ((0 == index || 1 == index) && isFinish) {
-                                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                    customDialog.dismiss();
-                                }
-                                EventBus.getDefault().post(new HomeWaybillEvent());
-                                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                                finish();
                             }
                         } else {
-                            if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                customDialog.dismiss();
-                            }
-                            EventBus.getDefault().post(new HomeWaybillEvent());
-                            finish();
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
                         }
                         CacheGroup.cacheList.remove(TYPE_NAME[i]);
@@ -216,18 +142,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                             if (sob.getData().getCarNumber().equals(value)) {
                                 hyr.uploadFile(new File(path));
                             } else {
-                                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                    customDialog.dismiss();
-                                }
                                 new MessageUtils().showCenMessage(ShangChuangImgActivity.this, "车牌号不匹配!", "请重新拍照或联系管理员");
                             }
                         } else {
                             hyr.uploadFile(new File(path));
                         }
                     } else {//识别失败后返回code500
-                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                            customDialog.dismiss();
-                        }
                         if (index == 0) {//装卸货车辆需要识别车牌号){
                             Toast.makeText(con, "装货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
                         } else if (index == 1) {
@@ -240,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()));
@@ -250,21 +168,10 @@ 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();
-                new MessageUtils().showSimCenPop(con, "缺少定位权限,去开启精确定位权限！", "取消", "确认", () -> {
-                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                    Uri uri = Uri.fromParts("package", getPackageName(), null);
-                    intent.setData(uri);
-                    startActivity(intent);
-                });
-
-
-//                Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
                 //定位结果接收
                 //finish();
                 break;
@@ -279,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));
@@ -289,7 +196,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
         }
     }
-
     private LatLng latLng;
 
     public LatLng convertGPSToBaidu(LatLng srLatLng) {
@@ -328,7 +234,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         sobStr = getIntent().getExtras().getString("sob");
         //Log.e("---sdwStr--",sdwStr);
         sob = new Gson().fromJson(sobStr, StartOrderBean.class);
-
         initView(null);
         customDialog = new CustomDialog(con, "正在定位当前位置...");
         customDialog.show();
@@ -373,9 +278,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         }
         submit.setOnClickListener(v -> {
             if (imgIds.size() != 0) {
-                //判断运单是否已取消
+                typeRequest();
-                hyr.getWaybillStatus(sob.getData().getWaybillId());
-//                typeRequest();
             } else {
                 Toast.makeText(con, "请先上传一张图片", Toast.LENGTH_SHORT).show();
             }
@@ -420,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);
@@ -439,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);
             }
         }
@@ -458,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:
                 //装货
@@ -474,48 +361,16 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--装货信息", gson.toJson(lub));
                     if (locationKey) {//高德定位
                         if (keys) {
-                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
+                            nfc();
-                                @Override
+                            loadInfo();
-                                public void onSuccess(Object o) {
-
-                                    String string = o.toString();
-                                    if (string.equals("PICKUPED")) {//安联装货，单平台未装货
-                                        isFinish = true;
-                                        //平台确认装货
-                                        hyr.loading(lub);
-                                    } else {
-                                        nfc();
-                                        loadInfo();
-                                    }
-                                    upLocation(lgdu.getLatitude()+"",lgdu.getLongitude()+"",sob.getData().getShippingNoteNumber());
-                                }
-
-                                @Override
-                                public void onFailure(String s, String s1) {
-                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                        customDialog.dismiss();
-                                    }
-                                    ToastUtils.showToast(con, s1);
-                                }
-                            });
-
-
-//                            nfc();
-//                            loadInfo();
 //                            up_traffic_start();
 //                            up_image_z();
                         }
                     } else {
-                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                            customDialog.dismiss();
-                        }
                         Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
                     }
 
                 } else {
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -530,46 +385,16 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--卸货信息", gson.toJson(lub));
                     if (locationKey) {
                         if (keys) {
-                            MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() {
+                            nfc();
-                                @Override
+                            uploadInfo();
-                                public void onSuccess(Object o) {
-                                    if (o.toString().equals("UNLOADED")) {//安联装货，单平台未装货
-                                        //卸货状态-平台
-                                        isFinish = true;
-                                        hyr.dischargeCargo(lub);
-                                    } else {
-                                        nfc();
-                                        uploadInfo();
-                                    }
-                                    upLocation(lgdu.getLatitude()+"",lgdu.getLongitude()+"",sob.getData().getShippingNoteNumber());
-                                }
-
-                                @Override
-                                public void onFailure(String s, String s1) {
-                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                        customDialog.dismiss();
-                                    }
-                                    ToastUtils.showToast(con, s1);
-                                }
-                            });
-
-
-//                            nfc();
-//                            uploadInfo();
 
                         }
 
                     } else {
-                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                            customDialog.dismiss();
-                        }
                         Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
                     }
 
                 } else {
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -594,15 +419,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                         }
                         hyr.receipt(urib);
                     } else {
-                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                            customDialog.dismiss();
-                        }
                         Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
                     }
                 } else {
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -713,10 +532,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
-                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "装货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -749,10 +564,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
-                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "卸货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -761,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);
@@ -789,11 +597,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
-                SPUtils.remove(con, "curWaybillId");
-                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "回单照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -841,6 +644,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     }
 
 
+
+
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -869,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);
                 }
             });
@@ -909,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);
                 }
             });
@@ -920,12 +719,4 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
     }
 
-    private void upLocation(String lat,String lon,String shippingNoteNumber){
-        TrackInputBean tib = new TrackInputBean();
-        tib.setLatitude(lat);
-        tib.setLongitude(lon);
-        tib.setShippingNoteNumber(shippingNoteNumber);
-        hyr.trackTracking(tib);
-    }
-
 }

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/home/shangchuan/WebPDFActivity.java

@@ -58,7 +58,7 @@ public class WebPDFActivity extends BaseActivity {
             protected void onPostExecute(Void aVoid) {
                 super.onPostExecute(aVoid);
                 pdf_view.fromStream(input[0])
-//                        .pages(0,1,2,3,4,5,6,7) // all pages are displayed by default
+                        .pages(0,1) // all pages are displayed by default
                         .enableAnnotationRendering(true)
                         .load();
             }

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,14 +18,10 @@ 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;
 import com.arpa.hndahesudintocctmsdriver.request.net.RxHttpCallBack;
-import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
-import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
 import com.dahe.mylibrary.net.CommonResponseBean;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -50,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;
@@ -77,9 +64,9 @@ 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;
-    private CustomDialog customDialog;
 
     @Override
     public void msgMethod(Message m) {
@@ -98,42 +85,23 @@ public class LoginActivity extends BaseActivity {
                     Log.e("--短信发送res--", "短信发送成功");
                 }
                 if (CacheGroup.cacheList.get(LOGIN_RESULT) != null) {
-                    if (customDialog != null && customDialog.isShowing())
-                        customDialog.dismiss();
-
-                    btn_login.setEnabled(true);
-                    btn_login.setBackgroundResource(R.drawable.bg_btn);
                     //存储登录记录
                     loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
                     Log.e("--登录信息--", new Gson().toJson(loginBean));
-                    AppInfoBean appInfoBean = new AppInfoBean();
                     if (loginBean.getCode() == 200) {
                         SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken());
                         SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
                         SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname());
                         SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + "");
-//                        JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
+                        JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
-                        appInfoBean.setStatus("0");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean, "post");
                         UiAuxiliary.homeRequest("登录成功");
                         finish();
                     } else {
-                        appInfoBean.setStatus("1");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean, "post");
                         Toast.makeText(con, loginBean.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(LOGIN_RESULT);
                 }
                 break;
-
-            case RequsetCodeConstants.ERROR:
-                if (customDialog != null && customDialog.isShowing())
-                    customDialog.dismiss();
-                btn_login.setEnabled(true);
-                btn_login.setBackgroundResource(R.drawable.bg_btn);
-                break;
             default:
                 break;
         }
@@ -150,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);
     }
@@ -163,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 = "https://agreement.dahehuoyun.com/#/user";
+            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 = "我已阅读并同意相关服务条款和隐私政策《用户服务协议》和《隐私政策》";
@@ -187,7 +159,7 @@ public class LoginActivity extends BaseActivity {
             public void onClick(View widget) {
                 Log.e("-用户服务协议-", url1);
                 //用户服务协议点击事件
-                Intent in = new Intent(con, WebOnlyOneActivity.class);
+                Intent in = new Intent(con, WebActivity.class);
                 in.putExtra("title", "用户服务协议");
                 in.putExtra("url", url1);
                 startActivity(in);
@@ -207,7 +179,7 @@ public class LoginActivity extends BaseActivity {
             @Override
             public void onClick(View widget) {
                 //隐私协议点击事件
-                Intent in = new Intent(con, WebOnlyOneActivity.class);
+                Intent in = new Intent(con, WebActivity.class);
                 in.putExtra("title", "隐私政策");
                 in.putExtra("url", url2);
                 startActivity(in);
@@ -242,16 +214,12 @@ public class LoginActivity extends BaseActivity {
                 }
             }
         });
-        btn_login.setOnClickListener(new OnLimitClickHelper(v -> {
+        btn_login.setOnClickListener(v -> {
             String phone = String.valueOf(input_phone.getText());
             String code = String.valueOf(input_code.getText());
             Log.e("--code--", code);
             if (judgeFormat(phone, code)) {
                 if (key) {
-                    btn_login.setEnabled(false);
-                    btn_login.setBackgroundResource(R.drawable.bg_btn_gray);
-                    customDialog = new CustomDialog(con, "登陆中...");
-                    customDialog.show();
                     LoginRegInputBean lb = new LoginRegInputBean();
                     lb.setRoleId(4);
                     lb.setUname(phone);
@@ -263,7 +231,7 @@ public class LoginActivity extends BaseActivity {
                     Toast.makeText(con, "请先同意用户协议和隐私政策", Toast.LENGTH_SHORT).show();
                 }
             }
-        }));
+        });
         auto_login.setOnClickListener(v -> {
             JVerificationInterface.getToken(con, 20000, (i, s, s1) -> {
                 JVerifyUIConfig uiConfig = new JVerifyUIConfig.Builder()

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,17 +138,16 @@ public class WelcomeActivity extends BaseAppCompatActivity {
             new XPopup.Builder(con)
                     .dismissOnBackPressed(false)
                     .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/currency/#/",
+                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/huawei/#/private",
-                            "https://agreement.dahehuoyun.com/#/user", hd))
+                            "http://agreement.dahehuoyun.com/#/user", hd))
                     .show();
         }
-        if (WelcomeActivity.this!=null&&!WelcomeActivity.this.isFinishing()){
+        Glide.with(con)
-            Glide.with(con)
+                .load(SPUtils.getPreWelPic(this))
-                    .load(SPUtils.getPreWelPic(this))
+                .placeholder(startImageUrl.getDrawable())
-                    .placeholder(startImageUrl.getDrawable())
+                .error(R.drawable.welcome_bg_default)
-                    .error(R.drawable.welcome_bg_default)
+                .into(startImageUrl);
-                    .into(startImageUrl);
+
-        }
         //SystemUtil.get
     }
 
@@ -162,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,
@@ -293,12 +280,10 @@ public class WelcomeActivity extends BaseAppCompatActivity {
 
     public void cdWelcome(String url) {
         if (!"".equals(url)) {
-            if (WelcomeActivity.this!=null&&!WelcomeActivity.this.isFinishing()){
+            Glide.with(con).load(url)
-                Glide.with(con).load(url)
+                    .placeholder(startImageUrl.getDrawable())
-                        .placeholder(startImageUrl.getDrawable())
+                    .error(R.drawable.welcome_bg_default)
-                        .error(R.drawable.welcome_bg_default)
+                    .into(startImageUrl);
-                        .into(startImageUrl);
-            }
         }
         SPUtils.setPreWelPic(this, url);
         cd_view.setVisibility(View.VISIBLE);
@@ -346,8 +331,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 }
                 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
                 // 路由初始化
-//                JVerificationInterface.setDebugMode(true);
+                JVerificationInterface.setDebugMode(true);
-//                JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+                JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
                 //友盟
                 //设置非debug版本开启
                 if (!isDebugVersion(con)) {

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

@@ -17,19 +17,14 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.arpa.hndahesudintocctmsdriver.bean.UpAppBean;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
-import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
-import com.arpa.hndahesudintocctmsdriver.ui.alert.UpAppAlert;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
 import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
 import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ImageLoader;
-import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
 
@@ -52,7 +47,6 @@ import com.permissionx.guolindev.PermissionX;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,54 +63,35 @@ 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");
                 }
-
-                if (CacheGroup.cacheList.get("up_app") != null) {
-                    Log.e("up_app", CacheGroup.cacheList.get("up_app"));
-                    UpAppBean uab = new Gson().fromJson(CacheGroup.cacheList.get("up_app"), UpAppBean.class);
-                    if (uab.getCode() == 200) {
-                        if (uab.getData() != null) {
-                            new XPopup.Builder(con)
-                                    .dismissOnBackPressed(false)
-                                    .dismissOnTouchOutside(false)
-                                    .asCustom(new UpAppAlert(con, uab.getData().getDownloadUrl(), uab.getData().getContent(), uab.getData().getVersion(), uab.getData().getForce()))
-                                    .show();
-                        }else{
-                            Toast.makeText(con, "当前已经是最新版本", Toast.LENGTH_LONG).show();
-                        }
-                    }else{
-                        Toast.makeText(con, uab.getMsg(), Toast.LENGTH_LONG).show();
-                    }
-                    CacheGroup.cacheList.remove("up_app");
-                }
                 break;
         }
     }
@@ -125,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();
@@ -139,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();
         });
@@ -148,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");
     }
 
@@ -156,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)));
         //用户信息
@@ -249,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]);
@@ -280,85 +253,54 @@ 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 -> {
+        onUpdate.setOnClickListener(v -> Toast.makeText(con,"当前已经是最新版本",Toast.LENGTH_LONG).show());
-                    ur.upApp();
-                }
-        );
         //系统设置
         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())){
-                ImageLoader.getInstance().loadImage(con,userBean.getData().getHeadportraitUrl(),img_head);
+                Glide.with(con).load(userBean.getData().getHeadportraitUrl()).into(img_head);
             }
-
+            if(userBean!=null && 100003==userBean.getData().getAuditStatus()){
-            if (userBean != null) {
+                auth_box.setVisibility(View.GONE);
-                if ("0".equals(userBean.getData().getRealAuthentication())) {
+                no_auth.setVisibility(View.GONE);
-                    no_auth.setVisibility(View.VISIBLE);
+            }else{
-                } else {
+                auth_box.setVisibility(View.GONE);
-                    if (100003 == userBean.getData().getAuditStatus()) {
+                no_auth.setVisibility(View.VISIBLE);
-                        no_auth.setVisibility(View.GONE);
-                    } else {
-                        no_auth.setBackgroundResource(R.mipmap.icon_auth_wsh);
-                    }
-                }
             }
-
-//            if (userBean != null && 100003 == userBean.getData().getAuditStatus()) {
-//                auth_box.setVisibility(View.GONE);
-//                no_auth.setVisibility(View.GONE);
-//            } else {
-//                auth_box.setVisibility(View.GONE);
-//                no_auth.setVisibility(View.VISIBLE);
-//            }
         }
     }
 
     @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(threadMode = ThreadMode.MAIN)
     public void personResult(PersonEvent home) {
         Log.e("-res-", home.getMessage());
         if (ur != null) {
             ur.User();
         }
     }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        if (ur != null) {
-            ur.User();
-        }
-    }
 }

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

@@ -13,7 +13,6 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
-import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -36,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) {
@@ -74,9 +73,8 @@ public class SetupActivity extends BaseActivity {
         ConfigBean cb= ConfigParts.getConfigParts(con);
         if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
+            url1="https://agreement.dahehuoyun.com/huawei/#/private";
-//            url2=cb.getData().getPrivateUrl();
+            url2=cb.getData().getPrivateUrl();
-            url2="https://agreement.dahehuoyun.com/currency/#/";
             kefu=cb.getData().getServiceMobile();
             url3=cb.getData().getSecurityUrl();
         }
@@ -87,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);
     }
@@ -95,19 +92,19 @@ public class SetupActivity extends BaseActivity {
     public void initView(Object obj) {
         super.initView(obj);
             r1.setOnClickListener(v12 -> {
-                Intent in=new Intent(con, WebOnlyOneActivity.class);
+                Intent in=new Intent(con,WebActivity.class);
                 in.putExtra("title","隐私政策");
                 in.putExtra("url",url2);
                 startActivity(in);
             });
             r2.setOnClickListener(v12 -> {
-                Intent in=new Intent(con,WebOnlyOneActivity.class);
+                Intent in=new Intent(con,WebActivity.class);
                 in.putExtra("title","用户协议");
                 in.putExtra("url",url1);
                 startActivity(in);
             });
             r3.setOnClickListener(v12 -> {
-                Intent in=new Intent(con,WebOnlyOneActivity.class);
+                Intent in=new Intent(con,WebActivity.class);
                 in.putExtra("title","运输安全责任书");
                 in.putExtra("url",url3);
                 startActivity(in);
@@ -121,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,WebOnlyOneActivity.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,18 +12,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean;
-import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
-import com.arpa.hndahesudintocctmsdriver.request.AuthRequest;
-import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
-import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
-import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
-import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
-import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
-import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickListener;
 import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ImageLoader;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
@@ -42,8 +30,6 @@ import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
-import com.lxj.xpopup.XPopup;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
 
 import java.io.File;
 import java.util.List;
@@ -54,166 +40,100 @@ 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, skip;
+    private TextView submit;
     private ImageView return_btn;
-    public GetImageAlert gia = new GetImageAlert();
+    public GetImageAlert gia=new GetImageAlert();
     String path;
     private OCRBankBean ib;
-    DriverAuthDataBean dad;
-
-    boolean isAuth = false;
     private WalletRequest qr;
     private TextView tp;
-    private String imageId;
 
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what) {
+        switch (m.what){
             case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("OCR_BANK") != null) {
+                if (CacheGroup.cacheList.get("OCR_BANK")!=null) {
-                    ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class);
+                    ib=new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"),OCRBankBean.class);
-                    customDialog.dismiss();
+                    if(ib.getCode()==200){
-                    if (ib.getCode() == 200&&ib.getData()!=null) {
                         initView(null);
-                        WalletFragment.isInsBank = true;
+                        customDialog.dismiss();
-                    } else {
+                        WalletFragment.isInsBank=true;
-                        Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
+                    }else{
+                        Toast.makeText(con,ib.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("OCR_BANK");
                 }
-
+                if(CacheGroup.cacheList.get("insBank")!=null){
-                if (CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA) != null) {
+                    BaseBean bb=new Gson().fromJson(CacheGroup.cacheList.get("insBank"),BaseBean.class);
-                    dad = new Gson().fromJson(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA), DriverAuthDataBean.class);
+                    if(bb.getCode()==200){
-                    if (dad.getCode() == 200) {
+                        Toast.makeText(con,"绑定成功",Toast.LENGTH_SHORT).show();
-                        if (dad.getData() != null && !TextUtils.isEmpty(dad.getData().getCardNo())) {
-                            isAuth = true;
-                            skip.setVisibility(View.GONE);
-                            submit.setBackgroundResource(R.drawable.bg_btn_grey);
-                            bank_name.setText(dad.getData().getBankName());
-                            bank_number.setText(dad.getData().getCardNo());
-                            ImageLoader.getInstance().loadImage(con,dad.getData().getBankImgUrl(),up_bank_img);
-                        }
-
-                    } else {
-                        Toast.makeText(con, dad.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove(WoDeFragment.AUTH_DATA);
-                }
-
-                if (CacheGroup.cacheList.get("insBank") != null) {
-                    if (customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
-                    BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class);
-                    if (bb.getCode() == 200) {
-                        if (type == 1) {
-                            Intent in = new Intent(con, CertificatesActivity.class);
-                            in.putExtra("index", 1);
-                            startActivity(in);
-                        }
-                        Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
                         finish();
-                    } else {
+                    }else{
-                        Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,bb.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("insBank");
                 }
-                if (CacheGroup.cacheList.get("upload") != null) {
-                    UploadBean ub = new Gson().fromJson(CacheGroup.cacheList.get("upload"), UploadBean.class);
-                    if (ub.getCode() == 200) {
-                        imageId = ub.getData().getId()+"";
-                        new OCRRequest().ORCBankZj(con, hd, ub.getData().getUrl());
-
-                    } else {
-                        Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("upload");
-                }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                customDialog = new CustomDialog(con, "上传识别中...");
+                customDialog=new CustomDialog(con, "上传识别中...");
                 customDialog.show();
                 path = (String) m.obj;
-
+                new OCRRequest().ORCBank(con,hd,new File(path));
-                new AuthRequest().upload(con, hd, new File(path));
-
-//                new OCRRequest().ORCBank(con, hd, new File(path));
                 break;
         }
     }
 
     private CustomDialog customDialog;
 
-
-    /**
-     * 1：司机注册自动跳转
-     * 0：钱包添加银行卡
-     */
-    private int type = 0;
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_bank_auth);
-        act = this;
+        act=this;
-        con = this;
+        con=this;
-        Bundle extras = getIntent().getExtras();
+        up_bank_img=findViewById(R.id.up_bank_img);
-        if (extras != null) {
+        bank_name=findViewById(R.id.bank_name);
-            type = getIntent().getExtras().getInt("type");
+        bank_number=findViewById(R.id.bank_number);
-        }
+        submit=findViewById(R.id.submit);
-        up_bank_img = findViewById(R.id.up_bank_img);
+        return_btn=findViewById(R.id.return_btn);
-        bank_name = findViewById(R.id.bank_name);
+        qr=new WalletRequest(con,hd);
-        bank_number = findViewById(R.id.bank_number);
-        submit = findViewById(R.id.submit);
-        skip = findViewById(R.id.skip);
-        return_btn = findViewById(R.id.return_btn);
-        qr = new WalletRequest(con, hd);
         up_bank_img.setOnClickListener(v -> {
-            if (isAuth) {
+            gia.showPopueWindow(this);
-                new XPopup.Builder(con)
+        });
-                        .asImageViewer(up_bank_img, dad.getData().getBankImgUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher_round))
+        submit.setOnClickListener(v -> {
-                        .show();
+            if(ib!=null){
-            } else {
+                submit();
-                gia.showPopueWindow(this);
+            }else{
+                Toast.makeText(con,"请先上传图片",Toast.LENGTH_SHORT).show();
             }
         });
-        submit.setOnClickListener(new OnLimitClickHelper(this));
-        skip.setOnClickListener(new OnLimitClickHelper(this));
         return_btn.setOnClickListener(v -> {
             finish();
         });
-
-        if (type == 1) {
-            skip.setVisibility(View.VISIBLE);
-        } else {
-            skip.setVisibility(View.GONE);
-        }
-        UserRequset ur = new UserRequset(con, hd);
-        ur.driverAuthData();
     }
 
     @Override
     public void initView(Object obj) {
         super.initView(obj);
         bank_name.setText(ib.getData().getBankName());
-        bank_number.setText(ib.getData().getCardNumber());
+        bank_number.setText(ib.getData().getBankCardNumber());
-        ImageLoader.getInstance().loadImage(con,path,up_bank_img);
+        Glide.with(con).load(ib.getData().getUrl()).into(up_bank_img);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 12 && resultCode == RESULT_OK) {
+         if (requestCode == 12 && resultCode == RESULT_OK) {
-            path = gia.getFile().getPath();
+            path=gia.getFile().getPath();
-            Log.e("图片地址:", path);
+            Log.e("图片地址:",path);
             gia.dis();
-            ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
+            ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
             if (imgs != null && imgs.size() > 0) {
@@ -223,58 +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().getType()));
+        ibib.setCardType(Integer.parseInt(ib.getData().getBankCardType()));
-        ibib.setCardType(1);
         ibib.setBankName(bankName);
         ibib.setCardUserType(1);
-        ibib.setImageId(Integer.parseInt(imageId));
+        ibib.setImageId(ib.getData().getId());
-        Log.e("-res-", new Gson().toJson(ibib));
+        Log.e("-res-",new Gson().toJson(ibib));
         qr.insBankCard(ibib);
     }
 
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.submit:
-                if (isAuth) {
-                    Intent in = new Intent(con, CertificatesActivity.class);
-                    in.putExtra("index", 1);
-                    startActivity(in);
-                    finish();
-                    return;
-                }
-                if (ib != null) {
-                    submit();
-                } else {
-                    Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show();
-                }
-                break;
-            case R.id.skip:
-                new MessageUtils().showSimCenPop(con, "确定跳过银行卡?，可能会导致运费无法结算！", "取消", "确认", () -> {
-                    Intent in = new Intent(con, CertificatesActivity.class);
-                    in.putExtra("index", 1);
-                    startActivity(in);
-                });
-                break;
-        }
-    }
 }

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

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

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

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

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

@@ -1,227 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.ui.web;
-
-import android.annotation.SuppressLint;
-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;
-import android.webkit.WebViewClient;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-import com.arpa.hndahesudintocctmsdriver.R;
-import com.arpa.hndahesudintocctmsdriver.bean.UserBean;
-import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
-import com.arpa.hndahesudintocctmsdriver.util.PaxWebChromeClient;
-import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
-import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
-import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
-
-/**
- * @author hlh
- * @version 1.0.0
- * @date 2021/8/6 16:48
- * @description:访问webview的activity
- */
-public class WebOnlyOneActivity extends BaseActivity {
-
-    private String url = "";
-    private String title = "";
-    private WebView wv;
-    private TextView title_tv;
-    private PaxWebChromeClient chromeClient;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StateStyleUtil.stateTextColor(this);
-        setContentView(R.layout.activity_web);
-        con = this;
-        initHardwareAccelerate();
-        wv = findViewById(R.id.wv);
-        title_tv = findViewById(R.id.title);
-        Intent in = getIntent();
-        url = in.getExtras().getString("url");
-        title = in.getExtras().getString("title");
-        chromeClient = new PaxWebChromeClient(this, null, null);
-        if ("咨询建议".equals(title)) {
-            initOpinion();
-        } else {
-            initView(null);
-        }
-    }
-
-    private void initHardwareAccelerate() {
-        try {
-            if (Integer.parseInt(Build.VERSION.SDK) >= 11) {
-                getWindow()
-                        .setFlags(
-                                android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
-                                android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
-            }
-        } catch (Exception e) {
-        }
-    }
-
-    @SuppressLint({"JavascriptInterface", "SetJavaScriptEnabled"})
-    @Override
-    public void initView(Object obj) {
-        super.initView(obj);
-        WebSettings webSettings = wv.getSettings();
-        //设置网页有缓存的时候也继续读取新的地址
-        webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
-        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资源
-        //覆盖WebView默认使用第三方或系统默认浏览器打开网页的行为，使网页用WebView打开
-        wv.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                return super.shouldOverrideUrlLoading(view, request);
-            }
-
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url1) {
-                //返回值是true的时候控制去WebView打开，为false调用系统浏览器或第三方浏览器
-                Log.d("test", "webactivity..url:" + url);
-//                if(!url.startsWith("http"))
-//                {
-//                    Log.d("test","非http开头..url:"+url);
-//                    Intent intent = new Intent(Intent.ACTION_VIEW,Uri.parse(url));
-//                    boolean isInstall = getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size()>0;
-//                    Log.d("test","是否安装要跳转的app:"+isInstall);
-//                    if(isInstall)
-//                    {
-//                        startActivity(intent);
-//                        finish();
-//                    }
-//                    return true;
-//                }
-                if (!url1.equals(url))
-                    return true;
-                wv.loadUrl(url1);
-                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);
-        title_tv.setText(title);
-    }
-
-    public void initOpinion() {
-        if (findViewById(R.id.return_btn) != null) {
-            findViewById(R.id.return_btn).setOnClickListener(v -> {
-                finish();
-            });
-        }
-        title_tv.setText(title);
-        UserBean ub = UserParts.getUser(con);
-        wv.getSettings().setJavaScriptEnabled(true);
-        wv.getSettings().setDomStorageEnabled(true); // 这个要加上
-        String openid = ub.getData().getUname(); // 用户的openid
-        String nickname = StringUtil.isNull(ub.getData().getRname(), "游客"); // 用户的nickname
-        String headimgurl = StringUtil.isNull(ub.getData().getHeadportraitUrl(), "");  // 用户的头像url
-
-        /* 获得 webview url，请注意url单词是product而不是products，products是旧版本的参数，用错地址将不能成功提交 */
-        String url = "https://support.qq.com/products/335639"; // 把1221数字换成你的产品ID，否则会不成功
-        /* 准备post参数 */
-        String postData = "nickname=" + nickname + "&avatar=" + headimgurl + "&openid=" + openid;
-        wv.postUrl(url, postData.getBytes());
-        wv.setWebChromeClient(chromeClient);
-        wv.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                return super.shouldOverrideUrlLoading(view, request);
-            }
-
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                //返回值是true的时候控制去WebView打开，为false调用系统浏览器或第三方浏览器
-                view.loadUrl(url);
-                return true;
-            }
-
-            @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-                super.onReceivedSslError(view, handler, error);
-                handler.proceed();
-            }
-        });
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        chromeClient.onActivityResult(requestCode, resultCode, data);
-
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
-
-    public class JavaScriptObject {
-
-        Context mContxt;
-
-        public JavaScriptObject(Context mContxt) {
-            this.mContxt = mContxt;
-
-        }
-
-        @JavascriptInterface
-        public void getName() {
-            Log.e("eeee-", "name");
-            Toast.makeText(con, "hello", Toast.LENGTH_SHORT).show();
-        }
-
-        @JavascriptInterface
-        public String getUserToken() {
-//            Log.e("-token-",UserParts.getUser(con).getData().getToken());
-//            return "woshitoken-androidfasdf";
-            return UserParts.getUser(con).getData().getToken();
-        }
-
-        @JavascriptInterface
-        public void isSuccess() {
-            finish();
-        }
-
-        @JavascriptInterface
-        public void isPdfSuccess() {
-            Toast.makeText(con, "签署成功", Toast.LENGTH_SHORT).show();
-            finish();
-        }
-    }
-
-
-}
-

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

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

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

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

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

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

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

@@ -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/GetCarImageAlert.java

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

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

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

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/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/util/view/BaseActivity.java

@@ -28,8 +28,6 @@ public abstract class BaseActivity extends Activity {
     private String title_text="空白标题";
 
     public Handler hd=new Handler(msg -> {
-        if (this==null||this.isFinishing())
-            return true;
         msgMethod(msg);
         return false;
     });

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseAppCompatActivity.java

@@ -25,8 +25,6 @@ public class BaseAppCompatActivity extends AppCompatActivity {
     public static String dataName,dataName2,dataName3="";
     public View root;
     public Handler hd=new Handler(msg -> {
-        if (this==null||this.isFinishing())
-            return true;
         msgMethod(msg);
         return false;
     });

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java

@@ -105,8 +105,6 @@ public class BaseRecyclerView extends RecyclerView {
         ra.addItem(mb);
     }
     public void adds(List<ManyBean> list){
-        if (ra==null)
-            return;
         ra.add(list);
     }
     public AdapterAlls createsH(Context con, List<ManyBean> list){

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/bg_btn_deepgreen16.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <gradient android:angle="0" android:useLevel="true"
-                android:startColor="#0b64f6 " android:endColor="#5cb3fd"
-                android:centerX="0" android:centerY="0"
-                android:gradientRadius="@dimen/dp_63" />
-            <corners android:radius="@dimen/dp_19" />
-        </shape>
-
-    </item>
-</selector>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#AAAAAA" />
-            <corners android:topLeftRadius="@dimen/dp_29" android:topRightRadius="@dimen/dp_29"
-                android:bottomLeftRadius="@dimen/dp_29" android:bottomRightRadius="@dimen/dp_29" />
-        </shape>
-    </item>
-</selector>

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

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

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

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

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

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

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

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

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

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

app/src/main/res/layout/activity_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_bank_auth.xml

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

app/src/main/res/layout/activity_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_face_succ_result.xml

@@ -1,73 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    tools:context=".ui.auth.CertificatesActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/return_btn"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_31"
-            android:layout_marginLeft="@dimen/dp_28"
-            android:layout_marginTop="@dimen/dp_58"
-            android:padding="@dimen/dp_10"
-            android:scaleType="fitXY"
-            android:src="@mipmap/return_lefts" />
-
-
-    </LinearLayout>
-
-    <ImageView
-        android:layout_marginTop="@dimen/dp_210"
-        android:id="@+id/img"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/face_success"></ImageView>
-
-    <TextView
-        android:id="@+id/tvTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/img"
-        android:layout_centerHorizontal="true"
-        android:text="恭喜您! 实名认证成功"
-        android:textColor="@color/black"
-        android:textSize="@dimen/sp_16" />
-
-
-    <LinearLayout
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_46"
-        android:layout_below="@+id/tvTitle"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/btnHome"
-            android:layout_width="@dimen/dp_110"
-            android:layout_height="@dimen/dp_38"
-            android:background="@drawable/bg_btn_green16"
-            android:text="返回首页"
-            android:textColor="#0966FF" />
-
-        <Button
-            android:layout_marginLeft="@dimen/dp_20"
-            android:id="@+id/btnAddCar"
-            android:textColor="@color/white"
-            android:layout_width="@dimen/dp_110"
-            android:layout_height="@dimen/dp_38"
-            android:background="@drawable/bg_btn_deepgreen16"
-            android:text="添加车辆" />
-    </LinearLayout>
-
-</RelativeLayout>

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

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

app/src/main/res/layout/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>