diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt index 3c2d122..adb0ab2 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt @@ -54,7 +54,8 @@ data class GjjManifest( var splitFlag: String = "", // 分批标志 var subCode: String = "", // 子代码 var unNumber: String = "", // 危险品编号 - var activeId: Long = 0 // 活动ID + var activeId: Long = 0, // 活动ID + var locationTally: String = "" // 理货库位号 ) : Serializable { // 分单列表 var haWbList: List? = null diff --git a/module_base/src/main/res/drawable/bg_light_green_radius_8.xml b/module_base/src/main/res/drawable/bg_light_green_radius_8.xml new file mode 100644 index 0000000..1b3f7d7 --- /dev/null +++ b/module_base/src/main/res/drawable/bg_light_green_radius_8.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt index 7754940..cb7bd5f 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt @@ -1,5 +1,6 @@ package com.lukouguoji.gjj.holder +import android.graphics.Color import android.view.View import com.lukouguoji.gjj.R import com.lukouguoji.gjj.databinding.ItemIntImpManifestBinding @@ -43,6 +44,13 @@ class IntImpManifestViewHolder(view: View) : clickListener?.onItemClick(position, 102) // 102=删除 } + // 展开按钮颜色:绿色背景时黑色,否则保持原色 + if (bean.ref == "1") { + binding.ivShow.setColorFilter(Color.BLACK) + } else { + binding.ivShow.clearColorFilter() + } + // 展开按钮点击事件 - 先加载分单数据,再切换展开状态 binding.ivShow.setOnClickListener { if (!bean.showMore.get() && bean.haWbList.isNullOrEmpty()) { diff --git a/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml b/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml index d7e3aaa..3249b4c 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml @@ -259,7 +259,7 @@ diff --git a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml index b997197..017f3ff 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml @@ -32,7 +32,7 @@