From 4867c14581991b9a06788fffad1eb4ed767e93ef Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Sun, 14 Sep 2025 11:38:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/AndroidManifest.xml | 8 +-- .../adapter/TunnelWorkingFaceAdapter.kt | 8 +-- .../adapter/TunnelingRockNatureAdapter.kt | 5 +- ...eActivity.kt => AddWorkingFaceActivity.kt} | 5 +- ...ity.kt => AddWorkingFaceRecordActivity.kt} | 6 +- .../tunneling/activity/TunnelingActivity.kt | 16 ++--- .../activity/WorkingFaceDetail2Activity.kt | 6 +- ...tivity.kt => WorkingFaceRecordActivity.kt} | 16 ++--- ...ty.kt => WorkingFaceStatisticsActivity.kt} | 8 +-- .../tunneling/adapter/TunnelingHomeAdapter.kt | 64 ------------------- .../adapter/TunnelingHomeListAdapter.kt | 27 -------- ...face.xml => activity_add_working_face.xml} | 0 ...l => activity_add_working_face_record.xml} | 0 ...t.xml => activity_working_face_record.xml} | 0 ...l => activity_working_face_statistics.xml} | 0 15 files changed, 38 insertions(+), 131 deletions(-) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/{ui/tunneling => }/adapter/TunnelingRockNatureAdapter.kt (89%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/{WorkFaceActivity.kt => AddWorkingFaceActivity.kt} (98%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/{AddWorkingPointActivity.kt => AddWorkingFaceRecordActivity.kt} (97%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/{WorkingPointActivity.kt => WorkingFaceRecordActivity.kt} (87%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/{WorkingFaceDetailActivity.kt => WorkingFaceStatisticsActivity.kt} (95%) delete mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeAdapter.kt delete mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeListAdapter.kt rename coalMiningApp/app/src/main/res/layout/{activity_work_face.xml => activity_add_working_face.xml} (100%) rename coalMiningApp/app/src/main/res/layout/{activity_add_working_point.xml => activity_add_working_face_record.xml} (100%) rename coalMiningApp/app/src/main/res/layout/{activity_working_point.xml => activity_working_face_record.xml} (100%) rename coalMiningApp/app/src/main/res/layout/{activity_working_face_detail.xml => activity_working_face_statistics.xml} (100%) diff --git a/coalMiningApp/app/src/main/AndroidManifest.xml b/coalMiningApp/app/src/main/AndroidManifest.xml index 4c35391..e8d699a 100644 --- a/coalMiningApp/app/src/main/AndroidManifest.xml +++ b/coalMiningApp/app/src/main/AndroidManifest.xml @@ -31,13 +31,13 @@ - - + + - - 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..53bb06e 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 @@ -15,7 +15,7 @@ import com.zmkg.coaloperation.R import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingFaceBinding 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.ui.tunneling.activity.WorkingFaceRecordActivity import com.zmkg.coaloperation.utils.ScreenUtil import com.zmkg.coaloperation.utils.gone import com.zmkg.coaloperation.utils.toJsonString @@ -81,10 +81,10 @@ class TunnelWorkingFaceAdapter(var list: MutableList) : Log.d(TAG, "convert: ${item.records!![recordPosition].toJsonString()}") context.let { ctx -> if (ctx is TunnelingActivity) { - ctx.toActivity(WorkingPointActivity::class.java, Bundle().apply { - putString(WorkingPointActivity.FACE_NAME, item.surfaceName) + ctx.toActivity(WorkingFaceRecordActivity::class.java, Bundle().apply { + putString(WorkingFaceRecordActivity.FACE_NAME, item.surfaceName) putParcelable( - WorkingPointActivity.FACE_RECORD, + WorkingFaceRecordActivity.FACE_RECORD, item.records!![recordPosition] ) }) 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/adapter/TunnelingRockNatureAdapter.kt similarity index 89% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingRockNatureAdapter.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt index 09ff7d3..bb47590 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingRockNatureAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt @@ -1,4 +1,4 @@ -package com.zmkg.coaloperation.ui.tunneling.adapter +package com.zmkg.coaloperation.adapter import android.view.LayoutInflater import android.view.ViewGroup @@ -8,7 +8,6 @@ import com.zmkg.coaloperation.R import com.zmkg.coaloperation.databinding.ItemRockNatureBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity - /** * 顶板岩性 */ @@ -16,7 +15,7 @@ import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity class TunnelingRockNatureAdapter(list: MutableList) : BaseQuickAdapter(R.layout.item_rock_nature, list) { - inner class VH(var binding: ItemRockNatureBinding):BaseViewHolder(binding.root) + inner class VH(var binding: ItemRockNatureBinding): BaseViewHolder(binding.root) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH { val binding = ItemRockNatureBinding.inflate( 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/AddWorkingFaceActivity.kt similarity index 98% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkFaceActivity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt index a611cb8..31ba623 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/AddWorkingFaceActivity.kt @@ -21,6 +21,7 @@ import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus import androidx.core.view.isGone import com.zmkg.coaloperation.bean.WorkOption +import com.zmkg.coaloperation.databinding.ActivityAddWorkingFaceBinding import com.zmkg.coaloperation.utils.DateTimeUtil import com.zmkg.coaloperation.utils.DictUtils import com.zmkg.coaloperation.utils.PickerUtil @@ -33,8 +34,8 @@ import java.time.LocalDateTime /** * 工作面 */ -class WorkFaceActivity : - BaseVMBActivity(R.layout.activity_work_face) { +class AddWorkingFaceActivity : + BaseVMBActivity(R.layout.activity_add_working_face) { companion object { private const val TAG = "WorkFaceActivity" 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/AddWorkingFaceRecordActivity.kt similarity index 97% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingPointActivity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceRecordActivity.kt index cf14ec7..0c70aed 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/AddWorkingFaceRecordActivity.kt @@ -10,7 +10,7 @@ import com.zmkg.coaloperation.R import com.zmkg.coaloperation.adapter.TunnelRoofLithologyAdapter import com.zmkg.coaloperation.base.BaseVMBActivity import com.zmkg.coaloperation.base.viewmodel.TestViewModel -import com.zmkg.coaloperation.databinding.ActivityAddWorkingPointBinding +import com.zmkg.coaloperation.databinding.ActivityAddWorkingFaceRecordBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel @@ -29,8 +29,8 @@ import java.time.LocalDateTime /** * 开始记录 */ -class AddWorkingPointActivity : - BaseVMBActivity(R.layout.activity_add_working_point) { +class AddWorkingFaceRecordActivity : + BaseVMBActivity(R.layout.activity_add_working_face_record) { companion object { const val TAG = "AddWorkingPointActivity" 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..2076f43 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 @@ -43,8 +43,8 @@ class TunnelingActivity : TunnelWorkingFaceAdapter(workingFaceList).apply { setOnItemChildClickListener { _, view, position -> if (view.id == R.id.llWorkingFace) { - toActivity(WorkingFaceDetailActivity::class.java, Bundle().apply { - putParcelable(WorkingFaceDetailActivity.FACE_DETAIL, workingFaceList[position]) + toActivity(WorkingFaceStatisticsActivity::class.java, Bundle().apply { + putParcelable(WorkingFaceStatisticsActivity.FACE_DETAIL, workingFaceList[position]) }) return@setOnItemChildClickListener } @@ -59,16 +59,16 @@ class TunnelingActivity : return@setOnItemChildClickListener } if (view.id == R.id.start_record) { - toActivity(AddWorkingPointActivity::class.java, Bundle().apply { + toActivity(AddWorkingFaceRecordActivity::class.java, Bundle().apply { putLong( - AddWorkingPointActivity.FACE_ID, + AddWorkingFaceRecordActivity.FACE_ID, workingFaceList[position].surfaceId ) putString( - AddWorkingPointActivity.FACE_NAME, + AddWorkingFaceRecordActivity.FACE_NAME, workingFaceList[position].surfaceName ) - putInt(AddWorkingPointActivity.SHOW_TYPE, 0) + putInt(AddWorkingFaceRecordActivity.SHOW_TYPE, 0) }) } } @@ -105,8 +105,8 @@ class TunnelingActivity : override fun bindEvent() { mBinding.toolbarLay.titleTvRight.setOnClickListener { - toActivity(WorkFaceActivity::class.java, Bundle().apply { - putString(WorkFaceActivity.WORK_FACE_TYPE, WorkFaceActivity.WorkFaceType.ADD.name) + toActivity(AddWorkingFaceActivity::class.java, Bundle().apply { + putString(AddWorkingFaceActivity.WORK_FACE_TYPE, AddWorkingFaceActivity.WorkFaceType.ADD.name) }) } } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt index 8091cb7..6598241 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt @@ -50,10 +50,10 @@ class WorkingFaceDetail2Activity : override fun bindEvent() { mBinding.toolbarLay.titleTvRight.setOnClickListener { - toActivity(WorkFaceActivity::class.java, Bundle().apply { - putString(WorkFaceActivity.WORK_FACE_TYPE, WorkFaceActivity.WorkFaceType.EDIT.name) + toActivity(AddWorkingFaceActivity::class.java, Bundle().apply { + putString(AddWorkingFaceActivity.WORK_FACE_TYPE, AddWorkingFaceActivity.WorkFaceType.EDIT.name) // putSerializable(WorkFaceActivity.FACE_WORK_DETAIL_DATA, detail) - putParcelable(WorkFaceActivity.FACE_WORK_DETAIL_DATA, detail) + putParcelable(AddWorkingFaceActivity.FACE_WORK_DETAIL_DATA, detail) }) } } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingPointActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt similarity index 87% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingPointActivity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt index b2c0fa5..67053dc 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingPointActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt @@ -10,10 +10,8 @@ import com.zmkg.coaloperation.R import com.zmkg.coaloperation.adapter.WorkingItemAdapter import com.zmkg.coaloperation.base.BaseVMBActivity import com.zmkg.coaloperation.base.viewmodel.TestViewModel -import com.zmkg.coaloperation.bean.RockItem import com.zmkg.coaloperation.bean.WorkingFaceItem -import com.zmkg.coaloperation.databinding.ActivityWorkingPointBinding -import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity +import com.zmkg.coaloperation.databinding.ActivityWorkingFaceRecordBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel import com.zmkg.coaloperation.utils.DictUtils @@ -24,8 +22,8 @@ import org.greenrobot.eventbus.ThreadMode /** * 查看（棋盘井） */ -class WorkingPointActivity : - BaseVMBActivity(R.layout.activity_working_point) { +class WorkingFaceRecordActivity : + BaseVMBActivity(R.layout.activity_working_face_record) { companion object { const val TAG = "WorkingPointActivity" @@ -49,10 +47,10 @@ class WorkingPointActivity : mBinding.toolbarLay.title = "查看详情" mBinding.toolbarLay.rightText = "修改" mBinding.toolbarLay.titleTvRight.setOnClickListener { - toActivity(AddWorkingPointActivity::class.java, Bundle().apply { - putInt(AddWorkingPointActivity.SHOW_TYPE, 1) - putString(AddWorkingPointActivity.FACE_NAME, faceName) - putParcelable(AddWorkingPointActivity.FACE_RECORD, faceRecord) + toActivity(AddWorkingFaceRecordActivity::class.java, Bundle().apply { + putInt(AddWorkingFaceRecordActivity.SHOW_TYPE, 1) + putString(AddWorkingFaceRecordActivity.FACE_NAME, faceName) + putParcelable(AddWorkingFaceRecordActivity.FACE_RECORD, faceRecord) }) } mBinding.rvPointList.let { 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/WorkingFaceStatisticsActivity.kt similarity index 95% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt index 82f42ac..42687a7 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/WorkingFaceStatisticsActivity.kt @@ -6,12 +6,12 @@ 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.adapter.TunnelingRockNatureAdapter +import com.zmkg.coaloperation.databinding.ActivityWorkingFaceStatisticsBinding import com.zmkg.coaloperation.ui.tunneling.bean.FaceWorkDetailBean import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel import com.zmkg.coaloperation.utils.ScreenUtil @@ -23,8 +23,8 @@ import kotlin.math.roundToInt /** * 工作面详情 */ -class WorkingFaceDetailActivity : - BaseVMBActivity(R.layout.activity_working_face_detail) { +class WorkingFaceStatisticsActivity : + BaseVMBActivity(R.layout.activity_working_face_statistics) { companion object { const val FACE_DETAIL = "faceDetail" diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeAdapter.kt deleted file mode 100644 index 358c0a8..0000000 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeAdapter.kt +++ /dev/null @@ -1,64 +0,0 @@ -//package com.zmkg.coaloperation.ui.tunneling.adapter -// -//import android.content.Intent -//import android.view.View -//import android.widget.ImageView -//import android.widget.LinearLayout -//import androidx.recyclerview.widget.RecyclerView -//import com.chad.library.adapter.base.BaseQuickAdapter -//import com.chad.library.adapter.base.viewholder.BaseViewHolder -//import com.zmkg.coaloperation.R -//import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeBean -//import com.zmkg.coaloperation.ui.tunneling.activity.WorkingPointActivity -// -// -///** -// * 掘进首页列表 -// */ -// -//class TunnelingHomeAdapter(var listener: (Int,String?)->Unit) : BaseQuickAdapter( -// R.layout.item_geological_list -//) { -// -// override fun convert(holder: BaseViewHolder, item: TunnelingHomeBean) { -// val tunnelingHomeListAdapter: TunnelingHomeListAdapter by lazy { TunnelingHomeListAdapter().apply { -// setOnItemClickListener { adapter, view, position -> -// context.startActivity(Intent(context, WorkingPointActivity::class.java)) -// } -// } } -// -// val rvList = holder.getView(R.id.rv_content) -// val expand = holder.getView(R.id.expand) -// val recordLayout = holder.getView(R.id.record_layout) -// -// holder.apply { -// setText(R.id.title, item.surfaceName) -// rvList.adapter = tunnelingHomeListAdapter -// tunnelingHomeListAdapter.setNewInstance(item.contentList?:mutableListOf()) -// } -// expand.setOnClickListener { -// val imageView = it as ImageView -// if (imageView.tag.equals("0")) {//收起状态 -// imageView.setImageResource(R.drawable.ic_arrow_down_white) -// recordLayout.visibility = View.VISIBLE -// imageView.tag = "1" -// -// if (data[holder.absoluteAdapterPosition].contentList.isNullOrEmpty()) { -//// if (context is TunnelingActivity) { -//// (context as TunnelingActivity).getRecordList(holder.layoutPosition) { -//// tunnelingHomeListAdapter.notifyDataSetChanged() -//// } -//// } -// listener.invoke(holder.absoluteAdapterPosition,data[holder.absoluteAdapterPosition].surfaceId) -// } -// } else {//展开状态 -// imageView.setImageResource(R.drawable.ic_arrow_right_gray) -// recordLayout.visibility = View.GONE -// imageView.tag = "0" -// } -// } -// } -// init { -// addChildClickViewIds(R.id.start_record) -// } -//} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeListAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeListAdapter.kt deleted file mode 100644 index a1d53e5..0000000 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeListAdapter.kt +++ /dev/null @@ -1,27 +0,0 @@ -//package com.zmkg.coaloperation.ui.tunneling.adapter -// -//import com.chad.library.adapter.base.BaseQuickAdapter -//import com.chad.library.adapter.base.viewholder.BaseViewHolder -//import com.zmkg.coaloperation.R -//import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeItemBean -// -// -///** -// * 掘进首页点击出现的列表 -// */ -// -//class TunnelingHomeListAdapter : -// BaseQuickAdapter(R.layout.item_geological_list_content) { -// -// -// override fun convert(holder: BaseViewHolder, item: TunnelingHomeItemBean) { -// if (holder.absoluteAdapterPosition != 0) { -// holder.setGone(R.id.head, true) -// } -// holder.setText(R.id.time, item.workingDate) -// .setText(R.id.record, item.recordPerson) -// -// -// } -// -//} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/activity_work_face.xml b/coalMiningApp/app/src/main/res/layout/activity_add_working_face.xml similarity index 100% rename from coalMiningApp/app/src/main/res/layout/activity_work_face.xml rename to coalMiningApp/app/src/main/res/layout/activity_add_working_face.xml diff --git a/coalMiningApp/app/src/main/res/layout/activity_add_working_point.xml b/coalMiningApp/app/src/main/res/layout/activity_add_working_face_record.xml similarity index 100% rename from coalMiningApp/app/src/main/res/layout/activity_add_working_point.xml rename to coalMiningApp/app/src/main/res/layout/activity_add_working_face_record.xml diff --git a/coalMiningApp/app/src/main/res/layout/activity_working_point.xml b/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml similarity index 100% rename from coalMiningApp/app/src/main/res/layout/activity_working_point.xml rename to coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml diff --git a/coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml b/coalMiningApp/app/src/main/res/layout/activity_working_face_statistics.xml similarity index 100% rename from coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml rename to coalMiningApp/app/src/main/res/layout/activity_working_face_statistics.xml From 87278949d1de644123304490188ad8eed6e09368 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Sun, 14 Sep 2025 11:51:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/AndroidManifest.xml | 2 +- .../adapter/TunnelRoofLithologyAdapter.kt | 5 +- ...r.kt => TunnelWorkingRecordItemAdapter.kt} | 21 +++-- .../adapter/TunnelingRockNatureAdapter.kt | 8 +- .../{ui/tunneling => }/bean/DictBean.kt | 2 +- ...FaceItem.kt => TunnelWorkingRecordItem.kt} | 2 +- .../{ui/tunneling => }/bean/TunnelingBean.kt | 56 ++++++------ .../zmkg/coaloperation/data/api/HomeApi.kt | 19 ++-- .../data/repository/HomeRepository.kt | 81 ++++++++--------- .../activity/AddWorkingFaceActivity.kt | 32 ++----- ...tivity.kt => WorkingFaceDetailActivity.kt} | 42 ++++----- .../activity/WorkingFaceRecordActivity.kt | 28 +++--- .../activity/WorkingFaceStatisticsActivity.kt | 6 +- .../tunneling/viewmodel/TunnelingViewModel.kt | 88 +++++++++---------- .../com/zmkg/coaloperation/utils/DictUtils.kt | 2 +- .../java/com/zmkg/coaloperation/utils/Ext.kt | 30 ++++++- ...2.xml => activity_working_face_detail.xml} | 2 +- .../layout/activity_working_face_record.xml | 2 +- ... list_item_tunnel_working_record_item.xml} | 0 19 files changed, 213 insertions(+), 215 deletions(-) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/{WorkingItemAdapter.kt => TunnelWorkingRecordItemAdapter.kt} (81%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/{ui/tunneling => }/bean/DictBean.kt (85%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/{WorkingFaceItem.kt => TunnelWorkingRecordItem.kt} (92%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/{ui/tunneling => }/bean/TunnelingBean.kt (80%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/{WorkingFaceDetail2Activity.kt => WorkingFaceDetailActivity.kt} (62%) rename coalMiningApp/app/src/main/res/layout/{activity_working_face_detail2.xml => activity_working_face_detail.xml} (93%) rename coalMiningApp/app/src/main/res/layout/{list_item_working_face.xml => list_item_tunnel_working_record_item.xml} (100%) diff --git a/coalMiningApp/app/src/main/AndroidManifest.xml b/coalMiningApp/app/src/main/AndroidManifest.xml index e8d699a..371d9d2 100644 --- a/coalMiningApp/app/src/main/AndroidManifest.xml +++ b/coalMiningApp/app/src/main/AndroidManifest.xml @@ -33,7 +33,7 @@ - + diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelRoofLithologyAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelRoofLithologyAdapter.kt index e7f5b9e..5339b82 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelRoofLithologyAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelRoofLithologyAdapter.kt @@ -8,6 +8,7 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.zmkg.coaloperation.R import com.zmkg.coaloperation.databinding.ListItemRockBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity +import com.zmkg.coaloperation.utils.formatDecimalString class TunnelRoofLithologyAdapter(var list: MutableList) : BaseQuickAdapter( @@ -34,13 +35,13 @@ class TunnelRoofLithologyAdapter(var list: MutableList item.positionStart = text.toString().trim() }) - setText(item.positionStart) + setText(item.positionStart.formatDecimalString()) } it.tvRockEndLen.run { addTextChangedListener(onTextChanged = { text, start, before, count -> item.positionEnd = text.toString().trim() }) - setText(item.positionEnd) + setText(item.positionEnd.formatDecimalString()) } it.tvRockType.run { addTextChangedListener(onTextChanged = { text, start, before, count -> diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/WorkingItemAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingRecordItemAdapter.kt similarity index 81% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/WorkingItemAdapter.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingRecordItemAdapter.kt index 1a9d8f4..6a4d96e 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/WorkingItemAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingRecordItemAdapter.kt @@ -9,21 +9,20 @@ import androidx.core.view.updateLayoutParams import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.zmkg.coaloperation.R -import com.zmkg.coaloperation.bean.RockItem -import com.zmkg.coaloperation.bean.WorkingFaceItem +import com.zmkg.coaloperation.bean.TunnelWorkingRecordItem import com.zmkg.coaloperation.databinding.ListItemRockBinding -import com.zmkg.coaloperation.databinding.ListItemWorkingFaceBinding +import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingRecordItemBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity import com.zmkg.coaloperation.utils.ScreenUtil -class WorkingItemAdapter(data: MutableList) : - BaseQuickAdapter( - R.layout.list_item_working_face, +class TunnelWorkingRecordItemAdapter(data: MutableList) : + BaseQuickAdapter( + R.layout.list_item_tunnel_working_record_item, data ) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH { - val binding = ListItemWorkingFaceBinding.inflate( + val binding = ListItemTunnelWorkingRecordItemBinding.inflate( LayoutInflater.from(parent.context), parent, false @@ -35,7 +34,7 @@ class WorkingItemAdapter(data: MutableList) : override fun convert( holder: VH, - item: WorkingFaceItem + item: TunnelWorkingRecordItem ) { if (item.pageType == 0) { loadFaceData(holder.binding, item) @@ -52,7 +51,7 @@ class WorkingItemAdapter(data: MutableList) : } } - private fun loadPointData(binding: ListItemWorkingFaceBinding, item: WorkingFaceItem) { + private fun loadPointData(binding: ListItemTunnelWorkingRecordItemBinding, item: TunnelWorkingRecordItem) { binding.run { tvItemName.text = item.name if (item.items.isNullOrEmpty()) { @@ -73,7 +72,7 @@ class WorkingItemAdapter(data: MutableList) : } } } - private fun loadFaceData(binding: ListItemWorkingFaceBinding, item: WorkingFaceItem) { + private fun loadFaceData(binding: ListItemTunnelWorkingRecordItemBinding, item: TunnelWorkingRecordItem) { binding.tvItemName.let { it.updateLayoutParams { height = ScreenUtil.dp2px(50f) } it.text = item.name @@ -114,5 +113,5 @@ class WorkingItemAdapter(data: MutableList) : } - inner class VH(var binding: ListItemWorkingFaceBinding) : BaseViewHolder(binding.root) + inner class VH(var binding: ListItemTunnelWorkingRecordItemBinding) : BaseViewHolder(binding.root) } \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt index bb47590..0327043 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt @@ -7,6 +7,8 @@ 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.utils.formatDecimalString + /** * 顶板岩性 @@ -15,7 +17,7 @@ import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity class TunnelingRockNatureAdapter(list: MutableList) : BaseQuickAdapter(R.layout.item_rock_nature, list) { - inner class VH(var binding: ItemRockNatureBinding): BaseViewHolder(binding.root) + inner class VH(var binding: ItemRockNatureBinding):BaseViewHolder(binding.root) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH { val binding = ItemRockNatureBinding.inflate( @@ -28,8 +30,8 @@ class TunnelingRockNatureAdapter(list: MutableList) : override fun convert(holder: VH, item: TunnelRoofLithologyEntity) { holder.binding.let { - it.tvRock1Start.text = item.positionStart - it.tvRock1End.text = item.positionEnd + it.tvRock1Start.text = item.positionStart.formatDecimalString() + it.tvRock1End.text = item.positionEnd.formatDecimalString() it.tvRock1Name.text = item.lithologyType } } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/bean/DictBean.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/DictBean.kt similarity index 85% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/bean/DictBean.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/DictBean.kt index c3af593..8e7551c 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/bean/DictBean.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/DictBean.kt @@ -1,4 +1,4 @@ -package com.zmkg.coaloperation.ui.tunneling.bean +package com.zmkg.coaloperation.bean data class DictBean( var seam_list: Map?, diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/WorkingFaceItem.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingRecordItem.kt similarity index 92% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/WorkingFaceItem.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingRecordItem.kt index 5e75e9c..23bc6cd 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/WorkingFaceItem.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingRecordItem.kt @@ -2,7 +2,7 @@ package com.zmkg.coaloperation.bean import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity -data class WorkingFaceItem( +data class TunnelWorkingRecordItem( var name: String? = "", var value: String? = "", var items: MutableList? = null, diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/bean/TunnelingBean.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelingBean.kt similarity index 80% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/bean/TunnelingBean.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelingBean.kt index c1e3b76..04d33c8 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/bean/TunnelingBean.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelingBean.kt @@ -1,4 +1,4 @@ -package com.zmkg.coaloperation.ui.tunneling.bean +package com.zmkg.coaloperation.bean import java.io.Serializable @@ -6,33 +6,33 @@ import java.io.Serializable /** * 掘进 */ -data class TunnelingHomeBean( - var contentList: MutableList?, - val createBy: String?, - val createTime: String?, - val updateBy: String?, - val updateTime: String?, - val remark: String?, - val surfaceId: String?, - val totalFootage: String?, - val seamId: String?, - val areaId: String?, - val seamName: String?, - val surfaceName: String?, - val areaName: String?, - val surfaceAzimuth: String?, - val surfaceHeight: String?, - val surfaceWidth: String?, - val tunnelNature: String?, - val planStartDate: String?, - val planEndDate: String?, - val geologicalType: String?, - val hydrogeologicalType: String?, - val seamIgnition: String?, - val seamGas: String?, - val seamBumpPressure: String?, - val surfaceSupportForm: String? -) +//data class TunnelingHomeBean( +// var contentList: MutableList?, +// val createBy: String?, +// val createTime: String?, +// val updateBy: String?, +// val updateTime: String?, +// val remark: String?, +// val surfaceId: String?, +// val totalFootage: String?, +// val seamId: String?, +// val areaId: String?, +// val seamName: String?, +// val surfaceName: String?, +// val areaName: String?, +// val surfaceAzimuth: String?, +// val surfaceHeight: String?, +// val surfaceWidth: String?, +// val tunnelNature: String?, +// val planStartDate: String?, +// val planEndDate: String?, +// val geologicalType: String?, +// val hydrogeologicalType: String?, +// val seamIgnition: String?, +// val seamGas: String?, +// val seamBumpPressure: String?, +// val surfaceSupportForm: String? +//) class TunnelingHomeItemBean { var createBy: String? = null diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt index 07df248..2bb3bb8 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt @@ -3,11 +3,8 @@ package com.zmkg.coaloperation.data.api import com.zmkg.coaloperation.data.bean.ApiResponse import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity import com.zmkg.coaloperation.retorfit.UrlConfig -import com.zmkg.coaloperation.ui.tunneling.bean.FaceWorkDetailBean -import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeBean -import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeItemBean +import com.zmkg.coaloperation.bean.FaceWorkDetailBean import com.zmkg.coaloperation.ui.home.bean.WaterLedgerBean -import kotlinx.coroutines.flow.MutableSharedFlow import okhttp3.RequestBody import retrofit2.http.Body import retrofit2.http.GET @@ -29,14 +26,14 @@ interface HomeApi { /** * 掘进-首页-工作面列表 */ - @GET("/api/mine/tunnelling/surface/list") - suspend fun getTunnelingHomeData(): ApiResponse> +// @GET("/api/mine/tunnelling/surface/list") +// suspend fun getTunnelingHomeData(): ApiResponse> - /** - * 掘进-首页-工作面记录列表 - */ - @GET("/api/mine/tunnelling/surface/record/{recordId}") - suspend fun getTunnelingHomeItemData(@Path("recordId") recordId: String?): ApiResponse> +// /** +// * 掘进-首页-工作面记录列表 +// */ +// @GET("/api/mine/tunnelling/surface/record/{recordId}") +// suspend fun getTunnelingHomeItemData(@Path("recordId") recordId: String?): ApiResponse> /** * 掘进-工作面详情 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt index 238a151..f4a7cd6 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt @@ -5,14 +5,7 @@ import com.zmkg.coaloperation.data.api.HomeApi import com.zmkg.coaloperation.data.bean.ApiResponse import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity import com.zmkg.coaloperation.retorfit.RetrofitManager -import com.zmkg.coaloperation.retorfit.RetrofitManager.toRequestBody -import com.zmkg.coaloperation.superfuntion.toJson -import com.zmkg.coaloperation.ui.tunneling.bean.FaceWorkDetailBean -import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingFaceAddBean -import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeBean -import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeItemBean import com.zmkg.coaloperation.ui.home.bean.WaterLedgerBean -import kotlinx.coroutines.flow.MutableSharedFlow object HomeRepository : BaseRepository(){ @@ -30,44 +23,44 @@ object HomeRepository : BaseRepository(){ } } - /** - * 掘进-首页-工作面列表 - */ - suspend fun getTunnelingHomeData(): ApiResponse> { - return apiCall { - val map = mutableMapOf() - service.getTunnelingHomeData() - } - } - - /** - * 掘进-首页-工作面记录列表 - */ - suspend fun getTunnelingHomeItemData(surfaceId: String?): ApiResponse> { - return apiCall { - val map = mutableMapOf() - service.getTunnelingHomeItemData(surfaceId) - } - } - /** - * 掘进-工作面详情 - */ - suspend fun getTunnelingSurfaceDetail(surfaceId: String?): ApiResponse { - return apiCall { - val map = mutableMapOf() - service.getTunnelingSurfaceDetail(surfaceId) - } - } - - /** - * 掘进-新增工作面 - */ - suspend fun postTunnellingSurfaceAdd(tunnelingFaceAddBean: TunnelingFaceAddBean): ApiResponse { - return apiCall { - service.postTunnellingSurfaceAdd(tunnelingFaceAddBean.toJson().toRequestBody()) - } - } +// /** +// * 掘进-首页-工作面列表 +// */ +// suspend fun getTunnelingHomeData(): ApiResponse> { +// return apiCall { +// val map = mutableMapOf() +// service.getTunnelingHomeData() +// } +// } +// /** +// * 掘进-首页-工作面记录列表 +// */ +// suspend fun getTunnelingHomeItemData(surfaceId: String?): ApiResponse> { +// return apiCall { +// val map = mutableMapOf() +// service.getTunnelingHomeItemData(surfaceId) +// } +// } +// /** +// * 掘进-工作面详情 +// */ +// suspend fun getTunnelingSurfaceDetail(surfaceId: String?): ApiResponse { +// return apiCall { +// val map = mutableMapOf() +// service.getTunnelingSurfaceDetail(surfaceId) +// } +// } +// +// /** +// * 掘进-新增工作面 +// */ +// suspend fun postTunnellingSurfaceAdd(tunnelingFaceAddBean: TunnelingFaceAddBean): ApiResponse { +// return apiCall { +// service.postTunnellingSurfaceAdd(tunnelingFaceAddBean.toJson().toRequestBody()) +// } +// } +// suspend fun getTunnelHomeList() : ApiResponse?> { return apiCall { service.getTunnelHomeList() diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt index 31ba623..62627ce 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt @@ -4,29 +4,21 @@ import android.os.Bundle import android.text.TextUtils import android.view.View import android.widget.TextView -import androidx.lifecycle.Lifecycle +import androidx.core.view.isGone import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.lifecycleScope -import androidx.lifecycle.repeatOnLifecycle import com.zmkg.coaloperation.R import com.zmkg.coaloperation.base.BaseVMBActivity -import com.zmkg.coaloperation.databinding.ActivityWorkFaceBinding -import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity -import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceViewModel -import com.zmkg.coaloperation.event.TunnelingWorkFaceRefreshEvent -import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.launch -import org.greenrobot.eventbus.EventBus -import androidx.core.view.isGone import com.zmkg.coaloperation.bean.WorkOption import com.zmkg.coaloperation.databinding.ActivityAddWorkingFaceBinding +import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity +import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceViewModel +import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel import com.zmkg.coaloperation.utils.DateTimeUtil import com.zmkg.coaloperation.utils.DictUtils import com.zmkg.coaloperation.utils.PickerUtil import com.zmkg.coaloperation.utils.gone import com.zmkg.coaloperation.utils.visible +import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import java.time.LocalDateTime @@ -80,7 +72,7 @@ class AddWorkingFaceActivity : mBinding.expandLayout.visible() mBinding.imgExpand.gone() faceDetail = - intent.getParcelableExtra(WorkingFaceDetail2Activity.FACE_WORK_DETAIL_DATA) as TunnelWorkingFaceEntity? + intent.getParcelableExtra(WorkingFaceDetailActivity.FACE_WORK_DETAIL_DATA) as TunnelWorkingFaceEntity? if (faceDetail == null) { showToast("未查询到工作面数据") return @@ -109,7 +101,7 @@ class AddWorkingFaceActivity : PickerUtil.showOptionPicker(this, "请选择所属煤层", DictUtils.seamList) { option -> mBinding.tvSeamName.text = option.name mBinding.tvSeamName.tag = option.id - seamAreaList = DictUtils.areaMap[option.id]?:mutableListOf() + seamAreaList = DictUtils.areaMap[option.id] ?: mutableListOf() } } mBinding.tvAreaName.setOnClickListener { v -> @@ -171,16 +163,6 @@ class AddWorkingFaceActivity : override fun createObserve() { super.createObserve() - lifecycleScope.launch { - repeatOnLifecycle(Lifecycle.State.CREATED) { - mViewModel.tunnelingWorkFaceAdd.collectLatest { - showToast("新增成功") - EventBus.getDefault().post(TunnelingWorkFaceRefreshEvent()) - delay(200) - finish() - } - } - } } override fun processClick(v: View?) { diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt similarity index 62% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt index 6598241..6df0328 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt @@ -7,9 +7,9 @@ import com.zmkg.coaloperation.R import com.zmkg.coaloperation.base.BaseVMBActivity import com.zmkg.coaloperation.base.viewmodel.TestViewModel import androidx.recyclerview.widget.LinearLayoutManager -import com.zmkg.coaloperation.adapter.WorkingItemAdapter -import com.zmkg.coaloperation.bean.WorkingFaceItem -import com.zmkg.coaloperation.databinding.ActivityWorkingFaceDetail2Binding +import com.zmkg.coaloperation.adapter.TunnelWorkingRecordItemAdapter +import com.zmkg.coaloperation.bean.TunnelWorkingRecordItem +import com.zmkg.coaloperation.databinding.ActivityWorkingFaceDetailBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -17,18 +17,18 @@ import org.greenrobot.eventbus.ThreadMode /** * 工作面详情2 */ -class WorkingFaceDetail2Activity : - BaseVMBActivity(R.layout.activity_working_face_detail2) { +class WorkingFaceDetailActivity : + BaseVMBActivity(R.layout.activity_working_face_detail) { companion object { const val FACE_WORK_DETAIL_DATA = "faceWorkDetailData" } - private val list: MutableList = mutableListOf() + private val list: MutableList = mutableListOf() // private var detail:FaceWorkDetailBean?=null private var detail: TunnelWorkingFaceEntity? = null private val adapter by lazy { - WorkingItemAdapter(list) + TunnelWorkingRecordItemAdapter(list) } override fun initView(savedInstanceState: Bundle?) { @@ -66,38 +66,38 @@ class WorkingFaceDetail2Activity : private fun loadFaceDetail(it: TunnelWorkingFaceEntity) { mBinding.toolbarLay.title = it.surfaceName list.clear() - list.add(WorkingFaceItem(pageType = 0, name = "工作面名称", value = it.surfaceName)) - list.add(WorkingFaceItem(pageType = 0, name = "所属煤层", value = it.seamName)) - list.add(WorkingFaceItem(pageType = 0, name = "所属采区域", value = it.areaName)) - list.add(WorkingFaceItem(pageType = 0, name = "工作面方位角", value = it.surfaceAzimuth)) - list.add(WorkingFaceItem(pageType = 0, name = "工作面巷高", value = it.surfaceHeight)) - list.add(WorkingFaceItem(pageType = 0, name = "工作面巷宽", value = it.surfaceWidth)) - list.add(WorkingFaceItem(pageType = 0, name = "巷道性质", value = it.tunnelNature)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面名称", value = it.surfaceName)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "所属煤层", value = it.seamName)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "所属采区域", value = it.areaName)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面方位角", value = it.surfaceAzimuth)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面巷高", value = it.surfaceHeight)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面巷宽", value = it.surfaceWidth)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "巷道性质", value = it.tunnelNature)) list.add( - WorkingFaceItem( + TunnelWorkingRecordItem( pageType = 0, name = "计划工期", value = "${it.planStartDate} ~ ${it.planEndDate}" ) ) - list.add(WorkingFaceItem(pageType = 0, name = "地质类型", value = it.geologicalType)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "地质类型", value = it.geologicalType)) list.add( - WorkingFaceItem( + TunnelWorkingRecordItem( pageType = 0, name = "水文地质类型", value = it.hydrogeologicalType ) ) - list.add(WorkingFaceItem(pageType = 0, name = "煤层发火性", value = it.seamIgnition)) - list.add(WorkingFaceItem(pageType = 0, name = "瓦斯含量", value = it.seamGas)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "煤层发火性", value = it.seamIgnition)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "瓦斯含量", value = it.seamGas)) list.add( - WorkingFaceItem( + TunnelWorkingRecordItem( pageType = 0, name = "冲击地压危险性", value = it.seamBumpPressure ) ) - list.add(WorkingFaceItem(pageType = 0, name = "支护形式", value = it.surfaceSupportForm)) + list.add(TunnelWorkingRecordItem(pageType = 0, name = "支护形式", value = it.surfaceSupportForm)) adapter.notifyDataSetChanged() } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt index 67053dc..6cef10b 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt @@ -7,10 +7,10 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.zmkg.coaloperation.R -import com.zmkg.coaloperation.adapter.WorkingItemAdapter +import com.zmkg.coaloperation.adapter.TunnelWorkingRecordItemAdapter import com.zmkg.coaloperation.base.BaseVMBActivity import com.zmkg.coaloperation.base.viewmodel.TestViewModel -import com.zmkg.coaloperation.bean.WorkingFaceItem +import com.zmkg.coaloperation.bean.TunnelWorkingRecordItem import com.zmkg.coaloperation.databinding.ActivityWorkingFaceRecordBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel @@ -33,13 +33,13 @@ class WorkingFaceRecordActivity : private var faceName: String? = null private var faceRecord: TunnelWorkingFaceRecordEntity? = null - private val list: MutableList = mutableListOf() + private val list: MutableList = mutableListOf() private val roofLithologyViewModel: TunnelRoofLithologyViewModel by lazy { ViewModelProvider(this)[TunnelRoofLithologyViewModel::class.java] } private val adapter by lazy { - WorkingItemAdapter(list) + TunnelWorkingRecordItemAdapter(list) } override fun initView(savedInstanceState: Bundle?) { @@ -75,26 +75,26 @@ class WorkingFaceRecordActivity : @SuppressLint("NotifyDataSetChanged") private fun loadFaceRecord(it: TunnelWorkingFaceRecordEntity) { list.clear() - list.add(WorkingFaceItem(pageType = 1, name = "工作面名称", value = faceName)) - list.add(WorkingFaceItem(pageType = 1, name = "施工日期", value = it.workingDate)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "工作面名称", value = faceName)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "施工日期", value = it.workingDate)) list.add( - WorkingFaceItem( + TunnelWorkingRecordItem( pageType = 1, name = "施工班次", value = DictUtils.getTeamShift(it.teamShift) ) ) - list.add(WorkingFaceItem(pageType = 1, name = "施工队伍", value = it.teamName)) - list.add(WorkingFaceItem(pageType = 1, name = "带班队长", value = it.teamLeader)) - list.add(WorkingFaceItem(pageType = 1, name = "本班进尺", value = it.workingFootage)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "施工队伍", value = it.teamName)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "带班队长", value = it.teamLeader)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "本班进尺", value = it.workingFootage)) // val rockList = mutableListOf() // rockList.add(RockItem(startLen = 0, endLen = 1, rockType = "泥")) // rockList.add(RockItem(startLen = 0, endLen = 1, rockType = "砂")) - list.add(WorkingFaceItem(pageType = 1, name = "顶板岩性", value = "", items = null)) - list.add(WorkingFaceItem(pageType = 1, name = "煤层倾角", value = it.seamDip)) - list.add(WorkingFaceItem(pageType = 1, name = "煤层高", value = it.seamHeight)) - list.add(WorkingFaceItem(pageType = 1, name = "记录人", value = it.recordPerson)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "顶板岩性", value = "", items = null)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "煤层倾角", value = it.seamDip)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "煤层高", value = it.seamHeight)) + list.add(TunnelWorkingRecordItem(pageType = 1, name = "记录人", value = it.recordPerson)) adapter.notifyDataSetChanged() } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt index 42687a7..8eea826 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt @@ -12,7 +12,7 @@ import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceRecordViewModel import com.zmkg.coaloperation.adapter.TunnelingRockNatureAdapter import com.zmkg.coaloperation.databinding.ActivityWorkingFaceStatisticsBinding -import com.zmkg.coaloperation.ui.tunneling.bean.FaceWorkDetailBean +import com.zmkg.coaloperation.bean.FaceWorkDetailBean import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel import com.zmkg.coaloperation.utils.ScreenUtil import org.greenrobot.eventbus.Subscribe @@ -107,12 +107,12 @@ class WorkingFaceStatisticsActivity : override fun bindEvent() { mBinding.toolbarLay.titleTvRight.setOnClickListener { - toActivity(WorkingFaceDetail2Activity::class.java, Bundle().apply { + toActivity(WorkingFaceDetailActivity::class.java, Bundle().apply { // putSerializable( // WorkingFaceDetail2Activity.FACE_WORK_DETAIL_DATA, // mViewModel.faceWorkDetailData.value as Serializable // ) - putParcelable(WorkingFaceDetail2Activity.FACE_WORK_DETAIL_DATA, faceDetail) + putParcelable(WorkingFaceDetailActivity.FACE_WORK_DETAIL_DATA, faceDetail) }) } } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt index 4243d21..872a91a 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt @@ -5,11 +5,7 @@ import com.zmkg.coaloperation.data.repository.HomeRepository import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity import com.zmkg.coaloperation.superfuntion.handleRequest import com.zmkg.coaloperation.superfuntion.launch -import com.zmkg.coaloperation.ui.tunneling.bean.FaceWorkDetailBean -import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingFaceAddBean -import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeItemBean import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.MutableStateFlow /** @@ -19,11 +15,11 @@ class TunnelingViewModel : BaseViewModel() { // var tunnelingHomeList = MutableSharedFlow?>() - var tunnelingHomeItemList = MutableSharedFlow?>() - var tunnelingWorkFaceAdd = MutableSharedFlow()//新增面 - var faceWorkDetailData = MutableStateFlow(null)//面详情 - - var itemIndex = MutableStateFlow(0)//item的下标 +// var tunnelingHomeItemList = MutableSharedFlow?>() +// var tunnelingWorkFaceAdd = MutableSharedFlow()//新增面 +// var faceWorkDetailData = MutableStateFlow(null)//面详情 +// +// var itemIndex = MutableStateFlow(0)//item的下标 override fun init() { } @@ -42,44 +38,44 @@ class TunnelingViewModel : BaseViewModel() { // ) // } - fun getTunnelingHomeItemData(index: Int,surfaceId: String?) { - launch( - { - itemIndex.emit(index) - handleRequest( - HomeRepository.getTunnelingHomeItemData(surfaceId), - successBlock = { - tunnelingHomeItemList.emit(it.data) - - }) - } - ) - } - - fun getTunnelingSurfaceDetail(surfaceId: String?) { - launch( - { - handleRequest( - HomeRepository.getTunnelingSurfaceDetail(surfaceId), - successBlock = { +// fun getTunnelingHomeItemData(index: Int,surfaceId: String?) { +// launch( +// { +// itemIndex.emit(index) +// handleRequest( +// HomeRepository.getTunnelingHomeItemData(surfaceId), +// successBlock = { // tunnelingHomeItemList.emit(it.data) - faceWorkDetailData.emit(it.data) - }) - } - ) - } - - fun postTunnellingSurfaceAdd(tunnelingFaceAddBean: TunnelingFaceAddBean) { - launch( - { - handleRequest( - HomeRepository.postTunnellingSurfaceAdd(tunnelingFaceAddBean), - successBlock = { - tunnelingWorkFaceAdd.emit(true) - }) - } - ) - } +// +// }) +// } +// ) +// } +// +// fun getTunnelingSurfaceDetail(surfaceId: String?) { +// launch( +// { +// handleRequest( +// HomeRepository.getTunnelingSurfaceDetail(surfaceId), +// successBlock = { +//// tunnelingHomeItemList.emit(it.data) +// faceWorkDetailData.emit(it.data) +// }) +// } +// ) +// } +// +// fun postTunnellingSurfaceAdd(tunnelingFaceAddBean: TunnelingFaceAddBean) { +// launch( +// { +// handleRequest( +// HomeRepository.postTunnellingSurfaceAdd(tunnelingFaceAddBean), +// successBlock = { +// tunnelingWorkFaceAdd.emit(true) +// }) +// } +// ) +// } var tunnelFaceAndRecordList = MutableSharedFlow?>() diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/DictUtils.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/DictUtils.kt index 4fe5d5d..9c23c25 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/DictUtils.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/DictUtils.kt @@ -3,7 +3,7 @@ package com.zmkg.coaloperation.utils import android.util.Log import com.google.gson.internal.LazilyParsedNumber import com.zmkg.coaloperation.bean.WorkOption -import com.zmkg.coaloperation.ui.tunneling.bean.DictBean +import com.zmkg.coaloperation.bean.DictBean object DictUtils { diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/Ext.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/Ext.kt index 86a3d9d..ad696ae 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/Ext.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/Ext.kt @@ -54,4 +54,32 @@ fun SharedPreferences.put(vararg pairs: Pair) { } } } -} \ No newline at end of file +} + +/** + * 格式化小数字符串 + * 如果小数点后都是零，则去掉小数点和小数部分，否则返回原始字符串 + * + * @return 格式化后的字符串 + */ +fun String.formatDecimalString(): String { + // 检查字符串是否包含小数点 + if (!this.contains('.')) { + return this + } + // 尝试分割整数和小数部分 + val parts = this.split('.') + if (parts.size != 2) { + return this + } + // 检查小数部分是否全部为零 + val decimalPart = parts[1] + val isAllZeros = decimalPart.all { it == '0' } + return if (isAllZeros) { + parts[0] // 返回整数部分 + } else { + this // 返回原始字符串 + } +} + + diff --git a/coalMiningApp/app/src/main/res/layout/activity_working_face_detail2.xml b/coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml similarity index 93% rename from coalMiningApp/app/src/main/res/layout/activity_working_face_detail2.xml rename to coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml index f86a6dd..ed5c42e 100644 --- a/coalMiningApp/app/src/main/res/layout/activity_working_face_detail2.xml +++ b/coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml @@ -28,7 +28,7 @@ android:layout_marginBottom="10dp" tools:itemCount="20" android:overScrollMode="never" - tools:listitem="@layout/list_item_working_face" + tools:listitem="@layout/list_item_tunnel_working_record_item" android:background="@drawable/bg_stroke_gray"/> diff --git a/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml b/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml index f7c0dd6..d4c2d3c 100644 --- a/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml +++ b/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml @@ -28,7 +28,7 @@ android:layout_marginBottom="10dp" tools:itemCount="10" android:overScrollMode="never" - tools:listitem="@layout/list_item_working_face" + tools:listitem="@layout/list_item_tunnel_working_record_item" android:background="@drawable/bg_stroke_gray"/> diff --git a/coalMiningApp/app/src/main/res/layout/list_item_working_face.xml b/coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_record_item.xml similarity index 100% rename from coalMiningApp/app/src/main/res/layout/list_item_working_face.xml rename to coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_record_item.xml From fa2672d6d7e39846efb406a290a95b61b803126e Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Sun, 14 Sep 2025 12:01:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=9D=A2=E4=B8=8E?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=95=B0=E5=AD=97=E6=A0=BC=E5=BC=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Adapter.kt => TunnelWorkingItemAdapter.kt} | 27 +++++++------- ...kingRecordItem.kt => TunnelWorkingItem.kt} | 2 +- .../activity/WorkingFaceDetailActivity.kt | 36 +++++++++---------- .../activity/WorkingFaceRecordActivity.kt | 28 +++++++-------- .../activity/WorkingFaceStatisticsActivity.kt | 13 +++---- .../layout/activity_working_face_detail.xml | 2 +- .../layout/activity_working_face_record.xml | 2 +- ....xml => list_item_tunnel_working_item.xml} | 0 8 files changed, 56 insertions(+), 54 deletions(-) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/{TunnelWorkingRecordItemAdapter.kt => TunnelWorkingItemAdapter.kt} (77%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/{TunnelWorkingRecordItem.kt => TunnelWorkingItem.kt} (92%) rename coalMiningApp/app/src/main/res/layout/{list_item_tunnel_working_record_item.xml => list_item_tunnel_working_item.xml} (100%) diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingRecordItemAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingItemAdapter.kt similarity index 77% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingRecordItemAdapter.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingItemAdapter.kt index 6a4d96e..36dbafa 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingRecordItemAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingItemAdapter.kt @@ -9,20 +9,21 @@ import androidx.core.view.updateLayoutParams import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.zmkg.coaloperation.R -import com.zmkg.coaloperation.bean.TunnelWorkingRecordItem +import com.zmkg.coaloperation.bean.TunnelWorkingItem import com.zmkg.coaloperation.databinding.ListItemRockBinding -import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingRecordItemBinding +import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingItemBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity import com.zmkg.coaloperation.utils.ScreenUtil +import com.zmkg.coaloperation.utils.formatDecimalString -class TunnelWorkingRecordItemAdapter(data: MutableList) : - BaseQuickAdapter( - R.layout.list_item_tunnel_working_record_item, +class TunnelWorkingItemAdapter(data: MutableList) : + BaseQuickAdapter( + R.layout.list_item_tunnel_working_item, data ) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH { - val binding = ListItemTunnelWorkingRecordItemBinding.inflate( + val binding = ListItemTunnelWorkingItemBinding.inflate( LayoutInflater.from(parent.context), parent, false @@ -34,12 +35,12 @@ class TunnelWorkingRecordItemAdapter(data: MutableList) override fun convert( holder: VH, - item: TunnelWorkingRecordItem + item: TunnelWorkingItem ) { if (item.pageType == 0) { loadFaceData(holder.binding, item) } else if (item.pageType == 1) { - loadPointData(holder.binding, item) + loadRecordData(holder.binding, item) } val position = holder.layoutPosition holder.binding.divider.let { @@ -51,7 +52,7 @@ class TunnelWorkingRecordItemAdapter(data: MutableList) } } - private fun loadPointData(binding: ListItemTunnelWorkingRecordItemBinding, item: TunnelWorkingRecordItem) { + private fun loadRecordData(binding: ListItemTunnelWorkingItemBinding, item: TunnelWorkingItem) { binding.run { tvItemName.text = item.name if (item.items.isNullOrEmpty()) { @@ -72,7 +73,7 @@ class TunnelWorkingRecordItemAdapter(data: MutableList) } } } - private fun loadFaceData(binding: ListItemTunnelWorkingRecordItemBinding, item: TunnelWorkingRecordItem) { + private fun loadFaceData(binding: ListItemTunnelWorkingItemBinding, item: TunnelWorkingItem) { binding.tvItemName.let { it.updateLayoutParams { height = ScreenUtil.dp2px(50f) } it.text = item.name @@ -95,12 +96,12 @@ class TunnelWorkingRecordItemAdapter(data: MutableList) tvRockStartLen.let { it.focusable = EditText.NOT_FOCUSABLE it.setOnKeyListener(null) - it.setText(item.positionStart) + it.setText(item.positionStart.formatDecimalString()) } tvRockEndLen.let { it.focusable = EditText.NOT_FOCUSABLE it.setOnKeyListener(null) - it.setText(item.positionEnd) + it.setText(item.positionEnd.formatDecimalString()) } tvRockType.let { it.focusable = EditText.NOT_FOCUSABLE @@ -113,5 +114,5 @@ class TunnelWorkingRecordItemAdapter(data: MutableList) } - inner class VH(var binding: ListItemTunnelWorkingRecordItemBinding) : BaseViewHolder(binding.root) + inner class VH(var binding: ListItemTunnelWorkingItemBinding) : BaseViewHolder(binding.root) } \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingRecordItem.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt similarity index 92% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingRecordItem.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt index 23bc6cd..d239ef6 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingRecordItem.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt @@ -2,7 +2,7 @@ package com.zmkg.coaloperation.bean import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity -data class TunnelWorkingRecordItem( +data class TunnelWorkingItem( var name: String? = "", var value: String? = "", var items: MutableList? = null, 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 6df0328..ca01aef 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 @@ -7,8 +7,8 @@ import com.zmkg.coaloperation.R import com.zmkg.coaloperation.base.BaseVMBActivity import com.zmkg.coaloperation.base.viewmodel.TestViewModel import androidx.recyclerview.widget.LinearLayoutManager -import com.zmkg.coaloperation.adapter.TunnelWorkingRecordItemAdapter -import com.zmkg.coaloperation.bean.TunnelWorkingRecordItem +import com.zmkg.coaloperation.adapter.TunnelWorkingItemAdapter +import com.zmkg.coaloperation.bean.TunnelWorkingItem import com.zmkg.coaloperation.databinding.ActivityWorkingFaceDetailBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity import org.greenrobot.eventbus.Subscribe @@ -23,12 +23,12 @@ class WorkingFaceDetailActivity : const val FACE_WORK_DETAIL_DATA = "faceWorkDetailData" } - private val list: MutableList = mutableListOf() + private val list: MutableList = mutableListOf() // private var detail:FaceWorkDetailBean?=null private var detail: TunnelWorkingFaceEntity? = null private val adapter by lazy { - TunnelWorkingRecordItemAdapter(list) + TunnelWorkingItemAdapter(list) } override fun initView(savedInstanceState: Bundle?) { @@ -66,38 +66,38 @@ class WorkingFaceDetailActivity : private fun loadFaceDetail(it: TunnelWorkingFaceEntity) { mBinding.toolbarLay.title = it.surfaceName list.clear() - list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面名称", value = it.surfaceName)) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "所属煤层", value = it.seamName)) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "所属采区域", value = it.areaName)) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面方位角", value = it.surfaceAzimuth)) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面巷高", value = it.surfaceHeight)) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "工作面巷宽", value = it.surfaceWidth)) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "巷道性质", value = it.tunnelNature)) + list.add(TunnelWorkingItem(pageType = 0, name = "工作面名称", value = it.surfaceName)) + list.add(TunnelWorkingItem(pageType = 0, name = "所属煤层", value = it.seamName)) + list.add(TunnelWorkingItem(pageType = 0, name = "所属采区域", value = it.areaName)) + list.add(TunnelWorkingItem(pageType = 0, name = "工作面方位角", value = it.surfaceAzimuth)) + list.add(TunnelWorkingItem(pageType = 0, name = "工作面巷高", value = it.surfaceHeight)) + list.add(TunnelWorkingItem(pageType = 0, name = "工作面巷宽", value = it.surfaceWidth)) + list.add(TunnelWorkingItem(pageType = 0, name = "巷道性质", value = it.tunnelNature)) list.add( - TunnelWorkingRecordItem( + TunnelWorkingItem( pageType = 0, name = "计划工期", value = "${it.planStartDate} ~ ${it.planEndDate}" ) ) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "地质类型", value = it.geologicalType)) + list.add(TunnelWorkingItem(pageType = 0, name = "地质类型", value = it.geologicalType)) list.add( - TunnelWorkingRecordItem( + TunnelWorkingItem( pageType = 0, name = "水文地质类型", value = it.hydrogeologicalType ) ) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "煤层发火性", value = it.seamIgnition)) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "瓦斯含量", value = it.seamGas)) + list.add(TunnelWorkingItem(pageType = 0, name = "煤层发火性", value = it.seamIgnition)) + list.add(TunnelWorkingItem(pageType = 0, name = "瓦斯含量", value = it.seamGas)) list.add( - TunnelWorkingRecordItem( + TunnelWorkingItem( pageType = 0, name = "冲击地压危险性", value = it.seamBumpPressure ) ) - list.add(TunnelWorkingRecordItem(pageType = 0, name = "支护形式", value = it.surfaceSupportForm)) + list.add(TunnelWorkingItem(pageType = 0, name = "支护形式", value = it.surfaceSupportForm)) adapter.notifyDataSetChanged() } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt index 6cef10b..ad925f7 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt @@ -7,10 +7,10 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.zmkg.coaloperation.R -import com.zmkg.coaloperation.adapter.TunnelWorkingRecordItemAdapter +import com.zmkg.coaloperation.adapter.TunnelWorkingItemAdapter import com.zmkg.coaloperation.base.BaseVMBActivity import com.zmkg.coaloperation.base.viewmodel.TestViewModel -import com.zmkg.coaloperation.bean.TunnelWorkingRecordItem +import com.zmkg.coaloperation.bean.TunnelWorkingItem import com.zmkg.coaloperation.databinding.ActivityWorkingFaceRecordBinding import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel @@ -33,13 +33,13 @@ class WorkingFaceRecordActivity : private var faceName: String? = null private var faceRecord: TunnelWorkingFaceRecordEntity? = null - private val list: MutableList = mutableListOf() + private val list: MutableList = mutableListOf() private val roofLithologyViewModel: TunnelRoofLithologyViewModel by lazy { ViewModelProvider(this)[TunnelRoofLithologyViewModel::class.java] } private val adapter by lazy { - TunnelWorkingRecordItemAdapter(list) + TunnelWorkingItemAdapter(list) } override fun initView(savedInstanceState: Bundle?) { @@ -75,26 +75,26 @@ class WorkingFaceRecordActivity : @SuppressLint("NotifyDataSetChanged") private fun loadFaceRecord(it: TunnelWorkingFaceRecordEntity) { list.clear() - list.add(TunnelWorkingRecordItem(pageType = 1, name = "工作面名称", value = faceName)) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "施工日期", value = it.workingDate)) + list.add(TunnelWorkingItem(pageType = 1, name = "工作面名称", value = faceName)) + list.add(TunnelWorkingItem(pageType = 1, name = "施工日期", value = it.workingDate)) list.add( - TunnelWorkingRecordItem( + TunnelWorkingItem( pageType = 1, name = "施工班次", value = DictUtils.getTeamShift(it.teamShift) ) ) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "施工队伍", value = it.teamName)) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "带班队长", value = it.teamLeader)) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "本班进尺", value = it.workingFootage)) + list.add(TunnelWorkingItem(pageType = 1, name = "施工队伍", value = it.teamName)) + list.add(TunnelWorkingItem(pageType = 1, name = "带班队长", value = it.teamLeader)) + list.add(TunnelWorkingItem(pageType = 1, name = "本班进尺", value = it.workingFootage)) // val rockList = mutableListOf() // rockList.add(RockItem(startLen = 0, endLen = 1, rockType = "泥")) // rockList.add(RockItem(startLen = 0, endLen = 1, rockType = "砂")) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "顶板岩性", value = "", items = null)) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "煤层倾角", value = it.seamDip)) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "煤层高", value = it.seamHeight)) - list.add(TunnelWorkingRecordItem(pageType = 1, name = "记录人", value = it.recordPerson)) + list.add(TunnelWorkingItem(pageType = 1, name = "顶板岩性", value = "", items = null)) + list.add(TunnelWorkingItem(pageType = 1, name = "煤层倾角", value = it.seamDip)) + list.add(TunnelWorkingItem(pageType = 1, name = "煤层高", value = it.seamHeight)) + list.add(TunnelWorkingItem(pageType = 1, name = "记录人", value = it.recordPerson)) adapter.notifyDataSetChanged() } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt index 8eea826..605d66c 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt @@ -15,6 +15,7 @@ import com.zmkg.coaloperation.databinding.ActivityWorkingFaceStatisticsBinding import com.zmkg.coaloperation.bean.FaceWorkDetailBean import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel import com.zmkg.coaloperation.utils.ScreenUtil +import com.zmkg.coaloperation.utils.formatDecimalString import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import kotlin.apply @@ -89,10 +90,10 @@ class WorkingFaceStatisticsActivity : loadFaceDetail() workingFaceRecordViewModel.getLastEntity(detail.surfaceId) { record -> record?.let { - mBinding.tvYesterdayLen.text = "${it.workingFootage}m" - mBinding.tvWorkingFaceAngle.text = "${it.seamDip}" + mBinding.tvYesterdayLen.text = "${it.workingFootage?.formatDecimalString()}m" + mBinding.tvWorkingFaceAngle.text = "${it.seamDip?.formatDecimalString()}" // mBinding.tvMonthAccumulateLen.text = "${it.monthFootage}m" - mBinding.tvWorkingFaceWater.text = "${it.waterYield}" + mBinding.tvWorkingFaceWater.text = "${it.waterYield?.formatDecimalString()}" roofLithologyViewModel.getEntityList(it.recordId) { list -> list?.let { @@ -151,9 +152,9 @@ class WorkingFaceStatisticsActivity : val accumulative = stringToDouble(bean.accumulativeFootage) val remaining = stringToDouble(bean.remainingFootage) - tvLenTotal.text = "总进尺：${total}m" - tvLenAccumulate.text = "累计进尺：${accumulative}m" - tvLenRemain.text = "剩余进尺：${remaining}m" + tvLenTotal.text = "总进尺：${bean.totalFootage?.formatDecimalString()}m" + tvLenAccumulate.text = "累计进尺：${bean.accumulativeFootage?.formatDecimalString()}m" + tvLenRemain.text = "剩余进尺：${bean.remainingFootage?.formatDecimalString()}m" //累计进尺占比 var radio = 0 diff --git a/coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml b/coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml index ed5c42e..8460781 100644 --- a/coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml +++ b/coalMiningApp/app/src/main/res/layout/activity_working_face_detail.xml @@ -28,7 +28,7 @@ android:layout_marginBottom="10dp" tools:itemCount="20" android:overScrollMode="never" - tools:listitem="@layout/list_item_tunnel_working_record_item" + tools:listitem="@layout/list_item_tunnel_working_item" android:background="@drawable/bg_stroke_gray"/> diff --git a/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml b/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml index d4c2d3c..7056f83 100644 --- a/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml +++ b/coalMiningApp/app/src/main/res/layout/activity_working_face_record.xml @@ -28,7 +28,7 @@ android:layout_marginBottom="10dp" tools:itemCount="10" android:overScrollMode="never" - tools:listitem="@layout/list_item_tunnel_working_record_item" + tools:listitem="@layout/list_item_tunnel_working_item" android:background="@drawable/bg_stroke_gray"/> diff --git a/coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_record_item.xml b/coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_item.xml similarity index 100% rename from coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_record_item.xml rename to coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_item.xml