fff

app/build.gradle

@@ -37,10 +37,9 @@ android {
         applicationId "com.arpa.hndahesudintocctmsdriver"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 60
+        versionCode 59
-        versionName "3.3.0"
+        versionName "3.2.9"
         flavorDimensions "CHANNEL_VALUE"
-        flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
 
@@ -57,7 +56,27 @@ android {
             // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' , 'arm64-v8a'
 
         }
+
+        manifestPlaceholders = [
+                JPUSH_PKGNAME : applicationId,
+                JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+                MEIZU_APPKEY : "MZ-魅族的APPKEY",
+                MEIZU_APPID : "MZ-魅族的APPID",
+                XIAOMI_APPID : "MI-小米的APPID",
+                XIAOMI_APPKEY : "MI-小米的APPKEY",
+                OPPO_APPKEY : "OP-oppo的APPKEY",
+                OPPO_APPID : "OP-oppo的APPID",
+                OPPO_APPSECRET : "OP-oppo的APPSECRET",
+                VIVO_APPKEY : "vivo的APPKEY",
+                VIVO_APPID : "vivo的APPID"
+        ]
     }
+//    sourceSets {
+//        main {
+//            jniLibs.srcDirs = ['libs']
+//        }
+//    }
 
     sourceSets {
         main {
@@ -96,14 +115,7 @@ android {
 
     productFlavors {
         qa {
-            applicationId "com.arpa.hndahesudintocctmsdriver.text"
+            manifestPlaceholders = [CHANNEL_VALUE: "好运司机测试"]
-            manifestPlaceholders = [CHANNEL_VALUE: "司机测试",
-                                    app_icon     : "@drawable/diver_logo_text",
-                                    GAODEKEY     : "6791d69f6221a0841b521763af86eb01",
-                                    JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
-                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
-            ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
             buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "true"
@@ -111,14 +123,7 @@ android {
             resValue "string", "appName", "司机测试"
         }
         product {
-            applicationId "com.arpa.hndahesudintocctmsdriver"
+            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机"]
-            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机",
-                                    app_icon     : "@drawable/diver_logo",
-                                    GAODEKEY     : "78019612271411eca3af34db91930620",
-                                    JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
-                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
-            ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")
             buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "false"
@@ -126,26 +131,10 @@ android {
             resValue "string", "appName", "大河好运司机"
         }
 
-        productbc {
-            applicationId "com.arpa.hndahesudintocctmsdriver.bc"
-            manifestPlaceholders = [CHANNEL_VALUE: "司机运营",
-                                    app_icon     : "@drawable/diver_logo_yunying",
-                                    GAODEKEY     : "f960bc6d14788238918bd014fa08a870",
-                                    JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
-                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
-            ]
-            buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")
-            buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
-            buildConfigField "boolean", "isTest", "false"
-            //APP名称，可以在androidMainfest中引用
-            resValue "string", "appName", "司机运营"
     }
-
+    productFlavors.all { flavor ->
+        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
     }
-//    productFlavors.all { flavor ->
-//        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
-//    }
 
 
     android.applicationVariants.all { variant ->

app/src/main/AndroidManifest.xml

@@ -44,7 +44,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.EACCES" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-feature
         android:name="android.hardware.nfc"
         android:required="true" />
@@ -53,7 +53,7 @@
         android:name="com.arpa.hndahesudintocctmsdriver.App"
         android:allowBackup="true"
         android:excludeFromRecents="true"
-        android:icon="${app_icon}"
+        android:icon="@drawable/diver_logo"
         android:label="@string/appName"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
@@ -97,9 +97,8 @@
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
             android:screenOrientation="portrait"/>
-
         <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivityBC"
+            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity"
             android:screenOrientation="portrait">
 
             <intent-filter>
@@ -110,8 +109,10 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
 
-        </activity> <activity
+        </activity>
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity"
+
+        <activity
+            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivityBC"
             android:screenOrientation="portrait">
 
             <intent-filter>
@@ -261,7 +262,7 @@
         <!--高德地图-->
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="${GAODEKEY}" />
+            android:value="78019612271411eca3af34db91930620" />
 <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
         <service android:name="com.amap.api.location.APSService"></service>
@@ -396,7 +397,7 @@
         </receiver>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="com.arpa.hndahesudintocctmsdriver.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:ignore="WrongManifestParent">

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

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

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

@@ -1,6 +1,5 @@
 package com.arpa.hndahesudintocctmsdriver.request;
 
-import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
 import com.arpa.hndahesudintocctmsdriver.request.bean.TrackInputBean;
@@ -9,6 +8,7 @@ import com.arpa.hndahesudintocctmsdriver.ui.home.HuoYuanFragmengt;
 import com.arpa.hndahesudintocctmsdriver.ui.home.HuoYunDelActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.OrderComplaintActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity;
 import com.arpa.hndahesudintocctmsdriver.util.map.MapUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
@@ -89,11 +89,6 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING(), gson.toJson(lub)),getToken(con),con);
         RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd);
     }
-    //卸货-补传
-    public void dischargeCargo4(LUInputBean lub){
-        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING4(), gson.toJson(lub)),getToken(con),con);
-        RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd);
-    }
     //回单
     public void receipt(UploadReceiptInputBean urib){
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUploadReceipt(), gson.toJson(urib)),getToken(con),con);

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

