webview添加loading

app/build.gradle

@@ -35,10 +35,10 @@ android {
 
     defaultConfig {
         applicationId "com.arpa.hndahesudintocctmsdriver"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 30
-        versionCode 60
+        versionCode 68
-        versionName "3.3.0"
+        versionName "3.3.8"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -101,11 +101,11 @@ android {
                                     app_icon     : "@drawable/diver_logo_text",
                                     GAODEKEY     : "6791d69f6221a0841b521763af86eb01",
                                     JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
                                     JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
             ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
-            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
+            buildConfigField("String", "BASE_URL", "\"https://app.test.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "司机测试"
@@ -114,9 +114,9 @@ android {
             applicationId "com.arpa.hndahesudintocctmsdriver"
             manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机",
                                     app_icon     : "@drawable/diver_logo",
-                                    GAODEKEY     : "78019612271411eca3af34db91930620",
+                                    GAODEKEY     : "9480fd96746922630e9bf6c75a101059",
                                     JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
                                     JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
             ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")

app/src/main/AndroidManifest.xml

@@ -53,7 +53,7 @@
         android:name="com.arpa.hndahesudintocctmsdriver.App"
         android:allowBackup="true"
         android:excludeFromRecents="true"
-        android:icon="${app_icon}"
+        android:icon="@mipmap/diver_logo"
         android:label="@string/appName"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
@@ -93,6 +93,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"  />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
@@ -160,6 +161,7 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
@@ -169,6 +171,7 @@
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -274,7 +277,7 @@
         <!-- 极光-->
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="571d93ae5117da6dee848c92" /> <!-- </>值来自开发者平台取得的AppKey -->
+            android:value="fba6f55621c670d8c1fe9191" /> <!-- </>值来自开发者平台取得的AppKey -->
 
         <meta-data
             android:name="JPUSH_CHANNEL"

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,41 @@
+package com.arpa.hndahesudintocctmsdriver.bean;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName ToH5Bean
+ * @Author john
+ * @Date 2024/9/9 10:01
+ * @Description TODO
+ */
+public class ToH5Bean implements Serializable {
+
+    private int id;
+    private String carNumber;
+    private String carId;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getCarNumber() {
+        return carNumber;
+    }
+
+    public void setCarNumber(String carNumber) {
+        this.carNumber = carNumber;
+    }
+
+    public String getCarId() {
+        return carId;
+    }
+
+    public void setCarId(String carId) {
+        this.carId = carId;
+    }
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.arpa.hndahesudintocctmsdriver.event;
+
+/**
+ * @author hlh
+ * @version 1.0.0
+ * @date 2021/10/20 14:43
+ * @description:
+ */
+public class HomeWaybillEvent {
+
+
+
+    public HomeWaybillEvent() {
+
+    }
+}

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

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

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

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

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

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

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

@@ -72,6 +72,15 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getAgreeOrder(),MapUtil.mapJson(map)),getToken(con),con);
         RequestUtil.start(1, HuoYunDelActivity.END,re,con,hd);
     }
+
+    public void confirm(String cid,String contractUrl,int wid){
+        Map<String,Object> map=new HashMap<>();
+        map.put("carId",cid);
+        map.put("orderId",wid);
+        map.put("contractUrl",contractUrl);
+        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getAgreeOrder(),MapUtil.mapJson(map)),getToken(con),con);
+        RequestUtil.start(1, HuoYunDelActivity.END,re,con,hd);
+    }
     //获取执行中的运单
     public void startOrder(int id){
         Map<String,Object> map=new HashMap<>();

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

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

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

@@ -86,7 +86,7 @@ public class RequestConstant {
     //车辆详情
     private static final String GET_CAR_DEL = "/app/carDriver/getCarInfo";
     //删除车辆
-    private static final String DEL_CAR = "/app/carDriver/removeCar";
+    private static final String DEL_CAR = "/app/carDriver/unBindCar";
     //上传车辆照片
     private static final String SAVECARIMG = "/app/carDriver/saveCarImg";
     //上传头像保存
@@ -130,6 +130,9 @@ public class RequestConstant {
     private static final String DRIVER_AUTH_SAVECARREGISTERNO = "/app/carDriver/saveCarRegisterNo";
     //道路运输信息
     private static final String DRIVER_AUTH_SAVECARROADLICENSENO = "/app/carDriver/saveCarRoadLicenseNo";
+
+    //交强险
+    private static final String DRIVER_TRAFFIC_INSU = "/app/carDriver/saveCarInsurace";
     //党员认证
     private static final String PARTY_MEMBER = "/app/user/partyMember";
     //实名认证
@@ -159,11 +162,16 @@ public class RequestConstant {
 
     //车辆自动审核触发器
     private static final String CAR_AUDIT = "/app/carDriver/carAutomaticAudit";
+    private static final String APP_INFO = "/common/app/logininfor";
 
     public static String getCarAudit() {
         return BASE_URL + CAR_AUDIT;
     }
 
+    public static String postAppInfo() {
+        return BASE_URL + APP_INFO;
+    }
+
     public static String getCarColor() {
         return BASE_URL + CAR_COLOR;
     }
@@ -375,6 +383,10 @@ public class RequestConstant {
         return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO;
     }
 
+    public static String getTrafficInsurance() {
+        return BASE_URL + DRIVER_TRAFFIC_INSU;
+    }
+
     public static String getSaveDrawCar() {
         return BASE_URL + SAVE_DRAW_CAR;
     }

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

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

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

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

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

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

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

@@ -29,6 +29,7 @@ import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
+import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.PickerUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
@@ -37,6 +38,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.dahe.mylibrary.utils.ActivityUtils;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
@@ -157,15 +159,24 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         || CacheGroup.cacheList.get("saveVehicleLicense") != null || CacheGroup.cacheList.get("authUrl") != null
                         || CacheGroup.cacheList.get("saveDrawCar") != null) {
                     if (CacheGroup.cacheList.get("driverAuthIdCard") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthIdCard"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
                             finish();
 
                             //上传身份证信息后 跳转上传驾驶证信息页面
-                            Intent in = new Intent(con, CertificatesActivity.class);
+//                            Intent in = new Intent(con, CertificatesActivity.class);
-                            in.putExtra("index", 1);
+//                            in.putExtra("index", 1);
-                            startActivity(in);
+//                            startActivity(in);
+
+
+                            //上传身份证信息后 跳转上传银行卡信息页面
+                            Intent in333=new Intent(con, UpBankActivity.class);
+                            in333.putExtra("type",1);
+                            startActivity(in333);
 
                         } else {
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -174,6 +185,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("driverAuthLicense") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthLicense"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
@@ -206,6 +220,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("saveVehicleLicense") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         CarZhengBean czb = gson.fromJson(CacheGroup.cacheList.get("saveVehicleLicense"), CarZhengBean.class);
                         if (czb.getCode() == 200) {
                             String needUpQCPhoto = czb.getData().getNeedUpQCPhoto();//是否需要上传从业资格证
@@ -214,13 +231,19 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             Toast.makeText(con, "车辆行驶证保存成功", Toast.LENGTH_SHORT).show();
 
                             VehicleEvent ve = new VehicleEvent(String.valueOf(czb.getData().getCarId()));
-                            EventBus.getDefault().post(ve);
+                            EventBus.getDefault().postSticky(ve);
 
                             // TODO: 2023/8/23
                             if ("1".equals(isTrailer)) {//判断是否跳转挂车行驶证
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
+                                if (olb != null && olb.getData() != null && olb.getData().isCarExist()) {
+                                    CarDelBean carDelBean = new CarDelBean();
+                                    carDelBean.setRes(1);//保留字段 1：为绑定车辆，可以进行修改挂车信息
+                                    carDelBean.setData(gson.fromJson(gson.toJson(olb.getData().getExistCarInfo()), CarDelBean.DataDTO.class));
+                                    in.putExtra("cheData", gson.toJson(carDelBean));
+                                }
                                 startActivity(in);
                             } else if ("1".equals(needUpQCPhoto)) {//判断是否跳转从业资格证
                                 Intent in = new Intent(con, AuthQualificationActivity.class);
@@ -231,6 +254,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
+                                in.putExtra("carExist", true);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
                                 startActivity(in);
                             } else {
@@ -263,6 +287,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         CacheGroup.cacheList.remove("saveVehicleLicense");
                     }
                     if (CacheGroup.cacheList.get("saveDrawCar") != null) {
+                        if (customDialog != null) {
+                            customDialog.dismiss();
+                        }
                         Log.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
                         CarZhengBean bb = gson.fromJson(CacheGroup.cacheList.get("saveDrawCar"), CarZhengBean.class);
                         if (bb.getCode() == 200) {
@@ -283,6 +310,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//现判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
+                                in.putExtra("carExist", true);
                                 in.putExtra("carId", carId);
                                 startActivity(in);
                             } else {
@@ -336,8 +364,11 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
                 } else {
+                    //重复代码?
                     initView(null);
+                    if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) {
                         initData();
+                    }
                     pathOrcRes();
                 }
                 break;
@@ -415,6 +446,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
 //                there_div.setVisibility(View.VISIBLE);
                 if (c_str != null && !c_str.equals("")) {
                     cdb = gson.fromJson(c_str, CarDelBean.class);
+                    oCrcarId = cdb.getData().getTrailerResVo().getTrailerLicenseId() + "";
                     initView(null);
                     initData();
                 } else {
@@ -554,9 +586,14 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     case 0:
                         finish();
                         //上传身份证信息后 跳转上传驾驶证信息页面
-                        Intent in1 = new Intent(con, CertificatesActivity.class);
+//                        Intent in1 = new Intent(con, CertificatesActivity.class);
-                        in1.putExtra("index", 1);
+//                        in1.putExtra("index", 1);
-                        startActivity(in1);
+//                        startActivity(in1);
+
+                        //上传身份证信息后 跳转上传银行卡信息页面
+                        Intent in333=new Intent(con, UpBankActivity.class);
+                        in333.putExtra("type",1);
+                        startActivity(in333);
                         break;
                     case 1:
                         //传驾驶证信息页面 跳转实名认证
@@ -671,15 +708,17 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     value3.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getOwner(), "空数据"));
                     value4.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getVehicleNumber(), "空数据"));
                     value6.setText(StringUtil.isNull(cdb.getData().getCarEnergyTypValue(), "空数据"));
-                    submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     Glide.with(con).load(url1).into(img1);
                     Glide.with(con).load(url2).into(img2);
                     Glide.with(con).load(url3).into(img3);
+                    if (cdb.getRes() != 1) {
+                        submit.setBackgroundResource(R.drawable.bg_btn_grey);
                         u_img.setText("已上传");
                         u_img2.setText("已上传");
                         u_img3.setText("点击查看");
                         isAuth = true;
                     }
+                }
                 break;
             default:
                 break;
@@ -738,7 +777,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         value1.setText(ocb.getData().getName());
                         value2.setText(ocb.getData().getCardId());
                         value3.setText(ocb.getData().getAddress());
-                        Glide.with(con).load(url1).into(img1);
+//                        Glide.with(con).load(url1).into(img1);
+                        Glide.with(con).load(path).into(img1);
                         fontId = ocb.getData().getId();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
@@ -750,7 +790,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (ocbb.getCode() == 200) {
                         url2 = ocbb.getData().getUrl();
                         value4.setText(ocbb.getData().getEndTime());
-                        Glide.with(con).load(url2).into(img2);
+//                        Glide.with(con).load(url2).into(img2);
+                        Glide.with(con).load(path).into(img2);
                         startTime = ocbb.getData().getStartTime();
                         backId = ocbb.getData().getId();
 
@@ -774,7 +815,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         value2.setText(StringUtil.isNull(od.getStartTime(), "识别异常"));
                         value3.setText(StringUtil.isNull(od.getAllowType(), "识别异常"));
                         value4.setText(StringUtil.isNull(od.getEndTime(), "识别异常"));
-                        Glide.with(con).load(url1).into(img1);
+//                        Glide.with(con).load(url1).into(img1);
+                        Glide.with(con).load(path).into(img1);
                         fontId = od.getId();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
@@ -786,7 +828,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (odlb.getCode() == 200) {
                         url2 = odlb.getData().getUrl();
                         backId = odlb.getData().getId();
-                        Glide.with(con).load(url2).into(img2);
+//                        Glide.with(con).load(url2).into(img2);
+                        Glide.with(con).load(path).into(img2);
                         //自动调取提交功能，实现页面自动跳转
                         subimt();
                     } else {
@@ -802,13 +845,22 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
                     olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class);
                     if (olb.getCode() == 200) {
+                        if (olb.getData().isCarExist()) {
+                            value1.setEnabled(false);
+                            Glide.with(con).load(olb.getData().getExistCarInfo().getBackImage()).into(img2);
+                            url2 = olb.getData().getExistCarInfo().getBackImage();
+                            ToastUtils.showLongToast(con, "该车辆已存在,请仔细核对相关信息");
+                        } else {
+                            value1.setEnabled(true);
+                        }
                         url1 = olb.getData().getUrl();
                         value1.setText(olb.getData().getCarNumber());
                         value2.setText(olb.getData().getType());
                         value3.setText(olb.getData().getOwner());
                         value4.setText(olb.getData().getVehicleNumber());
                         fontId = olb.getData().getId();
-                        Glide.with(con).load(url1).into(img1);
+//                        Glide.with(con).load(url1).into(img1);
+                        Glide.with(con).load(path).into(img1);
                         oCrcarId = olb.getData().getCarId() + "";
                         Log.e("-cardId-", oCrcarId);
                     } else {
@@ -821,8 +873,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (oblb.getCode() == 200) {
                         url2 = oblb.getData().getUrl();
                         backId = oblb.getData().getId();
-                        Glide.with(con).load(url2).into(img2);
+//                        Glide.with(con).load(url2).into(img2);
-                        //自动调取提交功能，实现页面自动跳转
+                        Glide.with(con).load(path).into(img2);
+                        //自动调取提交功能，实现页面自动跳转实现页面自动跳转
                         subimt();
                     } else {
                         Toast.makeText(con, oblb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -834,7 +887,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (ub.getCode() == 200) {
                         url3 = ub.getData().getUrl();
                         fid = ub.getData().getId();
-                        Glide.with(con).load(url3).into(img3);
+//                        Glide.with(con).load(url3).into(img3);
+                        Glide.with(con).load(path).into(img3);
                     } else {
                         Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -878,7 +932,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
 
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
@@ -894,7 +948,16 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
+//                   if (cdb != null && cdb.getData().getTrailerResVo() &&cdb.getRes() == 1)
+                    boolean isExist = false;
+                    if (olb != null) {//主页识别成功后获取
+                        isExist = olb.getData().isCarExist();
+                    } else {
+                        if (cdb != null && cdb.getData().getTrailerResVo() != null && cdb.getRes() == 1) {//上个页面带来数据
+                            isExist = true;
+                        }
+                    }
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, isExist);
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
                 }
@@ -917,6 +980,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         switch (index) {
             case 0:
                 if (ocb != null && ocbb != null) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     IDInputBean ib = new IDInputBean();
                     ib.setIdcarName(str1);
                     ib.setIdcard(str2);
@@ -939,6 +1004,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 //olb
                 //{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
                 if (odl != null && odlb != null) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     Log.e("ocr", new Gson().toJson(odl));
                     LicenseInputBean iib = new LicenseInputBean();
                     iib.setArchivesName(str1);
@@ -955,20 +1022,25 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 2:
-                if (olb != null && oblb != null) {
+                if ((olb != null && !olb.getData().isCarExist() && oblb != null) || (olb != null && olb.getData().isCarExist())) {
 //                    if (curColor == null || curEnergy == null) {
 //                        Toast.makeText(con, "请完善内容", Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     HashMap<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-                    map.put("licenseId", oblb.getData().getLicenseId());
+                    map.put("licenseId", olb.getData().isCarExist() ? olb.getData().getExistCarInfo().getLicenseId() : oblb.getData().getLicenseId());
                     map.put("carNumber", str1);
                     map.put("type", str2);
                     map.put("owner", str3);
                     map.put("vehicleNumber", str4);
+//                    if (olb.getData().isCarExist()) {
+//                        map.put("carId", olb.getData().getCarId());
+//                    }
 //                    map.put("carPlateColor", curColor.getValue());
 //                    map.put("carEnergyTyp", curEnergy.getValue());
                     new AuthRequest().saveVehicleLicense(con, hd, MapUtil.mapJson(map));
@@ -977,22 +1049,27 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 3:
-                if (olb != null && oblb != null) {
+                if (olb != null || (cdb != null && cdb.getRes() == 1)) {
 //                    if (curEnergy==null){
 //                        Toast.makeText(con,"请完善内容",Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
                     Map<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-                    map.put("licenseId", oblb.getData().getLicenseId());
+//                    map.put("licenseId", oblb.getData().getLicenseId());
                     map.put("carId", carId);
                     map.put("carNumberDraw", str1);
                     map.put("type", str2);
                     map.put("owner", str3);
 //                    map.put("carEnergyTyp", curEnergy.getValue());
                     map.put("vehicleNumber", str4);
+                    if (cdb != null && cdb.getRes() == 1 && cdb.getData() != null && cdb.getData().getTrailerResVo() != null) {
+                        map.put("oldTrailerNumber", cdb.getData().getTrailerResVo().getCarNumber());
+                    }
                     new AuthRequest().saveDrawCar(con, hd, MapUtil.mapJson(map));
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();

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

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

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

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

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

@@ -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;
@@ -35,18 +36,26 @@ import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.Marker;
 import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.MyLocationStyle;
+import com.arpa.hndahesudintocctmsdriver.bean.BankCardListBean;
 import com.arpa.hndahesudintocctmsdriver.bean.DriverExpireBean;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.JTT;
 import com.arpa.hndahesudintocctmsdriver.constant.JTTConstant;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
+import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
+import com.arpa.hndahesudintocctmsdriver.request.WalletRequest;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.news.NewActivity;
+import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.TimeUtil;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.gyf.cactus.Cactus;
 import com.hjq.xtoast.XToast;
@@ -116,7 +125,11 @@ public class HomeFragment extends BaseFragment {
     private HuoYuanListBean hb;
     private Gson gson = new Gson();
     private CardView btn_news, btn_loadin, btn_update;
-    private LinearLayout order_all;
+    private LinearLayout order_all, llCurWay;
+
+    private TextView tvWaybill, tvGo, tvZX;
+
+    private ImageView ivType;
     private HuoYuanListBean uab;
     private List<Marker> list = new ArrayList<>();
     private HuoYuanListDealBean hdb;
@@ -138,6 +151,23 @@ public class HomeFragment extends BaseFragment {
                     refreshLayout.finishRefresh(500);
                     keys = false;
                 }
+
+                //银行卡信息接收
+                if (CacheGroup.cacheList.get(dataName2) != null) {
+                    BankCardListBean bcb = new Gson().fromJson(CacheGroup.cacheList.get(dataName2), BankCardListBean.class);
+                    if (bcb.getCode() == 200) {
+                        if (bcb.getData() == null || bcb.getData().getRecords() == null || bcb.getData().getRecords().size() < 1) {
+                            new MessageUtils().showSimCenPop(con, "缺少银行卡可能会导致运费无法结算，是否去添加！", "取消", "确认", () -> {
+                                Intent in333 = new Intent(con, UpBankActivity.class);
+                                startActivity(in333);
+                            });
+                        }
+                    } else {
+                        Toast.makeText(con, bcb.getMsg(), Toast.LENGTH_SHORT).show();
+                    }
+                    CacheGroup.cacheList.remove(dataName2);
+                }
+
                 if (CacheGroup.cacheList.get("userdata") != null) {
                     ub = gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
                     if (ub.getCode() == 200) {
@@ -164,8 +194,12 @@ public class HomeFragment extends BaseFragment {
                         SPUtil.insSP(con, JTTConstant.JTT_DATA_NAME, JTTConstant.JTT_DATA_ORDER_KEY, gson.toJson(sob));
                         initStart();
                         StartOrderParts.setStartOrder(con, sob);
-                        if (sob.getData() != null) {
+                        if (sob.getData() != null && !sob.getData().getWaybillStatus().equals("已取消")) {
+                            dealCurWay(sob.getData());
                             ur.getJtts(sob.getData().getShippingNoteNumber());
+                        } else {
+                            SPUtils.remove(con,"curWaybillId");
+                            llCurWay.setVisibility(View.GONE);
                         }
                     } else {
                         Toast.makeText(con, sob.getMsg(), Toast.LENGTH_SHORT).show();
@@ -240,7 +274,9 @@ public class HomeFragment extends BaseFragment {
                                 in.putExtra("url", deb.getData().getIdCardUpdateUrl());
                             }
                         }
-                        if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(deb.getData().getIdCardUpdateUrl())) {
+                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl()) ||
+                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl()) ||
+                                !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) {
                             new XToast<>(act)
                                     .setContentView(R.layout.view_bc)
                                     // 设置成可拖拽的
@@ -317,8 +353,8 @@ public class HomeFragment extends BaseFragment {
         EventBus.getDefault().register(this);
         hyr = new HuoYuanRequset(con, hd);
         ur = new UserRequset(con, hd);
-        initRefreshLoad();
         initView(null);
+        initRefreshLoad();
         btn_news.setOnClickListener(v -> {
 
         });
@@ -424,6 +460,13 @@ public class HomeFragment extends BaseFragment {
         order_box = v.findViewById(R.id.order_box);
         auth_box = v.findViewById(R.id.auth_box);
         order_all = v.findViewById(R.id.order_all);
+
+        llCurWay = v.findViewById(R.id.llCurWay);
+        tvWaybill = v.findViewById(R.id.tvWaybill);
+        tvGo = v.findViewById(R.id.tvGo);
+        tvZX = v.findViewById(R.id.loadingAddress);
+        ivType = v.findViewById(R.id.ivType);
+
         ImageView fun_left = v.findViewById(R.id.fun_left);
         ImageView fun_right = v.findViewById(R.id.fun_right);
         fun_left.setOnClickListener(v16 -> startActivity(new Intent(con, OrderListActivity.class)));
@@ -523,6 +566,100 @@ public class HomeFragment extends BaseFragment {
         initMap();
     }
 
+
+    StartOrderBean.DataDTO.WayChildrenDTO zData = new StartOrderBean.DataDTO.WayChildrenDTO();
+    StartOrderBean.DataDTO.WayChildrenDTO xData = new StartOrderBean.DataDTO.WayChildrenDTO();
+
+    /**
+     * 一装一卸逻辑
+     *
+     * @param data
+     */
+    private void dealCurWay(StartOrderBean.DataDTO data) {
+        SPUtils.put(con, "curWaybillId", data.getWaybillId());
+
+        for (int i = 0; i < data.getWayChildren().size(); i++) {
+            if (1 == data.getWayChildren().get(i).getType()) {
+                zData = data.getWayChildren().get(i);
+                break;
+            }
+        }
+
+        for (int i = 0; i < data.getWayChildren().size(); i++) {
+            if (2 == data.getWayChildren().get(i).getType()) {
+                xData = data.getWayChildren().get(i);
+                break;
+            }
+        }
+
+        llCurWay.setVisibility(View.VISIBLE);
+        tvWaybill.setText(data.getShippingNoteNumber());
+        tvGo.setText(getGoText(zData.getStatus(),xData.getStatus()));
+        if (data.getWaybillStatus().equals("待装货")) {
+            tvZX.setText(zData.getAddress());
+            ivType.setBackgroundResource(R.mipmap.zhuang);
+        } else {
+            tvZX.setText(xData.getAddress());
+            ivType.setBackgroundResource(R.mipmap.xie);
+        }
+
+        tvGo.setOnClickListener(v -> {
+            int zStatus = zData.getStatus();
+            int xStatus = xData.getStatus();
+            if (zStatus == 0) {//未装货
+                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                in.putExtra("type", 0);
+                in.putExtra("wid", zData.getId() + "");
+                in.putExtra("sob", gson.toJson(sob));
+                in.putExtra("keys", true);
+                startActivity(in);
+            } else if (zStatus == 1 && xStatus == 4) {//已装货未上传回单
+                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                in.putExtra("type", 2);
+                in.putExtra("wid", zData.getId() + "");
+                in.putExtra("h_type", 0);
+                in.putExtra("sob", gson.toJson(sob));
+                startActivity(in);
+            } else if (zStatus == 3 && xStatus == 4) {//已上传装货回单，未卸货
+                int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zData.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
+                if (dis > 5) {//大于五分钟可以接单
+                    Intent in = new Intent(con, ShangChuangImgActivity.class);
+                    in.putExtra("type", 1);
+                    in.putExtra("wid", xData.getId() + "");
+                    in.putExtra("sob", gson.toJson(sob));
+                    in.putExtra("keys", true);
+                    startActivity(in);
+                } else {
+                    ToastUtils.showToast(con, "请到卸货地再进行卸货操作!");
+                }
+
+            } else if (zStatus == 3 && xStatus == 2) {//已卸货，未上传卸货回单
+                Intent in = new Intent(con, ShangChuangImgActivity.class);
+                in.putExtra("type", 2);
+                in.putExtra("wid", xData.getId() + "");
+                in.putExtra("h_type", 1);
+                in.putExtra("sob", gson.toJson(sob));
+                in.putExtra("keys", true);
+                startActivity(in);
+            }else{
+                ToastUtils.showToast(con,"已完成该运单");
+            }
+        });
+    }
+
+    private String getGoText(int zStatus, int xStatus) {
+        if (zStatus == 0) {//未装货
+            return "去装货";
+        } else if (zStatus == 1 && xStatus == 4) {//已装货未上传回单
+            return "装货回单";
+        } else if (zStatus == 3 && xStatus == 4) {//已上传装货回单，未卸货
+            return "去卸货";
+        } else if (zStatus == 3 && xStatus == 2) {//已卸货，未上传卸货回单
+            return "卸货回单";
+        }
+        return "已完成";
+    }
+
     /**
      *
      */
@@ -542,12 +679,14 @@ public class HomeFragment extends BaseFragment {
         ur.upApp();
         hyr.getHuoYuan(1, 100);
         ur.getImage(1);
-
+        WalletRequest qr = new WalletRequest(con, hd);
 
         if (UiAuxiliary.isLogin(con)) {
+            int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1);
             ur.User();
+            qr.getBankCardList();
             ur.getDriverExpire();
-            hyr.startOrder(0);
+            hyr.startOrder(curWaybillId==-1 ? 0 : curWaybillId);
             ur.driverAuthData();
         }
 //            oldTime= Calendar.getInstance().getTimeInMillis();
@@ -995,6 +1134,12 @@ public class HomeFragment extends BaseFragment {
         initView(null);
     }
 
+    @Subscribe
+    public void processResult(HomeWaybillEvent home) {
+        int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1);
+        hyr.startOrder(curWaybillId==-1 ? 0 : curWaybillId);
+    }
+
     class Model {
 
         private int imageId;

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

@@ -4,12 +4,20 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
+import android.text.Layout;
+import android.text.TextUtils;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -21,8 +29,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.H5Activity;
 import com.arpa.hndahesudintocctmsdriver.bean.JTT;
+import com.arpa.hndahesudintocctmsdriver.bean.ToH5Bean;
 import com.arpa.hndahesudintocctmsdriver.event.FaceEvent;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
+import com.arpa.hndahesudintocctmsdriver.event.PdfResEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
@@ -102,14 +112,18 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
 //                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
-
+                        if (null==bb.getData()){
-
+                            UiAuxiliary.homeRequest("接单");
+                            Intent in = new Intent(con, StartYunDanActivity.class);
+                            in.putExtra("id", "0");
+                            startActivity(in);
+                            finish();
+                        }else{
                             Intent intent = new Intent(this, H5Activity.class);
                             intent.putExtra("url", (String) bb.getData());
                             intent.putExtra("view_file", false);
                             startActivity(intent);
-
+                        }
-
                         //finish();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -142,8 +156,20 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         .asConfirm("请确认接单", "是否确定承运此运单？",
                                 "取消", "确认",
                                 () -> {
+                                    ToH5Bean toH5Bean = new ToH5Bean();
+                                    toH5Bean.setId(id);
+                                    toH5Bean.setCarNumber(car.getText().toString().substring("选择车辆:".length()));
+                                    toH5Bean.setCarId(cid);
                                     Log.e("--id--", "cid:" + cid + "---wid:" + id);
-                                    hyr.confirm(cid, id);
+                                    Intent in = new Intent(con, WebActivity.class);
+                                    in.putExtra("url", "https://platform.test.dahehuoyun.com/contract/dist/#/contracttemplate");
+                                    in.putExtra("id", id);
+                                    in.putExtra("ToH5Bean",toH5Bean);
+                                    in.putExtra("title", "合同签署");
+//                                    startActivity(in);
+
+                                    startActivityForResult(in,1);
+
                                 }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
                         .show();
                 break;
@@ -195,6 +221,8 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     //2021/02/27记，类型声明错误
                     ImageButton return_btn = v.findViewById(R.id.return_btn);
                     ImageButton xuan = v.findViewById(R.id.xuan);
+                    CheckBox checkBox = v.findViewById(R.id.cb);
+                    TextView totalFreight = v.findViewById(R.id.totalFreight);
                     ImageButton btnFp = v.findViewById(R.id.btnFp);
                     TextView effectiveTime = v.findViewById(R.id.effectiveTime);
                     TextView check_contract = v.findViewById(R.id.check_contract);
@@ -205,6 +233,15 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     return_btn.setOnClickListener(v16 -> {
                         finish();
                     });
+                    totalFreight.setText("****");
+                    checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                        if (isChecked){
+                            totalFreight.setText(hyd.getData().getTotalFreight());
+                        }else{
+                            totalFreight.setText("****");
+                        }
+//                        totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
+                    });
 //                    String textSource = "同意在符合相关税务机关要求的情况下代开<font color='#ff0000'>增值税发票</font>";
                     String textSource = "公司已对运输合同条款充分解释说明，本人已充分理解、认可并签署；同意符合税务机关要求下<font color='#ff0000'>代开增值税发票</font>，产生的增值税及附加税本人承担。";
                     tvZzs.setText(Html.fromHtml(textSource));
@@ -413,6 +450,22 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK&&requestCode==1){
+            //签合同后接单
+//            String pdfUrl = data.getStringExtra("pdfUrl");
+//            hyr.confirm(cid,pdfUrl, id);
+
+            UiAuxiliary.homeRequest("接单");
+            Intent in = new Intent(con, StartYunDanActivity.class);
+            in.putExtra("id", "0");
+            startActivity(in);
+            finish();
+        }
+    }
+
     /**
      * 接单
      * 先判断安联用户信息验证，随后接单

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

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

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

@@ -19,13 +19,16 @@ import com.alct.mdp.callback.OnResultListener;
 import com.alct.mdp.model.Goods;
 import com.alct.mdp.model.Image;
 import com.alct.mdp.model.Location;
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
+import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
+import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
@@ -55,6 +58,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -93,11 +98,15 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("upload") != null) {
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     Log.e("upload", CacheGroup.cacheList.get("upload"));
                     ub = gson.fromJson(CacheGroup.cacheList.remove("upload"), UploadBean.class);
                     if (ub.getCode() == 200) {
                         imgIds.add(ub.getData().getId());
-                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
+//                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
+                        Glide.with(con).load(path).into(res_img);
                         res_img.setVisibility(View.VISIBLE);
                         img_delete.setVisibility(View.VISIBLE);
                         img_icon.setVisibility(View.GONE);
@@ -113,6 +122,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                         if (bb.getCode() == 200) {
                             if (index == 2) {
                                 if (!keys) {//装货回单
+                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                                        customDialog.dismiss();
+                                    }
+                                    EventBus.getDefault().post(new HomeWaybillEvent());
                                     Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
@@ -148,6 +161,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                             hyr.uploadFile(new File(path));
                         }
                     } else {//识别失败后返回code500
+                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                            customDialog.dismiss();
+                        }
                         if (index == 0) {//装卸货车辆需要识别车牌号){
                             Toast.makeText(con, "装货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
                         } else if (index == 1) {
@@ -190,7 +206,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //                if(index==1 || index==2){
 //                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
 //                }
-                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
+                if ((index == 0 || index == 1) && !BuildConfig.isTest) {//装卸货车辆需要识别车牌号,测试环境不校验车牌号
                     new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
                 } else {
                     hyr.uploadFile(new File(path));
@@ -200,6 +216,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
         }
     }
+
     private LatLng latLng;
 
     public LatLng convertGPSToBaidu(LatLng srLatLng) {
@@ -327,6 +344,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             path = gia.getFile().getPath();
             Log.e("图片地址:", path);
             gia.dis();
+
+            if (customDialog != null && !customDialog.isShowing()) {
+                customDialog = new CustomDialog(con, "网络请求中...");
+                customDialog.show();
+            }
+
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
@@ -340,6 +363,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 path = paths;
                 Log.e("图片地址:", path);
                 gia.dis();
+
+                if (customDialog != null && !customDialog.isShowing()) {
+                    customDialog = new CustomDialog(con, "网络请求中...");
+                    customDialog.show();
+                }
+
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
         }
@@ -353,6 +382,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //        for(int i=0;i<imgIds.size();i++){
 //            Log.e("--imgIds--",imgIds.get(i)+"");
 //        }
+        if (customDialog != null && !customDialog.isShowing()) {
+            customDialog = new CustomDialog(con, "网络请求中...");
+            customDialog.show();
+        }
         switch (index) {
             case 0:
                 //装货
@@ -536,6 +569,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "装货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -568,6 +605,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "卸货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -576,6 +617,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             @Override
             public void onFailure(String s, String s1) {
                 Log.e("上报安联失败(卸货照片):", s + s1);
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
 //                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
 //                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -601,6 +645,11 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
+                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    customDialog.dismiss();
+                }
+                SPUtils.remove(con,"curWaybillId");
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "回单照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -648,8 +697,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     }
 
 
-
-
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -678,6 +725,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(装货):", s + s1);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });
@@ -715,6 +765,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });

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

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

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

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

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

@@ -18,6 +18,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
+import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
@@ -170,12 +171,14 @@ public class MyFragment extends BaseFragment {
                         startActivity(in);
                     });
                     break;
-                default:break;
+                default:
+                    break;
             }
         });
     }
 
-    class Model{ }
+    class Model {
+    }
 
     public void getRequest() {
         sob = StartOrderParts.getStartOrder(con);
@@ -296,6 +299,13 @@ public class MyFragment extends BaseFragment {
             ur.vehicleList("1");
         }
     }
+
+    @Subscribe
+    public void refreshCarListEvent(RefreshCarListEvent event) {
+        Log.e("-msg-", event.getMessage());
+        ur.vehicleList("1");
+    }
+
     @Subscribe
     public void personResult(PersonEvent home) {
         Log.e("-res-", home.getMessage());

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

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

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -12,6 +13,10 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
+import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
+import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickListener;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -40,11 +45,11 @@ import java.util.List;
  * @date 2021/8/26 19:06
  * @description:
  */
-public class UpBankActivity extends BaseAppCompatActivity {
+public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClickListener {
 
     private ImageView up_bank_img;
     private EditText bank_name, bank_number;
-    private TextView submit;
+    private TextView submit, skip;
     private ImageView return_btn;
     public GetImageAlert gia = new GetImageAlert();
     String path;
@@ -59,9 +64,9 @@ public class UpBankActivity extends BaseAppCompatActivity {
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("OCR_BANK") != null) {
                     ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class);
+                    customDialog.dismiss();
                     if (ib.getCode() == 200) {
                         initView(null);
-                        customDialog.dismiss();
                         WalletFragment.isInsBank = true;
                     } else {
                         Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show();
@@ -71,6 +76,12 @@ public class UpBankActivity extends BaseAppCompatActivity {
                 if (CacheGroup.cacheList.get("insBank") != null) {
                     BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class);
                     if (bb.getCode() == 200) {
+                        if (type == 1) {
+                            Intent in = new Intent(con, CertificatesActivity.class);
+                            in.putExtra("index", 1);
+                            startActivity(in);
+                        }
+                        customDialog.dismiss();
                         Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
                         finish();
                     } else {
@@ -90,6 +101,13 @@ public class UpBankActivity extends BaseAppCompatActivity {
 
     private CustomDialog customDialog;
 
+
+    /**
+     * 1：司机注册自动跳转
+     * 0：钱包添加银行卡
+     */
+    private int type = 0;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -97,25 +115,31 @@ public class UpBankActivity extends BaseAppCompatActivity {
         setContentView(R.layout.activity_bank_auth);
         act = this;
         con = this;
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            type = getIntent().getExtras().getInt("type");
+        }
         up_bank_img = findViewById(R.id.up_bank_img);
         bank_name = findViewById(R.id.bank_name);
         bank_number = findViewById(R.id.bank_number);
         submit = findViewById(R.id.submit);
+        skip = findViewById(R.id.skip);
         return_btn = findViewById(R.id.return_btn);
         qr = new WalletRequest(con, hd);
         up_bank_img.setOnClickListener(v -> {
             gia.showPopueWindow(this);
         });
-        submit.setOnClickListener(v -> {
+        submit.setOnClickListener(new OnLimitClickHelper(this));
-            if(ib!=null){
+        skip.setOnClickListener(new OnLimitClickHelper(this));
-                submit();
-            }else{
-                Toast.makeText(con,"请先上传图片",Toast.LENGTH_SHORT).show();
-            }
-        });
         return_btn.setOnClickListener(v -> {
             finish();
         });
+
+        if (type == 1) {
+            skip.setVisibility(View.VISIBLE);
+        } else {
+            skip.setVisibility(View.GONE);
+        }
     }
 
     @Override
@@ -152,6 +176,8 @@ public class UpBankActivity extends BaseAppCompatActivity {
     }
 
     public void submit() {
+        customDialog = new CustomDialog(con, "上传中,请稍后...");
+        customDialog.show();
         String bankName = bank_name.getText().toString().trim();
         String bankNumber = bank_number.getText().toString().trim();
         if ("".equals(bankName) || "".equals(bankNumber)) {
@@ -168,4 +194,23 @@ public class UpBankActivity extends BaseAppCompatActivity {
         qr.insBankCard(ibib);
     }
 
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.submit:
+                if (ib != null) {
+                    submit();
+                } else {
+                    Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show();
+                }
+                break;
+            case R.id.skip:
+                new MessageUtils().showSimCenPop(con, "确定跳过银行卡?，可能会导致运费无法结算！","取消","确认", () -> {
+                    Intent in = new Intent(con, CertificatesActivity.class);
+                    in.putExtra("index", 1);
+                    startActivity(in);
+                });
+                break;
+        }
+    }
 }

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

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

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

@@ -5,25 +5,36 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.net.http.SslError;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.webkit.JavascriptInterface;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.R;
+import com.arpa.hndahesudintocctmsdriver.bean.ToH5Bean;
 import com.arpa.hndahesudintocctmsdriver.bean.UserBean;
+import com.arpa.hndahesudintocctmsdriver.event.PdfResEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.util.PaxWebChromeClient;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
+import com.google.gson.Gson;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.io.Serializable;
 
 /**
  * @author hlh
@@ -35,9 +46,12 @@ public class WebActivity extends BaseActivity {
 
     private String url = "";
     private String title = "";
+    private int id = -1;
     private WebView wv;
     private TextView title_tv;
+    private ProgressBar progressBar;
     private  PaxWebChromeClient chromeClient;
+    private ToH5Bean toH5Bean;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -47,11 +61,15 @@ public class WebActivity extends BaseActivity {
         con=this;
         initHardwareAccelerate();
         wv = findViewById(R.id.wv);
+        progressBar = findViewById(R.id.progressBar);
         title_tv = findViewById(R.id.title);
         Intent in = getIntent();
         url = in.getExtras().getString("url");
         title = in.getExtras().getString("title");
-        chromeClient = new PaxWebChromeClient(this,null,null);
+        toH5Bean = (ToH5Bean)in.getSerializableExtra("ToH5Bean");
+        String carNumber = toH5Bean.getCarNumber();
+        id = in.getExtras().getInt("id");
+        chromeClient = new PaxWebChromeClient(this,progressBar,null);
         if ("咨询建议".equals(title)) {
             initOpinion();
         } else {
@@ -81,6 +99,11 @@ public class WebActivity extends BaseActivity {
         webSettings.setJavaScriptEnabled(true);
         webSettings.setDomStorageEnabled(true);
         webSettings.setDefaultTextEncodingName("utf-8");
+        // 特别注意：5.1以上默认禁止了https和http混用，以下方式是开启
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+
         wv.addJavascriptInterface(new JavaScriptObject(con), "webObj");
         //PaxWebChromeClient chromeClient=new PaxWebChromeClient();
         //WebView加载web资源
@@ -111,6 +134,12 @@ public class WebActivity extends BaseActivity {
                 wv.loadUrl(url);
                 return  true;
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                super.onReceivedSslError(view, handler, error);
+                handler.proceed();
+            }
         });
         wv.setWebChromeClient(chromeClient);
         wv.loadUrl(url);
@@ -149,6 +178,12 @@ public class WebActivity extends BaseActivity {
                 view.loadUrl(url);
                 return true;
             }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                super.onReceivedSslError(view, handler, error);
+                handler.proceed();
+            }
         });
     }
 
@@ -183,15 +218,39 @@ public class WebActivity extends BaseActivity {
 
         @JavascriptInterface
         public String getUserToken(){
-            Log.e("-token-",UserParts.getUser(con).getData().getToken());
+//            Log.e("-token-",UserParts.getUser(con).getData().getToken());
+//            return "woshitoken-androidfasdf";
             return UserParts.getUser(con).getData().getToken();
         }
 
+        @JavascriptInterface
+        public int getOrderId(){
+            return id;
+        }
+
+        @JavascriptInterface
+        public String getOrderinfo(){
+            return new Gson().toJson(toH5Bean);
+        }
+
         @JavascriptInterface
         public void isSuccess(){
             finish();
         }
+        @JavascriptInterface
+        public void isPdfSuccess(String pdfUrl){
+//            Toast.makeText(con, "签署成功", Toast.LENGTH_SHORT).show();
+//            EventBus.getDefault().post(new PdfResEvent(pdfUrl));
+            Intent intent = new Intent();
+            intent.putExtra("pdfUrl",pdfUrl);
+            setResult(RESULT_OK,intent);
+            finish();
+        }
 
+        @JavascriptInterface
+        public void isFail(){
+            finish();
+        }
     }
 
 

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

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

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

@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
+import android.view.View;
 import android.webkit.PermissionRequest;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
@@ -38,12 +39,12 @@ public class PaxWebChromeClient extends WebChromeClient {
     @Override
     public void onProgressChanged(WebView view, int newProgress) {
         if (newProgress == 100) {
-            //bar.setVisibility(View.INVISIBLE);
+            bar.setVisibility(View.INVISIBLE);
         } else {
-//            if (View.INVISIBLE == bar.getVisibility()) {
+            if (View.INVISIBLE == bar.getVisibility()) {
-//                bar.setVisibility(View.VISIBLE);
+                bar.setVisibility(View.VISIBLE);
-//            }
+            }
-//            bar.setProgress(newProgress);
+            bar.setProgress(newProgress);
         }
         super.onProgressChanged(view, newProgress);
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,11 +3,24 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <WebView
+
+    <RelativeLayout
         android:layout_marginTop="@dimen/dp_88"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <WebView
             android:id="@+id/wv"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:visibility="invisible"
+            android:layout_alignParentTop="true" />
+    </RelativeLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

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

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

@@ -168,6 +168,114 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dp_12" />
     </LinearLayout>
+
+
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/llCurWay"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_140"
+        android:layout_marginLeft="@dimen/dp_5"
+        android:layout_marginRight="@dimen/dp_5"
+        android:background="@drawable/bg_huoyuan">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_25"
+            android:layout_marginRight="@dimen/dp_25"
+            android:layout_marginBottom="@dimen/dp_22">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="运输中订单:"
+                        android:textColor="#ff333333"
+                        android:textSize="@dimen/sp_16" />
+
+                    <TextView
+                        android:id="@+id/tvWaybill"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:text="1321561432123156"
+                        android:textColor="#ff333333"
+                        android:textSize="@dimen/sp_16" />
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_6">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:id="@+id/ivType"
+                                android:layout_width="@dimen/dp_20"
+                                android:layout_height="@dimen/dp_20"
+                                android:layout_gravity="center"
+                                android:scaleType="fitXY"
+                                android:background="@mipmap/zhuang" />
+
+                            <TextView
+                                android:id="@+id/loadingAddress"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_marginLeft="@dimen/dp_5"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:text="郑州市市委党校郑州市市委党校郑州市市委党校郑州市市委党校"
+                                android:textColor="#ff333333"
+                                android:textSize="@dimen/sp_15" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+
+                    <TextView
+                        android:id="@+id/tvGo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_28"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentBottom="true"
+                        android:background="@drawable/shape_red_bg14"
+                        android:paddingLeft="@dimen/dp_14"
+                        android:paddingRight="@dimen/dp_14"
+                        android:text="去装货"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/sp_13" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+
     <!-- <LinearLayout
          android:layout_marginTop="@dimen/dp_4"
          android:layout_width="match_parent"

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

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

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

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

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

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

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

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

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

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

gradle/wrapper/gradle-wrapper.properties

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

mylibrary/build.gradle

@@ -79,6 +79,8 @@ dependencies {
     api rootProject.ext.dependencies["Search"]
     api 'com.gyf.cactus:cactus:1.1.3-beta13'
 
+    api 'com.github.gcacace:signature-pad:1.3.1'
+
     //友盟基础库（必须）
 //    api 'com.umeng.umsdk:common:9.4.4'
 //    api 'com.umeng.umsdk:asms:1.4.1'

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

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