定位数据本地化保存

app/build.gradle

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

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <!-- 录音 -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <!--播音-->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -268,7 +269,8 @@
             android:value="${GAODEKEY}" />
 <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
-        <service android:name="com.amap.api.location.APSService"></service>
+        <service android:name="com.amap.api.location.APSService"
+            android:foregroundServiceType="location"></service>
 
         <!--百度地图-->
         <meta-data

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

@@ -78,29 +78,30 @@ public class App extends Application {
             }
         }
 
-//        PendingIntent pendingIntent =
+        PendingIntent pendingIntent =
-//                PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
-//        Cactus.getInstance()
+        Cactus.getInstance()
-//                .isDebug(true)
+                .isDebug(true)
-//                //可选，设置通知栏点击事件
+                //可选，设置通知栏点击事件
-//                .setPendingIntent(pendingIntent)
+                .setPendingIntent(pendingIntent)
-////                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
+                .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
-////                .setMusicId(R.raw.main) //可选，设置音乐
+                .setMusicId(R.raw.main) //可选，设置音乐
-////                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
+//                .setPendingIntent(pendingIntent)//可选，设置通知栏点击事件
-////                .addCallback(new CactusCallback())//可选，运行时回调
+//                .addCallback(new CactusCallback())//可选，运行时回调
-//                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+                .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
+                .setCrashRestartUIEnabled(true)//可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
-//                .setTitle("大河好运")
+                .setTitle("大河好运")
-//                .setSmallIcon(R.drawable.diver_logo)
+                .setContent("大河好运司机端为您提供服务")
-//                .addBackgroundCallback(new CactusBackgroundCallback() {
+                .setSmallIcon(R.drawable.diver_logo)
-//                    @Override
+                .addBackgroundCallback(new CactusBackgroundCallback() {
-//                    public void onBackground(boolean b) {
+                    @Override
-//                        if (b){
+                    public void onBackground(boolean b) {
-//                            getBillLocation();
+                        if (b){
-//                        }
+                            getBillLocation();
-//                    }
+                        }
-//                })
+                    }
-//                .register(this);
+                })
+                .register(this);
     }
 
     public static App getApp() {

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

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

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

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

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

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

@@ -1,22 +0,0 @@
-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/request/HuoYuanRequset.java

@@ -72,15 +72,6 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getAgreeOrder(),MapUtil.mapJson(map)),getToken(con),con);
         RequestUtil.start(1, HuoYunDelActivity.END,re,con,hd);
     }
-
-    public void 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/RequestConstant.java

@@ -162,16 +162,11 @@ 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;
     }

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

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

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

