发货时间逻辑优化,首页添加默认以及优化可选项
This commit is contained in:
parent
fa479bd0ec
commit
66cc63d791
@ -34,8 +34,8 @@ android {
|
||||
applicationId "com.oneclouds.cargo"
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 30
|
||||
versionCode 29
|
||||
versionName "3.0.9"
|
||||
versionCode 30
|
||||
versionName "3.1.0"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
||||
|
@ -0,0 +1,88 @@
|
||||
package com.oneclouds.cargo.bean;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author hlh
|
||||
* @version 1.0.0
|
||||
* @date 2021/9/15 15:41
|
||||
* @description:
|
||||
*/
|
||||
public class CarShortTypeBean {
|
||||
|
||||
private int res;
|
||||
private int code;
|
||||
private boolean success;
|
||||
private String msg;
|
||||
private List<DataDTO> data;
|
||||
|
||||
public int getRes() {
|
||||
return res;
|
||||
}
|
||||
|
||||
public void setRes(int res) {
|
||||
this.res = res;
|
||||
}
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(int code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public boolean isSuccess() {
|
||||
return success;
|
||||
}
|
||||
|
||||
public void setSuccess(boolean success) {
|
||||
this.success = success;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public List<DataDTO> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<DataDTO> data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataDTO {
|
||||
private int value;
|
||||
private String alctName;
|
||||
private String label;
|
||||
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getAlctName() {
|
||||
return alctName;
|
||||
}
|
||||
|
||||
public void setAlctName(String alctName) {
|
||||
this.alctName = alctName;
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
return label;
|
||||
}
|
||||
|
||||
public void setLabel(String label) {
|
||||
this.label = label;
|
||||
}
|
||||
}
|
||||
}
|
108
app/src/main/java/com/oneclouds/cargo/bean/GoodsTypeBean.java
Normal file
108
app/src/main/java/com/oneclouds/cargo/bean/GoodsTypeBean.java
Normal file
@ -0,0 +1,108 @@
|
||||
package com.oneclouds.cargo.bean;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author hlh
|
||||
* @version 1.0.0
|
||||
* @date 2021/9/15 15:41
|
||||
* @description:
|
||||
*/
|
||||
public class GoodsTypeBean {
|
||||
|
||||
private int res;
|
||||
private int code;
|
||||
private boolean success;
|
||||
private String msg;
|
||||
private List<DataDTO> data;
|
||||
|
||||
public int getRes() {
|
||||
return res;
|
||||
}
|
||||
|
||||
public void setRes(int res) {
|
||||
this.res = res;
|
||||
}
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(int code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public boolean isSuccess() {
|
||||
return success;
|
||||
}
|
||||
|
||||
public void setSuccess(boolean success) {
|
||||
this.success = success;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public List<DataDTO> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public void setData(List<DataDTO> data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public static class DataDTO {
|
||||
|
||||
private String cateName;
|
||||
private int alctGoodsTypeId;
|
||||
private int id;
|
||||
private String shipperId;
|
||||
private String remarks;
|
||||
|
||||
|
||||
public String getCateName() {
|
||||
return cateName;
|
||||
}
|
||||
|
||||
public void setCateName(String cateName) {
|
||||
this.cateName = cateName;
|
||||
}
|
||||
|
||||
public int getAlctGoodsTypeId() {
|
||||
return alctGoodsTypeId;
|
||||
}
|
||||
|
||||
public void setAlctGoodsTypeId(int alctGoodsTypeId) {
|
||||
this.alctGoodsTypeId = alctGoodsTypeId;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getShipperId() {
|
||||
return shipperId;
|
||||
}
|
||||
|
||||
public void setShipperId(String shipperId) {
|
||||
this.shipperId = shipperId;
|
||||
}
|
||||
|
||||
public String getRemarks() {
|
||||
return remarks;
|
||||
}
|
||||
|
||||
public void setRemarks(String remarks) {
|
||||
this.remarks = remarks;
|
||||
}
|
||||
}
|
||||
}
|
@ -43,6 +43,8 @@ public class OrderRequest {
|
||||
|
||||
//车型车长
|
||||
public static final String ORDER_CAR_TYPE_AND_CAR_LONG="order_CarTypeAndCarLong";
|
||||
public static final String ORDER_CAR_TYPE_AND_CAR="order_CarTypeAndCar";
|
||||
public static final String ORDER_CAR_TYPE_AND_GOODS_TYPE="ORDER_CAR_TYPE_AND_GOODS_TYPE";
|
||||
//业务类型
|
||||
public static final String ORDER_BUSINESS_TYPE_LIST="order_businessTypeList";
|
||||
|
||||
@ -64,6 +66,25 @@ public class OrderRequest {
|
||||
//货源保存/提交
|
||||
public static final String ORDER_PULIST_ORDER="publishOrder";
|
||||
|
||||
//车辆类型
|
||||
public static String CAR_TYPE ="/common/dic/carTypeSimpleList";
|
||||
|
||||
//货物大类
|
||||
public static String GOODS_TYPE ="/shipperWeb/goodsCate/nplist";
|
||||
|
||||
|
||||
//货物大类-汇总版
|
||||
public void goodType(){
|
||||
Request re = OkHttpUtil.posts(new OkDate(UrlManager.getGoodType(), "post",""),getToken(con),con);
|
||||
RequestTest.test(1,ORDER_CAR_TYPE_AND_GOODS_TYPE,re,con,hd);
|
||||
}
|
||||
|
||||
//车型车长-汇总版
|
||||
public void carType(){
|
||||
Request re = OkHttpUtil.posts(new OkDate(UrlManager.getCarType(), "post",""),getToken(con),con);
|
||||
RequestTest.test(1,ORDER_CAR_TYPE_AND_CAR,re,con,hd);
|
||||
}
|
||||
|
||||
//车型车长
|
||||
public void carTypeLongList(){
|
||||
Request re = OkHttpUtil.posts(new OkDate(UrlManager.getOrderCarTypeAndCarLong(), "post",""),getToken(con),con);
|
||||
|
@ -1,5 +1,8 @@
|
||||
package com.oneclouds.cargo.request.manager;
|
||||
|
||||
import static com.oneclouds.cargo.request.OrderRequest.CAR_TYPE;
|
||||
import static com.oneclouds.cargo.request.OrderRequest.GOODS_TYPE;
|
||||
|
||||
/**
|
||||
* @author hlh
|
||||
* @version 1.0.0
|
||||
@ -9,180 +12,180 @@ package com.oneclouds.cargo.request.manager;
|
||||
public class UrlManager {
|
||||
|
||||
//域名地址
|
||||
public static final String BASE_URL ="http://app.dahehuoyun.com/api";
|
||||
public static final String BASE_URL = "http://app.dahehuoyun.com/api";
|
||||
//http://request.one-clouds.com/api
|
||||
/*--货物小类管理--*/
|
||||
|
||||
//货物小类添加
|
||||
private static final String CATE_ADD="/app/shipper/cate/add";
|
||||
private static final String CATE_ADD = "/app/shipper/cate/add";
|
||||
//货物小类删除
|
||||
private static final String CATE_DELETE="/app/shipper/cate/delete";
|
||||
private static final String CATE_DELETE = "/app/shipper/cate/delete";
|
||||
//货物小类修改
|
||||
private static final String CATE_UPDATE="/app/shipper/cate/update";
|
||||
private static final String CATE_UPDATE = "/app/shipper/cate/update";
|
||||
//货物小类列表
|
||||
private static final String CATE_LIST="/app/shipper/cate/list";
|
||||
private static final String CATE_LIST = "/app/shipper/cate/list";
|
||||
//无分页小类列表
|
||||
private static final String CATE_NLIST="/app/shipper/cate/nlist";
|
||||
private static final String CATE_NLIST = "/app/shipper/cate/nlist";
|
||||
//无分页大类列表
|
||||
private static final String CATE_NPLIST="/app/shipper/cate/nplist";
|
||||
private static final String CATE_NPLIST = "/app/shipper/cate/nplist";
|
||||
//安联货物分类
|
||||
private static final String CATE_NPLIST_AL="/app/shipper/cate/nplistAl";
|
||||
private static final String CATE_NPLIST_AL = "/app/shipper/cate/nplistAl";
|
||||
|
||||
//搜索车辆
|
||||
private static final String CATE_CAR_LIST="/app/shipperCar/shipperCarList";
|
||||
private static final String CATE_CAR_LIST = "/app/shipperCar/shipperCarList";
|
||||
|
||||
/*--发票管理--*/
|
||||
|
||||
//可申请发票的订单
|
||||
private static final String INVOICE_CAN_APPLY_ORDER="/app/shipper/invoice/canApplyOrder";
|
||||
private static final String INVOICE_CAN_APPLY_ORDER = "/app/shipper/invoice/canApplyOrder";
|
||||
//已申请开票详情
|
||||
private static final String INVOICE_DETAILS_BY_ID="/app/shipper/invoice/detailsById";
|
||||
private static final String INVOICE_DETAILS_BY_ID = "/app/shipper/invoice/detailsById";
|
||||
//发票申请记录
|
||||
private static final String INVOICE_FIND_PAGE="/app/shipper/invoice/findPage";
|
||||
private static final String INVOICE_FIND_PAGE = "/app/shipper/invoice/findPage";
|
||||
//申请发票保存
|
||||
private static final String INVOICE_SAVE="/app/shipper/invoice/save";
|
||||
private static final String INVOICE_SAVE = "/app/shipper/invoice/save";
|
||||
//发票抬头信息删除
|
||||
private static final String INVOICE_DELETE="/app/shipper/invoice/title/delete";
|
||||
private static final String INVOICE_DELETE = "/app/shipper/invoice/title/delete";
|
||||
//通过id查询发票抬头信息
|
||||
private static final String INVOICE_FIND_BY_ID="/app/shipper/invoice/title/findById";
|
||||
private static final String INVOICE_FIND_BY_ID = "/app/shipper/invoice/title/findById";
|
||||
//查询当前用户最新发票抬头信息
|
||||
private static final String INVOICE_FIND_SHIPPER_INVOICE_TITLE="/app/shipper/invoice/title/findShipperInvoiceTitle";
|
||||
private static final String INVOICE_FIND_SHIPPER_INVOICE_TITLE = "/app/shipper/invoice/title/findShipperInvoiceTitle";
|
||||
//发票抬头信息保存
|
||||
private static final String INVOICE_TITLE_SAVE="/app/shipper/invoice/title/save";
|
||||
private static final String INVOICE_TITLE_SAVE = "/app/shipper/invoice/title/save";
|
||||
|
||||
/*--地址管理--*/
|
||||
|
||||
//地址信息删除
|
||||
private static final String ADDRESS_DELETE="/app/shipper/address/delete";
|
||||
private static final String ADDRESS_DELETE = "/app/shipper/address/delete";
|
||||
//地址信息查询
|
||||
private static final String ADDRESS_FIND_BY_ID="/app/shipper/address/findById";
|
||||
private static final String ADDRESS_FIND_BY_ID = "/app/shipper/address/findById";
|
||||
//地址信息列表
|
||||
private static final String ADDRESS_FIND_PAGE="/app/shipper/address/findPage";
|
||||
private static final String ADDRESS_FIND_PAGE = "/app/shipper/address/findPage";
|
||||
//查询登录用户地址信息列表
|
||||
private static final String ADDRESS_FIND_PAGE_MY_SELF="/app/shipper/address/findPageMySelf";
|
||||
private static final String ADDRESS_FIND_PAGE_MY_SELF = "/app/shipper/address/findPageMySelf";
|
||||
//地址信息保存
|
||||
private static final String ADDRESS_SAVE="/app/shipper/address/save";
|
||||
private static final String COMPANY_SAVE="/app/shipper/auth/companyInfo";
|
||||
private static final String ADDRESS_SAVE = "/app/shipper/address/save";
|
||||
private static final String COMPANY_SAVE = "/app/shipper/auth/companyInfo";
|
||||
|
||||
/*--货主认证--*/
|
||||
|
||||
//货主认证信息查看
|
||||
private static final String AUTH_INFO="/app/shipper/auth/authInfo";
|
||||
private static final String AUTH_INFO = "/app/shipper/auth/authInfo";
|
||||
//货主企业公司信息认证保存
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_COMPANY="/app/shipper/auth/enterpriseAuthCompanyNew";
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_COMPANY = "/app/shipper/auth/enterpriseAuthCompanyNew";
|
||||
//货主企业法人信息保存
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_CORPORATION="/app/shipper/auth/enterpriseAuthCorporationNew";
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_CORPORATION = "/app/shipper/auth/enterpriseAuthCorporationNew";
|
||||
//货主企业认证保存
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_SAVE="/app/shipper/auth/enterpriseAuthSave";
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_SAVE = "/app/shipper/auth/enterpriseAuthSave";
|
||||
//货主企业委托授权书信息保存
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_WARRANT="/app/shipper/auth/enterpriseAuthWarrant";
|
||||
private static final String AUTH_ENTER_PRISE_AUTH_WARRANT = "/app/shipper/auth/enterpriseAuthWarrant";
|
||||
//货主信息是否已认证
|
||||
private static final String AUTH_IS_AUTH="/app/shipper/auth/isAuth";
|
||||
private static final String AUTH_IS_AUTH = "/app/shipper/auth/isAuth";
|
||||
//货主个人认证保存
|
||||
private static final String AUTH_PERSON_AUTH_SAVE="/app/shipper/auth/personAuthSave";
|
||||
private static final String AUTH_PERSON_AUTH_SAVE = "/app/shipper/auth/personAuthSave";
|
||||
//党员认证保存
|
||||
private static final String AUTH_PARTY_MEMBER="/app/user/partyMember";
|
||||
private static final String AUTH_PARTY_MEMBER = "/app/user/partyMember";
|
||||
|
||||
/*--货主运单管理--*/
|
||||
|
||||
//投诉信息保存
|
||||
private static final String WAYBILL_COMPLAINT_V3="/app/shipper/waybill/complaintV3";
|
||||
private static final String WAYBILL_COMPLAINT_V3 = "/app/shipper/waybill/complaintV3";
|
||||
//确认装货
|
||||
private static final String WAYBILL_CONFIRM_LOADING="/app/shipper/waybill/confirmLoading";
|
||||
private static final String WAYBILL_CONFIRM_LOADING = "/app/shipper/waybill/confirmLoading";
|
||||
//确认卸货
|
||||
private static final String WAYBILL_CONFIRM_UNLOAD="/app/shipper/waybill/confirmUnload";
|
||||
private static final String WAYBILL_CONFIRM_UNLOAD = "/app/shipper/waybill/confirmUnload";
|
||||
//评价信息保存
|
||||
private static final String WAYBILL_EVALUATION_V3="/app/shipper/waybill/evaluationV3";
|
||||
private static final String WAYBILL_EVALUATION_V3 = "/app/shipper/waybill/evaluationV3";
|
||||
//运单详情
|
||||
private static final String WAYBILL_GET_EXECUTE_WATBILL="/app/shipper/waybill/getExecuteWaybill";
|
||||
private static final String WAYBILL_GET_EXECUTE_WATBILL = "/app/shipper/waybill/getExecuteWaybill";
|
||||
//获取双轨迹
|
||||
private static final String WAYBILL_GET_LOC="/app/shipper/waybill/getLoc";
|
||||
private static final String WAYBILL_GET_LOC = "/app/shipper/waybill/getLoc";
|
||||
//货源详情
|
||||
private static final String WAYBILL_GET_ORDER_DETAIL="/app/shipper/waybill/getOrderDetail";
|
||||
private static final String WAYBILL_GET_ORDER_DETAIL = "/app/shipper/waybill/getOrderDetail";
|
||||
//获取评价信息
|
||||
private static final String WAYBILL_LIST_APPAISES="/app/shipper/waybill/listAppraises";
|
||||
private static final String WAYBILL_LIST_APPAISES = "/app/shipper/waybill/listAppraises";
|
||||
//获取投诉信息
|
||||
private static final String WAYBILL_LIST_COMPLAINT="/app/shipper/waybill/listComplaint";
|
||||
private static final String WAYBILL_LIST_COMPLAINT = "/app/shipper/waybill/listComplaint";
|
||||
//货源列表
|
||||
private static final String WAYBILL_LIST_V2="/app/shipper/waybill/listV2";
|
||||
private static final String WAYBILL_LIST_V2 = "/app/shipper/waybill/listV2";
|
||||
//运单列表数量
|
||||
private static final String WAYBILL_LIST_NUM="/app/shipper/waybill/listnum";
|
||||
private static final String WAYBILL_LIST_NUM = "/app/shipper/waybill/listnum";
|
||||
|
||||
/*--货物管理--*/
|
||||
|
||||
//货物添加
|
||||
private static final String GOODS_ADD="/app/shipper/goods/add";
|
||||
private static final String GOODS_ADD = "/app/shipper/goods/add";
|
||||
//货物删除
|
||||
private static final String GOODS_DELETE="/app/shipper/goods/delete";
|
||||
private static final String GOODS_DELETE = "/app/shipper/goods/delete";
|
||||
//货物列表
|
||||
private static final String GOODS_LIST="/app/shipper/goods/list";
|
||||
private static final String GOODS_LIST = "/app/shipper/goods/list";
|
||||
//货物修改
|
||||
private static final String GOODS_UPDATE="/app/shipper/goods/update";
|
||||
private static final String GOODS_UPDATE = "/app/shipper/goods/update";
|
||||
|
||||
/*--货物计量单位管理--*/
|
||||
|
||||
//货物计量单位添加
|
||||
private static final String UNIT_ADD="/app/shipper/goods/add";
|
||||
private static final String UNIT_ADD = "/app/shipper/goods/add";
|
||||
//货物计量单位删除
|
||||
private static final String UNIT_DELETE="/app/shipper/unit/delete";
|
||||
private static final String UNIT_DELETE = "/app/shipper/unit/delete";
|
||||
//货物计量单位列表
|
||||
private static final String UNIT_LIST="/app/shipper/unit/list";
|
||||
private static final String UNIT_LIST = "/app/shipper/unit/list";
|
||||
//无分页货物单位列表
|
||||
private static final String UNIT_NLIST="/app/shipper/unit/nlist";
|
||||
private static final String UNIT_NLIST = "/app/shipper/unit/nlist";
|
||||
//货物计量单位修改
|
||||
private static final String UNIT_UPDATE="/app/shipper/unit/update";
|
||||
private static final String UNIT_UPDATE = "/app/shipper/unit/update";
|
||||
|
||||
/*--货源管理--*/
|
||||
|
||||
//车型车长
|
||||
private static final String ORDER_CAR_TYPE_AND_CAR_LONG="/app/shipper/order/CarTypeAndCarLong";
|
||||
private static final String ORDER_CAR_TYPE_AND_CAR_LONG = "/app/shipper/order/CarTypeAndCarLong";
|
||||
//业务类型
|
||||
private static final String ORDER_BUSINESS_TYPE_LIST="/app/shipper/order/businessTypeList";
|
||||
private static final String ORDER_BUSINESS_TYPE_LIST = "/app/shipper/order/businessTypeList";
|
||||
//业务类型交通厅
|
||||
private static final String ORDER_BUSINESS_TYPE_LIST_JTT="/app/shipper/order/nplist";
|
||||
private static final String ORDER_BUSINESS_TYPE_LIST_JTT = "/app/shipper/order/nplist";
|
||||
//业务类型安联
|
||||
private static final String ORDER_BUSINESS_TYPE_LIST_AL="/app/shipper/order/nplistAl";
|
||||
private static final String ORDER_BUSINESS_TYPE_LIST_AL = "/app/shipper/order/nplistAl";
|
||||
//运单轨迹
|
||||
private static final String ORDER_FIND_LOCUS_LIST="/app/shipper/order/findLocusList";
|
||||
private static final String ORDER_FIND_LOCUS_LIST = "/app/shipper/order/findLocusList";
|
||||
//货源列表
|
||||
private static final String ORDER_FIND_ORDER_LIST="/app/shipper/order/findOrderList";
|
||||
private static final String ORDER_FIND_ORDER_LIST = "/app/shipper/order/findOrderList";
|
||||
//货源删除
|
||||
private static final String ORDER_DEL="/app/shipper/order/orderDel";
|
||||
private static final String ORDER_DEL = "/app/shipper/order/orderDel";
|
||||
//货源撤销
|
||||
private static final String ORDER_REVOKE="/app/shipper/order/orderRevoke";
|
||||
private static final String ORDER_REVOKE = "/app/shipper/order/orderRevoke";
|
||||
//货源查询状态列表
|
||||
private static final String ORDER_STATELIST="/app/shipper/order/orderStateList";
|
||||
private static final String ORDER_STATELIST = "/app/shipper/order/orderStateList";
|
||||
//包装方式
|
||||
private static final String ORDER_PACK_NAME_LIST="/app/shipper/order/packNameList";
|
||||
private static final String ORDER_PACK_NAME_LIST = "/app/shipper/order/packNameList";
|
||||
//货源保存/提交
|
||||
private static final String ORDER_PULIST_ORDER="/app/shipper/order/publishOrder";
|
||||
private static final String ORDER_PULIST_ORDER = "/app/shipper/order/publishOrder";
|
||||
|
||||
/*--货主评价管理--*/
|
||||
|
||||
//评价信息查询
|
||||
private static final String SA_FIND_BY_ID="/app/shipperAppraises/findById";
|
||||
private static final String SA_FIND_BY_ID = "/app/shipperAppraises/findById";
|
||||
//查询登录用户评价信息数量
|
||||
private static final String SA_FIND_CURRENT_USER_APPRAISES_COUNT="/app/shipperAppraises/findCurrentUserAppraisesCount";
|
||||
private static final String SA_FIND_CURRENT_USER_APPRAISES_COUNT = "/app/shipperAppraises/findCurrentUserAppraisesCount";
|
||||
//评价信息列表
|
||||
private static final String SA_FIND_PAGE="/app/shipperAppraises/findPage";
|
||||
private static final String SA_FIND_PAGE = "/app/shipperAppraises/findPage";
|
||||
|
||||
/*--司机管理--*/
|
||||
|
||||
//发布货源-选择司机
|
||||
private static final String DRIVER_CHOOSE="/app/shipper/driver/chooseDriver";
|
||||
private static final String DRIVER_CHOOSE = "/app/shipper/driver/chooseDriver";
|
||||
//发布货源-选择司机
|
||||
private static final String DRIVER_CHOOSE_V2="/app/shipper/driver/chooseDriverV2";
|
||||
private static final String DRIVER_CHOOSE_V2 = "/app/shipper/driver/chooseDriverV2";
|
||||
|
||||
/*--OCR识别--*/
|
||||
|
||||
//银行卡
|
||||
private static final String OCR_BANK="/common/ocr/bank";
|
||||
private static final String OCR_BANK = "/common/ocr/bank";
|
||||
//营业执照
|
||||
private static final String OCR_BUSINESS_LICENSE="/common/ocr/businessLicense";
|
||||
private static final String OCR_BUSINESS_LICENSE = "/common/ocr/businessLicense";
|
||||
//身份证正面
|
||||
private static final String OCR_ID_CARD_FRONT="/common/ocr/idCardFront";
|
||||
private static final String OCR_ID_CARD_FRONT = "/common/ocr/idCardFront";
|
||||
//身份证识别反面
|
||||
private static final String OCR_ID_CARD_BACK="/common/ocr/idCardBack";
|
||||
private static final String OCR_ID_CARD_BACK = "/common/ocr/idCardBack";
|
||||
|
||||
/*--公共接口--*/
|
||||
|
||||
@ -191,397 +194,413 @@ public class UrlManager {
|
||||
//忘记密码
|
||||
private static final String FORGETPWD = "/common/forgetPwd";
|
||||
//账户登录
|
||||
private static final String LOGIN="/common/register";
|
||||
private static final String LOGIN2="/common/login";
|
||||
private static final String LOGIN = "/common/register";
|
||||
private static final String LOGIN2 = "/common/login";
|
||||
//账户信息
|
||||
private static final String USER_INFO="/app/user/getUserInfo";
|
||||
private static final String USER_INFO = "/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 BANK_CARD_ADD="/app/bankCard/save";
|
||||
private static final String BANK_CARD_ADD = "/app/bankCard/save";
|
||||
//删除银行卡
|
||||
private static final String BANK_CARD_DELETE="/app/bankCard/deleteCard";
|
||||
private static final String BANK_CARD_DELETE = "/app/bankCard/deleteCard";
|
||||
//账户提现
|
||||
private static final String BANK_CASH_APPLY="/app/account/cashApply/bank";
|
||||
private static final String BANK_CASH_APPLY = "/app/account/cashApply/bank";
|
||||
//生成电子账户
|
||||
private static final String CONTRACTS_ADD="/app/bank/addContracts";
|
||||
private static final String CONTRACTS_ADD = "/app/bank/addContracts";
|
||||
//获取电子账户
|
||||
private static final String CONTRACTS_GET="/app/bank/getContracts";
|
||||
private static final String CONTRACTS_GET = "/app/bank/getContracts";
|
||||
//获取账户未读消息
|
||||
private static final String MESSAGE_FIND_NOT_READ_COUNT="/app/message/findCurrentUserNotReadCount";
|
||||
private static final String MESSAGE_FIND_NOT_READ_COUNT = "/app/message/findCurrentUserNotReadCount";
|
||||
//获取账户消息
|
||||
private static final String MESSAGE_FIND_PAGE="/app/message/findPage";
|
||||
private static final String MESSAGE_FIND_PAGE = "/app/message/findPage";
|
||||
//已读消息
|
||||
private static final String MESSAGE_SET_READ_BY_ID="/app/message/setReadById";
|
||||
private static final String MESSAGE_SET_READ_BY_ID = "/app/message/setReadById";
|
||||
//已读全部消息
|
||||
private static final String MESSAGE_SET_READ_ALL="/app/message/setReadAll";
|
||||
private static final String MESSAGE_SET_READ_ALL = "/app/message/setReadAll";
|
||||
//上传文件
|
||||
private static final String UPLOAD="/common/resource/upload";
|
||||
private static final String UPLOAD = "/common/resource/upload";
|
||||
//上传头像
|
||||
private static final String UPLOAD_HEAD="/app/user/uploadHeadportrait";
|
||||
private static final String UPLOAD_HEAD = "/app/user/uploadHeadportrait";
|
||||
//版本更新
|
||||
public static String VERSION ="/app/check/version";
|
||||
public static String VERSION = "/app/check/version";
|
||||
//配置项信息
|
||||
public static String CONFIG ="/common/config/list";
|
||||
public static String CONFIG = "/common/config/list";
|
||||
|
||||
//获取大屏的url
|
||||
public static String GET_URL ="/app/shipper/data/url";
|
||||
public static String GET_URL = "/app/shipper/data/url";
|
||||
|
||||
public static String getBaseUrl() {
|
||||
return BASE_URL;
|
||||
}
|
||||
|
||||
public static String getCarType() {
|
||||
return BASE_URL + CAR_TYPE;
|
||||
}
|
||||
|
||||
public static String getGoodType() {
|
||||
return BASE_URL + GOODS_TYPE;
|
||||
}
|
||||
|
||||
public static String getCateAdd() {
|
||||
return BASE_URL+CATE_ADD;
|
||||
return BASE_URL + CATE_ADD;
|
||||
}
|
||||
|
||||
public static String getCateDelete() {
|
||||
return BASE_URL+CATE_DELETE;
|
||||
return BASE_URL + CATE_DELETE;
|
||||
}
|
||||
|
||||
public static String getCateUpdate() {
|
||||
return BASE_URL+CATE_UPDATE;
|
||||
return BASE_URL + CATE_UPDATE;
|
||||
}
|
||||
|
||||
public static String getCateList() {
|
||||
return BASE_URL+CATE_LIST;
|
||||
return BASE_URL + CATE_LIST;
|
||||
}
|
||||
|
||||
public static String getCateNlist() {
|
||||
return BASE_URL+CATE_NLIST;
|
||||
return BASE_URL + CATE_NLIST;
|
||||
}
|
||||
|
||||
public static String getCateNplist() {
|
||||
return BASE_URL+CATE_NPLIST;
|
||||
return BASE_URL + CATE_NPLIST;
|
||||
}
|
||||
|
||||
public static String getCateNplistAl() {
|
||||
return BASE_URL+CATE_NPLIST_AL;
|
||||
return BASE_URL + CATE_NPLIST_AL;
|
||||
}
|
||||
|
||||
public static String getCarList() {
|
||||
return BASE_URL+CATE_CAR_LIST;
|
||||
return BASE_URL + CATE_CAR_LIST;
|
||||
}
|
||||
|
||||
|
||||
public static String getInvoiceCanApplyOrder() {
|
||||
return BASE_URL+INVOICE_CAN_APPLY_ORDER;
|
||||
return BASE_URL + INVOICE_CAN_APPLY_ORDER;
|
||||
}
|
||||
|
||||
public static String getInvoiceDetailsById() {
|
||||
return BASE_URL+INVOICE_DETAILS_BY_ID;
|
||||
return BASE_URL + INVOICE_DETAILS_BY_ID;
|
||||
}
|
||||
|
||||
public static String getInvoiceFindPage() {
|
||||
return BASE_URL+INVOICE_FIND_PAGE;
|
||||
return BASE_URL + INVOICE_FIND_PAGE;
|
||||
}
|
||||
|
||||
public static String getInvoiceSave() {
|
||||
return BASE_URL+INVOICE_SAVE;
|
||||
return BASE_URL + INVOICE_SAVE;
|
||||
}
|
||||
|
||||
public static String getInvoiceDelete() {
|
||||
return BASE_URL+INVOICE_DELETE;
|
||||
return BASE_URL + INVOICE_DELETE;
|
||||
}
|
||||
|
||||
public static String getInvoiceFindById() {
|
||||
return BASE_URL+INVOICE_FIND_BY_ID;
|
||||
return BASE_URL + INVOICE_FIND_BY_ID;
|
||||
}
|
||||
|
||||
public static String getInvoiceFindShipperInvoiceTitle() {
|
||||
return BASE_URL+INVOICE_FIND_SHIPPER_INVOICE_TITLE;
|
||||
return BASE_URL + INVOICE_FIND_SHIPPER_INVOICE_TITLE;
|
||||
}
|
||||
|
||||
public static String getInvoiceTitleSave() {
|
||||
return BASE_URL+INVOICE_TITLE_SAVE;
|
||||
return BASE_URL + INVOICE_TITLE_SAVE;
|
||||
}
|
||||
|
||||
public static String getAddressDelete() {
|
||||
return BASE_URL+ADDRESS_DELETE;
|
||||
return BASE_URL + ADDRESS_DELETE;
|
||||
}
|
||||
|
||||
public static String getAddressFindById() {
|
||||
return BASE_URL+ADDRESS_FIND_BY_ID;
|
||||
return BASE_URL + ADDRESS_FIND_BY_ID;
|
||||
}
|
||||
|
||||
public static String getAddressFindPage() {
|
||||
return BASE_URL+ADDRESS_FIND_PAGE;
|
||||
return BASE_URL + ADDRESS_FIND_PAGE;
|
||||
}
|
||||
|
||||
public static String getAddressFindPageMySelf() {
|
||||
return BASE_URL+ADDRESS_FIND_PAGE_MY_SELF;
|
||||
return BASE_URL + ADDRESS_FIND_PAGE_MY_SELF;
|
||||
}
|
||||
|
||||
public static String getAddressSave() {
|
||||
return BASE_URL+ADDRESS_SAVE;
|
||||
return BASE_URL + ADDRESS_SAVE;
|
||||
}
|
||||
|
||||
public static String getCompanyInfo() {
|
||||
return BASE_URL+COMPANY_SAVE;
|
||||
return BASE_URL + COMPANY_SAVE;
|
||||
}
|
||||
|
||||
public static String getAuthInfo() {
|
||||
return BASE_URL+AUTH_INFO;
|
||||
return BASE_URL + AUTH_INFO;
|
||||
}
|
||||
|
||||
public static String getAuthEnterPriseAuthCompany() {
|
||||
return BASE_URL+AUTH_ENTER_PRISE_AUTH_COMPANY;
|
||||
return BASE_URL + AUTH_ENTER_PRISE_AUTH_COMPANY;
|
||||
}
|
||||
|
||||
public static String getAuthEnterPriseAuthCorporation() {
|
||||
return BASE_URL+AUTH_ENTER_PRISE_AUTH_CORPORATION;
|
||||
return BASE_URL + AUTH_ENTER_PRISE_AUTH_CORPORATION;
|
||||
}
|
||||
|
||||
public static String getAuthEnterPriseAuthSave() {
|
||||
return BASE_URL+AUTH_ENTER_PRISE_AUTH_SAVE;
|
||||
return BASE_URL + AUTH_ENTER_PRISE_AUTH_SAVE;
|
||||
}
|
||||
|
||||
public static String getAuthEnterPriseAuthWarrant() {
|
||||
return BASE_URL+AUTH_ENTER_PRISE_AUTH_WARRANT;
|
||||
return BASE_URL + AUTH_ENTER_PRISE_AUTH_WARRANT;
|
||||
}
|
||||
|
||||
public static String getAuthIsAuth() {
|
||||
return BASE_URL+AUTH_IS_AUTH;
|
||||
return BASE_URL + AUTH_IS_AUTH;
|
||||
}
|
||||
|
||||
public static String getAuthPersonAuthSave() {
|
||||
return BASE_URL+AUTH_PERSON_AUTH_SAVE;
|
||||
return BASE_URL + AUTH_PERSON_AUTH_SAVE;
|
||||
}
|
||||
|
||||
public static String getWaybillComplaintV3() {
|
||||
return BASE_URL+WAYBILL_COMPLAINT_V3;
|
||||
return BASE_URL + WAYBILL_COMPLAINT_V3;
|
||||
}
|
||||
|
||||
public static String getWaybillConfirmLoading() {
|
||||
return BASE_URL+WAYBILL_CONFIRM_LOADING;
|
||||
return BASE_URL + WAYBILL_CONFIRM_LOADING;
|
||||
}
|
||||
|
||||
public static String getWaybillConfirmUnload() {
|
||||
return BASE_URL+WAYBILL_CONFIRM_UNLOAD;
|
||||
return BASE_URL + WAYBILL_CONFIRM_UNLOAD;
|
||||
}
|
||||
|
||||
public static String getWaybillEvaluationV3() {
|
||||
return BASE_URL+WAYBILL_EVALUATION_V3;
|
||||
return BASE_URL + WAYBILL_EVALUATION_V3;
|
||||
}
|
||||
|
||||
public static String getWaybillGetExecuteWatbill() {
|
||||
return BASE_URL+WAYBILL_GET_EXECUTE_WATBILL;
|
||||
return BASE_URL + WAYBILL_GET_EXECUTE_WATBILL;
|
||||
}
|
||||
|
||||
public static String getWaybillGetLoc() {
|
||||
return BASE_URL+WAYBILL_GET_LOC;
|
||||
return BASE_URL + WAYBILL_GET_LOC;
|
||||
}
|
||||
|
||||
public static String getWaybillGetOrderDetail() {
|
||||
return BASE_URL+WAYBILL_GET_ORDER_DETAIL;
|
||||
return BASE_URL + WAYBILL_GET_ORDER_DETAIL;
|
||||
}
|
||||
|
||||
public static String getWaybillListAppaises() {
|
||||
return BASE_URL+WAYBILL_LIST_APPAISES;
|
||||
return BASE_URL + WAYBILL_LIST_APPAISES;
|
||||
}
|
||||
|
||||
public static String getWaybillListComplaint() {
|
||||
return BASE_URL+WAYBILL_LIST_COMPLAINT;
|
||||
return BASE_URL + WAYBILL_LIST_COMPLAINT;
|
||||
}
|
||||
|
||||
public static String getWaybillListV2() {
|
||||
return BASE_URL+WAYBILL_LIST_V2;
|
||||
return BASE_URL + WAYBILL_LIST_V2;
|
||||
}
|
||||
|
||||
public static String getWaybillListNum() {
|
||||
return BASE_URL+WAYBILL_LIST_NUM;
|
||||
return BASE_URL + WAYBILL_LIST_NUM;
|
||||
}
|
||||
|
||||
public static String getGoodsAdd() {
|
||||
return BASE_URL+GOODS_ADD;
|
||||
return BASE_URL + GOODS_ADD;
|
||||
}
|
||||
|
||||
public static String getGoodsDelete() {
|
||||
return BASE_URL+GOODS_DELETE;
|
||||
return BASE_URL + GOODS_DELETE;
|
||||
}
|
||||
|
||||
public static String getGoodsList() {
|
||||
return BASE_URL+GOODS_LIST;
|
||||
return BASE_URL + GOODS_LIST;
|
||||
}
|
||||
|
||||
public static String getGoodsUpdate() {
|
||||
return BASE_URL+GOODS_UPDATE;
|
||||
return BASE_URL + GOODS_UPDATE;
|
||||
}
|
||||
|
||||
public static String getUnitAdd() {
|
||||
return BASE_URL+UNIT_ADD;
|
||||
return BASE_URL + UNIT_ADD;
|
||||
}
|
||||
|
||||
public static String getUnitDelete() {
|
||||
return BASE_URL+UNIT_DELETE;
|
||||
return BASE_URL + UNIT_DELETE;
|
||||
}
|
||||
|
||||
public static String getUnitList() {
|
||||
return BASE_URL+UNIT_LIST;
|
||||
return BASE_URL + UNIT_LIST;
|
||||
}
|
||||
|
||||
public static String getUnitNlist() {
|
||||
return BASE_URL+UNIT_NLIST;
|
||||
return BASE_URL + UNIT_NLIST;
|
||||
}
|
||||
|
||||
public static String getUnitUpdate() {
|
||||
return BASE_URL+UNIT_UPDATE;
|
||||
return BASE_URL + UNIT_UPDATE;
|
||||
}
|
||||
|
||||
public static String getOrderCarTypeAndCarLong() {
|
||||
return BASE_URL+ORDER_CAR_TYPE_AND_CAR_LONG;
|
||||
return BASE_URL + ORDER_CAR_TYPE_AND_CAR_LONG;
|
||||
}
|
||||
|
||||
public static String getOrderBusinessTypeList() {
|
||||
return BASE_URL+ORDER_BUSINESS_TYPE_LIST;
|
||||
return BASE_URL + ORDER_BUSINESS_TYPE_LIST;
|
||||
}
|
||||
|
||||
public static String getOrderBusinessTypeListJtt() {
|
||||
return BASE_URL+ORDER_BUSINESS_TYPE_LIST_JTT;
|
||||
return BASE_URL + ORDER_BUSINESS_TYPE_LIST_JTT;
|
||||
}
|
||||
|
||||
public static String getOrderBusinessTypeListAl() {
|
||||
return BASE_URL+ORDER_BUSINESS_TYPE_LIST_AL;
|
||||
return BASE_URL + ORDER_BUSINESS_TYPE_LIST_AL;
|
||||
}
|
||||
|
||||
public static String getOrderFindLocusList() {
|
||||
return BASE_URL+ORDER_FIND_LOCUS_LIST;
|
||||
return BASE_URL + ORDER_FIND_LOCUS_LIST;
|
||||
}
|
||||
|
||||
public static String getOrderFindOrderList() {
|
||||
return BASE_URL+ORDER_FIND_ORDER_LIST;
|
||||
return BASE_URL + ORDER_FIND_ORDER_LIST;
|
||||
}
|
||||
|
||||
public static String getOrderDel() {
|
||||
return BASE_URL+ORDER_DEL;
|
||||
return BASE_URL + ORDER_DEL;
|
||||
}
|
||||
|
||||
public static String getOrderRevoke() {
|
||||
return BASE_URL+ORDER_REVOKE;
|
||||
return BASE_URL + ORDER_REVOKE;
|
||||
}
|
||||
|
||||
public static String getOrderStatelist() {
|
||||
return BASE_URL+ORDER_STATELIST;
|
||||
return BASE_URL + ORDER_STATELIST;
|
||||
}
|
||||
|
||||
public static String getOrderPackNameList() {
|
||||
return BASE_URL+ORDER_PACK_NAME_LIST;
|
||||
return BASE_URL + ORDER_PACK_NAME_LIST;
|
||||
}
|
||||
|
||||
public static String getOrderPulistOrder() {
|
||||
return BASE_URL+ORDER_PULIST_ORDER;
|
||||
return BASE_URL + ORDER_PULIST_ORDER;
|
||||
}
|
||||
|
||||
public static String getSaFindById() {
|
||||
return BASE_URL+SA_FIND_BY_ID;
|
||||
return BASE_URL + SA_FIND_BY_ID;
|
||||
}
|
||||
|
||||
public static String getSaFindCurrentUserAppraisesCount() {
|
||||
return BASE_URL+SA_FIND_CURRENT_USER_APPRAISES_COUNT;
|
||||
return BASE_URL + SA_FIND_CURRENT_USER_APPRAISES_COUNT;
|
||||
}
|
||||
|
||||
public static String getSaFindPage() {
|
||||
return BASE_URL+SA_FIND_PAGE;
|
||||
return BASE_URL + SA_FIND_PAGE;
|
||||
}
|
||||
|
||||
public static String getDriverChoose() {
|
||||
return BASE_URL+DRIVER_CHOOSE;
|
||||
return BASE_URL + DRIVER_CHOOSE;
|
||||
}
|
||||
|
||||
public static String getDriverChooseV2() {
|
||||
return BASE_URL+DRIVER_CHOOSE_V2;
|
||||
return BASE_URL + DRIVER_CHOOSE_V2;
|
||||
}
|
||||
|
||||
public static String getOcrBank() {
|
||||
return BASE_URL+OCR_BANK;
|
||||
return BASE_URL + OCR_BANK;
|
||||
}
|
||||
|
||||
public static String getOcrBusinessLicense() {
|
||||
return BASE_URL+OCR_BUSINESS_LICENSE;
|
||||
return BASE_URL + OCR_BUSINESS_LICENSE;
|
||||
}
|
||||
|
||||
public static String getOcrIdCardFront() {
|
||||
return BASE_URL+OCR_ID_CARD_FRONT;
|
||||
return BASE_URL + OCR_ID_CARD_FRONT;
|
||||
}
|
||||
|
||||
public static String getOcrIdCardBack() {
|
||||
return BASE_URL+OCR_ID_CARD_BACK;
|
||||
return BASE_URL + OCR_ID_CARD_BACK;
|
||||
}
|
||||
|
||||
public static String getSendCode() {
|
||||
return BASE_URL+SEND_CODE;
|
||||
return BASE_URL + SEND_CODE;
|
||||
}
|
||||
|
||||
public static String forgetPwd() {
|
||||
return BASE_URL+FORGETPWD;
|
||||
return BASE_URL + FORGETPWD;
|
||||
}
|
||||
|
||||
public static String getLOGIN() { return BASE_URL+LOGIN; }
|
||||
public static String getLOGIN2() { return BASE_URL+LOGIN2; }
|
||||
public static String getLOGIN() {
|
||||
return BASE_URL + LOGIN;
|
||||
}
|
||||
|
||||
public static String getUserInfo() { return BASE_URL+USER_INFO; }
|
||||
public static String getLOGIN2() {
|
||||
return BASE_URL + LOGIN2;
|
||||
}
|
||||
|
||||
public static String getUserInfo() {
|
||||
return BASE_URL + USER_INFO;
|
||||
}
|
||||
|
||||
public static String getBankCardList() {
|
||||
return BASE_URL+BANK_CARD_LIST;
|
||||
return BASE_URL + BANK_CARD_LIST;
|
||||
}
|
||||
|
||||
public static String getBankCardAdd() {
|
||||
return BASE_URL+BANK_CARD_ADD;
|
||||
return BASE_URL + BANK_CARD_ADD;
|
||||
}
|
||||
|
||||
public static String getBankCardDelete() {
|
||||
return BASE_URL+BANK_CARD_DELETE;
|
||||
return BASE_URL + BANK_CARD_DELETE;
|
||||
}
|
||||
|
||||
public static String getBankCashApply() {
|
||||
return BASE_URL+BANK_CASH_APPLY;
|
||||
return BASE_URL + BANK_CASH_APPLY;
|
||||
}
|
||||
|
||||
public static String getContractsAdd() {
|
||||
return BASE_URL+CONTRACTS_ADD;
|
||||
return BASE_URL + CONTRACTS_ADD;
|
||||
}
|
||||
|
||||
public static String getContractsGet() {
|
||||
return BASE_URL+CONTRACTS_GET;
|
||||
return BASE_URL + CONTRACTS_GET;
|
||||
}
|
||||
|
||||
public static String getMessageFindNotReadCount() {
|
||||
return BASE_URL+MESSAGE_FIND_NOT_READ_COUNT;
|
||||
return BASE_URL + MESSAGE_FIND_NOT_READ_COUNT;
|
||||
}
|
||||
|
||||
public static String getMessageFindPage() {
|
||||
return BASE_URL+MESSAGE_FIND_PAGE;
|
||||
return BASE_URL + MESSAGE_FIND_PAGE;
|
||||
}
|
||||
|
||||
public static String getMessageSetReadById() {
|
||||
return BASE_URL+MESSAGE_SET_READ_BY_ID;
|
||||
return BASE_URL + MESSAGE_SET_READ_BY_ID;
|
||||
}
|
||||
|
||||
public static String getMessageSetReadAll() {
|
||||
return BASE_URL+MESSAGE_SET_READ_ALL;
|
||||
return BASE_URL + MESSAGE_SET_READ_ALL;
|
||||
}
|
||||
|
||||
public static String getUPLOAD() {
|
||||
return BASE_URL+UPLOAD;
|
||||
return BASE_URL + UPLOAD;
|
||||
}
|
||||
|
||||
public static String getUploadHead() {
|
||||
return BASE_URL+UPLOAD_HEAD;
|
||||
return BASE_URL + UPLOAD_HEAD;
|
||||
}
|
||||
|
||||
public static String getVERSION() {
|
||||
return BASE_URL+VERSION;
|
||||
return BASE_URL + VERSION;
|
||||
}
|
||||
|
||||
public static String getCONFIG() {
|
||||
return BASE_URL+CONFIG;
|
||||
return BASE_URL + CONFIG;
|
||||
}
|
||||
|
||||
public static String getAuthPartyMember() {
|
||||
return BASE_URL+AUTH_PARTY_MEMBER;
|
||||
return BASE_URL + AUTH_PARTY_MEMBER;
|
||||
}
|
||||
|
||||
public static String getGetUrl() {
|
||||
return BASE_URL+GET_URL;
|
||||
return BASE_URL + GET_URL;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -26,6 +26,8 @@ import android.widget.Toast;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.dahe.mylibrary.utils.TimeConstants;
|
||||
import com.dahe.mylibrary.utils.TimeUtil;
|
||||
import com.github.gzuliyujiang.wheelpicker.DatimePicker;
|
||||
import com.github.gzuliyujiang.wheelpicker.OptionPicker;
|
||||
import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
|
||||
@ -45,7 +47,9 @@ import com.oneclouds.cargo.bean.AlGoodsTypeListBean;
|
||||
import com.oneclouds.cargo.bean.BaseBean;
|
||||
import com.oneclouds.cargo.bean.BusinssTypeBean;
|
||||
import com.oneclouds.cargo.bean.CarBean;
|
||||
import com.oneclouds.cargo.bean.CarShortTypeBean;
|
||||
import com.oneclouds.cargo.bean.CarTypeLongBean;
|
||||
import com.oneclouds.cargo.bean.GoodsTypeBean;
|
||||
import com.oneclouds.cargo.bean.NpListBean;
|
||||
import com.oneclouds.cargo.bean.OptionBaseBean;
|
||||
import com.oneclouds.cargo.bean.UpAppBean;
|
||||
@ -77,9 +81,11 @@ import com.oneclouds.cargo.util.view.BaseRecyclerView;
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@ -107,6 +113,7 @@ public class HomeFragment extends BaseFragment {
|
||||
private String url = "";
|
||||
private TextView etCar;
|
||||
private EditText requirement;
|
||||
private TextView effectiveTime;
|
||||
|
||||
@Override
|
||||
public void msgMethod(Message m) {
|
||||
@ -114,6 +121,8 @@ public class HomeFragment extends BaseFragment {
|
||||
switch (m.what) {
|
||||
case 200:
|
||||
insData(OrderRequest.ORDER_CAR_TYPE_AND_CAR_LONG);
|
||||
insData(OrderRequest.ORDER_CAR_TYPE_AND_CAR);
|
||||
insData(OrderRequest.ORDER_CAR_TYPE_AND_GOODS_TYPE);
|
||||
insData(OrderRequest.ORDER_BUSINESS_TYPE_LIST);
|
||||
insData(OrderRequest.ORDER_BUSINESS_TYPE_LIST_JTT);
|
||||
insData(OrderRequest.ORDER_BUSINESS_TYPE_LIST_AL);
|
||||
@ -175,7 +184,6 @@ public class HomeFragment extends BaseFragment {
|
||||
}
|
||||
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -225,6 +233,8 @@ public class HomeFragment extends BaseFragment {
|
||||
pr.getUserInfo();
|
||||
or.carTypeLongList();
|
||||
or.businssTypeList();
|
||||
or.carType();
|
||||
or.goodType();
|
||||
or.packNameList();
|
||||
cr.cateNPList();
|
||||
cr.cateNPListAl();
|
||||
@ -267,9 +277,9 @@ public class HomeFragment extends BaseFragment {
|
||||
*/
|
||||
private void initInputCar(View v) {
|
||||
etCar = v.findViewById(R.id.etCar);
|
||||
etCar.setOnClickListener(V->{
|
||||
etCar.setOnClickListener(V -> {
|
||||
Intent intent = new Intent(con, DisCarActivity.class);
|
||||
intent.putExtra(AppConfig.STRING,etCar.getText().toString());
|
||||
intent.putExtra(AppConfig.STRING, etCar.getText().toString());
|
||||
startActivity(intent);
|
||||
});
|
||||
}
|
||||
@ -358,7 +368,7 @@ public class HomeFragment extends BaseFragment {
|
||||
TextView businessType = v.findViewById(R.id.businessType);
|
||||
//订单有效期
|
||||
RelativeLayout r5 = v.findViewById(R.id.r5);
|
||||
TextView effectiveTime = v.findViewById(R.id.effectiveTime);
|
||||
effectiveTime = v.findViewById(R.id.effectiveTime);
|
||||
|
||||
//货物大类 交通厅
|
||||
RelativeLayout r7 = v.findViewById(R.id.r7);
|
||||
@ -373,12 +383,17 @@ public class HomeFragment extends BaseFragment {
|
||||
//备注
|
||||
requirement = v.findViewById(R.id.requirement);
|
||||
|
||||
|
||||
//业务类型-默认值
|
||||
businessType.setText("干线普货运输");
|
||||
oib.getFormData().setBusinessType(1002996);
|
||||
|
||||
r7.setOnClickListener(v14 -> {
|
||||
if (isLogin()) {
|
||||
NpListBean al = TypeParts.getNpType(con);
|
||||
GoodsTypeBean ctb = TypeParts.getGoodsTypeShort(con);
|
||||
List<OptionBaseBean> data = new ArrayList<>();
|
||||
for (NpListBean.DataDTO datum : al.getData()) {
|
||||
data.add(new OptionBaseBean(datum.getId(), datum.getCateName()));
|
||||
for (GoodsTypeBean.DataDTO typeDTO : ctb.getData()) {
|
||||
data.add(new OptionBaseBean(typeDTO.getId(), typeDTO.getCateName()));
|
||||
}
|
||||
OptionPicker picker = new OptionPicker(act);
|
||||
picker.setBodyWidth(140);
|
||||
@ -390,6 +405,23 @@ public class HomeFragment extends BaseFragment {
|
||||
picker.setData(data);
|
||||
picker.setDefaultPosition(2);
|
||||
picker.show();
|
||||
|
||||
// NpListBean al = TypeParts.getNpType(con);
|
||||
// List<OptionBaseBean> data = new ArrayList<>();
|
||||
// for (NpListBean.DataDTO datum : al.getData()) {
|
||||
// data.add(new OptionBaseBean(datum.getId(), datum.getCateName()));
|
||||
// }
|
||||
// OptionPicker picker = new OptionPicker(act);
|
||||
// picker.setBodyWidth(140);
|
||||
// picker.setOnOptionPickedListener((position, item) -> {
|
||||
// OptionBaseBean obb = (OptionBaseBean) item;
|
||||
// tvHwdlJt.setText(obb.getName());
|
||||
// oib.getFormData().setGoodsBigCate(obb.getId());
|
||||
// });
|
||||
// picker.setData(data);
|
||||
// picker.setDefaultPosition(2);
|
||||
// picker.show();
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@ -472,10 +504,10 @@ public class HomeFragment extends BaseFragment {
|
||||
});
|
||||
r3.setOnClickListener(v1 -> {
|
||||
if (isLogin()) {
|
||||
CarTypeLongBean ctb = TypeParts.getCarTypeLong(con);
|
||||
CarShortTypeBean ctb = TypeParts.getCarTypeShort(con);
|
||||
List<OptionBaseBean> data = new ArrayList<>();
|
||||
for (CarTypeLongBean.DataDTO.TypeDTO typeDTO : ctb.getData().getType()) {
|
||||
data.add(new OptionBaseBean(typeDTO.getValue(), typeDTO.getName()));
|
||||
for (CarShortTypeBean.DataDTO typeDTO : ctb.getData()) {
|
||||
data.add(new OptionBaseBean(typeDTO.getValue(), typeDTO.getLabel()));
|
||||
}
|
||||
OptionPicker picker = new OptionPicker(act);
|
||||
picker.setBodyWidth(140);
|
||||
@ -559,12 +591,11 @@ public class HomeFragment extends BaseFragment {
|
||||
}
|
||||
if (null != oib.getSendTableData().get(0).getGoods()
|
||||
&& null != oib.getPutTableData().get(0).getGoods()
|
||||
&&0!=oib.getFormData().getVehicleType()
|
||||
&&0!=oib.getFormData().getVehicleLength()
|
||||
&&0!=oib.getFormData().getBusinessType()
|
||||
&&0!=oib.getFormData().getGoodsBigCate()
|
||||
&&0!=oib.getFormData().getAlctGoodsType()
|
||||
&&!TextUtils.isEmpty(oib.getFormData().getEffectiveTime())
|
||||
&& 0 != oib.getFormData().getVehicleType()
|
||||
&& 0 != oib.getFormData().getVehicleLength()
|
||||
&& 0 != oib.getFormData().getBusinessType()
|
||||
&& 0 != oib.getFormData().getGoodsBigCate()
|
||||
&& !TextUtils.isEmpty(oib.getFormData().getEffectiveTime())
|
||||
) {
|
||||
new XPopup.Builder(act)
|
||||
.isDestroyOnDismiss(true) //对于只使用一次的弹窗,推荐设置这个
|
||||
@ -749,15 +780,21 @@ public class HomeFragment extends BaseFragment {
|
||||
oib.getPutTableData().set(data_index, op);
|
||||
brv_discharge.updateItemV(data_index, op);
|
||||
// }
|
||||
|
||||
//订单有效期根据装货截止时间延长15天
|
||||
String loadingDeadline = os.getLoadingDeadline();
|
||||
String text = TimeUtil.getString(loadingDeadline, new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()), 21600, TimeConstants.MIN);
|
||||
effectiveTime.setText(text);
|
||||
oib.getFormData().setEffectiveTime(text);
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void disCarEvent(BaseEvent baseEvent){
|
||||
if (baseEvent.getData() instanceof CarBean){
|
||||
public void disCarEvent(BaseEvent baseEvent) {
|
||||
if (baseEvent.getData() instanceof CarBean) {
|
||||
CarBean data = (CarBean) baseEvent.getData();
|
||||
etCar.setText(data.getCarNum()+" "+data.getDriverPhone());
|
||||
oib.getFormData().setShipperCarId(data.getCarId()+"");
|
||||
oib.getFormData().setShipperDriverId(data.getDriverId()+"");
|
||||
etCar.setText(data.getCarNum() + " " + data.getDriverPhone());
|
||||
oib.getFormData().setShipperCarId(data.getCarId() + "");
|
||||
oib.getFormData().setShipperDriverId(data.getDriverId() + "");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -18,10 +18,16 @@ import android.widget.Toast;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.dahe.mylibrary.utils.TimeConstants;
|
||||
import com.dahe.mylibrary.utils.TimeUtil;
|
||||
import com.dahe.mylibrary.utils.ToastUtils;
|
||||
import com.github.gzuliyujiang.wheelpicker.DatePicker;
|
||||
import com.github.gzuliyujiang.wheelpicker.DatimePicker;
|
||||
import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
|
||||
import com.github.gzuliyujiang.wheelpicker.annotation.TimeMode;
|
||||
import com.github.gzuliyujiang.wheelpicker.entity.DateEntity;
|
||||
import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity;
|
||||
import com.github.gzuliyujiang.wheelpicker.widget.DateWheelLayout;
|
||||
import com.github.gzuliyujiang.wheelpicker.widget.DatimeWheelLayout;
|
||||
import com.google.gson.Gson;
|
||||
import com.lxj.xpopup.XPopup;
|
||||
@ -52,8 +58,10 @@ import com.umeng.vt.diff.V;
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* @ClassName NodeInfoActivity
|
||||
@ -78,7 +86,7 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
private TextView tvName, tvNameDis;
|
||||
private TextView tvPhone, tvPhoneDis;
|
||||
private TextView tvAddress, tvAddressDis;
|
||||
private TextView tvStartTime,tvRight;
|
||||
private TextView tvStartTime, tvRight;
|
||||
private EditText etMoney;
|
||||
private TextView tvEndTimeDis;
|
||||
private Button submit;
|
||||
@ -118,7 +126,7 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
op = oib.getPutTableData().get(0);
|
||||
tvRight.setVisibility(View.VISIBLE);
|
||||
tvRight.setText("再来一单");
|
||||
tvRight.setOnClickListener(v->{
|
||||
tvRight.setOnClickListener(v -> {
|
||||
|
||||
ChangeTabEvent changeTabEvent = new ChangeTabEvent(2);
|
||||
EventBus.getDefault().post(changeTabEvent);
|
||||
@ -168,7 +176,7 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
ryDis = v.findViewById(R.id.ryDis);
|
||||
|
||||
|
||||
ryDis.addItemDecoration(new RecyclerViewDecoration(con,RecyclerViewDecoration.VERTICAL_LIST));
|
||||
ryDis.addItemDecoration(new RecyclerViewDecoration(con, RecyclerViewDecoration.VERTICAL_LIST));
|
||||
ryDis.createV(con, new ArrayList<OrderInputBean.PutTableDataDTO.GoodsDTO>(), R.layout.item_cargo).setOnItemViewListener((position1, o1, v1) -> {
|
||||
TextView tvHWName = v1.findViewById(R.id.tvHWName);
|
||||
TextView tvCount = v1.findViewById(R.id.tvCount);
|
||||
@ -208,6 +216,7 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
ryDis.notifyDatas(op.getGoods());
|
||||
} else {
|
||||
op.setGoods(new ArrayList<>());
|
||||
// tvEndTimeDis.setText(this.op.getLoadingDeadline());
|
||||
}
|
||||
|
||||
rlTopDis.setOnClickListener(v12 -> {
|
||||
@ -228,20 +237,21 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
});
|
||||
|
||||
tvEndTimeDis.setOnClickListener(V -> {
|
||||
DatimePicker ap = new DatimePicker(act);
|
||||
final DatimeWheelLayout wheelLayout = ap.getWheelLayout();
|
||||
ap.setOnDatimePickedListener((year, month, day, hour, minute, second) -> {
|
||||
String text = year + "-" + getRead(month) + "-" + getRead(day) + " " + getRead(hour) + ":" + getRead(minute);
|
||||
this.op.setLoadingDeadline(text);
|
||||
tvEndTimeDis.setText(text);
|
||||
timeKey = true;
|
||||
});
|
||||
wheelLayout.setDateMode(DateMode.YEAR_MONTH_DAY);
|
||||
wheelLayout.setTimeMode(TimeMode.HOUR_24_NO_SECOND);
|
||||
wheelLayout.setRange(DatimeEntity.now(), DatimeEntity.yearOnFuture(10));
|
||||
wheelLayout.setDateLabel("年", "月", "日");
|
||||
wheelLayout.setTimeLabel("时", "分", "");
|
||||
ap.show();
|
||||
ToastUtils.showToast(con,"选择装货时间自动计算");
|
||||
// DatimePicker ap = new DatimePicker(act);
|
||||
// final DatimeWheelLayout wheelLayout = ap.getWheelLayout();
|
||||
// ap.setOnDatimePickedListener((year, month, day, hour, minute, second) -> {
|
||||
// String text = year + "-" + getRead(month) + "-" + getRead(day) + " " + getRead(hour) + ":" + getRead(minute);
|
||||
// this.op.setLoadingDeadline(text);
|
||||
// tvEndTimeDis.setText(text);
|
||||
// timeKey = true;
|
||||
// });
|
||||
// wheelLayout.setDateMode(DateMode.YEAR_MONTH_DAY);
|
||||
// wheelLayout.setTimeMode(TimeMode.HOUR_24_NO_SECOND);
|
||||
// wheelLayout.setRange(DatimeEntity.now(), DatimeEntity.yearOnFuture(10));
|
||||
// wheelLayout.setDateLabel("年", "月", "日");
|
||||
// wheelLayout.setTimeLabel("时", "分", "");
|
||||
// ap.show();
|
||||
});
|
||||
|
||||
|
||||
@ -273,6 +283,17 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
etMoney.setText(os.getTotalPrice() + "");
|
||||
} else {
|
||||
os.setGoods(new ArrayList<>());
|
||||
|
||||
String nowString = TimeUtil.getNowString("yyyy-MM-dd")+ " " + getRead(23) + ":" + getRead(59);
|
||||
this.os.setLoadingDeadline(nowString);
|
||||
tvStartTime.setText(nowString);
|
||||
timeKey = true;
|
||||
|
||||
String endDate = TimeUtil.getString(nowString, new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()),14400, TimeConstants.MIN);
|
||||
this.op.setLoadingDeadline(endDate);
|
||||
// tvEndTimeDis.setText(endDate);
|
||||
// timeKey = true;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -288,22 +309,25 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
});
|
||||
|
||||
tvStartTime.setOnClickListener(V -> {
|
||||
DatimePicker ap = new DatimePicker(act);
|
||||
final DatimeWheelLayout wheelLayout = ap.getWheelLayout();
|
||||
ap.setOnDatimePickedListener((year, month, day, hour, minute, second) -> {
|
||||
String text = year + "-" + getRead(month) + "-" + getRead(day) + " " + getRead(hour) + ":" + getRead(minute);
|
||||
DatePicker ap = new DatePicker(act);
|
||||
final DateWheelLayout wheelLayout = ap.getWheelLayout();
|
||||
ap.setOnDatePickedListener((year, month, day) -> {
|
||||
String text = year + "-" + getRead(month) + "-" + getRead(day) + " " + getRead(23) + ":" + getRead(59);
|
||||
this.os.setLoadingDeadline(text);
|
||||
tvStartTime.setText(text);
|
||||
timeKey = true;
|
||||
|
||||
String endDate = TimeUtil.getString(text, new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()),14400, TimeConstants.MIN);
|
||||
this.op.setLoadingDeadline(endDate);
|
||||
tvEndTimeDis.setText(endDate);
|
||||
timeKey = true;
|
||||
});
|
||||
wheelLayout.setDateMode(DateMode.YEAR_MONTH_DAY);
|
||||
wheelLayout.setTimeMode(TimeMode.HOUR_24_NO_SECOND);
|
||||
wheelLayout.setRange(DatimeEntity.now(), DatimeEntity.yearOnFuture(10));
|
||||
wheelLayout.setRange(DateEntity.today(), DateEntity.yearOnFuture(10));
|
||||
wheelLayout.setDateLabel("年", "月", "日");
|
||||
wheelLayout.setTimeLabel("时", "分", "");
|
||||
ap.show();
|
||||
});
|
||||
ryPretend.addItemDecoration(new RecyclerViewDecoration(con,RecyclerViewDecoration.VERTICAL_LIST));
|
||||
ryPretend.addItemDecoration(new RecyclerViewDecoration(con, RecyclerViewDecoration.VERTICAL_LIST));
|
||||
ryPretend.createV(con, os.getGoods(), R.layout.item_cargo).setOnItemViewListener((position1, o1, v1) -> {
|
||||
TextView tvHWName = v1.findViewById(R.id.tvHWName);
|
||||
TextView tvCount = v1.findViewById(R.id.tvCount);
|
||||
@ -325,7 +349,7 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
startActivity(in);
|
||||
});
|
||||
tvDel.setOnClickListener(v22 -> {
|
||||
if (op.getGoods().size()>0){
|
||||
if (op.getGoods().size() > 0) {
|
||||
new XPopup.Builder(con)
|
||||
// .isDestroyOnDismiss(true) //对于只使用一次的弹窗,推荐设置这个
|
||||
.asConfirm("请确认", "删除装货货物,需重新添加卸货地址货物?",
|
||||
@ -336,7 +360,7 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
ryDis.delAllDatas();
|
||||
}, null, false, R.layout.alert_ok_cancel) //最后一个参数绑定已有布局
|
||||
.show();
|
||||
}else{
|
||||
} else {
|
||||
ryPretend.delItemV(position1);
|
||||
}
|
||||
|
||||
@ -441,8 +465,7 @@ public class NodeInfoActivity extends BaseActivity {
|
||||
String startTim = tvStartTime.getText().toString();
|
||||
String endTimeDis = tvEndTimeDis.getText().toString();
|
||||
if (TextUtils.isEmpty(name) || TextUtils.isEmpty(nameDis) ||
|
||||
TextUtils.isEmpty(money) || TextUtils.isEmpty(startTim) ||
|
||||
TextUtils.isEmpty(endTimeDis)) {
|
||||
TextUtils.isEmpty(money) || TextUtils.isEmpty(startTim)) {
|
||||
ToastUtil.show(con, "请完善装卸货信息");
|
||||
return;
|
||||
}
|
||||
|
@ -5,7 +5,9 @@ import android.content.Context;
|
||||
import com.google.gson.Gson;
|
||||
import com.oneclouds.cargo.bean.AlGoodsTypeListBean;
|
||||
import com.oneclouds.cargo.bean.BusinssTypeBean;
|
||||
import com.oneclouds.cargo.bean.CarShortTypeBean;
|
||||
import com.oneclouds.cargo.bean.CarTypeLongBean;
|
||||
import com.oneclouds.cargo.bean.GoodsTypeBean;
|
||||
import com.oneclouds.cargo.bean.NpListBean;
|
||||
import com.oneclouds.cargo.bean.PackNameBean;
|
||||
import com.oneclouds.cargo.constant.SPConstant;
|
||||
@ -62,6 +64,35 @@ public class TypeParts {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
//车型车长
|
||||
public static CarShortTypeBean getCarTypeShort(Context con){
|
||||
String str=SPUtil.getSP(con,"chacheData", OrderRequest.ORDER_CAR_TYPE_AND_CAR);
|
||||
if(!str.equals("")){
|
||||
CarShortTypeBean ctlb=gson.fromJson(str, CarShortTypeBean.class);
|
||||
if(ctlb.getCode()==200){
|
||||
return ctlb;
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
//货物大类-汇总(交通厅安联)
|
||||
public static GoodsTypeBean getGoodsTypeShort(Context con){
|
||||
String str=SPUtil.getSP(con,"chacheData", OrderRequest.ORDER_CAR_TYPE_AND_GOODS_TYPE);
|
||||
if(!str.equals("")){
|
||||
GoodsTypeBean ctlb=gson.fromJson(str, GoodsTypeBean.class);
|
||||
if(ctlb.getCode()==200){
|
||||
return ctlb;
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
//业务类型
|
||||
public static BusinssTypeBean getBusType(Context con){
|
||||
String str=SPUtil.getSP(con,"chacheData", OrderRequest.ORDER_BUSINESS_TYPE_LIST);
|
||||
|
@ -274,6 +274,14 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_2"
|
||||
android:background="#F6F6F9"/>
|
||||
|
||||
<TextView
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:gravity="center"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="ICP备案号:豫ICP备09025418号-25A"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<Button
|
||||
|
@ -10,7 +10,7 @@
|
||||
android:layout_marginRight="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_9"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_370"
|
||||
android:layout_height="@dimen/dp_300"
|
||||
android:orientation="vertical"
|
||||
android:background="@mipmap/icon_huoyuan_bottom"
|
||||
android:paddingLeft="@dimen/dp_12"
|
||||
@ -260,7 +260,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/dp_24"
|
||||
android:text="货物大类(交通厅)"
|
||||
android:text="货物大类"
|
||||
android:textColor="#ff999999"
|
||||
android:textSize="@dimen/sp_14" />
|
||||
<LinearLayout
|
||||
@ -287,11 +287,13 @@
|
||||
</RelativeLayout>
|
||||
|
||||
<View
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:background="#8AA5E1"
|
||||
android:alpha="0.5"/>
|
||||
<RelativeLayout
|
||||
android:visibility="gone"
|
||||
android:id="@+id/r8"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@ -334,11 +336,13 @@
|
||||
</RelativeLayout>
|
||||
|
||||
<View
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:background="#8AA5E1"
|
||||
android:alpha="0.5"/>
|
||||
<RelativeLayout
|
||||
android:visibility="gone"
|
||||
android:id="@+id/r5"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
@ -79,6 +79,7 @@
|
||||
android:background="@color/def_text" />
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_marginTop="@dimen/dp_14"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@ -114,6 +115,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:layout_marginTop="@dimen/dp_16"
|
||||
|
Loading…
Reference in New Issue
Block a user