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

回采新增详情修改、合并我的数据拉取和推送到新数据同步页面

Browse Source
This commit is contained in:
lvmeng
2025-09-22 18:55:59 +08:00
parent e712fa230a
commit 6e75007bd1
41 changed files with 1135 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coalMiningApp/app/src/main/res/layout/activity_add_mining_face.xml
+4 -4
View File
@@ -11,7 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<include
@@ -30,10 +30,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
tools:itemCount="6"
android:background="@drawable/bg_stroke_gray"
android:overScrollMode="never"
tools:listitem="@layout/list_item_add_mining_face"
android:background="@drawable/bg_stroke_gray"/>
tools:itemCount="6"
tools:listitem="@layout/list_item_add_mining_face" />
</LinearLayout>
<com.allen.library.shape.ShapeTextView
coalMiningApp/app/src/main/res/layout/activity_add_working_face.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<include
coalMiningApp/app/src/main/res/layout/activity_add_working_face_record.xml
+52 -2
View File
@@ -335,11 +335,12 @@
android:textSize="16sp" />
<TextView
android:layout_width="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical|end"
android:includeFontPadding="false"
android:layout_marginStart="5dp"
android:text="°"
android:textColor="#6A6F87"
android:textSize="16sp" />
@@ -382,12 +383,61 @@
android:textSize="16sp" />
<TextView
android:layout_width="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical|end"
android:includeFontPadding="false"
android:text="m"
android:layout_marginStart="5dp"
android:textColor="#6A6F87"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/bottom_border"
android:gravity="center_vertical"
android:paddingStart="20dp"
android:paddingEnd="15dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="涌水量"
android:textColor="#6A6F87"
android:textSize="16sp" />
<EditText
android:id="@+id/etWaterYield"
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="60dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textColorHint="#6A6F87"
android:textCursorDrawable="@drawable/cursor_white"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical|end"
android:includeFontPadding="false"
android:text="m³/h"
android:layout_marginStart="5dp"
android:textColor="#6A6F87"
android:textSize="16sp" />
</LinearLayout>
coalMiningApp/app/src/main/res/layout/activity_cache_manage.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar_lay"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<com.allen.library.shape.ShapeLinearLayout
coalMiningApp/app/src/main/res/layout/activity_data_sync.xml
+30
View File
@@ -0,0 +1,30 @@
<?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/rvFuncList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
tools:listitem="@layout/list_item_data_sync"
android:overScrollMode="never" />
</LinearLayout>
</layout>
coalMiningApp/app/src/main/res/layout/activity_geological.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<include
coalMiningApp/app/src/main/res/layout/activity_geological_catalog_point.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<include
coalMiningApp/app/src/main/res/layout/activity_login.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
android:background="@color/black_bg">
<com.allen.library.shape.ShapeFrameLayout
android:layout_width="match_parent"
coalMiningApp/app/src/main/res/layout/activity_main.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_alignParentBottom="true"
android:background="@color/black"
android:background="@color/black_bg"
app:config_file_name="tab.json"
app:container_id="@id/main_content_layout" />
</RelativeLayout>
coalMiningApp/app/src/main/res/layout/activity_mining_face_record.xml
+158
View File
@@ -0,0 +1,158 @@
<?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"
tools:ignore="HardcodedText,Autofill,TextFields" >
<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.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:paddingStart="20dp"
android:paddingEnd="20dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.zmkg.coaloperation.view.NestedRecyclerView
android:id="@+id/rvBaseData"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:background="@drawable/bg_stroke_gray"
android:overScrollMode="never"
tools:listitem="@layout/list_item_mining_record_base_data"
tools:itemCount="4"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:text="实测煤厚"
android:textColor="@color/white"
app:drawableStartCompat="@drawable/line_green"/>
<com.zmkg.coaloperation.view.NestedRecyclerView
android:id="@+id/rvCoalThickness"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/list_item_mining_record_coal_thickness"
tools:itemCount="4"
android:background="@drawable/bg_stroke_gray" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:background="@drawable/bg_stroke_gray">
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="start"
android:layout_marginStart="20dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="是否出水"
android:textColor="#FF6A6F87"
android:textSize="16sp" />
<TextView
android:id="@+id/tvWaterOutflow"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="end"
android:layout_marginEnd="15dp"
android:drawablePadding="2dp"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="请选择"
android:textColor="@color/white"
android:textSize="16sp"
app:drawableEndCompat="@drawable/ic_arrow_down_white" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="@drawable/bg_stroke_gray">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="50dp"
android:layout_gravity="start"
android:layout_marginStart="20dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="回采工作面涌水量"
android:textColor="#FF6A6F87"
android:textSize="16sp" />
<EditText
android:id="@+id/etInputValue"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginEnd="5dp"
android:background="@drawable/rectangle_stroke_grey_corner8"
android:hint="请输入"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:layout_gravity="end|center_vertical"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textColorHint="#757B8C"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginEnd="15dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="m³/h"
android:textColor="#FF6A6F87"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.allen.library.shape.ShapeTextView
android:id="@+id/btnSaveRecord"
android:layout_width="250dp"
android:layout_height="52dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:text="保存"
android:textColor="@color/white"
android:textSize="18sp"
app:shapeCornersRadius="30dp"
app:shapeSolidColor="#21A69A" />
</LinearLayout>
</layout>
coalMiningApp/app/src/main/res/layout/activity_network_config.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar_lay"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<com.allen.library.shape.ShapeLinearLayout
coalMiningApp/app/src/main/res/layout/fragment_home.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
android:background="@color/black_bg">
<RelativeLayout
coalMiningApp/app/src/main/res/layout/fragment_record.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<include
coalMiningApp/app/src/main/res/layout/fragment_report.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/black_bg"
android:orientation="vertical">
<include
coalMiningApp/app/src/main/res/layout/lay_title_right_bar.xml
+1 -1
View File
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@{transparentBg?@color/transparent:@color/black}"
tools:background="@color/black">
tools:background="@color/black_bg">
<ImageView
android:id="@+id/title_iv_back"
coalMiningApp/app/src/main/res/layout/list_item_add_mining_face.xml
-1
View File
@@ -7,7 +7,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- android:background="#0C0D0E"-->
<TextView
android:id="@+id/tvFuncName"
coalMiningApp/app/src/main/res/layout/list_item_data_sync.xml
+33
View File
@@ -0,0 +1,33 @@
<?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="50dp"
android:background="@drawable/bg_stroke_gray"
android:gravity="center_vertical"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:orientation="vertical">
<TextView
android:id="@+id/tvItemUnit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="m" />
<!-- <com.google.android.material.divider.MaterialDivider-->
<!-- android:id="@+id/divider"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- app:dividerColor="#282C38" />-->
</LinearLayout>
</layout>
coalMiningApp/app/src/main/res/layout/list_item_mining_record_base_data.xml
+62
View File
@@ -0,0 +1,62 @@
<?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.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="1dp"
app:dividerColor="#282C38"
app:layout_constraintBottom_toBottomOf="parent" />
<TextView
android:id="@+id/tvItemName"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="#FF6A6F87"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
tools:text="长度" />
<TextView
android:id="@+id/tvItemUnit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="15dp"
android:gravity="center_vertical"
app:layout_constraintEnd_toEndOf="parent"
android:maxLines="1"
tools:text="m"
android:textColor="#FF6A6F87"
android:textSize="16sp" />
<EditText
android:id="@+id/etItemValue"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="5dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tvItemUnit"
android:theme="@style/Theme.AppCompat.DayNight"
android:background="@drawable/rectangle_stroke_grey_corner8"
android:gravity="center_vertical"
android:hint="请输入"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textColorHint="#757B8C"
android:textSize="14sp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
coalMiningApp/app/src/main/res/layout/list_item_mining_record_coal_thickness.xml
+117
View File
@@ -0,0 +1,117 @@
<?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.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
tools:background="@color/black_bg"
android:orientation="horizontal">
<EditText
android:id="@+id/etItemName"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_gravity="end|center_vertical"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:background="@drawable/rectangle_stroke_grey_corner8"
android:gravity="center_vertical"
android:hint="请输入"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textColorHint="#757B8C"
android:textSize="14sp"
android:theme="@style/Theme.AppCompat.DayNight"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.divider.MaterialDivider
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
app:dividerColor="#282C38"
app:layout_constraintTop_toBottomOf="@id/etItemName" />
<TextView
android:id="@+id/tvNameUnit"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginStart="10dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="#架"
android:textColor="#FF6A6F87"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@id/etItemName"
app:layout_constraintStart_toEndOf="@id/etItemName"
app:layout_constraintTop_toTopOf="@id/etItemName" />
<TextView
android:id="@+id/tvValueUnit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="15dp"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="#FF6A6F87"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@id/etItemName"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/etItemName"
tools:text="m" />
<EditText
android:id="@+id/etItemValue"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="5dp"
android:background="@drawable/rectangle_stroke_grey_corner8"
android:gravity="center_vertical"
android:hint="请输入"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textColor="@color/white"
android:textColorHint="#757B8C"
android:textSize="14sp"
android:theme="@style/Theme.AppCompat.DayNight"
app:layout_constraintBottom_toBottomOf="@id/etItemName"
app:layout_constraintEnd_toStartOf="@id/tvValueUnit"
app:layout_constraintTop_toTopOf="@id/etItemName" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/dash_line"
app:layout_constraintBottom_toBottomOf="@id/etItemName"
app:layout_constraintEnd_toStartOf="@id/etItemValue"
app:layout_constraintStart_toEndOf="@id/tvNameUnit"
app:layout_constraintTop_toTopOf="@id/etItemName" />
<TextView
android:id="@+id/btnAddPoint"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:drawablePadding="7dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="新增支架号"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_add_point"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etItemName" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>