@@ -3,12 +3,15 @@ package com.arpa.hndahesudintocctmsdriver.service;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.IBinder;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.amap.api.location.AMapLocation;
+import com.arpa.hndahesudintocctmsdriver.util.FileIOUtils;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
@@ -18,8 +21,13 @@ import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Filter;
 
 /**
  * @author hlh
@@ -32,7 +40,7 @@ public class TrackService extends Service {
     private Context con;
     private TrackInputBean tib=new TrackInputBean();
     private LocationGDUtil l;
-    private int timeSum=1000*60*3;
+    private int timeSum=1000*60;
     private String snn="";
     private Gson gson=new Gson();
     private HuoYuanRequset hyr;
@@ -51,7 +59,30 @@ public class TrackService extends Service {
                 }
                 break;
             case LocationGDUtil.RES:
-                genzong();
+                if(CacheGroup.cacheList.get("getLocation")!=null){
+                    AMapLocation location = gson.fromJson(CacheGroup.cacheList.get("getLocation"), AMapLocation.class);
+                    String time2  = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+                    String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+                    //                    当前时间:${time2},经纬度:${it.latitude}:${it.longitude}
+                    FileIOUtils.writeFileFromString(
+                            Environment.getExternalStorageDirectory()
+                                    .toString() + "/crashinfo/" + "crash-"+time+".txt",
+                            "当前时间:"+time2+",经纬度:"+location.getLatitude()+":"+location.getLongitude(),
+                            true
+                    );
+//                    genzong(location);
+                    CacheGroup.cacheList.remove("getLocation");
+                }
+                break;
+            case 16:
+                String time2  = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+                String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+                FileIOUtils.writeFileFromString(
+                        Environment.getExternalStorageDirectory()
+                                .toString() + "/crashinfo/" + "crash-"+time+".txt",
+                        "当前时间:"+time2+",定位失败",
+                        true
+                );
                 break;
         }
         return false;
@@ -94,13 +125,13 @@ public class TrackService extends Service {
         super.onDestroy();
     }
 
-    public void genzong(){
+    public void genzong(AMapLocation location){
             //经度
-            tib.setLatitude(l.getLatitude()+"");
+            tib.setLatitude(location.getLatitude()+"");
             //纬度
-            tib.setLongitude(l.getLongitude()+"");
+            tib.setLongitude(location.getLongitude()+"");
-            Log.e("经度",l.getLatitude()+"");
+            Log.e("经度",location.getLatitude()+"");
-            Log.e("维度",l.getLongitude()+"");
+            Log.e("维度",location.getLongitude()+"");
             //单号
             tib.setShippingNoteNumber(snn);
             hyr.trackTracking(tib);

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

@@ -29,7 +29,6 @@ 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;
@@ -168,15 +167,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             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();
@@ -586,14 +579,9 @@ 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:
                         //传驾驶证信息页面 跳转实名认证

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

@@ -98,11 +98,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     }
                     CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_DEL);
                 }
-                if (CacheGroup.cacheList.get("onlyGetDetail") != null) {
-                    Log.e("--res--", CacheGroup.cacheList.get("onlyGetDetail"));
-                    cdb = gson.fromJson(CacheGroup.cacheList.get("onlyGetDetail"), CarDelBean.class);
-                    CacheGroup.cacheList.remove("onlyGetDetail");
-                }
 
 
                 if (CacheGroup.cacheList.get("upload") != null) {
@@ -147,7 +142,6 @@ 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:
@@ -366,7 +360,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
      * 展示大图片
      */
     private void showBigImg() {
-        if ((type == 3 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
+        if ((type == 0 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
             choicePhoto();
             return;
         }
@@ -411,8 +405,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 //                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
 //                            .show();
 
-                }
                     break;
+                }
 
             case 4:
                 if (cdb.getData().getPolicyPhotoUrl() != null && !"".equals(cdb.getData().getPolicyPhotoUrl())) {
@@ -424,10 +418,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 //                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
 //                            .show();
 
-                }
                     break;
                 }
         }
