denghuan/good-luck-cargo
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

34发货，再来一单装卸货地址添加经纬度字段

Browse Source
This commit is contained in:
lijia 2025-01-09 08:51:32 +08:00
parent 8508bd8149
commit cb55876bce
9 changed files with 95 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -34,8 +34,8 @@ android {
applicationId "com.oneclouds.cargo"
minSdkVersion 23
targetSdkVersion 30
versionCode 33
versionName "3.1.3"
versionCode 34
versionName "3.1.4"
flavorDimensions "CHANNEL_VALUE"

18
app/src/main/java/com/oneclouds/cargo/bean/AddressListBean.java
View File

@ -151,10 +151,28 @@ public class AddressListBean {
private String createTime;
private String updateTime;
private String companyName;
private String latitude;
private String longitude;
private String companyCode;
private Object idCard;
private int userType;
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getBusinessCode() {
return businessCode;
}

2
app/src/main/java/com/oneclouds/cargo/request/WaybillRequest.java
View File

@ -82,7 +82,7 @@ public class WaybillRequest {
Map<String,Object> map=new HashMap<>();
map.put("page",page);
map.put("limit",limit);
map.put("receiverAddress",receiverAddress);
map.put("searchValue",receiverAddress);
// if(orderStatus!=0){
map.put("orderStatus",200004);
// }

19
app/src/main/java/com/oneclouds/cargo/request/bean/AddressInputBean.java
View File

@ -19,6 +19,8 @@ public class AddressInputBean{
private String companyCode;
private String companyName;
private String contactNumber;
private String longitude;
private String latitude;
private String contactPerson;
private String createTime;
private int id;
@ -32,6 +34,23 @@ public class AddressInputBean{
private int userId;
private int userType;
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getBusinessName() {
return businessName;
}

36
app/src/main/java/com/oneclouds/cargo/request/bean/OrderInputBean.java
View File

@ -197,8 +197,26 @@ public class OrderInputBean {
private String loadingPhone;
private String companyName;
private String companyCode;
private String lat;
private String lng;
private int sort;
public String getLat() {
return lat;
}
public void setLat(String lat) {
this.lat = lat;
}
public String getLng() {
return lng;
}
public void setLng(String lng) {
this.lng = lng;
}
public String getCompanyName() {
return companyName;
}
@ -343,6 +361,8 @@ public class OrderInputBean {
private List<GoodsDTO> goods;
private List<Integer> loadingAddress;
private String loadingDeadline;
private String lat;
private String lng;
private String loadingName;
private String loadingPhone;
private String companyName;
@ -350,6 +370,22 @@ public class OrderInputBean {
private int sort;
private double totalPrice;
public String getLat() {
return lat;
}
public void setLat(String lat) {
this.lat = lat;
}
public String getLng() {
return lng;
}
public void setLng(String lng) {
this.lng = lng;
}
public String getCompanyName() {
return companyName;
}

3
app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java
View File

@ -272,6 +272,7 @@ public class ChoiceAddressActivity extends BaseActivity implements View.OnClickL
etAddressDetail.setText(o.getAddress() + o.getName());
// etAddressDetail.setText(o.getDistrict() + o.getAddress());
adapter.setList(null);
});
@ -411,6 +412,8 @@ public class ChoiceAddressActivity extends BaseActivity implements View.OnClickL
tvAddress.setText(province + "-" + city + "-" + district);
aib.setLatitude(regeocodeResult.getRegeocodeQuery().getPoint().getLatitude()+"");
aib.setLongitude(regeocodeResult.getRegeocodeQuery().getPoint().getLongitude()+"");
aib.setProvinceS(province);
aib.setCityS(city);
aib.setAreaS(district);

12
app/src/main/java/com/oneclouds/cargo/ui/home/NodeInfoActivity.java
View File

@ -381,26 +381,30 @@ public class NodeInfoActivity extends BaseActivity {
list.add(ad.getCity());
list.add(ad.getArea());
if (event.getType() == 0) {
os.setDetailAddress(ad.getAddressDetail());
os.setDetailAddress(ad.getPathName()+ad.getAddressDetail());
os.setLoadingName(ad.getContactPerson());
os.setLoadingPhone(ad.getContactNumber());
os.setCompanyCode(ad.getCompanyCode());
os.setCompanyName(ad.getCompanyName());
os.setLat(ad.getLatitude());
os.setLng(ad.getLongitude());
os.setLoadingAddress(list);
tvName.setText(ad.getContactPerson());
tvPhone.setText(ad.getContactNumber());
tvAddress.setText(ad.getAddressDetail());
tvAddress.setText(ad.getPathName()+ad.getAddressDetail());
// GetObjectName.ZIModel(address_box,os,con);
} else {
op.setDetailAddress(ad.getAddressDetail());
op.setDetailAddress(ad.getPathName()+ad.getAddressDetail());
op.setLoadingName(ad.getContactPerson());
op.setLoadingPhone(ad.getContactNumber());
op.setCompanyCode(ad.getCompanyCode());
op.setCompanyName(ad.getCompanyName());
op.setLat(ad.getLatitude());
op.setLng(ad.getLongitude());
op.setLoadingAddress(list);
tvNameDis.setText(ad.getContactPerson());
tvPhoneDis.setText(ad.getContactNumber());
tvAddressDis.setText(ad.getAddressDetail());
tvAddressDis.setText(ad.getPathName()+ad.getAddressDetail());
// GetObjectName.ZIModel(address_box,op,con);
}

12
app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt
View File

@ -664,26 +664,30 @@ class AnotherOrderActivity : BaseActivity() {
list.add(ad.getCity())
list.add(ad.getArea())
if (event.type == 0) {
oib.sendTableData.get(0).setDetailAddress(ad.getAddressDetail())
oib.sendTableData.get(0).setDetailAddress(ad.pathName+ad.getAddressDetail())
oib.sendTableData.get(0).setLoadingName(ad.getContactPerson())
oib.sendTableData.get(0).setLoadingPhone(ad.getContactNumber())
oib.sendTableData.get(0).setCompanyCode(ad.getCompanyCode())
oib.sendTableData.get(0).setCompanyName(ad.getCompanyName())
oib.sendTableData.get(0).lat = ad.latitude
oib.sendTableData.get(0).lng = ad.longitude
oib.sendTableData.get(0).setLoadingAddress(list)
tvName.setText(ad.getContactPerson())
tvPhone.setText(ad.getContactNumber())
tvAddress.setText(ad.getAddressDetail())
tvAddress.setText(ad.pathName+ad.getAddressDetail())
// GetObjectName.ZIModel(address_box,os,con);
} else {
oib.putTableData.get(0).setDetailAddress(ad.getAddressDetail())
oib.putTableData.get(0).setDetailAddress(ad.pathName+ad.getAddressDetail())
oib.putTableData.get(0).setLoadingName(ad.getContactPerson())
oib.putTableData.get(0).setLoadingPhone(ad.getContactNumber())
oib.putTableData.get(0).setCompanyCode(ad.getCompanyCode())
oib.putTableData.get(0).setCompanyName(ad.getCompanyName())
oib.putTableData.get(0).lat = ad.latitude
oib.putTableData.get(0).lng = ad.longitude
oib.putTableData.get(0).setLoadingAddress(list)
tvNameDis.setText(ad.getContactPerson())
tvPhoneDis.setText(ad.getContactNumber())
tvAddressDis.setText(ad.getAddressDetail())
tvAddressDis.setText(ad.pathName+ad.getAddressDetail())
// GetObjectName.ZIModel(address_box,op,con);
}
}

2
app/src/main/res/layout/activity_choice_address.xml
View File

@ -201,8 +201,6 @@
android:background="@null"
android:gravity="right"
android:hint="请输入详细地址"
android:maxLines="1"
android:singleLine="true"
android:textSize="@dimen/dp_14" />
<ImageView