From 4ea76341c3267d5c31bd84f225215baecd855e27 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Sat, 13 Sep 2025 21:13:26 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E3=80=81=E8=AF=A6=E6=83=85=E3=80=81UI"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e959a71e854f53d6719c7b0fbb850ac85111cc57. --- .../adapter/TunnelWorkingFaceAdapter.kt | 16 +- .../db/dao/TunnelWorkingFaceRecordDao.kt | 3 - .../tunnel/TunnelRoofLithologyEntity.kt | 6 +- .../tunnel/TunnelWorkingFaceRecordEntity.kt | 9 - .../TunnelWorkingFaceRecordRepository.kt | 5 - .../TunnelWorkingFaceRecordViewModel.kt | 5 - .../activity/AddWorkingPointActivity.kt | 1 - .../tunneling/activity/TunnelingActivity.kt | 47 ++---- .../ui/tunneling/activity/WorkFaceActivity.kt | 1 - .../activity/WorkingFaceDetailActivity.kt | 38 +---- .../adapter/TunnelingRockNatureAdapter.kt | 30 +--- .../ui/user/fragment/UserFragment.kt | 4 - .../res/layout/activity_add_working_point.xml | 14 +- .../src/main/res/layout/item_rock_nature.xml | 158 +++++++++--------- .../layout/list_item_tunnel_working_face.xml | 1 - coalMiningApp/config.gradle | 2 +- 16 files changed, 113 insertions(+), 227 deletions(-) diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt index 77e9fc2..8fc5d28 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt @@ -17,9 +17,7 @@ import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity import com.zmkg.coaloperation.ui.tunneling.activity.TunnelingActivity import com.zmkg.coaloperation.ui.tunneling.activity.WorkingPointActivity import com.zmkg.coaloperation.utils.ScreenUtil -import com.zmkg.coaloperation.utils.gone import com.zmkg.coaloperation.utils.toJsonString -import com.zmkg.coaloperation.utils.visible class TunnelWorkingFaceAdapter(var list: MutableList) : BaseQuickAdapter( @@ -46,9 +44,7 @@ class TunnelWorkingFaceAdapter(var list: MutableList) : holder.binding.let { binding -> binding.includeHeader.root.isEnabled = false binding.tvWorkingFaceName.text = item.surfaceName - binding.llFaceRecord.let { - if (item.isExpandRecord) it.visible() else it.gone() - } + binding.llFaceRecord.visibility = if (item.isExpandRecord) View.VISIBLE else View.GONE binding.ivExpandRecord.setImageResource( if (item.isExpandRecord) R.drawable.ic_arrow_down_white else R.drawable.ic_arrow_right_gray ) @@ -59,10 +55,6 @@ class TunnelWorkingFaceAdapter(var list: MutableList) : item.records = mutableListOf() } val size = item.records!!.size - binding.includeHeader.root.let { header -> - if (size > 0) header.visible() - else header.gone() - } rv.updateLayoutParams { height = if (size >= 3) ScreenUtil.dp2px(150F) @@ -99,11 +91,7 @@ class TunnelWorkingFaceAdapter(var list: MutableList) : inner class VH(var binding: ListItemTunnelWorkingFaceBinding) : BaseViewHolder(binding.root) init { - addChildClickViewIds( - R.id.start_record, - R.id.ivExpandRecord, - R.id.llWorkingFace - ) + addChildClickViewIds(R.id.start_record, R.id.ivExpandRecord) } } \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt index 2aba4c4..8dd8cab 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt @@ -30,9 +30,6 @@ interface TunnelWorkingFaceRecordDao { @Query("SELECT * FROM tunnel_working_face_record WHERE surfaceId = :recordId") fun getEntityById(recordId: Long): TunnelWorkingFaceRecordEntity - @Query("SELECT * FROM tunnel_working_face_record WHERE surfaceId = :surfaceId AND latestRecordState = '1' ORDER BY createTime ASC LIMIT 1") - fun getLastEntity(surfaceId: Long): TunnelWorkingFaceRecordEntity? - @Query("DELETE FROM tunnel_working_face_record") fun deleteAll(): Int } \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelRoofLithologyEntity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelRoofLithologyEntity.kt index 9da4cf2..59168f1 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelRoofLithologyEntity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelRoofLithologyEntity.kt @@ -2,7 +2,6 @@ package com.zmkg.coaloperation.db.entiry.tunnel import android.os.Parcelable import androidx.room.Entity -import androidx.room.Ignore import androidx.room.PrimaryKey import com.zmkg.coaloperation.utils.DateTimeUtil import kotlinx.parcelize.Parcelize @@ -60,7 +59,4 @@ class TunnelRoofLithologyEntity ( * 数据状态：0-默认值，原始数据，1-已修改数据 */ var dataState: String = "0" -): Parcelable { - @Ignore - constructor():this(lithologyId = 0) -} +): Parcelable \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceRecordEntity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceRecordEntity.kt index bc95435..a231181 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceRecordEntity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceRecordEntity.kt @@ -68,10 +68,6 @@ data class TunnelWorkingFaceRecordEntity ( * 煤层高度 */ var seamHeight: String? = null, - /** - * 涌水量 - */ - var waterYield: String? = null, /** * 创建时间 @@ -88,11 +84,6 @@ data class TunnelWorkingFaceRecordEntity ( */ var dataState: String = "0", - /** - * 工作面中昨日记录状态：0-默认值，非昨日记录，1-昨日记录 - */ - var latestRecordState: String = "0", - @Ignore var mineWorkingLithologyList: MutableList? = null, diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt index 22002b2..fe14ca4 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt @@ -31,11 +31,6 @@ class TunnelWorkingFaceRecordRepository(private val dao: TunnelWorkingFaceRecord suspend fun getEntityById(faceId: Long) = withContext(Dispatchers.IO) { dao.getEntityById(faceId) } - - suspend fun getLastEntity(surfaceId: Long) = withContext(Dispatchers.IO) { - dao.getLastEntity(surfaceId) - } - suspend fun deleteAll() = withContext(Dispatchers.IO) { dao.deleteAll() } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt index 0058e46..b26014b 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt @@ -56,11 +56,6 @@ class TunnelWorkingFaceRecordViewModel(application: Application) : AndroidViewMo repository.getEntityById(recordId) } - fun getLastEntity(surfaceId: Long, action: (TunnelWorkingFaceRecordEntity?) -> Unit) = viewModelScope.launch { - val record = repository.getLastEntity(surfaceId) - action(record) - } - fun deleteAll(action: () -> Unit={}) = viewModelScope.launch { repository.deleteAll() action() diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingPointActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingPointActivity.kt index cf14ec7..a196c99 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingPointActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingPointActivity.kt @@ -230,7 +230,6 @@ class AddWorkingPointActivity : Log.d(TAG, "saveFaceRecord: ${roofLithologyList.toJson()}") workingFaceRecordViewModel.insert(faceRecord) { - EventBus.getDefault().post(faceRecord) roofLithologyViewModel.insertList(roofLithologyList) { finish() } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt index 3e924c7..0cd814c 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt @@ -41,13 +41,12 @@ class TunnelingActivity : private val workingFaceAdapter: TunnelWorkingFaceAdapter by lazy { TunnelWorkingFaceAdapter(workingFaceList).apply { + setOnItemClickListener { _, _, position -> + toActivity(WorkingFaceDetailActivity::class.java, Bundle().apply { + putParcelable(WorkingFaceDetailActivity.FACE_DETAIL, workingFaceList[position]) + }) + } setOnItemChildClickListener { _, view, position -> - if (view.id == R.id.llWorkingFace) { - toActivity(WorkingFaceDetailActivity::class.java, Bundle().apply { - putParcelable(WorkingFaceDetailActivity.FACE_DETAIL, workingFaceList[position]) - }) - return@setOnItemChildClickListener - } if (view.id == R.id.ivExpandRecord) { val expandState = view.tag.toString().toBooleanStrictOrNull() ?: false workingFaceList[position].isExpandRecord = expandState.not() @@ -127,7 +126,10 @@ class TunnelingActivity : workingFaceAdapter.notifyItemChanged(position) return@getEntityList } - val recordAdapter = getRecordAdapter(position) + val viewHolder = + mBinding.rvList.findViewHolderForLayoutPosition(position) as TunnelWorkingFaceAdapter.VH + val recordAdapter = + viewHolder.binding.rvFaceRecord.adapter as TunnelWorkingFaceRecordAdapter recordAdapter.apply { list.clear() // list.add(FACE_RECORD_HEADER) @@ -141,15 +143,6 @@ class TunnelingActivity : @Subscribe(threadMode = ThreadMode.MAIN) fun onWorkingFaceEvent(event: TunnelWorkingFaceEntity) { val index = workingFaceList.indexOfFirst { it.surfaceId == event.surfaceId } - if (index == -1) { - //新增工作面 - val insertIndex = workingFaceList.size - workingFaceList.add(event) - workingFaceAdapter.notifyItemInserted(insertIndex) - workingFaceAdapter.notifyItemRangeChanged(insertIndex, insertIndex+1) - return - } - //修改工作面 workingFaceViewModel.getEntityById(event.surfaceId) { entity -> workingFaceList[index] = entity workingFaceAdapter.notifyItemChanged(index) @@ -158,27 +151,7 @@ class TunnelingActivity : @Subscribe(threadMode = ThreadMode.MAIN) fun onFaceRecordEvent(event: TunnelWorkingFaceRecordEntity) { - val position = workingFaceList.indexOfFirst { it.surfaceId == event.surfaceId } - val faceEntity = workingFaceList[position] - if (faceEntity.isExpandRecord.not()) { - return - } - faceEntity.records?.let { records -> - val index = records.indexOfFirst { it.recordId == event.recordId } - if (index == -1) { - records.add(event) - } else { - records[index] = event - } - } - val recordAdapter = getRecordAdapter(position) - recordAdapter.notifyDataSetChanged() - } - - private fun getRecordAdapter(position:Int):TunnelWorkingFaceRecordAdapter { - val viewHolder = - mBinding.rvList.findViewHolderForLayoutPosition(position) as TunnelWorkingFaceAdapter.VH - return viewHolder.binding.rvFaceRecord.adapter as TunnelWorkingFaceRecordAdapter + //TODO 折叠子列表 } } \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkFaceActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkFaceActivity.kt index a611cb8..70c1074 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkFaceActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkFaceActivity.kt @@ -287,7 +287,6 @@ class WorkFaceActivity : } workingFaceViewModel.insert(workingFaceEntity) { showToast("工作面新增完成") - EventBus.getDefault().post(workingFaceEntity) finish() } } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt index 82f42ac..8e98621 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt @@ -5,12 +5,8 @@ import android.view.View import com.zmkg.coaloperation.R import com.zmkg.coaloperation.base.BaseVMBActivity import androidx.core.graphics.toColorInt -import androidx.lifecycle.ViewModelProvider import com.zmkg.coaloperation.databinding.ActivityWorkingFaceDetailBinding -import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity -import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel -import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceRecordViewModel import com.zmkg.coaloperation.ui.tunneling.adapter.TunnelingRockNatureAdapter import com.zmkg.coaloperation.ui.tunneling.bean.FaceWorkDetailBean import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel @@ -30,18 +26,7 @@ class WorkingFaceDetailActivity : const val FACE_DETAIL = "faceDetail" } - private val workingFaceRecordViewModel: TunnelWorkingFaceRecordViewModel by lazy { - ViewModelProvider(this)[TunnelWorkingFaceRecordViewModel::class.java] - } - - private val roofLithologyViewModel: TunnelRoofLithologyViewModel by lazy { - ViewModelProvider(this)[TunnelRoofLithologyViewModel::class.java] - } - private val tunnelingRockNatureAdapter: TunnelingRockNatureAdapter by lazy { - TunnelingRockNatureAdapter(lithologyList) - } - - private val lithologyList:MutableList = mutableListOf() + val tunnelingRockNatureAdapter: TunnelingRockNatureAdapter by lazy { TunnelingRockNatureAdapter() } private var faceDetail: TunnelWorkingFaceEntity? = null @@ -85,23 +70,8 @@ class WorkingFaceDetailActivity : // } faceDetail = intent.getParcelableExtra(FACE_DETAIL) - faceDetail?.let { detail -> + faceDetail?.let { loadFaceDetail() - workingFaceRecordViewModel.getLastEntity(detail.surfaceId) { record -> - record?.let { - mBinding.tvYesterdayLen.text = "${it.workingFootage}m" - mBinding.tvWorkingFaceAngle.text = "${it.seamDip}" -// mBinding.tvMonthAccumulateLen.text = "${it.monthFootage}m" - mBinding.tvWorkingFaceWater.text = "${it.waterYield}" - - roofLithologyViewModel.getEntityList(it.recordId) { list -> - list?.let { - lithologyList.addAll(it) - tunnelingRockNatureAdapter.notifyDataSetChanged() - } - } - } - } } } @@ -137,7 +107,7 @@ class WorkingFaceDetailActivity : bean ?: return } - private fun stringToDouble(numText: String?): Double { + private fun stringToDouble(numText:String?): Double { if (numText.isNullOrEmpty() || numText.isBlank()) return 0.toDouble() return numText.toDouble() } @@ -149,7 +119,7 @@ class WorkingFaceDetailActivity : val total = stringToDouble(bean.totalFootage) val accumulative = stringToDouble(bean.accumulativeFootage) - val remaining = stringToDouble(bean.remainingFootage) + val remaining =stringToDouble( bean.remainingFootage) tvLenTotal.text = "总进尺：${total}m" tvLenAccumulate.text = "累计进尺：${accumulative}m" diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingRockNatureAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingRockNatureAdapter.kt index 09ff7d3..2cbdfbe 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingRockNatureAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingRockNatureAdapter.kt @@ -1,38 +1,26 @@ package com.zmkg.coaloperation.ui.tunneling.adapter -import android.view.LayoutInflater -import android.view.ViewGroup import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.zmkg.coaloperation.R -import com.zmkg.coaloperation.databinding.ItemRockNatureBinding -import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity +import com.zmkg.coaloperation.ui.tunneling.bean.MineWorkingLithology +import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeItemBean /** * 顶板岩性 */ -class TunnelingRockNatureAdapter(list: MutableList) : - BaseQuickAdapter(R.layout.item_rock_nature, list) { +class TunnelingRockNatureAdapter : + BaseQuickAdapter(R.layout.item_rock_nature) { - inner class VH(var binding: ItemRockNatureBinding):BaseViewHolder(binding.root) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH { - val binding = ItemRockNatureBinding.inflate( - LayoutInflater.from(context),parent, false - ) - return VH(binding).also { - bindViewClickListener(it, viewType) - } - } + override fun convert(holder: BaseViewHolder, item: MineWorkingLithology) { + holder.setText(R.id.tvRock1Start, "${item.positionStart}") + .setText(R.id.tvRock1End, "${item.positionEnd}") + .setText(R.id.tvRock1Name, item.lithologyType) + - override fun convert(holder: VH, item: TunnelRoofLithologyEntity) { - holder.binding.let { - it.tvRock1Start.text = item.positionStart - it.tvRock1End.text = item.positionEnd - it.tvRock1Name.text = item.lithologyType - } } } \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/user/fragment/UserFragment.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/user/fragment/UserFragment.kt index 9f2fbc2..d7f192b 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/user/fragment/UserFragment.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/user/fragment/UserFragment.kt @@ -155,10 +155,6 @@ class UserFragment : workingFaceViewModel.insertList(list) {} list.forEach { faceEntity -> faceEntity.records?.let { recordList -> - val lastRecordId = faceEntity.latestRecord?.recordId - val record = recordList.firstOrNull {it.recordId == lastRecordId} - record?.latestRecordState = "1" - //保存工作面记录数据 workingFaceRecordViewModel.insertList(recordList) recordList.forEach { recordEntity -> diff --git a/coalMiningApp/app/src/main/res/layout/activity_add_working_point.xml b/coalMiningApp/app/src/main/res/layout/activity_add_working_point.xml index 5e01617..8fe6897 100644 --- a/coalMiningApp/app/src/main/res/layout/activity_add_working_point.xml +++ b/coalMiningApp/app/src/main/res/layout/activity_add_working_point.xml @@ -18,7 +18,7 @@ android:id="@+id/toolbar_lay" layout="@layout/lay_title_right_bar" /> - + android:background="@drawable/bg_stroke_gray" + android:orientation="vertical"> - - + diff --git a/coalMiningApp/app/src/main/res/layout/item_rock_nature.xml b/coalMiningApp/app/src/main/res/layout/item_rock_nature.xml index 1cddb3c..d41358b 100644 --- a/coalMiningApp/app/src/main/res/layout/item_rock_nature.xml +++ b/coalMiningApp/app/src/main/res/layout/item_rock_nature.xml @@ -1,82 +1,82 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_face.xml b/coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_face.xml index cb1e861..9a1b872 100644 --- a/coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_face.xml +++ b/coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_face.xml @@ -15,7 +15,6 @@ android:orientation="vertical">