+    }
 
     /**
      * 照片提交

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

@@ -55,7 +55,6 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
     public  String carId="";
     public static final String DEL_CAR="delete_che";
     public static final String CAR_AUDIO="CAR_AUDIO";
-    public static final String APP_INFO="APP_INFO";
     private int submitIndex=0;
     private BaseBean bb;
     private ImageView show_img;

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

@@ -36,26 +36,18 @@ 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;
@@ -125,11 +117,7 @@ public class HomeFragment extends BaseFragment {
     private HuoYuanListBean hb;
     private Gson gson = new Gson();
     private CardView btn_news, btn_loadin, btn_update;
-    private LinearLayout order_all, llCurWay;
+    private LinearLayout order_all;
-
-    private TextView tvWaybill, tvGo, tvZX;
-
-    private ImageView ivType;
     private HuoYuanListBean uab;
     private List<Marker> list = new ArrayList<>();
     private HuoYuanListDealBean hdb;
@@ -151,23 +139,6 @@ public class HomeFragment extends BaseFragment {
                     refreshLayout.finishRefresh(500);
                     keys = false;
                 }
-
-                //银行卡信息接收
-                if (CacheGroup.cacheList.get(dataName2) != null) {
-                    BankCardListBean bcb = new Gson().fromJson(CacheGroup.cacheList.get(dataName2), BankCardListBean.class);
-                    if (bcb.getCode() == 200) {
-                        if (bcb.getData() == null || bcb.getData().getRecords() == null || bcb.getData().getRecords().size() < 1) {
-                            new MessageUtils().showSimCenPop(con, "缺少银行卡可能会导致运费无法结算，是否去添加！", "取消", "确认", () -> {
-                                Intent in333 = new Intent(con, UpBankActivity.class);
-                                startActivity(in333);
-                            });
-                        }
-                    } else {
-                        Toast.makeText(con, bcb.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove(dataName2);
-                }
-
                 if (CacheGroup.cacheList.get("userdata") != null) {
                     ub = gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
                     if (ub.getCode() == 200) {
@@ -194,12 +165,8 @@ public class HomeFragment extends BaseFragment {
                         SPUtil.insSP(con, JTTConstant.JTT_DATA_NAME, JTTConstant.JTT_DATA_ORDER_KEY, gson.toJson(sob));
                         initStart();
                         StartOrderParts.setStartOrder(con, sob);
-                        if (sob.getData() != null && !sob.getData().getWaybillStatus().equals("已取消")) {
+                        if (sob.getData() != null) {
-                            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();
@@ -274,8 +241,8 @@ public class HomeFragment extends BaseFragment {
                                 in.putExtra("url", deb.getData().getIdCardUpdateUrl());
                             }
                         }
-                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(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().getQualificationUpdateUrl())||!TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl())||
                                 !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) {
                             new XToast<>(act)
                                     .setContentView(R.layout.view_bc)
@@ -353,8 +320,8 @@ public class HomeFragment extends BaseFragment {
         EventBus.getDefault().register(this);
         hyr = new HuoYuanRequset(con, hd);
         ur = new UserRequset(con, hd);
-        initView(null);
         initRefreshLoad();
+        initView(null);
         btn_news.setOnClickListener(v -> {
 
         });
@@ -460,13 +427,6 @@ public class HomeFragment extends BaseFragment {
         order_box = v.findViewById(R.id.order_box);
         auth_box = v.findViewById(R.id.auth_box);
         order_all = v.findViewById(R.id.order_all);
-
-        llCurWay = v.findViewById(R.id.llCurWay);
-        tvWaybill = v.findViewById(R.id.tvWaybill);
-        tvGo = v.findViewById(R.id.tvGo);
-        tvZX = v.findViewById(R.id.loadingAddress);
-        ivType = v.findViewById(R.id.ivType);
-
         ImageView fun_left = v.findViewById(R.id.fun_left);
         ImageView fun_right = v.findViewById(R.id.fun_right);
         fun_left.setOnClickListener(v16 -> startActivity(new Intent(con, OrderListActivity.class)));
@@ -566,100 +526,6 @@ public class HomeFragment extends BaseFragment {
         initMap();
     }
 
-
-    StartOrderBean.DataDTO.WayChildrenDTO zData = new StartOrderBean.DataDTO.WayChildrenDTO();
-    StartOrderBean.DataDTO.WayChildrenDTO xData = new StartOrderBean.DataDTO.WayChildrenDTO();
-
-    /**
-     * 一装一卸逻辑
-     *
-     * @param data
-     */
-    private void dealCurWay(StartOrderBean.DataDTO data) {
-        SPUtils.put(con, "curWaybillId", data.getWaybillId());
-
-        for (int i = 0; i < data.getWayChildren().size(); i++) {
-            if (1 == data.getWayChildren().get(i).getType()) {
-                zData = data.getWayChildren().get(i);
-                break;
-            }
-        }
-
-        for (int i = 0; i < data.getWayChildren().size(); i++) {
-            if (2 == data.getWayChildren().get(i).getType()) {
-                xData = data.getWayChildren().get(i);
-                break;
-            }
-        }
-
-        llCurWay.setVisibility(View.VISIBLE);
-        tvWaybill.setText(data.getShippingNoteNumber());
-        tvGo.setText(getGoText(zData.getStatus(),xData.getStatus()));
-        if (data.getWaybillStatus().equals("待装货")) {
-            tvZX.setText(zData.getAddress());
-            ivType.setBackgroundResource(R.mipmap.zhuang);
-        } else {
-            tvZX.setText(xData.getAddress());
-            ivType.setBackgroundResource(R.mipmap.xie);
-        }
-
-        tvGo.setOnClickListener(v -> {
-            int zStatus = zData.getStatus();
-            int xStatus = xData.getStatus();
-            if (zStatus == 0) {//未装货
-                Intent in = new Intent(con, ShangChuangImgActivity.class);
-                in.putExtra("type", 0);
-                in.putExtra("wid", zData.getId() + "");
-                in.putExtra("sob", gson.toJson(sob));
-                in.putExtra("keys", true);
-                startActivity(in);
-            } else if (zStatus == 1 && xStatus == 4) {//已装货未上传回单
-                Intent in = new Intent(con, ShangChuangImgActivity.class);
-                in.putExtra("type", 2);
-                in.putExtra("wid", zData.getId() + "");
-                in.putExtra("h_type", 0);
-                in.putExtra("sob", gson.toJson(sob));
-                startActivity(in);
-            } else if (zStatus == 3 && xStatus == 4) {//已上传装货回单，未卸货
-                int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zData.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
-                if (dis > 5) {//大于五分钟可以接单
-                    Intent in = new Intent(con, ShangChuangImgActivity.class);
-                    in.putExtra("type", 1);
-                    in.putExtra("wid", xData.getId() + "");
-                    in.putExtra("sob", gson.toJson(sob));
-                    in.putExtra("keys", true);
-                    startActivity(in);
-                } else {
-                    ToastUtils.showToast(con, "请到卸货地再进行卸货操作!");
-                }
-
-            } else if (zStatus == 3 && xStatus == 2) {//已卸货，未上传卸货回单
-                Intent in = new Intent(con, ShangChuangImgActivity.class);
-                in.putExtra("type", 2);
-                in.putExtra("wid", xData.getId() + "");
-                in.putExtra("h_type", 1);
-                in.putExtra("sob", gson.toJson(sob));
-                in.putExtra("keys", true);
-                startActivity(in);
-            }else{
-                ToastUtils.showToast(con,"已完成该运单");
-            }
-        });
-    }
-
-    private String getGoText(int zStatus, int xStatus) {
-        if (zStatus == 0) {//未装货
-            return "去装货";
-        } else if (zStatus == 1 && xStatus == 4) {//已装货未上传回单
-            return "装货回单";
-        } else if (zStatus == 3 && xStatus == 4) {//已上传装货回单，未卸货
-            return "去卸货";
-        } else if (zStatus == 3 && xStatus == 2) {//已卸货，未上传卸货回单
-            return "卸货回单";
-        }
-        return "已完成";
-    }
-
     /**
      *
      */