@@ -67,8 +67,6 @@ public class RequestConstant {
     private static final String LOADING="/app/driver/waybill/loadingV2";
     //卸货
     private static final String UNLOADING="/app/driver/waybill/unloadV2";
-    //卸货-补传
-    private static final String UNLOADING4 = "/app/driver/waybill/unloadV4";
     //上传回单
     private static final String UPLOAD_RECEIPT="/app/driver/waybill/uploadReceipt";
     //轨迹跟踪
@@ -211,13 +209,9 @@ public class RequestConstant {
         return BASE_URL + BANK_CARD_LIST;
     }
 
-    public static String getXiaoXiListUrl() {
+    public static String getXiaoXiListUrl() { return BASE_URL + XIAOXI_LIST; }
-        return BASE_URL + XIAOXI_LIST;
-    }
 
-    public static String getXiaoxiAll() {
+    public static String getXiaoxiAll() { return BASE_URL +XIAOXI_ALL; }
-        return BASE_URL + XIAOXI_ALL;
-    }
 
     public static String getOrderList() {
         return BASE_URL +ORDER_LIST;
@@ -247,10 +241,6 @@ public class RequestConstant {
         return BASE_URL +UNLOADING;
     }
 
-    public static String getUNLOADING4() {
-        return BASE_URL + UNLOADING4;
-    }
-
     public static String getGetEvaluate() {
         return BASE_URL +GET_EVALUATE;
     }
@@ -303,25 +293,15 @@ public class RequestConstant {
         return BASE_URL +ISAUTH_IDCARD;
     }
 
-    public static String getIsauthDriverauthLicense() {
+    public static String getIsauthDriverauthLicense() { return BASE_URL +ISAUTH_DRIVERAUTH_LICENSE; }
-        return BASE_URL + ISAUTH_DRIVERAUTH_LICENSE;
-    }
 
-    public static String getUploadReceipt() {
+    public static String getUploadReceipt() { return BASE_URL +UPLOAD_RECEIPT; }
-        return BASE_URL + UPLOAD_RECEIPT;
-    }
 
-    public static String getUPLOAD() {
+    public static String getUPLOAD() { return BASE_URL +UPLOAD; }
-        return BASE_URL + UPLOAD;
-    }
 
-    public static String getTrackTracking() {
+    public static String getTrackTracking() {return BASE_URL +TRACK_TRACKING; }
-        return BASE_URL + TRACK_TRACKING;
-    }
 
-    public static String getEvaluationV2() {
+    public static String getEvaluationV2() { return BASE_URL +EVALUATION_V2; }
-        return BASE_URL + EVALUATION_V2;
-    }
 
     public static String getDRIVERAUTHIDCARD() {
         return BASE_URL +DRIVERAUTHIDCARD;
@@ -339,45 +319,27 @@ public class RequestConstant {
         return BASE_URL +SAVECARIMG;
     }
 
-    public static String getUploadHead() {
+    public static String getUploadHead() { return BASE_URL +UPLOAD_HEAD; }
-        return BASE_URL + UPLOAD_HEAD;
-    }
 
     public static String getInsBankcard() {
         return BASE_URL +INS_BANKCARD;
     }
 
-    public static String getDelCar() {
+    public static String getDelCar() { return BASE_URL +DEL_CAR; }
-        return BASE_URL + DEL_CAR;
-    }
 
-    public static String getXiaoxiDel() {
+    public static String getXiaoxiDel() { return BASE_URL +XIAOXI_DEL; }
-        return BASE_URL + XIAOXI_DEL;
-    }
 
-    public static String getCOMPLAINT() {
+    public static String getCOMPLAINT() { return BASE_URL+COMPLAINT; }
-        return BASE_URL + COMPLAINT;
-    }
 
-    public static String getXiaoxiDelAll() {
+    public static String getXiaoxiDelAll() { return BASE_URL+XIAOXI_DEL_ALL; }
-        return BASE_URL + XIAOXI_DEL_ALL;
-    }
 
-    public static String getDriverAuthQualification() {
+    public static String getDriverAuthQualification() { return BASE_URL+DRIVER_AUTH_QUALIFICATION; }
-        return BASE_URL + DRIVER_AUTH_QUALIFICATION;
-    }
 
-    public static String getDriverSaveCarRegisterNo() {
+    public static String getDriverSaveCarRegisterNo() { return BASE_URL+DRIVER_AUTH_SAVECARREGISTERNO; }
-        return BASE_URL + DRIVER_AUTH_SAVECARREGISTERNO;
-    }
 
-    public static String getDriverSaveCarRoadLicenseNo() {
+    public static String getDriverSaveCarRoadLicenseNo() { return BASE_URL+DRIVER_AUTH_SAVECARROADLICENSENO; }
-        return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO;
-    }
 
-    public static String getSaveDrawCar() {
+    public static String getSaveDrawCar() { return BASE_URL+SAVE_DRAW_CAR; }
-        return BASE_URL + SAVE_DRAW_CAR;
-    }
 
     public static String getIsAuthDriverAuthQualification() {
         return BASE_URL+IS_AUTH_DRIVER_AUTH_QUALIFICATION;
@@ -419,9 +381,7 @@ public class RequestConstant {
         return BASE_URL+WITHDRAWALS_CONFIG;
     }
 
-    public static String getGetErrorOrder() {
+    public static String getGetErrorOrder() { return BASE_URL+GET_ERROR_ORDER; }
-        return BASE_URL + GET_ERROR_ORDER;
-    }
 
     public static String getGetExampleList() {
         return BASE_URL+GET_EXAMPLE_LIST;

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

@@ -137,18 +137,18 @@ public class UserRequset {
 
     //app更新
     public void upApp() {
-//        String vs = "1.0.0";
+        String vs = "1.0.0";
-//        try {
+        try {
-////            isOpenAppNoRe();
+//            isOpenAppNoRe();
-//            vs = con.getPackageManager().getPackageInfo(con.getPackageName(), 0).versionName;
+            vs = con.getPackageManager().getPackageInfo(con.getPackageName(), 0).versionName;
-//        } catch (PackageManager.NameNotFoundException e) {
+        } catch (PackageManager.NameNotFoundException e) {
-//            e.printStackTrace();
+            e.printStackTrace();
-//        }
+        }
-//        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
-//        map.put("source", 0);
+        map.put("source", 0);
-//        map.put("version", vs);
+        map.put("version", vs);
-//        Request re = OkHttpUtil.post(new OkDate(RequestConstant.getVERSION(), MapUtil.mapJson(map)), con);
+        Request re = OkHttpUtil.post(new OkDate(RequestConstant.getVERSION(), MapUtil.mapJson(map)), con);
-//        RequestUtil.start(1, "up_app", re, con, hd);
+        RequestUtil.start(1, "up_app", re, con, hd);
     }
 
     /**

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

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

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

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

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

@@ -660,9 +660,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 break;
             case 3:
                 Log.e("挂车信息", gson.toJson(cdb));
-                if (cdb != null && cdb.getData().getTrailerResVo() != null
+                if (cdb != null && cdb.getData().getTrailerResVo() != null) {
-                        && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getFrontImage())
-                        && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getBackImage())) {
                     url1 = StringUtil.isNull(cdb.getData().getTrailerResVo().getFrontImage(), "");
                     url2 = StringUtil.isNull(cdb.getData().getTrailerResVo().getBackImage(), "");
                     url3 = StringUtil.isNull(cdb.getData().getTrailerResVo().getThreeImage(), "");

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

@@ -159,12 +159,12 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     if (ib.getCode() == 200) {
                         //判断是否需要跳转挂车行驶证页面
                         if (!"".equals(carId) ){
-                            if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，并且传过挂车直接结束
+                            if (cdb.getData().getIsTrailer() == 1&&!TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车，并且传过挂车直接结束
                                 finish();
                                 Intent in = new Intent(con, AddCarSuccActivity.class);
                                 in.putExtra("type", 3);
                                 con.startActivity(in);
-                            } else if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，没传过挂车，到挂车页面
+                            }else if(cdb.getData().getIsTrailer() == 1&&TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车，没传过挂车，到挂车页面
                                 finish();
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);

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

@@ -7,6 +7,7 @@ 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;
@@ -22,7 +23,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
-import androidx.core.app.ActivityCompat;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.alct.mdp.callback.OnDownloadResultListener;
@@ -36,7 +36,6 @@ import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.Marker;
 import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.MyLocationStyle;
-import com.arpa.hndahesudintocctmsdriver.App;
 import com.arpa.hndahesudintocctmsdriver.bean.DriverExpireBean;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.JTT;
@@ -86,13 +85,7 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.time.Timer;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseFragment;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
-import com.lxj.xpopup.util.XPermission;
 import com.permissionx.guolindev.PermissionX;
-import com.permissionx.guolindev.callback.RequestCallback;
-import com.permissionx.guolindev.dialog.RationaleDialog;
-import com.permissionx.guolindev.request.ChainTask;
-import com.permissionx.guolindev.request.ExplainScope;
-import com.permissionx.guolindev.request.ForwardScope;
 import com.youth.banner.Banner;
 import com.youth.banner.BannerConfig;
 import com.youth.banner.Transformer;
@@ -104,9 +97,6 @@ import org.greenrobot.eventbus.Subscribe;
 import java.util.ArrayList;
 import java.util.List;
 
-import pub.devrel.easypermissions.EasyPermissions;
-import pub.devrel.easypermissions.helper.PermissionHelper;
-
 /**
  * @author hlh
  * @version 1.0.0
@@ -555,6 +545,7 @@ public class HomeFragment extends BaseFragment {
         ur.getImage(1);
 
 
+
         if (UiAuxiliary.isLogin(con)) {
             ur.User();
             ur.getDriverExpire();

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

@@ -31,6 +31,7 @@ import com.amap.api.maps.model.LatLngBounds;
 import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.PolylineOptions;
 
+import com.amap.api.services.core.AMapException;
 import com.amap.api.services.core.LatLonPoint;
 import com.amap.api.services.route.BusRouteResult;
 import com.amap.api.services.route.DrivePath;
@@ -39,7 +40,7 @@ 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.ui.home.shangchuan.ShangChuangImgActivity;
+import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.bumptech.glide.Glide;
 import com.dahe.mylibrary.utils.TimeUtil;
 import com.dahe.mylibrary.utils.ToastUtils;
@@ -54,6 +55,7 @@ import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
 import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary;
 import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.GetShangChuanActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.OrderComplaintActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.WebPDFActivity;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil;
 import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
@@ -69,6 +71,7 @@ import com.arpa.hndahesudintocctmsdriver.util.view.ScoreView;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class StartYunDanActivity extends BaseActivity {

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

@@ -160,9 +160,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 14://定位成功
                 locationKey = true;
-                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                 customDialog.dismiss();
-                }
                 tv_loaction.setText("定位成功");
                 tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
                 latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude()));
@@ -170,9 +168,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 16://定位失败
                 locationKey = false;
-                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                 customDialog.dismiss();
-                }
                 tv_loaction.setText("定位失败，点击重试");
                 tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color, null));
                 Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();

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

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

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

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

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

@@ -55,7 +55,6 @@ public class GetCarImageAlert {
             //请按照如图所示拍摄回单照片，回单照片必须保持清晰完整，能看清具体吨数，便于结算运费时核查，感谢配合。
         }
         btn_xiangce.setOnClickListener(v -> {
-            try {
             PermissionX.init(act)
                     .permissions(Manifest.permission.READ_EXTERNAL_STORAGE)
                     .request((allGranted, grantedList, deniedList) -> {
@@ -65,13 +64,8 @@ public class GetCarImageAlert {
                             Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
                         }
                     });
-            } catch (Exception e) {
-                Toast.makeText(act.getBaseContext(), "程序出现问题了，请重新登录后重试!!!", Toast.LENGTH_LONG).show();
-            }
-
         });
         btn_paizhao.setOnClickListener(v -> {
-            try{
             PermissionX.init(act)
                     .permissions(Manifest.permission.CAMERA)
                     .request((allGranted, grantedList, deniedList) -> {
@@ -83,10 +77,6 @@ public class GetCarImageAlert {
                             Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
                         }
                     });
-            }catch (Exception e){
-                Toast.makeText(act.getBaseContext(), "程序出现问题了，请重新登录后重试!!!", Toast.LENGTH_LONG).show();
-            }
-
         });
         img.setOnClickListener(v -> {
             if (!key){

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

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

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

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

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

@@ -46,8 +46,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_alignParentRight="true"
-                android:visibility="gone"
+                android:visibility="gone">
-                >
 
                 <androidx.cardview.widget.CardView
                     android:id="@+id/btn_news"

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

@@ -1,876 +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.Button;
-import android.widget.EditText;
-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.amap.api.services.core.AMapException;
-import com.amap.api.services.core.LatLonPoint;
-import com.amap.api.services.geocoder.GeocodeSearch;
-import com.amap.api.services.help.Inputtips;
-import com.amap.api.services.help.InputtipsQuery;
-import com.amap.api.services.help.Tip;
-import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
-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.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.utils.CoordinateConverter;
-import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ToastUtils;
-import com.github.gzuliyujiang.wheelpicker.DatimePicker;
-import com.github.gzuliyujiang.wheelpicker.annotation.TimeMode;
-import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity;
-import com.google.gson.Gson;
-import com.luck.picture.lib.PictureSelector;
-import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.entity.LocalMedia;
-import com.lxj.xpopup.XPopup;
-import com.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.request.HuoYuanRequset;
-import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
-import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean;
-import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
-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.time.Timer;
-import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
-import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
-import com.lxj.xpopup.interfaces.OnSelectListener;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ShangChuangImgActivity extends BaseAppCompatActivity implements Inputtips.InputtipsListener {
-
-    private TextView submit, name_top, name_body, address, tips, tips_x,tvDate,tvLocation;
-    private RelativeLayout getImg;
-    private EditText etAddress;
-    private Button btnOk;
-    private ImageView res_img, img_icon, img_delete;
-    private String[] names = {"装货", "卸货", "回单"};
-    public static String[] TYPE_NAME = {"zhuanghuo", "xiehuo", "huidan"};
-    private int index = 0;
-    //
-    private Gson gson = new Gson();
-    //
-    private LUInputBean lub = new LUInputBean();
-    private UploadReceiptInputBean urib = new UploadReceiptInputBean();
-    private LocationGDUtil lgdu;
-    public 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;
-
-
-    private String selDate;
-    private GeocodeSearch geocoderSearch;
-
-    private TempLoca tempLoca = new TempLoca();
-    private TempLoca tempLocaBd = new TempLoca();
-
-
-    @Override
-    public void onGetInputtips(List<Tip> tipList, int rCode) {
-        if (rCode == AMapException.CODE_AMAP_SUCCESS) {
-            List<String> names = new ArrayList<String>();
-            if(tipList != null) {
-                int size = tipList.size();
-                for (int i = 0; i < size; i++) {
-                    Tip tip = tipList.get(i);
-                    if(tip != null) {
-                        names.add(tip.getDistrict()+tip.getName());
-                    }
-                }
-
-                new XPopup.Builder(this)
-                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-                        .hasShadowBg(false) // 去掉半透明背景
-                        .atView(etAddress)
-                        .asAttachList(names.toArray(new String[0]), new int[]{}, new OnSelectListener() {
-                            @Override
-                            public void onSelect(int position, String text) {
-                                Tip tip = tipList.get(position);
-                                etAddress.setText(tip.getDistrict()+tip.getAddress()+tip.getName());
-                                LatLonPoint latLonPoint = tip.getPoint();
-                                tempLoca.setAddress(etAddress.getText().toString());
-                                tempLoca.setLatitude(latLonPoint.getLatitude());
-                                tempLoca.setLongitude(latLonPoint.getLongitude());
-                                tempLoca.setTime(tvDate.getText().toString());
-
-                                LatLng latLng = convertGPSToBaidu(new LatLng(latLonPoint.getLatitude(), latLonPoint.getLongitude()));
-                                tempLocaBd.setLongitude(latLng.longitude);
-                                tempLocaBd.setLatitude(latLng.latitude);
-                                tempLocaBd.setAddress(etAddress.getText().toString());
-                                tempLocaBd.setTime(tvDate.getText().toString());
-
-                            }
-                        })
-                        .show();
-
-
-
-//                SimpleAdapter aAdapter = new SimpleAdapter(getApplicationContext(), listString, R.layout.item_layout,
-//                        new String[]{"name", "address"}, new int[]{R.id.poi_field_id, R.id.poi_value_id});
-//
-//                minputlist.setAdapter(aAdapter);
-//                aAdapter.notifyDataSetChanged();
-            }
-
-        } else {
-        }
-    }
-
-    class TempLoca{
-        private double latitude;
-        private double longitude;
-        private String address;
-        private String time;
-
-        public TempLoca() {
-
-        }
-
-        public TempLoca(double latitude, double longitude, String address, String time) {
-            this.latitude = latitude;
-            this.longitude = longitude;
-            this.address = address;
-            this.time = time;
-        }
-
-        public double getLatitude() {
-            return latitude;
-        }
-
-        public void setLatitude(double latitude) {
-            this.latitude = latitude;
-        }
-
-        public double getLongitude() {
-            return longitude;
-        }
-
-        public void setLongitude(double longitude) {
-            this.longitude = longitude;
-        }
-
-        public String getAddress() {
-            return address;
-        }
-
-        public void setAddress(String address) {
-            this.address = address;
-        }
-
-        public String getTime() {
-            return time;
-        }
-
-        public void setTime(String time) {
-            this.time = time;
-        }
-    }
-
-    @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 (index == 2) {
-                                if (!keys){//装货回单
-                                    Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                                    finish();
-                                }
-                            }
-                        } else {
-                            Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
-                        }
-                        CacheGroup.cacheList.remove(TYPE_NAME[i]);
-                        break;
-                    }
-                }
-                if (CacheGroup.cacheList.get("carName") != null) {
-                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("carName"), BaseBean.class);
-                    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;
-                customDialog.dismiss();
-                tv_loaction.setText("定位成功");
-                tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
-                latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude()));
-                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));
-//                }
-                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
-                    new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
-                } else {
-                    hyr.uploadFile(new File(path));
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    private LatLng latLng;
-
-    public LatLng convertGPSToBaidu(LatLng srLatLng) {
-        CoordinateConverter converter = new CoordinateConverter();
-        converter.from(CoordinateConverter.CoordType.COMMON);
-        converter.coord(srLatLng);
-        return converter.convert();
-    }
-
-    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_bc);
-        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);
-        btnOk = findViewById(R.id.btnOk);
-        etAddress = findViewById(R.id.etAddress);
-        tvDate = findViewById(R.id.tvDate);
-        tvLocation = findViewById(R.id.tvLocation);
-        tips = findViewById(R.id.tips);
-        tips_x = findViewById(R.id.tips_x);
-        Bundle ins = getIntent().getExtras();
-        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();
-        tv_loaction.setOnClickListener(v -> {
-            if (!locationKey) {
-                customDialog.show();
-                lgdu.onCreate();
-            }
-        });
-
-        btnOk.setOnClickListener(v -> {
-            String s = etAddress.getText().toString();
-            if (TextUtils.isEmpty(selDate)){
-                ToastUtils.showToast(this,"请先选择时间");
-                return;
-            }
-            if (!TextUtils.isEmpty(s)&&s.length()>=4){
-
-                InputtipsQuery inputquery = new InputtipsQuery(s, "");
-//                inputquery.setCityLimit(true);
-                Inputtips inputTips = new Inputtips(this, inputquery);
-                inputTips.setInputtipsListener(this);
-                inputTips.requestInputtipsAsyn();
-
-
-//                GeocodeQuery query = new GeocodeQuery(s, "100000");// 第一个参数表示地址，第二个参数表示查询城市，中文或者中文全拼，citycode、adcode，
-//                geocoderSearch.getFromLocationNameAsyn(query);// 设置同步地理编码请求
-            }else{
-                ToastUtils.showToast(this,"请输入地址且长度大于4");
-            }
-        });
-
-        tvDate.setOnClickListener(v -> {
-
-            DatimePicker datimePicker = new DatimePicker(this);
-            datimePicker.setBodyWidth(300);
-            datimePicker.getWheelLayout().setRange(DatimeEntity.yearOnFuture(-1),DatimeEntity.yearOnFuture(10),DatimeEntity.now());
-            datimePicker.setOnDatimePickedListener((year, month, day, hour, minute, second) -> {
-                selDate = year+"-"+month+"-"+day+" "+ hour+":"+minute;
-                tvDate.setText(selDate);
-            });
-            datimePicker.getWheelLayout().setDateLabel("年", "月", "日");
-            datimePicker.getWheelLayout().setTimeLabel("时","分","");
-            datimePicker.getWheelLayout().setTimeMode(TimeMode.HOUR_24_NO_SECOND);
-            datimePicker.show();
-        });
-
-        hyr = new HuoYuanRequset(con, hd);
-    }
-
-    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);
-            } 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(tempLoca.getLatitude() + "");
-                    lub.setLongitude(tempLoca.getLongitude() + "");
-                    lub.setLocationAddress(tempLoca.getAddress());
-                    lub.setImageId(imgIds);
-                    lub.setWaybillId(wid);
-                    Log.e("--装货信息", gson.toJson(lub));
-                    if (locationKey) {//高德定位
-                        if (keys) {
-                            nfc();
-                            loadInfo();
-//                            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(tempLoca.getLatitude() + "");
-                    lub.setLongitude(tempLoca.getLongitude() + "");
-                    lub.setLocationAddress(tempLoca.getAddress());
-                    lub.setImageId(imgIds);
-                    lub.setWaybillId(wid);
-                    lub.setRealLoadTime(tempLoca.getTime());
-                    Log.e("--卸货信息", gson.toJson(lub));
-                    if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) {
-                        if (keys) {
-                            nfc();
-                            uploadInfo();
-
-                        }
-
-                    } 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 && !TextUtils.isEmpty(tempLoca.address)) {
-                            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 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_trafficSign() {
-        //安联
-        Location l = new Location();
-        l.setBaiduLongitude(tempLocaBd.longitude);
-        l.setBaiduLatitude(tempLocaBd.latitude);
-        l.setLocation(tempLocaBd.getAddress());
-        l.setTime(tempLocaBd.getTime());
-        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("上报安联", "签收成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(签收):", s + s1);
-            }
-        });
-    }
-
-    //上传安联-回单
-    public void up_trafficReceipt() {
-        //安联
-        Location l = new Location();
-        l.setBaiduLongitude(tempLocaBd.longitude);
-        l.setBaiduLatitude(tempLocaBd.latitude);
-        l.setLocation(tempLocaBd.getAddress());
-        l.setTime(tempLocaBd.getTime());
-        MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "回单上传成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单):", s + s1);
-            }
-
-        });
-    }
-
-    public void up_image_z() {
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        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(Timer.getTimerT());
-        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLocaBd.getAddress());
-        MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "装货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.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);
-//              startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void up_image() {
-        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(tempLocaBd.getTime());
-        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLocaBd.getAddress());
-        MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "卸货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.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);
-//                startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void receipt_image() {
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        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(tempLocaBd.getTime());
-        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLocaBd.getAddress());
-        MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "回单照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.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);
-////                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);
-    }
-
-
-
-
-    /**
-     * 上传安联和交通厅,平台-装货
-     */
-    private void loadInfo() {
-        //安联
-        if (sob.getData().getReportAlct() == 1) {
-            Location l = new Location();
-            l.setBaiduLongitude(tempLocaBd.longitude);
-            l.setBaiduLatitude(tempLocaBd.latitude);
-            l.setLocation(tempLocaBd.getAddress());
-            l.setTime(tempLocaBd.getTime());
-            MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "装货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.start(con, sob, "");
-                    }
-                    //装货状态
-                    hyr.loading(lub);
-                    //装货照片
-                    up_image_z();
-                }
-
-                @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(tempLocaBd.longitude);
-            l.setBaiduLatitude(tempLocaBd.latitude);
-            l.setLocation(tempLocaBd.getAddress());
-            l.setTime(tempLocaBd.getTime());
-            Log.e("-安联卸货信息-", gson.toJson(l));
-            MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "卸货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.stop(con, sob, "");
-                    }
-                    //卸货状态-平台
-                    hyr.dischargeCargo4(lub);
-                    //卸货照片-安联
-                    up_image();
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(卸货):", s + s1);
-//                    new MessageUtils().showCenMessage(con, s1);
-                    //运单状态不一致，平台更新状态
-                    hyr.dischargeCargo4(lub);
-                }
-            });
-        }
-
-
-    }
-}

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

