webview添加loading

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "com.arpa.hndahesudintocctmsdriver"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 67
+        versionCode 68
-        versionName "3.3.7"
+        versionName "3.3.8"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -228,6 +228,5 @@ dependencies {
     implementation 'com.github.getActivity:XToast:8.2'
 
     implementation project(path: ':mylibrary')
-    implementation 'com.lk.mapsdk:sdk-full:2.3.7'
 
 }

app/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.arpa.hndahesudintocctmsdriver">
-
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <!-- 白名单 -->
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -15,8 +14,6 @@
     <!--播音-->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!-- 地图截屏图片保存等 -->
-    <uses-permission android:name="android.permission.READ_MEDIA_PERMISSION" />
     <!-- 极光 -->
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
@@ -69,24 +66,19 @@
             android:name="com/alct/mdp"
             android:required="false" />
 
-        <meta-data
-            android:name="com.lk.lbsapi.API_KEY"
-            android:value="EE1721986040968235494A762772C95410D9881BB10790FC0BCRFNPFKW4K6697" />
-
-
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" ></activity>
 
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.wallet.WithdrawalActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"   />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.OrderAllActivity"
             android:screenOrientation="portrait" />
@@ -101,11 +93,11 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
-            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
-            android:windowSoftInputMode="adjustPan|stateHidden" />
+            android:screenOrientation="portrait"  />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity"
             android:screenOrientation="portrait">
@@ -150,13 +142,13 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.GetShangChuanActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AuthQualificationActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.OrderListActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.HuoYunDelActivity"
             android:screenOrientation="portrait">
@@ -169,14 +161,14 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
-            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
-            android:windowSoftInputMode="adjustPan|stateHidden" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity"
             android:exported="true"
@@ -200,10 +192,10 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle.VideoReleaseActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.WebPDFActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity"
             android:screenOrientation="portrait">
@@ -211,13 +203,13 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle.HomePageActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.alert.VehicleChoiceActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.OrderComplaintActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.web.WebActivity"
             android:screenOrientation="portrait"
@@ -231,7 +223,7 @@
         <activity
             android:name=".ui.news.NewActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+             android:windowSoftInputMode="stateAlwaysHidden" />
 
         <service
             android:name="com.arpa.hndahesudintocctmsdriver.service.TrackService"
@@ -274,7 +266,7 @@
         <meta-data
             android:name="com.amap.api.v2.apikey"
             android:value="${GAODEKEY}" />
-        <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
+<!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
         <service android:name="com.amap.api.location.APSService"></service>
 
@@ -370,11 +362,10 @@
 
         <activity
             android:name=".H5Activity"
-            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
-            android:screenOrientation="portrait">
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 

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

@@ -23,9 +23,6 @@ import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.gyf.cactus.Cactus;
 import com.gyf.cactus.callback.CactusBackgroundCallback;
 import com.gyf.cactus.callback.CactusCallback;
-import com.lk.mapsdk.base.mapapi.initializer.InitializerOptions;
-import com.lk.mapsdk.base.mapapi.initializer.SDKInitializer;
-import com.lk.mapsdk.base.mapapi.model.CoordType;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.umeng.commonsdk.UMConfigure;
 