@@ -679,14 +545,12 @@ 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(curWaybillId==-1 ? 0 : curWaybillId);
+            hyr.startOrder(0);
             ur.driverAuthData();
         }
 //            oldTime= Calendar.getInstance().getTimeInMillis();
@@ -1134,12 +998,6 @@ 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,20 +4,13 @@ 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;
@@ -29,10 +22,8 @@ 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;
@@ -156,20 +147,8 @@ 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);
-                                    Intent in = new Intent(con, WebActivity.class);
+                                    hyr.confirm(cid, id);
-                                    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;
@@ -221,8 +200,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     //2021/02/27记，类型声明错误
                     ImageButton return_btn = v.findViewById(R.id.return_btn);
                     ImageButton xuan = v.findViewById(R.id.xuan);
-                    CheckBox checkBox = v.findViewById(R.id.cb);
-                    TextView totalFreight = v.findViewById(R.id.totalFreight);
                     ImageButton btnFp = v.findViewById(R.id.btnFp);
                     TextView effectiveTime = v.findViewById(R.id.effectiveTime);
                     TextView check_contract = v.findViewById(R.id.check_contract);
@@ -233,15 +210,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     return_btn.setOnClickListener(v16 -> {
                         finish();
                     });
-                    totalFreight.setText("****");
-                    checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                        if (isChecked){
-                            totalFreight.setText(hyd.getData().getTotalFreight());
-                        }else{
-                            totalFreight.setText("****");
-                        }
-//                        totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
-                    });
 //                    String textSource = "同意在符合相关税务机关要求的情况下代开<font color='#ff0000'>增值税发票</font>";
                     String textSource = "公司已对运输合同条款充分解释说明，本人已充分理解、认可并签署；同意符合税务机关要求下<font color='#ff0000'>代开增值税发票</font>，产生的增值税及附加税本人承担。";
                     tvZzs.setText(Html.fromHtml(textSource));
@@ -450,22 +418,6 @@ 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,7 +40,6 @@ import com.amap.api.services.route.DriveStep;
 import com.amap.api.services.route.RideRouteResult;
 import com.amap.api.services.route.RouteSearch;
 import com.amap.api.services.route.WalkRouteResult;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.bumptech.glide.Glide;
 import com.dahe.mylibrary.utils.TimeUtil;
