From f37ffa779aec1c7a27bc62852b6bafc337df82f2 Mon Sep 17 00:00:00 2001 From: lijia Date: Sat, 7 Oct 2023 11:24:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E4=BC=A0=E7=B1=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/HuoYuanRequset.java | 5 + .../request/RequestConstant.java | 320 ++++++++++-------- .../request/bean/LUInputBean.java | 9 + .../shangchuan/ShangChuangImgActivityBC.java | 70 ++-- 4 files changed, 231 insertions(+), 173 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java index 4bb9936..63191f9 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java @@ -89,6 +89,11 @@ public class HuoYuanRequset{ Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING(), gson.toJson(lub)),getToken(con),con); RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd); } + //卸货-补传 + public void dischargeCargo4(LUInputBean lub){ + Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING4(), gson.toJson(lub)),getToken(con),con); + RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd); + } //回单 public void receipt(UploadReceiptInputBean urib){ Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUploadReceipt(), gson.toJson(urib)),getToken(con),con); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/RequestConstant.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/RequestConstant.java index f6b2e99..667c842 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/RequestConstant.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/RequestConstant.java @@ -4,197 +4,199 @@ import com.arpa.hndahesudintocctmsdriver.BuildConfig; public class RequestConstant { - public static String TOKEN="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzA0MDE3OTIsInVzZXJJZCI6ODAsImlhdCI6MTYyNzcyMzM5Mn0.f9Q-UZVduW6nt1s0L-3vYsrOJJ8iuSCSlJ9uu8yIxBI"; + public static String TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzA0MDE3OTIsInVzZXJJZCI6ODAsImlhdCI6MTYyNzcyMzM5Mn0.f9Q-UZVduW6nt1s0L-3vYsrOJJ8iuSCSlJ9uu8yIxBI"; //域名地址http://request.one-clouds.com/api https://huoyun.mzxd56.com/api http://app.dahehuoyun.com/api public static String BASE_URL = BuildConfig.BASE_URL; //版本更新/app/check/version - public static String VERSION ="/app/check/version"; + public static String VERSION = "/app/check/version"; //全部代码 - public static String CODE_DATA ="/common/dic/listdata"; + public static String CODE_DATA = "/common/dic/listdata"; //短信验证码 private static final String SEND_CODE = "/common/sendcode"; //登录 - private static final String REG="/common/register"; + private static final String REG = "/common/register"; //注册 - private static final String LOGIN="/common/register"; + private static final String LOGIN = "/common/register"; //上传文件 - private static final String UPLOAD="/common/resource/upload"; + private static final String UPLOAD = "/common/resource/upload"; //配置项信息 - private static final String CONFIG="/common/config/list"; + private static final String CONFIG = "/common/config/list"; //获取开屏页图片和轮播图 - private static final String GET_IMAGE="/common/resource/image/config"; + private static final String GET_IMAGE = "/common/resource/image/config"; //司机认证信息 - private static final String DRIVER_AUTH_INFO="/app/driver/auth/authInfo"; + private static final String DRIVER_AUTH_INFO = "/app/driver/auth/authInfo"; //货源大厅 - private static final String GOODS_HALL="/app/driver/order/getHallList"; + private static final String GOODS_HALL = "/app/driver/order/getHallList"; //历史成交货源 - private static final String GET_EXAMPLE_LIST="/app/driver/order/getExampleList"; + private static final String GET_EXAMPLE_LIST = "/app/driver/order/getExampleList"; //货源详情 - private static final String GOODS_DEL="/app/driver/order/findOrderInfoV2"; + private static final String GOODS_DEL = "/app/driver/order/findOrderInfoV2"; //账户信息 - private static final String USER="/app/user/getUserInfo"; + private static final String USER = "/app/user/getUserInfo"; //银行卡列表 - private static final String BANK_CARD_LIST="/app/bankCard/findPage"; + private static final String BANK_CARD_LIST = "/app/bankCard/findPage"; //绑定银行卡 - private static final String INS_BANKCARD="/app/bankCard/bandCard"; -// private static final String INS_BANKCARD="/app/bankCard/save"; + private static final String INS_BANKCARD = "/app/bankCard/bandCard"; + // private static final String INS_BANKCARD="/app/bankCard/save"; //删除银行卡 // private static final String DELETE_BANKCARD="/app/bankCard/deleteCard"; - private static final String DELETE_BANKCARD="/app/bankCard/unBandCard"; + private static final String DELETE_BANKCARD = "/app/bankCard/unBandCard"; //生成电子账户 - private static final String ADD_CONTRACTS="/app/bank/addContracts"; + private static final String ADD_CONTRACTS = "/app/bank/addContracts"; //获取电子账户 - private static final String GET_CONTRACTS="/app/bank/getContracts"; + private static final String GET_CONTRACTS = "/app/bank/getContracts"; //获取账户未读消息 - private static final String XIAOXI_LIST="/app/message/findCurrentUserNotReadCount"; + private static final String XIAOXI_LIST = "/app/message/findCurrentUserNotReadCount"; //获取账户消息 - private static final String XIAOXI_ALL="/app/message/findPage"; + private static final String XIAOXI_ALL = "/app/message/findPage"; //已读消息 - private static final String XIAOXI_DEL="/app/message/setReadById"; + private static final String XIAOXI_DEL = "/app/message/setReadById"; //已读全部消息 - private static final String XIAOXI_DEL_ALL="/app/message/setReadAll"; + private static final String XIAOXI_DEL_ALL = "/app/message/setReadAll"; //运单列表 - private static final String ORDER_LIST="/app/driver/waybill/listV2"; + private static final String ORDER_LIST = "/app/driver/waybill/listV2"; //抢单 - private static final String AGREE_ORDER="/app/driver/waybill/grabDriverOrdersContruct"; + private static final String AGREE_ORDER = "/app/driver/waybill/grabDriverOrdersContruct"; //获取正在执行的运单/运单详情 - private static final String GET_START_ORDER="/app/driver/waybill/getExecuteWaybill"; + private static final String GET_START_ORDER = "/app/driver/waybill/getExecuteWaybill"; //查看承运合同 - private static final String GET_CARRY_CONTRACT="/common/appContract/findCarrierContract"; + private static final String GET_CARRY_CONTRACT = "/common/appContract/findCarrierContract"; //评价信息保存 - private static final String EVALUATIONV2="/app/driver/waybill/evaluationV2"; + private static final String EVALUATIONV2 = "/app/driver/waybill/evaluationV2"; //装货 - private static final String LOADING="/app/driver/waybill/loadingV2"; + private static final String LOADING = "/app/driver/waybill/loadingV2"; //卸货 - private static final String UNLOADING="/app/driver/waybill/unloadV2"; + private static final String UNLOADING = "/app/driver/waybill/unloadV2"; + //卸货-补传 + private static final String UNLOADING4 = "/app/driver/waybill/unloadV4"; //上传回单 - private static final String UPLOAD_RECEIPT="/app/driver/waybill/uploadReceipt"; + private static final String UPLOAD_RECEIPT = "/app/driver/waybill/uploadReceipt"; //轨迹跟踪 - private static final String TRACK_TRACKING="/app/driver/waybill/addAppLocation"; + private static final String TRACK_TRACKING = "/app/driver/waybill/addAppLocation"; //获取评价信息 - private static final String GET_EVALUATE="/app/driver/waybill/listAppraises"; + private static final String GET_EVALUATE = "/app/driver/waybill/listAppraises"; //获取投诉信息 - private static final String GET_COMPLAINT="/app/driver/waybill/listComplaint"; + private static final String GET_COMPLAINT = "/app/driver/waybill/listComplaint"; //保存投诉信息 - private static final String COMPLAINT="/app/driver/waybill/complaintV2"; + private static final String COMPLAINT = "/app/driver/waybill/complaintV2"; //保存评价信息 - private static final String EVALUATION_V2="/app/driver/waybill/evaluationV2"; + private static final String EVALUATION_V2 = "/app/driver/waybill/evaluationV2"; //车辆列表 - private static final String GET_CAR_LIST="/app/carDriver/getCarList"; + private static final String GET_CAR_LIST = "/app/carDriver/getCarList"; //车辆详情 - private static final String GET_CAR_DEL="/app/carDriver/getCarInfo"; + private static final String GET_CAR_DEL = "/app/carDriver/getCarInfo"; //删除车辆 - private static final String DEL_CAR="/app/carDriver/removeCar"; + private static final String DEL_CAR = "/app/carDriver/removeCar"; //上传车辆照片 - private static final String SAVECARIMG="/app/carDriver/saveCarImg"; + private static final String SAVECARIMG = "/app/carDriver/saveCarImg"; //上传头像保存 - private static final String UPLOAD_HEAD="/app/user/uploadHeadportrait"; + private static final String UPLOAD_HEAD = "/app/user/uploadHeadportrait"; //获取上传失败的订单 - private static final String GET_ERROR_ORDER="/app/driver/waybill/getAsymmetryWaybill"; + private static final String GET_ERROR_ORDER = "/app/driver/waybill/getAsymmetryWaybill"; //提现 - private static final String TIXIAN="/app/account/cashApply/bank/charge"; + private static final String TIXIAN = "/app/account/cashApply/bank/charge"; //--ORC识别-- //银行卡识别 - private static final String ORC_BANK="/common/ocr/bank"; + private static final String ORC_BANK = "/common/ocr/bank"; //身份证正面 - private static final String ID_CARD_FRONT="/common/ocr/idCardFront"; + private static final String ID_CARD_FRONT = "/common/ocr/idCardFront"; //身份证识别反面 - private static final String ID_CARD_BACK="/common/ocr/idCardBack"; + private static final String ID_CARD_BACK = "/common/ocr/idCardBack"; //驾驶证正面 - private static final String DRIVING_LICENSE="/common/ocr/drivingLicense"; + private static final String DRIVING_LICENSE = "/common/ocr/drivingLicense"; //驾驶证副页 - private static final String DRIVING_LICENSE_BACK="/common/ocr/drivingLicenseBack"; + private static final String DRIVING_LICENSE_BACK = "/common/ocr/drivingLicenseBack"; //行驶证正面 - private static final String VEHICLE_LICENSE="/common/ocr/vehicleLicense"; + private static final String VEHICLE_LICENSE = "/common/ocr/vehicleLicense"; //行驶证副页 - private static final String VEHICLE_LICENSE_BACK="/common/ocr/v2/vehicleBackLicenseV3"; + private static final String VEHICLE_LICENSE_BACK = "/common/ocr/v2/vehicleBackLicenseV3"; //身份证认证信息 - private static final String ISAUTH_IDCARD="/app/driver/auth/isAuthIdCard"; + private static final String ISAUTH_IDCARD = "/app/driver/auth/isAuthIdCard"; //驾驶证认证信息 - private static final String ISAUTH_DRIVERAUTH_LICENSE="/app/driver/auth/isAuthDriverAuthLicense"; + private static final String ISAUTH_DRIVERAUTH_LICENSE = "/app/driver/auth/isAuthDriverAuthLicense"; //资格证认证信息 - private static final String IS_AUTH_DRIVER_AUTH_QUALIFICATION="/app/driver/auth/isAuthDriverAuthQualification"; + private static final String IS_AUTH_DRIVER_AUTH_QUALIFICATION = "/app/driver/auth/isAuthDriverAuthQualification"; //行驶证认证信息 //身份证认证 - private static final String DRIVERAUTHIDCARD="/app/driver/auth/driverAuthIdCard"; + private static final String DRIVERAUTHIDCARD = "/app/driver/auth/driverAuthIdCard"; //驾驶证认证 - private static final String DRIVERAUTHLICENSE="/app/driver/auth/driverAuthLicense"; + private static final String DRIVERAUTHLICENSE = "/app/driver/auth/driverAuthLicense"; //行驶证认证 - private static final String SAVEVEHICLELICENSE="/app/carDriver/saveVehicleLicense"; + private static final String SAVEVEHICLELICENSE = "/app/carDriver/saveVehicleLicense"; //从业资格证认证 - private static final String DRIVER_AUTH_QUALIFICATION="/app/driver/auth/driverAuthQualification"; + private static final String DRIVER_AUTH_QUALIFICATION = "/app/driver/auth/driverAuthQualification"; //车辆等级证书 - private static final String DRIVER_AUTH_SAVECARREGISTERNO="/app/carDriver/saveCarRegisterNo"; + private static final String DRIVER_AUTH_SAVECARREGISTERNO = "/app/carDriver/saveCarRegisterNo"; //道路运输信息 - private static final String DRIVER_AUTH_SAVECARROADLICENSENO="/app/carDriver/saveCarRoadLicenseNo"; + private static final String DRIVER_AUTH_SAVECARROADLICENSENO = "/app/carDriver/saveCarRoadLicenseNo"; //党员认证 - private static final String PARTY_MEMBER="/app/user/partyMember"; + private static final String PARTY_MEMBER = "/app/user/partyMember"; //实名认证 - private static final String AUTH_URL="/app/driver/auth/getAuthUrl"; + private static final String AUTH_URL = "/app/driver/auth/getAuthUrl"; //车牌号 - private static final String PLATE_LICENSE="/common/ocr/plateLicense"; + private static final String PLATE_LICENSE = "/common/ocr/plateLicense"; //车牌号2 - private static final String PLATE_LICENSE2="/common/aliyun/ocr/RecognizeCarNumber"; + private static final String PLATE_LICENSE2 = "/common/aliyun/ocr/RecognizeCarNumber"; //添加挂车 - private static final String SAVE_DRAW_CAR="/app/carDriver/saveDrawCar"; + private static final String SAVE_DRAW_CAR = "/app/carDriver/saveDrawCar"; //提现记录 - private static final String CHANGE_RECORD="/app/account/change/record"; + private static final String CHANGE_RECORD = "/app/account/change/record"; //提现手续费 - private static final String WITHDRAWALS_CHARGE="/app/account/withdrawals/charge"; + private static final String WITHDRAWALS_CHARGE = "/app/account/withdrawals/charge"; //提现配置信息 - private static final String WITHDRAWALS_CONFIG="/app/account/withdrawals/config"; + private static final String WITHDRAWALS_CONFIG = "/app/account/withdrawals/config"; //获取车辆颜色 - private static final String CAR_COLOR="/app/common/carColorTypeList"; + private static final String CAR_COLOR = "/app/common/carColorTypeList"; //获取车辆颜色 - private static final String CAR_ENERGYTYPE="/app/common/carEnergyTypeList"; + private static final String CAR_ENERGYTYPE = "/app/common/carEnergyTypeList"; //车辆自动审核触发器 - private static final String CAR_AUDIT="/app/carDriver/carAutomaticAudit"; + private static final String CAR_AUDIT = "/app/carDriver/carAutomaticAudit"; - public static String getCarAudit(){ - return BASE_URL +CAR_AUDIT; + public static String getCarAudit() { + return BASE_URL + CAR_AUDIT; } - public static String getCarColor(){ - return BASE_URL +CAR_COLOR; + public static String getCarColor() { + return BASE_URL + CAR_COLOR; } - public static String getCarEnergyType(){ + public static String getCarEnergyType() { return BASE_URL + CAR_ENERGYTYPE; } //app/driver/auth/driverExpire - public static final String GET_CERTIFICATE_EXPIRED="/app/driver/auth/driverExpire"; + public static final String GET_CERTIFICATE_EXPIRED = "/app/driver/auth/driverExpire"; public static String getSendCodeUrl() { - return BASE_URL +SEND_CODE; + return BASE_URL + SEND_CODE; } public static String getREGUrl() { - return BASE_URL +REG; + return BASE_URL + REG; } public static String getLoginUrl() { - return BASE_URL +LOGIN; + return BASE_URL + LOGIN; } public static String getDriverAuthInfoUrl() { - return BASE_URL +DRIVER_AUTH_INFO; + return BASE_URL + DRIVER_AUTH_INFO; } public static String getGoodsHallUrl() { - return BASE_URL +GOODS_HALL; + return BASE_URL + GOODS_HALL; } public static String getGoodsDelUrl() { - return BASE_URL +GOODS_DEL; + return BASE_URL + GOODS_DEL; } public static String getUserUrl() { @@ -209,201 +211,239 @@ public class RequestConstant { return BASE_URL + BANK_CARD_LIST; } - public static String getXiaoXiListUrl() { return BASE_URL + XIAOXI_LIST; } + public static String getXiaoXiListUrl() { + return BASE_URL + XIAOXI_LIST; + } - public static String getXiaoxiAll() { return BASE_URL +XIAOXI_ALL; } + public static String getXiaoxiAll() { + return BASE_URL + XIAOXI_ALL; + } public static String getOrderList() { - return BASE_URL +ORDER_LIST; + return BASE_URL + ORDER_LIST; } public static String getAgreeOrder() { - return BASE_URL +AGREE_ORDER; + return BASE_URL + AGREE_ORDER; } public static String getGetStartOrder() { - return BASE_URL +GET_START_ORDER; + return BASE_URL + GET_START_ORDER; } public static String getGetCarryContract() { - return BASE_URL +GET_CARRY_CONTRACT; + return BASE_URL + GET_CARRY_CONTRACT; } public static String getEVALUATIONV2() { - return BASE_URL +EVALUATIONV2; + return BASE_URL + EVALUATIONV2; } public static String getLOADING() { - return BASE_URL +LOADING; + return BASE_URL + LOADING; } public static String getUNLOADING() { - return BASE_URL +UNLOADING; + return BASE_URL + UNLOADING; + } + + public static String getUNLOADING4() { + return BASE_URL + UNLOADING4; } public static String getGetEvaluate() { - return BASE_URL +GET_EVALUATE; + return BASE_URL + GET_EVALUATE; } public static String getGetComplaint() { - return BASE_URL +GET_COMPLAINT; + return BASE_URL + GET_COMPLAINT; } public static String getOrcBank() { - return BASE_URL +ORC_BANK; + return BASE_URL + ORC_BANK; } public static String getIdCardFront() { - return BASE_URL +ID_CARD_FRONT; + return BASE_URL + ID_CARD_FRONT; } public static String getIdCardBack() { - return BASE_URL +ID_CARD_BACK; + return BASE_URL + ID_CARD_BACK; } public static String getDrivingLicense() { - return BASE_URL +DRIVING_LICENSE; + return BASE_URL + DRIVING_LICENSE; } public static String getDrivingLicenseBack() { - return BASE_URL +DRIVING_LICENSE_BACK; + return BASE_URL + DRIVING_LICENSE_BACK; } public static String getVehicleLicense() { - return BASE_URL +VEHICLE_LICENSE; + return BASE_URL + VEHICLE_LICENSE; } public static String getVehicleLicenseBack() { - return BASE_URL +VEHICLE_LICENSE_BACK; + return BASE_URL + VEHICLE_LICENSE_BACK; } public static String getGetCarList() { - return BASE_URL +GET_CAR_LIST; + return BASE_URL + GET_CAR_LIST; } public static String getGetCarDel() { - return BASE_URL +GET_CAR_DEL; + return BASE_URL + GET_CAR_DEL; } public static String getCodeData() { - return BASE_URL +CODE_DATA; + return BASE_URL + CODE_DATA; } public static String getIsauthIdcard() { - return BASE_URL +ISAUTH_IDCARD; + return BASE_URL + ISAUTH_IDCARD; } - public static String getIsauthDriverauthLicense() { return BASE_URL +ISAUTH_DRIVERAUTH_LICENSE; } + public static String getIsauthDriverauthLicense() { + return BASE_URL + ISAUTH_DRIVERAUTH_LICENSE; + } - public static String getUploadReceipt() { return BASE_URL +UPLOAD_RECEIPT; } + public static String getUploadReceipt() { + return BASE_URL + UPLOAD_RECEIPT; + } - public static String getUPLOAD() { return BASE_URL +UPLOAD; } + public static String getUPLOAD() { + return BASE_URL + UPLOAD; + } - public static String getTrackTracking() {return BASE_URL +TRACK_TRACKING; } + public static String getTrackTracking() { + return BASE_URL + TRACK_TRACKING; + } - public static String getEvaluationV2() { return BASE_URL +EVALUATION_V2; } + public static String getEvaluationV2() { + return BASE_URL + EVALUATION_V2; + } public static String getDRIVERAUTHIDCARD() { - return BASE_URL +DRIVERAUTHIDCARD; + return BASE_URL + DRIVERAUTHIDCARD; } public static String getDRIVERAUTHLICENSE() { - return BASE_URL +DRIVERAUTHLICENSE; + return BASE_URL + DRIVERAUTHLICENSE; } public static String getSAVEVEHICLELICENSE() { - return BASE_URL +SAVEVEHICLELICENSE; + return BASE_URL + SAVEVEHICLELICENSE; } public static String getSAVECARIMG() { - return BASE_URL +SAVECARIMG; + return BASE_URL + SAVECARIMG; } - public static String getUploadHead() { return BASE_URL +UPLOAD_HEAD; } + public static String getUploadHead() { + return BASE_URL + UPLOAD_HEAD; + } public static String getInsBankcard() { - return BASE_URL +INS_BANKCARD; + return BASE_URL + INS_BANKCARD; } - public static String getDelCar() { return BASE_URL +DEL_CAR; } + public static String getDelCar() { + return BASE_URL + DEL_CAR; + } - public static String getXiaoxiDel() { return BASE_URL +XIAOXI_DEL; } + public static String getXiaoxiDel() { + return BASE_URL + XIAOXI_DEL; + } - public static String getCOMPLAINT() { return BASE_URL+COMPLAINT; } + public static String getCOMPLAINT() { + return BASE_URL + COMPLAINT; + } - public static String getXiaoxiDelAll() { return BASE_URL+XIAOXI_DEL_ALL; } + public static String getXiaoxiDelAll() { + return BASE_URL + XIAOXI_DEL_ALL; + } - public static String getDriverAuthQualification() { return BASE_URL+DRIVER_AUTH_QUALIFICATION; } + public static String getDriverAuthQualification() { + return BASE_URL + DRIVER_AUTH_QUALIFICATION; + } - public static String getDriverSaveCarRegisterNo() { return BASE_URL+DRIVER_AUTH_SAVECARREGISTERNO; } + public static String getDriverSaveCarRegisterNo() { + return BASE_URL + DRIVER_AUTH_SAVECARREGISTERNO; + } - public static String getDriverSaveCarRoadLicenseNo() { return BASE_URL+DRIVER_AUTH_SAVECARROADLICENSENO; } + public static String getDriverSaveCarRoadLicenseNo() { + return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO; + } - public static String getSaveDrawCar() { return BASE_URL+SAVE_DRAW_CAR; } + public static String getSaveDrawCar() { + return BASE_URL + SAVE_DRAW_CAR; + } public static String getIsAuthDriverAuthQualification() { - return BASE_URL+IS_AUTH_DRIVER_AUTH_QUALIFICATION; + return BASE_URL + IS_AUTH_DRIVER_AUTH_QUALIFICATION; } public static String getVERSION() { - return BASE_URL+VERSION; + return BASE_URL + VERSION; } public static String getAddContracts() { - return BASE_URL+ADD_CONTRACTS; + return BASE_URL + ADD_CONTRACTS; } public static String getGetContracts() { - return BASE_URL+GET_CONTRACTS; + return BASE_URL + GET_CONTRACTS; } public static String getTIXIAN() { - return BASE_URL+TIXIAN; + return BASE_URL + TIXIAN; } public static String getPartyMember() { - return BASE_URL+PARTY_MEMBER; + return BASE_URL + PARTY_MEMBER; } public static String getCONFIG() { - return BASE_URL+CONFIG; + return BASE_URL + CONFIG; } public static String getChangeRecord() { - return BASE_URL+CHANGE_RECORD; + return BASE_URL + CHANGE_RECORD; } public static String getChangeCharge() { - return BASE_URL+WITHDRAWALS_CHARGE; + return BASE_URL + WITHDRAWALS_CHARGE; } public static String getChangeConfig() { - return BASE_URL+WITHDRAWALS_CONFIG; + return BASE_URL + WITHDRAWALS_CONFIG; } - public static String getGetErrorOrder() { return BASE_URL+GET_ERROR_ORDER; } + public static String getGetErrorOrder() { + return BASE_URL + GET_ERROR_ORDER; + } public static String getGetExampleList() { - return BASE_URL+GET_EXAMPLE_LIST; + return BASE_URL + GET_EXAMPLE_LIST; } public static String getAuthUrl() { - return BASE_URL+AUTH_URL; + return BASE_URL + AUTH_URL; } public static String getPlateLicense() { - return BASE_URL+PLATE_LICENSE; + return BASE_URL + PLATE_LICENSE; } public static String getPlateLicense2() { - return BASE_URL+PLATE_LICENSE2; + return BASE_URL + PLATE_LICENSE2; } public static String getGetImage() { - return BASE_URL+GET_IMAGE; + return BASE_URL + GET_IMAGE; } public static String getGetCertificateExpired() { - return BASE_URL+GET_CERTIFICATE_EXPIRED; + return BASE_URL + GET_CERTIFICATE_EXPIRED; } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/bean/LUInputBean.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/bean/LUInputBean.java index 987404c..197764b 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/bean/LUInputBean.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/bean/LUInputBean.java @@ -15,6 +15,15 @@ public class LUInputBean { private String locationAddress; private String longitude; private String waybillId; + private String realLoadTime; + + public String getRealLoadTime() { + return realLoadTime; + } + + public void setRealLoadTime(String realLoadTime) { + this.realLoadTime = realLoadTime; + } public List getImageId() { return imageId; diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java index d6c129e..4ff46e9 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java @@ -86,7 +86,8 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { private boolean locationKey = false; private TextView tv_loaction; - private TempLoca tempLoca = new TempLoca(36.11944878,120.10315118,"中国山东省青岛市黄岛区铁峰山路","2023-09-23 11:19"); + private TempLoca tempLoca = new TempLoca(39.24,117.07,"天津市北辰区双口镇永宝路17号","2023-09-26 10:00"); + private TempLoca tempLocaBd = new TempLoca(39.246543,117.079713,"天津市北辰区双口镇永宝路17号","2023-09-26 10:00"); class TempLoca{ private double latitude; @@ -391,9 +392,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { case 0: //装货 if (imgIds != null && imgIds.size() > 0) { - lub.setLatitude(lgdu.getLatitude() + ""); - lub.setLongitude(lgdu.getLongitude() + ""); - lub.setLocationAddress(lgdu.getAddress()); + lub.setLatitude(tempLoca.getLatitude() + ""); + lub.setLongitude(tempLoca.getLongitude() + ""); + lub.setLocationAddress(tempLoca.getAddress()); lub.setImageId(imgIds); lub.setWaybillId(wid); Log.e("--装货信息", gson.toJson(lub)); @@ -420,6 +421,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { lub.setLocationAddress(tempLoca.getAddress()); lub.setImageId(imgIds); lub.setWaybillId(wid); + lub.setRealLoadTime(tempLoca.getTime()); Log.e("--卸货信息", gson.toJson(lub)); if (locationKey) { if (keys) { @@ -495,10 +497,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { public void up_trafficSign() { //安联 Location l = new Location(); - l.setBaiduLongitude(tempLoca.longitude); - l.setBaiduLatitude(tempLoca.latitude); - l.setLocation(tempLoca.getAddress()); - l.setTime(tempLoca.getTime()); + l.setBaiduLongitude(tempLocaBd.longitude); + l.setBaiduLatitude(tempLocaBd.latitude); + l.setLocation(tempLocaBd.getAddress()); + l.setTime(tempLocaBd.getTime()); List gs = new ArrayList<>(); for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) { if (wid.equals(wayChild.getId() + "")) { @@ -535,10 +537,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { public void up_trafficReceipt() { //安联 Location l = new Location(); - l.setBaiduLongitude(tempLoca.longitude); - l.setBaiduLatitude(tempLoca.latitude); - l.setLocation(tempLoca.getAddress()); - l.setTime(tempLoca.getTime()); + l.setBaiduLongitude(tempLocaBd.longitude); + l.setBaiduLatitude(tempLocaBd.latitude); + l.setLocation(tempLocaBd.getAddress()); + l.setTime(tempLocaBd.getTime()); MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() { @Override @@ -563,9 +565,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); image.setImageTakenDate(Timer.getTimerT()); - image.setBaiduLongitude(latLng.longitude); - image.setBaiduLatitude(latLng.latitude); - image.setLocation(lgdu.getAddress()); + image.setBaiduLongitude(tempLocaBd.longitude); + image.setBaiduLatitude(tempLocaBd.latitude); + image.setLocation(tempLocaBd.getAddress()); MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() { @Override @@ -594,10 +596,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base); image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); - image.setImageTakenDate(tempLoca.getTime()); - image.setBaiduLongitude(tempLoca.longitude); - image.setBaiduLatitude(tempLoca.latitude); - image.setLocation(tempLoca.getAddress()); + image.setImageTakenDate(tempLocaBd.getTime()); + image.setBaiduLongitude(tempLocaBd.longitude); + image.setBaiduLatitude(tempLocaBd.latitude); + image.setLocation(tempLocaBd.getAddress()); MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() { @Override @@ -627,10 +629,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base); image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); - image.setImageTakenDate(tempLoca.getTime()); - image.setBaiduLongitude(tempLoca.longitude); - image.setBaiduLatitude(tempLoca.latitude); - image.setLocation(tempLoca.getAddress()); + image.setImageTakenDate(tempLocaBd.getTime()); + image.setBaiduLongitude(tempLocaBd.longitude); + image.setBaiduLatitude(tempLocaBd.latitude); + image.setLocation(tempLocaBd.getAddress()); MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() { @Override @@ -691,10 +693,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { //安联 if (sob.getData().getReportAlct() == 1) { Location l = new Location(); - l.setBaiduLongitude(latLng.longitude); - l.setBaiduLatitude(latLng.latitude); - l.setLocation(lgdu.getAddress()); - l.setTime(Timer.getTimerT()); + l.setBaiduLongitude(tempLocaBd.longitude); + l.setBaiduLatitude(tempLocaBd.latitude); + l.setLocation(tempLocaBd.getAddress()); + l.setTime(tempLocaBd.getTime()); MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() { @Override public void onSuccess() { @@ -727,10 +729,10 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { //安联 if (sob.getData().getReportAlct() == 1) { Location l = new Location(); - l.setBaiduLongitude(tempLoca.longitude); - l.setBaiduLatitude(tempLoca.latitude); - l.setLocation(tempLoca.getAddress()); - l.setTime(tempLoca.getTime()); + l.setBaiduLongitude(tempLocaBd.longitude); + l.setBaiduLatitude(tempLocaBd.latitude); + l.setLocation(tempLocaBd.getAddress()); + l.setTime(tempLocaBd.getTime()); Log.e("-安联卸货信息-", gson.toJson(l)); MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() { @Override @@ -741,7 +743,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { JTTProcess.stop(con, sob, ""); } //卸货状态-平台 - hyr.dischargeCargo(lub); + hyr.dischargeCargo4(lub); //卸货照片-安联 up_image(); } @@ -749,7 +751,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { Log.e("上报安联失败(卸货):", s + s1); - new MessageUtils().showCenMessage(con, s1); +// new MessageUtils().showCenMessage(con, s1); + //运单状态不一致，平台更新状态 + hyr.dischargeCargo4(lub); } }); }