涌水量观测优化

coalMiningApp/app/src/main/AndroidManifest.xml

@@ -66,6 +66,7 @@
         <activity android:name=".ui.wateryield.WaterYieldAddObservePointActivity"
             android:windowSoftInputMode="adjustPan"/>
         <activity android:name=".ui.wateryield.WaterYieldHomeActivity" />
+        <activity android:name=".ui.wateryield.WaterYieldObserveRecordActivity" />
     </application>
 
 </manifest>

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<WaterYieldRecordItem>) :
+    BaseQuickAdapter<WaterYieldRecordItem, WaterYieldRecordAdapter.VH>(
+        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<WaterYieldRecordItem>
+    ) {
+        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)
+}

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<TunnelRoofLithologyEntity>? = 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<Work3LevelOption>? = null
+)
+
 data class TunnelSubmitData(
-    var faceList: MutableList<TunnelWorkingFaceEntity>?=null,
+    var faceList: MutableList<TunnelWorkingFaceEntity>? = null,
-    var recordList: MutableList<TunnelWorkingFaceRecordEntity>?=null,
+    var recordList: MutableList<TunnelWorkingFaceRecordEntity>? = null,
-    var lithologyList: MutableList<TunnelRoofLithologyEntity>?=null
+    var lithologyList: MutableList<TunnelRoofLithologyEntity>? = null
+)
+
+data class WaterYieldRecordItem(
+    var name: String? = "",
+    var value: String? = "",
+    var isHeader: Boolean = false,
+    var items: MutableList<WaterYieldRecordItem>? = null,
 )

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 {
+
         }
     }
 

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<TestViewModel, FragmentVolumeMethodBinding>(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() {

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<TestViewModel, ActivityWaterYieldObserveRecordBinding>(R.layout.activity_water_yield_observe_record) {
+
+        private val recordList: MutableList<WaterYieldRecordItem> = mutableListOf()
+        private val recordAdapter by lazy {
+            WaterYieldRecordAdapter(recordList)
+        }
+
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.toolbarLay.title = "历史记录"
+//        mBinding.toolbarLay.rightText = "添加观测点"
+        mBinding.toolbarLay.titleIvRight.run {
+            updateLayoutParams<RelativeLayout.LayoutParams> {
+                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<RelativeLayout.LayoutParams> {
+                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<WaterYieldRecordItem>()
+    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() {
+
+    }
+
+}

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<Work3LevelOption>, 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<String>().apply {
+//            val items1: MutableList<String> = mutableListOf()
+//            val items2: MutableList<MutableList<String>> = mutableListOf()
+//            val items3: MutableList<MutableList<MutableList<String>>> = mutableListOf()
+//            options.forEach {
+//                items1.add(it.name)
+//
+//            }
+//            setPicker( options.map { it.name } , null, null)
+//            show()
+//        }
+//    }
+
+
     fun showOptionPicker(context: Context, title:String, options: List<WorkOption>, 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<String>, action: (String) -> Unit) {
         OptionsPickerBuilder(context) { opt1, _, _, _ ->
             action(options[opt1])

coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml

@@ -175,8 +175,7 @@
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/fragment_container"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
+                android:layout_height="match_parent"/>
-                android:layout_weight="1"/>
 
         </LinearLayout>
 

coalMiningApp/app/src/main/res/layout/activity_water_yield_observe_record.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black_bg"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/lay_title_right_bar" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvObserveRecord"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="15dp"
+            android:overScrollMode="never"
+            tools:listitem="@layout/list_item_water_yield_record"
+            android:background="@drawable/bg_stroke_gray"/>
+
+    </LinearLayout>
+</layout>

coalMiningApp/app/src/main/res/layout/fragment_buoy_method.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:overScrollMode="never">
 
         <LinearLayout
@@ -13,7 +13,7 @@
             android:background="@color/black_bg"
             android:orientation="vertical">
 
-            <com.zmkg.coaloperation.view.NestedRecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvBuoyTop"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
                 tools:itemCount="2"
                 tools:listitem="@layout/list_item_buoy_top" />
 
-            <com.zmkg.coaloperation.view.NestedRecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvBuoyBottom"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -128,6 +128,39 @@
                     android:textCursorDrawable="@drawable/cursor_white"
                     android:textSize="16sp" />
             </LinearLayout>
+            <LinearLayout
+                style="?android:attr/buttonBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:orientation="horizontal"
+                android:paddingStart="30dp"
+                android:paddingEnd="30dp">
+
+                <Button
+                    android:id="@+id/btnRecord"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="44dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_btn_save"
+                    android:text="查看记录"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+
+                <Button
+                    android:id="@+id/btnSubmit"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="44dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_btn_export"
+                    android:text="确认提交"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+            </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 

coalMiningApp/app/src/main/res/layout/fragment_volume_method.xml

@@ -2,181 +2,212 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-    <LinearLayout
+
-        android:layout_height="match_parent"
+    <ScrollView
         android:layout_width="match_parent"
-        android:background="@color/black_bg"
+        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:overScrollMode="never">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20dp"
+            android:background="@color/black_bg"
-            android:background="@drawable/bg_stroke_gray"
             android:orientation="vertical">
 
-            <FrameLayout
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                android:background="@drawable/bg_stroke_gray"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/bottom_border"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="容积体积(L)"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <EditText
+                        android:id="@+id/etInputVolume"
+                        android:layout_width="120dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical|end"
+                        android:background="@color/transparent"
+                        android:gravity="end|center_vertical"
+                        android:hint="请输入"
+                        android:maxLines="1"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white"
+                        android:textCursorDrawable="@drawable/cursor_white"
+                        android:textSize="16sp" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="装满容积时间(s)"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <EditText
+                        android:id="@+id/etInputSecond"
+                        android:layout_width="120dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginStart="10dp"
+                        android:background="@color/transparent"
+                        android:gravity="end|center_vertical"
+                        android:hint="请输入"
+                        android:maxLines="1"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white"
+                        android:textCursorDrawable="@drawable/cursor_white"
+                        android:textSize="16sp" />
+                </FrameLayout>
+            </LinearLayout>
+
+            <com.allen.library.shape.ShapeButton
+                android:id="@+id/btnCalculate"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_gravity="bottom|center_horizontal"
+                android:layout_marginHorizontal="20dp"
+                android:layout_marginVertical="20dp"
+                android:gravity="center"
+                android:text="计算"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                app:shapeCornersRadius="36dp"
+                app:shapeSolidColor="#21A69A" />
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:background="@drawable/bottom_border"
+                android:layout_marginStart="20dp"
-                android:paddingStart="20dp"
+                android:layout_marginEnd="20dp"
-                android:paddingEnd="15dp">
+                android:background="@drawable/bg_stroke_gray"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="容积体积(L)"
+                    android:layout_marginStart="20dp"
-                    android:textColor="#6A6F87"
+                    android:text="涌水量(m /h)："
-                    android:textSize="16sp" />
-
-                <EditText
-                    android:id="@+id/etInputVolume"
-                    android:layout_width="wrap_content"
-                    android:layout_height="30dp"
-                    android:layout_gravity="center_vertical|end"
-                    android:layout_marginStart="10dp"
-                    android:background="@drawable/bg_solid_black"
-                    android:gravity="center_vertical"
-                    android:hint="请输入"
-                    android:maxWidth="100dp"
-                    android:maxLines="1"
-                    android:minWidth="80dp"
-                    android:paddingStart="5dp"
-                    android:paddingEnd="5dp"
                     android:textColor="@color/white"
-                    android:textColorHint="#6A6F87"
+                    android:textSize="18sp" />
-                    android:textCursorDrawable="@drawable/cursor_white"
-                    android:textSize="16sp" />
-            </FrameLayout>
 
-            <FrameLayout
+                <TextView
+                    android:id="@+id/tvWaterYieldValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginStart="3dp"
+                    android:gravity="center_vertical"
+                    android:includeFontPadding="false"
+                    android:maxLines="1"
+                    tools:text="10"
+                    android:textColor="#A3FEA6"
+                    android:textSize="18sp" />
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
+                android:layout_height="wrap_content"
-                android:paddingStart="20dp"
+                android:layout_marginStart="20dp"
-                android:paddingEnd="15dp">
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="20dp"
+                android:background="@drawable/bg_stroke_gray"
+                android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="50dp"
                     android:layout_gravity="center_vertical"
-                    android:text="装满容积时间(s)"
+                    android:layout_marginStart="20dp"
-                    android:textColor="#6A6F87"
+                    android:gravity="center_vertical"
+                    android:text="备注"
+                    android:textColor="#A3FEA6"
                     android:textSize="16sp" />
 
+                <com.google.android.material.divider.MaterialDivider
+                    android:id="@+id/divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    app:dividerColor="#282C38" />
+
                 <EditText
-                    android:id="@+id/etInputSecond"
+                    android:id="@+id/etRemark"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical|end"
-                    android:layout_marginStart="10dp"
+                    android:layout_marginStart="20dp"
-                    android:background="@drawable/bg_solid_black"
+                    android:layout_marginEnd="15dp"
-                    android:gravity="center_vertical"
+                    android:layout_marginBottom="10dp"
-                    android:hint="请输入"
+                    android:background="@color/transparent"
-                    android:maxWidth="100dp"
+                    android:gravity="top"
-                    android:maxLines="1"
+                    android:hint="请输入备注内容，120字以内"
-                    android:minWidth="80dp"
+                    android:lines="5"
-                    android:paddingStart="5dp"
+                    android:maxLength="120"
-                    android:paddingEnd="5dp"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
                     android:textColor="@color/white"
                     android:textColorHint="#6A6F87"
                     android:textCursorDrawable="@drawable/cursor_white"
                     android:textSize="16sp" />
-            </FrameLayout>
+            </LinearLayout>
-        </LinearLayout>
 
-        <com.allen.library.shape.ShapeButton
+            <LinearLayout
-            android:id="@+id/btnCalculate"
+                style="?android:attr/buttonBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_gravity="bottom|center_horizontal"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginVertical="20dp"
-            android:gravity="center"
-            android:text="计算"
-            android:textColor="@color/white"
-            android:textSize="18sp"
-            app:shapeCornersRadius="36dp"
-            app:shapeSolidColor="#21A69A" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/bg_stroke_gray"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="20dp"
-                android:text="涌水量(m /h)："
-                android:textColor="@color/white"
-                android:textSize="18sp" />
-
-            <TextView
-                android:id="@+id/tvWaterYieldValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center_vertical"
-                android:layout_marginStart="3dp"
-                android:gravity="center_vertical"
-                android:includeFontPadding="false"
-                android:maxLines="1"
-                tools:text="10"
-                android:textColor="#A3FEA6"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/bg_stroke_gray"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="20dp"
-                android:gravity="center_vertical"
-                android:text="备注"
-                android:textColor="#A3FEA6"
-                android:textSize="16sp" />
-
-            <com.google.android.material.divider.MaterialDivider
-                android:id="@+id/divider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                app:dividerColor="#282C38" />
-
-            <EditText
-                android:id="@+id/etRemark"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|end"
+                android:paddingTop="20dp"
-                android:layout_marginStart="20dp"
+                android:paddingBottom="20dp"
-                android:layout_marginEnd="15dp"
+                android:orientation="horizontal"
-                android:layout_marginBottom="10dp"
+                android:paddingStart="30dp"
-                android:background="@color/transparent"
+                android:paddingEnd="30dp">
-                android:gravity="top"
-                android:hint="请输入备注内容，120字以内"
-                android:lines="5"
-                android:maxLength="120"
-                android:paddingTop="10dp"
-                android:paddingBottom="10dp"
-                android:textColor="@color/white"
-                android:textColorHint="#6A6F87"
-                android:textCursorDrawable="@drawable/cursor_white"
-                android:textSize="16sp" />
-        </LinearLayout>
 
-    </LinearLayout>
+                <Button
+                    android:id="@+id/btnRecord"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="44dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_btn_save"
+                    android:text="查看记录"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+
+                <Button
+                    android:id="@+id/btnSubmit"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="44dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_btn_export"
+                    android:text="确认提交"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 
 </layout>

coalMiningApp/app/src/main/res/layout/lay_title_right_bar.xml

@@ -94,6 +94,16 @@
             android:src="@{rightImageSrc==null?@drawable/icon_back:rightImageSrc}"
             android:visibility="@{rightImageSrc!=null?View.VISIBLE:View.GONE}" />
 
+        <ImageView
+            android:id="@+id/title_iv_right2"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_toStartOf="@id/title_iv_right"
+            android:layout_marginEnd="2dp"
+            android:scaleType="center"
+            tools:src="@drawable/ic_func_delete"
+            android:visibility="visible"/>
+
         <View
             android:id="@+id/v_line"
             android:layout_width="match_parent"

coalMiningApp/app/src/main/res/layout/list_item_buoy_bottom.xml

@@ -35,6 +35,7 @@
                 android:hint="请输入"
                 android:maxLines="1"
                 android:background="@color/transparent"
+                android:textCursorDrawable="@drawable/cursor_white"
                 android:textColor="@color/white"
                 android:textColorHint="@color/white"
                 android:textSize="16sp" />

coalMiningApp/app/src/main/res/layout/list_item_buoy_top.xml

@@ -62,6 +62,7 @@
                 android:maxLines="1"
                 android:textColor="@color/white"
                 android:textColorHint="@color/white"
+                android:textCursorDrawable="@drawable/cursor_white"
                 android:textSize="16sp" />
             <!--        android:background="@drawable/bg_solid_black"-->
             <!--        android:textCursorDrawable="@drawable/cursor_white"-->
@@ -90,6 +91,7 @@
                 android:layout_marginStart="10dp"
                 android:background="@color/transparent"
                 android:gravity="end|center_vertical"
+                android:textCursorDrawable="@drawable/cursor_white"
                 android:hint="请输入"
                 android:maxLines="1"
                 android:textColor="@color/white"

coalMiningApp/app/src/main/res/layout/list_item_water_yield_record.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        tools:background="@color/black_bg">
+
+        <TextView
+            android:id="@+id/tvItemName"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="0dp"
+            android:gravity="center_vertical"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="瓦斯含量" />
+
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/verticalDivider"
+            android:layout_width="1dp"
+            android:layout_height="0dp"
+            app:dividerColor="#20222B"
+            android:layout_marginStart="10dp"
+            app:layout_constraintStart_toEndOf="@id/tvItemName"
+            app:layout_constraintTop_toTopOf="@id/tvItemName"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+        <FrameLayout
+            android:id="@+id/frameLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/verticalDivider"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/tvItemValue"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:ellipsize="end"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="15dp"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                tools:text="5-20304回风工作面" />
+
+            <LinearLayout
+                android:id="@+id/llContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvItemName"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="UselessLeaf" />
+        </FrameLayout>
+
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            app:dividerColor="#20222B"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/frameLayout" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

coalMiningApp/app/src/main/res/layout/list_item_water_yield_record_inner.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:background="@color/black_bg">
+
+        <TextView
+            android:id="@+id/tvItemName"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginEnd="65dp"
+            android:layout_gravity="start"
+            android:gravity="center_vertical"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:layout_marginStart="15dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="瓦斯含量" />
+
+        <TextView
+            android:id="@+id/tvItemValue"
+            android:layout_width="60dp"
+            android:layout_height="50dp"
+            android:layout_gravity="end"
+            android:layout_marginEnd="15dp"
+            android:gravity="end|center_vertical"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            tools:text="15m/s" />
+
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_gravity="bottom"
+            app:dividerColor="#20222B" />
+
+    </FrameLayout>
+</layout>

coalMiningApp/app/src/main/res/values/colors.xml

@@ -32,4 +32,5 @@
     <color name="black_bg2">#17181C</color>
     <color name="shape_green">#A3FEA6</color>
     <color name="scrollbar">#FF21A69A</color>
+    <color name="divider">#353846</color>
 </resources>