diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index 2d21c67..52a4c54 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -60,13 +60,6 @@ //绑定事件 holder.entrustStateView.setOnClickListener { -// if (rowsBean.status == "2" || rowsBean.status == "4") { -// "当前状态不可编辑".show(context) -// } else { -// listener?.onStateViewClicked(position) -// } - - //暂不做判断,计量中心人员只能接收和退回,不能编辑 listener?.onStateViewClicked(position) } } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index 2d21c67..52a4c54 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -60,13 +60,6 @@ //绑定事件 holder.entrustStateView.setOnClickListener { -// if (rowsBean.status == "2" || rowsBean.status == "4") { -// "当前状态不可编辑".show(context) -// } else { -// listener?.onStateViewClicked(position) -// } - - //暂不做判断,计量中心人员只能接收和退回,不能编辑 listener?.onStateViewClicked(position) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 31be87c..e35122e 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.home +import android.view.View import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,19 @@ entrustViewModel.entrustDetail.observe(this) { if (it.code == 200) { - fragmentPages.add(BasicInformationFragment(it.data)) + val data = it.data + + // 未接收:1 + // 已接收:2 + // 已取消:3 + // 检测完成:4 + if (data.status == "1") { + returnImageView.visibility = View.GONE + } else { + acceptImageView.visibility = View.GONE + } + + fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(LogRecordFragment()) val entrustPageTitles = arrayOf("基础信息", "日志记录")