ROOT判断

app/build.gradle

@@ -3,7 +3,6 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'com.huawei.agconnect'
-    id 'kotlin-android-extensions'
 }
 
 android {
@@ -16,29 +15,27 @@ android {
             keyPassword '123456'
             storeFile file('key.jks')
             storePassword '123456'
-            v1SigningEnabled true
-            v2SigningEnabled true
         }
-//        debug {
+        debug {
-//            keyAlias 'key0'
+            keyAlias 'key0'
-//            keyPassword '123456'
+            keyPassword '123456'
-//            storeFile file('key.jks')
+            storeFile file('key.jks')
-//            storePassword '123456'
+            storePassword '123456'
-//        }
+        }
-//        release {
+        release {
-//            keyAlias 'key0'
+            keyAlias 'key0'
-//            keyPassword '123456'
+            keyPassword '123456'
-//            storeFile file('key.jks')
+            storeFile file('key.jks')
-//            storePassword '123456'
+            storePassword '123456'
-//        }
+        }
     }
 
     defaultConfig {
         applicationId "com.arpa.hndahesudintocctmsdriver"
-        minSdkVersion 23
+        minSdkVersion 22
         targetSdkVersion 30
-        versionCode 57
+        versionCode 50
-        versionName "3.2.7"
+        versionName "3.2.0"
         flavorDimensions "CHANNEL_VALUE"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
@@ -52,7 +49,7 @@ android {
         ndk {
 
             //选择要添加的对应 cpu 类型的 .so 库。
-            abiFilters 'armeabi-v7a', 'arm64-v8a'
+            abiFilters 'armeabi', 'armeabi-v7a'
             // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' , 'arm64-v8a'
 
         }
@@ -72,12 +69,6 @@ android {
                 VIVO_APPID : "vivo的APPID"
         ]
     }
-//    sourceSets {
-//        main {
-//            jniLibs.srcDirs = ['libs']
-//        }
-//    }
-
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
@@ -88,10 +79,9 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.config
         }
         debug {
-            signingConfig signingConfigs.config
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
@@ -115,20 +105,14 @@ android {
 
     productFlavors {
         qa {
-            manifestPlaceholders = [CHANNEL_VALUE: "好运司机测试"]
+            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机"]
-            buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
+            buildConfigField("String", "OPEN_API_URL", "\"http://192.168.111.244:4009\"")
-            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
+            buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
-            buildConfigField "boolean", "isTest", "true"
-            //APP名称，可以在androidMainfest中引用
-            resValue "string", "appName", "司机测试"
         }
         product {
             manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机"]
-            buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")
+            buildConfigField("String", "AL_BASE", "\"https://oapi.alct56.com\"")
             buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
-            buildConfigField "boolean", "isTest", "false"
-            //APP名称，可以在androidMainfest中引用
-            resValue "string", "appName", "大河好运司机"
         }
 
     }
@@ -140,14 +124,9 @@ android {
     android.applicationVariants.all { variant ->
         variant.outputs.all {
             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")
+            if(variant.buildType.name.equals('release')){
-            def appName = null
+                outputFileName = "dhhy-driver-"+date+"-${versionName}.apk"
-            if (isText=="true") {
-                appName = '大河好运司机测试_'
-            }else{
-                appName = '大河好运司机_'
             }
-            outputFileName =appName+"${variant.buildType.name}_${defaultConfig.versionName}_${date}.apk"
         }
     }
     lintOptions {
@@ -164,8 +143,6 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'com.caverock:androidsvg-aar:1.3'
 
-    //当引入的与之前引入的库有重复冲突部分的时候，使用compileOnly
-    implementation files('libs\\mdp_sdk.jar')
     //压缩工具
     implementation 'top.zibin:Luban:1.1.3'
     //角标
@@ -180,10 +157,9 @@ dependencies {
     implementation 'com.github.jenly1314.AppUpdater:app-dialog:1.1.0'
     //轮播插件
     implementation 'com.github.zhpanvip:BannerViewPager:3.5.4'
-    //
+    //弹出框
 //    implementation 'com.lxj:xpopup:2.2.8'
-    //工具类
+//    implementation 'com.github.li-xiaojun:XPopup:2.8.15'
-    //implementation 'cn.hutool:hutool-all:5.7.11'
     //交通厅
     implementation 'com.lzy.net:okgo:3.0.4'
     implementation 'com.alibaba:fastjson:1.2.61'
@@ -191,12 +167,12 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.5'
     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'
     implementation 'com.j256.ormlite:ormlite-android:4.48'
     implementation 'com.j256.ormlite:ormlite-core:4.48'
-    compileOnly 'com.github.hotchemi:permissionsdispatcher:2.3.1'
+    implementation "org.permissionsdispatcher:permissionsdispatcher:4.6.0"
-    annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:2.3.1'
+    kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.6.0"
+
     //极光认证
     implementation 'cn.jiguang.sdk:jverification:2.7.1'  // 此处以2.7.1 版本为例。a
     implementation 'cn.jiguang.sdk:jpush:4.2.4'  // 此处以JPush 4.2.4 版本为例。
@@ -208,31 +184,24 @@ dependencies {
     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 "org.permissionsdispatcher:permissionsdispatcher:4.6.0"
-    kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.6.0"
     //选择器
     implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:3.1.1'
     //EventBus
     implementation 'org.greenrobot:eventbus:3.1.1'
-    //易签宝
-    implementation(name:'EsignSDK', ext:'aar')
-    implementation'pub.devrel:easypermissions:1.3.0'
-
-    implementation "com.squareup.retrofit2:retrofit:2.4.0"
-//    implementation "com.squareup.retrofit2:converter-gson:2.4.0"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0"
-//    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-
-    implementation "io.reactivex.rxjava2:rxjava:2.1.5"
-    implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
 
     //pdf展示
     implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
-    //
+    //工具类
+    //implementation 'cn.hutool:hutool-all:5.7.11'
     implementation 'com.github.getActivity:XToast:8.2'
 
+    //易签宝
+    implementation(name:'EsignSDK', ext:'aar')
+
+    //当引入的与之前引入的库有重复冲突部分的时候，使用compileOnly
+    implementation files('libs\\mdp_sdk.jar')
+
     implementation project(path: ':mylibrary')
-    implementation project(path: ':ocr_ui')
 
 }

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" />
     <!-- 基础权限 -->
@@ -15,9 +14,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!-- 极光 -->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -25,7 +22,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
 
     <!-- Optional -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 用于开启 debug 版本的应用在6.0 系统上 层叠窗口权限 -->
@@ -51,16 +47,16 @@
     <uses-permission android:name="android.permission.NFC" />
     <application
         android:name="com.arpa.hndahesudintocctmsdriver.App"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:excludeFromRecents="true"
         android:icon="@drawable/diver_logo"
-        android:label="@string/appName"
+        android:label="@string/app_name"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:replace="android:label,android:allowBackup">
+        tools:replace="android:icon,android:allowBackup">
 
         <uses-library
             android:name="com/alct/mdp"
@@ -69,7 +65,7 @@
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:exported="true"
+            android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" ></activity>
 
@@ -99,20 +95,7 @@
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity"
-            android:screenOrientation="portrait">
+            android:exported="false"
-
-            <intent-filter>
-                <action android:name="android.nfc.action.TAG_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="*/*" />
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity2"
             android:screenOrientation="portrait">
 
             <intent-filter>
@@ -172,9 +155,7 @@
             android:screenOrientation="portrait">
 
         </activity>
-        <activity
+
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle.VideoReleaseActivity"
-            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.WebPDFActivity"
             android:screenOrientation="portrait"/>
@@ -231,7 +212,7 @@
             android:process=":remote"></service>
         <service
             android:name="com.arpa.hndahesudintocctmsdriver.service.PlayerMusicService"
-            android:exported="true"
+            android:exported="false"
             android:process=":music_v1" />
         <service
             android:name="com.alct.mdp.job.LocationUploadJobService"
@@ -289,8 +270,10 @@
         <!-- 易签宝 -->
         <activity
             android:name="com.esign.esignsdk.h5.H5Activity"
+            android:exported="false"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -306,7 +289,7 @@
         <!-- 若您的业务中有使用极光富媒体功能，或者极光早上好功能，需要把此 Activity 的 exported 修改成 true 覆盖 mavenCentral 上的组件。 -->
         <activity
             android:name="cn.jpush.android.ui.PopWinActivity"
-            android:exported="true"
+            android:exported="false"
             android:theme="@style/MyDialogStyle"
             tools:node="replace">
             <intent-filter>
@@ -320,7 +303,7 @@
         <activity
             android:name="cn.jpush.android.ui.PushActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:exported="true"
+            android:exported="false"
             android:theme="@android:style/Theme.NoTitleBar"
             tools:node="replace">
             <intent-filter>
@@ -331,7 +314,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.NFCActivity">
+        <activity android:name=".ui.NFCActivity"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.nfc.action.TAG_DISCOVERED" />
 
@@ -341,27 +325,6 @@
             </intent-filter>
         </activity>
 
-
-        <activity
-            android:name=".H5Activity"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="demo"
-                    android:path="/signBack"
-                    android:scheme="esign" />
-                <data
-                    android:host="demo"
-                    android:path="/realBack"
-                    android:scheme="esign" />
-            </intent-filter>
-        </activity>
-
         <service
             android:name="com.arpa.hndahesudintocctmsdriver.push.XService"
             android:enabled="true"

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

@@ -2,10 +2,7 @@ package com.arpa.hndahesudintocctmsdriver;
 
 import android.app.ActivityManager;
 import android.app.Application;
-import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -14,26 +11,18 @@ import android.util.Log;
 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.log.LogUtil;
-import com.arpa.hndahesudintocctmsdriver.util.BillLocationUtils;
 import com.dahe.mylibrary.CommonBaseLibrary;
-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.umeng.commonsdk.UMConfigure;
 
 import cn.jiguang.verifysdk.api.JVerificationInterface;
 
 public class App extends Application {
 
-//    String key = "f9d35b1133cff1f6e3960c89b249e03f";
+    String key = "f9d35b1133cff1f6e3960c89b249e03f";
-    String key = "19ac0aa74338e487e45057faf7212401";
+    String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ==";
-    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==";
-
-    //    String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ==";
 
     public final static int APP_STATUS_KILLED = 0; // 表示应用是被杀死后在启动的
     public final static int APP_STATUS_NORMAL = 1; // 表示应用时正常的启动流程
@@ -44,6 +33,8 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
         mApplication = this;
+        //初始化log
+        LogUtil.init(BuildConfig.DEBUG);
         con = getBaseContext();
         CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
         String state = SPUtil.getSP(con, "state_data", "authorization_state");
@@ -56,8 +47,8 @@ public class App extends Application {
                 res.updateConfiguration(config, res.getDisplayMetrics());
                 //安联初始化
                 if (context.getPackageName().equals(getCurrentProcessName(context))) {
-                    //Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
+                    //LogUtil.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
-                    MDPLocationCollectionManager.initialize(this, BuildConfig.OPEN_AL_URL);
+                    MDPLocationCollectionManager.initialize(this, BuildConfig.AL_BASE);
                 }
                 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
                 // 路由初始化
@@ -72,33 +63,9 @@ public class App extends Application {
                 JTTProcess.init(this);
                 //QupaiHttpFinal.getInstance().initOkHttpFinal();
             } catch (Exception e) {
-                Log.e("-error-", "初始化失败sss");
+                LogUtil.e("-error-", "初始化失败sss");
             }
         }
-
-//        PendingIntent pendingIntent =
-//                PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
-//        Cactus.getInstance()
-//                .isDebug(true)
-//                //可选，设置通知栏点击事件
-//                .setPendingIntent(pendingIntent)
-////                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
-////                .setMusicId(R.raw.main) //可选，设置音乐
-////                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
-////                .addCallback(new CactusCallback())//可选，运行时回调
-//                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                .setTitle("大河好运")
-//                .setSmallIcon(R.drawable.diver_logo)
-//                .addBackgroundCallback(new CactusBackgroundCallback() {
-//                    @Override
-//                    public void onBackground(boolean b) {
-//                        if (b){
-//                            getBillLocation();
-//                        }
-//                    }
-//                })
-//                .register(this);
     }
 
     public static App getApp() {
@@ -119,10 +86,6 @@ public class App extends Application {
         UMConfigure.init(getApplicationContext(), UMConfigure.DEVICE_TYPE_PHONE, "");
     }
 
-    private void getBillLocation() {
-        BillLocationUtils.getInstance().getBillLocation(con);
-    }
-
     private static String getCurrentProcessName(Context context) {
         String currentProcessName = "";
         int pid = android.os.Process.myPid();

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

@@ -1,502 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver;
-
-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.view.View;
-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.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop;
-import com.arpa.hndahesudintocctmsdriver.event.FaceEvent;
-import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
-import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary;
-import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
-import com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
-import com.dahe.mylibrary.utils.ToastUtils;
-import com.esign.esignsdk.EsignSdk;
-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 static android.webkit.WebSettings.LOAD_NO_CACHE;
-
-/**
- * @author xingtian on 2019/3/25
- */
-public class H5Activity 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);
-
-
-        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 (url.contains("callback")) {
-//                // 实名认证结束 返回按钮/倒计时返回/暂不认证
-//                boolean status = uri.getBooleanQueryParameter("passed", false);
-//                if (status) {
-//
-//                    new Handler().postDelayed(() -> {
-//                        FaceEvent he = new FaceEvent("刷脸成功");
-//                        EventBus.getDefault().post(he);
-//                        finish();
-//                    }, 4000);
-//                }else{
-//                    if (mWebView.canGoBack()) {
-//                        mWebView.goBack();
-//                    }
-//                    Toast.makeText(H5Activity.this, "认证失败,请重新刷脸认证", Toast.LENGTH_SHORT).show();
-//                }
-//                return true;
-//            }
-
-            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(H5Activity.this, "签署结果： " + " signResult = " + signResult, Toast.LENGTH_LONG).show();
-                        } else {
-                            String tsignCode = uri.getQueryParameter("tsignCode");
-                            if ("0".equals(tsignCode)) {
-                                tsignCode = "签署成功";
-                            } else {
-                                tsignCode = "签署失败";
-                            }
-                            Toast.makeText(H5Activity.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) {
-                        //认证成功返回
-                        Toast.makeText(H5Activity.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) {
-                    //认证成功返回
-                    Toast.makeText(H5Activity.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(H5Activity.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(H5Activity.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(H5Activity.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/CarDelBean.java

@@ -77,15 +77,6 @@ public class CarDelBean {
         private String registerNo;
         private String carEnergyTypValue;
         private String carPlateColorValue;
-        private String needUpQCPhoto;
-
-        public String getNeedUpQCPhoto() {
-            return needUpQCPhoto;
-        }
-
-        public void setNeedUpQCPhoto(String needUpQCPhoto) {
-            this.needUpQCPhoto = needUpQCPhoto;
-        }
 
         public String getCarPlateColorValue() {
             return carPlateColorValue;

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

@@ -1,150 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.bean;
-
-import java.util.List;
-
-/**
- * @ClassName CarInfoBean
- * @Author 用户
- * @Date 2023/8/17 15:35
- * @Description TODO
- */
-public class CarInfoBean {
-
-
-    private int code;
-    private DataDTO data;
-    private String msg;
-    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 int getRes() {
-        return res;
-    }
-
-    public void setRes(int res) {
-        this.res = res;
-    }
-
-    public Boolean getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-
-    public static class DataDTO {
-        private Object code;
-        private DataDTO.DataDTO2 data;
-        private Object message;
-        private String forceMatching;
-
-
-        public String getForceMatching() {
-            return forceMatching;
-        }
-
-        public void setForceMatching(String forceMatching) {
-            this.forceMatching = forceMatching;
-        }
-
-        public Object getCode() {
-            return code;
-        }
-
-        public void setCode(Object code) {
-            this.code = code;
-        }
-
-        public DataDTO2 getData() {
-            return data;
-        }
-
-        public void setData(DataDTO2 data) {
-            this.data = data;
-        }
-
-        public Object getMessage() {
-            return message;
-        }
-
-        public void setMessage(Object message) {
-            this.message = message;
-        }
-
-        public static class DataDTO2 {
-            private List<DataDTO.DataDTO2.PrismKeyValueInfoDTO> prism_keyValueInfo;
-
-            public List<DataDTO.DataDTO2.PrismKeyValueInfoDTO> getPrism_keyValueInfo() {
-                return prism_keyValueInfo;
-            }
-
-            public void setPrism_keyValueInfo(List<DataDTO.DataDTO2.PrismKeyValueInfoDTO> prism_keyValueInfo) {
-                this.prism_keyValueInfo = prism_keyValueInfo;
-            }
-
-            public static class PrismKeyValueInfoDTO {
-                private int keyProb;
-                private int valueProb;
-                private String value;
-                private String key;
-
-                public int getKeyProb() {
-                    return keyProb;
-                }
-
-                public void setKeyProb(int keyProb) {
-                    this.keyProb = keyProb;
-                }
-
-                public int getValueProb() {
-                    return valueProb;
-                }
-
-                public void setValueProb(int valueProb) {
-                    this.valueProb = valueProb;
-                }
-
-                public String getValue() {
-                    return value;
-                }
-
-                public void setValue(String value) {
-                    this.value = value;
-                }
-
-                public String getKey() {
-                    return key;
-                }
-
-                public void setKey(String key) {
-                    this.key = key;
-                }
-            }
-        }
-    }
-}

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

@@ -56,33 +56,6 @@ public class CarZhengBean {
 
     public static class DataDTO {
         private int carId;
-        private String needUpQCPhoto;
-        private String isTrailer;
-        private String needUpRLPhoto;
-
-        public String getNeedUpRLPhoto() {
-            return needUpRLPhoto;
-        }
-
-        public void setNeedUpRLPhoto(String needUpRLPhoto) {
-            this.needUpRLPhoto = needUpRLPhoto;
-        }
-
-        public String getIsTrailer() {
-            return isTrailer;
-        }
-
-        public void setIsTrailer(String isTrailer) {
-            this.isTrailer = isTrailer;
-        }
-
-        public String getNeedUpQCPhoto() {
-            return needUpQCPhoto;
-        }
-
-        public void setNeedUpQCPhoto(String needUpQCPhoto) {
-            this.needUpQCPhoto = needUpQCPhoto;
-        }
 
         public int getCarId() {
             return carId;

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

@@ -257,7 +257,6 @@ public class StartOrderBean {
             private String realityTimeDate;
             private int status;
             private String longitude;
-            private String imageTakenDate;
             private String latitude;
             private List<GoodsDTO> goods;
             private int report;
@@ -281,14 +280,6 @@ public class StartOrderBean {
             private String distance;
             private int isEvaluation;
 
-            public String getImageTakenDate() {
-                return imageTakenDate;
-            }
-
-            public void setImageTakenDate(String imageTakenDate) {
-                this.imageTakenDate = imageTakenDate;
-            }
-
             public long getId() {
                 return id;
             }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/constant/HYConstant.java

@@ -1,48 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.constant;
-
-/**
- * @ClassName HYConstant
- * @Author 用户
- * @Date 2023/8/29 09:32
- * @Description TODO
- */
-public class HYConstant {
-
-    //-------------安联---------------start
-    //企业代码
-    private static final String ENTERPRISE_CODE="E0019169";
-    //企业app的身份码
-    private static final String APP_IDENTITY="b4a472a025e443b383970cdd5465552e";
-    //企业app验证码
-    private static final String APP_KEY="b948efbb4c2a4ba0805c534f2fba0c89";
-
-    //企业代码-测试
-    private static final String ENTERPRISE_CODE_TEXT="E0019093";
-    //企业app的身份码-测试
-    private static final String APP_IDENTITY_TEXT="a15b4ba5bd2542cc9a6bea9bdadf9ef9";
-    //企业app验证码-测试
-    private static final String APP_KEY_TEXT="07a6256cad5642138ed6e962a5a157be";
-    //-------------安联---------------end
-
-
-    //-------------交通厅---------------start
-    public final static String JTT_DATA_NAME="jtt_data";
-    public final static String JTT_DATA_JTTORDER_KEY="JTT_order_key";
-    public final static String JTT_DATA_ORDER_KEY="order_key";
-    //-------------交通厅---------------end
-
-    //--------------E签宝--------------start
-    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==";
-    //-------------E签宝---------------end
-
-    //--------------交通厅--------------start
-    private final static String APPID="com.arpa.hndahesudintocctmsdriver";
-    private final static String APP_SECURITY="01e20fc6585a42738ac88a12321dc41bff473b4b20184aacbbcee7d7864359a6";
-    private final static String CODE="41110447";
-    private final static String ENVIRONMENT="release";
-    //-------------交通厅---------------end
-
-
-
-}

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

@@ -1,72 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.cuspop
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.view.View
-import com.arpa.hndahesudintocctmsdriver.R
-import com.lxj.xpopup.core.CenterPopupView
-import kotlinx.android.synthetic.main.load.view.*
-import kotlinx.android.synthetic.main.pop_message_center.view.*
-
-
-/**
- * @ClassName MessagePop
- * @Author 用户
- * @Date 2023/8/14 18:01
- * @Description TODO
- */
-class MessagePop(context: Context) : CenterPopupView(context), View.OnClickListener {
-
-    lateinit var content :String
-     var secMessage :String? = ""
-
-    constructor(context: Context,message : String) :this(context) {
-        content = message
-    }
-
-    constructor(context: Context,message : String,message2 : String) :this(context) {
-        content = message
-        secMessage = message2
-    }
-
-    override fun getImplLayoutId() = R.layout.pop_message_center
-
-    override fun onCreate() {
-        super.onCreate()
-        tvCancel.setOnClickListener(this)
-        tvOk.setOnClickListener(this)
-        tvPhone.setOnClickListener(this)
-        tvContent.text = "$content"
-        tvMessage2.text =secMessage
-    }
-
-    override fun onClick(v: View?) {
-        when(v?.id){
-            R.id.tvCancel -> {
-                dismiss()
-            }
-            R.id.tvOk,R.id.tvPhone -> {
-                dismiss()
-                val toString = tvPhone.text.toString()
-                val intent = Intent(Intent.ACTION_DIAL)
-                val data = Uri.parse("tel:$toString")
-                intent.data = data
-                context.startActivity(intent)
-//                BaseUtils.callPhone(content as Activity, tvPhone.text.toString())
-            }
-        }
-    }
-
-
-    private var listener: OnMyItemClickListener? = null
-    fun setOnMyItemClickListener(listener: OnMyItemClickListener?): MessagePop {
-        this.listener = listener
-        return this
-    }
-
-    interface OnMyItemClickListener {
-        fun onItemClick(startTime: String, endTime: String)
-    }
-
-}

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

@@ -1,60 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.cuspop
-
-import android.content.Context
-import android.view.View
-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.*
-
-
-/**
- * @ClassName MessagePop
- * @Author 用户
- * @Date 2023/8/14 18:01
- * @Description TODO
- */
-class SimCenterPop(context: Context) : CenterPopupView(context), View.OnClickListener {
-
-    lateinit var content: String
-    lateinit var secMessage: String
-
-    constructor(context: Context, message: String) : this(context) {
-        content = message
-    }
-
-
-    override fun getImplLayoutId() = R.layout.pop_sim_center
-
-    override fun onCreate() {
-        super.onCreate()
-        tvCancel.setOnClickListener(this)
-        tvOk.setOnClickListener(this)
-        tvContent.text = "$content"
-
-    }
-
-    override fun onClick(v: View?) {
-        when (v?.id) {
-            R.id.tvCancel -> {
-                dismiss()
-            }
-            R.id.tvOk -> {
-                dismiss()
-                listener?.onItemClick()
-            }
-        }
-    }
-
-
-    private var listener: OnMyItemClickListener? = null
-    fun setOnMyItemClickListener(listener: OnMyItemClickListener): SimCenterPop {
-        this.listener = listener
-        return this
-    }
-
-    interface OnMyItemClickListener {
-        fun onItemClick()
-    }
-
-}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/event/FaceEvent.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 FaceEvent {
-
-    private String message;
-
-    public FaceEvent(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/parts/AuthParts.java

@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.parts;
 import android.content.Context;
 import android.util.Log;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
@@ -19,7 +20,7 @@ public class AuthParts {
 
     public static DriverAuthDataBean getAuth(Context con){
         String authData=SPUtil.getSP(con,"data","authdata");
-        Log.e("--data--",authData);
+        LogUtil.e("--data--",authData);
         if("".equals(authData)){
             return null;
         }else {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/PushMessageReceiver.java

@@ -8,6 +8,7 @@ import com.arpa.hndahesudintocctmsdriver.service.MakeUpService;
 import com.arpa.hndahesudintocctmsdriver.ui.home.HuoYunDelActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -25,7 +26,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
 
     @Override
     public void onMessage(Context context, CustomMessage customMessage) {
-        Log.e(TAG, "[onMessage] " + customMessage);
+        LogUtil.e(TAG, "[onMessage] " + customMessage);
         Intent intent = new Intent("com.jiguang.demo.message");
         intent.putExtra("msg", customMessage.message);
         context.sendBroadcast(intent);
@@ -33,7 +34,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
 
     @Override
     public void onNotifyMessageOpened(Context context, NotificationMessage message) {
-        Log.e(TAG, "[onNotifyMessageOpened] " + message);
+        LogUtil.e(TAG, "[onNotifyMessageOpened] " + message);
         try{
             //打开自定义的Activity
             JSONObject json=new JSONObject(message.notificationExtras);
@@ -41,7 +42,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
             String url=json.getString("url");
             if(url.indexOf("driver/detail")!=-1){
                 int id=Integer.parseInt(url.split("=")[1]);
-                Log.e("-url-",url+"_"+id);
+                LogUtil.e("-url-",url+"_"+id);
                 Intent in=new Intent(context, HuoYunDelActivity.class);
                 in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
                 in.putExtra("id",Integer.parseInt(url.split("=")[1]));
@@ -54,7 +55,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
             }
 
         }catch (Throwable throwable){
-            Log.e("123", "[onNotifyMessageOpened] " + message);
+            LogUtil.e("123", "[onNotifyMessageOpened] " + message);
             Intent in=new Intent(context, WelcomeActivity.class);
             in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
             context.startActivity(in);
@@ -63,7 +64,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
 
     @Override
     public void onMultiActionClicked(Context context, Intent intent) {
-        Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
+        LogUtil.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
         String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
 
         //开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
@@ -72,19 +73,19 @@ public class PushMessageReceiver extends JPushMessageReceiver {
             return;
         }
         if (nActionExtra.equals("my_extra1")) {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
+            LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
         } else if (nActionExtra.equals("my_extra2")) {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
+            LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
         } else if (nActionExtra.equals("my_extra3")) {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
+            LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
         } else {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
+            LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
         }
     }
 
     @Override
     public void onNotifyMessageArrived(Context context,NotificationMessage message) {
-        Log.e(TAG, "[onNotifyMessageArrived] " + message);
+        LogUtil.e(TAG, "[onNotifyMessageArrived] " + message);
         JSONObject json= null;
         String str="";
         try {
@@ -103,24 +104,24 @@ public class PushMessageReceiver extends JPushMessageReceiver {
 
     @Override
     public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
-        Log.e(TAG, "[onNotifyMessageDismiss] " + message);
+        LogUtil.e(TAG, "[onNotifyMessageDismiss] " + message);
     }
 
     @Override
     public void onRegister(Context context, String registrationId) {
-        Log.e(TAG, "[onRegister] " + registrationId);
+        LogUtil.e(TAG, "[onRegister] " + registrationId);
         Intent intent = new Intent("com.jiguang.demo.register");
         context.sendBroadcast(intent);
     }
 
     @Override
     public void onConnected(Context context, boolean isConnected) {
-        Log.e(TAG, "[onConnected] " + isConnected);
+        LogUtil.e(TAG, "[onConnected] " + isConnected);
     }
 
     @Override
     public void onCommandResult(Context context, CmdMessage cmdMessage) {
-        Log.e(TAG, "[onCommandResult] " + cmdMessage);
+        LogUtil.e(TAG, "[onCommandResult] " + cmdMessage);
     }
 
     @Override
@@ -150,7 +151,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
     @Override
     public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
         super.onNotificationSettingsCheck(context, isOn, source);
-        Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
+        LogUtil.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
     }
 
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java

@@ -3,6 +3,8 @@ package com.arpa.hndahesudintocctmsdriver.push;
 import android.content.Context;
 import android.util.Log;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
+
 import cn.jpush.android.api.JPushMessage;
 
 /**
@@ -49,7 +51,7 @@ public class TagAliasOperatorHelper {
                 logs += ", tags is exceed limit need to clean";
             }
             logs += ", errorCode:" + jPushMessage.getErrorCode();
-            Log.e(TAG, logs);
+            LogUtil.e(TAG, logs);
             //ToastHelper.showOther(context,logs);
         }
     }
@@ -63,7 +65,7 @@ public class TagAliasOperatorHelper {
             //ToastHelper.showOk(context,"modify success");
         }else{
             String logs = "Failed to modify tags, errorCode:" + jPushMessage.getErrorCode();
-            Log.e(TAG, logs);
+            LogUtil.e(TAG, logs);
             //ToastHelper.showOther(context,logs);
         }
     }
@@ -77,7 +79,7 @@ public class TagAliasOperatorHelper {
             //ToastHelper.showOk(context,"modify success");
         }else{
             String logs = "Failed to modify alias, errorCode:" + jPushMessage.getErrorCode();
-            Log.e(TAG, logs);
+            LogUtil.e(TAG, logs);
             //ToastHelper.showOther(context,logs);
             //MMKV.defaultMMKV().putString(AdvActivity.ALIAS_DATA, "");
         }
@@ -92,7 +94,7 @@ public class TagAliasOperatorHelper {
             //ToastHelper.showOk(context,"modify success");
         }else{
             String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
-            Log.e(TAG, logs);
+            LogUtil.e(TAG, logs);
             //ToastHelper.showOther(context,logs);
             //MMKV.defaultMMKV().putString(AdvActivity.MN_DATA, "");
         }

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

@@ -8,11 +8,8 @@ import com.alct.mdp.MDPLocationCollectionManager;
 import com.alct.mdp.callback.OnDownloadResultListener;
 import com.alct.mdp.callback.OnResultListener;
 import com.alct.mdp.model.Identity;
-import com.arpa.hndahesudintocctmsdriver.App;
-import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.parts.AuthParts;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
-import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean;
 import com.arpa.hndahesudintocctmsdriver.bean.FqBean;
@@ -32,37 +29,26 @@ public class ALProcess {
     //企业app验证码
     private static final String APP_KEY="b948efbb4c2a4ba0805c534f2fba0c89";
 
-    //企业代码-测试
-    private static final String ENTERPRISE_CODE_TEXT="E0019093";
-    //企业app的身份码-测试
-    private static final String APP_IDENTITY_TEXT="a15b4ba5bd2542cc9a6bea9bdadf9ef9";
-    //企业app验证码-测试
-    private static final String APP_KEY_TEXT="07a6256cad5642138ed6e962a5a157be";
-
-
     public static void verification(Context con){
         DriverAuthDataBean auth= AuthParts.getAuth(con);
         Identity idy=new Identity();
         //企业代码
-        idy.setEnterpriseCode(BuildConfig.isTest?ENTERPRISE_CODE_TEXT:ENTERPRISE_CODE);
+        idy.setEnterpriseCode(ENTERPRISE_CODE);
         //企业app的身份码
-        idy.setAppIdentity(BuildConfig.isTest?APP_IDENTITY_TEXT:APP_IDENTITY);
+        idy.setAppIdentity(APP_IDENTITY);
         //企业app验证码
-        idy.setAppKey(BuildConfig.isTest?APP_KEY_TEXT:APP_KEY);
+        idy.setAppKey(APP_KEY);
         //司机身份证
         idy.setDriverIdentity(auth.getData().getIdcard());
         //idy.setDriverIdentity("410725198311042012");
         MDPLocationCollectionManager.register(con, idy, new OnResultListener() {
             @Override
             public void onSuccess() {
-                Log.e("--success--","验证成功");
                 getFq(con);
             }
 
             @Override
             public void onFailure(java.lang.String s, java.lang.String s1) {
-                Log.e("--error--",s+s1+"");
-                new MessageUtils().showCenMessage(con,s1);
             }
         });
     }
@@ -71,18 +57,18 @@ public class ALProcess {
         MDPLocationCollectionManager.getInvoices(con, 100, 1, new OnDownloadResultListener() {
             @Override
             public void onSuccess(Object o) {
-                Log.e("--获取发票列表成功--",new Gson().toJson(o));
+                LogUtil.e("--获取发票列表成功--",new Gson().toJson(o));
                 try{
                     FqBean fb=new Gson().fromJson(new Gson().toJson(o),FqBean.class);
                     applyFq(con,fb);
                 }catch (Exception e){
-                    Log.e("--失败--","数据解析失败");
+                    LogUtil.e("--失败--","数据解析失败");
                 }
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("--获取发票列表失败--",s+s1+"");
+                LogUtil.e("--获取发票列表失败--",s+s1+"");
             }
 
         });
@@ -91,16 +77,16 @@ public class ALProcess {
 
     public static void applyFq(Context con,FqBean fb){
         for (FqBean.Invoice driverInvoice : fb.getDriverInvoices()) {
-            MDPLocationCollectionManager.confirmInvoice(con, BuildConfig.isTest?ENTERPRISE_CODE_TEXT:ENTERPRISE_CODE, driverInvoice.getDriverInvoiceCode(), new OnResultListener() {
+            MDPLocationCollectionManager.confirmInvoice(con, ENTERPRISE_CODE, driverInvoice.getDriverInvoiceCode(), new OnResultListener() {
                 @Override
                 public void onSuccess() {
 
-                    Log.e("--成功--","申请发票成功");
+                    LogUtil.e("--成功--","申请发票成功");
                 }
 
                 @Override
                 public void onFailure(String s, String s1) {
-                    Log.e("--失败--","申请发票失败"+s+s1);
+                    LogUtil.e("--失败--","申请发票失败"+s+s1);
                 }
             });
         }
@@ -112,7 +98,7 @@ public class ALProcess {
     //        @param enterpriseCode 企业号
     //        @param nfcId NFC id
     //        @param listener 回调函数
-            MDPLocationCollectionManager.checkNfc(con, shipmentCode,ENTERPRISE_CODE, nfcId, new OnResultListener() {
+        MDPLocationCollectionManager.checkNfc(con, shipmentCode,ENTERPRISE_CODE, nfcId, new OnResultListener() {
             @Override
             public void onSuccess() {
 
@@ -126,33 +112,4 @@ public class ALProcess {
     }
 
 
-    public static void verification(Context con,Handler hd){
-        DriverAuthDataBean auth= AuthParts.getAuth(con);
-        Identity idy=new Identity();
-        //企业代码
-        idy.setEnterpriseCode(BuildConfig.isTest?ENTERPRISE_CODE_TEXT:ENTERPRISE_CODE);
-        //企业app的身份码
-        idy.setAppIdentity(BuildConfig.isTest?APP_IDENTITY_TEXT:APP_IDENTITY);
-        //企业app验证码
-        idy.setAppKey(BuildConfig.isTest?APP_KEY_TEXT:APP_KEY);
-        //司机身份证
-        idy.setDriverIdentity(auth.getData().getIdcard());
-        //idy.setDriverIdentity("410725198311042012");
-        MDPLocationCollectionManager.register(con, idy, new OnResultListener() {
-            @Override
-            public void onSuccess() {
-                MsgUtil.addHdMsgWatBody(hd, 1111,"认证成功");
-                Log.e("--success--","验证成功");
-                getFq(con);
-            }
-
-            @Override
-            public void onFailure(java.lang.String s, java.lang.String s1) {
-                Log.e("--error--",s+s1+"");
-                MsgUtil.addHdMsgWatBody(hd, 2222,s1);
-//                new MessageUtils().showCenMessage(con,s1);
-            }
-        });
-    }
-
 }

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

@@ -10,6 +10,7 @@ import com.arpa.hndahesudintocctmsdriver.bean.JTT;
 import com.arpa.hndahesudintocctmsdriver.constant.JTTConstant;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.service.JTTSendService;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.google.gson.Gson;
@@ -56,12 +57,10 @@ public class JTTProcess {
                 ENVIRONMENT, new OnResultListener() {
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("交通厅-获取授权",s+s1);
             }
 
             @Override
             public void onSuccess(List<ShippingNoteInfo> list) {
-                Log.e("交通厅-获取授权",gson.toJson(list));
                 if(list.size()>0){
                     SPUtil.insSP(con,JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_JTTORDER_KEY,gson.toJson(list.get(0)));
                     Intent in=new Intent(con, JTTSendService.class);
@@ -89,19 +88,19 @@ public class JTTProcess {
         sni.setEndLocationText(endWay.getAddress());
         sni.setEndCountrySubdivisionCode(sob.getData().getEndCountrySubdivisionCode());
         snis[0]=sni;
-        Log.e("起点代码",sob.getData().getStartCountrySubdivisionCode());
+        LogUtil.e("起点代码",sob.getData().getStartCountrySubdivisionCode());
-        Log.e("终点代码",sob.getData().getEndCountrySubdivisionCode());
+        LogUtil.e("终点代码",sob.getData().getEndCountrySubdivisionCode());
 //        AMapLocationClient.updatePrivacyShow(con,true,true);
 //        AMapLocationClient.updatePrivacyAgree(con,true);
         LocationOpenApi.start(con, sob.getData().getCarNumber(), UserParts.getUser(con).getData().getRname(), remark,snis, new OnResultListener() {
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("交通厅-开启定位失败",s+s1+"");
+                LogUtil.e("交通厅-开启定位失败",s+s1+"");
             }
 
             @Override
             public void onSuccess(List<ShippingNoteInfo> list) {
-                Log.e("交通厅-开启定位成功",gson.toJson(list));
+                LogUtil.e("交通厅-开启定位成功",gson.toJson(list));
                 if(list.size()>0){
                     SPUtil.insSP(con, JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_JTTORDER_KEY,gson.toJson(list.get(0)));
                     Intent in=new Intent(con, JTTSendService.class);
@@ -125,12 +124,12 @@ public class JTTProcess {
         LocationOpenApi.send(con,sob.getData().getCarNumber(), UserParts.getUser(con).getData().getRname(), remark,snis, new OnSendResultListener() {
             @Override
             public void onFailure(String s, String s1, List<ShippingNoteInfo> list) {
-                Log.e("交通厅-发送定位失败",s+s1+"");
+                LogUtil.e("交通厅-发送定位失败",s+s1+"");
             }
 
             @Override
             public void onSuccess(List<ShippingNoteInfo> list) {
-                Log.e("交通厅-发送定位成功",gson.toJson(list));
+                LogUtil.e("交通厅-发送定位成功",gson.toJson(list));
             }
         });
     }
@@ -158,12 +157,12 @@ public class JTTProcess {
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("交通厅-暂停定位失败",s+s1+"");
+                LogUtil.e("交通厅-暂停定位失败",s+s1+"");
             }
 
             @Override
             public void onSuccess(List<ShippingNoteInfo> list) {
-                Log.e("交通厅-暂停定位成功",gson.toJson(list));
+                LogUtil.e("交通厅-暂停定位成功",gson.toJson(list));
             }
 
         });
@@ -191,12 +190,12 @@ public class JTTProcess {
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("交通厅-重启定位失败",s+s1+"");
+                LogUtil.e("交通厅-重启定位失败",s+s1+"");
             }
 
             @Override
             public void onSuccess(List<ShippingNoteInfo> list) {
-                Log.e("交通厅-重启定位成功",gson.toJson(list));
+                LogUtil.e("交通厅-重启定位成功",gson.toJson(list));
             }
 
         });
@@ -224,12 +223,12 @@ public class JTTProcess {
         LocationOpenApi.stop(con, sob.getData().getCarNumber(),UserParts.getUser(con).getData().getRname(), remark,snis, new OnResultListener() {
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("交通厅-结束定位失败",s+s1+"");
+                LogUtil.e("交通厅-结束定位失败",s+s1+"");
             }
 
             @Override
             public void onSuccess(List<ShippingNoteInfo> list) {
-                Log.e("交通厅-结束定位成功",gson.toJson(list));
+                LogUtil.e("交通厅-结束定位成功",gson.toJson(list));
                 Intent stopIntent = new Intent(con,JTTSendService.class);
                 con.stopService(stopIntent);
             }

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

@@ -63,7 +63,6 @@ public class AuthRequest {
 
     //驾驶证认证
     public void driverAuthLicense(Context con, Handler hd, LicenseInputBean iib) {
-        Log.e("--认证信息--", gson.toJson(iib));
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getDRIVERAUTHLICENSE(), gson.toJson(iib)), getToken(con), con);
         RequestUtil.start(1, "driverAuthLicense", re, con, hd);
     }

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

@@ -25,10 +25,5 @@ public class BusinessRequest {
         Request re = OkHttpUtil.get(new OkDate(url+ Md5Util.resUrl(longitude,latitude,name), "post", ""));
         RequestUtil.start(12, "business_list",re,con,hd);
     }
-    public void GetBusiness(Context con, Handler hd, String id){
-        String url="https://openapi.dianping.com/router/poiinfo/detailinfo";
-        Request re = OkHttpUtil.get(new OkDate(url+Md5Util.resDelUrl(id), "post", ""));
-        RequestUtil.start(1, "business",re,con,hd);
-    }
 
 }

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

@@ -66,7 +66,6 @@ public class NewsRequest {
     public void delNewsAll(Context con, Handler hd,Model m){
         m.setId(0);
         token= SPUtil.getSP(con, LoginActivity.USER,LoginActivity.USER_TOKEN);
-        Log.e("-xm-",gson.toJson(m));
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getXiaoxiDelAll(),gson.toJson(m)),getToken(con),con);
         RequestUtil.start(1, NewsActivity.NEWS_DEL,re,con,hd);
         ///app/message/setReadAll

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

@@ -59,9 +59,4 @@ public class OCRRequest {
         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

@@ -1,12 +1,10 @@
 package com.arpa.hndahesudintocctmsdriver.request;
 
-import com.arpa.hndahesudintocctmsdriver.BuildConfig;
-
 public class RequestConstant {
 
     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;
+    public static String BASE_URL ="http://app.dahehuoyun.com/api";
     //版本更新/app/check/version
     public static String VERSION ="/app/check/version";
     //全部代码
@@ -135,9 +133,6 @@ public class RequestConstant {
     //车牌号
     private static final String PLATE_LICENSE="/common/ocr/plateLicense";
 
-    //车牌号2
-    private static final String PLATE_LICENSE2="/common/aliyun/ocr/RecognizeCarNumber";
-
     //添加挂车
     private static final String SAVE_DRAW_CAR="/app/carDriver/saveDrawCar";
     //提现记录
@@ -395,10 +390,6 @@ public class RequestConstant {
         return BASE_URL+PLATE_LICENSE;
     }
 
-    public static String getPlateLicense2() {
-        return BASE_URL+PLATE_LICENSE2;
-    }
-
     public static String getGetImage() {
         return BASE_URL+GET_IMAGE;
     }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/Api.java

@@ -23,8 +23,8 @@ public interface Api {
     //获取版本
     String VERSION = BASE_URL + "app/version";
 
-//    @POST(BASE_URL+"/common/register")
+    @POST(BASE_URL+"/common/register")
-//    Observable<CommonResponseBean> log(@Body LoginRegInputBean bean);
+    Observable<CommonResponseBean> log(@Body LoginRegInputBean bean);
 
 }
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/CreateJsonUtils.java

@@ -2,6 +2,7 @@ package com.arpa.hndahesudintocctmsdriver.request.net;
 
 import android.util.Log;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.dahe.mylibrary.net.JsonUtils;
 import com.dahe.mylibrary.utils.MD5Utils;
 import com.dahe.mylibrary.utils.StringUtils;
@@ -70,7 +71,7 @@ public class CreateJsonUtils {
         map.put("api_key", "xccdb-power-bank");
         map.put("sign", MD5Utils.md5(JsonUtils.getInstance().getGson().toJson(map)));
         map.put("time", TimeUtil.getNowMills());
-        Log.i(TAG, new Gson().toJson(map));
+        LogUtil.e(TAG, new Gson().toJson(map));
         return new Gson().toJson(map);
     }
 
@@ -123,15 +124,15 @@ public class CreateJsonUtils {
         }
         try {
             signStr = (sign1(requestDataMap) + "&api_key=xccdb-power-bank").replaceFirst("&", "");
-            Log.i(TAG, "createRequestBody: " + sign1(requestDataMap));
+            LogUtil.e(TAG, "createRequestBody: " + sign1(requestDataMap));
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        Log.i(TAG, "createRequestBody: " + signStr);
+        LogUtil.e(TAG, "createRequestBody: " + signStr);
         for (String keySet : requestDataMap.keySet()) {
             requestBodyMap.put(keySet, RequestBody.create(MediaType.parse("multipart/form-data"), requestDataMap.get(keySet) + ""));
         }
-        Log.i(TAG, "createRequestBody: " + MD5Utils.md5((signStr)));
+        LogUtil.e(TAG, "createRequestBody: " + MD5Utils.md5((signStr)));
         requestBodyMap.put("sign", RequestBody.create(MediaType.parse("multipart/form-data"),
                 MD5Utils.md5((signStr))));
         requestBodyMap.put("time", RequestBody.create(MediaType.parse("multipart/form-data"), TimeUtil.getNowMills() / 1000 + ""));

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RequestHeadInterceptor.java

@@ -37,7 +37,6 @@ public class RequestHeadInterceptor implements Interceptor {
                 .addHeader("deviceType", "ANDROID")
                 .addHeader("language", BaseUtils.getLanguage(App.getApp())+"")
                 .build();
-        Log.i(TAG, "intercept: " + request.headers());
         return chain.proceed(request);
     }
 }

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

@@ -65,7 +65,6 @@ public class JTTSendService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-        Log.e("交通厅","开启位置上传");
         con=this;
         String str= SPUtil.getSP(con, JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_JTTORDER_KEY);
         String str2=SPUtil.getSP(con,JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_ORDER_KEY);
@@ -103,7 +102,6 @@ public class JTTSendService extends Service {
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.e("服务开启","-----");
         return START_STICKY;
 
     }

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

@@ -9,6 +9,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
 import com.arpa.hndahesudintocctmsdriver.request.bean.TrackInputBean;
@@ -54,7 +55,7 @@ public class LocationService extends Service {
         super.onCreate();
         con=this;
         hyr=new HuoYuanRequset(con,hd);
-        Log.e("开始循环上传，等待100ms","-----");
+        LogUtil.e("开始循环上传，等待100ms","-----");
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
@@ -67,7 +68,6 @@ public class LocationService extends Service {
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.e("服务开启","-----");
         return START_STICKY;
 
     }
@@ -84,10 +84,8 @@ public class LocationService extends Service {
         tib.setLatitude(l.getLatitude()+"");
         //纬度
         tib.setLongitude(l.getLongitude()+"");
-        Log.e("经度",l.getLatitude()+"");
-        Log.e("维度",l.getLongitude()+"");
         sum+=3;
-        Log.e("当前app后台服务存活时间(手机息屏状态)",sum+"秒");
+        LogUtil.e("当前app后台服务存活时间(手机息屏状态)",sum+"秒");
     }
 
 }

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

@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.alct.mdp.model.Image;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
@@ -55,7 +56,6 @@ public class MakeUpAlService extends Service {
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.e("服务开启","-----");
         return START_STICKY;
 
     }
@@ -90,12 +90,12 @@ public class MakeUpAlService extends Service {
 
             @Override
             public void onSuccess() {
-                Log.e("上报安联","装货照片上传成功");
+                LogUtil.e("上报安联","装货照片上传成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(装货照片):",s+s1);
+                LogUtil.e("上报安联失败(装货照片):",s+s1);
             }
 
         });
@@ -106,12 +106,12 @@ public class MakeUpAlService extends Service {
 
             @Override
             public void onSuccess() {
-                Log.e("上报安联","卸货照片上传成功");
+                LogUtil.e("上报安联","卸货照片上传成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(卸货照片):",s+s1);
+                LogUtil.e("上报安联失败(卸货照片):",s+s1);
             }
 
         });
@@ -122,12 +122,12 @@ public class MakeUpAlService extends Service {
 
             @Override
             public void onSuccess() {
-                Log.e("上报安联","回单照片上传成功");
+                LogUtil.e("上报安联","回单照片上传成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单照片):",s+s1);
+                LogUtil.e("上报安联失败(回单照片):",s+s1);
             }
 
         });

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

@@ -25,17 +25,14 @@ public class MakeUpService extends Service {
 
     private MediaPlayer mediaPlayer = new MediaPlayer();
     public void palyMp3(){
-        Log.e("开始播放","-----");
         try {
             AssetFileDescriptor fd =getAssets().openFd("kujp9scu.mp3");
             mediaPlayer.setDataSource(fd);
             mediaPlayer.setLooping(false);//设置为循环播放
             mediaPlayer.prepare();//初始化播放器MediaPlayer
             mediaPlayer.start();
-            Log.e("播放成功","-----");
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("播放失败","-----");
         }
     }
     private Handler hd=new Handler(msg -> {
@@ -64,7 +61,6 @@ public class MakeUpService extends Service {
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.e("服务开启","-----");
 
         return START_STICKY;
 

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

@@ -28,7 +28,6 @@ public class RestartService extends Service {
 
     //Service被启动的时候回调onStartCommand方法
     public int onStartCommand(Intent intent, int flags, int startId){
-        Log.e("---static---","启动");
         return START_STICKY;
     }
     @Override

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

@@ -59,7 +59,6 @@ public class TestService extends Service {
             @Override
             public void run() {
                 notification("消息","您有一条新的订单");
-                Log.e("1234","1234");
             }
         },100,5000);
     }
@@ -67,14 +66,12 @@ public class TestService extends Service {
 
     //Service被启动的时候回调onStartCommand方法
     public int onStartCommand(Intent intent, int flags, int startId){
-        Log.e("---static---","启动");
         return START_STICKY;
     }
 
     //Service被销毁的时候回调onDestroy方法
     public void onDestroy(){
         super.onDestroy();
-        Log.e("---static---","关闭");
         Intent intentOne = new Intent(con,TestService.class);
         startService(intentOne);
     }

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

@@ -9,6 +9,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
@@ -43,9 +44,9 @@ public class TrackService extends Service {
                 if(CacheGroup.cacheList.get("genzong")!=null){
                     BaseBean bb=gson.fromJson(CacheGroup.cacheList.get("genzong"),BaseBean.class);
                     if(bb.getCode()==200){
-                        Log.e("--轨迹上传--","成功");
+                        LogUtil.e("--轨迹上传--","成功");
                     }else{
-                        Log.e("--轨迹上传失败:--",bb.getMsg());
+                        LogUtil.e("--轨迹上传失败:--",bb.getMsg());
                     }
                     CacheGroup.cacheList.remove("genzong");
                 }
@@ -66,7 +67,7 @@ public class TrackService extends Service {
         super.onCreate();
         con=this;
         hyr=new HuoYuanRequset(con,hd);
-        Log.e("开始循环上传，等待100ms","-----");
+        LogUtil.e("开始循环上传，等待100ms","-----");
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
@@ -84,7 +85,7 @@ public class TrackService extends Service {
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.e("服务开启","-----");
+        LogUtil.e("服务开启","-----");
         return START_STICKY;
 
     }
@@ -99,8 +100,8 @@ public class TrackService extends Service {
             tib.setLatitude(l.getLatitude()+"");
             //纬度
             tib.setLongitude(l.getLongitude()+"");
-            Log.e("经度",l.getLatitude()+"");
+            LogUtil.e("经度",l.getLatitude()+"");
-            Log.e("维度",l.getLongitude()+"");
+            LogUtil.e("维度",l.getLongitude()+"");
             //单号
             tib.setShippingNoteNumber(snn);
             hyr.trackTracking(tib);

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

@@ -1,7 +1,6 @@
 package com.arpa.hndahesudintocctmsdriver.ui
 
 import android.Manifest
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -20,12 +19,11 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity
 import com.arpa.hndahesudintocctmsdriver.util.view.BottomTabUtil
 import com.arpa.hndahesudintocctmsdriver.util.view.PanDuanUtil
+import com.dahe.mylibrary.utils.RootCheck
 import com.google.gson.Gson
-import com.gyf.cactus.ext.cactusUpdateNotification
+import com.lxj.xpopup.XPopup
 import com.permissionx.guolindev.PermissionX
 
-@Suppress("DIVISION_BY_ZERO")
-@SuppressLint("SetTextI18n")
 class MainActivity : BaseAppCompatActivity() {
 
     private var ibs = arrayOf<ImageView>()
@@ -41,8 +39,7 @@ class MainActivity : BaseAppCompatActivity() {
             1 -> {
                 isExit = false;
             }
-            RequsetCodeConstants.SUCCESS -> {
+            RequsetCodeConstants.SUCCESS -> {}
-            }
         }
     }
 
@@ -50,10 +47,7 @@ class MainActivity : BaseAppCompatActivity() {
         super.onCreate(savedInstanceState)
         StateStyleUtil.stateTextColor(this)
         setContentView(R.layout.activity_main)
-        cactusUpdateNotification {
+        isRoot()
-            setTitle("好运司机")
-            setContent("您的接单小助手")
-        }
         con = this
         act = this
         //隐藏标题栏
@@ -135,11 +129,7 @@ class MainActivity : BaseAppCompatActivity() {
         PermissionX.init(this)
             .permissions(Manifest.permission.ACCESS_FINE_LOCATION,
                 Manifest.permission.ACCESS_COARSE_LOCATION,
-                Manifest.permission.ACCESS_BACKGROUND_LOCATION,
+                Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.RECORD_AUDIO,
-                Manifest.permission.CAMERA)
             .request { allGranted, grantedList, deniedList ->
                 if (allGranted) {
 
@@ -160,7 +150,6 @@ class MainActivity : BaseAppCompatActivity() {
     fun jumpLogin() {
         var inl = Intent(con, LoginActivity::class.java)
         startActivity(inl)
-
     }
 
 
@@ -188,4 +177,17 @@ class MainActivity : BaseAppCompatActivity() {
         }
     }
 
+    fun isRoot() {
+        if (RootCheck.isRoot()) {
+            XPopup.Builder(this)
+                .isDestroyOnDismiss(true)
+                .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+                .asConfirm("警告", "该设备已ROOT,存在安全隐! 请更换安全设备后继续使用!",
+                    "取消", "确定", {
+                        System.exit(0)
+//                    moveTaskToBack(true)
+                    }, null, true).show()
+        }
+    }
+
 }

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

@@ -84,7 +84,6 @@ public class NFCActivity extends BaseAppCompatActivity {
 
             }
         });
-        Log.e("nfc",str);
     }
 
 }

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

@@ -19,6 +19,7 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.bumptech.glide.Glide;
 import com.esign.esignsdk.EsignSdk;
@@ -43,7 +44,6 @@ import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
 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 java.io.File;
 import java.util.List;
@@ -60,7 +60,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
     private RelativeLayout up_img, cow1;
     private LinearLayout data_view;
     private ImageView img;
-    private TextView zjimg_name, upload_img, name2, title1, title2, tvSkip, tvTips;
+    private TextView zjimg_name, upload_img, name2, title1, title2, tvSkip,tvTips;
     private View vs;
     private EditText value1;
     private Button submit;
@@ -86,7 +86,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove("upload");
                 }
                 if (CacheGroup.cacheList.get("isAuthDriverAuthQualification") != null) {
-                    Log.e("is", CacheGroup.cacheList.get("isAuthDriverAuthQualification"));
+                    LogUtil.e("is", CacheGroup.cacheList.get("isAuthDriverAuthQualification"));
                     ib = gson.fromJson(CacheGroup.cacheList.get("isAuthDriverAuthQualification"), IsAuthDriverAuthQualificationBean.class);
                     if (ib.getCode() == 200) {
                         if (ib.getData() != null) {
@@ -101,32 +101,16 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthQualification"), BaseBean.class);
                     if (bb.getCode() == 200) {
 //                        initAuth();
-                        //判断是否从车辆进来 carId为空从个人认证进来需跳转实名认证，不为空车辆信息进入，需跳转车辆照片
+                        //从业资格证->实名认证
-                        if (TextUtils.isEmpty(carId)) {
+//                        finish();
-                            //从业资格证->实名认证
+                        if (key) {
-                            if (key) {
+                            key = false;
-                                key = false;
+                            new AuthRequest().getAuthUrl(con, hd);
-                                new AuthRequest().getAuthUrl(con, hd);
+                            new Handler().postDelayed(() -> {
-                                new Handler().postDelayed(() -> {
+                                key = true;
-                                    key = true;
+                            }, 3000);
-                                }, 3000);
-                            }
-                        } else {
-                            finish();
-                            if (isOverCar){//从业资格证=》道路运输许可证
-                                Intent in = new Intent(con, PhotoCarActivity.class);
-                                in.putExtra("type", 3);
-                                in.putExtra("carId", carId);
-                                startActivity(in);
-                            }else{//资料传完  补传情况
-                                Intent in = new Intent(con, AddCarSuccActivity.class);
-                                in.putExtra("type", 3);
-                                con.startActivity(in);
-                            }
                         }
 
-
-
                         Toast.makeText(con, "资格证上传成功", Toast.LENGTH_SHORT).show();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -149,14 +133,14 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                 }
 
                 if (CacheGroup.cacheList.get("authUrl") != null) {
-                    Log.e("url", CacheGroup.cacheList.get("authUrl"));
+                    LogUtil.e("url", CacheGroup.cacheList.get("authUrl"));
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
                     if (bb.getCode() == 200) {
-//                        finish();
+                        finish();
                         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"));
+                    }//LogUtil.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
                 }
                 break;
@@ -170,8 +154,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
     }
 
     private String type = "0";
-    private String carId = "";
-    private boolean isOverCar = false;
     private UserBean userBean;
 
     @Override
@@ -180,7 +162,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_auth_qualification);
         con = this;
-        act = this;
+        act=this;
         img = findViewById(R.id.img);
         zjimg_name = findViewById(R.id.zjimg_name);
         upload_img = findViewById(R.id.upload_img);
@@ -197,8 +179,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         vs = findViewById(R.id.vs);
         data_view = findViewById(R.id.data_view);
         type = getIntent().getExtras().getString("type");
-        carId = getIntent().getExtras().getString("carId", "");
-        isOverCar = getIntent().getExtras().getBoolean("isOverCar",false);
         ur = new UserRequset(con, hd);
         initView(null);
         if ("0".equals(type)) {
@@ -210,11 +190,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             }
             //new RZRequest().isDriverAuthQualification(con,hd);
         }
-        if (TextUtils.isEmpty(carId)){//carId不为空 从添加车辆进入  该操作不能跳过
-            tvSkip.setVisibility(View.VISIBLE);
-        }else{
-            tvSkip.setVisibility(View.GONE);
-        }
     }
 
     private boolean key = true;
@@ -231,10 +206,9 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         });
         img.setOnClickListener(v -> {
             if (!"".equals(url)) {
-                new XPopup.Builder(con).asImageViewer(img, url, new SmartGlideImageLoader(R.mipmap.ic_launcher_round)).show();
+                new XPopup.Builder(con)
-//                new XPopup.Builder(con)
+                        .asImageViewer(img, url, true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
-//                        .asImageViewer(img, url, true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
+                        .show();
-//                        .show();
             }
         });
         value2.setOnClickListener(v -> {
@@ -253,7 +227,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     if (!"".equals(id) && !"".equals(date) && !"".equals(url)) {
                         new AuthRequest().driverAuthQualification(con, hd, id, ub.getData().getId(), date);
                     } else {
-                        Toast.makeText(con, "请补充证件信息", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con, "提交信息不完整", Toast.LENGTH_SHORT).show();
                     }
                 } else {
                     if (!"".equals(url)) {
@@ -284,9 +258,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         });
 
         tvSkip.setOnClickListener(v -> {
-
-
-
             if (type.equals("0")) {
 //                finish();
                 if (key) {
@@ -320,7 +291,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             zjimg_name.setText("党员证照片");
             data_view.setVisibility(View.GONE);
             title2.setVisibility(View.GONE);
-        } else {
+        }else{
             tvTips.setVisibility(View.VISIBLE);
         }
     }
@@ -354,7 +325,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 12 && resultCode == RESULT_OK) {
             path = gia.getFile().getPath();
-            Log.e("图片地址:", path);
+            LogUtil.e("图片地址:", path);
             gia.dis();
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -367,7 +338,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     paths = image.getPath();
                 }
                 path = paths;
-                Log.e("图片地址:", path);
+                LogUtil.e("图片地址:", path);
                 gia.dis();
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }

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

@@ -4,16 +4,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -21,31 +18,22 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.bean.DicBean;
-import com.arpa.hndahesudintocctmsdriver.bean.SinglePickBean;
-import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop;
-import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.PickerUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.arpa.hndahesudintocctmsdriver.util.map.MapUtil;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
-import com.dahe.mylibrary.utils.ActivityUtils;
-import com.esign.esignsdk.EsignSdk;
-import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
 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.core.ImageViewerPopupView;
 import com.lxj.xpopup.interfaces.XPopupImageLoader;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
@@ -76,10 +64,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 import com.lxj.xpopup.photoview.PhotoView;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
 
 import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -109,14 +95,14 @@ public class CertificatesActivity extends BaseAppCompatActivity {
     private int[] typeImgOne = {R.mipmap.id, R.mipmap.license, R.mipmap.vehicle_license, R.mipmap.vehicle_license};
     private int[] typeImgTwo = {R.mipmap.id_back, R.mipmap.license_back, R.mipmap.vehicle_license_back, R.mipmap.vehicle_license_back};
     private int index = 0;
-    private DicBean.DataDTO curColor, curEnergy;
+    private DicBean.DataDTO curColor,curEnergy;
     private TextView zj_name, zjimg_name, zjimg2_name, zj_name2, zj_name3;
     private TextView name1, name2, name3, name4, value5, value6;
-    private EditText value1, value2, value3, value4, value7;
+    private EditText value1, value2, value3, value4,value7;
     private Button submit;
     private ImageView img1, img2, img3, type_img;
     private TextView u_img, u_img2, u_img3;
-    private LinearLayout llColor, llType, llCarName;
+    private LinearLayout llColor, llType,llCarName;
     private CardView there_div;
     private BaseRecyclerView brv;
     //
@@ -131,7 +117,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
     private String url2 = "";
     private String url3 = "";
     private boolean[] keys = {false, false, false};
-    private boolean key = true;
 
     public void FalseKeys() {
         for (int i = 0; i < keys.length; i++) {
@@ -154,8 +139,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 break;
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("driverAuthIdCard") != null || CacheGroup.cacheList.get("driverAuthLicense") != null
-                        || CacheGroup.cacheList.get("saveVehicleLicense") != null || CacheGroup.cacheList.get("authUrl") != null
+                        || CacheGroup.cacheList.get("saveVehicleLicense") != null || CacheGroup.cacheList.get("saveDrawCar") != null) {
-                        || CacheGroup.cacheList.get("saveDrawCar") != null) {
                     if (CacheGroup.cacheList.get("driverAuthIdCard") != null) {
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthIdCard"), BaseBean.class);
                         if (bb.getCode() == 200) {
@@ -177,16 +161,12 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthLicense"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
+                            finish();
 
-                            //上传驾驶证信息页面 进行实名认证操作
+                            //上传驾驶证信息页面 跳转资格证信息页面
-                            if (key) {
+                            Intent in = new Intent(con, AuthQualificationActivity.class);
-                                key = false;
+                            in.putExtra("type", "0");
-                                new AuthRequest().getAuthUrl(con, hd);
+                            startActivity(in);
-                                new Handler().postDelayed(() -> {
-                                    key = true;
-                                }, 3000);
-                            }
-
 
                         } else {
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -194,104 +174,40 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         CacheGroup.cacheList.remove("driverAuthLicense");
                     }
 
-                    if (CacheGroup.cacheList.get("authUrl") != null) {
-                        Log.e("url", CacheGroup.cacheList.get("authUrl"));
-                        BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
-                        if (bb.getCode() == 200) {
-                            EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
-                        } else {
-                            Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
-                        }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
-                        CacheGroup.cacheList.remove("authUrl");
-                    }
-
                     if (CacheGroup.cacheList.get("saveVehicleLicense") != null) {
                         CarZhengBean czb = gson.fromJson(CacheGroup.cacheList.get("saveVehicleLicense"), CarZhengBean.class);
                         if (czb.getCode() == 200) {
-                            String needUpQCPhoto = czb.getData().getNeedUpQCPhoto();//是否需要上传从业资格证
-                            String isTrailer = czb.getData().getIsTrailer();//是否需要上传挂车
-                            String needUpRLPhoto = czb.getData().getNeedUpRLPhoto();//是否需要上传道路运输证到
                             Toast.makeText(con, "车辆行驶证保存成功", Toast.LENGTH_SHORT).show();
-
+                            finish();
                             VehicleEvent ve = new VehicleEvent(String.valueOf(czb.getData().getCarId()));
                             EventBus.getDefault().post(ve);
 
-                            // TODO: 2023/8/23
+                            //上传行驶证信息后 跳转车辆照片页面
-                            if ("1".equals(isTrailer)) {//判断是否跳转挂车行驶证
+                            Intent in = new Intent(con, PhotoCarActivity.class);
-                                Intent in = new Intent(con, CertificatesActivity.class);
+                            in.putExtra("type", 0);
-                                in.putExtra("index", 3);
+                            in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
-                                in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
+                            con.startActivity(in);
-                                startActivity(in);
-                            } else if ("1".equals(needUpQCPhoto)) {//判断是否跳转从业资格证
-                                Intent in = new Intent(con, AuthQualificationActivity.class);
-                                in.putExtra("type", "0");
-                                in.putExtra("isOverCar", true);
-                                in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
-                                startActivity(in);
-                            } else if ("1".equals(needUpRLPhoto)) {//判断是否跳转道路运输许可证
-                                Intent in = new Intent(con, PhotoCarActivity.class);
-                                in.putExtra("type", 3);
-                                in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
-                                startActivity(in);
-                            } else {
-                                //跳转成功页面
-                                Intent in = new Intent(con, AddCarSuccActivity.class);
-                                in.putExtra("type", 3);
-                                in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
-                                con.startActivity(in);
-                            }
-                            finish();
-//                            if ("1".equals(needUpQCPhoto)) {
-//                                //现逻辑：上传行驶证信息后 判断是否跳转从业资格证
-//                                Intent in = new Intent(con, AuthQualificationActivity.class);
-//                                in.putExtra("type", "0");
-//                                in.putExtra("isOverCar", false);
-//                                in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
-//                                startActivity(in);
-//                            } else {
-//                                //原逻辑：上传行驶证信息后 跳转车辆照片页面
-//                                Intent in = new Intent(con, PhotoCarActivity.class);
-//                                in.putExtra("type", 0);
-//                                in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
-//                                con.startActivity(in);
-//                            }
-
-
                         } else {
                             Toast.makeText(con, czb.getMsg(), Toast.LENGTH_SHORT).show();
                         }
                         CacheGroup.cacheList.remove("saveVehicleLicense");
                     }
                     if (CacheGroup.cacheList.get("saveDrawCar") != null) {
-                        Log.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
+                        LogUtil.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
-                        CarZhengBean bb = gson.fromJson(CacheGroup.cacheList.get("saveDrawCar"), CarZhengBean.class);
+                        BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("saveDrawCar"), BaseBean.class);
                         if (bb.getCode() == 200) {
-                            String needUpQCPhoto = bb.getData().getNeedUpQCPhoto();
-                            String needUpRLPhoto = bb.getData().getNeedUpRLPhoto();//是否需要上传道路运输证到
                             Toast.makeText(con, "挂车信息保存成功", Toast.LENGTH_SHORT).show();
                             finish();
                             VehicleEvent ve = new VehicleEvent("挂");
                             EventBus.getDefault().post(ve);
 
-                            if ("1".equals(needUpQCPhoto)) {
+                            //挂车信息保存成功跳转成功页面
-                                //现逻辑：上传挂车保信息后 判断是否跳转从业资格证
+                            Intent in = new Intent(con, AddCarSuccActivity.class);
-                                Intent in = new Intent(con, AuthQualificationActivity.class);
+                            in.putExtra("type", 3);
-                                in.putExtra("type", "0");
+                            in.putExtra("carId", carId);
-                                in.putExtra("carId", carId);
+                            con.startActivity(in);
-                                in.putExtra("isOverCar", true);
+
-                                startActivity(in);
+
-                            } else if ("1".equals(needUpRLPhoto)) {//现判断是否跳转道路运输许可证
-                                Intent in = new Intent(con, PhotoCarActivity.class);
-                                in.putExtra("type", 3);
-                                in.putExtra("carId", carId);
-                                startActivity(in);
-                            } else {
-                                //原逻辑：挂车信息保存成功跳转成功页面
-                                Intent in = new Intent(con, AddCarSuccActivity.class);
-                                in.putExtra("type", 3);
-                                in.putExtra("carId", carId);
-                                con.startActivity(in);
-                            }
                         } else {
                             Toast.makeText(con, "挂车信息保存失败", Toast.LENGTH_SHORT).show();
                         }
@@ -299,7 +215,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
                 } else if (CacheGroup.cacheList.get(CAR_COLOR) != null) {
                     DicBean bb = gson.fromJson(CacheGroup.cacheList.get(CAR_COLOR), DicBean.class);
-                    if (bb.getCode() == 200) {
+                    if (bb.getCode()==200){
                         PickerUtils.getInstance().pickSingle(this, "车牌颜色", bb.getData(), new OnOptionPickedListener() {
                             @Override
                             public void onOptionPicked(int position, Object item) {
@@ -313,7 +229,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove(CAR_COLOR);
                 } else if (CacheGroup.cacheList.get(CAR_ENERGY_TYPE) != null) {
                     DicBean bb = gson.fromJson(CacheGroup.cacheList.get(CAR_ENERGY_TYPE), DicBean.class);
-                    if (bb.getCode() == 200) {
+                    if (bb.getCode()==200){
                         PickerUtils.getInstance().pickSingle(this, "燃油类型", bb.getData(), new OnOptionPickedListener() {
                             @Override
                             public void onOptionPicked(int position, Object item) {
@@ -325,16 +241,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         });
                     }
                     CacheGroup.cacheList.remove(CAR_ENERGY_TYPE);
-                } else if (CacheGroup.cacheList.get("authUrl") != null) {
-                    //实名认证校验
-                    Log.e("url", CacheGroup.cacheList.get("authUrl"));
-                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
-                    if (bb.getCode() == 200) {
-                        EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
-                    } else {
-                        Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
-                    }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
-                    CacheGroup.cacheList.remove("authUrl");
                 } else {
                     initView(null);
                     initData();
@@ -355,7 +261,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_shangchuan_xsz);
-        EventBus.getDefault().register(this);
         llColor = findViewById(R.id.llColor);
         llCarName = findViewById(R.id.llCarName);
         llType = findViewById(R.id.llType);
@@ -423,8 +328,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 break;
             case 2:
                 llCarName.setVisibility(View.GONE);
-//                llColor.setVisibility(View.VISIBLE);
+                llColor.setVisibility(View.VISIBLE);
-//                llType.setVisibility(View.VISIBLE);
+                llType.setVisibility(View.VISIBLE);
                 type_img.setImageResource(R.mipmap.auth_icon_3);
 //                there_div.setVisibility(View.VISIBLE);
                 if (c_str != null && !c_str.equals("")) {
@@ -463,12 +368,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         img1.setOnClickListener(v -> {
             if (!url1.equals("")) {
                 new XPopup.Builder(con)
-                        .asImageViewer(img1, url1, new SmartGlideImageLoader(R.mipmap.ic_launcher_round))
+                        .asImageViewer(img1, url1, true, -1, -1, 50, false, new ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
+            }else{
-//                        .asImageViewer(img1, url1, true, -1, -1, 50, false, new ImageLoader())
-//                        .show();
-            } else {
                 if (!isAuth) {
                     FalseKeys();
                     keys[0] = true;
@@ -480,12 +382,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         img2.setOnClickListener(v -> {
             if (!url2.equals("")) {
                 new XPopup.Builder(con)
-                        .asImageViewer(img2, url2, new SmartGlideImageLoader(R.mipmap.ic_launcher_round))
+                        .asImageViewer(img2, url2, true, -1, -1, 50, false, new ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
+            }else{
-//                        .asImageViewer(img2, url2, true, -1, -1, 50, false, new ImageLoader())
-//                        .show();
-            } else {
                 if (!isAuth) {
                     FalseKeys();
                     keys[1] = true;
@@ -527,11 +426,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 gia.showPopueWindow(this);
             } else if (!url3.equals("")) {
                 new XPopup.Builder(con)
-                        .asImageViewer(img3, url3, new SmartGlideImageLoader(R.mipmap.ic_launcher_round))
+                        .asImageViewer(img3, url3, true, -1, -1, 50, false, new ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
-//                        .asImageViewer(img3, url3, true, -1, -1, 50, false, new ImageLoader())
-//                        .show();
             }
         });
         value5.setOnClickListener(v -> {
@@ -559,21 +455,11 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         startActivity(in1);
                         break;
                     case 1:
-                        //传驾驶证信息页面 跳转实名认证
+                        finish();
-//                        finish();
-                        if (key) {
-                            key = false;
-                            new AuthRequest().getAuthUrl(con, hd);
-                            new Handler().postDelayed(() -> {
-                                key = true;
-                            }, 3000);
-                        }
-
                         //上传驾驶证信息页面 跳转资格证信息页面
-//                        finish();
+                        Intent in2 = new Intent(con, AuthQualificationActivity.class);
-//                        Intent in2 = new Intent(con, AuthQualificationActivity.class);
+                        in2.putExtra("type", "0");
-//                        in2.putExtra("type", "0");
+                        startActivity(in2);
-//                        startActivity(in2);
                         break;
                     case 2:
                         finish();
@@ -588,12 +474,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         });
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
     boolean isAuth = false;
 
     public void initData() {
@@ -659,7 +539,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 3:
-                Log.e("挂车信息", gson.toJson(cdb));
+                LogUtil.e("挂车信息", gson.toJson(cdb));
                 if (cdb != null && cdb.getData().getTrailerResVo() != null) {
                     url1 = StringUtil.isNull(cdb.getData().getTrailerResVo().getFrontImage(), "");
                     url2 = StringUtil.isNull(cdb.getData().getTrailerResVo().getBackImage(), "");
@@ -691,7 +571,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 12 && resultCode == RESULT_OK) {
             path = gia.getFile().getPath();
-            Log.e("图片地址:", path);
+            LogUtil.e("图片地址:", path);
             gia.dis();
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -704,7 +584,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     paths = image.getPath();
                 }
                 path = paths;
-                Log.e("图片地址:", path);
+                LogUtil.e("图片地址:", path);
                 gia.dis();
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
@@ -751,9 +631,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         Glide.with(con).load(url2).into(img2);
                         startTime = ocbb.getData().getStartTime();
                         backId = ocbb.getData().getId();
-
-                        //自动调取提交功能，实现页面自动跳转
-                        subimt();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
                     }
@@ -785,8 +662,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         url2 = odlb.getData().getUrl();
                         backId = odlb.getData().getId();
                         Glide.with(con).load(url2).into(img2);
-                        //自动调取提交功能，实现页面自动跳转
-                        subimt();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
                     }
@@ -797,7 +672,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
             case 2:
                 //{"车牌号","车辆类型","所有人","车辆识别代码"}
                 if (CacheGroup.cacheList.get(TYPE_NAME[2]) != null) {
-                    Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
+                    LogUtil.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
                     olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class);
                     if (olb.getCode() == 200) {
                         url1 = olb.getData().getUrl();
@@ -808,7 +683,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         fontId = olb.getData().getId();
                         Glide.with(con).load(url1).into(img1);
                         oCrcarId = olb.getData().getCarId() + "";
-                        Log.e("-cardId-", oCrcarId);
+                        LogUtil.e("-cardId-", oCrcarId);
                     } else {
                         Toast.makeText(con, olb.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -820,8 +695,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         url2 = oblb.getData().getUrl();
                         backId = oblb.getData().getId();
                         Glide.with(con).load(url2).into(img2);
-                        //自动调取提交功能，实现页面自动跳转
-                        subimt();
                     } else {
                         Toast.makeText(con, oblb.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -856,7 +729,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 if (keys[0]) {
                     new OCRRequest().OCRCard(con, hd, new File(path));
                 } else {
-                    Log.e("res" + new File(path).getName(), new File(path).getPath());
+                    LogUtil.e("res" + new File(path).getName(), new File(path).getPath());
                     new OCRRequest().OCRCardBack(con, hd, new File(path));
                 }
                 break;
@@ -883,7 +756,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 3:
-                Log.e("添加挂车", "挂车" + oCrcarId);
+                LogUtil.e("添加挂车", "挂车" + oCrcarId);
                 if (keys[0]) {
                     new OCRRequest().OCRVehicleLicense(con, hd, new File(path));
                 } else if (keys[1]) {
@@ -937,7 +810,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 //olb
                 //{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
                 if (odl != null && odlb != null) {
-                    Log.e("ocr", new Gson().toJson(odl));
+                    LogUtil.e("ocr", new Gson().toJson(odl));
                     LicenseInputBean iib = new LicenseInputBean();
                     iib.setArchivesName(str1);
                     iib.setDriverLicenseName(value7.getText().toString());
@@ -954,10 +827,10 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 break;
             case 2:
                 if (olb != null && oblb != null) {
-//                    if (curColor == null || curEnergy == null) {
+                    if (curColor==null||curEnergy==null){
-//                        Toast.makeText(con, "请完善内容", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,"请完善内容",Toast.LENGTH_SHORT).show();
-//                        return;
+                        return;
-//                    }
+                    }
                     HashMap<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
@@ -967,8 +840,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     map.put("type", str2);
                     map.put("owner", str3);
                     map.put("vehicleNumber", str4);
-//                    map.put("carPlateColor", curColor.getValue());
+                    map.put("carPlateColor", curColor.getValue());
-//                    map.put("carEnergyTyp", curEnergy.getValue());
+                    map.put("carEnergyTyp", curEnergy.getValue());
                     new AuthRequest().saveVehicleLicense(con, hd, MapUtil.mapJson(map));
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();
@@ -1001,61 +874,27 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         }
     }
 
-    public static void personEvent(String msg) {
+    public static void personEvent(String msg){
-        PersonEvent he = new PersonEvent(msg);
+        PersonEvent he=new PersonEvent(msg);
         EventBus.getDefault().post(he);
     }
 
-    @Subscribe
+    public static class ImageLoader implements XPopupImageLoader {
-    public void processResult(AuthEvent auth) {
+        @Override
-        //添加实名/意愿/签署完成之后的逻辑
+        public void loadImage(int position, @NonNull Object url, @NonNull ImageView imageView) {
-        Log.e("-回调信息-", auth.result);
+            //必须指定Target.SIZE_ORIGINAL，否则无法拿到原图，就无法享用天衣无缝的动画
-        JSONObject jsonObject = JSON.parseObject(auth.result);
+            Glide.with(imageView).load(url).apply(new RequestOptions().placeholder(R.mipmap.ic_launcher_round).override(Target.SIZE_ORIGINAL)).into(imageView);
-        if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
+        }
-            EsignSdk.getInstance().finishH5Activity();
-            new MessageUtils().showSimCenPop(con, "个人信息上传成功，请添加车辆信息!", () -> {
-                finish();
-                Intent in = new Intent(con, CertificatesActivity.class);
-                in.putExtra("index", 2);
-                startActivity(in);
 
-            });
+        @Override
-            if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
+        public File getImageFile(@NonNull Context context, @NonNull Object uri) {
-                Toast.makeText(con, "签署场景成功", Toast.LENGTH_SHORT).show();
+            try {
-            } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
+                return Glide.with(context).downloadOnly().load(uri).submit().get();
-                Toast.makeText(con, "实名认证成功", Toast.LENGTH_SHORT).show();
+            } catch (Exception e) {
-            } else {
+                e.printStackTrace();
-                Toast.makeText(con, "意愿认证成功", Toast.LENGTH_SHORT).show();
             }
-        } else {
+            return null;
-            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();
         }
     }
 
-//    public static class ImageLoader implements XPopupImageLoader {
-//        @Override
-//        public void loadImage(int position, @NonNull Object url, @NonNull ImageView imageView) {
-//            //必须指定Target.SIZE_ORIGINAL，否则无法拿到原图，就无法享用天衣无缝的动画
-//            Glide.with(imageView).load(url).apply(new RequestOptions().placeholder(R.mipmap.ic_launcher_round).override(Target.SIZE_ORIGINAL)).into(imageView);
-//        }
-//
-//        @Override
-//        public File getImageFile(@NonNull Context context, @NonNull Object uri) {
-//            try {
-//                return Glide.with(context).downloadOnly().load(uri).submit().get();
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//            return null;
-//        }
-//    }
-
 }

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

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
-import android.util.Log;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -15,9 +14,9 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.arpa.hndahesudintocctmsdriver.H5Activity;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.bumptech.glide.Glide;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
@@ -41,7 +40,6 @@ import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
 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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -94,18 +92,13 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove("upHeadImg");
                 }
                 if (CacheGroup.cacheList.get("authUrl") != null) {
-                    Log.e("url", CacheGroup.cacheList.get("authUrl"));
+                    LogUtil.e("url", CacheGroup.cacheList.get("authUrl"));
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
                     if (bb.getCode() == 200) {
-
-//                        Intent intent = new Intent(this, H5Activity.class);
-//                        intent.putExtra("url", (String) bb.getData());
-//                        intent.putExtra("view_file", false);
-//                        startActivity(intent);
                         EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
-                    }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
+                    }//LogUtil.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
                 }
                 break;
@@ -168,8 +161,6 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
 //            startActivityForResult(in, 12);
             //EsignSdk.getInstance().startH5Activity(act,"https://smlh5.esign.cn/usercenterFront/oemAuth/v3/realName/index?contextKey=b7b103b15b866ec4c72beef1dfe20828&appId=7438873235");
             if (key) {
-//                EsignSdk.getInstance().startH5Activity(act, "");
-
                 key = false;
                 new AuthRequest().getAuthUrl(con, hd);
                 new Handler().postDelayed(() -> {
@@ -184,11 +175,8 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
         up_head.setOnClickListener(v -> {
             if (ub.getData().getHeadportraitUrl() != null && !ub.getData().getHeadportraitUrl().equals("")) {
                 new XPopup.Builder(con)
-                        .asImageViewer(up_head, ub.getData().getHeadportraitUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                        .asImageViewer(up_head, ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
-//                        .asImageViewer(up_head, ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
-//                        .show();
             }
         });
         hyr = new HuoYuanRequset(con, hd);
@@ -218,7 +206,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
 
     @Subscribe
     public void personResult(PersonEvent home) {
-        Log.e("-res-", home.getMessage());
+        LogUtil.e("-res-", home.getMessage());
         if (ur != null) {
             ur.User();
         }
@@ -235,7 +223,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 12 && resultCode == RESULT_OK) {
             path = gia.getFile().getPath();
-            Log.e("图片地址:", path);
+            LogUtil.e("图片地址:", path);
             gia.dis();
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -247,7 +235,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
                     paths = image.getPath();
                 }
                 path = paths;
-                Log.e("图片地址:", path);
+                LogUtil.e("图片地址:", path);
                 gia.dis();
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
@@ -269,7 +257,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
     @Subscribe
     public void processResult(AuthEvent auth) {
         //添加实名/意愿/签署完成之后的逻辑
-        Log.e("-回调信息-", auth.result);
+        LogUtil.e("-回调信息-", auth.result);
         JSONObject jsonObject = JSON.parseObject(auth.result);
         if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
             if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {

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

@@ -27,6 +27,7 @@ import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
 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.log.LogUtil;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
@@ -36,7 +37,6 @@ 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;
@@ -53,12 +53,12 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
     private String[] name1 = {"车辆照片", "NFC照片", "车辆登记证书照片", "道路运输许可证照片"};
     private String[] name2 = {"请上传车辆照片", "请上传NFC照片", "请上传车辆登记证书照片", "请上传道路运输许可证照片"};
     private Boolean[] isShowEdit = {false, false, true, true};
-    private Boolean[] isShowSkip = {true, false, false, true};
+    private Boolean[] isShowSkip = {true, false, false, false};
     private String[] tips = {
             "",
             "*注意: 没有粘贴NFC芯片的车辆无需上传,可直接跳过",
             "*注意: 没有可直接跳过,等候下次上传",
-            "*注意: 4.5吨以下车辆不需要上传,可直接跳过"};
+            "*注意: 4.5吨一下车辆不需要上传,可直接跳过"};
 
 
     private BaseRecyclerView brv;
@@ -83,7 +83,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         switch (m.what) {
             case 200:
                 if (CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL) != null) {
-                    Log.e("--res--", CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
+                    LogUtil.e("--res--", CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
                     cdb = gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL), CarDelBean.class);
                     if (cdb.getCode() == 200) {
                         showImgToView();
@@ -139,7 +139,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     CacheGroup.cacheList.remove("saveCarImg");
                 }
                 if (CacheGroup.cacheList.get("saveCarRegisterNo") != null) {
-                    Log.e("is", CacheGroup.cacheList.get("saveCarRegisterNo"));
+                    LogUtil.e("is", CacheGroup.cacheList.get("saveCarRegisterNo"));
                     IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRegisterNo"), IsAuthDriverAuthQualificationBean.class);
                     if (ib.getCode() == 200) {
                         finish();
@@ -154,17 +154,12 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                 }
 
                 if (CacheGroup.cacheList.get("saveCarRoadLicenseNo") != null) {
-                    Log.e("is", CacheGroup.cacheList.get("saveCarRoadLicenseNo"));
+                    LogUtil.e("is", CacheGroup.cacheList.get("saveCarRoadLicenseNo"));
                     IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRoadLicenseNo"), IsAuthDriverAuthQualificationBean.class);
                     if (ib.getCode() == 200) {
                         //判断是否需要跳转挂车行驶证页面
-                        if (!"".equals(carId) ){
+                        if (!"".equals(carId) && cdb.getData().getIsTrailer() == 1) {
-                            if (cdb.getData().getIsTrailer() == 1&&!TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车，并且传过挂车直接结束
+                            if (!"".equals(carId)) {
-                                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();
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
@@ -173,41 +168,15 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                     in.putExtra("cheData", new Gson().toJson(cdb));
                                 }
                                 startActivity(in);
-                            }else if(cdb.getData().getIsTrailer() == 0){//不需要挂车
+                            } else {
-                                if ("1".equals(cdb.getData().getNeedUpQCPhoto())){//需要从业资格证
+                                Toast.makeText(con, "请先绑定行驶证", Toast.LENGTH_SHORT).show();
-                                    Intent in = new Intent(con, AuthQualificationActivity.class);
-                                    in.putExtra("type", "0");
-                                    in.putExtra("carId", carId);
-                                    in.putExtra("isOverCar", false);
-                                    startActivity(in);
-                                }else{
-                                    finish();
-                                    Intent in = new Intent(con, AddCarSuccActivity.class);
-                                    in.putExtra("type", 3);
-                                    con.startActivity(in);
-                                }
                             }
+                        } else {
+                            finish();
+                            Intent in = new Intent(con, AddCarSuccActivity.class);
+                            in.putExtra("type", 3);
+                            con.startActivity(in);
                         }
-
-//                        if (!"".equals(carId) && cdb.getData().getIsTrailer() == 1) {
-//                            if (!"".equals(carId)) {
-//                                finish();
-//                                Intent in = new Intent(con, CertificatesActivity.class);
-//                                in.putExtra("index", 3);
-//                                in.putExtra("carId", carId);
-//                                if (cdb != null) {
-//                                    in.putExtra("cheData", new Gson().toJson(cdb));
-//                                }
-//                                startActivity(in);
-//                            } else {
-//                                Toast.makeText(con, "请先绑定行驶证", Toast.LENGTH_SHORT).show();
-//                            }
-//                        } else {
-//                            finish();
-//                            Intent in = new Intent(con, AddCarSuccActivity.class);
-//                            in.putExtra("type", 3);
-//                            con.startActivity(in);
-//                        }
                     } else {
                         Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -272,7 +241,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 12 && resultCode == RESULT_OK) {
             path = gia.getFile().getPath();
-            Log.e("图片地址:", path);
+            LogUtil.e("图片地址:", path);
             gia.dis();
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -285,7 +254,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     paths = image.getPath();
                 }
                 path = paths;
-                Log.e("图片地址:", path);
+                LogUtil.e("图片地址:", path);
                 gia.dis();
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
@@ -319,42 +288,30 @@ 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(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
                             .show();
-//                    new XPopup.Builder(con)
-//                            .asImageViewer(img, cdb.getData().getCarImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
-//                            .show();
                 }
                 break;
             case 1:
                 if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getNfcImage().equals("")) {
                     new XPopup.Builder(con)
-                            .asImageViewer(img, cdb.getData().getNfcImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                            .asImageViewer(img, cdb.getData().getNfcImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
                             .show();
-//                    new XPopup.Builder(con)
-//                            .asImageViewer(img, cdb.getData().getNfcImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
-//                            .show();
                 }
                 break;
             case 2:
                 if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getRegisterImage().equals("")) {
                     new XPopup.Builder(con)
-                            .asImageViewer(img, cdb.getData().getRegisterImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                            .asImageViewer(img, cdb.getData().getRegisterImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
                             .show();
-//                    new XPopup.Builder(con)
-//                            .asImageViewer(img, cdb.getData().getRegisterImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
-//                            .show();
                 }
                 break;
             case 3:
                 if (cdb.getData().getRoadLicensePhoto() != null && !"".equals(cdb.getData().getRoadLicensePhoto())) {
                     //roadLicensePhoto
                     new XPopup.Builder(con)
-                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
                             .show();
-//                    new XPopup.Builder(con)
-//                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
-//                            .show();
 
                     break;
                 }
@@ -376,8 +333,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                 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", 1);
-                    in.putExtra("type", 3);
                     in.putExtra("carId", carId);
                     con.startActivity(in);
                 } else{
@@ -394,7 +350,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
             case 2:
                 String s = value1.getText().toString();
                 if (TextUtils.isEmpty(s)) {
-                    Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请完善证号", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 new AuthRequest().saveCarRegisterNo(con,hd,carId,s);
@@ -402,7 +358,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
             case 3:
                 String s1 = value1.getText().toString();
                 if (TextUtils.isEmpty(s1)) {
-                    Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请完善证号", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 new AuthRequest().saveCarRoadLicenseNo(con,hd,carId,s1);
@@ -470,8 +426,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         if (0 == type) {
             finish();
             Intent in = new Intent(con, PhotoCarActivity.class);
-//            in.putExtra("type", 1);
+            in.putExtra("type", 1);
-            in.putExtra("type", 3);
             in.putExtra("carId", carId);
             con.startActivity(in);
         } else if (1 == type) {

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

@@ -15,6 +15,7 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -33,7 +34,6 @@ import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 
 import org.greenrobot.eventbus.EventBus;
@@ -65,7 +65,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove(CAR_AUDIO);
                 }
                 if(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL)!=null){
-                    Log.e("--res--",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
+                    LogUtil.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);
@@ -159,7 +159,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
         refreshLayout=findViewById(R.id.srl);
         carId=getIntent().getExtras().getString("carId");
         ur=new UserRequset(con,hd);
-        Log.e("--carId--",carId+"--");
+        LogUtil.e("--carId--",carId+"--");
         initRefreshLoad();
     }
 
@@ -222,11 +222,8 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
             carImage.setOnClickListener(v14 -> {
                 if(cdb!=null && cdb.getData()!=null && cdb.getData().getCarImage()!=null && !cdb.getData().getCarImage().equals("")){
                     new XPopup.Builder(con)
-                            .asImageViewer(carImage,cdb.getData().getCarImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                            .asImageViewer(carImage,cdb.getData().getCarImage(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
                             .show();
-//                    new XPopup.Builder(con)
-//                            .asImageViewer(carImage,cdb.getData().getCarImage(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
-//                            .show();
                 }
             });
             r1.setOnClickListener(v12 -> {
@@ -340,7 +337,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
         super.onActivityResult(requestCode, resultCode, data);
          if (requestCode == 12 && resultCode == RESULT_OK) {
             path=gia.getFile().getPath();
-            Log.e("图片地址:",path);
+            LogUtil.e("图片地址:",path);
             gia.dis();
             ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -353,7 +350,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     paths = image.getPath();
                 }
                 path=paths;
-                Log.e("图片地址:",path);
+                LogUtil.e("图片地址:",path);
                 gia.dis();
                 ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
             }
@@ -368,7 +365,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
     public void initRefreshLoad(){
         refreshLayout=findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新","pps");
+            LogUtil.e("下拉刷新","pps");
             if("".equals(carId)){
                 initView(null);
                 refreshLayout.finishRefresh();
@@ -386,7 +383,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
 
     @Subscribe
     public void  processResult(VehicleEvent event) {
-        Log.e("-msg-",event.getMessage());
+        LogUtil.e("-msg-",event.getMessage());
         if(!"挂".equals(event.getMessage())) {
             carId = event.getMessage();
         }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/BusinessActivity.java

@@ -2,7 +2,6 @@ package com.arpa.hndahesudintocctmsdriver.ui.business;
 
 import android.os.Bundle;
 import android.os.Message;
-import android.text.TextUtils;
 import android.util.Log;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -10,15 +9,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.amap.api.services.core.AMapException;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
-import com.amap.api.services.core.LatLonPoint;
-import com.amap.api.services.core.PoiItem;
-import com.amap.api.services.core.SuggestionCity;
-import com.amap.api.services.poisearch.PoiResult;
-import com.amap.api.services.poisearch.PoiSearch;
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
-import com.dahe.mylibrary.utils.ImageLoader;
-import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BusinessBean;
@@ -49,70 +40,53 @@ import okhttp3.Response;
  * @date 2021/9/6 9:59
  * @description:
  */
-public class BusinessActivity extends BaseActivity implements PoiSearch.OnPoiSearchListener {
+public class BusinessActivity extends BaseActivity {
 
     private BaseRecyclerView business_type;
     private BaseRecyclerView business_list;
     private LocationGDUtil ld;
     private TextView address;
     private BusinessListBean blb;
-    private Gson gson = new Gson();
+    private Gson gson=new Gson();
-    private List<Object> bbs = new ArrayList<>();
+    private List<Object> bbs=new ArrayList<>();
     private CustomDialog customDialog;
-    private int sum = 0;
+    private int sum=0;
-    private String type = "餐饮";
+    private String type="餐饮";
-    private PoiSearch.Query query;
-    private List<PoiItem> poiItems;// poi数据
-
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what) {
+        switch (m.what){
             case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("business_list") != null) {
+                if(CacheGroup.cacheList.get("business_list")!=null){
-                    Log.e("--res--", CacheGroup.cacheList.get("business_list") + "");
+                    LogUtil.e("--res--",CacheGroup.cacheList.get("business_list")+"");
-                    blb = gson.fromJson(CacheGroup.cacheList.get("business_list"), BusinessListBean.class);
+                    blb=gson.fromJson(CacheGroup.cacheList.get("business_list"),BusinessListBean.class);
-                    if (blb.getCode() == 200) {
+                    if(blb.getCode()==200){
                         forGetBusDel();
-                    } else {
+                    }else{
-                        Toast.makeText(con, blb.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,blb.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("business_list");
                 }
                 break;
             case LocationGDUtil.RES:
                 address.setText(ld.getAddress());
-//                new BusinessRequest().GetBusinessList(con,hd,ld.getLongitude()+"",ld.getLatitude()+"",type);
+                new BusinessRequest().GetBusinessList(con,hd,ld.getLongitude()+"",ld.getLatitude()+"",type);
-
-                try {
-                    customDialog.dismiss();
-                    LatLonPoint lp = new LatLonPoint(ld.getLatitude(), ld.getLongitude());
-                    PoiSearch poiSearch = new PoiSearch(this, query);
-                    poiSearch.setOnPoiSearchListener(this);
-                    poiSearch.setBound(new PoiSearch.SearchBound(lp, 5000, true));//
-                    // 设置搜索区域为以lp点为圆心，其周围5000米范围
-                    poiSearch.searchPOIAsyn();// 异步搜索
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-
                 break;
             case 2:
-                BusinessBean.DataDTO bds = gson.fromJson((String) m.obj, BusinessBean.DataDTO.class);
+                BusinessBean.DataDTO bds=gson.fromJson((String) m.obj,BusinessBean.DataDTO.class);
                 bbs.add(bds);
                 initBusListDel();
                 break;
             case 3:
-                Log.e("aaa", (String) m.obj);
+                LogUtil.e("aaa",(String) m.obj);
-                BusinessBean.DataDTO bd = gson.fromJson((String) m.obj, BusinessBean.DataDTO.class);
+                BusinessBean.DataDTO bd=gson.fromJson((String) m.obj,BusinessBean.DataDTO.class);
 
-                if (bd != null) {
+                if(bd!=null){
                     //if (BeanUtil.isBean(bd.getClass())) {
                     try {
                         business_list.addItemV(bd);
-                    } catch (Exception e) {
+                    }catch (Exception e){
-                        Log.e("遇到了", bd.toString());
+                        LogUtil.e("遇到了",bd.toString());
                     }
                     //}
                 }
@@ -125,130 +99,71 @@ public class BusinessActivity extends BaseActivity implements PoiSearch.OnPoiSea
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_business);
-        con = this;
+        con=this;
-        business_type = findViewById(R.id.business_type);
+        business_type=findViewById(R.id.business_type);
-        business_list = findViewById(R.id.business_list);
+        business_list=findViewById(R.id.business_list);
-        address = findViewById(R.id.address);
+        address=findViewById(R.id.address);
         try {
-            type = getIntent().getExtras().getString("type");
+            type=getIntent().getExtras().getString("type");
-        } catch (Exception e) {
+        }catch (Exception e){
-            type = "餐饮";
+            type="餐饮";
         }
         initView(null);
-        customDialog = new CustomDialog(con, "正在定位...");
+        customDialog=new CustomDialog(con, "正在定位...");
         customDialog.show();
-        ld = new LocationGDUtil(con, hd);
+        ld=new LocationGDUtil(con,hd);
         ld.onCreate();
-
-        changeType(type);
-
     }
 
-    List<Object> list_type = new ArrayList<>();
+    List<Object> list_type=new ArrayList<>();
-
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        list_type.add(new Model("餐饮", R.mipmap.icon_canguan));
+        list_type.add(new Model("餐饮",R.mipmap.icon_canguan));
-        list_type.add(new Model("住宿", R.mipmap.icon_jiudian));
+        list_type.add(new Model("住宿",R.mipmap.icon_jiudian));
-        list_type.add(new Model("商店", R.mipmap.icon_shangdian));
+        list_type.add(new Model("商店",R.mipmap.icon_shangdian));
-        list_type.add(new Model("加油站", R.mipmap.icon_jiayouzhan));
+        list_type.add(new Model("加油站",R.mipmap.icon_jiayouzhan));
-        list_type.add(new Model("汽车维修", R.mipmap.icon_xiuche));
+        list_type.add(new Model("汽车维修",R.mipmap.icon_xiuche));
-        business_type.createG(4, con, list_type, R.layout.item_business_type).setOnItemViewListener((position, o, v) -> {
+        business_type.createG(4,con,list_type,R.layout.item_business_type).setOnItemViewListener((position, o, v) -> {
-            Model m = (Model) o;
+            Model m= (Model) o;
-            ImageView type_img = v.findViewById(R.id.type_icon);
+            ImageView type_img=v.findViewById(R.id.type_icon);
             type_img.setImageResource(m.getType_img());
             v.setOnClickListener(v1 -> {
-                sum = 0;
+                sum=0;
-                bbs = new ArrayList<>();
+                bbs=new ArrayList<>();
-                customDialog = new CustomDialog(con, "正在切换...");
+                customDialog=new CustomDialog(con, "正在切换...");
                 customDialog.show();
-                changeType(m.getType_name());
+                new BusinessRequest().GetBusinessList(con,hd,ld.getLongitude()+"",ld.getLatitude()+"",m.getType_name());
-//                new BusinessRequest().GetBusinessList(con,hd,ld.getLongitude()+"",ld.getLatitude()+"",m.getType_name());
             });
         });
     }
 
-    @Override
+    public void forGetBusDel(){
-    public void onPoiSearched(PoiResult poiResult, int i) {
-        if (poiResult != null && poiResult.getQuery() != null) {// 搜索poi的结果
-            poiItems = poiResult.getPois();// 当搜索不到poiitem数据时，会返回含有搜索关键字的城市信息
-            if (poiItems != null && poiItems.size() > 0) {
-                initBusListDel();
-            } else {
-                ToastUtils.showToast(con, "对不起，没有搜索到相关数据!");
-            }
-        } else {
-            ToastUtils.showToast(con, "对不起，没有搜索到相关数据!");
-        }
-    }
-
-    @Override
-    public void onPoiItemSearched(PoiItem poiItem, int i) {
-        System.out.println(poiItem);
-    }
-
-    private void changeType(String type) {
-        query = new PoiSearch.Query(type, "", "");
-        query.setExtensions("all");
-        query.setPageSize(20);// 设置每页最多返回多少条poiitem
-        query.setPageNum(0);// 设置查第一页
-
-        if (ld.getLatitude() != 0) {
-            try {
-
-                LatLonPoint lp = new LatLonPoint(ld.getLatitude(), ld.getLongitude());
-                PoiSearch poiSearch = new PoiSearch(this, query);
-                poiSearch.setOnPoiSearchListener(this);
-                poiSearch.setBound(new PoiSearch.SearchBound(lp, 5000, true));//
-                // 设置搜索区域为以lp点为圆心，其周围5000米范围
-                poiSearch.searchPOIAsyn();// 异步搜索
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void forGetBusDel() {
         customDialog.dismiss();
         //business_list.remo
-        Log.e("-数组-", gson.toJson(blb));
+        LogUtil.e("-数组-",gson.toJson(blb));
-        for (int i = 0; i < blb.getData().getResults().size(); i++) {
+        for (int i=0;i<blb.getData().getResults().size();i++) {
             //new BusinessRequest().GetBusiness(con,hd,blb.getData().getResults().get(i).getOpenshopid());
-            String url = "https://openapi.dianping.com/router/poiinfo/detailinfo";
+            String url="https://openapi.dianping.com/router/poiinfo/detailinfo";
-            requestGet(url + Md5Util.resDelUrl(blb.getData().getResults().get(i).getOpenshopid()));
+            requestGet(url+Md5Util.resDelUrl(blb.getData().getResults().get(i).getOpenshopid()));
         }
     }
 
 
-    public void initBusListDel() {
+    public void initBusListDel(){
-        customDialog.dismiss();
         //开始渲染
-        business_list.createV(con, poiItems, R.layout.item_business_list).setOnItemViewListener((position, o, v) -> {
+        business_list.createV(con,bbs,R.layout.item_business_list).setOnItemViewListener((position, o, v) -> {
-            PoiItem bd = (PoiItem) o;
+            BusinessBean.DataDTO bd= (BusinessBean.DataDTO) o;
-            ImageView img = v.findViewById(R.id.photo_url);
+            v.setOnClickListener(v1 -> {
-            TextView name = v.findViewById(R.id.name);
-            TextView address = v.findViewById(R.id.address);
-            TextView taste = v.findViewById(R.id.taste);
-
-            if (bd.getPhotos().size() > 0 && !TextUtils.isEmpty(bd.getPhotos().get(0).getUrl())) {
-                ImageLoader.getInstance().loadRoundImage(con, bd.getPhotos().get(0).getUrl(), 10, img);
-            }
-
-            name.setText(bd.getTitle());
-            address.setText(bd.getSnippet());
-            taste.setText(bd.getTel());
-
-//            v.setOnClickListener(v1 -> {
 //                Intent in=new Intent(con, WebActivity.class);
 //                in.putExtra("url",bd.getBusiness_url());
 //                in.putExtra("title",bd.getName());
 //                startActivity(in);
-//            });
+            });
         });
     }
 
-    public void requestGet(String url) {
+    public void requestGet(String url){
         OkHttpClient client = new OkHttpClient().newBuilder()
                 .build();
         Request request = new Request.Builder()
@@ -264,22 +179,22 @@ public class BusinessActivity extends BaseActivity implements PoiSearch.OnPoiSea
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
-                if (response.code() == 200) {
+                if(response.code()==200){
-                    String body = response.body().string();
+                    String body=response.body().string();
-                    Log.e("-body-", body);
+                    LogUtil.e("-body-",body);
-                    BusinessBean bb = gson.fromJson(body, BusinessBean.class);
+                    BusinessBean bb=gson.fromJson(body,BusinessBean.class);
-                    if (bb.getCode() == 200) {
+                    if(bb.getCode()==200){
                         sum++;
                         //bbs.add(bb.getData());
-                        if (sum == 1) {
+                        if(sum==1){
-                            Log.e("--添加--", bbs.size() + "_" + blb.getData().getResults().size());
+                            LogUtil.e("--添加--",bbs.size()+"_"+blb.getData().getResults().size());
-                            MsgUtil.addHdMsgWatBody(hd, 2, gson.toJson(bb.getData()));
+                            MsgUtil.addHdMsgWatBody(hd,2,gson.toJson(bb.getData()));
-                        } else {
+                        }else{
-                            Log.e("--添加--", bbs.size() + "_" + blb.getData().getResults().size());
+                            LogUtil.e("--添加--",bbs.size()+"_"+blb.getData().getResults().size());
-                            MsgUtil.addHdMsgWatBody(hd, 3, gson.toJson(bb.getData()));
+                            MsgUtil.addHdMsgWatBody(hd,3,gson.toJson(bb.getData()));
                         }
                     }
-                } else {
+                }else{
 
                 }
             }
@@ -287,7 +202,8 @@ public class BusinessActivity extends BaseActivity implements PoiSearch.OnPoiSea
     }
 
 
-    class Model {
+
+    class Model{
         private String type_name;
         private int type_img;
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/Md5Util.java

@@ -19,8 +19,8 @@ import java.util.Set;
  * @description:
  */
 public class Md5Util {
-    static String app_key="1000055";
+    static String app_key="3d4c1b5592f9ae09";
-    static String appSecret="4e0d1be81540c4d1f0868d329b3229467f071f6c";
+    static String appSecret="642cc46b385264595df7cce271250a1cb782b39c";
     static String[] strs={"app_key","deviceId","longitude","latitude","keyword","timestamp","format","v","sign_method","session","sign"};
     static String[] strsDel={"app_key","deviceId","openshopid","timestamp","format","v","sign_method","session","sign"};
     public static String resUrl(String longitude,String latitude,String keyword){
@@ -35,7 +35,7 @@ public class Md5Util {
         requestParam.put("format", "json");
         requestParam.put("v", "1");
         requestParam.put("sign_method", "MD5");
-        requestParam.put("session", "c1fc1773a27d47e988725bc6df150626dbda0b4d");
+        requestParam.put("session", "cb2007c78d055247f7f242760173268caef1183a");
         requestParam.put("sign", generateSign(requestParam,appSecret,"MD5"));
         str+="?";
         for(int i=0;i<requestParam.size();i++){

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

@@ -7,7 +7,6 @@ import android.graphics.Outline;
 import android.location.Location;
 import android.os.Bundle;
 import android.os.Message;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -43,14 +42,12 @@ import com.arpa.hndahesudintocctmsdriver.constant.JTTConstant;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
-import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.news.NewActivity;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
-import com.baidu.ocr.ui.camera.CameraActivity;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
-import com.gyf.cactus.Cactus;
 import com.hjq.xtoast.XToast;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.interfaces.OnConfirmListener;
@@ -95,7 +92,6 @@ import com.youth.banner.loader.ImageLoader;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -128,7 +124,6 @@ public class HomeFragment extends BaseFragment {
     private ImageConfig ic;
     private DriverExpireBean deb;
 
-
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
@@ -146,22 +141,13 @@ public class HomeFragment extends BaseFragment {
                     if (ub.getCode() == 200) {
                         SPUtil.insSP(con, "data", "userdata", CacheGroup.cacheList.get("userdata"));
                         MsgUtil.addHdMsgWat(hd, 33);
-
-                        //新用户注册，需弹窗提示注册
-                        if ("0".equals(ub.getData().getRealAuthentication())){
-                            new MessageUtils().showSimCenPop(con, "该司机还未认证，未认证无法接单。是否去注册！", () -> {
-                                Intent in=new Intent(con, CertificatesActivity.class);
-                                in.putExtra("index",0);
-                                startActivity(in);
-                            });
-                        }
                     } else {
                         Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("userdata");
                 }
                 if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER) != null) {
-                    Log.e("--sob--", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
+                    LogUtil.e("--sob--", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
                     sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
                     if (sob.getCode() == 200) {
                         SPUtil.insSP(con, JTTConstant.JTT_DATA_NAME, JTTConstant.JTT_DATA_ORDER_KEY, gson.toJson(sob));
@@ -176,7 +162,7 @@ public class HomeFragment extends BaseFragment {
                     CacheGroup.cacheList.remove(HuoYuanFragmengt.START_ORDER);
                 }
                 if (CacheGroup.cacheList.get("up_app") != null) {
-                    Log.e("up_app", CacheGroup.cacheList.get("up_app"));
+                    LogUtil.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) {
@@ -190,7 +176,7 @@ public class HomeFragment extends BaseFragment {
                     CacheGroup.cacheList.remove("up_app");
                 }
                 if (CacheGroup.cacheList.get("hl") != null) {
-                    Log.e("hl", CacheGroup.cacheList.get("hl"));
+                    LogUtil.e("hl", CacheGroup.cacheList.get("hl"));
                     uab = new Gson().fromJson(CacheGroup.cacheList.get("hl"), HuoYuanListBean.class);
                     if (uab.getCode() == 200) {
                         initOrder();
@@ -212,7 +198,7 @@ public class HomeFragment extends BaseFragment {
                     CacheGroup.cacheList.remove(WoDeFragment.AUTH_DATA);
                 }
                 if (CacheGroup.cacheList.get("dealList") != null) {
-                    Log.e("历史货源", CacheGroup.cacheList.get("dealList"));
+                    LogUtil.e("历史货源", CacheGroup.cacheList.get("dealList"));
                     hdb = gson.fromJson(CacheGroup.cacheList.get("dealList"), HuoYuanListDealBean.class);
                     if (hdb.getCode() == 200) {
                         insDeal();
@@ -231,7 +217,7 @@ public class HomeFragment extends BaseFragment {
                     CacheGroup.cacheList.remove("getImage");
                 }
                 if (CacheGroup.cacheList.get("driverExpire") != null) {
-                    Log.e("过期数据：", CacheGroup.cacheList.get("driverExpire"));
+                    LogUtil.e("过期数据：", CacheGroup.cacheList.get("driverExpire"));
                     deb = gson.fromJson(CacheGroup.cacheList.get("driverExpire"), DriverExpireBean.class);
                     if (deb.getCode() == 200) {
                         Intent in = new Intent(con, WebActivity.class);
@@ -252,7 +238,7 @@ public class HomeFragment extends BaseFragment {
                                     .setDuration(1000 * 60 * 60 * 12)
                                     .setOnClickListener(R.id.img_kf, (toast, view) -> {
                                         toast.startActivity(in);
-                                        Log.e("-is-", view.isInTouchMode() + "");
+                                        LogUtil.e("-is-", view.isInTouchMode() + "");
                                     })
                                     // 设置动画样式
                                     //.setAnimStyle(android.R.style.Animation_Translucent)
@@ -338,20 +324,13 @@ public class HomeFragment extends BaseFragment {
             }
         });
         news_btn.setOnClickListener(v -> {
-            // TODO: 2023/8/30 测试orc拍照
+            if (UiAuxiliary.isLogin(con)) {
-            Intent intent = new Intent(getActivity(), CameraActivity.class);
+                Intent in = new Intent(con, NewActivity.class);
-            intent.putExtra(CameraActivity.KEY_OUTPUT_FILE_PATH,
+                startActivity(in);
-                    new File(getActivity().getFilesDir(), "pic.jpg").getAbsolutePath());
+            } else {
-            intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, CameraActivity.CONTENT_TYPE_ID_CARD_FRONT);
+                Intent in = new Intent(con, LoginActivity.class);
-            startActivityForResult(intent, 1111);
+                startActivity(in);
-
+            }
-//            if (UiAuxiliary.isLogin(con)) {
-//                Intent in = new Intent(con, NewActivity.class);
-//                startActivity(in);
-//            } else {
-//                Intent in = new Intent(con, LoginActivity.class);
-//                startActivity(in);
-//            }
         });
         //Intent serviceIn=new Intent(con, LocationService.class);
         //getActivity().startService(serviceIn);
@@ -366,7 +345,7 @@ public class HomeFragment extends BaseFragment {
                 .setDuration(1000 * 60 * 60 * 12)
                 .setOnClickListener(R.id.img_kf, (toast, view) -> {
                     toast.startActivity(in);
-                    Log.e("-is-", view.isInTouchMode() + "");
+                    LogUtil.e("-is-", view.isInTouchMode() + "");
                 })
                 // 设置动画样式
                 //.setAnimStyle(android.R.style.Animation_Translucent)
@@ -384,7 +363,7 @@ public class HomeFragment extends BaseFragment {
 //                        } catch (UnknownHostException e) {
 //                            e.printStackTrace();
 //                        }
-//                        Log.e("-ip-",":"+str);
+//                        LogUtil.e("-ip-",":"+str);
 //                    }
 //                }.start();
         return root;
@@ -394,7 +373,7 @@ public class HomeFragment extends BaseFragment {
     public void initRefreshLoad() {
         refreshLayout = root.findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新", "pps");
+            LogUtil.e("下拉刷新", "pps");
             keys = true;
             getRequest();
         });
@@ -405,7 +384,6 @@ public class HomeFragment extends BaseFragment {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        Cactus.getInstance().updateNotification(getActivity());
         List<ManyBean> list = new ArrayList<>();
         list.add(new ManyBean(new Model(), R.layout.item_home));
         as = brv.creates(con, list);
@@ -490,7 +468,7 @@ public class HomeFragment extends BaseFragment {
                     case 0:
                         //startActivity(new Intent(con, OrderListActivity.class));
                         PermissionX.init(getActivity())
-                                .permissions(Manifest.permission.ACCESS_FINE_LOCATION)
+                                .permissions(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
                                 .request((allGranted, grantedList, deniedList) -> {
                                     if (allGranted) {
                                         Intent in = new Intent(con, BusinessActivity.class);
@@ -552,9 +530,6 @@ public class HomeFragment extends BaseFragment {
         ur.upApp();
         hyr.getHuoYuan(1, 100);
         ur.getImage(1);
-
-
-
         if (UiAuxiliary.isLogin(con)) {
             ur.User();
             ur.getDriverExpire();
@@ -614,7 +589,7 @@ public class HomeFragment extends BaseFragment {
             if (sob != null && sob.getData() != null && 0 < sob.getData().getWayChildren().size()) {
                 //order_start.setVisibility(View.VISIBLE);
                 SPUtil.insSP(con, "order", "ShippingNoteNumber", sob.getData().getShippingNoteNumber());
-                Log.e("开始轨迹上传服务", "-----");
+                LogUtil.e("开始轨迹上传服务", "-----");
                 orderNum.setText("运单号:" + sob.getData().getShippingNoteNumber());
                 order_state.setText("" + sob.getData().getWaybillStatus());
                 Intent serviceIn = new Intent(con, TrackService.class);
@@ -809,16 +784,14 @@ public class HomeFragment extends BaseFragment {
     private class MyLoader extends ImageLoader {
         @Override
         public void displayImage(Context context, Object path, ImageView imageView) {
-            if (HomeFragment.this != null && getActivity() != null && !getActivity().isDestroyed()) {
+            Glide.with(con).load(path).into(imageView);
-                Glide.with(con).load(path).into(imageView);
-            }
         }
     }
 
     public void addMap(double latitude, double longitude, String title, String price, int id) {
         if (aMap != null) {
-            Log.e("longitude", longitude + "");
+            LogUtil.e("longitude", longitude + "");
-            Log.e("latitude", latitude + "");
+            LogUtil.e("latitude", latitude + "");
             MarkerOptions markerOption = new MarkerOptions();
             markerOption.position(new LatLng(latitude, longitude));
             View infoWindow = LayoutInflater.from(con).inflate(
@@ -879,7 +852,7 @@ public class HomeFragment extends BaseFragment {
                 }
                 return false;
             });
-            //Log.e("--长度--",aMap.getMapScreenMarkers().size()+"个");
+            //LogUtil.e("--长度--",aMap.getMapScreenMarkers().size()+"个");
         }
     }
 
@@ -910,7 +883,6 @@ public class HomeFragment extends BaseFragment {
     public void initAlct() {
         PermissionX.init(getActivity())
                 .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
                         Manifest.permission.RECORD_AUDIO)
                 .request((allGranted, grantedList, deniedList) -> {
                     if (allGranted) {
@@ -923,12 +895,12 @@ public class HomeFragment extends BaseFragment {
         MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
             @Override
             public void onSuccess(Object o) {
-                Log.e("--成功信息--", new Gson().toJson(o));
+                LogUtil.e("--成功信息--", new Gson().toJson(o));
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("--失败信息--", s + s1);
+                LogUtil.e("--失败信息--", s + s1);
             }
         });
     }
@@ -985,8 +957,8 @@ public class HomeFragment extends BaseFragment {
                 double lat = location.getLatitude();
                 //纬度
                 double lng = location.getLongitude();
-                Log.e("定位信息1", location.getLatitude() + "");
+                LogUtil.e("定位信息1", location.getLatitude() + "");
-                Log.e("定位信息2", location.getLongitude() + "");
+                LogUtil.e("定位信息2", location.getLongitude() + "");
                 //实现第一次定位成功,将地图中心移动到定位点
                 CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(new
                         LatLng(lat, lng), 11);
@@ -994,7 +966,7 @@ public class HomeFragment extends BaseFragment {
             } else {
                 //错误信息
                 String error = bundle.get("errorInfo").toString();
-                Log.e("Map", error);
+                LogUtil.e("Map", error);
                 Toast.makeText(con, "地图定位失败" + error, Toast.LENGTH_LONG).show();
             }
         }
@@ -1002,7 +974,7 @@ public class HomeFragment extends BaseFragment {
 
     @Subscribe
     public void processResult(HomeEvent home) {
-        Log.e("-res-", home.getMessage());
+        LogUtil.e("-res-", home.getMessage());
         initView(null);
     }
 

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

@@ -18,6 +18,7 @@ import androidx.annotation.Nullable;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.alct.mdp.callback.OnDownloadResultListener;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.haozhang.lib.SlantedTextView;
 import com.lxj.xpopup.XPopup;
@@ -86,7 +87,7 @@ public class HuoYuanFragmengt extends BaseFragment {
             case RequsetCodeConstants.SUCCESS:
                 if (!UiAuxiliary.isLogin(con)){
                     if (CacheGroup.cacheList.get("hl")!=null && CacheGroup.cacheList.get("up_app")!=null){
-                        Log.e("未登录货源1",CacheGroup.cacheList.get("hl"));
+                        LogUtil.e("未登录货源1",CacheGroup.cacheList.get("hl"));
                         hb=gson.fromJson(CacheGroup.cacheList.get("hl"),HuoYuanListBean.class);
                         if(hb.getCode()==200){
                             initView(null);
@@ -110,9 +111,9 @@ public class HuoYuanFragmengt extends BaseFragment {
                 }else{
                     if (CacheGroup.cacheList.get("hl")!=null && CacheGroup.cacheList.get(START_ORDER)!=null
                             && CacheGroup.cacheList.get("userdata")!=null && CacheGroup.cacheList.get("up_app")!=null){
-                        Log.e("货源",CacheGroup.cacheList.get("hl"));
+                        LogUtil.e("货源",CacheGroup.cacheList.get("hl"));
-                        Log.e("user",CacheGroup.cacheList.get("userdata"));
+                        LogUtil.e("user",CacheGroup.cacheList.get("userdata"));
-                        Log.e("up_app",CacheGroup.cacheList.get("up_app"));
+                        LogUtil.e("up_app",CacheGroup.cacheList.get("up_app"));
                         hb=gson.fromJson(CacheGroup.cacheList.get("hl"),HuoYuanListBean.class);
                         sob=gson.fromJson(CacheGroup.cacheList.get(START_ORDER),StartOrderBean.class);
                         user=gson.fromJson(CacheGroup.cacheList.get("userdata"),UserBean.class);
@@ -137,7 +138,7 @@ public class HuoYuanFragmengt extends BaseFragment {
                         delCac();
                     }
                     if(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA)!=null){
-                        Log.e("--认证信息--",CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA));
+                        LogUtil.e("--认证信息--",CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA));
                         DriverAuthDataBean dad=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA),DriverAuthDataBean.class);
                         if (dad.getCode()==200) {
                             SPUtil.insSP(con,"data","authdata",CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA));
@@ -207,7 +208,7 @@ public class HuoYuanFragmengt extends BaseFragment {
     public void initRefreshLoad(){
         refreshLayout=root.findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新","pps");
+            LogUtil.e("下拉刷新","pps");
             delCac();
             hd.sendEmptyMessageDelayed(10, 10000);
             hyr.getHuoYuan(1,100);
@@ -230,7 +231,7 @@ public class HuoYuanFragmengt extends BaseFragment {
         list.add(new ManyBean(new model(),R.layout.renzheng));
         if(sob!=null && sob.getData()!=null && sob.getData().getWayChildren().size()>0){
             SPUtil.insSP(con,"order","ShippingNoteNumber",sob.getData().getShippingNoteNumber());
-            Log.e("开始轨迹上传服务","-----");
+            LogUtil.e("开始轨迹上传服务","-----");
             Intent serviceIn=new Intent(con,TrackService.class);
             getActivity().startService(serviceIn);
             list.add(new ManyBean(sob.getData(),R.layout.huoyuan_yundan));
@@ -263,11 +264,11 @@ public class HuoYuanFragmengt extends BaseFragment {
         MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
             @Override
             public void onSuccess(Object o) {
-                Log.e("--成功信息--",new Gson().toJson(o));
+                LogUtil.e("--成功信息--",new Gson().toJson(o));
             }
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("--失败信息--",s+s1);
+                LogUtil.e("--失败信息--",s+s1);
             }
         });
     }
@@ -281,7 +282,7 @@ public class HuoYuanFragmengt extends BaseFragment {
                 user_state=1;
             }
         }
-        Log.e("--登录状态--",UiAuxiliary.isLogin(con)+"");
+        LogUtil.e("--登录状态--",UiAuxiliary.isLogin(con)+"");
         TextView rz=v.findViewById(R.id.rz);
         TextView state_body=v.findViewById(R.id.state_body);
         state_body.setText(states_body[user_state]);
@@ -297,7 +298,7 @@ public class HuoYuanFragmengt extends BaseFragment {
                     startActivity(in2);
                     break;
                 case 2:
-                    Log.e("路径",PushConstant.ORDER_ALL);
+                    LogUtil.e("路径",PushConstant.ORDER_ALL);
                     //ARouter.getInstance().build(PushConstant.ORDER_ALL).navigation();
                     Intent in3=new Intent(con, OrderAllActivity.class);
                     startActivity(in3);
@@ -345,12 +346,12 @@ public class HuoYuanFragmengt extends BaseFragment {
                     Button qiang=v1.findViewById(R.id.qiang);
                     TextView type_timer=v1.findViewById(R.id.type_timer);
                     qiang.setOnClickListener(v22 -> {
-                        Log.e("user",new Gson().toJson(user));
+                        LogUtil.e("user",new Gson().toJson(user));
                         if(UiAuxiliary.isLogin(con) && user!=null){
                             if(user.getData().getAuditStatus()==100003){
                                 Intent in=new Intent(con,HuoYunDelActivity.class);
                                 in.putExtra("id",hdr.getOrderId());
-                                Log.e("---id---",hdr.getOrderId()+"");
+                                LogUtil.e("---id---",hdr.getOrderId()+"");
                                 startActivity(in);
                             }else{
                                 new XPopup.Builder(act)
@@ -393,12 +394,12 @@ public class HuoYuanFragmengt extends BaseFragment {
                         qiang.setText("抢单");
                     }
                     v1.setOnClickListener(v2 -> {
-                        Log.e("user",new Gson().toJson(user));
+                        LogUtil.e("user",new Gson().toJson(user));
                         if(UiAuxiliary.isLogin(con) && user!=null){
                             if(user.getData().getAuditStatus()==100003){
                                 Intent in=new Intent(con,HuoYunDelActivity.class);
                                 in.putExtra("id",hdr.getOrderId());
-                                Log.e("---id---",hdr.getOrderId()+"");
+                                LogUtil.e("---id---",hdr.getOrderId()+"");
                                 startActivity(in);
                             }else{
                                 Toast.makeText(con,"请认证之后再接单",Toast.LENGTH_SHORT).show();

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

@@ -1,7 +1,6 @@
 package com.arpa.hndahesudintocctmsdriver.ui.home;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -19,27 +18,21 @@ import androidx.annotation.Nullable;
 
 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.event.FaceEvent;
-import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 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.auth.PersonalAuthActivity;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.img.ImageGetUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
-import com.dahe.mylibrary.utils.ActivityUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.core.BasePopupView;
-import com.lxj.xpopup.interfaces.OnCancelListener;
 import com.lxj.xpopup.interfaces.OnConfirmListener;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
@@ -96,20 +89,12 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_LIST);
                 }
                 if (CacheGroup.cacheList.get(END) != null) {
-                    Log.e("--end--", CacheGroup.cacheList.get(END));
+                    LogUtil.e("--end--", CacheGroup.cacheList.get(END));
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(END), BaseBean.class);
                     if (bb.getCode() == 200) {
                         //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
-//                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
+                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
-
-
-                        Intent intent = new Intent(this, H5Activity.class);
-                        intent.putExtra("url", (String) bb.getData());
-                        intent.putExtra("view_file", false);
-                        startActivity(intent);
-
-
                         //finish();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -132,25 +117,10 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                 break;
             case 13:
                 int index = Integer.valueOf((String) m.obj);
-                Log.e("--选择车辆--", clb.getData().get(index).getCarNumber());
+                LogUtil.e("--选择车辆--", clb.getData().get(index).getCarNumber());
                 car.setText("选择车辆:" + clb.getData().get(index).getCarNumber());
                 cid = clb.getData().get(index).getCarId();
                 break;
-            case 1111://安联用户验证通过，接单
-                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();
-                break;
-            case 2222://安联用户验证不通过
-                customDialog.dismiss();
-                new MessageUtils().showCenMessage(con, (String) m.obj);
-                break;
         }
     }
 
@@ -267,7 +237,20 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                             if (cid != null) {
 //                                if (fpKey){
                                 if (key) {
-                                    reOrder();
+                                    new XPopup.Builder(con)
+                                            .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+                                            .asConfirm("请确认接单", "是否确定承运此运单？",
+                                                    "取消", "确认",
+                                                    new OnConfirmListener() {
+                                                        @Override
+                                                        public void onConfirm() {
+                                                            LogUtil.e("--id--", "cid:" + cid + "---wid:" + id);
+                                                            customDialog = new CustomDialog(con, "正在接单...");
+                                                            customDialog.show();
+                                                            hyr.confirm(cid, id);
+                                                        }
+                                                    }, null, false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
+                                            .show();
                                 } else {
                                     Toast.makeText(con, "请先同意并签署运输合同", Toast.LENGTH_SHORT).show();
                                 }
@@ -301,7 +284,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         HuoYuanDelBean.DataDTO.SendInfoDTO hdsg = (HuoYuanDelBean.DataDTO.SendInfoDTO) o1;
                         type.setImageResource(R.mipmap.zhuang);
                         String goodsData = "";
-                        Log.e("--goodsData--", goodsData);
+                        LogUtil.e("--goodsData--", goodsData);
                         for (int i = 0; i < hdsg.getGoods().size(); i++) {
                             if (i != 0) {
                                 goodsData += "\n" + hdsg.getGoods().get(i).getGoodName() + "|" + hdsg.getGoods().get(i).getGoodNum() + hdsg.getGoods().get(i).getGoodUnit() + "|货物价值(元):" + hdsg.getGoods().get(i).getGoodPrice();
@@ -319,7 +302,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         HuoYuanDelBean.DataDTO.PutInfoDTO hdsg = (HuoYuanDelBean.DataDTO.PutInfoDTO) o1;
                         type.setImageResource(R.mipmap.xie);
                         String goodsData = "";
-                        Log.e("--goodsData--", goodsData);
+                        LogUtil.e("--goodsData--", goodsData);
                         for (int i = 0; i < hdsg.getGoods().size(); i++) {
                             if (i != 0) {
                                 goodsData += "\n" + hdsg.getGoods().get(i).getGoodName() + "|" + hdsg.getGoods().get(i).getGoodNum() + hdsg.getGoods().get(i).getGoodUnit() + "|货物价值(元):" + hdsg.getGoods().get(i).getGoodPrice();
@@ -334,55 +317,10 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
         });
     }
 
-    @Subscribe
-    public void faceResult(FaceEvent home) {
-        Log.e("-res-", home.getMessage());
-
-        UiAuxiliary.homeRequest("接单");
-        Intent in = new Intent(con, StartYunDanActivity.class);
-        in.putExtra("id", "0");
-        startActivity(in);
-        finish();
-
-//        new Handler().postDelayed(() -> {
-//            UiAuxiliary.homeRequest("接单");
-//            Intent in = new Intent(con, StartYunDanActivity.class);
-//            in.putExtra("id", "0");
-//            startActivity(in);
-//            finish();
-//        }, 2500);
-
-
-
-//        new Handler().postDelayed(() -> {
-//
-//
-//            UiAuxiliary.homeRequest("接单");
-////                    //ur.getJtt(hyd.getData().getId());
-//
-//            Intent in = new Intent(con, StartYunDanActivity.class);
-//            in.putExtra("id", "0");
-//            startActivity(in);
-//
-//            ActivityUtils.finishActivity(H5Activity.class);
-//            finish();
-//
-//
-//        }, 1500);
-
-//        UiAuxiliary.homeRequest("接单");
-
-//        Intent in = new Intent(con, StartYunDanActivity.class);
-//        in.putExtra("id", "0");
-//        startActivity(in);
-//        finish();
-
-    }
-
     @Subscribe
     public void processResult(AuthEvent auth) {
         //添加实名/意愿/签署完成之后的逻辑
-        Log.e("-回调信息-", auth.result);
+        LogUtil.e("-回调信息-", auth.result);
         JSONObject jsonObject = JSON.parseObject(auth.result);
         if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
             if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
@@ -413,15 +351,4 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
         }
     }
 
-    /**
-     * 接单
-     * 先判断安联用户信息验证，随后接单
-     */
-    private void reOrder() {
-        customDialog = new CustomDialog(con, "正在接单...");
-        customDialog.show();
-        //验证安联用户是否通过
-        ALProcess.verification(con, hd);
-    }
-
 }

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

@@ -10,6 +10,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.haozhang.lib.SlantedTextView;
 import com.lxj.xpopup.core.BasePopupView;
@@ -47,7 +48,7 @@ public class OrderAllActivity extends BaseActivity {
         switch (m.what){
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get(USER_ORDER_LIST)!=null && index==1) {
-                    Log.e("结果2",CacheGroup.cacheList.get(USER_ORDER_LIST));
+                    LogUtil.e("结果2",CacheGroup.cacheList.get(USER_ORDER_LIST));
                     olb=gson.fromJson(CacheGroup.cacheList.get(USER_ORDER_LIST),OrderListBean.class);
                     if(olb.getCode()==200){
                         initView(null);
@@ -81,7 +82,7 @@ public class OrderAllActivity extends BaseActivity {
                 }else{
                     Toast.makeText(con,"抢单",Toast.LENGTH_SHORT).show();
                 }
-//                xp.dismiss();
+                xp.dismiss();
                 break;
             default:break;
         }
@@ -91,14 +92,14 @@ public class OrderAllActivity extends BaseActivity {
     public void initRefreshLoad() {
         refreshLayout =findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新", "pps");
+            LogUtil.e("下拉刷新", "pps");
             index=1;
             dataKey=true;
             timer="";
             ur.getListV2(index,10);
         });
         refreshLayout.setOnLoadMoreListener(refreshLayout -> {
-            Log.e("上拉加载", "次数"+index);
+            LogUtil.e("上拉加载", "次数"+index);
             if(dataKey){
                 index++;
                 ur.getListV2(index,10);
@@ -167,7 +168,7 @@ public class OrderAllActivity extends BaseActivity {
                     v.setTop(getResources().getDimensionPixelOffset(R.dimen.dp_10));
                     OrderListBean.DataDTO.ListDTO idl= (OrderListBean.DataDTO.ListDTO) o;
                     v.setOnClickListener(v1 -> {
-                        Log.e("id",idl.getOrderId()+"");
+                        LogUtil.e("id",idl.getOrderId()+"");
                         Intent in=new Intent(con,StartYunDanActivity.class);
                         in.putExtra("id",idl.getOrderId());
                         startActivity(in);
@@ -205,7 +206,7 @@ public class OrderAllActivity extends BaseActivity {
                         state4.setText(" 已评价");
                     }
                     SlantedTextView states=v.findViewById(R.id.states);
-                    Log.e("类型",":"+ld.getDispatchType());
+                    LogUtil.e("类型",":"+ld.getDispatchType());
                     if(ld.getDispatchType()==1){
                         states.setText("派单");
                     } else if(ld.getDispatchType()==2) {

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

@@ -11,6 +11,7 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.interfaces.OnConfirmListener;
@@ -54,13 +55,13 @@ public class OrderListActivity extends BaseActivity {
     public void initRefreshLoad() {
         refreshLayout =findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新", "pps");
+            LogUtil.e("下拉刷新", "pps");
             index=1;
             dataKey=true;
             hyr.getHuoYuan(index,10);
         });
         refreshLayout.setOnLoadMoreListener(refreshLayout -> {
-            Log.e("上拉加载", "次数"+index);
+            LogUtil.e("上拉加载", "次数"+index);
             if(dataKey){
                 index++;
                 hyr.getHuoYuan(index,10);
@@ -81,7 +82,7 @@ public class OrderListActivity extends BaseActivity {
                 refreshLayout.finishRefresh();
                 refreshLayout.finishLoadMore();
                 if(CacheGroup.cacheList.get("hl")!=null){
-                    Log.e("货源",CacheGroup.cacheList.get("hl"));
+                    LogUtil.e("货源",CacheGroup.cacheList.get("hl"));
                     hb=gson.fromJson(CacheGroup.cacheList.get("hl"),HuoYuanListBean.class);
                     if(hb.getCode()==200){
                         if(index==1){
@@ -95,7 +96,7 @@ public class OrderListActivity extends BaseActivity {
                     CacheGroup.cacheList.remove("hl");
                 }
                 if(CacheGroup.cacheList.get("dealList")!=null){
-                    Log.e("历史货源",CacheGroup.cacheList.get("dealList"));
+                    LogUtil.e("历史货源",CacheGroup.cacheList.get("dealList"));
                     hdb=gson.fromJson(CacheGroup.cacheList.get("dealList"),HuoYuanListDealBean.class);
                     if(hdb.getCode()==200){
                         insDeal();

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

@@ -40,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.ToastUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.TimeUtil;
-import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -76,11 +74,11 @@ import java.util.List;
 
 public class StartYunDanActivity extends BaseActivity {
 
-    public static final String GET_EVALUTE = "getEvalute";
+    public static final String GET_EVALUTE="getEvalute";
-    public static final String KEEP_EVALUTE = "keepEvalte";
+    public static final String KEEP_EVALUTE="keepEvalte";
-    public static final String GET_COMPLAINT = "getComplaint";
+    public static final String GET_COMPLAINT="getComplaint";
 
-    private String TAG = "StartYunDanActivity";
+    private String TAG="StartYunDanActivity";
     private NestedScrollView bottomSheet;
     private MapView map;
     private BaseRecyclerView brv;
@@ -88,58 +86,57 @@ public class StartYunDanActivity extends BaseActivity {
     private LinearLayout protect;
     //private RelativeLayout title_rl;
     private TextView title;
-    private ScoreView sv1, sv2;
+    private ScoreView sv1,sv2;
-    private Gson gson = new Gson();
+    private Gson gson=new Gson();
     private StartOrderBean sob;
     private WNewsBean wnb;
     private HuoYuanRequset hyr;
     //是否处于展开状态
-    private boolean key = false;
+    private boolean key=false;
-    private int id = 0;
+    private int id=0;
     LocationGDUtil ld;
 
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what) {
+        switch (m.what){
             case RequsetCodeConstants.SUCCESS:
                 //获取页面数据
-                if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER) != 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));
+                    LogUtil.e("-评论-",CacheGroup.cacheList.get(GET_EVALUTE));
-                    Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
+                    LogUtil.e("-运单-",CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
-                    sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
+                    sob=gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
-                    wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
+                    wnb=gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
-                    if (sob.getCode() == 200 && sob.getData() != null) {
+                    if(sob.getCode()==200 && sob.getData()!=null){
                         id = sob.getData().getWaybillId();
                         initView(null);
-                    } else if (sob.getData() == null) {
+                    }else if(sob.getData()==null){
 //                        Toast.makeText(con,"运单执行结束",Toast.LENGTH_SHORT).show();
-                        SPUtil.insSP(con, "order", "ShippingNoteNumber", "");
+                        SPUtil.insSP(con,"order","ShippingNoteNumber","");
                         UiAuxiliary.homeRequest("运单结束");
 //                        finish();
-                    } else {
+                    }else{
-                        Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,sob.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(HuoYuanFragmengt.START_ORDER);
                     CacheGroup.cacheList.remove(GET_EVALUTE);
                 }
                 //保存评价
-                if (CacheGroup.cacheList.get(KEEP_EVALUTE) != null) {
+                if(CacheGroup.cacheList.get(KEEP_EVALUTE)!=null){
-                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(KEEP_EVALUTE), BaseBean.class);
+                    BaseBean bb=gson.fromJson(CacheGroup.cacheList.get(KEEP_EVALUTE),BaseBean.class);
-                    if (bb.getCode() == 200) {
+                    if(bb.getCode()==200){
-                        Toast.makeText(con, "评价保存成功", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,"评价保存成功",Toast.LENGTH_SHORT).show();
                         hyr.startOrder(id);
                         hyr.getEvaluate(id);
-                    } else {
+                    }else{
-                        Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,bb.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(KEEP_EVALUTE);
                 }
                 break;
             case 15:
                 break;
-            default:
+            default:break;
-                break;
         }
     }
 
@@ -151,28 +148,28 @@ public class StartYunDanActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_yundan_start);
-        con = this;
+        con=this;
-        id = getIntent().getExtras().getInt("id");
+        id=getIntent().getExtras().getInt("id");
-        brv = findViewById(R.id.brv);
+        brv=findViewById(R.id.brv);
-        protect = findViewById(R.id.protect);
+        protect=findViewById(R.id.protect);
-        title = findViewById(R.id.title);
+        title=findViewById(R.id.title);
-        bottomSheet = findViewById(R.id.bottom_sheet);
+        bottomSheet =findViewById(R.id.bottom_sheet);
         BottomSheetBehavior mBottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);
         mBottomSheetBehavior.setHideable(false);
         mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
         //mBottomSheetBehavior.set
-        map = findViewById(R.id.map);
+        map=findViewById(R.id.map);
         map.onCreate(savedInstanceState);
         if (aMap == null) {
             aMap = map.getMap();
             initLoaction();
         }
-        Log.e("--id--", "" + id);
+        LogUtil.e("--id--",""+id);
-        String userdata = SPUtil.getSP(con, "data", "userdata");
+        String userdata= SPUtil.getSP(con,"data","userdata");
-        if (!userdata.equals("")) {
+        if(!userdata.equals("")){
-            ub = gson.fromJson(userdata, UserBean.class);
+            ub=gson.fromJson(userdata,UserBean.class);
         }
-        hyr = new HuoYuanRequset(con, hd);
+        hyr=new HuoYuanRequset(con,hd);
 //        hyr.startOrder(id);
 //        hyr.getEvaluate(id);
     }
@@ -188,60 +185,59 @@ public class StartYunDanActivity extends BaseActivity {
         //控件隐藏的动画
         mHiddenAmin = new AlphaAnimation(1.0f, 0.0f);
         mHiddenAmin.setDuration(1000);
-        List<ManyBean> list = new ArrayList<>();
+        List<ManyBean> list=new ArrayList<>();
         //list.add(new ManyBean(new model(),R.layout.yundan_start_top));
-        list.add(new ManyBean(sob.getData(), R.layout.item_yundan_yunxing));
+        list.add(new ManyBean(sob.getData(),R.layout.item_yundan_yunxing));
-        list.add(new ManyBean(sob.getData(), R.layout.yundan_start_bottom));
+        list.add(new ManyBean(sob.getData(),R.layout.yundan_start_bottom));
-        brv.creates(con, list).setOnItemViewListener((position, o, v, layout) -> {
+        brv.creates(con,list).setOnItemViewListener((position, o, v, layout) -> {
-            switch (layout) {
+            switch (layout){
                 case R.layout.yundan_start_top:
-                    ImageButton return_btn = v.findViewById(R.id.return_btn);
+                    ImageButton return_btn=v.findViewById(R.id.return_btn);
                     return_btn.setOnClickListener(v1 -> finish());
                     break;
                 case R.layout.yundan_start_bottom:
                     initStartBody(v);
                     break;
                 case R.layout.item_yundan_yunxing:
-                    ImageView head_img = v.findViewById(R.id.head_img);
+                    ImageView head_img=v.findViewById(R.id.head_img);
-                    if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) {
+                    if(ub!=null && ub.getData()!=null && !ub.getData().getHeadportraitUrl().equals("")){
                         Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
                     }
                     break;
-                default:
+                default: break;
-                    break;
             }
         });
     }
 
-    private boolean iskey = false;
+    private boolean iskey=false;
 
-    private void initStartBody(View v) {
+    private void initStartBody(View v){
-        LinearLayout jiesuan = v.findViewById(R.id.jiesuan);
+        LinearLayout jiesuan=v.findViewById(R.id.jiesuan);
 //        if(id==0){
 //            jiesuan.setVisibility(View.GONE);
 //        }else{
 //            jiesuan.setVisibility(View.VISIBLE);
 //        }
-        sv1 = v.findViewById(R.id.score1);
+        sv1=v.findViewById(R.id.score1);
-        sv2 = v.findViewById(R.id.score2);
+        sv2=v.findViewById(R.id.score2);
         sv1.initView();
         sv2.initView();
         sv1.setScore(5);
         //设置是否可以修改评分，默认为true
-        TextView pl_submit = v.findViewById(R.id.pl_submit);
+        TextView pl_submit=v.findViewById(R.id.pl_submit);
-        TextView m_pl_value = v.findViewById(R.id.m_pl_value);
+        TextView m_pl_value=v.findViewById(R.id.m_pl_value);
-        TextView pl_value = v.findViewById(R.id.pl_value);
+        TextView pl_value=v.findViewById(R.id.pl_value);
-        if (wnb.getData() != null) {
+        if(wnb.getData()!=null){
             for (WNewsBean.DataDTO datum : wnb.getData()) {
-                if (datum.getType() == 0) {
+                if(datum.getType()==0){
                     sv1.setScore(datum.getAttitudeScore());
                     m_pl_value.setText(datum.getContent());
                     pl_submit.setVisibility(View.GONE);
                     sv1.setUpKey(false);
                     m_pl_value.setEnabled(false);
                 }
-                if (datum.getType() == 1) {
+                if(datum.getType()==1){
-                    Log.e("分数", datum.getAttitudeScore() + "_");
+                    LogUtil.e("分数",datum.getAttitudeScore()+"_");
                     sv2.setScore(datum.getAttitudeScore());
                     pl_value.setText(datum.getContent());
                 }
@@ -249,45 +245,45 @@ public class StartYunDanActivity extends BaseActivity {
         }
         sv2.setUpKey(false);
         pl_submit.setOnClickListener(v12 -> {
-            String evaluate = m_pl_value.getText() + "";
+            String evaluate=m_pl_value.getText()+"";
-            if (id != 0) {
+            if(id!=0){
-                if (evaluate.length() >= 5) {
+                if(evaluate.length()>=5){
-                    Log.e("星星", "" + sv1.getScore());
+                    LogUtil.e("星星",""+sv1.getScore());
-                    hyr.keepEvaluate(sv1.getScore(), m_pl_value.getText() + "", id);
+                    hyr.keepEvaluate(sv1.getScore(),m_pl_value.getText()+"",id);
-                } else {
+                }else{
-                    Toast.makeText(con, "写够5个字才是好司机~", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(con,"写够5个字才是好司机~",Toast.LENGTH_SHORT).show();
                 }
-            } else {
+            }else{
-                Toast.makeText(con, "运单尚未结束", Toast.LENGTH_SHORT).show();
+                Toast.makeText(con,"运单尚未结束",Toast.LENGTH_SHORT).show();
             }
         });
-        Button complaint = v.findViewById(R.id.complaint);
+        Button complaint=v.findViewById(R.id.complaint);
         complaint.setOnClickListener(v1 -> {
-            Intent in = new Intent(con, OrderComplaintActivity.class);
+            Intent in=new Intent(con, OrderComplaintActivity.class);
-            in.putExtra("id", id);
+            in.putExtra("id",id);
             startActivity(in);
         });
-        BaseRecyclerView bv_zhuang = v.findViewById(R.id.bv_zhuang);
+        BaseRecyclerView bv_zhuang=v.findViewById(R.id.bv_zhuang);
-        BaseRecyclerView bv_xie = v.findViewById(R.id.bv_xie);
+        BaseRecyclerView bv_xie=v.findViewById(R.id.bv_xie);
         //bv_zhuang.set
-        List<Object> list_zhuang = new ArrayList<>();
+        List<Object> list_zhuang=new ArrayList<>();
-        List<Object> list_xie = new ArrayList<>();
+        List<Object> list_xie=new ArrayList<>();
-        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+        for(int i=0;i<sob.getData().getWayChildren().size();i++){
-            StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+            StartOrderBean.DataDTO.WayChildrenDTO sdw=sob.getData().getWayChildren().get(i);
-            if (sdw.getType() == 1) {
+            if(sdw.getType()==1){
-                sdw.setUpdateTime(StringUtil.isNull((String) sdw.getUpdateTime(), "未装货"));
+                sdw.setUpdateTime(StringUtil.isNull((String) sdw.getUpdateTime(),"未装货"));
                 list_zhuang.add(sdw);
-            } else {
+            }else{
-                sdw.setUpdateTime(StringUtil.isNull((String) sdw.getUpdateTime(), "未卸货"));
+                sdw.setUpdateTime(StringUtil.isNull((String) sdw.getUpdateTime(),"未卸货"));
                 list_xie.add(sdw);
             }
         }
-        TextView get_contract = v.findViewById(R.id.get_contract);
+        TextView get_contract=v.findViewById(R.id.get_contract);
         get_contract.setOnClickListener(v13 -> {
-            Intent in = new Intent(con, WebPDFActivity.class);
+            Intent in=new Intent(con, WebPDFActivity.class);
-            in.putExtra("title", "电子合同");
+            in.putExtra("title","电子合同");
-            Log.e("--地址--", sob.getData().getContractUrl());
+            LogUtil.e("--地址--",sob.getData().getContractUrl());
-            in.putExtra("url", sob.getData().getContractUrl());
+            in.putExtra("url",sob.getData().getContractUrl());
             startActivity(in);
         });
 //        v.findViewById(R.id.upload_receipt).setOnClickListener(new View.OnClickListener() {
@@ -299,149 +295,130 @@ public class StartYunDanActivity extends BaseActivity {
 //                startActivity(in);
 //            }
 //        });
-        bv_zhuang.createV(con, list_zhuang, R.layout.item_huoyuan_start_zx).setOnItemViewListener((position, o, v14) -> {
+        bv_zhuang.createV(con,list_zhuang,R.layout.item_huoyuan_start_zx).setOnItemViewListener((position, o, v14) -> {
             //
-            boolean upkey = false;
+            boolean upkey=false;
-            if (position == 0) {
+            if(position==0){
-                upkey = true;
+                upkey=true;
             }
-            initZX(upkey, v14, position, o, 0);
+            initZX(upkey, v14,position,o,0);
         });
-        bv_xie.createV(con, list_xie, R.layout.item_huoyuan_start_zx).setOnItemViewListener((position, o, v15) -> {
+        bv_xie.createV(con,list_xie,R.layout.item_huoyuan_start_zx).setOnItemViewListener((position, o, v15) -> {
             //
-            boolean upkey = false;
+            boolean upkey=false;
-            if (position == (list_xie.size() - 1)) {
+            if(position==(list_xie.size()-1)){
-                upkey = true;
+                upkey=true;
             }
             initZX(upkey, v15, position, o, 1);
         });
         search();
     }
 
-    public void initZX(boolean key, View v, int position, Object o, int type) {
+    public void initZX(boolean key,View v,int position,Object o,int type){
-        StartOrderBean.DataDTO.WayChildrenDTO sdw = (StartOrderBean.DataDTO.WayChildrenDTO) o;
+        StartOrderBean.DataDTO.WayChildrenDTO sdw= (StartOrderBean.DataDTO.WayChildrenDTO) o;
-        TextView index = v.findViewById(R.id.index);
+        TextView index=v.findViewById(R.id.index);
-        TextView s_zx = v.findViewById(R.id.s_zx);
+        TextView s_zx=v.findViewById(R.id.s_zx);
-        TextView j_zx = v.findViewById(R.id.j_zx);
+        TextView j_zx=v.findViewById(R.id.j_zx);
-        if (type == 1) {
+        if(type==1){
             s_zx.setText("实际卸货时间:");
             j_zx.setText("计划卸货时间:");
         }
-        if (position == 0) {
+        if(position==0){
-            if (type == 0) {
+            if(type==0){
                 index.setText("装货地");
-            } else {
+            }else{
                 index.setText("卸货地");
             }
-        } else {
+        }else{
-            if (type == 0) {
+            if(type==0) {
                 index.setText("第" + (position + 1) + "装货地");
-            } else {
+            }else{
                 index.setText("第" + (position + 1) + "卸货地");
             }
         }
-        TextView goodName = v.findViewById(R.id.goodName);
+        TextView goodName=v.findViewById(R.id.goodName);
-        TextView goodNum = v.findViewById(R.id.goodNum);
+        TextView goodNum=v.findViewById(R.id.goodNum);
-        TextView goodUnit = v.findViewById(R.id.goodUnit);
+        TextView goodUnit=v.findViewById(R.id.goodUnit);
         goodName.setText(sdw.getGoods().get(0).getGoodName());
         goodNum.setText(sdw.getGoods().get(0).getGoodNum());
         goodUnit.setText(sdw.getGoods().get(0).getGoodUnit());
-        TextView huoyuan_state = v.findViewById(R.id.huoyuan_state);
+        TextView huoyuan_state=v.findViewById(R.id.huoyuan_state);
-        huoyuan_state.setText(stateText(sdw.getStatus(), type));
+        huoyuan_state.setText(stateText(sdw.getStatus(),type));
         huoyuan_state.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String wid = sdw.getId() + "";
+                String wid= sdw.getId()+"";
-                if (sdw.getStatus() == 0) {
+                if(sdw.getStatus()==0){
-                    if (type == 0) {
+                    if(type==0){
-                        Intent in = new Intent(con, ShangChuangImgActivity.class);
+                        Intent in=new Intent(con, ShangChuangImgActivity.class);
-                        in.putExtra("type", type);
+                        in.putExtra("type",type);
-                        in.putExtra("wid", wid);
+                        in.putExtra("wid",wid);
-                        in.putExtra("sob", gson.toJson(sob));
+                        in.putExtra("sob",gson.toJson(sob));
-                        in.putExtra("keys", key);
+                        in.putExtra("keys",key);
                         startActivity(in);
-                    } else {
+                    }else{
-                        Toast.makeText(con, "您还没有装货", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,"您还没有装货",Toast.LENGTH_SHORT).show();
                     }
-                } else if (sdw.getStatus() == 1) {//装货回单
+                }else if(sdw.getStatus()==1){
-                    Intent in = new Intent(con, ShangChuangImgActivity.class);
+                    Intent in=new Intent(con, ShangChuangImgActivity.class);
-                    in.putExtra("type", 2);
+                    in.putExtra("type",2);
-                    in.putExtra("wid", wid);
+                    in.putExtra("wid",wid);
-                    in.putExtra("h_type", type);
+                    in.putExtra("h_type",type);
-                    in.putExtra("sob", gson.toJson(sob));
+                    in.putExtra("sob",gson.toJson(sob));
                     startActivity(in);
-                } else if (sdw.getStatus() == 2) {//上传收货单(卸货回单)
+                }else if(sdw.getStatus()==2){
-                    Intent in = new Intent(con, ShangChuangImgActivity.class);
+                    Intent in=new Intent(con, ShangChuangImgActivity.class);
-                    in.putExtra("type", 2);
+                    in.putExtra("type",2);
-                    in.putExtra("wid", wid);
+                    in.putExtra("wid",wid);
-                    in.putExtra("h_type", type);
+                    in.putExtra("h_type",type);
-                    in.putExtra("sob", gson.toJson(sob));
+                    in.putExtra("sob",gson.toJson(sob));
-                    in.putExtra("keys", key);
+                    in.putExtra("keys",key);
                     startActivity(in);
-                } else if (sdw.getStatus() == 3) {
+                }else if(sdw.getStatus()==3){
-                    Intent in = new Intent(con, GetShangChuanActivity.class);
+                    Intent in=new Intent(con, GetShangChuanActivity.class);
-                    in.putExtra("sdwStr", gson.toJson(sdw));
+                    in.putExtra("sdwStr",gson.toJson(sdw));
+                    startActivity(in);
+                }else{
+                    Intent in=new Intent(con, ShangChuangImgActivity.class);
+                    in.putExtra("type",type);
+                    in.putExtra("wid",wid);
+                    in.putExtra("sob",gson.toJson(sob));
+                    in.putExtra("keys",key);
                     startActivity(in);
-                } else {//卸货照片
-                    StartOrderBean.DataDTO.WayChildrenDTO zInfo;
-                    for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
-                        if (sob.getData().getWayChildren().get(i).getType() == 1) {
-                            zInfo = sob.getData().getWayChildren().get(i);
-                            int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zInfo.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
-                            if (dis > 5) {
-                                if (zInfo.getReceiptUrl() != null && zInfo.getReceiptUrl().size() > 0) {
-                                    Intent in = new Intent(con, ShangChuangImgActivity.class);
-                                    in.putExtra("type", type);
-                                    in.putExtra("wid", wid);
-                                    in.putExtra("sob", gson.toJson(sob));
-                                    in.putExtra("keys", key);
-                                    startActivity(in);
-                                    break;
-                                } else {
-                                    ToastUtils.showToast(StartYunDanActivity.this, "请先上传出货单,再进行卸货操作!");
-                                }
-                            } else {//大于五分钟可以接单
-                                ToastUtils.showToast(StartYunDanActivity.this, "装卸货时间间隔过短,请稍后重试!");
-                            }
-                            break;
-                        }
-                    }
-
                 }
             }
         });
     }
 
-    public String stateText(int state, int type) {
+    public String stateText(int state,int type){
-        String str = "";
+        String str="";
         //0待装货，1已装货 2已卸货 3已上传回单 4待卸货
-        switch (state) {
+        switch (state){
             case 0://str="待装货";
-                if (type == 0) {
+                if(type==0){
-                    str = "立即装货";
+                    str="立即装货";
 //                    str="确认装货";
-                } else {
+                }else{
-                    str = "请先装货";
+                    str="请先装货";
                 }
                 break;
             case 1://str="已装货";
-                str = "上传出货单";
+                str="上传出货单";
 //                str="确认回单";
                 break;
             case 2://str="已卸货";
-                str = "上传收货单";
+                str="上传收货单";
 //                str="确认回单";
                 break;
             case 3:
                 //str="已上传回单";
-                str = "查看凭证";
+                str="查看凭证";
                 break;
             case 4:
                 //str="待卸货";
-                str = "确认卸货";
+                str="确认卸货";
-                break;
-            default:
                 break;
+            default:break;
         }
         return str;
     }
@@ -449,7 +426,7 @@ public class StartYunDanActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (map != null) {
+        if(map!=null){
             map.onResume();
         }
         hyr.startOrder(id);
@@ -459,7 +436,7 @@ public class StartYunDanActivity extends BaseActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        if (map != null) {
+        if(map!=null){
             map.onPause();
         }
     }
@@ -467,7 +444,7 @@ public class StartYunDanActivity extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (map != null) {
+        if(map!=null){
             map.onDestroy();
         }
     }
@@ -477,12 +454,11 @@ public class StartYunDanActivity extends BaseActivity {
         super.onSaveInstanceState(outState);
         map.onSaveInstanceState(outState);
     }
-
     LocationSource.OnLocationChangedListener mListener;
     AMapLocationClient mlocationClient;
     AMapLocationClientOption mLocationOption;
 
-    public void initLoaction() {
+    public void initLoaction(){
         // 设置定位监听
         aMap.setLocationSource(new LocationSource() {
             @Override
@@ -501,13 +477,13 @@ public class StartYunDanActivity extends BaseActivity {
                     mlocationClient.setLocationListener(new AMapLocationListener() {
                         @Override
                         public void onLocationChanged(AMapLocation aMapLocation) {
-                            if (mListener != null && aMapLocation != null) {
+                            if (mListener != null&&aMapLocation != null) {
                                 if (aMapLocation != null
-                                        && aMapLocation.getErrorCode() == 0) {
+                                        &&aMapLocation.getErrorCode() == 0) {
                                     mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
                                 } else {
-                                    String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
+                                    String errText = "定位失败," + aMapLocation.getErrorCode()+ ": " + aMapLocation.getErrorInfo();
-                                    Log.e("AmapErr", errText);
+                                    LogUtil.e("AmapErr",errText);
                                 }
                             }
                         }
@@ -559,44 +535,45 @@ public class StartYunDanActivity extends BaseActivity {
 
 
     private RouteSearch mRouteSearch;//路线查询器
-    private List<LatLonPoint> lists = new ArrayList<>();
+    private List<LatLonPoint> lists=new ArrayList<>();
 
 
-    public void search() {
+    public void search(){
 //        try {
 //            AMapLocationClient.updatePrivacyShow(con,true,true);
 //            AMapLocationClient.updatePrivacyAgree(con,true);
-        mRouteSearch = new RouteSearch(this);
+            mRouteSearch = new RouteSearch(this);
 //        } catch (AMapException e) {
 //            e.printStackTrace();
 //        }
         //设置数据回调监听器
         mRouteSearch.setRouteSearchListener(new OnRouteSearchListener());
         //设置开始位置坐标点(注意经纬度不能写反,会报错1800(只能规划到中国区域里的地图路线))
-        LatLonPoint startPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+        LatLonPoint startPoint=new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
                 Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
         //设置目的地坐标点
-        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size()-1)).getLatitude()),
-                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size()-1)).getLongitude()));
         //查询信息对象
-        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+        for (int i=0;i<sob.getData().getWayChildren().size();i++){
-            if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+            if(i!=0 && i!=(sob.getData().getWayChildren().size()-1)){
-                LatLonPoint sp = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
+                LatLonPoint sp=new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
                         Double.parseDouble(sob.getData().getWayChildren().get((i)).getLongitude()));
                 lists.add(sp);
             }
         }
-        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint, endPoint);
+        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint,endPoint);
         //设置搜索参数 1.fromAndTo 路径的起点终点  2.路径规划的策略(这里是驾车模式,具体看高德API) 3.途
         //经点，可选 4.避让区域，可选， 5.避让道路 ,可选
         RouteSearch.DriveRouteQuery query = new
-                RouteSearch.DriveRouteQuery(fromAndTo, RouteSearch.DRIVING_SINGLE_DEFAULT, lists, null, "");
+                RouteSearch.DriveRouteQuery(fromAndTo,RouteSearch.DRIVING_SINGLE_DEFAULT,lists,null,"");
         //开始异步查询
         mRouteSearch.calculateDriveRouteAsyn(query);
     }
 
 
-    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener {
+
+    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener{
 
         @Override
         public void onBusRouteSearched(BusRouteResult busRouteResult, int i) {
@@ -605,7 +582,7 @@ public class StartYunDanActivity extends BaseActivity {
 
         @Override
         public void onDriveRouteSearched(DriveRouteResult driveRouteResult, int rCode) {
-            if (rCode == 1000) {//获取规划路线成功,获取到的是了,路线坐标点的集合
+            if (rCode == 1000){//获取规划路线成功,获取到的是了,路线坐标点的集合
                 List<DrivePath> paths = driveRouteResult.getPaths();
                 //创建存储坐标点的集合
                 List<LatLng> latLngs = new ArrayList<>();
@@ -614,7 +591,7 @@ public class StartYunDanActivity extends BaseActivity {
                     for (DriveStep mDriveStep : mDrivePath.getSteps()) {
                         for (LatLonPoint mLatLonPoint : mDriveStep.getPolyline()) {
                             latLngs.add(new
-                                    LatLng(mLatLonPoint.getLatitude(), mLatLonPoint.getLongitude()));
+                                    LatLng(mLatLonPoint.getLatitude(),mLatLonPoint.getLongitude()));
                         }
                     }
                 }
@@ -625,24 +602,24 @@ public class StartYunDanActivity extends BaseActivity {
                         .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
                         .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
                                 Double.parseDouble(sob.getData().getWayChildren().get(0).getLongitude()))));
-                for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+                for(int i=0;i<sob.getData().getWayChildren().size();i++){
-                    if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+                    if(i!=0 && i!=(sob.getData().getWayChildren().size()-1)){
-                        StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+                        StartOrderBean.DataDTO.WayChildrenDTO sdw=sob.getData().getWayChildren().get(i);
-                        int icon = 0;
+                        int icon=0;
-                        if (sdw.getType() == 1) {
+                        if(sdw.getType()==1){
-                            icon = R.mipmap.z_loc;
+                            icon=R.mipmap.z_loc;
-                        } else {
+                        }else{
-                            icon = R.mipmap.x_loc;
+                            icon=R.mipmap.x_loc;
                         }
                         aMap.addMarker(new MarkerOptions()
                                 .icon(BitmapDescriptorFactory.fromResource(icon))
-                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()), Double.parseDouble(sdw.getLongitude()))));
+                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()),Double.parseDouble(sdw.getLongitude()))));
                     }
                 }
                 aMap.addMarker(new MarkerOptions()
                         .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
-                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size()-1)).getLatitude()),
-                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()))));
+                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size()-1)).getLongitude()))));
                 //绘制规划路径路线
                 aMap.addPolyline(new PolylineOptions()
                         //路线坐标点的集合
@@ -653,15 +630,15 @@ public class StartYunDanActivity extends BaseActivity {
                 //设置画线的颜色
 
                 //显示完整包含所有marker地图路线
-                LatLngBounds.Builder builder = LatLngBounds.builder();
+                LatLngBounds.Builder builder =LatLngBounds.builder();
                 for (int i = 0; i < latLngs.size(); i++) {
                     builder.include(latLngs.get(i));
                 }
                 //显示全部marker,第二个参数是四周留空宽度
-                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 200));
+                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(),200));
                 LatLng latLng = new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
                         Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));//构造一个位置
-                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 6));
+                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng,6));
             }
         }
 
@@ -677,7 +654,7 @@ public class StartYunDanActivity extends BaseActivity {
 
     }
 
-    public void up_traffic() {
+    public void up_traffic(){
 //        ShippingNoteInfo[] snis=new ShippingNoteInfo[1];
 //        ShippingNoteInfo sni=new ShippingNoteInfo();
 //        sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber());
@@ -688,11 +665,11 @@ public class StartYunDanActivity extends BaseActivity {
 //        LocationOpenApi.stop(con, snis, new OnResultListener() {
 //            @Override
 //            public void onSuccess() {
-//                Log.e("关闭定位成功","卸货货上传成功");
+//                LogUtil.e("关闭定位成功","卸货货上传成功");
 //            }
 //            @Override
 //            public void onFailure(String s, String s1) {
-//                Log.e("关闭定位失败:",s+s1);
+//                LogUtil.e("关闭定位失败:",s+s1);
 //            }
 //        });
     }

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

@@ -1,182 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle;
-
-import android.graphics.Bitmap;
-import android.media.MediaMetadataRetriever;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-//import com.alibaba.sdk.android.vod.upload.VODSVideoUploadCallback;
-//import com.alibaba.sdk.android.vod.upload.VODSVideoUploadClient;
-//import com.alibaba.sdk.android.vod.upload.VODSVideoUploadClientImpl;
-//import com.alibaba.sdk.android.vod.upload.model.SvideoInfo;
-//import com.alibaba.sdk.android.vod.upload.session.VodHttpClientConfig;
-//import com.alibaba.sdk.android.vod.upload.session.VodSessionCreateInfo;
-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 java.io.File;
-import java.io.FileOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-
-/**
- * @author hlh
- * @version 1.0.0
- * @date 2021/11/4 17:15
- * @description:
- */
-
-public class VideoReleaseActivity extends BaseActivity {
-
-    private String videoPath="";
-    private String coverPath="";
-    private String video_title="用户未设置";
-    private ImageView video_cover;
-    @Override
-    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StateStyleUtil.stateTextColor(this);
-        setContentView(R.layout.activity_video_release);
-        con=this;
-        video_cover=findViewById(R.id.video_cover);
-        videoPath=getIntent().getExtras().getString("path");
-        setTitle("发布");
-        initView(null);
-    }
-
-    @Override
-    public void initView(Object obj) {
-        super.initView(obj);
-        getFirstframe(videoPath);
-        Glide.with(con).load(new File(coverPath)).into(video_cover);
-    }
-
-    public void submit(View v){
-
-        //uplod();
-    }
-
-    private void getFirstframe(String path){
-        MediaMetadataRetriever mmr=new MediaMetadataRetriever();//实例化MediaMetadataRetriever对象
-        File file=new File(path);//实例化File对象，文件路径为/storage/emulated/0/shipin.mp4 （手机根目录）
-        if(!file.exists()){
-            Log.e("s","文件不存在");
-        }
-        mmr.setDataSource(path);
-        Bitmap bitmap = mmr.getFrameAtTime(0); //0表示首帧图片
-        mmr.release(); //释放MediaMetadataRetriever对象
-        if(bitmap!=null){
-            Log.e("s","获取视频缩略图成功");
-            //存储媒体已经挂载，并且挂载点可读/写。
-            if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-                bitmap.recycle(); //回收bitmap
-                return;
-            }
-            try {
-                Calendar now = new GregorianCalendar();
-                SimpleDateFormat simpleDate = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault());
-                String picture_Name = simpleDate.format(now.getTime()); //获取当前时间戳作为文件名称，避免同名
-                String framePath = "/storage/emulated/0/DCIM/Camera/"; //图片保存文件夹
-                File frame_file = new File(framePath);
-                if (!frame_file.exists()) { //// 如果路径不存在，就创建路径
-                    frame_file.mkdirs();
-                }
-                File picture_file = new File(framePath,picture_Name + ".jpg"); // 创建路径和文件名的File对象
-                FileOutputStream out = new FileOutputStream(picture_file);
-                bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
-                out.flush();
-                out.close();  //注意关闭文件流
-                Log.e("s","保存图片成功");
-                coverPath=picture_file.getPath();
-            } catch (Exception e) {
-                Log.e("保存图片失败",e.getMessage().toString());
-                Toast.makeText(con, "保存图片失败！" + e.getMessage().toString(), Toast.LENGTH_LONG).show();
-                e.printStackTrace();
-            }
-        }else{
-            Log.e("e","获取视频缩略图失败");
-        }
-    }
-
-    private String accessKeyId="";
-    private String accessKeySecret="";
-    private String securityToken="";
-    private String expriedTime="";
-    private String requestID="";
-
-//    public void uplod(){
-//        VODSVideoUploadClient vodsVideoUploadClient = new VODSVideoUploadClientImpl(getApplicationContext());
-//        vodsVideoUploadClient.init();
-//        //构建上传参数
-//        //参数请确保存在，如不存在SDK内部将会直接将错误throw Exception
-//        //文件路径保证存在之外因为Android 6.0之后需要动态获取权限，请开发者自行实现获取"文件读写权限"
-//        VodHttpClientConfig vodHttpClientConfig = new VodHttpClientConfig.Builder()
-//                .setMaxRetryCount(2)//重试次数
-//                .setConnectionTimeout(15 * 1000)//连接超时
-//                .setSocketTimeout(15 * 1000)//socket超时
-//                .build();
-//        //构建短视频VideoInfo，常见的描述、标题、详情都可以设置
-//        SvideoInfo svideoInfo = new SvideoInfo();
-//        svideoInfo.setTitle(video_title);//标题
-//        svideoInfo.setDesc("-无-");//文件详情
-//        svideoInfo.setCateId(1);//分类ID
-//        //构建点播上传参数（重要）
-//        VodSessionCreateInfo vodSessionCreateInfo =new VodSessionCreateInfo.Builder()
-//                .setImagePath(coverPath)//图片地址
-//                .setVideoPath(videoPath)//视频地址
-//                .setAccessKeyId(accessKeyId)//临时accessKeyId
-//                .setAccessKeySecret(accessKeySecret)//临时accessKeySecret
-//                .setSecurityToken(securityToken)//securityToken
-//                .setExpriedTime(expriedTime)//STStoken过期时间
-//                .setRequestID(requestID)//requestID，开发者可以传将获取STS返回的requestID设置也可以不设
-//                .setIsTranscode(true)//是否转码，如开启转码请AppSever务必监听服务端转码成功的通知
-//                .setSvideoInfo(svideoInfo)//短视频信息
-//                .setVodHttpClientConfig(vodHttpClientConfig)//网络参数
-//                .build();
-//        vodsVideoUploadClient.uploadWithVideoAndImg(vodSessionCreateInfo, new VODSVideoUploadCallback() {
-//            @Override
-//            public void onUploadSucceed(String videoId, String imageUrl) {
-//                //上传成功返回视频ID和图片URL
-//                Log.d("-success-","onUploadSucceed"+ "videoId:"+ videoId + "imageUrl" + imageUrl);
-//            }
-//            @Override
-//            public void onUploadFailed(String code, String message) {
-//                //上传失败返回错误码和message，错误码有详细的错误信息请开发者仔细阅读
-//                Log.d("-error-","onUploadFailed" + "code" + code + "message" + message);
-//            }
-//            @Override
-//            public void onUploadProgress(long uploadedSize, long totalSize) {
-//                //上传的进度回调，非UI线程
-//                Log.d("-进度-","onUploadProgress" + uploadedSize * 100 / totalSize);
-//                //progress = uploadedSize * 100 / totalSize;
-//                //handler.sendEmptyMessage(0);
-//            }
-//            @Override
-//            public void onSTSTokenExpried() {
-//                Log.d("过期","onSTSTokenExpried");
-//                //STS token过期之后刷新STStoken，如正在上传将会断点续传
-//                // vodsVideoUploadClient.refreshSTSToken(accessKeyId,accessKeySecret,securityToken,expriedTime);
-//            }
-//            @Override
-//            public void onUploadRetry(String code, String message) {
-//                //上传重试的提醒
-//                //Log.d(TAG,"onUploadRetry" + "code" + code + "message" + message);
-//            }
-//            @Override
-//            public void onUploadRetryResume() {
-//                //上传重试成功的回调，告知用户重试成功
-//                //Log.d(TAG,"onUploadRetryResume");
-//            }
-//        });
-//    }
-}

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

@@ -1,12 +1,12 @@
 package com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
@@ -16,7 +16,6 @@ import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
 
 /**
  * @author hlh
@@ -39,7 +38,7 @@ public class GetShangChuanActivity extends BaseActivity {
         con=this;
         initFind();
         sdwStr=getIntent().getExtras().getString("sdwStr");
-        Log.e("---sdwStr--",sdwStr);
+        LogUtil.e("---sdwStr--",sdwStr);
         sdw=new Gson().fromJson(sdwStr,StartOrderBean.DataDTO.WayChildrenDTO.class);
         initView(null);
     }
@@ -75,22 +74,16 @@ public class GetShangChuanActivity extends BaseActivity {
             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))
+                        .asImageViewer(img1,sdw.getSendPutImagesUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
-//                        .asImageViewer(img1,sdw.getSendPutImagesUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
-//                        .show();
             });
         }
         if(sdw.getReceiptUrl()!=null && sdw.getReceiptUrl().size()>=1){
             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))
+                        .asImageViewer(img2,sdw.getReceiptUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
-//                        .asImageViewer(img2,sdw.getReceiptUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
-//                        .show();
             });
         }
         //new GlideUrl(sdw.getSendPutImagesUrl().toString(), new LazyHeaders.Builder().addHeader("Cookie", AppCurrentUser.getInstance().getUserCookie()).build());

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

@@ -19,22 +19,13 @@ import com.alct.mdp.callback.OnResultListener;
 import com.alct.mdp.model.Goods;
 import com.alct.mdp.model.Image;
 import com.alct.mdp.model.Location;
-import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
-import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
-import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
-import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
-import com.baidu.mapapi.CoordType;
-import com.baidu.mapapi.SDKInitializer;
-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.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -49,6 +40,7 @@ import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
 import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil;
+import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
 import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.file.FileUtil;
@@ -57,7 +49,6 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.time.Timer;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -66,115 +57,89 @@ import java.util.List;
 
 public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
-    private TextView submit, name_top, name_body, address, tips, tips_x;
+    private TextView submit,name_top,name_body,address,tips,tips_x;
     private RelativeLayout getImg;
-    private ImageView res_img, img_icon, img_delete;
+    private ImageView res_img,img_icon,img_delete;
-    private String[] names = {"装货", "卸货", "回单"};
+    private String[] names={"装货","卸货","回单"};
-    public static String[] TYPE_NAME = {"zhuanghuo", "xiehuo", "huidan"};
+    public static String[] TYPE_NAME={"zhuanghuo","xiehuo","huidan"};
-    private int index = 0;
+    private int index=0;
     //
-    private Gson gson = new Gson();
+    private Gson gson=new Gson();
     //
-    private LUInputBean lub = new LUInputBean();
+    private LUInputBean lub=new LUInputBean();
-    private UploadReceiptInputBean urib = new UploadReceiptInputBean();
+    private UploadReceiptInputBean urib=new UploadReceiptInputBean();
     private LocationGDUtil lgdu;
-    public LocationUtil lu;
+    private LocationUtil lu;
-    private List<Integer> imgIds = new ArrayList<>();
+    private List<Integer> imgIds=new ArrayList<>();
     private UploadBean ub;
     private HuoYuanRequset hyr;
     //
-    private GetCarImageAlert gia = new GetCarImageAlert();
+    private GetCarImageAlert gia=new GetCarImageAlert();
     private CustomDialog customDialog;
-    private int id = 0;
+    private int id=0;
-    private boolean key = true;
+    private boolean key=true;
-    private boolean keys = false;
+    private boolean keys=false;
-    private boolean locationKey = false;
+    private boolean locationKey=false;
     private TextView tv_loaction;
 
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what) {
+        switch (m.what){
             case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("upload") != null) {
+                if (CacheGroup.cacheList.get("upload")!=null) {
-                    Log.e("upload", CacheGroup.cacheList.get("upload"));
+                    LogUtil.e("upload",CacheGroup.cacheList.get("upload"));
-                    ub = gson.fromJson(CacheGroup.cacheList.remove("upload"), UploadBean.class);
+                    ub=gson.fromJson(CacheGroup.cacheList.remove("upload"),UploadBean.class);
-                    if (ub.getCode() == 200) {
+                    if(ub.getCode()==200){
                         imgIds.add(ub.getData().getId());
                         Glide.with(con).load(ub.getData().getUrl()).into(res_img);
                         res_img.setVisibility(View.VISIBLE);
                         img_delete.setVisibility(View.VISIBLE);
                         img_icon.setVisibility(View.GONE);
-                        key = false;
+                        key=false;
-                    } else {
+                    }else{
-                        Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,ub.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("upload");
                 }
-                for (int i = 0; i < TYPE_NAME.length; i++) {
+                for(int i=0;i<TYPE_NAME.length;i++){
-                    if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) {
+                    if (CacheGroup.cacheList.get(TYPE_NAME[i])!=null) {
-                        BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class);
+                        BaseBean bb=gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]),BaseBean.class);
-                        if (bb.getCode() == 200) {
+                        if(bb.getCode()==200){
-                            if (!keys) {
+                            if(!keys){
-                                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(con,"上传成功",Toast.LENGTH_SHORT).show();
                                 finish();
-                            } else {
+                            }else{
-                                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(con,"上传成功",Toast.LENGTH_SHORT).show();
                                 finish();
                             }
-                        } else {
+                        }else{
-                            Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(con,bb.getMsg(),Toast.LENGTH_SHORT).show();
                         }
                         CacheGroup.cacheList.remove(TYPE_NAME[i]);
                     }
                 }
-                if (CacheGroup.cacheList.get("carName") != null) {
+                if(CacheGroup.cacheList.get("carName")!=null){
-                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("carName"), BaseBean.class);
+                    BaseBean bb=gson.fromJson(CacheGroup.cacheList.get("carName"),BaseBean.class);
-                    if (bb.getCode() == 200) {
+                    if(bb.getCode()==200){
 
                     }
                     CacheGroup.cacheList.remove("carName");
                 }
-
-                if (CacheGroup.cacheList.get("carNum") != null) {
-                    Log.e("upload", CacheGroup.cacheList.get("carNum"));
-                    CarInfoBean ub = gson.fromJson(CacheGroup.cacheList.remove("carNum"), CarInfoBean.class);
-                    if (ub.getCode() == 200 && ub.getData().getData().getPrism_keyValueInfo().size() > 0) {
-                        String value = ub.getData().getData().getPrism_keyValueInfo().get(0).getValue();
-                        String forceMatching = ub.getData().getForceMatching();
-                        if ("1".equals(forceMatching)) {//是否强校验车牌号 1:强校验
-                            if (sob.getData().getCarNumber().equals(value)) {
-                                hyr.uploadFile(new File(path));
-                            } else {
-                                new MessageUtils().showCenMessage(ShangChuangImgActivity.this, "车牌号不匹配!", "请重新拍照或联系管理员");
-                            }
-                        } else {
-                            hyr.uploadFile(new File(path));
-                        }
-                    } else {//识别失败后返回code500
-                        if (index == 0) {//装卸货车辆需要识别车牌号){
-                            Toast.makeText(con, "装货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
-                        } else if (index == 1) {
-                            Toast.makeText(con, "卸货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
-                        }
-
-                    }
-                    CacheGroup.cacheList.remove("carNum");
-                }
                 break;
             case 14://定位成功
-                locationKey = true;
+                locationKey=true;
                 customDialog.dismiss();
                 tv_loaction.setText("定位成功");
-                tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
+                tv_loaction.setTextColor(getResources().getColor(R.color.theme_color,null));
                 initLocation();
                 break;
             case 16://定位失败
-                locationKey = false;
+                locationKey=false;
                 customDialog.dismiss();
                 tv_loaction.setText("定位失败，点击重试");
-                tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color, null));
+                tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color,null));
-                Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
+                Toast.makeText(con,"定位失败，请确认开启定位后重试！",Toast.LENGTH_LONG).show();
                 //定位结果接收
                 //finish();
                 break;
@@ -182,74 +147,67 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
 
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                path = (String) m.obj;
+                path= (String) m.obj;
-                Log.e("res:", "选定图片结果");
+                LogUtil.e("res:","选定图片结果");
-                Log.e("res:", path);
+                LogUtil.e("res:",path);
                 //选定图片结果
 //                if(index==1 || index==2){
 //                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
 //                }
-                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
+                hyr.uploadFile(new File(path));
-                    new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
-                } else {
-                    hyr.uploadFile(new File(path));
-                }
-                break;
-            default:
                 break;
+            default:break;
         }
     }
 
     private String wid;
     private int h_type;
-    String sobStr = "";
+    String sobStr="";
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_shangchuan);
-        con = this;
+        con=this;
-        submit = findViewById(R.id.submit);
+        submit=findViewById(R.id.submit);
-        name_top = findViewById(R.id.name_top);
+        name_top=findViewById(R.id.name_top);
-        name_body = findViewById(R.id.name_body);
+        name_body=findViewById(R.id.name_body);
-        address = findViewById(R.id.address);
+        address=findViewById(R.id.address);
-        getImg = findViewById(R.id.getImg);
+        getImg=findViewById(R.id.getImg);
-        res_img = findViewById(R.id.res_img);
+        res_img=findViewById(R.id.res_img);
-        img_icon = findViewById(R.id.img_icon);
+        img_icon=findViewById(R.id.img_icon);
-        img_delete = findViewById(R.id.img_delete);
+        img_delete=findViewById(R.id.img_delete);
-        tv_loaction = findViewById(R.id.tv_loaction);
+        tv_loaction=findViewById(R.id.tv_loaction);
-        tips = findViewById(R.id.tips);
+        tips=findViewById(R.id.tips);
-        tips_x = findViewById(R.id.tips_x);
+        tips_x=findViewById(R.id.tips_x);
-        Bundle ins = getIntent().getExtras();
+        Bundle ins=getIntent().getExtras();
-        index = ins.getInt("type");
+        index=ins.getInt("type");
-        wid = ins.getString("wid");
+        wid=ins.getString("wid");
-        h_type = ins.getInt("h_type");
+        h_type=ins.getInt("h_type");
-        keys = ins.getBoolean("keys");
+        keys=ins.getBoolean("keys");
-        sobStr = getIntent().getExtras().getString("sob");
+        sobStr=getIntent().getExtras().getString("sob");
-        //Log.e("---sdwStr--",sdwStr);
+        //LogUtil.e("---sdwStr--",sdwStr);
-        sob = new Gson().fromJson(sobStr, StartOrderBean.class);
+        sob=new Gson().fromJson(sobStr, StartOrderBean.class);
         initView(null);
-        customDialog = new CustomDialog(con, "正在定位当前位置...");
+        customDialog=new CustomDialog(con, "正在定位当前位置...");
         customDialog.show();
-        lgdu = new LocationGDUtil(con, hd);
+        lgdu=new LocationGDUtil(con,hd);
         //启动定位
         lgdu.onCreate();
-        lu = new LocationUtil(con, hd);
+        lu=new LocationUtil(con,hd);
         lu.onCreate();
-//        if (keys) {
+        if (keys){
-//            lu = new LocationUtil(con, hd);
+            lu=new LocationUtil(con,hd);
-//            lu.onCreate();
+            lu.onCreate();
-//        }
+        }
         tv_loaction.setOnClickListener(v -> {
-            if (!locationKey) {
+            if (!locationKey){
                 customDialog.show();
                 lgdu.onCreate();
-                lu = new LocationUtil(con, hd);
-                lu.onCreate();
             }
         });
-        hyr = new HuoYuanRequset(con, hd);
+        hyr=new HuoYuanRequset(con,hd);
 //        if (!NfcUtils.hasNfc(con)) {
 //            Toast.makeText(con,"请先开启nfc",Toast.LENGTH_LONG).show();
 //        }else{
@@ -265,42 +223,39 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        name_top.setText("上传" + names[index] + "照片");
+        name_top.setText("上传"+names[index]+"照片");
-        name_body.setText(names[index] + "照片");
+        name_body.setText(names[index]+"照片");
-        if (index == 1) {
+        if(index==1){
             tips.setVisibility(View.VISIBLE);
             tips_x.setVisibility(View.VISIBLE);
         }
         submit.setOnClickListener(v -> {
-            if (imgIds.size() != 0) {
+            if(imgIds.size()!=0){
                 typeRequest();
-            } else {
+            }else{
-                Toast.makeText(con, "请先上传一张图片", Toast.LENGTH_SHORT).show();
+                Toast.makeText(con,"请先上传一张图片",Toast.LENGTH_SHORT).show();
             }
         });
         getImg.setOnClickListener(v -> {
-            if (key) {
+            if(key){
-                Log.e("--imgIds.size()--", imgIds.size() + "");
+                LogUtil.e("--imgIds.size()--",imgIds.size()+"");
-                gia.showPopueWindow(this, index == 2);
+                gia.showPopueWindow(this,index==2);
-            } else {
+            }else{
                 new XPopup.Builder(con)
-                        .asImageViewer(res_img, ub.getData().getUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                        .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
+                Toast.makeText(con,"查看了照片", Toast.LENGTH_SHORT).show();
-//                        .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
-//                        .show();
-                Toast.makeText(con, "查看了照片", Toast.LENGTH_SHORT).show();
             }
         });
         img_delete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                imgIds = new ArrayList<>();
+                imgIds=new ArrayList<>();
-                ub = new UploadBean();
+                ub=new UploadBean();
                 res_img.setVisibility(View.GONE);
                 img_delete.setVisibility(View.GONE);
                 img_icon.setVisibility(View.VISIBLE);
-                key = true;
+                key=true;
             }
         });
     }
@@ -310,15 +265,15 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     @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) {
-            if (null == gia.getFile()) {
+             if (null==gia.getFile()){
-                new ToastUtil(con, Gravity.CENTER, "图片选择失败").show(Toast.LENGTH_SHORT);
+                 new ToastUtil(con, Gravity.CENTER,"图片选择失败").show(Toast.LENGTH_SHORT);
-                return;
+                 return;
-            }
+             }
-            path = gia.getFile().getPath();
+            path=gia.getFile().getPath();
-            Log.e("图片地址:", path);
+            LogUtil.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) {
@@ -328,207 +283,193 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 if (TextUtils.isEmpty(paths)) {
                     paths = image.getPath();
                 }
-                path = paths;
+                path=paths;
-                Log.e("图片地址:", path);
+                LogUtil.e("图片地址:",path);
                 gia.dis();
-                ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
+                ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
             }
         }
     }
 
-    public void initLocation() {
+    public void initLocation(){
         address.setText(lgdu.getAddress());
     }
 
-    public void typeRequest() {
+    public void typeRequest(){
 //        for(int i=0;i<imgIds.size();i++){
-//            Log.e("--imgIds--",imgIds.get(i)+"");
+//            LogUtil.e("--imgIds--",imgIds.get(i)+"");
 //        }
-        switch (index) {
+        switch (index){
             case 0:
                 //装货
-                if (imgIds != null && imgIds.size() > 0) {
+                if(imgIds!=null && imgIds.size()>0) {
                     lub.setLatitude(lgdu.getLatitude() + "");
                     lub.setLongitude(lgdu.getLongitude() + "");
                     lub.setLocationAddress(lgdu.getAddress());
                     lub.setImageId(imgIds);
                     lub.setWaybillId(wid);
-                    Log.e("--装货信息", gson.toJson(lub));
+                    LogUtil.e("--装货信息", gson.toJson(lub));
-                    if (locationKey) {//高德定位
+                    if(locationKey){
-                        if (keys) {
+                        hyr.loading(lub);
-                            if (lu!=null&&lu.getErrorCode()!=161){
+                        if(keys){
-                                ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！");
-                                return;
-                            }
                             nfc();
-                            loadInfo();
+                            up_traffic_start();
-//                            up_traffic_start();
+                            up_image_z();
-//                            up_image_z();
                         }
-                    } else {
+                    }else{
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show();
                     }
 
-                } else {
+                }else{
-                    Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show();
                 }
                 break;
             case 1:
-                if (imgIds != null && imgIds.size() > 0) {
+                if(imgIds!=null && imgIds.size()>0) {
                     //卸货
                     lub.setLatitude(lgdu.getLatitude() + "");
                     lub.setLongitude(lgdu.getLongitude() + "");
                     lub.setLocationAddress(lgdu.getAddress());
                     lub.setImageId(imgIds);
                     lub.setWaybillId(wid);
-                    Log.e("--卸货信息", gson.toJson(lub));
+                    LogUtil.e("--卸货信息", gson.toJson(lub));
-                    if (locationKey) {
+                    if(locationKey){
-                        if (keys) {
+                        if(keys){
-                            if (lu!=null&&lu.getErrorCode()!=161){
-                                ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！");
-                                return;
-                            }
                             nfc();
-                            uploadInfo();
+                            up_traffic_end();
-
+                            up_image();
                         }
-
+                        hyr.dischargeCargo(lub);
-                    } else {
+                    }else{
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show();
                     }
 
-                } else {
+                }else{
-                    Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show();
                 }
                 break;
             case 2:
-                if (imgIds != null && imgIds.size() > 0) {//卸货回单
+                if(imgIds!=null && imgIds.size()>0){
                     //上传回单
-                    urib.setLatitude(lgdu.getLatitude() + "");
+                    urib.setLatitude(lgdu.getLatitude()+"");
-                    urib.setLongitude(lgdu.getLongitude() + "");
+                    urib.setLongitude(lgdu.getLongitude()+"");
                     urib.setLocationAddress(lgdu.getAddress());
                     //装卸货类型
-                    urib.setType(h_type + 1);
+                    urib.setType(h_type+1);
                     //回单id 数组
                     urib.setReceiptId(imgIds);
                     //子运运单ID
                     urib.setWaybillId(wid);
-                    Log.e("--回单信息", gson.toJson(urib));
+                    LogUtil.e("--回单信息",gson.toJson(urib));
-                    if (locationKey) {
+                    if(locationKey) {
                         if (index == 2 && keys) {
-                            if (lu!=null&&lu.getErrorCode()!=161){
-                                ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！");
-                                return;
-                            }
                             up_trafficSign();
                             up_trafficReceipt();
                             receipt_image();
                         }
                         hyr.receipt(urib);
-                    } else {
+                    }{
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show();
                     }
-                } else {
+                }else{
-                    Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show();
                 }
                 break;
-            default:
+            default:break;
-                break;
         }
     }
 
     private StartOrderBean sob;
 
     //上传安联和交通厅-装货
-    public void up_traffic_start() {
+    public void up_traffic_start(){
-        //安联
+            //安联
-        if (sob.getData().getReportAlct() == 1) {
+        if(sob.getData().getReportAlct()==1) {
             Location l = new Location();
             l.setBaiduLongitude(lu.getLongitude());
             l.setBaiduLatitude(lu.getLatitude());
             l.setLocation(lu.getAddress());
             l.setTime(Timer.getTimerT());
-            MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
+            MDPLocationCollectionManager.pickup(con,sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
                 @Override
                 public void onSuccess() {
-                    Log.e("上报安联", "装货上传成功");
+                    LogUtil.e("上报安联", "装货上传成功");
                 }
 
                 @Override
                 public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(装货):", s + s1);
+                    LogUtil.e("上报安联失败(装货):", s + s1);
-                    new MessageUtils().showCenMessage(con, s1);
                 }
             });
         }
         //交通厅
-        if (sob.getData().getReport() == 1) {
+        if(sob.getData().getReport()==1){
-            JTTProcess.start(con, sob, "");
+            JTTProcess.start(con,sob,"");
         }
     }
 
-    public void nfc() {
+    public void nfc(){
 //        if(sob.getData().getNfcId().equals(nfcStr)){
 //            Toast.makeText(con,"nfcId匹配失败",Toast.LENGTH_LONG).show();
 //        }
-        if ("".equals(sob.getData().getNfcId()) || sob.getData().getNfcId() == null) {
+        if("".equals(sob.getData().getNfcId()) || sob.getData().getNfcId()==null){
             return;
         }
         MDPLocationCollectionManager.checkNfc(con, sob.getData().getShippingNoteNumber(),
                 sob.getData().getNfcId(), new OnResultListener() {
-                    @Override
+            @Override
-                    public void onSuccess() {
+            public void onSuccess() {
-                        Toast.makeText(con, "nfcId匹配成功", Toast.LENGTH_LONG).show();
+                Toast.makeText(con,"nfcId匹配成功",Toast.LENGTH_LONG).show();
-                    }
+            }
 
-                    @Override
+            @Override
-                    public void onFailure(String s, String s1) {
+            public void onFailure(String s, String s1) {
-                        Log.e("不匹配", "" + s + s1);
+                LogUtil.e("不匹配",""+s+s1);
-                    }
+            }
-                });
+        });
     }
 
     //上传安联和交通厅-卸货
-    public void up_traffic_end() {
+    public void up_traffic_end(){
         //安联
-        if (sob.getData().getReportAlct() == 1) {
+        if(sob.getData().getReportAlct()==1){
-            Location l = new Location();
+            Location l=new Location();
             l.setBaiduLongitude(lu.getLongitude());
             l.setBaiduLatitude(lu.getLatitude());
             l.setLocation(lu.getAddress());
             l.setTime(Timer.getTimerT());
-            Log.e("-安联卸货信息-", gson.toJson(l));
+            LogUtil.e("-安联卸货信息-",gson.toJson(l));
             MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
                 @Override
                 public void onSuccess() {
-                    Log.e("上报安联", "卸货上传成功");
+                    LogUtil.e("上报安联","卸货上传成功");
                 }
 
                 @Override
                 public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(卸货):", s + s1);
+                    LogUtil.e("上报安联失败(卸货):",s+s1);
                 }
             });
         }
         //交通厅
-        if (sob.getData().getReport() == 1) {
+        if(sob.getData().getReport()==1){
-            JTTProcess.stop(con, sob, "");
+            JTTProcess.stop(con,sob,"");
         }
     }
 
     //上传安联-签收
-    public void up_trafficSign() {
+    public void up_trafficSign(){
         //安联
-        Location l = new Location();
+        Location l=new Location();
         l.setBaiduLongitude(lu.getLongitude());
         l.setBaiduLatitude(lu.getLatitude());
         l.setLocation(lu.getAddress());
         l.setTime(Timer.getTimerT());
-        List<Goods> gs = new ArrayList<>();
+        List<Goods> gs=new ArrayList<>();
         for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if (wid.equals(wayChild.getId() + "")) {
+            if(wid.equals(wayChild.getId()+"")){
                 for (StartOrderBean.DataDTO.WayChildrenDTO.GoodsDTO good : wayChild.getGoods()) {
-                    Goods g = new Goods();
+                    Goods g=new Goods();
                     g.setGoodsName(good.getGoodName());
                     g.setUnit(good.getGoodUnit());
                     g.setItemNo(good.getId());
@@ -543,23 +484,23 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 }
             }
         }
-        MDPLocationCollectionManager.sign(con, sob.getData().getShippingNoteNumber(), l, gs, new com.alct.mdp.callback.OnResultListener() {
+        MDPLocationCollectionManager.sign(con, sob.getData().getShippingNoteNumber(), l,gs, new com.alct.mdp.callback.OnResultListener() {
             @Override
             public void onSuccess() {
-                Log.e("上报安联", "签收成功");
+                LogUtil.e("上报安联","签收成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(签收):", s + s1);
+                LogUtil.e("上报安联失败(签收):",s+s1);
             }
         });
     }
 
     //上传安联-回单
-    public void up_trafficReceipt() {
+    public void up_trafficReceipt(){
         //安联
-        Location l = new Location();
+        Location l=new Location();
         l.setBaiduLongitude(lu.getLongitude());
         l.setBaiduLatitude(lu.getLatitude());
         l.setLocation(lu.getAddress());
@@ -568,23 +509,23 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                Log.e("上报安联", "回单上传成功");
+                LogUtil.e("上报安联","回单上传成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单):", s + s1);
+                LogUtil.e("上报安联失败(回单):",s+s1);
             }
 
         });
     }
 
-    public void up_image_z() {
+    public void up_image_z(){
         ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        File file = new File(path);
+        File file=new File(path);
-        Image image = new Image();
+        Image image=new Image();
-        String base = BitmapUtil.imageToBase64(path);
+        String base= BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
+        image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base);
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
@@ -595,12 +536,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                Log.e("上报安联", "装货照片上传成功");
+                LogUtil.e("上报安联","装货照片上传成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(装货照片):", s + s1);
+                LogUtil.e("上报安联失败(装货照片):",s+s1);
 //              SPUtil.insSP(con,"make","装货",sob.getData().getShippingNoteNumber());
 //              SPUtil.insSP(con,"make","装货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //              Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -610,11 +551,11 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         });
     }
 
-    public void up_image() {
+    public void up_image(){
-        File file = new File(path);
+        File file=new File(path);
-        Image image = new Image();
+        Image image=new Image();
-        String base = BitmapUtil.imageToBase64(path);
+        String base= BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
+        image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base);
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
@@ -625,12 +566,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                Log.e("上报安联", "卸货照片上传成功");
+                LogUtil.e("上报安联","卸货照片上传成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(卸货照片):", s + s1);
+                LogUtil.e("上报安联失败(卸货照片):",s+s1);
 //                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
 //                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -640,12 +581,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         });
     }
 
-    public void receipt_image() {
+    public void receipt_image(){
         ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        File file = new File(path);
+        File file=new File(path);
-        Image image = new Image();
+        Image image=new Image();
-        String base = BitmapUtil.imageToBase64(path);
+        String base= BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
+        image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base);
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
@@ -656,12 +597,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                Log.e("上报安联", "回单照片上传成功");
+                LogUtil.e("上报安联","回单照片上传成功");
             }
 
             @Override
             public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单照片):", s + s1);
+                LogUtil.e("上报安联失败(回单照片):",s+s1);
 //                SPUtil.insSP(con,"make","回单",sob.getData().getShippingNoteNumber());
 ////                SPUtil.insSP(con,"make","回单-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 ////                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -685,7 +626,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         //NfcUtils.mNfcAdapter.disableForegroundDispatch(this);
     }
 
-    String nfcStr = "";
+    String nfcStr="";
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -697,80 +638,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        Log.e("nfc", nfcStr);
+        LogUtil.e("nfc",nfcStr);
     }
 
-    /**
-     * 上传安联和交通厅,平台-装货
-     */
-    private void loadInfo() {
-        //安联
-        if (sob.getData().getReportAlct() == 1) {
-            Location l = new Location();
-            l.setBaiduLongitude(lu.getLongitude());
-            l.setBaiduLatitude(lu.getLatitude());
-            l.setLocation(lu.getAddress());
-            l.setTime(Timer.getTimerT());
-            MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "装货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.start(con, sob, "");
-                    }
-                    //装货照片
-                    up_image_z();
-                    //装货状态
-                    hyr.loading(lub);
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(装货):", s + s1);
-                    new MessageUtils().showCenMessage(con, s1);
-                }
-            });
-        }
-
-    }
-
-    /**
-     * 上传安联和交通厅，平台-卸货
-     */
-    private void uploadInfo() {
-
-        //安联
-        if (sob.getData().getReportAlct() == 1) {
-            Location l = new Location();
-            l.setBaiduLongitude(lu.getLongitude());
-            l.setBaiduLatitude(lu.getLatitude());
-            l.setLocation(lu.getAddress());
-            l.setTime(Timer.getTimerT());
-            Log.e("-安联卸货信息-", gson.toJson(l));
-            MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "卸货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.stop(con, sob, "");
-                    }
-                    //卸货照片-安联
-                    up_image();
-                    //卸货状态-平台
-                    hyr.dischargeCargo(lub);
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(卸货):", s + s1);
-                    new MessageUtils().showCenMessage(con, s1);
-                }
-            });
-        }
-
-
-    }
 
 }

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

@@ -1,713 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Message;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-import com.alct.mdp.MDPLocationCollectionManager;
-import com.alct.mdp.callback.OnResultListener;
-import com.alct.mdp.model.Goods;
-import com.alct.mdp.model.Image;
-import com.alct.mdp.model.Location;
-import com.arpa.hndahesudintocctmsdriver.R;
-import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
-import com.arpa.hndahesudintocctmsdriver.bean.StartOrderBean;
-import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
-import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
-import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
-import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
-import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean;
-import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
-import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
-import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
-import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
-import com.arpa.hndahesudintocctmsdriver.util.file.FileUtil;
-import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
-import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
-import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
-import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil;
-import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
-import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
-import com.arpa.hndahesudintocctmsdriver.util.time.Timer;
-import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
-import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ToastUtils;
-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.util.SmartGlideImageLoader;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ShangChuangImgActivity2 extends BaseAppCompatActivity {
-
-    private TextView submit,name_top,name_body,address,tips,tips_x;
-    private RelativeLayout getImg;
-    private ImageView res_img,img_icon,img_delete;
-    private String[] names={"装货","卸货","回单"};
-    public static String[] TYPE_NAME={"zhuanghuo","xiehuo","huidan"};
-    private int index=0;
-    //
-    private Gson gson=new Gson();
-    //
-    private LUInputBean lub=new LUInputBean();
-    private UploadReceiptInputBean urib=new UploadReceiptInputBean();
-    private LocationGDUtil lgdu;
-    private LocationUtil lu;
-    private List<Integer> imgIds=new ArrayList<>();
-    private UploadBean ub;
-    private HuoYuanRequset hyr;
-    //
-    private GetCarImageAlert gia=new GetCarImageAlert();
-    private CustomDialog customDialog;
-    private int id=0;
-    private boolean key=true;
-    private boolean keys=false;
-    private boolean locationKey=false;
-    private TextView tv_loaction;
-
-    @Override
-    public void msgMethod(Message m) {
-        super.msgMethod(m);
-        switch (m.what){
-            case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("upload")!=null) {
-                    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);
-                        res_img.setVisibility(View.VISIBLE);
-                        img_delete.setVisibility(View.VISIBLE);
-                        img_icon.setVisibility(View.GONE);
-                        key=false;
-                    }else{
-                        Toast.makeText(con,ub.getMsg(),Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("upload");
-                }
-                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(!keys){
-                                Toast.makeText(con,"上传成功",Toast.LENGTH_SHORT).show();
-                                finish();
-                            }else{
-                                Toast.makeText(con,"上传成功",Toast.LENGTH_SHORT).show();
-                                finish();
-                            }
-                        }else{
-                            Toast.makeText(con,bb.getMsg(),Toast.LENGTH_SHORT).show();
-                        }
-                        CacheGroup.cacheList.remove(TYPE_NAME[i]);
-                    }
-                }
-                if(CacheGroup.cacheList.get("carName")!=null){
-                    BaseBean bb=gson.fromJson(CacheGroup.cacheList.get("carName"),BaseBean.class);
-                    if(bb.getCode()==200){
-
-                    }
-                    CacheGroup.cacheList.remove("carName");
-                }
-                break;
-            case 14://定位成功
-                locationKey=true;
-                customDialog.dismiss();
-                tv_loaction.setText("定位成功");
-                tv_loaction.setTextColor(getResources().getColor(R.color.theme_color,null));
-                initLocation();
-                break;
-            case 16://定位失败
-                locationKey=false;
-                customDialog.dismiss();
-                tv_loaction.setText("定位失败，点击重试");
-                tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color,null));
-                Toast.makeText(con,"定位失败，请确认开启定位后重试！",Toast.LENGTH_LONG).show();
-                //定位结果接收
-                //finish();
-                break;
-            case 15:
-                break;
-
-            case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                path= (String) m.obj;
-                Log.e("res:","选定图片结果");
-                Log.e("res:",path);
-                //选定图片结果
-//                if(index==1 || index==2){
-//                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
-//                }
-                hyr.uploadFile(new File(path));
-                break;
-            default:break;
-        }
-    }
-
-    private String wid;
-    private int h_type;
-    String sobStr="";
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StateStyleUtil.stateTextColor(this);
-        setContentView(R.layout.activity_shangchuan);
-        con=this;
-        submit=findViewById(R.id.submit);
-        name_top=findViewById(R.id.name_top);
-        name_body=findViewById(R.id.name_body);
-        address=findViewById(R.id.address);
-        getImg=findViewById(R.id.getImg);
-        res_img=findViewById(R.id.res_img);
-        img_icon=findViewById(R.id.img_icon);
-        img_delete=findViewById(R.id.img_delete);
-        tv_loaction=findViewById(R.id.tv_loaction);
-        tips=findViewById(R.id.tips);
-        tips_x=findViewById(R.id.tips_x);
-        Bundle ins=getIntent().getExtras();
-        index=ins.getInt("type");
-        wid=ins.getString("wid");
-        h_type=ins.getInt("h_type");
-        keys=ins.getBoolean("keys");
-        sobStr=getIntent().getExtras().getString("sob");
-        //Log.e("---sdwStr--",sdwStr);
-        sob=new Gson().fromJson(sobStr, StartOrderBean.class);
-        initView(null);
-        customDialog=new CustomDialog(con, "正在定位当前位置...");
-        customDialog.show();
-        lgdu=new LocationGDUtil(con,hd);
-        //启动定位
-        lgdu.onCreate();
-        lu=new LocationUtil(con,hd);
-        lu.onCreate();
-        if (keys){
-            lu=new LocationUtil(con,hd);
-            lu.onCreate();
-        }
-        tv_loaction.setOnClickListener(v -> {
-            if (!locationKey){
-                customDialog.show();
-                lgdu.onCreate();
-            }
-        });
-        hyr=new HuoYuanRequset(con,hd);
-//        if (!NfcUtils.hasNfc(con)) {
-//            Toast.makeText(con,"请先开启nfc",Toast.LENGTH_LONG).show();
-//        }else{
-//            initData();
-//        }
-    }
-
-    public void initData() {
-        //nfc初始化设置
-        NfcUtils nfcUtils = new NfcUtils(this);
-    }
-
-    @Override
-    public void initView(Object obj) {
-        super.initView(obj);
-        name_top.setText("上传"+names[index]+"照片");
-        name_body.setText(names[index]+"照片");
-        if(index==1){
-            tips.setVisibility(View.VISIBLE);
-            tips_x.setVisibility(View.VISIBLE);
-        }
-        submit.setOnClickListener(v -> {
-            if(imgIds.size()!=0){
-                typeRequest();
-            }else{
-                Toast.makeText(con,"请先上传一张图片",Toast.LENGTH_SHORT).show();
-            }
-        });
-        getImg.setOnClickListener(v -> {
-            if(key){
-                Log.e("--imgIds.size()--",imgIds.size()+"");
-                gia.showPopueWindow(this,true);
-//                gia.showPopueWindow(this,index==2);
-            }else{
-                new XPopup.Builder(con)
-                        .asImageViewer(res_img, ub.getData().getUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
-                        .show();
-//                new XPopup.Builder(con)
-//                        .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
-//                        .show();
-                Toast.makeText(con,"查看了照片", Toast.LENGTH_SHORT).show();
-            }
-        });
-        img_delete.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                imgIds=new ArrayList<>();
-                ub=new UploadBean();
-                res_img.setVisibility(View.GONE);
-                img_delete.setVisibility(View.GONE);
-                img_icon.setVisibility(View.VISIBLE);
-                key=true;
-            }
-        });
-    }
-
-    String path;
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-         if (requestCode == 12 && resultCode == RESULT_OK) {
-             if (null==gia.getFile()){
-                 new ToastUtil(con, Gravity.CENTER,"图片选择失败").show(Toast.LENGTH_SHORT);
-                 return;
-             }
-            path=gia.getFile().getPath();
-            Log.e("图片地址:",path);
-            gia.dis();
-            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) {
-                LocalMedia image = imgs.get(0);
-
-                String paths = image.getAndroidQToPath();
-                if (TextUtils.isEmpty(paths)) {
-                    paths = image.getPath();
-                }
-                path=paths;
-                Log.e("图片地址:",path);
-                gia.dis();
-                ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
-            }
-        }
-    }
-
-    public void initLocation(){
-        address.setText(lgdu.getAddress());
-    }
-
-    public void typeRequest(){
-//        for(int i=0;i<imgIds.size();i++){
-//            Log.e("--imgIds--",imgIds.get(i)+"");
-//        }
-        switch (index){
-            case 0:
-                //装货
-                if(imgIds!=null && imgIds.size()>0) {
-                    lub.setLatitude(lgdu.getLatitude() + "");
-                    lub.setLongitude(lgdu.getLongitude() + "");
-                    lub.setLocationAddress(lgdu.getAddress());
-                    lub.setImageId(imgIds);
-                    lub.setWaybillId(wid);
-                    Log.e("--装货信息", gson.toJson(lub));
-                    if(locationKey){
-//                        hyr.loading(lub);
-                        if(keys){
-                            nfc();
-                            up_traffic_start();
-                            up_image_z();
-                        }
-                    }else{
-                        Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show();
-                    }
-
-                }else{
-                    Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show();
-                }
-                break;
-            case 1:
-                if(imgIds!=null && imgIds.size()>0) {
-                    //卸货
-                    lub.setLatitude(lgdu.getLatitude() + "");
-                    lub.setLongitude(lgdu.getLongitude() + "");
-                    lub.setLocationAddress(lgdu.getAddress());
-                    lub.setImageId(imgIds);
-                    lub.setWaybillId(wid);
-                    Log.e("--卸货信息", gson.toJson(lub));
-                    if(locationKey){
-                        if(keys){
-                            nfc();
-                            up_traffic_end();
-                            up_image();
-                        }
-//                        hyr.dischargeCargo(lub);
-                    }else{
-                        Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show();
-                    }
-
-                }else{
-                    Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show();
-                }
-                break;
-            case 2:
-                if(imgIds!=null && imgIds.size()>0){//卸货回单
-                    //上传回单
-                    urib.setLatitude(lgdu.getLatitude()+"");
-                    urib.setLongitude(lgdu.getLongitude()+"");
-                    urib.setLocationAddress(lgdu.getAddress());
-                    //装卸货类型
-                    urib.setType(h_type+1);
-                    //回单id 数组
-                    urib.setReceiptId(imgIds);
-                    //子运运单ID
-                    urib.setWaybillId(wid);
-                    Log.e("--回单信息",gson.toJson(urib));
-                    if(locationKey) {
-                        if (index == 2 && keys) {
-                            up_trafficSign();
-                            up_trafficReceipt();
-                            receipt_image();
-                        }
-//                        hyr.receipt(urib);
-                    }else{
-                        Toast.makeText(con,"定位异常，请重新定位",Toast.LENGTH_SHORT).show();
-                    }
-                }else{
-                    Toast.makeText(con,"图片上传异常，请重新上传",Toast.LENGTH_SHORT).show();
-                }
-                break;
-            default:break;
-        }
-    }
-
-    private StartOrderBean sob;
-
-    //上传安联和交通厅-装货
-    public void up_traffic_start(){
-            //安联
-        if(sob.getData().getReportAlct()==1) {
-
-            StartOrderBean.DataDTO.WayChildrenDTO data = new StartOrderBean.DataDTO.WayChildrenDTO();
-            for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-                if (wayChild.getType()==1){
-                    data = wayChild;
-                }
-            }
-
-            Location l = new Location();
-            l.setBaiduLongitude(Double.parseDouble(data.getLongitude()));
-            l.setBaiduLatitude(Double.parseDouble(data.getLatitude()));
-            l.setLocation(data.getAddress());
-            l.setTime(data.getImageTakenDate());
-            MDPLocationCollectionManager.pickup(con,sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "装货上传成功");
-                    ToastUtils.showToast(ShangChuangImgActivity2.this,"装货上传成功");
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(装货):", s + s1);
-                    ToastUtils.showToast(ShangChuangImgActivity2.this,s + s1);
-                }
-            });
-        }
-        //交通厅
-        if(sob.getData().getReport()==1){
-            JTTProcess.start(con,sob,"");
-        }
-    }
-
-    public void nfc(){
-//        if(sob.getData().getNfcId().equals(nfcStr)){
-//            Toast.makeText(con,"nfcId匹配失败",Toast.LENGTH_LONG).show();
-//        }
-        if("".equals(sob.getData().getNfcId()) || sob.getData().getNfcId()==null){
-            return;
-        }
-        MDPLocationCollectionManager.checkNfc(con, sob.getData().getShippingNoteNumber(),
-                sob.getData().getNfcId(), new OnResultListener() {
-            @Override
-            public void onSuccess() {
-                Toast.makeText(con,"nfcId匹配成功",Toast.LENGTH_LONG).show();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("不匹配",""+s+s1);
-            }
-        });
-    }
-
-    //上传安联和交通厅-卸货
-    public void up_traffic_end(){
-        //安联
-        if(sob.getData().getReportAlct()==1){
-            StartOrderBean.DataDTO.WayChildrenDTO data = new StartOrderBean.DataDTO.WayChildrenDTO();
-            for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-                if (wayChild.getType()==2){
-                    data = wayChild;
-                }
-            }
-            Location l=new Location();
-            l.setBaiduLongitude(Double.parseDouble(data.getLongitude()));
-            l.setBaiduLatitude(Double.parseDouble(data.getLatitude()));
-            l.setLocation(data.getAddress());
-            l.setTime(data.getImageTakenDate());
-            Log.e("-安联卸货信息-",gson.toJson(l));
-            MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联","卸货上传成功");
-                    ToastUtils.showToast(ShangChuangImgActivity2.this,"卸货上传成功");
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(卸货):",s+s1);
-                    ToastUtils.showToast(ShangChuangImgActivity2.this,s+s1);
-                }
-            });
-        }
-        //交通厅
-        if(sob.getData().getReport()==1){
-            JTTProcess.stop(con,sob,"");
-        }
-    }
-
-    //上传安联-签收
-    public void up_trafficSign(){
-        StartOrderBean.DataDTO.WayChildrenDTO data = new StartOrderBean.DataDTO.WayChildrenDTO();
-        for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if (wayChild.getType()==2){
-                data = wayChild;
-            }
-        }
-        //安联
-        Location l=new Location();
-        l.setBaiduLongitude(Double.parseDouble(data.getLongitude()));
-        l.setBaiduLatitude(Double.parseDouble(data.getLatitude()));
-        l.setLocation(data.getAddress());
-        l.setTime(data.getImageTakenDate());
-        List<Goods> gs=new ArrayList<>();
-        for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if(wid.equals(wayChild.getId()+"")){
-                for (StartOrderBean.DataDTO.WayChildrenDTO.GoodsDTO good : wayChild.getGoods()) {
-                    Goods g=new Goods();
-                    g.setGoodsName(good.getGoodName());
-                    g.setUnit(good.getGoodUnit());
-                    g.setItemNo(good.getId());
-                    //实收
-                    g.setQuantity(1);
-                    //应收
-                    g.setReceivedQuantity(1);
-                    //破损
-                    g.setDamageQuantity(1);
-                    //丢失
-                    g.setQuantity(1);
-                }
-            }
-        }
-        MDPLocationCollectionManager.sign(con, sob.getData().getShippingNoteNumber(), l,gs, new OnResultListener() {
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联","签收成功");
-                ToastUtils.showToast(ShangChuangImgActivity2.this,"签收成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                ToastUtils.showToast(ShangChuangImgActivity2.this,s+s1);
-                Log.e("上报安联失败(签收):",s+s1);
-            }
-        });
-    }
-
-    //上传安联-回单
-    public void up_trafficReceipt(){
-        StartOrderBean.DataDTO.WayChildrenDTO data = new StartOrderBean.DataDTO.WayChildrenDTO();
-        for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if (wayChild.getType()==2){
-                data = wayChild;
-            }
-        }
-        //安联
-        Location l=new Location();
-        l.setBaiduLongitude(Double.parseDouble(data.getLongitude()));
-        l.setBaiduLatitude(Double.parseDouble(data.getLatitude()));
-        l.setLocation(data.getAddress());
-        l.setTime(data.getImageTakenDate());
-        MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联","回单上传成功");
-                ToastUtils.showToast(ShangChuangImgActivity2.this,"回单上传成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单):",s+s1);
-                ToastUtils.showToast(ShangChuangImgActivity2.this,s+s1);
-            }
-
-        });
-    }
-
-    public void up_image_z(){
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-
-        StartOrderBean.DataDTO.WayChildrenDTO data = new StartOrderBean.DataDTO.WayChildrenDTO();
-        for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if (wayChild.getType()==1){
-                data = wayChild;
-            }
-        }
-
-        File file=new File(path);
-        Image image=new Image();
-        String base= BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base);
-        image.setFileExt(FileUtil.lastName(file));
-        image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(data.getImageTakenDate());
-        image.setBaiduLongitude(Double.parseDouble(data.getLongitude()));
-        image.setBaiduLatitude(Double.parseDouble(data.getLatitude()));
-        image.setLocation(data.getAddress());
-        MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联","装货照片上传成功");
-                ToastUtils.showToast(ShangChuangImgActivity2.this,"装货照片上传成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(装货照片):",s+s1);
-                ToastUtils.showToast(ShangChuangImgActivity2.this,s+s1);
-//              SPUtil.insSP(con,"make","装货",sob.getData().getShippingNoteNumber());
-//              SPUtil.insSP(con,"make","装货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
-//              Intent serviceIn=new Intent(con, MakeUpAlService.class);
-//              startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void up_image(){
-
-        StartOrderBean.DataDTO.WayChildrenDTO data = new StartOrderBean.DataDTO.WayChildrenDTO();
-        for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if (wayChild.getType()==2){
-                data = wayChild;
-            }
-        }
-
-        File file=new File(path);
-        Image image=new Image();
-        String base= BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base);
-        image.setFileExt(FileUtil.lastName(file));
-        image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(data.getImageTakenDate());
-        image.setBaiduLongitude(Double.parseDouble(data.getLongitude()));
-        image.setBaiduLatitude(Double.parseDouble(data.getLatitude()));
-        image.setLocation(data.getAddress());
-        MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联","卸货照片上传成功");
-                ToastUtils.showToast(ShangChuangImgActivity2.this,"卸货照片上传成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(卸货照片):",s+s1);
-                ToastUtils.showToast(ShangChuangImgActivity2.this,s+s1);
-//                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
-//                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
-//                Intent serviceIn=new Intent(con, MakeUpAlService.class);
-//                startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void receipt_image(){
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        StartOrderBean.DataDTO.WayChildrenDTO data = new StartOrderBean.DataDTO.WayChildrenDTO();
-        for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if (wayChild.getType()==2){
-                data = wayChild;
-            }
-        }
-
-        File file=new File(path);
-        Image image=new Image();
-        String base= BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/"+ FileUtil.lastName(file) +";base64,"+base);
-        image.setFileExt(FileUtil.lastName(file));
-        image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(data.getImageTakenDate());
-        image.setBaiduLongitude(Double.parseDouble(data.getLongitude()));
-        image.setBaiduLatitude(Double.parseDouble(data.getLatitude()));
-        image.setLocation(data.getAddress());
-        MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联","回单照片上传成功");
-                ToastUtils.showToast(ShangChuangImgActivity2.this,"回单照片上传成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单照片):",s+s1);
-                ToastUtils.showToast(ShangChuangImgActivity2.this,s+s1);
-//                SPUtil.insSP(con,"make","回单",sob.getData().getShippingNoteNumber());
-////                SPUtil.insSP(con,"make","回单-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
-////                Intent serviceIn=new Intent(con, MakeUpAlService.class);
-////                startService(serviceIn);
-            }
-
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        //开启前台调度系统
-        //NfcUtils.mNfcAdapter.enableForegroundDispatch(this, NfcUtils.mPendingIntent, NfcUtils.mIntentFilter, NfcUtils.mTechList);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        //关闭前台调度系统
-        //NfcUtils.mNfcAdapter.disableForegroundDispatch(this);
-    }
-
-    String nfcStr="";
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        //当该Activity接收到NFC标签时，运行该方法
-        //调用工具方法，读取NFC数据
-        try {
-            nfcStr = NfcUtils.readNFCId(intent);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        Log.e("nfc",nfcStr);
-    }
-
-
-}

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

@@ -22,6 +22,7 @@ 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.util.log.LogUtil;
 import com.dahe.mylibrary.net.CommonResponseBean;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -82,12 +83,12 @@ public class LoginActivity extends BaseActivity {
                 break;
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get(CODE_RESULT) != null) {
-                    Log.e("--短信发送res--", "短信发送成功");
+                    LogUtil.e("--短信发送res--", "短信发送成功");
                 }
                 if (CacheGroup.cacheList.get(LOGIN_RESULT) != null) {
                     //存储登录记录
                     loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
-                    Log.e("--登录信息--", new Gson().toJson(loginBean));
+                    LogUtil.e("--登录信息--", new Gson().toJson(loginBean));
                     if (loginBean.getCode() == 200) {
                         SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken());
                         SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
@@ -157,7 +158,7 @@ public class LoginActivity extends BaseActivity {
         ssb.setSpan(new ClickableSpan() {
             @Override
             public void onClick(View widget) {
-                Log.e("-用户服务协议-", url1);
+                LogUtil.e("-用户服务协议-", url1);
                 //用户服务协议点击事件
                 Intent in = new Intent(con, WebActivity.class);
                 in.putExtra("title", "用户服务协议");
@@ -200,7 +201,7 @@ public class LoginActivity extends BaseActivity {
         getCode.setOnClickListener(v -> {
             String phone = String.valueOf(input_phone.getText());
             if ("".equals(phone) || phone == null) {
-                Log.e("点击事件", "请先输入手机号");
+                LogUtil.e("点击事件", "请先输入手机号");
                 Toast.makeText(con, "请先输入手机号", Toast.LENGTH_SHORT).show();
             } else {
                 if (11 == phone.length() && phone.indexOf("1") == 0) {
@@ -217,7 +218,7 @@ public class LoginActivity extends BaseActivity {
         btn_login.setOnClickListener(v -> {
             String phone = String.valueOf(input_phone.getText());
             String code = String.valueOf(input_code.getText());
-            Log.e("--code--", code);
+            LogUtil.e("--code--", code);
             if (judgeFormat(phone, code)) {
                 if (key) {
                     LoginRegInputBean lb = new LoginRegInputBean();

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

@@ -29,7 +29,6 @@ import androidx.cardview.widget.CardView;
 import androidx.core.app.ActivityCompat;
 
 import com.alct.mdp.MDPLocationCollectionManager;
-import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
@@ -37,6 +36,7 @@ import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
 import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.bumptech.glide.Glide;
 import com.esign.esignsdk.EsignSdk;
 import com.google.gson.Gson;
@@ -85,6 +85,9 @@ public class WelcomeActivity extends BaseAppCompatActivity {
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
+        System.out.println("csdf");
+        System.out.println("csdf");
+        System.out.println("csdf");
         switch (m.what) {
             case 200:
                 if (CacheGroup.cacheList.get("getImage") != null) {
@@ -219,10 +222,10 @@ public class WelcomeActivity extends BaseAppCompatActivity {
 
             br.close();
         } catch (java.io.FileNotFoundException ex) {
-            Log.d("TAG", "WhiteListPermissionFilter.cfg - FileNotFoundException");
+            LogUtil.e("TAG", "WhiteListPermissionFilter.cfg - FileNotFoundException");
             return true;
         } catch (java.io.IOException ex) {
-            Log.d("TAG", "WhiteListPermissionFilter.cfg - IOException");
+            LogUtil.e("TAG", "WhiteListPermissionFilter.cfg - IOException");
             return true;
         }
 
@@ -230,7 +233,7 @@ public class WelcomeActivity extends BaseAppCompatActivity {
 
         while (it.hasNext()) {
             String whitelistItem = it.next();
-            Log.d("TAG", "whitelistItem:" + whitelistItem);
+            LogUtil.e("TAG", "whitelistItem:" + whitelistItem);
             if (packagename.contains(whitelistItem)) {
                 return false;
             }
@@ -255,14 +258,14 @@ public class WelcomeActivity extends BaseAppCompatActivity {
 
             @Override
             public void onFailure(Call call, IOException e) {
-                Log.e("error", "配置项信息加载失败" + e.toString());
+                LogUtil.e("error", "配置项信息加载失败" + e.toString());
             }
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
                 if (response.code() == 200) {
                     String body = response.body().string();
-                    Log.e("-body-", body);
+                    LogUtil.e("-body-", body);
                     ConfigBean cb = new Gson().fromJson(body, ConfigBean.class);
                     if (cb.getCode() == 200) {
                         ConfigParts.setParts(con, cb);
@@ -308,12 +311,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
         }, cd * 1000);
     }
 
-//    String keys = "f9d35b1133cff1f6e3960c89b249e03f";
+    String keys = "f9d35b1133cff1f6e3960c89b249e03f";
-//    String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ==";
+    String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ==";
-
-    String keys = "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==";
-
 
     public void init() {
         String state = SPUtil.getSP(con, "state_data", "authorization_state");
@@ -326,13 +325,13 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 res.updateConfiguration(config, res.getDisplayMetrics());
                 //安联初始化
                 if (context.getPackageName().equals(getCurrentProcessName(context))) {
-                    //Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
+                    //LogUtil.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
-                    MDPLocationCollectionManager.initialize(getApplicationContext(), BuildConfig.OPEN_AL_URL);
+                    MDPLocationCollectionManager.initialize(getApplicationContext(), "https://oapi.alct56.com");
                 }
                 //在使用SDK各组件之前初始化context信息，传入ApplicationContext
                 // 路由初始化
                 JVerificationInterface.setDebugMode(true);
-                JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+                JVerificationInterface.init(con, 5000, (code, msg) -> LogUtil.e("tag", "code = " + code + " msg = " + msg));
                 //友盟
                 //设置非debug版本开启
                 if (!isDebugVersion(con)) {
@@ -341,7 +340,7 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 EsignSdk.getInstance().init(keys, license);
                 JTTProcess.init(getApplication());
             } catch (Exception e) {
-                Log.e("-error-", "初始化失败sss");
+                LogUtil.e("-error-", "初始化失败sss");
             }
         }
         SPUtil.insSP(con, "state_data", "authorization_state", "1");

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

@@ -24,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
 import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
@@ -291,14 +292,14 @@ public class MyFragment extends BaseFragment {
 
     @Subscribe
     public void  processResult(VehicleEvent event) {
-        Log.e("-msg-",event.getMessage());
+        LogUtil.e("-msg-",event.getMessage());
         if(!"挂".equals(event.getMessage())) {
             ur.vehicleList("1");
         }
     }
     @Subscribe
     public void personResult(PersonEvent home) {
-        Log.e("-res-", home.getMessage());
+        LogUtil.e("-res-", home.getMessage());
         if (ur != null) {
             ur.User();
         }

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

@@ -16,6 +16,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
@@ -35,7 +36,6 @@ import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseFragment;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
 import com.zhpan.bannerview.BannerViewPager;
 import com.zhpan.bannerview.constants.PageStyle;
 
@@ -110,7 +110,7 @@ public class WoDeFragment extends BaseFragment {
     public void initRefreshLoad(){
         refreshLayout=root.findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新","pps");
+            LogUtil.e("下拉刷新","pps");
             ur.User();
             ur.driverAuthData();
             ur.vehicleList("1");
@@ -177,11 +177,8 @@ public class WoDeFragment extends BaseFragment {
         headportraitUrl.setOnClickListener(v1 -> {
             if(ub.getData().getHeadportraitUrl()!=null && !ub.getData().getHeadportraitUrl().equals("")){
                 new XPopup.Builder(con)
-                        .asImageViewer(headportraitUrl,ub.getData().getHeadportraitUrl(),new SmartGlideImageLoader(R.mipmap.ic_launcher_round))
+                        .asImageViewer(headportraitUrl,ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
                         .show();
-//                new XPopup.Builder(con)
-//                        .asImageViewer(headportraitUrl,ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
-//                        .show();
             }else{
                 Intent in=new Intent(con, PersonalAuthActivity.class);
                 startActivity(in);
@@ -257,7 +254,7 @@ public class WoDeFragment extends BaseFragment {
             }
             data_view.setVisibility(View.VISIBLE);
             ins_view.setVisibility(View.GONE);
-            Log.e("--body--",gson.toJson(clb.getData().get(position)));
+            LogUtil.e("--body--",gson.toJson(clb.getData().get(position)));
             v.setOnClickListener(v1 -> {
                 Intent in=new Intent(con, VehicleAuthActivity.class);
                 in.putExtra("carId",clb.getData().get(position).getCarId());

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

@@ -11,6 +11,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
@@ -108,13 +109,13 @@ public class NewsActivity extends BaseAppCompatActivity {
     public void initRefreshLoad(){
         refreshLayout=findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新","pps");
+            LogUtil.e("下拉刷新","pps");
             index=1;
             new NewsRequest().getXiaoXiList(con,hd,type,index);
         });
         refreshLayout.autoRefresh();
         refreshLayout.setOnLoadMoreListener(refreshLayout -> {
-            Log.e("上拉加载","bbs");
+            LogUtil.e("上拉加载","bbs");
             index++;
             new NewsRequest().getXiaoXiList(con,hd,type,index);
             refreshLayout.finishLoadMore();

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

@@ -14,6 +14,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.bean.XiaoXiListBean;
@@ -68,7 +69,7 @@ public class NewsFragment extends BaseFragment {
         refreshLayout=root.findViewById(R.id.srl);
         refreshLayout.setEnableLoadMore(true);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新","pps");
+            LogUtil.e("下拉刷新","pps");
             new NewsRequest().getXiaoXiLists(con,hd);
         });
         refreshLayout.autoRefresh();

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

@@ -12,6 +12,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -131,7 +132,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
         super.onActivityResult(requestCode, resultCode, data);
          if (requestCode == 12 && resultCode == RESULT_OK) {
             path=gia.getFile().getPath();
-            Log.e("图片地址:",path);
+            LogUtil.e("图片地址:",path);
             gia.dis();
             ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -144,7 +145,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
                     paths = image.getPath();
                 }
                 path=paths;
-                Log.e("图片地址:",path);
+                LogUtil.e("图片地址:",path);
                 gia.dis();
                 ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
             }
@@ -164,7 +165,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
         ibib.setBankName(bankName);
         ibib.setCardUserType(1);
         ibib.setImageId(ib.getData().getId());
-        Log.e("-res-",new Gson().toJson(ibib));
+        LogUtil.e("-res-",new Gson().toJson(ibib));
         qr.insBankCard(ibib);
     }
 

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

@@ -16,6 +16,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -34,7 +35,6 @@ import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 
 import org.jetbrains.annotations.NotNull;
 
-
 public class WalletFragment extends BaseFragment{
 
     public static UserBean userBean;
@@ -138,7 +138,7 @@ public class WalletFragment extends BaseFragment{
     public void initRefreshLoad(){
         refreshLayout=root.findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新","pps");
+            LogUtil.e("下拉刷新","pps");
             qr.getBankCardList();
             qr.getContracts();
             ur.User();
@@ -182,7 +182,7 @@ public class WalletFragment extends BaseFragment{
                     .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
                     .asConfirm("好运值说明", "好运值是您在大河好运网络货运平台所赚取的运费总额，包括已提现到银行卡的金额和未提现的电子账户余额。",
                             "取消", "确认",
-                            () -> Log.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
+                            () -> LogUtil.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
                     .show();
         });
         //运单量
@@ -221,8 +221,8 @@ public class WalletFragment extends BaseFragment{
         }
     }
 
-    //初始化银行卡信息
+   //初始化银行卡信息
-    public void initBack(){
+   public void initBack(){
         if(bcb.getData() !=null && bcb.getData().getRecords()!=null && bcb.getData().getRecords().size()>=1){
             bank_title_1.setText(bcb.getData().getRecords().get(0).getBankName());
             bank_number.setText(bcb.getData().getRecords().get(0).getCardNo());
@@ -234,17 +234,17 @@ public class WalletFragment extends BaseFragment{
             bank_add.setVisibility(View.VISIBLE);
             bank_remove.setVisibility(View.GONE);
         }
-    }
+   }
 
-    //初始化电子账户信息
+   //初始化电子账户信息
-    public void initContracts(){
+   public void initContracts(){
-        if(cb.getData()!=null && !StringUtil.isNull(cb.getData().getChildAcctNo(),"").equals("")) {
+       if(cb.getData()!=null && !StringUtil.isNull(cb.getData().getChildAcctNo(),"").equals("")) {
-            bank_title_2.setText("浦发银行电子账户");
+           bank_title_2.setText("浦发银行电子账户");
-            bank2_number.setText(cb.getData().getChildAcctNo());
+           bank2_number.setText(cb.getData().getChildAcctNo());
-            bank2_number.setVisibility(View.VISIBLE);
+           bank2_number.setVisibility(View.VISIBLE);
-            bank_add2.setVisibility(View.GONE);
+           bank_add2.setVisibility(View.GONE);
-        }
+       }
-    }
+   }
 
     public static boolean isInsBank=false;
 
@@ -279,7 +279,7 @@ public class WalletFragment extends BaseFragment{
 //                .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
 //                .asConfirm("好运值说明", "好运值是您在大河好运网络货运平台所赚取的运费总额，包括已提现到银行卡的金额和未提现的电子账户余额。",
 //                        "取消", "确认",
-//                        () -> Log.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
+//                        () -> LogUtil.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
 //                .show();
 //    }
 //

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

@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.bean.ConfigRecordBean;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
 import com.arpa.hndahesudintocctmsdriver.weight.pop.CenterPop;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
@@ -225,7 +226,7 @@ public class WithdrawalActivity extends BaseActivity {
     public void initRefreshLoad(){
         srl=findViewById(R.id.srl);
         srl.setOnRefreshListener(refreshLayout -> {
-            Log.e("下拉刷新","pps");
+            LogUtil.e("下拉刷新","pps");
             qr.changeRecord();
 
 //            if("".equals(carId)){

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

@@ -94,13 +94,10 @@ public class WebActivity extends BaseActivity {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 //返回值是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);
@@ -177,13 +174,11 @@ public class WebActivity extends BaseActivity {
 
         @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 UserParts.getUser(con).getData().getToken();
         }
 

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

@@ -1,112 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.util;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
-
-import com.arpa.hndahesudintocctmsdriver.bean.JTT;
-import com.arpa.hndahesudintocctmsdriver.bean.StartOrderBean;
-import com.arpa.hndahesudintocctmsdriver.constant.JTTConstant;
-import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
-import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
-import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
-import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
-import com.arpa.hndahesudintocctmsdriver.service.TrackService;
-import com.arpa.hndahesudintocctmsdriver.ui.home.HuoYuanFragmengt;
-import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
-import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
-import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
-import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
-import com.dahe.mylibrary.utils.SelectPhotoUtils5;
-import com.google.gson.Gson;
-
-/**
- * @ClassName BillLocationUtils
- * @Author 用户
- * @Date 2022/10/17 10:24
- * @Description TODO
- */
-public class BillLocationUtils {
-
-    private Context con;
-
-
-    private static class SingletonHolder {
-        private static final BillLocationUtils INSTANCE = new BillLocationUtils();
-    }
-
-    private BillLocationUtils() {
-    }
-
-    public static final BillLocationUtils getInstance() {
-        return SingletonHolder.INSTANCE;
-    }
-
-    private HuoYuanRequset hyr;
-    private UserRequset ur;
-    public void getBillLocation(Context con) {
-        this.con = con;
-        hyr = new HuoYuanRequset(con, hd);
-        ur = new UserRequset(con, hd);
-        //获取执行中的运单
-        hyr.startOrder(0);
-    }
-
-    public Handler hd = new Handler(msg -> {
-        msgMethod(msg);
-        return false;
-    });
-
-    public void msgMethod(Message m) {
-        switch (m.what) {
-            case RequsetCodeConstants.SUCCESS:
-                Gson gson = new Gson();
-//                Toast.makeText(con,RequsetCodeConstants.FEEDBACK_TEXT,Toast.LENGTH_SHORT).show();
-                if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER) != null) {
-                    StartOrderBean sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
-                    if (sob.getCode() == 200) {
-                        if (sob.getData() != null) {
-                            SPUtil.insSP(con, JTTConstant.JTT_DATA_NAME, JTTConstant.JTT_DATA_ORDER_KEY, gson.toJson(sob));
-                            initStart(sob);
-                            StartOrderParts.setStartOrder(con, sob);
-                            ur.getJtts(sob.getData().getShippingNoteNumber());
-                        }
-                    } else {
-                        Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove(HuoYuanFragmengt.START_ORDER);
-                    break;
-                }
-
-                if (CacheGroup.cacheList.get("jttRes") != null) {
-                    JTT jtt = gson.fromJson(CacheGroup.cacheList.get("jttRes"), JTT.class);
-                    if (jtt.getCode() == 200) {
-                        SPUtil.insSP(con, "data", "jtt", CacheGroup.cacheList.get("jttRes"));
-                        JTTProcess.auth(con);
-                    } else {
-                        Toast.makeText(con, StringUtil.isNull(jtt.getMsg(), "返回错误"), Toast.LENGTH_LONG).show();
-                    }
-                    CacheGroup.cacheList.remove("jttRes");
-                }
-        }
-    }
-
-    private void initStart(StartOrderBean sob) {
-        if (sob.getData() != null) {
-            if (sob != null && sob.getData() != null && 0 < sob.getData().getWayChildren().size()) {
-                //order_start.setVisibility(View.VISIBLE);
-                SPUtil.insSP(con, "order", "ShippingNoteNumber", sob.getData().getShippingNoteNumber());
-                Log.e("开始轨迹上传服务", "-----");
-                Intent serviceIn = new Intent(con, TrackService.class);
-                con.startService(serviceIn);
-            } else {
-                SPUtil.insSP(con, "order", "ShippingNoteNumber", "");
-            }
-        }
-    }
-}

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

@@ -1,70 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.util
-
-import android.content.Context
-import android.content.Intent
-import com.arpa.hndahesudintocctmsdriver.cuspop.MessagePop
-import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop
-import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity
-import com.lxj.xpopup.XPopup
-
-/**
- * @ClassName MessageUtils
- * @Author 用户
- * @Date 2023/8/15 09:51
- * @Description TODO
- */
-class MessageUtils {
-
-    companion object {
-        fun getInstance() = InstanceHelper.sSingle
-    }
-
-    object InstanceHelper {
-        val sSingle = MessageUtils()
-    }
-
-    fun showCenMessage(ctx: Context, message: String) {
-        XPopup.Builder(ctx) //
-            .hasNavigationBar(false)
-            .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
-            .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{
-                override fun onItemClick(startTime: String, endTime: String) {
-                }
-            }))
-            .show()
-    }
-
-    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()
-
-    }
-
-}

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

@@ -20,7 +20,6 @@ public class LocationUtil{
 
     private double latitude;
     private double longitude;
-    private int errorCode;
     private String address;
     private Context con;
     private Handler hd;
@@ -40,10 +39,6 @@ public class LocationUtil{
         return longitude;
     }
 
-    public double getErrorCode() {
-        return errorCode;
-    }
-
     public String getAddress() {
         return address;
     }
@@ -67,7 +62,7 @@ public class LocationUtil{
         //LocationMode.Hight_Accuracy：高精度；
         //LocationMode. Battery_Saving：低功耗；
         //LocationMode. Device_Sensors：仅使用设备；
-        option.setCoorType("BD09ll");
+        option.setCoorType("GCJ02");
         //可选，设置返回经纬度坐标类型，默认GCJ02
         //GCJ02：国测局坐标；
         //BD09ll：百度经纬度坐标；
@@ -117,8 +112,7 @@ public class LocationUtil{
             float radius = location.getRadius();    //获取定位精度，默认值为0.0f
             String coorType = location.getCoorType();
             //获取经纬度坐标类型，以LocationClientOption中设置过的坐标类型为准
-            errorCode = location.getLocType();
+            int errorCode = location.getLocType();
-            String locTypeDescription = location.getLocTypeDescription();
             //获取定位类型、定位错误返回码，具体信息可参照类参考中BDLocation类中的说明
             Log.e("定位位置address",address+"");
             Log.e("定位坐标latitude",latitude+"");

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/log/LogUtil.java

@@ -1,40 +1,176 @@
 package com.arpa.hndahesudintocctmsdriver.util.log;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.Build;
 import android.util.Log;
 
-import java.security.SecureRandom;
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.DESKeySpec;
 
 /**
- * @author hlh
+ * author :
- * @version 1.0.0
+ * e-mail :
- * @date 2022/1/10 16:55
+ * time   :
- * @description:日志工具类
+ * desc   : Log日志输出工具类
+ * version: 1.0
  */
-public class LogUtil{
+public class LogUtil {
-
+    public static boolean isDebug = BuildConfig.DEBUG;
-    public static void show(String title,String value){
+    // 是否在log中显示行号
-        Log.e(title,value);
+    public static final String TAG = "com.hddhsd.drive";
-        Log.d(title,value);
+    public static boolean SHOW_LINE_NUMBER_IN_LOG = isDebug;
+    //是否已初始化
+    public static boolean initFlag = false;
 
+    public static void init(boolean debugFlag) {
+        isDebug = debugFlag;
+        SHOW_LINE_NUMBER_IN_LOG = debugFlag;
+        initFlag = true;
     }
 
+    /**
+     * 打印Log.w信息
+     *
+     * @param aPrintLogStr 打印信息字符串
+     */
+    public static void w(String aPrintLogStr) {
+        log(TAG, aPrintLogStr, Log.WARN, false);
+    }
+
+    public static void w(String tag, String aPrintLogStr) {
+        log(tag, aPrintLogStr, Log.WARN, false);
+    }
+
+    public static void i(String tag, String aPrintLogStr) {
+        log(tag, aPrintLogStr, Log.INFO, false);
+    }
+
+    public static void i(String aPrintLogStr) {
+        log(TAG, aPrintLogStr, Log.INFO, false);
+    }
+
+    public static void callerI(String aPrintLogStr) {
+        log(TAG, aPrintLogStr, Log.INFO, true);
+    }
+
+    public static void d(String tag, String aPrintLogStr) {
+        log(tag, aPrintLogStr, Log.DEBUG, false);
+    }
+
+    public static void d(String aPrintLogStr) {
+        log(TAG, aPrintLogStr, Log.DEBUG, false);
+    }
+
+    public static void e(String tag, String aPrintLogStr) {
+        log(tag, aPrintLogStr, Log.ERROR, false);
+    }
+
+    public static void e(String aPrintLogStr) {
+        log(TAG, aPrintLogStr, Log.ERROR, false);
+    }
+
+    public static void v(String tag, String aPrintLogStr) {
+        log(tag, aPrintLogStr, Log.VERBOSE, false);
+    }
+    /**
+     * 判断当前应用是否是debug状态
+     */
+    public static boolean isApkInDebug(Context context) {
+        try {
+            ApplicationInfo info = context.getApplicationInfo();
+            return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    /**
+     * @param tag        log的tag
+     * @param content    log的内容
+     * @param logType    log的类型,如Log.INFO,Log.DEBUG等
+     * @param showCaller 是否显示调用者的方法名和行号等
+     */
+    @SuppressLint("DefaultLocale")
+    public static void log(String tag, String content, int logType, boolean showCaller) {
+        if (!initFlag) {
+            init(true);
+            Log.e("LogUtil", "LogUtil没有初始化，请先初始化后使用，如果未初始化Log将不会输出显示");
+        }
+        if (isDebug) {
+            if (SHOW_LINE_NUMBER_IN_LOG) {
+                Throwable throwable = new Throwable();
+
+                 //LogUtils.LOGI的depth是0, 该函数的depth是1, 调用者的depth是2,调用者的调用者是3
+                int methodDepth = 2;
+                StackTraceElement[] stackTraceElements = throwable.getStackTrace();
+
+                if (methodDepth < stackTraceElements.length) {
+                    StackTraceElement element = stackTraceElements[methodDepth];
+
+                    if (showCaller) {
+                        if ((methodDepth + 1) < stackTraceElements.length) {
+                            StackTraceElement elementCaller = stackTraceElements[methodDepth + 1];
+
+                            if (elementCaller != null && elementCaller.getFileName() != null) {
+
+                                String callerClassName = elementCaller.getFileName().substring(0, elementCaller.getFileName().lastIndexOf("."));
+                                String className = element.getFileName().substring(0, element.getFileName().lastIndexOf("."));
+                                @SuppressLint("DefaultLocale") String loginfo = String.format("[%s.%s() (%s:%d)]", callerClassName, elementCaller.getMethodName(), elementCaller.getFileName(), elementCaller.getLineNumber());
+                                loginfo = loginfo + "\n";
+                                loginfo = loginfo + "    " + String.format("[%s.%s() (%s:%d)]%s", className, element.getMethodName(), element.getFileName(), element.getLineNumber(), content);
+
+                                content = loginfo;
+                            }
+
+                        }
+
+                    } else {
+                        if (element != null && element.getFileName() != null) {
+                            String className = element.getFileName().substring(0, element.getFileName().lastIndexOf("."));
+                            content = String.format("[%s.%s() (%s:%d)]%s", className, element.getMethodName(), element.getFileName(), element.getLineNumber(), content);
+                        }
+                    }
+                }
+            }
+
+            if (content.length() <= 3400) {
+                log(logType, "返回值：" + content, tag);
+            } else {
+                int flag = 0;
+                for (int i = 0; i < (content.length() / 3400); i++) {
+                    flag = i + 1;
+                    log(logType, "返回值(" + flag + "):"
+                            + content.substring(i * 3400, flag * 3400), tag);
+                }
+                log(logType, "返回值(" + (flag + 1) + "):"
+                        + content.substring(flag * 3400), tag);
+            }
+        }
+    }
+
+    public static void log(int logType, String content, String tag) {
+        switch (logType) {
+            case Log.INFO:
+                Log.i(tag, "===================>" + content);
+                break;
+            case Log.DEBUG:
+                Log.d(tag, "===================>" + content);
+                break;
+            case Log.ERROR:
+                Log.e(tag, "===================>" + content);
+                break;
+            case Log.WARN:
+                Log.w(tag, "===================>" + content);
+                break;
+            case Log.VERBOSE:
+                Log.v(tag, "===================>" + content);
+                break;
+            default:
+                break;
+        }
+
 
-    public static byte[] desDecrypt(byte[] encryptText, String desKeyParameter) throws Exception {
-        SecureRandom sr = new SecureRandom();
-        byte rawKeyData[] = desKeyParameter.getBytes();
-        DESKeySpec dks = new DESKeySpec(rawKeyData);
-        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
-        SecretKey key = keyFactory.generateSecret(dks);
-        Cipher cipher = Cipher.getInstance("DES");
-        cipher.init(Cipher.DECRYPT_MODE, key, sr);
-        byte encryptedData[] = encryptText;
-        byte decryptedData[] = cipher.doFinal(encryptedData);
-        return decryptedData;
     }
 
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/msg/MsgUtil.java

@@ -12,12 +12,12 @@ import android.os.Message;
 public class MsgUtil {
 
     public static void addHdMsgWat(Handler hd,int what){
-        Message msg=Message.obtain();
+        Message msg=new Message();
         msg.what=what;
         hd.sendMessage(msg);
     }
     public static void addHdMsgWatBody(Handler hd,int what,String body){
-        Message msg=Message.obtain();
+        Message msg=new Message();
         msg.what=what;
         msg.obj=body;
         hd.sendMessage(msg);

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

@@ -10,6 +10,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -17,6 +18,7 @@ import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
+import com.luck.picture.lib.broadcast.BroadcastManager;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 
 public abstract class BaseActivity extends Activity {
@@ -81,6 +83,7 @@ public abstract class BaseActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
     }
 
     MyReceiver receiver;
@@ -91,7 +94,7 @@ public abstract class BaseActivity extends Activity {
         filter.addAction("exit_app");
         if(receiver!=null){
             Log.e("广播概况",receiver.toString()+"_"+this.toString());
-            registerReceiver(receiver,filter);
+            registerReceiver(receiver,filter,"com.dhhy.receiver",new Handler());
         }
     }
     class MyReceiver extends BroadcastReceiver {

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

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -71,6 +72,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
     }
 
     MyReceiver receiver;
@@ -79,7 +81,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
         receiver = new MyReceiver();
         IntentFilter filter = new IntentFilter();
         filter.addAction("exit_app");
-        registerReceiver(receiver,filter);
+        registerReceiver(receiver,filter,"com.dhhy.receiver",new Handler());
     }
     class MyReceiver extends BroadcastReceiver {
 

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

@@ -91,7 +91,7 @@ public class BaseFragment extends Fragment {
         receiver = new MyReceiver();
         IntentFilter filter = new IntentFilter();
         filter.addAction("exit_app");
-        getActivity().registerReceiver(receiver,filter);
+        getActivity().registerReceiver(receiver,filter,"com.dhhy.receiver",new Handler());
     }
     class MyReceiver extends BroadcastReceiver {
 

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

@@ -1,43 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.util.view;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.widget.FrameLayout;
-
-/**
- * @ClassName GrayFrameLayout
- * @Author 用户
- * @Date 2023/1/29 15:28
- * @Description TODO
- */
-public class GrayFrameLayout extends FrameLayout {
-    private Paint mPaint = new Paint();
-
-    public GrayFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        ColorMatrix cm = new ColorMatrix();
-        cm.setSaturation(0);
-        mPaint.setColorFilter(new ColorMatrixColorFilter(cm));
-    }
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        canvas.saveLayer(null, mPaint, Canvas.ALL_SAVE_FLAG);
-        super.dispatchDraw(canvas);
-        canvas.restore();
-    }
-
-
-    @Override
-    public void draw(Canvas canvas) {
-        canvas.saveLayer(null, mPaint, Canvas.ALL_SAVE_FLAG);
-        super.draw(canvas);
-        canvas.restore();
-    }
-
-}

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

@@ -176,12 +176,10 @@
                 android:layout_centerVertical="true"/>
         </RelativeLayout>
         <View
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_2"
             android:background="#F6F6F9"/>
         <RelativeLayout
-            android:visibility="gone"
             android:id="@+id/r6"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -204,12 +202,10 @@
                 android:layout_centerVertical="true"/>
         </RelativeLayout>
         <View
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_2"
             android:background="#F6F6F9"/>
         <RelativeLayout
-            android:visibility="gone"
             android:id="@+id/r7"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -231,46 +227,6 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"/>
         </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_2"
-            android:background="#F6F6F9"/>
-        <RelativeLayout
-            android:id="@+id/r4"
-            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"
-                    />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="(如有挂车)"
-                    android:textColor="#C4C4CE"
-                    android:textSize="@dimen/sp_13"
-                    />
-            </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"
@@ -309,6 +265,44 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"/>
         </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_2"
+            android:background="#F6F6F9"/>
+        <RelativeLayout
+            android:id="@+id/r4"
+            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"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="(如有挂车)"
+                    android:textColor="#C4C4CE"
+                    android:textSize="@dimen/sp_13"
+                    />
+            </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:id="@+id/vs1"
             android:layout_width="match_parent"

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

@@ -55,11 +55,10 @@
                         android:layout_width="@dimen/dp_90"
                         android:layout_height="@dimen/dp_90"
                         android:background="#EEEEEE">
-
                         <ImageView
                             android:id="@+id/img1"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent" />
+                            android:layout_height="match_parent"/>
                     </RelativeLayout>
                     <LinearLayout
                         android:layout_marginTop="@dimen/dp_13"

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

@@ -477,7 +477,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_40"/>
+                android:layout_height="@dimen/dp_102"/>
 
             <Button
                 android:id="@+id/submit"

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

@@ -10,7 +10,7 @@
         android:layout_marginLeft="@dimen/dp_13"
         android:layout_width="@dimen/dp_290"
         android:layout_height="@dimen/dp_56"
-        android:src="@drawable/icon_home_1"
+        android:src="@mipmap/icon_home_1"
         android:scaleType="fitXY"/>
 
     <ImageView
@@ -20,7 +20,7 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/dp_13"
         android:scaleType="fitXY"
-        android:src="@drawable/icon_home_2" />
+        android:src="@mipmap/icon_home_2" />
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -22,7 +22,6 @@
             android:layout_marginLeft="@dimen/dp_10"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
             android:orientation="vertical">
             <LinearLayout
                 android:layout_marginTop="@dimen/dp_7"
@@ -38,11 +37,10 @@
                     android:id="@+id/name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
                     android:textSize="@dimen/sp_13" />
             </LinearLayout>
             <LinearLayout
-                android:layout_marginTop="@dimen/dp_18"
+                android:layout_marginTop="@dimen/dp_7"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
@@ -53,13 +51,12 @@
                     android:text="店铺地址:"/>
                 <TextView
                     android:id="@+id/address"
-                    android:singleLine="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/sp_13" />
             </LinearLayout>
             <LinearLayout
-                android:layout_marginTop="@dimen/dp_18"
+                android:layout_marginTop="@dimen/dp_7"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
@@ -67,15 +64,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/sp_13"
-                    android:text="联系方式:"/>
+                    android:text="口味:"/>
                 <TextView
                     android:id="@+id/taste"
-                    android:singleLine="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/sp_13" />
                 <TextView
-                    android:visibility="gone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/sp_13"
@@ -86,7 +81,6 @@
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/sp_13" />
                 <TextView
-                    android:visibility="gone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/sp_13"

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

@@ -1,68 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
-    android:id="@+id/item_huoyuan_new"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:id="@+id/item_huoyuan_new"
     android:paddingBottom="@dimen/dp_78">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_200"
-        android:background="@drawable/bg_banner"
+        android:orientation="vertical"
-        android:orientation="vertical">
+        android:background="@drawable/bg_banner">
 
         <com.youth.banner.Banner
+            android:layout_marginTop="@dimen/dp_12"
             android:id="@+id/banner"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:layout_margin="@dimen/dp_25"
+            android:layout_margin="@dimen/dp_25"/>
-            android:layout_marginTop="@dimen/dp_12" />
 
     </LinearLayout>
 
-    <LinearLayout
+    <RelativeLayout
+        android:layout_marginTop="@dimen/dp_m_12"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="wrap_content">
-        android:layout_marginTop="@dimen/dp_m_12">
 
         <ImageView
             android:id="@+id/fun_left"
+            android:layout_marginLeft="@dimen/dp_8"
             android:layout_width="@dimen/dp_176"
             android:layout_height="@dimen/dp_116"
-            android:layout_marginLeft="@dimen/dp_8"
+            android:src="@mipmap/icon_home_3"
-            android:layout_weight="1"
+            android:scaleType="fitXY"/>
-            android:background="@mipmap/icon_home_3"
-            android:scaleType="fitXY" />
 
         <ImageView
             android:id="@+id/fun_right"
             android:layout_width="@dimen/dp_176"
             android:layout_height="@dimen/dp_116"
+            android:layout_alignParentRight="true"
             android:layout_marginRight="8dp"
-            android:layout_weight="1"
+            android:scaleType="fitXY"
-            android:background="@mipmap/icon_home_4"
+            android:src="@mipmap/icon_home_4" />
-            android:scaleType="fitXY" />
 
-    </LinearLayout>
+    </RelativeLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_23"
             android:visibility="gone">
-
             <View
                 android:layout_width="@dimen/dp_54"
                 android:layout_height="@dimen/dp_3"
-                android:layout_centerHorizontal="true"
+                android:background="#999999"
                 android:layout_centerVertical="true"
-                android:background="#999999" />
+                android:layout_centerHorizontal="true"/>
         </RelativeLayout>
 
         <LinearLayout
@@ -71,187 +69,188 @@
             android:orientation="vertical">
 
             <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
+                android:layout_marginBottom="@dimen/dp_14"
                 android:id="@+id/brv_function"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dp_14"
+                android:overScrollMode="never"/>
-                android:overScrollMode="never" />
 
         </LinearLayout>
 
-    </LinearLayout>
+        </LinearLayout>
 
-    <LinearLayout
+        <LinearLayout
-        android:id="@+id/auth_box"
+            android:id="@+id/auth_box"
-        android:layout_width="match_parent"
+            android:layout_marginTop="@dimen/dp_4"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_4"
-        android:background="#fff"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@+id/text_login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="@dimen/dp_20"
-            android:text="认证成功 开始接单"
-            android:textColor="#ff666666"
-            android:textSize="@dimen/sp_14" />
-
-        <Button
-            android:id="@+id/btn_auth"
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_24"
-            android:layout_gravity="center"
-            android:layout_marginTop="@dimen/dp_7"
-            android:layout_marginBottom="@dimen/dp_16"
-            android:background="@drawable/bg_btn"
-            android:gravity="center"
-            android:text="去认证"
-            android:textColor="#ffffffff"
-            android:textSize="@dimen/sp_10" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/order_box"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_4"
-        android:background="#fff"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_20"
+            android:orientation="vertical"
-            android:layout_marginTop="@dimen/dp_24"
+            android:background="#fff"
-            android:layout_marginRight="@dimen/dp_20">
+            android:visibility="gone">
 
             <TextView
+                android:id="@+id/text_login"
+                android:layout_marginTop="@dimen/dp_20"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="执行中运单"
+                android:text="认证成功 开始接单"
-                android:textColor="#ff333333"
+                android:textColor="#ff666666"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
+                android:layout_gravity="center"
+                />
 
-            <LinearLayout
+            <Button
-                android:id="@+id/order_all"
+                android:id="@+id/btn_auth"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="@dimen/dp_7"
-                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_16"
-                android:layout_alignParentRight="true"
+                android:layout_width="@dimen/dp_60"
-                android:orientation="horizontal">
+                android:layout_height="@dimen/dp_24"
+                android:text="去认证"
+                android:background="@drawable/bg_btn"
+                android:textColor="#ffffffff"
+                android:textSize="@dimen/sp_10"
+                android:layout_gravity="center"
+                android:gravity="center" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/order_box"
+            android:layout_marginTop="@dimen/dp_4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="#fff"
+            android:visibility="gone">
+
+            <RelativeLayout
+                android:layout_marginTop="@dimen/dp_24"
+                android:layout_marginLeft="@dimen/dp_20"
+                android:layout_marginRight="@dimen/dp_20"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="全部运单"
+                    android:text="执行中运单"
-                    android:textColor="#ff999999"
+                    android:textColor="#ff333333"
-                    android:textSize="@dimen/sp_14" />
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"
+                    />
 
-                <ImageView
+                <LinearLayout
-                    android:layout_width="@dimen/dp_7"
+                    android:id="@+id/order_all"
-                    android:layout_height="@dimen/dp_12"
+                    android:layout_alignParentRight="true"
-                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
-                    android:layout_marginLeft="@dimen/dp_4"
+                    android:layout_height="wrap_content"
-                    android:src="@mipmap/chevron" />
+                    android:orientation="horizontal">
-            </LinearLayout>
+                    <TextView
-        </RelativeLayout>
+                        android:layout_width="wrap_content"
-
+                        android:layout_height="wrap_content"
-        <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
+                        android:text="全部运单"
-            android:id="@+id/brv_order"
+                        android:textColor="#ff999999"
+                        android:textSize="@dimen/sp_14"
+                        />
+                    <ImageView
+                        android:layout_marginLeft="@dimen/dp_4"
+                        android:layout_width="@dimen/dp_7"
+                        android:layout_height="@dimen/dp_12"
+                        android:src="@mipmap/chevron"
+                        android:layout_gravity="center"/>
+                </LinearLayout>
+            </RelativeLayout>
+            <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
+                android:layout_marginBottom="@dimen/dp_12"
+                android:id="@+id/brv_order"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
+       <!-- <LinearLayout
+            android:layout_marginTop="@dimen/dp_4"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_12" />
+            android:orientation="vertical"
-    </LinearLayout>
+            android:background="#fff">
-    <!-- <LinearLayout
+            <RelativeLayout
-         android:layout_marginTop="@dimen/dp_4"
+                android:layout_marginTop="@dimen/dp_24"
-         android:layout_width="match_parent"
+                android:layout_marginLeft="@dimen/dp_20"
-         android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/dp_20"
-         android:orientation="vertical"
+                android:layout_width="match_parent"
-         android:background="#fff">
+                android:layout_height="wrap_content">
-         <RelativeLayout
+                <TextView
-             android:layout_marginTop="@dimen/dp_24"
+                    android:layout_width="wrap_content"
-             android:layout_marginLeft="@dimen/dp_20"
+                    android:layout_height="wrap_content"
-             android:layout_marginRight="@dimen/dp_20"
+                    android:text="司机之家"
-             android:layout_width="match_parent"
+                    android:textColor="#ff333333"
-             android:layout_height="wrap_content">
+                    android:textSize="@dimen/sp_16"
-             <TextView
+                    android:textStyle="bold"/>
-                 android:layout_width="wrap_content"
+            </RelativeLayout>
-                 android:layout_height="wrap_content"
+            <com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
-                 android:text="司机之家"
+                android:layout_marginTop="@dimen/dp_14"
-                 android:textColor="#ff333333"
+                android:layout_marginBottom="@dimen/dp_24"
-                 android:textSize="@dimen/sp_16"
+                android:id="@+id/brv_driver_home"
-                 android:textStyle="bold"/>
+                android:layout_width="match_parent"
-         </RelativeLayout>
+                android:layout_height="wrap_content"/>
-         <com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
+        </LinearLayout>
-             android:layout_marginTop="@dimen/dp_14"
+        <LinearLayout
-             android:layout_marginBottom="@dimen/dp_24"
+            android:layout_marginTop="@dimen/dp_4"
-             android:id="@+id/brv_driver_home"
+            android:layout_width="match_parent"
-             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
-             android:layout_height="wrap_content"/>
+            android:orientation="vertical"
-     </LinearLayout>
+            android:background="#fff"
-     <LinearLayout
+            android:visibility="gone">
-         android:layout_marginTop="@dimen/dp_4"
+            <RelativeLayout
-         android:layout_width="match_parent"
+                android:layout_marginTop="@dimen/dp_24"
-         android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_20"
-         android:orientation="vertical"
+                android:layout_marginRight="@dimen/dp_20"
-         android:background="#fff"
+                android:layout_width="match_parent"
-         android:visibility="gone">
+                android:layout_height="wrap_content">
-         <RelativeLayout
+                <TextView
-             android:layout_marginTop="@dimen/dp_24"
+                    android:layout_width="wrap_content"
-             android:layout_marginLeft="@dimen/dp_20"
+                    android:layout_height="wrap_content"
-             android:layout_marginRight="@dimen/dp_20"
+                    android:text="司机圈"
-             android:layout_width="match_parent"
+                    android:textColor="#ff333333"
-             android:layout_height="wrap_content">
+                    android:textSize="@dimen/sp_16"
-             <TextView
+                    android:textStyle="bold"
-                 android:layout_width="wrap_content"
+                    />
-                 android:layout_height="wrap_content"
+                <LinearLayout
-                 android:text="司机圈"
-                 android:textColor="#ff333333"
-                 android:textSize="@dimen/sp_16"
-                 android:textStyle="bold"
-                 />
-             <LinearLayout
 
-                 android:layout_alignParentRight="true"
+                    android:layout_alignParentRight="true"
-                 android:layout_width="wrap_content"
+                    android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                 android:orientation="horizontal">
+                    android:orientation="horizontal">
-                 <TextView
+                    <TextView
-                     android:layout_width="wrap_content"
+                        android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
+                        android:layout_height="wrap_content"
-                     android:text="更多精彩"
+                        android:text="更多精彩"
-                     android:textColor="#ff999999"
+                        android:textColor="#ff999999"
-                     android:textSize="@dimen/sp_14"
+                        android:textSize="@dimen/sp_14"
-                     />
+                        />
-                 <ImageView
+                    <ImageView
-                     android:layout_marginLeft="@dimen/dp_4"
+                        android:layout_marginLeft="@dimen/dp_4"
-                     android:layout_width="@dimen/dp_7"
+                        android:layout_width="@dimen/dp_7"
-                     android:layout_height="@dimen/dp_12"
+                        android:layout_height="@dimen/dp_12"
-                     android:src="@mipmap/chevron"
+                        android:src="@mipmap/chevron"
-                     android:layout_gravity="center"/>
+                        android:layout_gravity="center"/>
-             </LinearLayout>
+                </LinearLayout>
-         </RelativeLayout>
+            </RelativeLayout>
-         <com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
+            <com.oneclouds.wangluohuoyun.util.view.BaseRecyclerView
-             android:layout_marginTop="@dimen/dp_14"
+                android:layout_marginTop="@dimen/dp_14"
-             android:id="@+id/brv_driver_circle"
+                android:id="@+id/brv_driver_circle"
-             android:layout_width="match_parent"
+                android:layout_width="match_parent"
-             android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"/>
-         <TextView
+            <TextView
-             android:id="@+id/version"
+                android:id="@+id/version"
-             android:layout_marginTop="@dimen/dp_5"
+                android:layout_marginTop="@dimen/dp_5"
-             android:layout_width="match_parent"
+                android:layout_width="match_parent"
-             android:layout_height="wrap_content"
+                android:layout_height="wrap_content"
-             android:text="——V2.0.7——"
+                android:text="——V2.0.7——"
-             android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/sp_13"
-             android:gravity="center"
+                android:gravity="center"
-             android:layout_marginBottom="@dimen/dp_5"
+                android:layout_marginBottom="@dimen/dp_5"
-             android:alpha="0.6"/>
+                android:alpha="0.6"/>
-     </LinearLayout>-->
+        </LinearLayout>-->
-    <include layout="@layout/item_order_recommend" />
+        <include
+            layout="@layout/item_order_recommend"/>
 </LinearLayout>

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

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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="wrap_content"
-    android:layout_margin="@dimen/dp_16"
-    android:background="@color/white"
-    android:elevation="@dimen/dp_5"
-
-    app:cardCornerRadius="@dimen/dp_10">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="提示"
-            android:textStyle="bold"
-            android:textColor="@color/red"
-            android:textSize="@dimen/sp_20"></TextView>
-
-        <TextView
-            android:lineSpacingExtra="@dimen/dp_6"
-            android:gravity="center"
-            android:id="@+id/tvContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_14"
-            android:textColor="#D86B6B"
-            android:textSize="@dimen/sp_14"
-            tools:text="提示"></TextView>
-        <TextView
-            android:id="@+id/tvMessage2"
-            android:lineSpacingExtra="@dimen/dp_6"
-            android:gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_14"
-            android:textColor="@color/color_9"
-            android:textSize="@dimen/sp_14"
-            android:text="请重新登录或联系管理员"></TextView>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_6"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="联系电话："
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_14"></TextView>
-
-            <TextView
-                android:id="@+id/tvPhone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="13783631930"
-                android:textColor="#009688"
-                android:textSize="@dimen/sp_16"></TextView>
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/dp_10"
-            android:paddingBottom="@dimen/dp_10">
-
-            <TextView
-                android:id="@+id/tvCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="取消"
-                android:textSize="@dimen/sp_16"></TextView>
-
-            <TextView
-                android:id="@+id/tvOk"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="确认拨打"
-                android:textColor="@color/colorPrimary"
-                android:textSize="@dimen/sp_16"></TextView>
-        </LinearLayout>
-
-    </LinearLayout>
-</androidx.cardview.widget.CardView>

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

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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="wrap_content"
-    android:layout_margin="@dimen/dp_16"
-    android:background="@color/white"
-    android:elevation="@dimen/dp_5"
-
-    app:cardCornerRadius="@dimen/dp_10">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="提示"
-            android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_20"></TextView>
-
-        <TextView
-            android:paddingLeft="@dimen/dp_10"
-            android:paddingRight="@dimen/dp_10"
-            android:lineSpacingExtra="@dimen/dp_6"
-            android:gravity="center"
-            android:id="@+id/tvContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_14"
-            android:textColor="#333"
-            android:textSize="@dimen/sp_14"
-            tools:text="提示"></TextView>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/dp_10"
-            android:paddingBottom="@dimen/dp_10">
-
-            <TextView
-                android:id="@+id/tvCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="取消"
-                android:textSize="@dimen/sp_16"></TextView>
-
-            <TextView
-                android:id="@+id/tvOk"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="去注册"
-                android:textColor="@color/colorPrimary"
-                android:textSize="@dimen/sp_16"></TextView>
-        </LinearLayout>
-
-    </LinearLayout>
-</androidx.cardview.widget.CardView>

app/src/main/res/values-sw1540dp/dimens.xml

@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-256.6667dp</dimen>
-	<dimen name="dp_m_50">-213.8889dp</dimen>
-	<dimen name="dp_m_30">-128.3333dp</dimen>
-	<dimen name="dp_m_20">-85.5556dp</dimen>
-	<dimen name="dp_m_12">-51.3333dp</dimen>
-	<dimen name="dp_m_10">-42.7778dp</dimen>
-	<dimen name="dp_m_8">-34.2222dp</dimen>
-	<dimen name="dp_m_5">-21.3889dp</dimen>
-	<dimen name="dp_m_2">-8.5556dp</dimen>
-	<dimen name="dp_m_1">-4.2778dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.4278dp</dimen>
-	<dimen name="dp_0_5">2.1389dp</dimen>
-	<dimen name="dp_1">4.2778dp</dimen>
-	<dimen name="dp_1_5">6.4167dp</dimen>
-	<dimen name="dp_2">8.5556dp</dimen>
-	<dimen name="dp_2_5">10.6944dp</dimen>
-	<dimen name="dp_3">12.8333dp</dimen>
-	<dimen name="dp_3_5">14.9722dp</dimen>
-	<dimen name="dp_4">17.1111dp</dimen>
-	<dimen name="dp_4_5">19.2500dp</dimen>
-	<dimen name="dp_5">21.3889dp</dimen>
-	<dimen name="dp_6">25.6667dp</dimen>
-	<dimen name="dp_7">29.9444dp</dimen>
-	<dimen name="dp_8">34.2222dp</dimen>
-	<dimen name="dp_9">38.5000dp</dimen>
-	<dimen name="dp_10">42.7778dp</dimen>
-	<dimen name="dp_11">47.0556dp</dimen>
-	<dimen name="dp_12">51.3333dp</dimen>
-	<dimen name="dp_13">55.6111dp</dimen>
-	<dimen name="dp_14">59.8889dp</dimen>
-	<dimen name="dp_15">64.1667dp</dimen>
-	<dimen name="dp_16">68.4444dp</dimen>
-	<dimen name="dp_17">72.7222dp</dimen>
-	<dimen name="dp_18">77.0000dp</dimen>
-	<dimen name="dp_19">81.2778dp</dimen>
-	<dimen name="dp_20">85.5556dp</dimen>
-	<dimen name="dp_21">89.8333dp</dimen>
-	<dimen name="dp_22">94.1111dp</dimen>
-	<dimen name="dp_23">98.3889dp</dimen>
-	<dimen name="dp_24">102.6667dp</dimen>
-	<dimen name="dp_25">106.9444dp</dimen>
-	<dimen name="dp_26">111.2222dp</dimen>
-	<dimen name="dp_27">115.5000dp</dimen>
-	<dimen name="dp_28">119.7778dp</dimen>
-	<dimen name="dp_29">124.0556dp</dimen>
-	<dimen name="dp_30">128.3333dp</dimen>
-	<dimen name="dp_31">132.6111dp</dimen>
-	<dimen name="dp_32">136.8889dp</dimen>
-	<dimen name="dp_33">141.1667dp</dimen>
-	<dimen name="dp_34">145.4444dp</dimen>
-	<dimen name="dp_35">149.7222dp</dimen>
-	<dimen name="dp_36">154.0000dp</dimen>
-	<dimen name="dp_37">158.2778dp</dimen>
-	<dimen name="dp_38">162.5556dp</dimen>
-	<dimen name="dp_39">166.8333dp</dimen>
-	<dimen name="dp_40">171.1111dp</dimen>
-	<dimen name="dp_41">175.3889dp</dimen>
-	<dimen name="dp_42">179.6667dp</dimen>
-	<dimen name="dp_43">183.9444dp</dimen>
-	<dimen name="dp_44">188.2222dp</dimen>
-	<dimen name="dp_45">192.5000dp</dimen>
-	<dimen name="dp_46">196.7778dp</dimen>
-	<dimen name="dp_47">201.0556dp</dimen>
-	<dimen name="dp_48">205.3333dp</dimen>
-	<dimen name="dp_49">209.6111dp</dimen>
-	<dimen name="dp_50">213.8889dp</dimen>
-	<dimen name="dp_51">218.1667dp</dimen>
-	<dimen name="dp_52">222.4444dp</dimen>
-	<dimen name="dp_53">226.7222dp</dimen>
-	<dimen name="dp_54">231.0000dp</dimen>
-	<dimen name="dp_55">235.2778dp</dimen>
-	<dimen name="dp_56">239.5556dp</dimen>
-	<dimen name="dp_57">243.8333dp</dimen>
-	<dimen name="dp_58">248.1111dp</dimen>
-	<dimen name="dp_59">252.3889dp</dimen>
-	<dimen name="dp_60">256.6667dp</dimen>
-	<dimen name="dp_61">260.9444dp</dimen>
-	<dimen name="dp_62">265.2222dp</dimen>
-	<dimen name="dp_63">269.5000dp</dimen>
-	<dimen name="dp_64">273.7778dp</dimen>
-	<dimen name="dp_65">278.0556dp</dimen>
-	<dimen name="dp_66">282.3333dp</dimen>
-	<dimen name="dp_67">286.6111dp</dimen>
-	<dimen name="dp_68">290.8889dp</dimen>
-	<dimen name="dp_69">295.1667dp</dimen>
-	<dimen name="dp_70">299.4444dp</dimen>
-	<dimen name="dp_71">303.7222dp</dimen>
-	<dimen name="dp_72">308.0000dp</dimen>
-	<dimen name="dp_73">312.2778dp</dimen>
-	<dimen name="dp_74">316.5556dp</dimen>
-	<dimen name="dp_75">320.8333dp</dimen>
-	<dimen name="dp_76">325.1111dp</dimen>
-	<dimen name="dp_77">329.3889dp</dimen>
-	<dimen name="dp_78">333.6667dp</dimen>
-	<dimen name="dp_79">337.9444dp</dimen>
-	<dimen name="dp_80">342.2222dp</dimen>
-	<dimen name="dp_81">346.5000dp</dimen>
-	<dimen name="dp_82">350.7778dp</dimen>
-	<dimen name="dp_83">355.0556dp</dimen>
-	<dimen name="dp_84">359.3333dp</dimen>
-	<dimen name="dp_85">363.6111dp</dimen>
-	<dimen name="dp_86">367.8889dp</dimen>
-	<dimen name="dp_87">372.1667dp</dimen>
-	<dimen name="dp_88">376.4444dp</dimen>
-	<dimen name="dp_89">380.7222dp</dimen>
-	<dimen name="dp_90">385.0000dp</dimen>
-	<dimen name="dp_91">389.2778dp</dimen>
-	<dimen name="dp_92">393.5556dp</dimen>
-	<dimen name="dp_93">397.8333dp</dimen>
-	<dimen name="dp_94">402.1111dp</dimen>
-	<dimen name="dp_95">406.3889dp</dimen>
-	<dimen name="dp_96">410.6667dp</dimen>
-	<dimen name="dp_97">414.9444dp</dimen>
-	<dimen name="dp_98">419.2222dp</dimen>
-	<dimen name="dp_99">423.5000dp</dimen>
-	<dimen name="dp_100">427.7778dp</dimen>
-	<dimen name="dp_101">432.0556dp</dimen>
-	<dimen name="dp_102">436.3333dp</dimen>
-	<dimen name="dp_103">440.6111dp</dimen>
-	<dimen name="dp_104">444.8889dp</dimen>
-	<dimen name="dp_105">449.1667dp</dimen>
-	<dimen name="dp_106">453.4444dp</dimen>
-	<dimen name="dp_107">457.7222dp</dimen>
-	<dimen name="dp_108">462.0000dp</dimen>
-	<dimen name="dp_109">466.2778dp</dimen>
-	<dimen name="dp_110">470.5556dp</dimen>
-	<dimen name="dp_111">474.8333dp</dimen>
-	<dimen name="dp_112">479.1111dp</dimen>
-	<dimen name="dp_113">483.3889dp</dimen>
-	<dimen name="dp_114">487.6667dp</dimen>
-	<dimen name="dp_115">491.9444dp</dimen>
-	<dimen name="dp_116">496.2222dp</dimen>
-	<dimen name="dp_117">500.5000dp</dimen>
-	<dimen name="dp_118">504.7778dp</dimen>
-	<dimen name="dp_119">509.0556dp</dimen>
-	<dimen name="dp_120">513.3333dp</dimen>
-	<dimen name="dp_121">517.6111dp</dimen>
-	<dimen name="dp_122">521.8889dp</dimen>
-	<dimen name="dp_123">526.1667dp</dimen>
-	<dimen name="dp_124">530.4444dp</dimen>
-	<dimen name="dp_125">534.7222dp</dimen>
-	<dimen name="dp_126">539.0000dp</dimen>
-	<dimen name="dp_127">543.2778dp</dimen>
-	<dimen name="dp_128">547.5556dp</dimen>
-	<dimen name="dp_129">551.8333dp</dimen>
-	<dimen name="dp_130">556.1111dp</dimen>
-	<dimen name="dp_131">560.3889dp</dimen>
-	<dimen name="dp_132">564.6667dp</dimen>
-	<dimen name="dp_133">568.9444dp</dimen>
-	<dimen name="dp_134">573.2222dp</dimen>
-	<dimen name="dp_135">577.5000dp</dimen>
-	<dimen name="dp_136">581.7778dp</dimen>
-	<dimen name="dp_137">586.0556dp</dimen>
-	<dimen name="dp_138">590.3333dp</dimen>
-	<dimen name="dp_139">594.6111dp</dimen>
-	<dimen name="dp_140">598.8889dp</dimen>
-	<dimen name="dp_141">603.1667dp</dimen>
-	<dimen name="dp_142">607.4444dp</dimen>
-	<dimen name="dp_143">611.7222dp</dimen>
-	<dimen name="dp_144">616.0000dp</dimen>
-	<dimen name="dp_145">620.2778dp</dimen>
-	<dimen name="dp_146">624.5556dp</dimen>
-	<dimen name="dp_147">628.8333dp</dimen>
-	<dimen name="dp_148">633.1111dp</dimen>
-	<dimen name="dp_149">637.3889dp</dimen>
-	<dimen name="dp_150">641.6667dp</dimen>
-	<dimen name="dp_151">645.9444dp</dimen>
-	<dimen name="dp_152">650.2222dp</dimen>
-	<dimen name="dp_153">654.5000dp</dimen>
-	<dimen name="dp_154">658.7778dp</dimen>
-	<dimen name="dp_155">663.0556dp</dimen>
-	<dimen name="dp_156">667.3333dp</dimen>
-	<dimen name="dp_157">671.6111dp</dimen>
-	<dimen name="dp_158">675.8889dp</dimen>
-	<dimen name="dp_159">680.1667dp</dimen>
-	<dimen name="dp_160">684.4444dp</dimen>
-	<dimen name="dp_161">688.7222dp</dimen>
-	<dimen name="dp_162">693.0000dp</dimen>
-	<dimen name="dp_163">697.2778dp</dimen>
-	<dimen name="dp_164">701.5556dp</dimen>
-	<dimen name="dp_165">705.8333dp</dimen>
-	<dimen name="dp_166">710.1111dp</dimen>
-	<dimen name="dp_167">714.3889dp</dimen>
-	<dimen name="dp_168">718.6667dp</dimen>
-	<dimen name="dp_169">722.9444dp</dimen>
-	<dimen name="dp_170">727.2222dp</dimen>
-	<dimen name="dp_171">731.5000dp</dimen>
-	<dimen name="dp_172">735.7778dp</dimen>
-	<dimen name="dp_173">740.0556dp</dimen>
-	<dimen name="dp_174">744.3333dp</dimen>
-	<dimen name="dp_175">748.6111dp</dimen>
-	<dimen name="dp_176">752.8889dp</dimen>
-	<dimen name="dp_177">757.1667dp</dimen>
-	<dimen name="dp_178">761.4444dp</dimen>
-	<dimen name="dp_179">765.7222dp</dimen>
-	<dimen name="dp_180">770.0000dp</dimen>
-	<dimen name="dp_181">774.2778dp</dimen>
-	<dimen name="dp_182">778.5556dp</dimen>
-	<dimen name="dp_183">782.8333dp</dimen>
-	<dimen name="dp_184">787.1111dp</dimen>
-	<dimen name="dp_185">791.3889dp</dimen>
-	<dimen name="dp_186">795.6667dp</dimen>
-	<dimen name="dp_187">799.9444dp</dimen>
-	<dimen name="dp_188">804.2222dp</dimen>
-	<dimen name="dp_189">808.5000dp</dimen>
-	<dimen name="dp_190">812.7778dp</dimen>
-	<dimen name="dp_191">817.0556dp</dimen>
-	<dimen name="dp_192">821.3333dp</dimen>
-	<dimen name="dp_193">825.6111dp</dimen>
-	<dimen name="dp_194">829.8889dp</dimen>
-	<dimen name="dp_195">834.1667dp</dimen>
-	<dimen name="dp_196">838.4444dp</dimen>
-	<dimen name="dp_197">842.7222dp</dimen>
-	<dimen name="dp_198">847.0000dp</dimen>
-	<dimen name="dp_199">851.2778dp</dimen>
-	<dimen name="dp_200">855.5556dp</dimen>
-	<dimen name="dp_201">859.8333dp</dimen>
-	<dimen name="dp_202">864.1111dp</dimen>
-	<dimen name="dp_203">868.3889dp</dimen>
-	<dimen name="dp_204">872.6667dp</dimen>
-	<dimen name="dp_205">876.9444dp</dimen>
-	<dimen name="dp_206">881.2222dp</dimen>
-	<dimen name="dp_207">885.5000dp</dimen>
-	<dimen name="dp_208">889.7778dp</dimen>
-	<dimen name="dp_209">894.0556dp</dimen>
-	<dimen name="dp_210">898.3333dp</dimen>
-	<dimen name="dp_211">902.6111dp</dimen>
-	<dimen name="dp_212">906.8889dp</dimen>
-	<dimen name="dp_213">911.1667dp</dimen>
-	<dimen name="dp_214">915.4444dp</dimen>
-	<dimen name="dp_215">919.7222dp</dimen>
-	<dimen name="dp_216">924.0000dp</dimen>
-	<dimen name="dp_217">928.2778dp</dimen>
-	<dimen name="dp_218">932.5556dp</dimen>
-	<dimen name="dp_219">936.8333dp</dimen>
-	<dimen name="dp_220">941.1111dp</dimen>
-	<dimen name="dp_221">945.3889dp</dimen>
-	<dimen name="dp_222">949.6667dp</dimen>
-	<dimen name="dp_223">953.9444dp</dimen>
-	<dimen name="dp_224">958.2222dp</dimen>
-	<dimen name="dp_225">962.5000dp</dimen>
-	<dimen name="dp_226">966.7778dp</dimen>
-	<dimen name="dp_227">971.0556dp</dimen>
-	<dimen name="dp_228">975.3333dp</dimen>
-	<dimen name="dp_229">979.6111dp</dimen>
-	<dimen name="dp_230">983.8889dp</dimen>
-	<dimen name="dp_231">988.1667dp</dimen>
-	<dimen name="dp_232">992.4444dp</dimen>
-	<dimen name="dp_233">996.7222dp</dimen>
-	<dimen name="dp_234">1001.0000dp</dimen>
-	<dimen name="dp_235">1005.2778dp</dimen>
-	<dimen name="dp_236">1009.5556dp</dimen>
-	<dimen name="dp_237">1013.8333dp</dimen>
-	<dimen name="dp_238">1018.1111dp</dimen>
-	<dimen name="dp_239">1022.3889dp</dimen>
-	<dimen name="dp_240">1026.6667dp</dimen>
-	<dimen name="dp_241">1030.9444dp</dimen>
-	<dimen name="dp_242">1035.2222dp</dimen>
-	<dimen name="dp_243">1039.5000dp</dimen>
-	<dimen name="dp_244">1043.7778dp</dimen>
-	<dimen name="dp_245">1048.0556dp</dimen>
-	<dimen name="dp_246">1052.3333dp</dimen>
-	<dimen name="dp_247">1056.6111dp</dimen>
-	<dimen name="dp_248">1060.8889dp</dimen>
-	<dimen name="dp_249">1065.1667dp</dimen>
-	<dimen name="dp_250">1069.4444dp</dimen>
-	<dimen name="dp_251">1073.7222dp</dimen>
-	<dimen name="dp_252">1078.0000dp</dimen>
-	<dimen name="dp_253">1082.2778dp</dimen>
-	<dimen name="dp_254">1086.5556dp</dimen>
-	<dimen name="dp_255">1090.8333dp</dimen>
-	<dimen name="dp_256">1095.1111dp</dimen>
-	<dimen name="dp_257">1099.3889dp</dimen>
-	<dimen name="dp_258">1103.6667dp</dimen>
-	<dimen name="dp_259">1107.9444dp</dimen>
-	<dimen name="dp_260">1112.2222dp</dimen>
-	<dimen name="dp_261">1116.5000dp</dimen>
-	<dimen name="dp_262">1120.7778dp</dimen>
-	<dimen name="dp_263">1125.0556dp</dimen>
-	<dimen name="dp_264">1129.3333dp</dimen>
-	<dimen name="dp_265">1133.6111dp</dimen>
-	<dimen name="dp_266">1137.8889dp</dimen>
-	<dimen name="dp_267">1142.1667dp</dimen>
-	<dimen name="dp_268">1146.4444dp</dimen>
-	<dimen name="dp_269">1150.7222dp</dimen>
-	<dimen name="dp_270">1155.0000dp</dimen>
-	<dimen name="dp_271">1159.2778dp</dimen>
-	<dimen name="dp_272">1163.5556dp</dimen>
-	<dimen name="dp_273">1167.8333dp</dimen>
-	<dimen name="dp_274">1172.1111dp</dimen>
-	<dimen name="dp_275">1176.3889dp</dimen>
-	<dimen name="dp_276">1180.6667dp</dimen>
-	<dimen name="dp_277">1184.9444dp</dimen>
-	<dimen name="dp_278">1189.2222dp</dimen>
-	<dimen name="dp_279">1193.5000dp</dimen>
-	<dimen name="dp_280">1197.7778dp</dimen>
-	<dimen name="dp_281">1202.0556dp</dimen>
-	<dimen name="dp_282">1206.3333dp</dimen>
-	<dimen name="dp_283">1210.6111dp</dimen>
-	<dimen name="dp_284">1214.8889dp</dimen>
-	<dimen name="dp_285">1219.1667dp</dimen>
-	<dimen name="dp_286">1223.4444dp</dimen>
-	<dimen name="dp_287">1227.7222dp</dimen>
-	<dimen name="dp_288">1232.0000dp</dimen>
-	<dimen name="dp_289">1236.2778dp</dimen>
-	<dimen name="dp_290">1240.5556dp</dimen>
-	<dimen name="dp_291">1244.8333dp</dimen>
-	<dimen name="dp_292">1249.1111dp</dimen>
-	<dimen name="dp_293">1253.3889dp</dimen>
-	<dimen name="dp_294">1257.6667dp</dimen>
-	<dimen name="dp_295">1261.9444dp</dimen>
-	<dimen name="dp_296">1266.2222dp</dimen>
-	<dimen name="dp_297">1270.5000dp</dimen>
-	<dimen name="dp_298">1274.7778dp</dimen>
-	<dimen name="dp_299">1279.0556dp</dimen>
-	<dimen name="dp_300">1283.3333dp</dimen>
-	<dimen name="dp_301">1287.6111dp</dimen>
-	<dimen name="dp_302">1291.8889dp</dimen>
-	<dimen name="dp_303">1296.1667dp</dimen>
-	<dimen name="dp_304">1300.4444dp</dimen>
-	<dimen name="dp_305">1304.7222dp</dimen>
-	<dimen name="dp_306">1309.0000dp</dimen>
-	<dimen name="dp_307">1313.2778dp</dimen>
-	<dimen name="dp_308">1317.5556dp</dimen>
-	<dimen name="dp_309">1321.8333dp</dimen>
-	<dimen name="dp_310">1326.1111dp</dimen>
-	<dimen name="dp_311">1330.3889dp</dimen>
-	<dimen name="dp_312">1334.6667dp</dimen>
-	<dimen name="dp_313">1338.9444dp</dimen>
-	<dimen name="dp_314">1343.2222dp</dimen>
-	<dimen name="dp_315">1347.5000dp</dimen>
-	<dimen name="dp_316">1351.7778dp</dimen>
-	<dimen name="dp_317">1356.0556dp</dimen>
-	<dimen name="dp_318">1360.3333dp</dimen>
-	<dimen name="dp_319">1364.6111dp</dimen>
-	<dimen name="dp_320">1368.8889dp</dimen>
-	<dimen name="dp_321">1373.1667dp</dimen>
-	<dimen name="dp_322">1377.4444dp</dimen>
-	<dimen name="dp_323">1381.7222dp</dimen>
-	<dimen name="dp_324">1386.0000dp</dimen>
-	<dimen name="dp_325">1390.2778dp</dimen>
-	<dimen name="dp_326">1394.5556dp</dimen>
-	<dimen name="dp_327">1398.8333dp</dimen>
-	<dimen name="dp_328">1403.1111dp</dimen>
-	<dimen name="dp_329">1407.3889dp</dimen>
-	<dimen name="dp_330">1411.6667dp</dimen>
-	<dimen name="dp_331">1415.9444dp</dimen>
-	<dimen name="dp_332">1420.2222dp</dimen>
-	<dimen name="dp_333">1424.5000dp</dimen>
-	<dimen name="dp_334">1428.7778dp</dimen>
-	<dimen name="dp_335">1433.0556dp</dimen>
-	<dimen name="dp_336">1437.3333dp</dimen>
-	<dimen name="dp_337">1441.6111dp</dimen>
-	<dimen name="dp_338">1445.8889dp</dimen>
-	<dimen name="dp_339">1450.1667dp</dimen>
-	<dimen name="dp_340">1454.4444dp</dimen>
-	<dimen name="dp_341">1458.7222dp</dimen>
-	<dimen name="dp_342">1463.0000dp</dimen>
-	<dimen name="dp_343">1467.2778dp</dimen>
-	<dimen name="dp_344">1471.5556dp</dimen>
-	<dimen name="dp_345">1475.8333dp</dimen>
-	<dimen name="dp_346">1480.1111dp</dimen>
-	<dimen name="dp_347">1484.3889dp</dimen>
-	<dimen name="dp_348">1488.6667dp</dimen>
-	<dimen name="dp_349">1492.9444dp</dimen>
-	<dimen name="dp_350">1497.2222dp</dimen>
-	<dimen name="dp_351">1501.5000dp</dimen>
-	<dimen name="dp_352">1505.7778dp</dimen>
-	<dimen name="dp_353">1510.0556dp</dimen>
-	<dimen name="dp_354">1514.3333dp</dimen>
-	<dimen name="dp_355">1518.6111dp</dimen>
-	<dimen name="dp_356">1522.8889dp</dimen>
-	<dimen name="dp_357">1527.1667dp</dimen>
-	<dimen name="dp_358">1531.4444dp</dimen>
-	<dimen name="dp_359">1535.7222dp</dimen>
-	<dimen name="dp_360">1540.0000dp</dimen>
-	<dimen name="dp_365">1561.3889dp</dimen>
-	<dimen name="dp_370">1582.7778dp</dimen>
-	<dimen name="dp_380">1625.5556dp</dimen>
-	<dimen name="dp_385">1646.9444dp</dimen>
-	<dimen name="dp_400">1711.1111dp</dimen>
-	<dimen name="dp_410">1753.8889dp</dimen>
-	<dimen name="dp_422">1805.2222dp</dimen>
-	<dimen name="dp_472">2019.1111dp</dimen>
-	<dimen name="dp_500">2138.8889dp</dimen>
-	<dimen name="dp_600">2566.6667dp</dimen>
-	<dimen name="dp_640">2737.7778dp</dimen>
-	<dimen name="dp_720">3080.0000dp</dimen>
-	<dimen name="sp_6">25.6667dp</dimen>
-	<dimen name="sp_7">29.9444dp</dimen>
-	<dimen name="sp_8">34.2222dp</dimen>
-	<dimen name="sp_9">38.5000dp</dimen>
-	<dimen name="sp_10">42.7778dp</dimen>
-	<dimen name="sp_11">47.0556dp</dimen>
-	<dimen name="sp_12">51.3333dp</dimen>
-	<dimen name="sp_13">55.6111dp</dimen>
-	<dimen name="sp_14">59.8889dp</dimen>
-	<dimen name="sp_15">64.1667dp</dimen>
-	<dimen name="sp_16">68.4444dp</dimen>
-	<dimen name="sp_17">72.7222dp</dimen>
-	<dimen name="sp_18">77.0000dp</dimen>
-	<dimen name="sp_19">81.2778dp</dimen>
-	<dimen name="sp_20">85.5556dp</dimen>
-	<dimen name="sp_21">89.8333dp</dimen>
-	<dimen name="sp_22">94.1111dp</dimen>
-	<dimen name="sp_23">98.3889dp</dimen>
-	<dimen name="sp_24">102.6667dp</dimen>
-	<dimen name="sp_25">106.9444dp</dimen>
-	<dimen name="sp_28">119.7778dp</dimen>
-	<dimen name="sp_30">128.3333dp</dimen>
-	<dimen name="sp_32">136.8889dp</dimen>
-	<dimen name="sp_34">145.4444dp</dimen>
-	<dimen name="sp_36">154.0000dp</dimen>
-	<dimen name="sp_38">162.5556dp</dimen>
-	<dimen name="sp_40">171.1111dp</dimen>
-	<dimen name="sp_42">179.6667dp</dimen>
-	<dimen name="sp_48">205.3333dp</dimen>
-	<dimen name="sp_58">248.1111dp</dimen>
-	<dimen name="sp_115">491.9444dp</dimen>
-</resources>