From 16f3172092b3fe67ee1f4c3d0fcf3720f04f9fbc Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 19 Aug 2024 10:56:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=81=94=EF=BC=8C=E4=BA=A4=E9=80=9A?= =?UTF-8?q?=E5=8E=85=E5=A4=A7=E7=B1=BB=E5=8C=B9=E9=85=8D=EF=BC=8C=E5=8D=B8?= =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E7=A8=8E=E5=8F=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../cargo/ui/home/ChoiceAddressActivity.java | 13 ++++++------- .../com/oneclouds/cargo/ui/home/HomeFragment.java | 14 ++++++++++++++ .../ui/waybill/activity/AnotherOrderActivity.kt | 4 ++++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0dcb812..793cbb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -124,7 +124,7 @@ android { appName = '货主端正式_' } variant.outputs.all { - outputFileName = appName+"_${variant.productFlavors[0].name}_v${variant.productFlavors[0].versionName}.apk" + outputFileName = appName+"_${variant.productFlavors[0].name}_v${versionName}.apk" } } } diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java index d19e208..2bb808b 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java +++ b/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java @@ -284,23 +284,22 @@ public class ChoiceAddressActivity extends BaseActivity implements View.OnClickL private void submint() { String name = etName.getText().toString(); String phone = etPhone.getText().toString(); - String num = tvNum.getText().toString(); +// String num = tvNum.getText().toString(); String address = tvAddress.getText().toString(); String addressDetail = etAddressDetail.getText().toString(); String tvNum2 = tvNum.getText().toString(); String comName2 = etName2.getText().toString(); - if (TextUtils.isEmpty(name) || TextUtils.isEmpty(phone) || - TextUtils.isEmpty(num) || TextUtils.isEmpty(address) || + if (TextUtils.isEmpty(name) || TextUtils.isEmpty(phone) || TextUtils.isEmpty(address) || TextUtils.isEmpty(addressDetail)||TextUtils.isEmpty(comName2)) { ToastUtil.show(con, "请完善信息"); return; } - if (type!=300001&&(num.length()!=15&&num.length()!=18&&num.length()!=20)){ - ToastUtil.show(con, "税号/身份证号长度不正确"); - return; - } +// if (type!=300001&&(num.length()!=15&&num.length()!=18&&num.length()!=20)){ +// ToastUtil.show(con, "税号/身份证号长度不正确"); +// return; +// } if (phone.startsWith("1") && phone.length() == 11) { aib.setAddressDetail(addressDetail); diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java b/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java index 18faeb2..7f30d92 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java +++ b/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java @@ -405,6 +405,20 @@ public class HomeFragment extends BaseFragment { OptionBaseBean obb = (OptionBaseBean) item; tvHwdlJt.setText(obb.getName()); oib.getFormData().setGoodsBigCate(obb.getId()); + + //匹配安联货物大类 + oib.getFormData().setAlctGoodsType(ctb.getData().get(position).getAlctGoodsTypeId()); + +// int alctGoodsTypeId = ctb.getData().get(position).getAlctGoodsTypeId(); +// AlGoodsTypeListBean al = TypeParts.getAlType(con); +// for (AlGoodsTypeListBean.DataDTO datum : al.getData()) { +// if (alctGoodsTypeId==datum.getId()){ +// tvHwdlAl.setText(obb.getName()); +// oib.getFormData().setAlctGoodsType(obb.getId()); +// break; +// } +// } + }); picker.setData(data); picker.setDefaultPosition(2); diff --git a/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt b/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt index f65f3f6..a41de40 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt +++ b/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt @@ -483,6 +483,10 @@ class AnotherOrderActivity : BaseActivity() { val obb = item as OptionBaseBean tvHwdlJt.text = obb.name oib.formData.goodsBigCate = obb.id + //匹配安联货物大类 + + //匹配安联货物大类 + oib.formData.alctGoodsType = ctb.data[position].alctGoodsTypeId } picker.setData(data) picker.setDefaultPosition(2)