首页权限优化

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -29,10 +29,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.H5Activity;
 import com.arpa.hndahesudintocctmsdriver.bean.JTT;
-import com.arpa.hndahesudintocctmsdriver.bean.ToH5Bean;
 import com.arpa.hndahesudintocctmsdriver.event.FaceEvent;
 import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
-import com.arpa.hndahesudintocctmsdriver.event.PdfResEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
@@ -156,20 +154,8 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         .asConfirm("请确认接单", "是否确定承运此运单？",
                                 "取消", "确认",
                                 () -> {
-                                    ToH5Bean toH5Bean = new ToH5Bean();
-                                    toH5Bean.setId(id);
-                                    toH5Bean.setCarNumber(car.getText().toString().substring("选择车辆:".length()));
-                                    toH5Bean.setCarId(cid);
                                     Log.e("--id--", "cid:" + cid + "---wid:" + id);
-                                    Intent in = new Intent(con, WebActivity.class);
+                                    hyr.confirm(cid, id);
-                                    in.putExtra("url", "https://platform.test.dahehuoyun.com/contract/dist/#/contracttemplate");
-                                    in.putExtra("id", id);
-                                    in.putExtra("ToH5Bean",toH5Bean);
-                                    in.putExtra("title", "合同签署");
-//                                    startActivity(in);
-
-                                    startActivityForResult(in,1);
-
                                 }, () -> customDialog.dismiss(), false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
                         .show();
                 break;
@@ -450,22 +436,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
         }
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == RESULT_OK&&requestCode==1){
-            //签合同后接单
-//            String pdfUrl = data.getStringExtra("pdfUrl");
-//            hyr.confirm(cid,pdfUrl, id);
-
-            UiAuxiliary.homeRequest("接单");
-            Intent in = new Intent(con, StartYunDanActivity.class);
-            in.putExtra("id", "0");
-            startActivity(in);
-            finish();
-        }
-    }
-
     /**
      * 接单
      * 先判断安联用户信息验证，随后接单

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

@@ -21,14 +21,12 @@ import com.alct.mdp.model.Image;
 import com.alct.mdp.model.Location;
 import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
-import com.arpa.hndahesudintocctmsdriver.event.HomeWaybillEvent;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
 import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
-import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
@@ -58,8 +56,6 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -125,7 +121,6 @@ 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();
                                 }
@@ -572,7 +567,6 @@ 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();
@@ -608,7 +602,6 @@ 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();
@@ -648,8 +641,6 @@ 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/wallet/UpBankActivity.java

@@ -13,8 +13,6 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
 import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickListener;
 import com.bumptech.glide.Glide;
@@ -49,7 +47,7 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
 
     private ImageView up_bank_img;
     private EditText bank_name, bank_number;
-    private TextView submit, skip;
+    private TextView submit;
     private ImageView return_btn;
     public GetImageAlert gia = new GetImageAlert();
     String path;
@@ -64,9 +62,9 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("OCR_BANK") != null) {
                     ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class);
-                    customDialog.dismiss();
                     if (ib.getCode() == 200) {
                         initView(null);
+                        customDialog.dismiss();
                         WalletFragment.isInsBank = true;
                     } else {
                         Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show();
@@ -76,11 +74,6 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
                 if (CacheGroup.cacheList.get("insBank") != null) {
                     BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class);
                     if (bb.getCode() == 200) {
-                        if (type == 1) {
-                            Intent in = new Intent(con, CertificatesActivity.class);
-                            in.putExtra("index", 1);
-                            startActivity(in);
-                        }
                         customDialog.dismiss();
                         Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
                         finish();
@@ -101,13 +94,6 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
 
     private CustomDialog customDialog;
 
-
-    /**
-     * 1：司机注册自动跳转
-     * 0：钱包添加银行卡
-     */
-    private int type = 0;
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,31 +101,19 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
         setContentView(R.layout.activity_bank_auth);
         act = this;
         con = this;
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            type = getIntent().getExtras().getInt("type");
-        }
         up_bank_img = findViewById(R.id.up_bank_img);
         bank_name = findViewById(R.id.bank_name);
         bank_number = findViewById(R.id.bank_number);
         submit = findViewById(R.id.submit);
