From fe4c8a2bebb43cdeeda7043e6048074924211a5b Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 7 Nov 2024 10:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/home/activtiy/SendGoodsActivity.kt     | 87 +++++++++----------
 1 file changed, 42 insertions(+), 45 deletions(-)

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 ce5d3c3..45f4e91 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
@@ -51,23 +51,16 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
 
     private var isMul = false
     override fun initView(savedInstanceState: Bundle?) {
-        setStatusBarColor(R.color.white)
-        setTitleBar("普通装货", true)
-
         intent.extras?.let {
             isMul = it.getBoolean(AppConfig.IS_MUL, false)
         }
+        setStatusBarColor(R.color.white)
+        setTitleBar( if (isMul) "一装多卸" else "普通装货", true)
 
-        datas = mutableListOf<AddressBean>(
-            AddressBean(),
-            AddressBean()
-        )
         binding.run {
             llAdd.visibility = if (isMul) View.VISIBLE else View.GONE
             tvAdd.setOnClickListener {
-
-                adapter.add(datas.size-1,AddressBean())
-                adapter.notifyDataSetChanged()
+                adapter.add(datas.size - 1, AddressBean())
             }
             llGoods.setOnClickListener {
                 ActivityUtils.startActivityForResult(
@@ -90,37 +83,8 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
             tvDate.setOnClickListener {
                 selectDate()
             }
+            initRecycle()
         }
-
-
-
-        adapter = binding.recycler.run {
-            layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false)
-            addItemDecoration(
-                RecycleViewDivider(
-                    LinearLayout.VERTICAL,
-                    ConvertUtils.dp2px(10.0f),
-                    Color.TRANSPARENT
-                )
-            )
-            adapter = SendGoodsAdapter()
-            adapter as SendGoodsAdapter
-        }.apply {
-            isStateViewEnable = true
-            setOnItemClickListener { adapter, view, position ->
-                ActivityUtils.startActivityForResult(
-                    this@SendGoodsActivity,
-                    AddressListActivity::class.java,
-                    position
-                )
-            }
-
-            addOnItemChildClickListener(R.id.tvDel){adapter,_,position->
-                adapter.removeAt(position)
-            }
-        }
-        adapter.submitList(datas)
-
     }
 
     override fun initDate() {
@@ -133,7 +97,7 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
                 val string = it.getString(AppConfig.BEAN, "")
                 if (string.isNotEmpty()) {
                     val addressBean = Gson().fromJson<AddressBean>(string, AddressBean::class.java)
-
+                    //处理地址信息
                     if (requestCode == 0) {
                         datas[requestCode] = addressBean.apply {
                             type = "1"
@@ -141,14 +105,14 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
                             name = contactPerson
                             phone = contactNumber
                         }
-                    } else if (requestCode == datas.size-1) {
+                    } else if (requestCode == datas.size - 1) {
                         datas[requestCode] = addressBean.apply {
                             type = "2"
                             address = addressDetail
                             name = contactPerson
                             phone = contactNumber
                         }
-                    }else{
+                    } else {
                         datas[requestCode] = addressBean.apply {
                             isPassingPoints = "1"
                             address = addressDetail
@@ -166,7 +130,7 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
                         val datas = it.getStringExtra(AppConfig.DATAS)
                         val userListType = object : TypeToken<MutableList<GoodBean>>() {}.type
 
-                        goodList = Gson().fromJson<MutableList<GoodBean>>(datas, userListType)
+                        goodList = Gson().fromJson(datas, userListType)
                         val joinToString = goodList.joinToString(separator = "\n") { innerIt ->
                             """${innerIt.goodName},${innerIt.jttGoodsCategoryName},${
                                 if (!TextUtils.isEmpty(innerIt.goodItemGrossWeight)) innerIt.goodItemGrossWeight + "吨" else innerIt.goodCube + "m³"
@@ -240,7 +204,7 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
             }))
     }
 
-    private fun selectDate(){
+    private fun selectDate() {
         PickerUtils.getInstance()
             .showDateSim(this@SendGoodsActivity, "装货截止时间") { date ->
                 binding.tvDate.text = date
@@ -281,4 +245,37 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
 
             }
     }
+
+    private fun initRecycle() {
+        datas = mutableListOf<AddressBean>(
+            AddressBean(),
+            AddressBean()
+        )
+        adapter = binding.recycler.run {
+            layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false)
+            addItemDecoration(
+                RecycleViewDivider(
+                    LinearLayout.VERTICAL,
+                    ConvertUtils.dp2px(10.0f),
+                    Color.TRANSPARENT
+                )
+            )
+            adapter = SendGoodsAdapter()
+            adapter as SendGoodsAdapter
+        }.apply {
+            isStateViewEnable = true
+            setOnItemClickListener { adapter, view, position ->
+                ActivityUtils.startActivityForResult(
+                    this@SendGoodsActivity,
+                    AddressListActivity::class.java,
+                    position
+                )
+            }
+
+            addOnItemChildClickListener(R.id.tvDel) { adapter, _, position ->
+                adapter.removeAt(position)
+            }
+        }
+        adapter.submitList(datas)
+    }
 }
\ No newline at end of file