From 79c085597629f93db816f941b81a5f9468b30eca Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Wed, 24 Sep 2025 19:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B9=E7=A7=AF=E6=B3=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable-xxxhdpi/ic_location.png | Bin 0 -> 3976 bytes
 .../layout/activity_water_yield_observe.xml   | 181 +++++++++++++++++-
 2 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_location.png

diff --git a/coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_location.png b/coalMiningApp/app/src/main/res/drawable-xxxhdpi/ic_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca648f21dd44ebcbd8eaf1a438fabd69cad1a6d4
GIT binary patch
literal 3976
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

literal 0
HcmV?d00001

diff --git a/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml b/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml
index 31e08ed..da928d7 100644
--- a/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml
+++ b/coalMiningApp/app/src/main/res/layout/activity_water_yield_observe.xml
@@ -17,7 +17,7 @@
             android:id="@+id/toolbar_lay"
             layout="@layout/lay_title_right_bar" />
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <LinearLayout
@@ -25,6 +25,19 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+                <TextView
+                    android:id="@+id/tvCoalLocation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="50dp"
+                    android:drawablePadding="10dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    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"
@@ -157,9 +170,173 @@
                         android:textSize="16sp"
                         app:drawableEndCompat="@drawable/ic_arrow_down_white" />
                 </LinearLayout>
+                <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="容积体积(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:gravity="center_vertical"
+                    android:layout_marginStart="20dp"
+                    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:layout_marginStart="20dp"
+                        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:gravity="center_vertical"
+                        android:layout_marginStart="3dp"
+                        android:maxLines="1"
+                        android:includeFontPadding="false"
+                        android:textColor="#A3FEA6"
+                        android:text="10"
+                        android:textSize="18sp" />
+                </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:background="@drawable/bg_stroke_gray">
+                <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>
-        </ScrollView>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 </layout>
\ No newline at end of file