From 039fd4ac37f3264bd7af734c7a2b41bbb352788b Mon Sep 17 00:00:00 2001 From: lijia Date: Fri, 8 Nov 2024 09:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A7=E7=89=A9=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dhsd/glowner/bean/OrderBean.kt | 6 +- .../ui/home/activtiy/GoodsInfoListActivity.kt | 19 +++-- .../ui/home/activtiy/SendGoodsActivity.kt | 81 ++++++++++--------- .../main/res/layout/activity_send_goods.xml | 71 ++++++++++++++++ 4 files changed, 133 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/dhsd/glowner/bean/OrderBean.kt b/app/src/main/java/com/dhsd/glowner/bean/OrderBean.kt index 807b984..b75a3cb 100644 --- a/app/src/main/java/com/dhsd/glowner/bean/OrderBean.kt +++ b/app/src/main/java/com/dhsd/glowner/bean/OrderBean.kt @@ -197,6 +197,8 @@ data class PostOrderBean( var receiverAddress: String, var vehicleType: String, var vehicleLength: String, + var requirement: String, + var remark: String, var childList:MutableList = mutableListOf(), var goodsList:MutableList = mutableListOf(), var order : OrderBean? = null @@ -211,8 +213,8 @@ data class PostOrderBean( "","","","","","", "","","","","","", "","","","","", - "","","","","","","","", - "","", "","","") + "","","","","","","","","", + "","", "","","","") } data class Child( diff --git a/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/GoodsInfoListActivity.kt b/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/GoodsInfoListActivity.kt index 4b474d9..5ee58fa 100644 --- a/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/GoodsInfoListActivity.kt +++ b/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/GoodsInfoListActivity.kt @@ -104,6 +104,13 @@ class GoodsInfoListActivity : BaseActivity(), } + + editPosition = -1 + ActivityUtils.startActivityForResult( + this@GoodsInfoListActivity, + GoodsInfoActivity::class.java, + 1 + ) } override fun initDate() { @@ -114,12 +121,12 @@ class GoodsInfoListActivity : BaseActivity(), super.onClick(view) when (view?.id) { R.id.tvGood -> { - var datas = mutableListOf("螺纹钢", "螺纹钢1", "螺纹钢2") - PickerUtils.getInstance().showSingleSelect( - this, "请选择货物", datas - ) { position, item -> - showToast(item as String) - } +// var datas = mutableListOf("螺纹钢", "螺纹钢1", "螺纹钢2") +// PickerUtils.getInstance().showSingleSelect( +// this, "请选择货物", datas +// ) { position, item -> +// showToast(item as String) +// } } R.id.tvGoodType -> { diff --git a/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/SendGoodsActivity.kt b/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/SendGoodsActivity.kt index d4a03bb..252b2ec 100644 --- a/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/SendGoodsActivity.kt +++ b/app/src/main/java/com/dhsd/glowner/ui/home/activtiy/SendGoodsActivity.kt @@ -70,6 +70,12 @@ class SendGoodsActivity : BaseActivity() { GoodsInfoListActivity::class.java, 8888 ) + +// ActivityUtils.startActivityForResult( +// this@SendGoodsActivity, +// GoodsInfoActivity::class.java, +// 8888 +// ) } llCarType.setOnClickListener { ActivityUtils.startActivityForResult( @@ -96,40 +102,9 @@ class SendGoodsActivity : BaseActivity() { super.onActivityResult(requestCode, resultCode, data) if (resultCode == AppCompatActivity.RESULT_OK) { data?.extras?.let { - val string = it.getString(AppConfig.BEAN, "") - if (string.isNotEmpty()) { - val addressBean = Gson().fromJson(string, AddressBean::class.java) - //处理地址信息 - if (requestCode == 0) { - datas[requestCode] = addressBean.apply { - type = "1" - address = addressDetail - name = contactPerson - phone = contactNumber - } - } else if (requestCode == datas.size - 1) { - datas[requestCode] = addressBean.apply { - type = "2" - address = addressDetail - name = contactPerson - phone = contactNumber - } - } else { - datas[requestCode] = addressBean.apply { - isPassingPoints = "1" - address = addressDetail - name = contactPerson - phone = contactNumber - } - } - adapter.notifyItemChanged(requestCode) - } - - } - data?.let { when (requestCode) { 8888 -> { - val datas = it.getStringExtra(AppConfig.DATAS) + val datas = it.getString(AppConfig.DATAS) val userListType = object : TypeToken>() {}.type goodList = Gson().fromJson(datas, userListType) @@ -142,20 +117,51 @@ class SendGoodsActivity : BaseActivity() { } 9999 -> { - val cx = it.getStringExtra(AppConfig.CX) - val cc = it.getStringExtra(AppConfig.CC) + val cx = it.getString(AppConfig.CX) + val cc = it.getString(AppConfig.CC) postOrderBean.run { if (cx != null) { vehicleType = cx } if (cc != null) { - vehicleLength = cc.replace("米", "") + vehicleLength = cc } } binding.tvCarType.text = """$cc $cx""" } - } + else -> { + val string = it.getString(AppConfig.BEAN, "") + if (string.isNotEmpty()) { + val addressBean = + Gson().fromJson(string, AddressBean::class.java) + //处理地址信息 + if (requestCode == 0) { + datas[requestCode] = addressBean.apply { + type = "1" + address = addressDetail + name = contactPerson + phone = contactNumber + } + } else if (requestCode == datas.size - 1) { + datas[requestCode] = addressBean.apply { + type = "2" + address = addressDetail + name = contactPerson + phone = contactNumber + } + } else { + datas[requestCode] = addressBean.apply { + isPassingPoints = "1" + address = addressDetail + name = contactPerson + phone = contactNumber + } + } + adapter.notifyItemChanged(requestCode) + } + } + } } } } @@ -184,6 +190,9 @@ class SendGoodsActivity : BaseActivity() { inputFreight = binding.etMoney.text.toString()//运费 childList = datas goodsList = goodList + requirement = binding.etRequire.text.toString().trim() + remark = binding.etRemark.text.toString().trim() + } DataManager.getInstance().addOrder(postOrderBean) diff --git a/app/src/main/res/layout/activity_send_goods.xml b/app/src/main/res/layout/activity_send_goods.xml index e17f45f..7fcd1f9 100644 --- a/app/src/main/res/layout/activity_send_goods.xml +++ b/app/src/main/res/layout/activity_send_goods.xml @@ -212,6 +212,77 @@ tools:text="5000元" /> + + + + + + + + + + + + + + + + + + + + + +