yixiong/digitalCoalMiningPlatform
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化数据拉取、新增、保存、详情、UI

Browse Source
This commit is contained in:
lvmeng
2025-09-13 21:04:46 +08:00
parent 0c3898c8af
commit 587139fd91
16 changed files with 227 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coalMiningApp/app/src/main/res/layout/activity_add_working_point.xml
+7 -7
View File
@@ -18,7 +18,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="0dp"
android:layout_marginStart="20dp"
@@ -32,8 +32,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_stroke_gray"
android:orientation="vertical">
android:orientation="vertical"
android:background="@drawable/bg_stroke_gray">
<LinearLayout
android:layout_width="match_parent"
@@ -266,7 +266,7 @@
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- tools:minHeight="60dp" />-->
<androidx.recyclerview.widget.RecyclerView
<com.zmkg.coaloperation.view.NestedRecyclerView
android:id="@+id/rvLithology"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -428,14 +428,14 @@
</FrameLayout>
</LinearLayout>
</ScrollView>
</androidx.core.widget.NestedScrollView>
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:orientation="horizontal"
android:paddingStart="30dp"
android:paddingEnd="30dp">
coalMiningApp/app/src/main/res/layout/item_rock_nature.xml
+79 -79
View File
@@ -1,82 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp">
<TextView
android:id="@+id/tvRock1Start"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@drawable/bg_solid_black"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:minWidth="60dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textSize="14sp" />
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/dash_line" />
<TextView
android:id="@+id/tvRock1End"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@drawable/bg_solid_black"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:minWidth="60dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="m"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/tvRock1Name"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_solid_black"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:minWidth="60dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="岩"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp">
<TextView
android:id="@+id/tvRock1Start"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@drawable/bg_solid_black"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:minWidth="60dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textSize="14sp" />
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/dash_line" />
<TextView
android:id="@+id/tvRock1End"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@drawable/bg_solid_black"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:minWidth="60dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="m"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/tvRock1Name"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_solid_black"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:minWidth="60dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="岩"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
</layout>
coalMiningApp/app/src/main/res/layout/list_item_tunnel_working_face.xml
+1
View File
@@ -15,6 +15,7 @@
android:orientation="vertical">
<com.allen.library.shape.ShapeLinearLayout
android:id="@+id/llWorkingFace"
android:layout_width="match_parent"
android:layout_height="74dp"
android:layout_marginHorizontal="20dp"