观测方法页面完善并进行切换

coalMiningApp/app/build.gradle

@@ -110,4 +110,6 @@ dependencies {
     implementation("org.apache.poi:poi:5.2.3")
     implementation("org.apache.poi:poi-ooxml:5.2.3")
 
+    implementation 'androidx.fragment:fragment-ktx:1.6.0'
+
 }

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/BuoyBottomAdapter.kt

@@ -0,0 +1,46 @@
+package com.zmkg.coaloperation.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.widget.addTextChangedListener
+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.BuoyBottomItem
+import com.zmkg.coaloperation.databinding.ListItemBuoyBottomBinding
+import com.zmkg.coaloperation.utils.formatDecimalString
+import com.zmkg.coaloperation.utils.gone
+import com.zmkg.coaloperation.utils.visible
+
+class BuoyBottomAdapter(list: MutableList<BuoyBottomItem>) :
+    BaseQuickAdapter<BuoyBottomItem, BuoyBottomAdapter.VH>(R.layout.list_item_buoy_bottom, list) {
+    inner class VH(var binding: ListItemBuoyBottomBinding) : BaseViewHolder(binding.root)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+        val binding = ListItemBuoyBottomBinding.inflate(
+            LayoutInflater.from(context), parent, false
+        )
+        return VH(binding).also {
+            bindViewClickListener(it, viewType)
+        }
+    }
+
+    override fun convert(holder: VH, item: BuoyBottomItem) {
+        holder.binding.let {
+            val position = holder.layoutPosition
+            if (position > 0) {
+                item.name = "断面${position}到断面${position + 1}的水流时间(s)"
+            }
+            it.tvShowName.text = item.name
+            it.etShowValue.run {
+                addTextChangedListener(onTextChanged = { text, start, before, count ->
+                    item.value = text.toString().trim()
+                })
+                setText(item.value.formatDecimalString())
+            }
+            it.divider.run {
+                if (position == data.size - 1) gone() else visible()
+            }
+        }
+    }
+}

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/BuoyTopAdapter.kt

@@ -0,0 +1,56 @@
+package com.zmkg.coaloperation.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.widget.addTextChangedListener
+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.BuoyTopItem
+import com.zmkg.coaloperation.databinding.ListItemBuoyTopBinding
+import com.zmkg.coaloperation.utils.formatDecimalString
+import com.zmkg.coaloperation.utils.gone
+import com.zmkg.coaloperation.utils.visible
+
+class BuoyTopAdapter(list: MutableList<BuoyTopItem>) :
+    BaseQuickAdapter<BuoyTopItem, BuoyTopAdapter.VH>(R.layout.list_item_buoy_top, list) {
+    inner class VH(var binding: ListItemBuoyTopBinding) : BaseViewHolder(binding.root)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+        val binding = ListItemBuoyTopBinding.inflate(
+            LayoutInflater.from(context), parent, false
+        )
+        return VH(binding).also {
+            bindViewClickListener(it, viewType)
+        }
+    }
+
+    override fun convert(holder: VH, item: BuoyTopItem) {
+        holder.binding.let {
+            val position = holder.layoutPosition
+            item.faceName = "断面${position + 1}"
+            it.tvFaceName.text = item.faceName
+            it.etDitchWidth.run {
+                addTextChangedListener(onTextChanged = { text, start, before, count ->
+                    item.ditchWidth = text.toString().trim()
+                })
+                setText(item.ditchWidth.formatDecimalString())
+            }
+            it.etDitchDepth.run {
+                addTextChangedListener(onTextChanged = { text, start, before, count ->
+                    item.ditchDepth = text.toString().trim()
+                })
+                setText(item.ditchDepth.formatDecimalString())
+            }
+            it.ivDeleteFace.run {
+                if (position > 0) visible() else gone()
+            }
+            it.divider.run {
+                if (position == data.size - 1) gone() else visible()
+            }
+            it.btnAddFace.run {
+                if (position == data.size - 1) visible() else gone()
+            }
+        }
+    }
+}

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/OtherData.kt

@@ -23,7 +23,18 @@ data class CoalThicknessItem(
 )
 
 data class DataSyncItem(
-    var funcName:String,
+    var funcName: String,
     var onDataPull: () -> Unit = {},
     var onDataPush: () -> Unit = {},
+)
+
+data class BuoyTopItem(
+    var faceName:String= "",
+    var ditchWidth: String = "",
+    var ditchDepth: String = ""
+)
+
+data class BuoyBottomItem(
+    var name: String = "",
+    var value: String = ""
 )

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/BuoyMethodFragment.kt