-        skip = findViewById(R.id.skip);
         return_btn = findViewById(R.id.return_btn);
         qr = new WalletRequest(con, hd);
         up_bank_img.setOnClickListener(v -> {
             gia.showPopueWindow(this);
         });
         submit.setOnClickListener(new OnLimitClickHelper(this));
-        skip.setOnClickListener(new OnLimitClickHelper(this));
         return_btn.setOnClickListener(v -> {
             finish();
         });
-
-        if (type == 1) {
-            skip.setVisibility(View.VISIBLE);
-        } else {
-            skip.setVisibility(View.GONE);
-        }
     }
 
     @Override
@@ -204,13 +178,6 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
                     Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show();
                 }
                 break;
-            case R.id.skip:
-                new MessageUtils().showSimCenPop(con, "确定跳过银行卡?，可能会导致运费无法结算！","取消","确认", () -> {
-                    Intent in = new Intent(con, CertificatesActivity.class);
-                    in.putExtra("index", 1);
-                    startActivity(in);
-                });
-                break;
         }
     }
 }

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

@@ -15,26 +15,18 @@ import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.R;
-import com.arpa.hndahesudintocctmsdriver.bean.ToH5Bean;
 import com.arpa.hndahesudintocctmsdriver.bean.UserBean;
-import com.arpa.hndahesudintocctmsdriver.event.PdfResEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.util.PaxWebChromeClient;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
-import com.google.gson.Gson;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.io.Serializable;
 
 /**
  * @author hlh
@@ -46,12 +38,9 @@ public class WebActivity extends BaseActivity {
 
     private String url = "";
     private String title = "";
-    private int id = -1;
     private WebView wv;
     private TextView title_tv;
-    private ProgressBar progressBar;
     private  PaxWebChromeClient chromeClient;
-    private ToH5Bean toH5Bean;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -61,15 +50,11 @@ public class WebActivity extends BaseActivity {
         con=this;
         initHardwareAccelerate();
         wv = findViewById(R.id.wv);
-        progressBar = findViewById(R.id.progressBar);
         title_tv = findViewById(R.id.title);
         Intent in = getIntent();
         url = in.getExtras().getString("url");
         title = in.getExtras().getString("title");
-        toH5Bean = (ToH5Bean)in.getSerializableExtra("ToH5Bean");
+        chromeClient = new PaxWebChromeClient(this,null,null);
-        String carNumber = toH5Bean.getCarNumber();
-        id = in.getExtras().getInt("id");
-        chromeClient = new PaxWebChromeClient(this,progressBar,null);
         if ("咨询建议".equals(title)) {
             initOpinion();
         } else {
@@ -218,39 +203,15 @@ public class WebActivity extends BaseActivity {
 
         @JavascriptInterface
         public String getUserToken(){
-//            Log.e("-token-",UserParts.getUser(con).getData().getToken());
+            Log.e("-token-",UserParts.getUser(con).getData().getToken());
-//            return "woshitoken-androidfasdf";
             return UserParts.getUser(con).getData().getToken();
         }
 
-        @JavascriptInterface
-        public int getOrderId(){
-            return id;
-        }
-
-        @JavascriptInterface
-        public String getOrderinfo(){
-            return new Gson().toJson(toH5Bean);
-        }
-
         @JavascriptInterface
         public void isSuccess(){
             finish();
         }
-        @JavascriptInterface
-        public void isPdfSuccess(String pdfUrl){
-//            Toast.makeText(con, "签署成功", Toast.LENGTH_SHORT).show();
-//            EventBus.getDefault().post(new PdfResEvent(pdfUrl));
-            Intent intent = new Intent();
-            intent.putExtra("pdfUrl",pdfUrl);
-            setResult(RESULT_OK,intent);
-            finish();
-        }
 
-        @JavascriptInterface
-        public void isFail(){
-            finish();
-        }
     }
 
 

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

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

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

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

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

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

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

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

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

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

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

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

mylibrary/build.gradle

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