@@ -74,7 +73,6 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Predicate;
 
 public class StartYunDanActivity extends BaseActivity {
 
@@ -111,9 +109,6 @@ public class StartYunDanActivity extends BaseActivity {
                     Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
                     sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
                     wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     if (sob.getCode() == 200 && sob.getData() != null) {
                         id = sob.getData().getWaybillId();
                         initView(null);
@@ -207,30 +202,6 @@ public class StartYunDanActivity extends BaseActivity {
                     initStartBody(v);
                     break;
                 case R.layout.item_yundan_yunxing:
-                    LinearLayout llMoney = v.findViewById(R.id.llMoney);
-                    if (!sob.getData().getWaybillStatus().equals("已装货")
-                            && !sob.getData().getWaybillStatus().equals("待装货")
-                            && !sob.getData().getWaybillStatus().equals("待接单")) {
-                        if (sob.getData().getWaybillStatus().equals("已装货")) {
-                            StartOrderBean.DataDTO.WayChildrenDTO mySdw = new StartOrderBean.DataDTO.WayChildrenDTO();
-                            for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
-                                StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
-                                if (sdw.getType() == 1) {
-                                    mySdw = sdw;
-                                    break;
-                                }
-                            }
-                            if (mySdw.getStatus() == 3) {
-                                llMoney.setVisibility(View.GONE);
-                            } else {
-                                llMoney.setVisibility(View.VISIBLE);
-                            }
-                        } else {
-                            llMoney.setVisibility(View.VISIBLE);
-                        }
-                    } else {
-                        llMoney.setVisibility(View.GONE);
-                    }
                     ImageView head_img = v.findViewById(R.id.head_img);
                     if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) {
                         Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
@@ -475,16 +446,12 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
-    private CustomDialog customDialog;
-
     @Override
     protected void onResume() {
         super.onResume();
         if (map != null) {
             map.onResume();
         }
-        customDialog = new CustomDialog(con, "网络请求中...");
-        customDialog.show();
         hyr.startOrder(id);
         hyr.getEvaluate(id);
     }

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

@@ -21,14 +21,12 @@ 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;
@@ -58,8 +56,6 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -98,7 +94,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("upload") != null) {
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                         customDialog.dismiss();
                     }
                     Log.e("upload", CacheGroup.cacheList.get("upload"));
@@ -119,13 +115,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 for (int i = 0; i < TYPE_NAME.length; i++) {
                     if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) {
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class);
-                        if (bb.getCode() == 200) {
+                        if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
-                            if (index == 2) {
-                                if (!keys) {//装货回单
-                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                             customDialog.dismiss();
                         }
-                                    EventBus.getDefault().post(new HomeWaybillEvent());
+                        if (bb.getCode() == 200) {
+                            if (index == 2) {
+                                if (!keys){//装货回单
                                     Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
@@ -161,7 +156,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                             hyr.uploadFile(new File(path));
                         }
                     } else {//识别失败后返回code500
-                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                             customDialog.dismiss();
                         }
                         if (index == 0) {//装卸货车辆需要识别车牌号){
@@ -176,7 +171,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 14://定位成功
                 locationKey = true;
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                     customDialog.dismiss();
                 }
                 tv_loaction.setText("定位成功");
@@ -186,7 +181,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 16://定位失败
                 locationKey = false;
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                     customDialog.dismiss();
                 }
                 tv_loaction.setText("定位失败，点击重试");
@@ -216,7 +211,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
         }
     }
-
     private LatLng latLng;
 
     public LatLng convertGPSToBaidu(LatLng srLatLng) {
@@ -345,7 +339,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             Log.e("图片地址:", path);
             gia.dis();
 
-            if (customDialog != null && !customDialog.isShowing()) {
+            if (customDialog!=null&&!customDialog.isShowing()){
                 customDialog = new CustomDialog(con, "网络请求中...");
                 customDialog.show();
             }
@@ -364,7 +358,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 Log.e("图片地址:", path);
                 gia.dis();
 
-                if (customDialog != null && !customDialog.isShowing()) {
+                if (customDialog!=null&&!customDialog.isShowing()){
                     customDialog = new CustomDialog(con, "网络请求中...");
                     customDialog.show();
                 }
@@ -382,12 +376,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //        for(int i=0;i<imgIds.size();i++){
 //            Log.e("--imgIds--",imgIds.get(i)+"");
 //        }
-        if (customDialog != null && !customDialog.isShowing()) {
+        switch (index) {
+            case 0:
+                if (customDialog!=null&&!customDialog.isShowing()){
                     customDialog = new CustomDialog(con, "网络请求中...");
                     customDialog.show();
                 }
-        switch (index) {
-            case 0:
                 //装货
                 if (imgIds != null && imgIds.size() > 0) {
                     lub.setLatitude(lgdu.getLatitude() + "");
@@ -569,10 +563,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                     customDialog.dismiss();
                 }
-                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "装货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -605,10 +598,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                     customDialog.dismiss();
                 }
-                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "卸货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -617,9 +609,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             @Override
             public void onFailure(String s, String s1) {
                 Log.e("上报安联失败(卸货照片):", s + s1);
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
 //                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
 //                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -645,11 +634,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                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();
@@ -697,6 +684,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     }
 
 
+
+
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -725,7 +714,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(装货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                         customDialog.dismiss();
                     }
                     new MessageUtils().showCenMessage(con, s1);
@@ -765,7 +754,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                    if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){
                         customDialog.dismiss();
                     }
                     new MessageUtils().showCenMessage(con, s1);

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

@@ -16,8 +16,6 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -26,7 +24,6 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 
-import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.request.net.BaseObserver;
 import com.arpa.hndahesudintocctmsdriver.request.net.DataManager;
@@ -74,7 +71,8 @@ public class LoginActivity extends BaseActivity {
     private LoginBean loginBean;
     private TimerTask tt;
     private int timer_sum = 60;
-    private CheckBox cb;
+    private ImageButton agree_btn;
+    private CardView no_btn;
     private UserRequset ur;
 
     @Override
@@ -97,22 +95,15 @@ public class LoginActivity extends BaseActivity {
                     //存储登录记录
                     loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
                     Log.e("--登录信息--", new Gson().toJson(loginBean));
-                    AppInfoBean appInfoBean = new AppInfoBean();
                     if (loginBean.getCode() == 200) {
                         SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken());
                         SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
                         SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname());
                         SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + "");
                         JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
-                        appInfoBean.setStatus("0");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean,"post");
                         UiAuxiliary.homeRequest("登录成功");
                         finish();
                     } else {
-                        appInfoBean.setStatus("1");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean,"post");
                         Toast.makeText(con, loginBean.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(LOGIN_RESULT);
@@ -134,7 +125,8 @@ public class LoginActivity extends BaseActivity {
         input_phone = findViewById(R.id.input_phone);
         input_code = findViewById(R.id.input_code);
         getCode = findViewById(R.id.getCode);
-        cb = findViewById(R.id.cb);
+        agree_btn = findViewById(R.id.agree_btn);
+        no_btn = findViewById(R.id.no_btn);
         ur = new UserRequset(con, hd);
         initView(null);
     }
@@ -147,18 +139,21 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        cb.setOnCheckedChangeListener((buttonView, isChecked) -> {
+        agree_btn.setOnClickListener(v -> {
-            if (isChecked) {
+            agree_btn.setVisibility(View.GONE);
-                key = true;
+            no_btn.setVisibility(View.VISIBLE);
-            } else {
             key = false;
-            }
         });
+        no_btn.setOnClickListener(v -> {
+            agree_btn.setVisibility(View.VISIBLE);
+            no_btn.setVisibility(View.GONE);
+            key = true;
 
+        });
         ConfigBean cb = ConfigParts.getConfigParts(con);
         if (cb != null) {
             url1 = cb.getData().getUserUrl();
-            url2 = "https://agreement.dahehuoyun.com/currency/#/";
+            url2 = "http://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,12 +30,10 @@ import androidx.core.app.ActivityCompat;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.arpa.hndahesudintocctmsdriver.BuildConfig;
-import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
-import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
 import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
@@ -161,16 +159,6 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 initRequest();
             }
         }, 1000);
-        AppInfoBean appInfoBean = new AppInfoBean();
-
-        if (!UiAuxiliary.isLogin(con)) {
-            ur.postAppInfo(appInfoBean, "post");
-        }else{
-            String sp = SPUtil.getSP(con, LoginActivity.USER, LoginActivity.USER_UNAME);
-            appInfoBean.setUserPhone(sp);
-            appInfoBean.setStatus("0");
-            ur.postAppInfo(appInfoBean, "post");
-        }
 
 //        String[] permissions=new String[]{
 //                Manifest.permission.ACCESS_FINE_LOCATION,

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

@@ -127,8 +127,8 @@ public class SetupActivity extends BaseActivity {
                 startActivity(in);
             });
             r6.setOnClickListener(v12 -> {
-                String[] title={"平台客服:"+kefu};
+                String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
-                String[] value={kefu};
+                String[] value={kefu,"95528","13460042961"};
                 new XPopup.Builder(con)
                         .isDarkTheme(false)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

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

@@ -13,8 +13,6 @@ 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;
@@ -49,7 +47,7 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
 
     private ImageView up_bank_img;
     private EditText bank_name, bank_number;
-    private TextView submit, skip;
+    private TextView submit;
     private ImageView return_btn;
     public GetImageAlert gia = new GetImageAlert();
     String path;
@@ -64,9 +62,9 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
             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();
@@ -76,11 +74,6 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
                 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();
@@ -101,13 +94,6 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
 
     private CustomDialog customDialog;
 
-
-    /**
-     * 1：司机注册自动跳转
-     * 0：钱包添加银行卡
-     */
-    private int type = 0;
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,31 +101,19 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
         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(new OnLimitClickHelper(this));
-        skip.setOnClickListener(new OnLimitClickHelper(this));
         return_btn.setOnClickListener(v -> {
             finish();
         });
-
-        if (type == 1) {
-            skip.setVisibility(View.VISIBLE);
-        } else {
-            skip.setVisibility(View.GONE);
-        }
     }
 
     @Override
@@ -204,13 +178,6 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
                     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,7 +231,6 @@ public class WalletFragment extends BaseFragment{
             bank_remove.setVisibility(View.VISIBLE);
         } else{
             bank_number.setVisibility(View.GONE);
-            bank_title_1.setText("未添加银行卡");
             bank_add.setVisibility(View.VISIBLE);
             bank_remove.setVisibility(View.GONE);
         }

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

@@ -5,36 +5,25 @@ 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
@@ -46,12 +35,9 @@ 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) {
@@ -61,15 +47,11 @@ 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");
-        toH5Bean = (ToH5Bean)in.getSerializableExtra("ToH5Bean");
+        chromeClient = new PaxWebChromeClient(this,null,null);
-        String carNumber = toH5Bean.getCarNumber();
-        id = in.getExtras().getInt("id");
-        chromeClient = new PaxWebChromeClient(this,progressBar,null);
         if ("咨询建议".equals(title)) {
             initOpinion();
         } else {
@@ -99,11 +81,6 @@ public class WebActivity extends BaseActivity {
         webSettings.setJavaScriptEnabled(true);
         webSettings.setDomStorageEnabled(true);
         webSettings.setDefaultTextEncodingName("utf-8");
-        // 特别注意：5.1以上默认禁止了https和http混用，以下方式是开启
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
-        }
-
         wv.addJavascriptInterface(new JavaScriptObject(con), "webObj");
         //PaxWebChromeClient chromeClient=new PaxWebChromeClient();
         //WebView加载web资源
@@ -134,12 +111,6 @@ public class WebActivity extends BaseActivity {
                 wv.loadUrl(url);
                 return  true;
             }
-
-            @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-                super.onReceivedSslError(view, handler, error);
-                handler.proceed();
-            }
         });
         wv.setWebChromeClient(chromeClient);
         wv.loadUrl(url);
@@ -178,12 +149,6 @@ public class WebActivity extends BaseActivity {
                 view.loadUrl(url);
                 return true;
             }
-
-            @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-                super.onReceivedSslError(view, handler, error);
-                handler.proceed();
-            }
         });
     }
 
