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-16 19:24:45 +08:00
parent b03a1bae8c
commit e34d925a83
14 changed files with 246 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coalMiningApp/app/src/main/res/layout/activity_mining.xml
+12 -1
View File
@@ -10,8 +10,19 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:background="@color/black_bg">
<include
android:id="@+id/toolbar_lay"
layout="@layout/lay_title_right_bar" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/list_item_tunnel_working_face" />
</LinearLayout>
</layout>
coalMiningApp/app/src/main/res/layout/activity_tunneling.xml
+2 -2
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:descendantFocusability="blocksDescendants"
android:orientation="vertical">
@@ -20,7 +20,7 @@
app:title="@{@string/title_tunneling}" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_list"
android:id="@+id/rvMiningList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
coalMiningApp/app/src/main/res/layout/custom_my_info_view.xml
+1 -1
View File
@@ -45,6 +45,6 @@
android:id="@+id/custom_info_iv_right"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/arrow_right" />
android:src="@drawable/ic_arrow_right_white2"/>
</com.allen.library.shape.ShapeLinearLayout>
</layout>
coalMiningApp/app/src/main/res/layout/fragment_user.xml
+16 -47
View File
@@ -7,28 +7,29 @@
</data>
<RelativeLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
android:background="@color/black_bg">
<com.allen.library.shape.ShapeLinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="10dp"
android:paddingBottom="25dp"
android:paddingBottom="10dp"
android:layout_marginTop="94dp"
android:orientation="vertical"
app:shapeCornersRadius="32dp"
app:shapeSolidColor="#17181C">
<TextView
android:id="@+id/tvUserName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="55dp"
android:gravity="center_horizontal"
android:text="账号昵称"
android:text="小助手"
android:textColor="@color/white"
android:textSize="24sp" />
@@ -42,59 +43,27 @@
android:textColor="#6A6F87"
android:textSize="14sp" />
<com.zmkg.coaloperation.view.CustomInfoView
android:id="@+id/network_config"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvMenuList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
<com.zmkg.coaloperation.view.CustomInfoView
android:id="@+id/data_pull"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
<com.zmkg.coaloperation.view.CustomInfoView
android:id="@+id/data_push"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
<com.zmkg.coaloperation.view.CustomInfoView
android:id="@+id/cache_manage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
<com.zmkg.coaloperation.view.CustomInfoView
android:id="@+id/check_update"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
<com.zmkg.coaloperation.view.CustomInfoView
android:id="@+id/system_exit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
<com.zmkg.coaloperation.view.CustomInfoView
android:id="@+id/about_us"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp" />
android:layout_height="match_parent"
tools:itemCount="6"
android:paddingTop="8dp"
android:paddingBottom="7dp"
android:clipToPadding="true"
tools:listitem="@layout/list_item_user_menu"/>
</com.allen.library.shape.ShapeLinearLayout>
<ImageView
android:id="@+id/header_icon"
android:id="@+id/ivHeadPic"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="60dp"
app:srcCompat="@drawable/ic_avatar"/>
<!-- android:background="#e3e3e3"-->
</RelativeLayout>
</FrameLayout>
</layout>
coalMiningApp/app/src/main/res/layout/list_item_user_menu.xml
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
</data>
<com.allen.library.shape.ShapeLinearLayout
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_marginTop="7dp"
android:layout_marginBottom="8dp"
android:layout_marginHorizontal="30dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:shapeSolidColor="#20222B"
app:shapeCornersRadius="16dp"
android:paddingHorizontal="15dp">
<ImageView
android:id="@+id/ivUserMenu"
android:layout_width="44dp"
android:layout_height="44dp"
android:scaleType="fitCenter"
android:padding="11dp"
tools:src="@mipmap/network"
tools:background="@drawable/bg_icon_network_config"/>
<TextView
android:id="@+id/tvUserMenu"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
tools:text="菜单"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/white"
android:textSize="16sp" />
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_arrow_right_white2" />
</com.allen.library.shape.ShapeLinearLayout>
</layout>