diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt index b76dc7f..32bfe98 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt @@ -4,14 +4,14 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustDetailModel +import com.pengxh.kt.lite.extensions.dp2px class CustomerSampleAdapter( - context: Context, + private val context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { @@ -25,14 +25,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { val params = holder.itemView.layoutParams - params.height = LinearLayout.LayoutParams.WRAP_CONTENT + params.height = 80f.dp2px(context) //绑定数据 val rowsBean = dataRows[position] - holder.sampleCodeView.text = rowsBean.sampleName + holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" + holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" + holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" + holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) + var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) + var validDateView: TextView = view.findViewById(R.id.validDateView) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt index b76dc7f..32bfe98 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt @@ -4,14 +4,14 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustDetailModel +import com.pengxh.kt.lite.extensions.dp2px class CustomerSampleAdapter( - context: Context, + private val context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { @@ -25,14 +25,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { val params = holder.itemView.layoutParams - params.height = LinearLayout.LayoutParams.WRAP_CONTENT + params.height = 80f.dp2px(context) //绑定数据 val rowsBean = dataRows[position] - holder.sampleCodeView.text = rowsBean.sampleName + holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" + holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" + holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" + holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) + var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) + var validDateView: TextView = view.findViewById(R.id.validDateView) } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml index c7414bb..a37e381 100644 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ b/app/src/main/res/layout/fragment_entrust_basic_information.xml @@ -180,7 +180,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_solid_layout_white_radius_10" android:paddingHorizontal="@dimen/dp_5" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -229,7 +228,6 @@ android:id="@+id/sampleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingHorizontal="@dimen/dp_10" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt index b76dc7f..32bfe98 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerSampleAdapter.kt @@ -4,14 +4,14 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustDetailModel +import com.pengxh.kt.lite.extensions.dp2px class CustomerSampleAdapter( - context: Context, + private val context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { @@ -25,14 +25,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { val params = holder.itemView.layoutParams - params.height = LinearLayout.LayoutParams.WRAP_CONTENT + params.height = 80f.dp2px(context) //绑定数据 val rowsBean = dataRows[position] - holder.sampleCodeView.text = rowsBean.sampleName + holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" + holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" + holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" + holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) + var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) + var validDateView: TextView = view.findViewById(R.id.validDateView) } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml index c7414bb..a37e381 100644 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ b/app/src/main/res/layout/fragment_entrust_basic_information.xml @@ -180,7 +180,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_solid_layout_white_radius_10" android:paddingHorizontal="@dimen/dp_5" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -229,7 +228,6 @@ android:id="@+id/sampleRecyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingHorizontal="@dimen/dp_10" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/item_customer_sample_rv_l.xml b/app/src/main/res/layout/item_customer_sample_rv_l.xml index 474b89b..27e5016 100644 --- a/app/src/main/res/layout/item_customer_sample_rv_l.xml +++ b/app/src/main/res/layout/item_customer_sample_rv_l.xml @@ -1,10 +1,60 @@ - + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/dp_5" + android:layout_marginTop="@dimen/dp_5" + app:cardCornerRadius="@dimen/dp_5" + app:cardElevation="@dimen/dp_3"> - - \ No newline at end of file + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_margin="@dimen/dp_5" + android:orientation="vertical"> + + + + + + + + + + + + + \ No newline at end of file