webview添加loading

电子签1版
取消运单优化
2024-09-09 15:51:39 +08:00 · 2024-09-09 14:57:02 +08:00 · 2024-09-04 16:05:05 +08:00 · 2024-09-04 09:23:31 +08:00 · 2024-08-27 09:27:30 +08:00
18 changed files with 702 additions and 140 deletions
@@ -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;
+    }
+}
@@ -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"
@@ -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() {
+
+    }
+}
@@ -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;
+    }
+}
@@ -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<>();
@@ -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);
-                            in.putExtra("index", 1);
-                            startActivity(in);
+//                            Intent in = new Intent(con, CertificatesActivity.class);
+//                            in.putExtra("index", 1);
+//                            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);
-                        in1.putExtra("index", 1);
-                        startActivity(in1);
+//                        Intent in1 = new Intent(con, CertificatesActivity.class);
+//                        in1.putExtra("index", 1);
+//                        startActivity(in1);
+
+                        //上传身份证信息后 跳转上传银行卡信息页面
+                        Intent in333=new Intent(con, UpBankActivity.class);
+                        in333.putExtra("type",1);
+                        startActivity(in333);
                        break;
                    case 1:
                        //传驾驶证信息页面 跳转实名认证
@@ -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())||
-                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl())||!TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl())||
+                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl()) ||
+                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl()) ||
                                !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) {
                            new XToast<>(act)
                                    .setContentView(R.layout.view_bc)
@@ -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();
@@ -901,26 +1037,16 @@ public class HomeFragment extends BaseFragment {

    public void initAlct() {
        PermissionX.init(getActivity())
-                .permissions(Manifest.permission.ACCESS_FINE_LOCATION,
-                        Manifest.permission.ACCESS_COARSE_LOCATION,
-                        Manifest.permission.ACCESS_BACKGROUND_LOCATION,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.CALL_PHONE,
-                        Manifest.permission.RECORD_AUDIO,
-                        Manifest.permission.CAMERA)
+                        Manifest.permission.RECORD_AUDIO)
                .request((allGranted, grantedList, deniedList) -> {
-                    boolean isHasLocation = false;
-                    boolean isHasStor = false;
-                    for (int i = 0; i < grantedList.size(); i++) {
-                        if (grantedList.get(i).equals(Manifest.permission.ACCESS_FINE_LOCATION)){
-                            isHasLocation = true;
+                    if (allGranted) {
+
+                    } else {
+
                    }
-                        if (grantedList.get(i).equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)){
-                            isHasStor = true;
-                        }
-                    }
-                    if (isHasLocation&&isHasStor){
+                });
        ALProcess.verification(con);
        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
            @Override
@@ -933,17 +1059,6 @@ public class HomeFragment extends BaseFragment {
                Log.e("--失败信息--", s + s1);
            }
        });
-                    }else {
-                        if (!isHasLocation){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-定位-始终允许", Toast.LENGTH_SHORT).show();
-                            return;
-                        }
-                        if (!isHasStor){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-媒体与文件-仅媒体", Toast.LENGTH_SHORT).show();
-                        }
-                    }
-                });
-
    }

    private MyLocationStyle myLocationStyle;//地图定位样式