@@ -52,18 +49,6 @@ public class App extends Application {
         CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
         CrashReport.initCrashReport(getApplicationContext(), "0fa55ffad8", false);
         String state = SPUtil.getSP(con, "state_data", "authorization_state");
-
-        InitializerOptions options = new InitializerOptions();
-        // 设置是否使用Https网络请求,默认使用
-        options.setHttpsEnable(true);
-        // 设置坐标系,默认GCJ02
-        options.setCoordType(CoordType.GCJ02);
-        // SDK 初始化
-        SDKInitializer.initialization(getApplicationContext(), options);
-
-        // Log 开关使能
-        SDKInitializer.setLogEnable(true);
-
         if ("1".equals(state)) {
             try {
                 Context context = getApplicationContext();

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

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

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

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

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

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

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

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

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

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

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

@@ -29,6 +29,7 @@ import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
+import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.PickerUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
@@ -167,9 +168,15 @@ 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();
@@ -579,9 +586,14 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     case 0:
                         finish();
                         //上传身份证信息后 跳转上传驾驶证信息页面
-                        Intent in1 = new Intent(con, CertificatesActivity.class);
+//                        Intent in1 = new Intent(con, CertificatesActivity.class);
-                        in1.putExtra("index", 1);
+//                        in1.putExtra("index", 1);
-                        startActivity(in1);
+//                        startActivity(in1);
+
+                        //上传身份证信息后 跳转上传银行卡信息页面
+                        Intent in333=new Intent(con, UpBankActivity.class);
+                        in333.putExtra("type",1);
+                        startActivity(in333);
                         break;
                     case 1:
                         //传驾驶证信息页面 跳转实名认证

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

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

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

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

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

@@ -17,14 +17,31 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
 
-
 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.amap.api.maps.AMap;
+import com.amap.api.maps.CameraUpdateFactory;
 import com.amap.api.maps.LocationSource;
+import com.amap.api.maps.MapView;
+import com.amap.api.maps.model.BitmapDescriptorFactory;
+import com.amap.api.maps.model.LatLng;
+import com.amap.api.maps.model.LatLngBounds;
+import com.amap.api.maps.model.MarkerOptions;
+import com.amap.api.maps.model.PolylineOptions;
+
+import com.amap.api.services.core.AMapException;
 import com.amap.api.services.core.LatLonPoint;
+import com.amap.api.services.route.BusRouteResult;
+import com.amap.api.services.route.DrivePath;
+import com.amap.api.services.route.DriveRouteResult;
+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;
 import com.dahe.mylibrary.utils.ToastUtils;
@@ -51,33 +68,13 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 import com.arpa.hndahesudintocctmsdriver.util.view.ScoreView;
-import com.lk.mapsdk.base.mapapi.initializer.InitializerOptions;
-import com.lk.mapsdk.base.mapapi.initializer.SDKInitializer;
-import com.lk.mapsdk.base.mapapi.model.CoordType;
-import com.lk.mapsdk.base.mapapi.model.LatLng;
-import com.lk.mapsdk.base.mapapi.model.LatLngBounds;
-import com.lk.mapsdk.map.mapapi.annotation.Marker;
-import com.lk.mapsdk.map.mapapi.annotation.Polyline;
-import com.lk.mapsdk.map.mapapi.annotation.options.MarkerOptions;
-import com.lk.mapsdk.map.mapapi.annotation.options.PolylineOptions;
-import com.lk.mapsdk.map.mapapi.annotation.util.BitmapDescriptorFactory;
-import com.lk.mapsdk.map.mapapi.camera.MapStatusUpdateFactory;
-import com.lk.mapsdk.map.mapapi.map.LKMap;
-import com.lk.mapsdk.map.mapapi.map.MapView;
-import com.lk.mapsdk.map.platform.style.layers.Property;
-import com.lk.mapsdk.route.mapapi.base.AutoInfo;
-import com.lk.mapsdk.route.mapapi.base.DrivingCostingOptionsInfo;
-import com.lk.mapsdk.route.mapapi.base.LocationsInfo;
-import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlan;
-import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlanOptions;
-import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlanResult;
-import com.lk.mapsdk.route.mapapi.driving.OnDrivingRoutePlanListener;
 
 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 {
 
@@ -87,7 +84,7 @@ public class StartYunDanActivity extends BaseActivity {
 
     private String TAG = "StartYunDanActivity";
     private NestedScrollView bottomSheet;
-    private MapView mapView;
+    private MapView map;
     private BaseRecyclerView brv;
     private AlphaAnimation mShowAnim, mHiddenAmin;//控件的显示和隐藏动画
     private LinearLayout protect;
@@ -114,6 +111,9 @@ public class StartYunDanActivity extends BaseActivity {
                     Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
                     sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
                     wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
+                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
+                        customDialog.dismiss();
+                    }
                     if (sob.getCode() == 200 && sob.getData() != null) {
                         id = sob.getData().getWaybillId();
                         initView(null);
@@ -149,6 +149,7 @@ public class StartYunDanActivity extends BaseActivity {
     }
 
     private UserBean ub;
+    private AMap aMap;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -156,10 +157,6 @@ public class StartYunDanActivity extends BaseActivity {
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_yundan_start);
         con = this;
-        mapView = findViewById(R.id.map);
-        mapView.onCreate(savedInstanceState);
-        mLKMap = mapView.getMap();
-        initMap();
         id = getIntent().getExtras().getInt("id");
         brv = findViewById(R.id.brv);
         protect = findViewById(R.id.protect);
@@ -169,10 +166,12 @@ public class StartYunDanActivity extends BaseActivity {
         mBottomSheetBehavior.setHideable(false);
         mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
         //mBottomSheetBehavior.set
-
+        map = findViewById(R.id.map);
-
+        map.onCreate(savedInstanceState);
-//        initLoaction();
+        if (aMap == null) {
-
+            aMap = map.getMap();
+            initLoaction();
+        }
         Log.e("--id--", "" + id);
         String userdata = SPUtil.getSP(con, "data", "userdata");
         if (!userdata.equals("")) {
@@ -208,6 +207,30 @@ public class StartYunDanActivity extends BaseActivity {
                     initStartBody(v);
                     break;
                 case R.layout.item_yundan_yunxing:
+                    LinearLayout llMoney = v.findViewById(R.id.llMoney);
+                    if (!sob.getData().getWaybillStatus().equals("已装货")
+                            && !sob.getData().getWaybillStatus().equals("待装货")
+                            && !sob.getData().getWaybillStatus().equals("待接单")) {
+                        if (sob.getData().getWaybillStatus().equals("已装货")) {
+                            StartOrderBean.DataDTO.WayChildrenDTO mySdw = new StartOrderBean.DataDTO.WayChildrenDTO();
+                            for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+                                StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+                                if (sdw.getType() == 1) {
+                                    mySdw = sdw;
+                                    break;
+                                }
+                            }
+                            if (mySdw.getStatus() == 3) {
+                                llMoney.setVisibility(View.GONE);
+                            } else {
+                                llMoney.setVisibility(View.VISIBLE);
+                            }
+                        } else {
+                            llMoney.setVisibility(View.VISIBLE);
+                        }
+                    } else {
+                        llMoney.setVisibility(View.GONE);
+                    }
                     ImageView head_img = v.findViewById(R.id.head_img);
                     if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) {
                         Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
@@ -321,8 +344,7 @@ public class StartYunDanActivity extends BaseActivity {
             }
             initZX(upkey, v15, position, o, 1);
         });
-//        search();
+        search();
-        doSearch();
     }
 
     public void initZX(boolean key, View v, int position, Object o, int type) {
@@ -453,12 +475,16 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
+    private CustomDialog customDialog;
+
     @Override
     protected void onResume() {
         super.onResume();
-        if (mapView != null) {
+        if (map != null) {
-            mapView.onResume();
+            map.onResume();
         }
+        customDialog = new CustomDialog(con, "网络请求中...");
+        customDialog.show();
         hyr.startOrder(id);
         hyr.getEvaluate(id);
     }
@@ -466,352 +492,223 @@ public class StartYunDanActivity extends BaseActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        if (mapView != null) {
+        if (map != null) {
-            mapView.onPause();
+            map.onPause();
         }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mapView != null) {
+        if (map != null) {
-            mapView.onDestroy();
+            map.onDestroy();
         }
     }
 
     @Override
     protected void onSaveInstanceState(@NonNull @NotNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        mapView.onSaveInstanceState(outState);
+        map.onSaveInstanceState(outState);
     }
 
     LocationSource.OnLocationChangedListener mListener;
     AMapLocationClient mlocationClient;
     AMapLocationClientOption mLocationOption;
 
-//    public void initLoaction() {
+    public void initLoaction() {
-//        // 设置定位监听
+        // 设置定位监听
-//        aMap.setLocationSource(new LocationSource() {
+        aMap.setLocationSource(new LocationSource() {
-//            @Override
+            @Override
-//            public void activate(OnLocationChangedListener onLocationChangedListener) {
+            public void activate(OnLocationChangedListener onLocationChangedListener) {
-//                mListener = onLocationChangedListener;
+                mListener = onLocationChangedListener;
-//                if (mlocationClient == null) {
+                if (mlocationClient == null) {
-//                    //初始化定位
+                    //初始化定位
-//                    try {
+                    try {
-//                        mlocationClient = new AMapLocationClient(con);
+                        mlocationClient = new AMapLocationClient(con);
-//                    } catch (Exception e) {
+                    } catch (Exception e) {
-//                        e.printStackTrace();
+                        e.printStackTrace();
-//                    }
+                    }
-//                    //初始化定位参数
+                    //初始化定位参数
-//                    mLocationOption = new AMapLocationClientOption();
+                    mLocationOption = new AMapLocationClientOption();
-//                    //设置定位回调监听
+                    //设置定位回调监听
-//                    mlocationClient.setLocationListener(new AMapLocationListener() {
+                    mlocationClient.setLocationListener(new AMapLocationListener() {
-//                        @Override
+                        @Override
-//                        public void onLocationChanged(AMapLocation aMapLocation) {
+                        public void onLocationChanged(AMapLocation aMapLocation) {
-//                            if (mListener != null && aMapLocation != null) {
+                            if (mListener != null && aMapLocation != null) {
-//                                if (aMapLocation != null
+                                if (aMapLocation != null
-//                                        && aMapLocation.getErrorCode() == 0) {
+                                        && aMapLocation.getErrorCode() == 0) {
-//                                    mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
+                                    mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
-//                                } else {
+                                } else {
-//                                    String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
+                                    String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
-//                                    Log.e("AmapErr", errText);
+                                    Log.e("AmapErr", errText);
-//                                }
+                                }
-//                            }
+                            }
-//                        }
+                        }
-//                    });
+                    });
-//                    //设置为高精度定位模式
+                    //设置为高精度定位模式
-//                    mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
+                    mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
-//                    // mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);
+                    // mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);
-//                    //设置定位模式为AMapLocationMode.Device_Sensors，仅设备模式。
+                    //设置定位模式为AMapLocationMode.Device_Sensors，仅设备模式。
-//                    //mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Device_Sensors);
+                    //mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Device_Sensors);
-//                    //获取一次定位结果：
+                    //获取一次定位结果：
-//                    //该方法默认为false。
+                    //该方法默认为false。
-//                    mLocationOption.setOnceLocation(true);
+                    mLocationOption.setOnceLocation(true);
-//                    //获取最近3s内精度最高的一次定位结果：
+                    //获取最近3s内精度最高的一次定位结果：
-//                    //设置setOnceLocationLatest(boolean b)接口为true，启动定位时SDK会返回最近3s内精度最高的一次定位结果。如果设置其为true，setOnceLocation(boolean b)接口也会被设置为true，反之不会，默认为false。
+                    //设置setOnceLocationLatest(boolean b)接口为true，启动定位时SDK会返回最近3s内精度最高的一次定位结果。如果设置其为true，setOnceLocation(boolean b)接口也会被设置为true，反之不会，默认为false。
-//                    mLocationOption.setOnceLocationLatest(true);
+                    mLocationOption.setOnceLocationLatest(true);
-//                    //设置是否返回地址信息（默认返回地址信息）
+                    //设置是否返回地址信息（默认返回地址信息）
-//                    mLocationOption.setNeedAddress(true);
+                    mLocationOption.setNeedAddress(true);
-//                    //设置是否允许模拟位置,默认为true，允许模拟位置
+                    //设置是否允许模拟位置,默认为true，允许模拟位置
-//                    mLocationOption.setMockEnable(true);
+                    mLocationOption.setMockEnable(true);
-//                    //单位是毫秒，默认30000毫秒，建议超时时间不要低于8000毫秒。
+                    //单位是毫秒，默认30000毫秒，建议超时时间不要低于8000毫秒。
-//                    mLocationOption.setHttpTimeOut(20000);
+                    mLocationOption.setHttpTimeOut(20000);
-//                    //关闭缓存机制
+                    //关闭缓存机制
-//                    mLocationOption.setLocationCacheEnable(false);
+                    mLocationOption.setLocationCacheEnable(false);
-//                    //设置定位参数
+                    //设置定位参数
-//                    mlocationClient.setLocationOption(mLocationOption);
+                    mlocationClient.setLocationOption(mLocationOption);
-//                    // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
+                    // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
-//                    // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
+                    // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
-//                    // 在定位结束后，在合适的生命周期调用onDestroy()方法
+                    // 在定位结束后，在合适的生命周期调用onDestroy()方法
-//                    // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
+                    // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
-//                    mlocationClient.startLocation();//启动定位
+                    mlocationClient.startLocation();//启动定位
-//                }
+                }
-//            }
+            }
-//
-//            @Override
-//            public void deactivate() {
-//                mListener = null;
-//                if (mlocationClient != null) {
-//                    mlocationClient.stopLocation();
-//                    mlocationClient.onDestroy();
-//                }
-//                mlocationClient = null;
-//            }
-//        });
-//        // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
-////        aMap.setMyLocationEnabled(true);
-////        ld=new LocationGDUtil(con,hd);
-////        ld.onCreate();
-//    }
-
-    private void initMap(){
-        // 通过InitializerOptions指定初始化配置参数
-        InitializerOptions options = new InitializerOptions();
-        // 设置是否使用Https网络请求,默认使用
-//        options.setIsHttpsEnable(true);
-        // 设置坐标系,默认GCJ02
-//        options.setCoorType(CoordType.GCJ02);
-
-        SDKInitializer.initialization(getApplicationContext(),options);
-    }
-
-    private DrivingRoutePlanOptions drivingRoutePlanOptions;
-    private List<LocationsInfo> locationsInfos;
-
-    private List<Polyline> polylines = new ArrayList<>();
-    private List<Marker> markers = new ArrayList<>();
-
-    private LKMap mLKMap;
-
-    private void doSearch() {
-        DrivingRoutePlan search = new DrivingRoutePlan();
-
-        drivingRoutePlanOptions = new DrivingRoutePlanOptions();
-        locationsInfos = new ArrayList<>();
-        // 设置开始坐标
-        LocationsInfo origin = new LocationsInfo();
-        origin.setLat(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()));
-        origin.setLon(Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
-        // 设置结束坐标
-        LocationsInfo dest = new LocationsInfo();
-        dest.setLat(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()));
-        dest.setLon(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
-        locationsInfos.add(origin);
-        locationsInfos.add(dest);
-        drivingRoutePlanOptions.setLocations(locationsInfos);
-        AutoInfo autoInfo = new AutoInfo();
-        DrivingCostingOptionsInfo drivingCostingOptionsInfo = new DrivingCostingOptionsInfo();
-        drivingCostingOptionsInfo.setAuto(autoInfo);
-        drivingRoutePlanOptions.setDrivingCostingOptions(drivingCostingOptionsInfo);
-
-        search.drivingRoutePlanRequest(drivingRoutePlanOptions, new OnDrivingRoutePlanListener() {
 
             @Override
-            public void onGetDrivingRoutePlanResult(DrivingRoutePlanResult routePlanResult) {
+            public void deactivate() {
-                addRoutePlanLine(routePlanResult);
+                mListener = null;
-                addRouteMarker();
+                if (mlocationClient != null) {
+                    mlocationClient.stopLocation();
+                    mlocationClient.onDestroy();
+                }
+                mlocationClient = null;
             }
         });
-    }
+        // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
-
+        aMap.setMyLocationEnabled(true);
-    /**
+//        ld=new LocationGDUtil(con,hd);
-     * 添加线路规划路线
+//        ld.onCreate();
-     *
-     * @param routePlanResult
-     */
-    private void addRoutePlanLine(DrivingRoutePlanResult routePlanResult) {
-        if (routePlanResult == null) {
-            Toast.makeText(this, "没有检索到结果", Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        if (routePlanResult.getRouteInfos() == null || routePlanResult.getRouteInfos().isEmpty()) {
-            Toast.makeText(this, "没有检索到结果", Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        List<LatLng> latLngs = new ArrayList<>();
-        List<LatLng> all = new ArrayList<>();
-        mLKMap.removeOverlay(polylines);
-        polylines.clear();
-
-        if (routePlanResult.getRouteInfos().size()>0){
-            latLngs.clear();
-            latLngs.addAll(routePlanResult.getRouteInfos().get(0).getGeometry());
-            PolylineOptions options = new PolylineOptions();
-            options.width(8f)
-                    .joinStyle(Property.LINE_JOIN_ROUND)
-                    .points(latLngs)
-                    .color(getResources().getColor(R.color.theme_color));
-            all.addAll(latLngs);
-            polylines.add((Polyline) mLKMap.addOverlay(options));
-        }
-
-
-
-
-//        for (int i = 0;i < routePlanResult.getRouteInfos().size();i ++){
-//            latLngs.clear();
-//            latLngs.addAll(routePlanResult.getRouteInfos().get(i).getGeometry());
-//            PolylineOptions options = new PolylineOptions();
-//            if(i == routePlanResult.getRouteInfos().size() - 1){
-//                options.width(8f)
-////                        .pattern(BitmapDescriptorFactory.fromResource(R.drawable.icon_roud_type))
-//                        .joinStyle(Property.LINE_JOIN_ROUND)
-//                        .points(latLngs)
-//                        .color(getResources().getColor(R.color.theme_color));
-//            }else{
-//                options.width(8f)
-////                        .joinStyle(Property.LINE_JOIN_ROUND)
-//                        .points(latLngs)
-//                        .color(getResources().getColor(R.color.theme_color));
-//            }
-//            all.addAll(latLngs);
-//            polylines.add((Polyline) mLKMap.addOverlay(options));
-//        }
-        mLKMap.setMapStatus(MapStatusUpdateFactory.buildUpdateByLatLngBounds(new LatLngBounds(all),100,100,100,100));
-    }
-
-    /**
-     * 添加起始点标记
-     */
-    private void addRouteMarker() {
-        mLKMap.removeOverlay(markers);
-        markers.clear();
-        MarkerOptions originOptions = new MarkerOptions()
-                .position(new LatLng(locationsInfos.get(0).getLat(),locationsInfos.get(0).getLon()))
-                .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
-                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                .iconScale(0.5f);
-        markers.add((Marker) mLKMap.addOverlay(originOptions));
-
-        MarkerOptions destinationOptions = new MarkerOptions()
-                .position(new LatLng(locationsInfos.get(1).getLat(),locationsInfos.get(1).getLon()))
-                .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
-                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                .iconScale(0.5f);
-        markers.add((Marker) mLKMap.addOverlay(destinationOptions));
     }
 
 
-//    private RouteSearch mRouteSearch;//路线查询器
+    private RouteSearch mRouteSearch;//路线查询器
-//    private List<LatLonPoint> lists = new ArrayList<>();
+    private List<LatLonPoint> lists = new ArrayList<>();
 
 
-//    public void search() {
+    public void search() {
-////        try {
+//        try {
-////            AMapLocationClient.updatePrivacyShow(con,true,true);
+//            AMapLocationClient.updatePrivacyShow(con,true,true);
-////            AMapLocationClient.updatePrivacyAgree(con,true);
+//            AMapLocationClient.updatePrivacyAgree(con,true);
-//        mRouteSearch = new RouteSearch(this);
+        mRouteSearch = new RouteSearch(this);
-////        } catch (AMapException e) {
+//        } catch (AMapException e) {
-////            e.printStackTrace();
+//            e.printStackTrace();
-////        }
-//        //设置数据回调监听器
-//        mRouteSearch.setRouteSearchListener(new OnRouteSearchListener());
-//        //设置开始位置坐标点(注意经纬度不能写反,会报错1800(只能规划到中国区域里的地图路线))
-//        LatLonPoint startPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
-//                Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
-//        //设置目的地坐标点
-//        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
-//                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
-//        //查询信息对象
-//        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
-//            if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
-//                LatLonPoint sp = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
-//                        Double.parseDouble(sob.getData().getWayChildren().get((i)).getLongitude()));
-//                lists.add(sp);
-//            }
 //        }
-//        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint, endPoint);
+        //设置数据回调监听器
-//        //设置搜索参数 1.fromAndTo 路径的起点终点  2.路径规划的策略(这里是驾车模式,具体看高德API) 3.途
+        mRouteSearch.setRouteSearchListener(new OnRouteSearchListener());
-//        //经点，可选 4.避让区域，可选， 5.避让道路 ,可选
+        //设置开始位置坐标点(注意经纬度不能写反,会报错1800(只能规划到中国区域里的地图路线))
-//        RouteSearch.DriveRouteQuery query = new
+        LatLonPoint startPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
-//                RouteSearch.DriveRouteQuery(fromAndTo, RouteSearch.DRIVING_SINGLE_DEFAULT, lists, null, "");
+                Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
-//        //开始异步查询
+        //设置目的地坐标点
-//        mRouteSearch.calculateDriveRouteAsyn(query);
+        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
-//    }
+                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+        //查询信息对象
+        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+            if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+                LatLonPoint sp = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
+                        Double.parseDouble(sob.getData().getWayChildren().get((i)).getLongitude()));
+                lists.add(sp);
+            }
+        }
+        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint, endPoint);
+        //设置搜索参数 1.fromAndTo 路径的起点终点  2.路径规划的策略(这里是驾车模式,具体看高德API) 3.途
+        //经点，可选 4.避让区域，可选， 5.避让道路 ,可选
+        RouteSearch.DriveRouteQuery query = new
+                RouteSearch.DriveRouteQuery(fromAndTo, RouteSearch.DRIVING_SINGLE_DEFAULT, lists, null, "");
+        //开始异步查询
+        mRouteSearch.calculateDriveRouteAsyn(query);
+    }
 
 
-//    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener {
+    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener {
-//
+
-//        @Override
+        @Override
-//        public void onBusRouteSearched(BusRouteResult busRouteResult, int i) {
+        public void onBusRouteSearched(BusRouteResult busRouteResult, int i) {
-//
+
-//        }
+        }
-//
+
-//        @Override
+        @Override
-//        public void onDriveRouteSearched(DriveRouteResult driveRouteResult, int rCode) {
+        public void onDriveRouteSearched(DriveRouteResult driveRouteResult, int rCode) {
-//            if (rCode == 1000) {//获取规划路线成功,获取到的是了,路线坐标点的集合
+            if (rCode == 1000) {//获取规划路线成功,获取到的是了,路线坐标点的集合
-//                List<DrivePath> paths = driveRouteResult.getPaths();
+                List<DrivePath> paths = driveRouteResult.getPaths();
-//                //创建存储坐标点的集合
+                //创建存储坐标点的集合
-//                List<LatLng> latLngs = new ArrayList<>();
+                List<LatLng> latLngs = new ArrayList<>();
-//                //遍历获取规划的所有路线坐标点
+                //遍历获取规划的所有路线坐标点
-//                for (DrivePath mDrivePath : paths) {
+                for (DrivePath mDrivePath : paths) {
-//                    for (DriveStep mDriveStep : mDrivePath.getSteps()) {
+                    for (DriveStep mDriveStep : mDrivePath.getSteps()) {
-//                        for (LatLonPoint mLatLonPoint : mDriveStep.getPolyline()) {
+                        for (LatLonPoint mLatLonPoint : mDriveStep.getPolyline()) {
-//                            latLngs.add(new
+                            latLngs.add(new
-//                                    LatLng(mLatLonPoint.getLatitude(), mLatLonPoint.getLongitude()));
+                                    LatLng(mLatLonPoint.getLatitude(), mLatLonPoint.getLongitude()));
-//                        }
+                        }
-//                    }
+                    }
-//                }
+                }
-//                //先清除一下,避免重复显示
+                //先清除一下,避免重复显示
-//                aMap.clear();
+                aMap.clear();
-//                //绘制起始位置和目的地marker
+                //绘制起始位置和目的地marker
-//                aMap.addMarker(new MarkerOptions()
+                aMap.addMarker(new MarkerOptions()
-//                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
+                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
-//                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
-//                                Double.parseDouble(sob.getData().getWayChildren().get(0).getLongitude()))));
+                                Double.parseDouble(sob.getData().getWayChildren().get(0).getLongitude()))));
-//                for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+                for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
-//                    if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+                    if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
-//                        StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+                        StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
-//                        int icon = 0;
+                        int icon = 0;
-//                        if (sdw.getType() == 1) {
+                        if (sdw.getType() == 1) {
-//                            icon = R.mipmap.z_loc;
+                            icon = R.mipmap.z_loc;
-//                        } else {
+                        } else {
-//                            icon = R.mipmap.x_loc;
+                            icon = R.mipmap.x_loc;
-//                        }
+                        }
-//                        aMap.addMarker(new MarkerOptions()
+                        aMap.addMarker(new MarkerOptions()
-//                                .icon(BitmapDescriptorFactory.fromResource(icon))
+                                .icon(BitmapDescriptorFactory.fromResource(icon))
-//                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()), Double.parseDouble(sdw.getLongitude()))));
+                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()), Double.parseDouble(sdw.getLongitude()))));
-//                    }
+                    }
-//                }
+                }
-//                aMap.addMarker(new MarkerOptions()
+                aMap.addMarker(new MarkerOptions()
-//                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
+                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
-//                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
-//                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()))));
+                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()))));
-//                //绘制规划路径路线
+                //绘制规划路径路线
-//                aMap.addPolyline(new PolylineOptions()
+                aMap.addPolyline(new PolylineOptions()
-//                        //路线坐标点的集合
+                        //路线坐标点的集合
-//                        .addAll(latLngs)
+                        .addAll(latLngs)
-//                        //线的宽度
+                        //线的宽度
-//                        .width(8)
+                        .width(8)
-//                        .color(getResources().getColor(R.color.theme_color)));
+                        .color(getResources().getColor(R.color.theme_color)));
-//                //设置画线的颜色
+                //设置画线的颜色
-//
+
-//                //显示完整包含所有marker地图路线
+                //显示完整包含所有marker地图路线
-//                LatLngBounds.Builder builder = LatLngBounds.builder();
+                LatLngBounds.Builder builder = LatLngBounds.builder();
-//                for (int i = 0; i < latLngs.size(); i++) {
+                for (int i = 0; i < latLngs.size(); i++) {
-//                    builder.include(latLngs.get(i));
+                    builder.include(latLngs.get(i));
-//                }
+                }
-//                //显示全部marker,第二个参数是四周留空宽度
+                //显示全部marker,第二个参数是四周留空宽度
-//                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 200));
+                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 200));
-//                LatLng latLng = new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+                LatLng latLng = new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
-//                        Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));//构造一个位置
+                        Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));//构造一个位置
-//                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 6));
+                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 6));
-//            }
+            }
-//        }
+        }
-//
+
-//        @Override
+        @Override
-//        public void onWalkRouteSearched(WalkRouteResult walkRouteResult, int i) {
+        public void onWalkRouteSearched(WalkRouteResult walkRouteResult, int i) {
-//
+
-//        }
+        }
-//
+
-//        @Override
+        @Override
-//        public void onRideRouteSearched(RideRouteResult rideRouteResult, int i) {
+        public void onRideRouteSearched(RideRouteResult rideRouteResult, int i) {
-//
+
-//        }
+        }
-//
+
-//    }
+    }
 
     public void up_traffic() {
 //        ShippingNoteInfo[] snis=new ShippingNoteInfo[1];
@@ -833,25 +730,4 @@ public class StartYunDanActivity extends BaseActivity {
 //        });
     }
 
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        mapView.onStart();
-    }
-
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mapView.onStop();
-    }
-
-
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        mapView.onDestroy();
-    }
-
 }

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