@@ -0,0 +1,79 @@
+package com.zmkg.coaloperation.ui.wateryield
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.zmkg.coaloperation.R
+import com.zmkg.coaloperation.adapter.BuoyBottomAdapter
+import com.zmkg.coaloperation.adapter.BuoyTopAdapter
+import com.zmkg.coaloperation.base.BaseVMBFragment
+import com.zmkg.coaloperation.base.viewmodel.TestViewModel
+import com.zmkg.coaloperation.bean.BuoyBottomItem
+import com.zmkg.coaloperation.bean.BuoyTopItem
+import com.zmkg.coaloperation.databinding.FragmentBuoyMethodBinding
+
+class BuoyMethodFragment :
+    BaseVMBFragment<TestViewModel, FragmentBuoyMethodBinding>(R.layout.fragment_buoy_method) {
+
+    private val buoyTopList: MutableList<BuoyTopItem> = mutableListOf()
+    private val buoyBottomList: MutableList<BuoyBottomItem> = mutableListOf()
+    private val buoyTopAdapter by lazy {
+        BuoyTopAdapter(buoyTopList).apply {
+            addChildClickViewIds(R.id.ivDeleteFace, R.id.btnAddFace)
+            setOnItemChildClickListener { adapter, view, position ->
+                if (view.id == R.id.ivDeleteFace) {
+                    try {
+                        if (position == 0) {
+                            return@setOnItemChildClickListener
+                        }
+                        buoyTopList.removeAt(position)
+                        notifyDataSetChanged()
+                        buoyBottomList.removeAt(position)
+                        buoyBottomAdapter.notifyDataSetChanged()
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                    return@setOnItemChildClickListener
+                }
+                if (view.id == R.id.btnAddFace) {
+                    try {
+                        buoyTopList.add(BuoyTopItem())
+                        notifyDataSetChanged()
+                        //val topSize = buoyTopList.size
+                        //name = "断面${topSize-1}到断面${topSize}的水流时间(s)"
+                        buoyBottomList.add(BuoyBottomItem())
+                        buoyBottomAdapter.notifyDataSetChanged()
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                    return@setOnItemChildClickListener
+                }
+            }
+        }
+    }
+    private val buoyBottomAdapter by lazy {
+        BuoyBottomAdapter(buoyBottomList)
+    }
+
+    override fun initView(root: View?, savedInstanceState: Bundle?) {
+        buoyTopList.add(BuoyTopItem())
+        mBinding.rvBuoyTop.let {
+            it.layoutManager = LinearLayoutManager(it.context)
+            it.adapter = buoyTopAdapter
+        }
+        buoyBottomList.run {
+            add(BuoyBottomItem(name = "水沟长(m)"))
+        }
+        mBinding.rvBuoyBottom.let {
+            it.layoutManager = LinearLayoutManager(it.context)
+            it.adapter = buoyBottomAdapter
+        }
+    }
+
+    override fun bindEvent() {
+    }
+
+    override fun onClick(p0: View?) {
+    }
+
+}

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/VolumeMethodFragment.kt

@@ -0,0 +1,21 @@
+package com.zmkg.coaloperation.ui.wateryield
+
+import android.os.Bundle
+import android.view.View
+import com.zmkg.coaloperation.R
+import com.zmkg.coaloperation.base.BaseVMBFragment
+import com.zmkg.coaloperation.base.viewmodel.TestViewModel
+import com.zmkg.coaloperation.databinding.FragmentVolumeMethodBinding
+
+class VolumeMethodFragment:
+    BaseVMBFragment<TestViewModel, FragmentVolumeMethodBinding>(R.layout.fragment_volume_method) {
+    override fun initView(root: View?, savedInstanceState: Bundle?) {
+    }
+
+    override fun bindEvent() {
+    }
+
+    override fun onClick(p0: View?) {
+    }
+
+}

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldAddObservePointActivity.kt

@@ -5,13 +5,13 @@ import android.view.View
 import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.base.viewmodel.TestViewModel
-import com.zmkg.coaloperation.databinding.ActivityAboutUsBinding
 import com.zmkg.coaloperation.databinding.ActivityWaterYieldAddObservePointBinding
 
 /**
  * 涌水量添加观测点
  */
 class WaterYieldAddObservePointActivity : BaseVMBActivity<TestViewModel, ActivityWaterYieldAddObservePointBinding>(R.layout.activity_water_yield_add_observe_point) {
+
     override fun initView(savedInstanceState: Bundle?) {
         mBinding.toolbarLay.title = "添加观测点"
 //        mBinding.toolbarLay.rightText = "添加观测点"

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/wateryield/WaterYieldObserveActivity.kt

@@ -2,6 +2,8 @@ package com.zmkg.coaloperation.ui.wateryield
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.adapter.WaterYieldObserveAdapter
@@ -26,6 +28,7 @@ class WaterYieldObserveActivity :
 //        mBinding.toolbarLay.titleTvRight.setOnClickListener {
 //            toActivity(WaterYieldAddObservePointActivity::class.java)
 //        }
+        initFragments()
     }
 
 
@@ -43,6 +46,11 @@ class WaterYieldObserveActivity :
                   it.text = option.name
                   it.tag = option.id
               }
+                if (option.id == "1") {
+                    switchFragment(1)
+                } else {
+                    switchFragment(0)
+                }
             }
         }
 
