From 117c5fa3ad126c3297302112462eded3af5a5ec9 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Thu, 25 Sep 2025 18:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=8C=E6=B0=B4=E9=87=8F=E8=A7=82=E6=B5=8B?= =?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 | 1 + .../adapter/WaterYieldRecordAdapter.kt | 129 +++++++ .../coaloperation/bean/TunnelWorkingItem.kt | 24 +- .../ui/wateryield/BuoyMethodFragment.kt | 8 + .../ui/wateryield/VolumeMethodFragment.kt | 6 + .../WaterYieldObserveRecordActivity.kt | 105 ++++++ .../zmkg/coaloperation/utils/PickerUtil.kt | 31 ++ .../res/drawable-xxxhdpi/ic_func_delete.png | Bin 0 -> 1530 bytes .../res/drawable-xxxhdpi/ic_func_edit.png | Bin 0 -> 2279 bytes .../layout/activity_water_yield_observe.xml | 3 +- .../activity_water_yield_observe_record.xml | 31 ++ .../main/res/layout/fragment_buoy_method.xml | 39 ++- .../res/layout/fragment_volume_method.xml | 317 ++++++++++-------- .../main/res/layout/lay_title_right_bar.xml | 10 + .../main/res/layout/list_item_buoy_bottom.xml | 1 + .../main/res/layout/list_item_buoy_top.xml | 2 + .../layout/list_item_water_yield_record.xml | 82 +++++ .../list_item_water_yield_record_inner.xml | 52 +++ .../app/src/main/res/values/colors.xml | 1 + 19 files changed, 689 insertions(+), 153 deletions(-) create mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/WaterYieldRecordAdapter.kt create mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveRecordActivity.kt create mode 100644 coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_func_delete.png create mode 100644 coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_func_edit.png create mode 100644 coalMiningApp/app/src/main/res/layout/activity_water_yield_observe_record.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_water_yield_record.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_water_yield_record_inner.xml diff --git a/coalMiningApp/app/src/main/AndroidManifest.xml b/coalMiningApp/app/src/main/AndroidManifest.xml index c92b113..25dbde0 100644 --- a/coalMiningApp/app/src/main/AndroidManifest.xml +++ b/coalMiningApp/app/src/main/AndroidManifest.xml @@ -66,6 +66,7 @@ + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/WaterYieldRecordAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/WaterYieldRecordAdapter.kt new file mode 100644 index 0000000..c927a13 --- /dev/null +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/WaterYieldRecordAdapter.kt @@ -0,0 +1,129 @@ +package com.zmkg.coaloperation.adapter + +import android.graphics.Color +import android.view.Gravity +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.LinearLayout +import androidx.constraintlayout.widget.ConstraintLayout +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.WaterYieldRecordItem +import com.zmkg.coaloperation.databinding.ListItemWaterYieldRecordBinding +import com.zmkg.coaloperation.databinding.ListItemWaterYieldRecordInnerBinding +import com.zmkg.coaloperation.utils.gone +import com.zmkg.coaloperation.utils.visible +import androidx.core.graphics.toColorInt +import com.zmkg.coaloperation.utils.dp + +class WaterYieldRecordAdapter(data: MutableList) : + BaseQuickAdapter( + R.layout.list_item_water_yield_record, + data + ) { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH { + val binding = ListItemWaterYieldRecordBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + return VH(binding).also { + bindViewClickListener(it, viewType) + } + } + + override fun convert( + holder: VH, + item: WaterYieldRecordItem + ) { + loadRecordData(holder.binding, item) + val position = holder.layoutPosition + holder.binding.divider.run { + if (position == data.size - 1) gone() else visible() + } + } + + private fun loadRecordData( + binding: ListItemWaterYieldRecordBinding, + item: WaterYieldRecordItem + ) { + binding.run { + if (item.isHeader) { + tvItemName.let { + it.textSize = 16F + it.setTextColor(Color.WHITE) + it.gravity = Gravity.CENTER + it.updateLayoutParams { + width = ConstraintLayout.LayoutParams.MATCH_PARENT + } + } + verticalDivider.gone() + tvItemValue.gone() + } else { + tvItemName.let { + it.textSize = 14F + it.setTextColor("#6A6F87".toColorInt()) + it.gravity = Gravity.CENTER_VERTICAL + it.updateLayoutParams { + width = 80.dp + } + } + verticalDivider.visible() + tvItemValue.visible() + } + tvItemName.text = item.name + if (item.items.isNullOrEmpty()) { +// tvItemName.updateLayoutParams { height = ScreenUtil.dp2px(50f) } + tvItemValue.let { + it.visibility = View.VISIBLE + it.text = item.value + } + llContainer.visibility = View.GONE + } else { +// tvItemName.updateLayoutParams { height = ScreenUtil.dp2px(60f) } + tvItemValue.visibility = View.GONE + llContainer.let { + it.visibility = View.VISIBLE + it.removeAllViews() + addChildToContainer(it, item.items!!) + } + } + } + } + + private fun loadItemData( + binding: ListItemWaterYieldRecordInnerBinding, + isLatest: Boolean, + item: WaterYieldRecordItem + ) { + binding.tvItemName.text = "${item.name}:" + binding.tvItemValue.text = item.value + binding.divider.run { + if (isLatest) gone() else visible() + } + } + + private fun addChildToContainer( + container: LinearLayout, + list: MutableList + ) { + list.forEachIndexed { index, item -> + val itemBinding = ListItemWaterYieldRecordInnerBinding.inflate( + LayoutInflater.from(context), + container, + false + ) + itemBinding.run { + loadItemData(itemBinding, index == list.size - 1, item) + container.addView(root) + } + } + } + + + inner class VH(var binding: ListItemWaterYieldRecordBinding) : BaseViewHolder(binding.root) +} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt index bd720eb..3105529 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt @@ -8,7 +8,7 @@ data class TunnelWorkingItem( var name: String? = "", var value: String? = "", var items: MutableList? = null, - var pageType:Int = 0 + var pageType: Int = 0 ) data class RockItem( @@ -18,12 +18,26 @@ data class RockItem( ) data class WorkOption( - var id:String, + var id: String, var name: String ) +data class Work3LevelOption( + var id: String = "", + var name: String = "", + + var list: List? = null +) + data class TunnelSubmitData( - var faceList: MutableList?=null, - var recordList: MutableList?=null, - var lithologyList: MutableList?=null + var faceList: MutableList? = null, + var recordList: MutableList? = null, + var lithologyList: MutableList? = null +) + +data class WaterYieldRecordItem( + var name: String? = "", + var value: String? = "", + var isHeader: Boolean = false, + var items: MutableList? = null, ) diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/BuoyMethodFragment.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/BuoyMethodFragment.kt index ce1db57..543d492 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/BuoyMethodFragment.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/BuoyMethodFragment.kt @@ -60,6 +60,7 @@ class BuoyMethodFragment : mBinding.rvBuoyTop.let { it.layoutManager = LinearLayoutManager(it.context) it.adapter = buoyTopAdapter + it.requestDisallowInterceptTouchEvent(true) } buoyBottomList.run { add(BuoyBottomItem(name = "水沟长(m)")) @@ -67,6 +68,13 @@ class BuoyMethodFragment : mBinding.rvBuoyBottom.let { it.layoutManager = LinearLayoutManager(it.context) it.adapter = buoyBottomAdapter + it.requestDisallowInterceptTouchEvent(true) + } + mBinding.btnRecord.setOnClickListener { + toActivity(WaterYieldObserveRecordActivity::class.java) + } + mBinding.btnSubmit.setOnClickListener { + } } diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/VolumeMethodFragment.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/VolumeMethodFragment.kt index 1c01f9f..ec0d379 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/VolumeMethodFragment.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/VolumeMethodFragment.kt @@ -10,6 +10,12 @@ import com.zmkg.coaloperation.databinding.FragmentVolumeMethodBinding class VolumeMethodFragment: BaseVMBFragment(R.layout.fragment_volume_method) { override fun initView(root: View?, savedInstanceState: Bundle?) { + mBinding.btnRecord.setOnClickListener { + toActivity(WaterYieldObserveRecordActivity::class.java) + } + mBinding.btnSubmit.setOnClickListener { + + } } override fun bindEvent() { diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveRecordActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveRecordActivity.kt new file mode 100644 index 0000000..1e036b7 --- /dev/null +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveRecordActivity.kt @@ -0,0 +1,105 @@ +package com.zmkg.coaloperation.ui.wateryield + +import android.os.Bundle +import android.view.View +import android.widget.RelativeLayout +import androidx.core.view.marginEnd +import androidx.core.view.updateLayoutParams +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import com.zmkg.coaloperation.R +import com.zmkg.coaloperation.adapter.WaterYieldRecordAdapter +import com.zmkg.coaloperation.base.BaseVMBActivity +import com.zmkg.coaloperation.base.viewmodel.TestViewModel +import com.zmkg.coaloperation.bean.WaterYieldRecordItem +import com.zmkg.coaloperation.databinding.ActivityWaterYieldObserveRecordBinding +import com.zmkg.coaloperation.utils.dp +import com.zmkg.coaloperation.utils.visible +import org.checkerframework.checker.units.qual.h + +/** + * 观测历史记录页面 + */ +class WaterYieldObserveRecordActivity : + BaseVMBActivity(R.layout.activity_water_yield_observe_record) { + + private val recordList: MutableList = mutableListOf() + private val recordAdapter by lazy { + WaterYieldRecordAdapter(recordList) + } + + override fun initView(savedInstanceState: Bundle?) { + mBinding.toolbarLay.title = "历史记录" +// mBinding.toolbarLay.rightText = "添加观测点" + mBinding.toolbarLay.titleIvRight.run { + updateLayoutParams { + rightMargin = 10.dp + topMargin = 6.dp + width = 36.dp + height = 36.dp + } + setImageResource(R.drawable.ic_func_edit) + mBinding.toolbarLay.rightImageSrc = drawable + visible() + setOnClickListener { + //toActivity(WaterYieldAddObservePointActivity::class.java) + } + } + mBinding.toolbarLay.titleIvRight2.run { + updateLayoutParams { + topMargin = 6.dp + width = 36.dp + height = 36.dp + } + setImageResource(R.drawable.ic_func_delete) + visible() + setOnClickListener { + //toActivity(WaterYieldAddObservePointActivity::class.java) + } + } + mBinding.rvObserveRecord.let { + it.layoutManager = LinearLayoutManager(this) + it.adapter = recordAdapter + } + initBuoyMethodData() + recordList.run { + add(WaterYieldRecordItem(name = "水文观测原始记录", isHeader = true)) + add(WaterYieldRecordItem(name = "观测时间", value = "2025-09-12 16:40:00")) + add(WaterYieldRecordItem(name = "观测地点", value = "观测点011")) + add(WaterYieldRecordItem(name = "观测人", value = "方一强")) + add(WaterYieldRecordItem(name = "观测方法", value = "浮标法")) + add(WaterYieldRecordItem(name = "观测参数", items = subList)) + add(WaterYieldRecordItem(name = "观测结果", value = "1178400m³/h")) + add(WaterYieldRecordItem(name = "备注", value = "")) + } + recordAdapter.notifyDataSetChanged() + } + + + override fun initData() { + } + + override fun bindEvent() { + + } + + override fun processClick(v: View?) { + } + + val subList = mutableListOf() + fun initBuoyMethodData() { + subList.run { + add(WaterYieldRecordItem(name = "断面1水沟宽", value = "15m")) + add(WaterYieldRecordItem(name = "断面1水沟深", value = "15m")) + add(WaterYieldRecordItem(name = "断面2水沟宽", value = "15m")) + add(WaterYieldRecordItem(name = "断面2水沟深", value = "15m")) + add(WaterYieldRecordItem(name = "水沟长", value = "15m")) + add(WaterYieldRecordItem(name = "断面1到断面2水流速度", value = "3m/s")) + } + } + + fun initVolumeMethodData() { + + } + +} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/PickerUtil.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/PickerUtil.kt index f6568f2..6ef6aa1 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/PickerUtil.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/PickerUtil.kt @@ -2,8 +2,11 @@ package com.zmkg.coaloperation.utils import android.content.Context import android.graphics.Color +import androidx.core.content.ContextCompat import com.bigkoo.pickerview.builder.OptionsPickerBuilder import com.bigkoo.pickerview.builder.TimePickerBuilder +import com.zmkg.coaloperation.R +import com.zmkg.coaloperation.bean.Work3LevelOption import com.zmkg.coaloperation.bean.WorkOption import java.text.SimpleDateFormat import java.util.Calendar @@ -42,10 +45,37 @@ object PickerUtil { } // 三级联动选择器示例 +// fun show3LevelOptionPicker(context: Context, title:String, options: List, action: (Work3LevelOption, Work3LevelOption, Work3LevelOption) -> Unit) { +// OptionsPickerBuilder(context) { idx1, idx2, idx3, _ -> +// val option1 = options[idx1] +// val option2 = option1.list!![idx2] +// val option3 = option2.list!![idx3] +// action(option1, option2, option3) +// }.apply { +// setTitleText(title) +// setContentTextSize(18) +// setOutSideCancelable(true) +// }.build().apply { +// val items1: MutableList = mutableListOf() +// val items2: MutableList> = mutableListOf() +// val items3: MutableList>> = mutableListOf() +// options.forEach { +// items1.add(it.name) +// +// } +// setPicker( options.map { it.name } , null, null) +// show() +// } +// } + + fun showOptionPicker(context: Context, title:String, options: List, action: (WorkOption) -> Unit) { OptionsPickerBuilder(context) { opt1, _, _, _ -> action(options[opt1]) }.apply { +// setOutSideColor(ContextCompat.getColor(context, R.color.black_bg)) +// setDividerColor(ContextCompat.getColor(context,R.color.divider)) + setTitleText(title) setContentTextSize(18) setOutSideCancelable(true) @@ -54,6 +84,7 @@ object PickerUtil { show() } } + fun showTextPicker(context: Context, title:String, options: List, action: (String) -> Unit) { OptionsPickerBuilder(context) { opt1, _, _, _ -> action(options[opt1]) diff --git a/coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_func_delete.png b/coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_func_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..95a0a43fcef3a505743d2b911da9d657768b4638 GIT binary patch literal 1530 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 + android:layout_height="match_parent"/> diff --git a/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe_record.xml b/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe_record.xml new file mode 100644 index 0000000..4539d2c --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe_record.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/fragment_buoy_method.xml b/coalMiningApp/app/src/main/res/layout/fragment_buoy_method.xml index 46f7433..0ea4d64 100644 --- a/coalMiningApp/app/src/main/res/layout/fragment_buoy_method.xml +++ b/coalMiningApp/app/src/main/res/layout/fragment_buoy_method.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools"> - - + + +