From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/res/layout/fragment_me.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index e3bfa61..a7bc4fb 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -37,16 +37,38 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
- android:id="@+id/fragment_me_user_name_iv"
+ android:id="@+id/fragment_me_user_name_tv"
android:layout_width="wrap_content"
- android:layout_height="25dp"
+ android:layout_height="22dp"
android:layout_marginTop="@dimen/dp_16"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" />
+
+ <ImageView
+ android:id="@+id/fragment_me_user_name_next_iv"
+ android:layout_width="7dp"
+ android:layout_height="@dimen/dp_12"
+ android:layout_marginStart="@dimen/text_15"
+ android:layout_marginTop="@dimen/dp_21"
+ android:src="@drawable/next"
+ app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv"
+ app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" />
+
+ <TextView
+ android:id="@+id/fragment_me_user_role_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="17dp"
+ android:layout_marginTop="@dimen/dp_11"
+ android:textColor="@color/text_66000000"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
+ app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
+ app:layout_constraintTop_toBottomOf="@+id/fragment_me_user_name_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
+
<LinearLayout
android:layout_width="match_parent"
@@ -59,14 +81,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
-
+ <!--涓昏处鍙锋墠鏄剧ず-->
<include
- android:id="@+id/fragment_me_line_set_il"
+ android:id="@+id/fragment_me_line_user_management_il"
layout="@layout/fragment_me_line" />
<include
android:id="@+id/fragment_me_line_asregards_il"
layout="@layout/fragment_me_line" />
+
+ <include
+ android:id="@+id/fragment_me_line_set_il"
+ layout="@layout/fragment_me_line" />
</LinearLayout>
--
Gitblit v1.8.0