@@ -66,4 +74,25 @@ class WaterYieldObserveActivity :
     override fun processClick(v: View?) {
     }
 
+    private val fragments = mutableListOf<Fragment>()
+    private fun initFragments() {
+        fragments.apply {
+            add(VolumeMethodFragment())
+            add(BuoyMethodFragment())
+        }
+        supportFragmentManager.commit {
+            add(R.id.fragment_container, fragments[0], "volume").hide(fragments[0])
+            add(R.id.fragment_container, fragments[1], "buoy").hide(fragments[1])
+        }
+    }
+
+    private fun switchFragment(position: Int) {
+        supportFragmentManager.commit {
+            setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out)
+            fragments.forEachIndexed { index, fragment ->
+                if (index == position) show(fragment) else hide(fragment)
+            }
+            setReorderingAllowed(true)
+        }
+    }
 }

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

@@ -17,326 +17,168 @@
             android:id="@+id/toolbar_lay"
             layout="@layout/lay_title_right_bar" />
 
-        <androidx.core.widget.NestedScrollView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tvCoalLocation"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:drawablePadding="10dp"
+                android:gravity="center_vertical"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="定位"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:drawableStartCompat="@drawable/ic_location" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                android:background="@drawable/bg_stroke_gray"
                 android:orientation="vertical">
 
-                <TextView
+                <FrameLayout
-                    android:id="@+id/tvCoalLocation"
+                    android:layout_width="match_parent"
-                    android:layout_width="wrap_content"
                     android:layout_height="50dp"
-                    android:drawablePadding="10dp"
+                    android:background="@drawable/bottom_border"
                     android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
+                    android:paddingEnd="15dp">
-                    android:text="定位"
-                    android:gravity="center_vertical"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    app:drawableStartCompat="@drawable/ic_location" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:background="@drawable/bg_stroke_gray"
-                    android:layout_marginHorizontal="20dp">
-                    <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="观测点"
-                            android:textColor="#6A6F87"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/tvObservePoint"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="end|center_vertical"
-                            android:drawablePadding="12dp"
-                            android:hint="请选择"
-                            android:paddingStart="5dp"
-                            android:paddingTop="3dp"
-                            android:paddingEnd="5dp"
-                            android:paddingBottom="3dp"
-                            android:textColor="@color/white"
-                            android:textColorHint="#6A6F87"
-                            android:textSize="16sp"
-                            app:drawableEndCompat="@drawable/ic_point_arrow_right" />
-                    </FrameLayout>
-                    <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="观测点坐标"
-                            android:textColor="#6A6F87"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/tvObservePointValue"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="end|center_vertical"
-                            android:drawablePadding="12dp"
-                            android:hint="请选择"
-                            android:paddingStart="5dp"
-                            android:paddingTop="3dp"
-                            android:paddingEnd="5dp"
-                            android:paddingBottom="3dp"
-                            android:textColor="@color/white"
-                            android:textColorHint="#6A6F87"
-                            android:textSize="16sp"
-                            app:drawableEndCompat="@drawable/ic_point_arrow_right" />
-                    </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="观测人"
-                            android:textColor="#6A6F87"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/tvObservePerson"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="end|center_vertical"
-                            android:drawablePadding="12dp"
-                            android:hint="请选择"
-                            android:paddingStart="5dp"
-                            android:paddingTop="3dp"
-                            android:paddingEnd="5dp"
-                            android:paddingBottom="3dp"
-                            android:textColor="@color/white"
-                            android:textColorHint="#6A6F87"
-                            android:textSize="16sp"
-                            app:drawableEndCompat="@drawable/ic_point_arrow_right" />
-                    </FrameLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:orientation="horizontal"
-                    android:gravity="center_vertical"
-                    android:layout_marginStart="20dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:text="观测方法"
+                        android:text="观测点"
                         android:textColor="#6A6F87"
                         android:textSize="16sp" />
 
                     <TextView