@@ -1,725 +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.CarInfoBean;
-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.OCRRequest;
-import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
-import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean;
-import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
-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.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.utils.CoordinateConverter;
-import com.bumptech.glide.Glide;
-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 ShangChuangImgActivity 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;
-    public 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 (index == 2) {
-                                if (!keys){//装货回单
-                                    Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                                    finish();
-                                }
-                            }
-                        } else {
-                            Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
-                        }
-                        CacheGroup.cacheList.remove(TYPE_NAME[i]);
-                        break;
-                    }
-                }
-                if (CacheGroup.cacheList.get("carName") != null) {
-                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("carName"), BaseBean.class);
-                    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;
-                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
-                    customDialog.dismiss();
-                }
-                tv_loaction.setText("定位成功");
-                tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
-                latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude()));
-                initLocation();
-                break;
-            case 16://定位失败
-                locationKey = false;
-                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
-                    customDialog.dismiss();
-                }
-                tv_loaction.setText("定位失败，点击重试");
-                tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color, null));
-                Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
-                //定位结果接收
-                //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));
-//                }
-                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
-                    new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
-                } else {
-                    hyr.uploadFile(new File(path));
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    private LatLng latLng;
-
-    public LatLng convertGPSToBaidu(LatLng srLatLng) {
-        CoordinateConverter converter = new CoordinateConverter();
-        converter.from(CoordinateConverter.CoordType.COMMON);
-        converter.coord(srLatLng);
-        return converter.convert();
-    }
-
-    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();
-//                lu = new LocationUtil(con, hd);
-//                lu.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, 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) {//高德定位
-                        if (keys) {
-                            nfc();
-                            loadInfo();
-//                            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();
-                            uploadInfo();
-
-                        }
-
-                    } 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 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_trafficSign() {
-        //安联
-        Location l = new Location();
-        l.setBaiduLongitude(latLng.longitude);
-        l.setBaiduLatitude(latLng.latitude);
-        l.setLocation(lgdu.getAddress());
-        l.setTime(Timer.getTimerT());
-        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("上报安联", "签收成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(签收):", s + s1);
-            }
-        });
-    }
-
-    //上传安联-回单
-    public void up_trafficReceipt() {
-        //安联
-        Location l = new Location();
-        l.setBaiduLongitude(latLng.longitude);
-        l.setBaiduLatitude(latLng.latitude);
-        l.setLocation(lgdu.getAddress());
-        l.setTime(Timer.getTimerT());
-        MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "回单上传成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单):", s + s1);
-            }
-
-        });
-    }
-
-    public void up_image_z() {
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        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(Timer.getTimerT());
-        image.setBaiduLongitude(latLng.longitude);
-        image.setBaiduLatitude(latLng.latitude);
-        image.setLocation(lgdu.getAddress());
-        MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "装货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.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);
-//              startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void up_image() {
-        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(Timer.getTimerT());
-        image.setBaiduLongitude(latLng.longitude);
-        image.setBaiduLatitude(latLng.latitude);
-        image.setLocation(lgdu.getAddress());
-        MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "卸货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.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);
-//                startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void receipt_image() {
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        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(Timer.getTimerT());
-        image.setBaiduLongitude(latLng.longitude);
-        image.setBaiduLatitude(latLng.latitude);
-        image.setLocation(lgdu.getAddress());
-        MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "回单照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.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);
-////                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);
-    }
-
-
-
-
-    /**
-     * 上传安联和交通厅,平台-装货
-     */
-    private void loadInfo() {
-        //安联
-        if (sob.getData().getReportAlct() == 1) {
-            Location l = new Location();
-            l.setBaiduLongitude(latLng.longitude);
-            l.setBaiduLatitude(latLng.latitude);
-            l.setLocation(lgdu.getAddress());
-            l.setTime(Timer.getTimerT());
-            MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "装货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.start(con, sob, "");
-                    }
-                    //装货状态
-                    hyr.loading(lub);
-                    //装货照片
-                    up_image_z();
-                }
-
-                @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(latLng.longitude);
-            l.setBaiduLatitude(latLng.latitude);
-            l.setLocation(lgdu.getAddress());
-            l.setTime(Timer.getTimerT());
-            Log.e("-安联卸货信息-", gson.toJson(l));
-            MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "卸货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.stop(con, sob, "");
-                    }
-                    //卸货状态-平台
-                    hyr.dischargeCargo(lub);
-                    //卸货照片-安联
-                    up_image();
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(卸货):", s + s1);
-                    new MessageUtils().showCenMessage(con, s1);
-                }
-            });
-        }
-
-
-    }
-
-}

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

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