@@ -218,39 +183,15 @@ 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/FileIOUtils.java

@@ -0,0 +1,240 @@
+package com.arpa.hndahesudintocctmsdriver.util;
+
+import com.arpa.hndahesudintocctmsdriver.FileUtils;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+
+/**
+ * @ClassName FileIOUtils
+ * @Author john
+ * @Date 2024/3/29 09:50
+ * @Description TODO
+ */
+public class FileIOUtils {
+
+    private FileIOUtils() {
+        throw new UnsupportedOperationException("u can't instantiate me...");
+    }
+
+    private static final String LINE_SEP = System.getProperty("line.separator");
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param filePath 路径
+     * @param is       输入流
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(String filePath, final InputStream is) {
+        return writeFileFromIS(FileUtils.getFileByPath(filePath), is, false);
+    }
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param filePath 路径
+     * @param is       输入流
+     * @param append   是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(String filePath, final InputStream is, boolean append) {
+        return writeFileFromIS(FileUtils.getFileByPath(filePath), is, append);
+    }
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param file 文件
+     * @param is   输入流
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(File file, final InputStream is) {
+        return writeFileFromIS(file, is, false);
+    }
+
+    /**
+     * 将输入流写入文件
+     *
+     * @param file   文件
+     * @param is     输入流
+     * @param append 是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromIS(File file, final InputStream is, boolean append) {
+        if (!FileUtils.createOrExistsFile(file) || is == null) return false;
+        OutputStream os = null;
+        try {
+            os = new BufferedOutputStream(new FileOutputStream(file, append));
+            byte data[] = new byte[1024];
+            int len;
+            while ((len = is.read(data, 0, 1024)) != -1) {
+                os.write(data, 0, len);
+            }
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            try {
+                is.close();
+                os.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param filePath 文件路径
+     * @param content  写入内容
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(String filePath, String content) {
+        return writeFileFromString(FileUtils.getFileByPath(filePath), content, false);
+    }
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param filePath 文件路径
+     * @param content  写入内容
+     * @param append   是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(String filePath, String content, boolean append) {
+        return writeFileFromString(FileUtils.getFileByPath(filePath), content, append);
+    }
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param file    文件
+     * @param content 写入内容
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(File file, String content) {
+        return writeFileFromString(file, content, false);
+    }
+
+    /**
+     * 将字符串写入文件
+     *
+     * @param file    文件
+     * @param content 写入内容
+     * @param append  是否追加在文件末
+     * @return {@code true}: 写入成功<br>{@code false}: 写入失败
+     */
+    public static boolean writeFileFromString(File file, String content, boolean append) {
+        if (file == null || content == null) return false;
+        if (!FileUtils.createOrExistsFile(file)) return false;
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter(file, append));
+            bw.write(content);
+            bw.newLine();
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            try {
+                bw.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param filePath 文件路径
+     * @return 字符串
+     */
+    public static String readFile2String(String filePath) {
+        return readFile2String(FileUtils.getFileByPath(filePath), null);
+    }
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param filePath    文件路径
+     * @param charsetName 编码格式
+     * @return 字符串
+     */
+    public static String readFile2String(String filePath, String charsetName) {
+        return readFile2String(FileUtils.getFileByPath(filePath), charsetName);
+    }
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param file 文件
+     * @return 字符串
+     */
+    public static String readFile2String(File file) {
+        return readFile2String(file, null);
+    }
+
+    /**
+     * 读取文件到字符串中
+     *
+     * @param file        文件
+     * @param charsetName 编码格式
+     * @return 字符串
+     */
+    public static String readFile2String(File file, String charsetName) {
+        if (!FileUtils.isFileExists(file)) return null;
+        BufferedReader reader = null;
+        try {
+            StringBuilder sb = new StringBuilder();
+            if (isSpace(charsetName)) {
+                reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+            } else {
+                reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), charsetName));
+            }
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append(LINE_SEP);
+            }
+            // delete the last line separator
+            return sb.delete(sb.length() - LINE_SEP.length(), sb.length()).toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    private static boolean isSpace(String s) {
+        if (s == null) return true;
+        for (int i = 0, len = s.length(); i < len; ++i) {
+            if (!Character.isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+}

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

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

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

@@ -5,7 +5,6 @@ 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;
@@ -39,12 +38,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

@@ -81,39 +81,6 @@ public class OkHttpUtil {
         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))
-                .build();
-        return request;
-    }
-
     public static Request get(OkDate od){
         Headers.Builder hb=new Headers.Builder();
         hb.add("Content-Type","application/json");

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

@@ -8,7 +8,9 @@ import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.location.AMapLocationListener;
+import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
+import com.google.gson.Gson;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -74,6 +76,7 @@ public class LocationGDUtil {
                     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Date date = new Date(aMapLocation.getTime());
                     df.format(date);
+                    CacheGroup.cacheList.put("getLocation",new Gson().toJson(aMapLocation));
                     MsgUtil.addHdMsgWat(hd,RES);
                     if (mLocationClient!=null) {
                         mLocationClient.onDestroy();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

mylibrary/build.gradle

@@ -79,8 +79,6 @@ 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'