-                        android:id="@+id/tvObserveMethod"
+                        android:id="@+id/tvObservePoint"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
                         android:drawablePadding="12dp"
                         android:hint="请选择"
-                        android:gravity="center_vertical"
-                        android:layout_marginStart="10dp"
                         android:paddingStart="5dp"
                         android:paddingTop="3dp"
                         android:paddingEnd="5dp"
                         android:paddingBottom="3dp"
-                        android:textColor="#A3FEA6"
+                        android:textColor="@color/white"
-                        android:textColorHint="#A3FEA6"
+                        android:textColorHint="#6A6F87"
                         android:textSize="16sp"
-                        app:drawableEndCompat="@drawable/ic_arrow_down_white" />
+                        app:drawableEndCompat="@drawable/ic_point_arrow_right" />
-                </LinearLayout>
+                </FrameLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:background="@drawable/bg_stroke_gray"
-                    android:layout_marginHorizontal="20dp">
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="50dp"
-                        android:background="@drawable/bottom_border"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="15dp">
 
-                        <TextView
+                <FrameLayout
-                            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="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:textCursorDrawable="@drawable/cursor_white"
-                            android:textSize="16sp" />
-                    </FrameLayout>
-                    <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="装满容积时间(s)"
-                            android:textColor="#6A6F87"
-                            android:textSize="16sp" />
-
-                        <EditText
-                            android:id="@+id/etInputSecond"
-                            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: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:gravity="center"
-                    android:textSize="18sp"
-                    android:text="计算"
-                    android:layout_marginHorizontal="20dp"
-                    android:layout_marginVertical="20dp"
-                    android:textColor="@color/white"
-                    app:shapeCornersRadius="36dp"
-                    app:shapeSolidColor="#21A69A" />
-
-                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
-                    android:orientation="horizontal"
+                    android:background="@drawable/bottom_border"
-                    android:gravity="center_vertical"
+                    android:paddingStart="20dp"
-                    android:layout_marginStart="20dp"
+                    android:paddingEnd="15dp">
-                    android:layout_marginEnd="20dp"
-                    android:background="@drawable/bg_stroke_gray">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:text="涌水量(m /h)："
+                        android:text="观测点坐标"
-                        android:layout_marginStart="20dp"
+                        android:textColor="#6A6F87"
-                        android:textColor="@color/white"
+                        android:textSize="16sp" />
-                        android:textSize="18sp" />
 
                     <TextView
-                        android:id="@+id/tvWaterYieldValue"
+                        android:id="@+id/tvObservePointValue"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:gravity="center_vertical"
+                        android:drawablePadding="12dp"
-                        android:layout_marginStart="3dp"
+                        android:hint="请选择"
-                        android:maxLines="1"
+                        android:paddingStart="5dp"
-                        android:includeFontPadding="false"
+                        android:paddingTop="3dp"
-                        android:textColor="#A3FEA6"
+                        android:paddingEnd="5dp"
-                        android:text="10"
+                        android:paddingBottom="3dp"
-                        android:textSize="18sp" />
+                        android:textColor="@color/white"
-                </LinearLayout>
+                        android:textColorHint="#6A6F87"
+                        android:textSize="16sp"
+                        app:drawableEndCompat="@drawable/ic_point_arrow_right" />
+                </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="观测人"
+                        android:textColor="#6A6F87"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tvObservePerson"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
+                        android:drawablePadding="12dp"
+                        android:hint="请选择"
+                        android:paddingStart="5dp"
+                        android:paddingTop="3dp"
+                        android:paddingEnd="5dp"
+                        android:paddingBottom="3dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#6A6F87"
+                        android:textSize="16sp"
+                        app:drawableEndCompat="@drawable/ic_point_arrow_right" />
+                </FrameLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="50dp"
-                android:orientation="vertical"
-                android:layout_marginTop="10dp"
                 android:layout_marginStart="20dp"
-                android:layout_marginEnd="20dp"
+                android:gravity="center_vertical"
-                android:background="@drawable/bg_stroke_gray">
+                android:orientation="horizontal">
+
                 <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:layout_gravity="center_vertical"