@@ -21,12 +21,14 @@ 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;
@@ -56,6 +58,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -121,6 +125,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                                     if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                                         customDialog.dismiss();
                                     }
+                                    EventBus.getDefault().post(new HomeWaybillEvent());
                                     Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
@@ -567,6 +572,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                     customDialog.dismiss();
                 }
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "装货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -602,6 +608,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
                     customDialog.dismiss();
                 }
+                EventBus.getDefault().post(new HomeWaybillEvent());
                 Log.e("上报安联", "卸货照片上传成功");
                 Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
                 finish();
@@ -641,6 +648,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 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();

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

@@ -140,8 +140,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
             new XPopup.Builder(con)
                     .dismissOnBackPressed(false)
                     .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/currency/#/",
+                    .asCustom(new AgreementAlert(con, "http://agreement.dahehuoyun.com/currency/#/",
-                            "https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
+                            "http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
                     .show();
         }
         Glide.with(con)

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

@@ -24,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
+import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;

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

@@ -73,9 +73,9 @@ public class SetupActivity extends BaseActivity {
         ConfigBean cb= ConfigParts.getConfigParts(con);
         if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
+            url1="http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
 //            url2=cb.getData().getPrivateUrl();
-            url2="https://agreement.dahehuoyun.com/currency/#/";
+            url2="http://agreement.dahehuoyun.com/currency/#/";
             kefu=cb.getData().getServiceMobile();
             url3=cb.getData().getSecurityUrl();
         }
@@ -123,12 +123,12 @@ public class SetupActivity extends BaseActivity {
             r8.setOnClickListener(v12 -> {
                 Intent in=new Intent(con,WebActivity.class);
                 in.putExtra("title","交易规则");
-                in.putExtra("url","https://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
+                in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
                 startActivity(in);
             });
             r6.setOnClickListener(v12 -> {
-                String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
+                String[] title={"平台客服:"+kefu};
-                String[] value={kefu,"95528","13460042961"};
+                String[] value={kefu};
                 new XPopup.Builder(con)
                         .isDarkTheme(false)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

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

@@ -13,6 +13,8 @@ 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;
@@ -47,7 +49,7 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
 
     private ImageView up_bank_img;
     private EditText bank_name, bank_number;
-    private TextView submit;
+    private TextView submit, skip;
     private ImageView return_btn;
     public GetImageAlert gia = new GetImageAlert();
     String path;
@@ -62,9 +64,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();
@@ -74,6 +76,11 @@ 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();
@@ -94,6 +101,13 @@ 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);
@@ -101,19 +115,31 @@ 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
@@ -178,6 +204,13 @@ 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/web/WebActivity.java

@@ -15,18 +15,26 @@ 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
@@ -38,9 +46,12 @@ public class WebActivity extends BaseActivity {
 
     private String url = "";
     private String title = "";
+    private int id = -1;
     private WebView wv;
     private TextView title_tv;
+    private ProgressBar progressBar;
     private  PaxWebChromeClient chromeClient;
+    private ToH5Bean toH5Bean;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -50,11 +61,15 @@ public class WebActivity extends BaseActivity {
         con=this;
         initHardwareAccelerate();
         wv = findViewById(R.id.wv);
+        progressBar = findViewById(R.id.progressBar);
         title_tv = findViewById(R.id.title);
         Intent in = getIntent();
         url = in.getExtras().getString("url");
         title = in.getExtras().getString("title");
-        chromeClient = new PaxWebChromeClient(this,null,null);
+        toH5Bean = (ToH5Bean)in.getSerializableExtra("ToH5Bean");
+        String carNumber = toH5Bean.getCarNumber();
+        id = in.getExtras().getInt("id");
+        chromeClient = new PaxWebChromeClient(this,progressBar,null);
         if ("咨询建议".equals(title)) {
             initOpinion();
         } else {
@@ -203,15 +218,39 @@ public class WebActivity extends BaseActivity {
 
         @JavascriptInterface
         public String getUserToken(){
-            Log.e("-token-",UserParts.getUser(con).getData().getToken());
+//            Log.e("-token-",UserParts.getUser(con).getData().getToken());
+//            return "woshitoken-androidfasdf";
             return UserParts.getUser(con).getData().getToken();
         }
 
+        @JavascriptInterface
+        public int getOrderId(){
+            return id;
+        }
+
+        @JavascriptInterface
+        public String getOrderinfo(){
+            return new Gson().toJson(toH5Bean);
+        }
+
         @JavascriptInterface
         public void isSuccess(){
             finish();
         }
+        @JavascriptInterface
+        public void isPdfSuccess(String pdfUrl){
+//            Toast.makeText(con, "签署成功", Toast.LENGTH_SHORT).show();
+//            EventBus.getDefault().post(new PdfResEvent(pdfUrl));
+            Intent intent = new Intent();
+            intent.putExtra("pdfUrl",pdfUrl);
+            setResult(RESULT_OK,intent);
+            finish();
+        }
 
+        @JavascriptInterface
+        public void isFail(){
+            finish();
+        }
     }
 
 

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

@@ -27,7 +27,8 @@ class MessageUtils {
         XPopup.Builder(ctx) //
             .hasNavigationBar(false)
             .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
-            .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{
+            .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object :
+                MessagePop.OnMyItemClickListener {
                 override fun onItemClick(startTime: String, endTime: String) {
                 }
             }))
@@ -38,14 +39,19 @@ class MessageUtils {
         XPopup.Builder(ctx) //
             .hasNavigationBar(false)
             .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象，推荐设置这个
-            .asCustom(MessagePop(ctx, message,message2).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{
+            .asCustom(MessagePop(ctx, message, message2).setOnMyItemClickListener(object :
+                MessagePop.OnMyItemClickListener {
                 override fun onItemClick(startTime: String, endTime: String) {
                 }
             }))
             .show()
     }
 
-    fun showSimCenPop(ctx: Context, message: String,onMyItemClickListener: SimCenterPop.OnMyItemClickListener){
+    fun showSimCenPop(
+        ctx: Context,
+        message: String,
+        onMyItemClickListener: SimCenterPop.OnMyItemClickListener
+    ) {
 
 //        XPopup.Builder(ctx) //
 //            .hasNavigationBar(false)
@@ -62,7 +68,35 @@ 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,6 +5,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
+import android.view.View;
 import android.webkit.PermissionRequest;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
@@ -38,12 +39,12 @@ public class PaxWebChromeClient extends WebChromeClient {
     @Override
     public void onProgressChanged(WebView view, int newProgress) {
         if (newProgress == 100) {
-            //bar.setVisibility(View.INVISIBLE);
+            bar.setVisibility(View.INVISIBLE);
         } else {
-//            if (View.INVISIBLE == bar.getVisibility()) {
+            if (View.INVISIBLE == bar.getVisibility()) {
-//                bar.setVisibility(View.VISIBLE);
+                bar.setVisibility(View.VISIBLE);
-//            }
+            }
-//            bar.setProgress(newProgress);
+            bar.setProgress(newProgress);
         }
         super.onProgressChanged(view, newProgress);
     }

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

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

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

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

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

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

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

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

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

@@ -4,12 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-<!--    <com.amap.api.maps.MapView-->
+    <com.amap.api.maps.MapView
-<!--        android:id="@+id/map"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="match_parent"/>-->
-
-    <com.lk.mapsdk.map.mapapi.map.MapView
         android:id="@+id/map"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

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

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

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

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

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

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

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

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

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

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

build.gradle

@@ -12,7 +12,6 @@ buildscript {
         maven {
             url 'https://maven.aliyun.com/repository/releases'
         }
-        maven { url 'http://lbs-sdk.luokuang.com/repository/maven-releases/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.2'
@@ -32,7 +31,6 @@ allprojects {
         maven {
             url 'https://maven.aliyun.com/repository/releases'
         }
-        maven { url 'http://lbs-sdk.luokuang.com/repository/maven-releases/' }
     }
 }
 

mylibrary/build.gradle

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