@@ -1019,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;
@@ -29,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;
@@ -154,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;
@@ -436,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();
+        }
+    }
+
    /**
     * 接单
     * 先判断安联用户信息验证，随后接单
@@ -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();
@@ -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;
        }
    }
 }
@@ -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();
+        }
    }


@@ -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()

    }
@@ -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()) {
-//                bar.setVisibility(View.VISIBLE);
-//            }
-//            bar.setProgress(newProgress);
+            if (View.INVISIBLE == bar.getVisibility()) {
+                bar.setVisibility(View.VISIBLE);
+            }
+            bar.setProgress(newProgress);
        }
        super.onProgressChanged(view, newProgress);
    }
@@ -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>
@@ -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"/>
-            <TextView
-                android:layout_marginTop="@dimen/dp_10"
-                android:id="@+id/submit"
-                android:layout_marginRight="@dimen/dp_30"
-                android:layout_alignParentRight="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="提交"
-                android:textColor="@color/theme_color"
-                android:textSize="@dimen/sp_15"
-                />
+                android:scaleType="fitXY"
+                android:src="@mipmap/return_lefts" />
+
+<!--            <TextView-->
+<!--                android:id="@+id/skip"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="@dimen/dp_10"-->
+<!--                android:layout_marginRight="@dimen/dp_30"-->
+<!--                android:layout_toLeftOf="@+id/submit"-->
+<!--                android:text="跳过"-->
+<!--                android:textColor="@color/theme_color"-->
+<!--                android:textSize="@dimen/sp_15"-->
+<!--                android:visibility="gone" />-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/submit"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_alignParentRight="true"-->
+<!--                android:layout_marginTop="@dimen/dp_10"-->
+<!--                android:layout_marginRight="@dimen/dp_30"-->
+<!--                android:text="提交"-->
+<!--                android:textColor="@color/theme_color"-->
+<!--                android:textSize="@dimen/sp_15" />-->
        </RelativeLayout>
+
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -41,47 +57,52 @@
            android:text="银行卡信息"
            android:textColor="#ff000000"
            android:textSize="@dimen/sp_23" />
+
        <TextView
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_20"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:textColor="@color/red"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_20"
            android:text="*注意: 请添加本人银行卡, 否则无法提现成功"
-            ></TextView>
+            android:textColor="@color/red"></TextView>

        <androidx.cardview.widget.CardView
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginRight="@dimen/dp_38"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_163"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginRight="@dimen/dp_38"
            app:cardCornerRadius="@dimen/dp_10">
+
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent">
+
                <ImageView
-                    android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true"
                    android:id="@+id/up_bank_img"
-                    android:src="@mipmap/bank_img"
                    android:layout_width="@dimen/dp_249"
                    android:layout_height="@dimen/dp_138"
-                    android:scaleType="fitXY"/>
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/bank_img" />
+
                <TextView
-                    android:layout_marginBottom="@dimen/dp_21"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:text="点击上传银行卡正面照"
+                    android:layout_alignParentBottom="true"
                    android:layout_centerHorizontal="true"
-                    android:layout_alignParentBottom="true"/>
+                    android:layout_marginBottom="@dimen/dp_21"
+                    android:text="点击上传银行卡正面照" />
            </RelativeLayout>
        </androidx.cardview.widget.CardView>
+
        <LinearLayout
-            android:layout_marginTop="@dimen/dp_15"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_15"
            android:orientation="horizontal">
+
            <TextView
                android:id="@+id/zj_name2"
                android:layout_width="wrap_content"
@@ -92,85 +113,122 @@
                android:textColor="#ffc4c4ce"
                android:textSize="@dimen/sp_13" />
        </LinearLayout>
+
        <LinearLayout
-            android:layout_marginTop="@dimen/dp_13"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_13"
            android:layout_marginRight="@dimen/dp_38"
-            android:padding="@dimen/dp_14"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
            android:background="@drawable/bg_bai"
-            android:elevation="@dimen/dp_1">
-            <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
-                android:id="@+id/brv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            android:elevation="@dimen/dp_1"
+            android:orientation="vertical"
+            android:padding="@dimen/dp_14">
+
+<!--            <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView-->
+<!--                android:id="@+id/brv"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content" />-->
+
            <LinearLayout
-                android:layout_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:textSize="@dimen/sp_13"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:inputType="text"
+                    android:layout_alignParentRight="true"
                    android:layout_marginLeft="@dimen/dp_30"
                    android:background="@null"
-                    />
+                    android:ellipsize="end"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/dp_10"
+                    android: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:textSize="@dimen/sp_13"
-                    android:inputType="number"
-                    android:maxLines="1"
-                    android:ellipsize="end"
+                    android:layout_alignParentRight="true"
                    android:layout_marginLeft="@dimen/dp_30"
                    android:background="@null"
+                    android:ellipsize="end"
+                    android:inputType="number"
+                    android:maxLines="1"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/dp_10"
+                    android:textColor="#ff000000"
+                    android:textSize="@dimen/sp_13" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
            />
-            </LinearLayout>
-        </LinearLayout>
+
+        <Button
+            android:id="@+id/skip"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_42"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginRight="@dimen/dp_38"
+            android:background="@drawable/bg_btn_grey"
+            android:text="跳过"
+            android:textColor="#fff"
+            android:textSize="@dimen/sp_15" />
+
+        <Button
+            android:id="@+id/submit"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_42"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginTop="@dimen/dp_22"
+            android:layout_marginRight="@dimen/dp_38"
+            android:layout_marginBottom="@dimen/dp_50"
+            android:background="@drawable/bg_btn_green"
+            android:text="下一步"
+            android:textColor="#fff"
+            android:textSize="@dimen/sp_15" />
    </LinearLayout>

 </RelativeLayout>
@@ -3,11 +3,24 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
-    <WebView
+
+    <RelativeLayout
        android:layout_marginTop="@dimen/dp_88"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <WebView
            android:id="@+id/wv"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:visibility="invisible"
+            android:layout_alignParentTop="true" />
+    </RelativeLayout>
+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -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"
@@ -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'
Author	SHA1	Message	Date
lijia	4ac0511f08	webview添加loading	2024-09-09 15:51:39 +08:00
lijia	1d9e8baed8	电子签1版	2024-09-09 14:57:02 +08:00
lijia	d385764b56	取消运单优化	2024-09-04 16:05:05 +08:00
lijia	eeadd1d196	首页添加执行中运单跳转功能	2024-09-04 09:23:31 +08:00
lijia	0e9224a034	用户注册添加银行卡逻辑，首页添加银行卡提示入口	2024-08-27 09:27:30 +08:00