-                    android:layout_marginStart="20dp"
+                    android:text="观测方法"
-                    android:layout_marginEnd="15dp"
+                    android:textColor="#6A6F87"
-                    android:layout_marginBottom="10dp"
-                    android:background="@color/transparent"
-                    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" />
+
+                <TextView
+                    android:id="@+id/tvObserveMethod"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginStart="10dp"
+                    android:drawablePadding="12dp"
+                    android:gravity="center_vertical"
+                    android:hint="请选择"
+                    android:paddingStart="5dp"
+                    android:paddingTop="3dp"
+                    android:paddingEnd="5dp"
+                    android:paddingBottom="3dp"
+                    android:textColor="#A3FEA6"
+                    android:textColorHint="#A3FEA6"
+                    android:textSize="16sp"
+                    app:drawableEndCompat="@drawable/ic_arrow_down_white" />
             </LinearLayout>
-            </LinearLayout>
+
-        </androidx.core.widget.NestedScrollView>
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/fragment_container"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+        </LinearLayout>
 
     </LinearLayout>
 </layout>

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

@@ -0,0 +1,134 @@
+<?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">
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:overScrollMode="never">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/black_bg"
+            android:orientation="vertical">
+
+            <com.zmkg.coaloperation.view.NestedRecyclerView
+                android:id="@+id/rvBuoyTop"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                android:overScrollMode="never"
+                android:background="@drawable/bg_stroke_gray"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="2"
+                tools:listitem="@layout/list_item_buoy_top" />
+
+            <com.zmkg.coaloperation.view.NestedRecyclerView
+                android:id="@+id/rvBuoyBottom"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                android:layout_marginTop="15dp"
+                android:overScrollMode="never"
+                android:background="@drawable/bg_stroke_gray"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="3"
+                tools:listitem="@layout/list_item_buoy_bottom" />
+
+
+            <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: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:layout_marginStart="20dp"
+                    android:layout_marginEnd="15dp"
+                    android:layout_marginBottom="10dp"
+                    android:background="@color/transparent"
+                    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>
+    </androidx.core.widget.NestedScrollView>
+
+</layout>

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

@@ -0,0 +1,182 @@
+<?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">
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:background="@color/black_bg"
+        android:orientation="vertical">
+
+        <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="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: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="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: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: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:layout_marginStart="20dp"
+                android:layout_marginEnd="15dp"
+                android:layout_marginBottom="10dp"
+                android:background="@color/transparent"
+                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>
+
+</layout>

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

@@ -0,0 +1,49 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:background="@color/black_bg">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/bottom_border"
+            android:paddingStart="20dp"
+            android:paddingEnd="15dp">
+
+            <TextView
+                android:id="@+id/tvShowName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="#6A6F87"
+                android:textSize="16sp"
+                tools:text="水沟长(m)" />
+
+            <EditText
+                android:id="@+id/etShowValue"
+                android:layout_width="120dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginStart="10dp"
+                android:gravity="end|center_vertical"
+                android:hint="请输入"
+                android:maxLines="1"
+                android:background="@color/transparent"
+                android:textColor="@color/white"
+                android:textColorHint="@color/white"
+                android:textSize="16sp" />
+        </FrameLayout>
+
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/divider"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            app:dividerColor="#282C38" />
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,121 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:background="@color/black_bg">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tvFaceName"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="20dp"
+                android:gravity="center_vertical"
+                android:textColor="#A3FEA6"
+                android:textSize="16sp"
+                tools:text="断面" />
+
+            <ImageView
+                android:id="@+id/ivDeleteFace"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:padding="14dp"
+                android:src="@drawable/ic_face_delete" />
+
+        </LinearLayout>
+
+        <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="水沟宽(m)"
+                android:textColor="#6A6F87"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/etDitchWidth"
+                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:textSize="16sp" />
+            <!--        android:background="@drawable/bg_solid_black"-->
+            <!--        android:textCursorDrawable="@drawable/cursor_white"-->
+        </FrameLayout>
+
+        <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="水沟深(m)"
+                android:textColor="#6A6F87"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/etDitchDepth"
+                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:textSize="16sp" />
+        </FrameLayout>
+
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/divider"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            app:dividerColor="#282C38" />
+
+        <TextView
+            android:id="@+id/btnAddFace"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:drawablePadding="7dp"
+            android:gravity="center_vertical"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:text="新增断面"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:visibility="visible"
+            app:drawableStartCompat="@drawable/ic_add_point" />
+    </LinearLayout>
+</layout>