~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -4,7 +4,7 @@
			android:id="@+id/me_parent"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@drawable/bj">
			android:background="@color/text_FF000000">

			<androidx.core.widget.NestedScrollView
			android:layout_width="match_parent"
			@@ -33,7 +33,8 @@
			android:layout_height="wrap_content"
			android:layout_centerInParent="true"
			android:text="@string/me"
			android:textColor="@color/text_E6FFFFFF"
			android:textColor="@color/text_FFACACAC"

			android:textSize="@dimen/text_18" />


			@@ -57,47 +58,68 @@
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent" />

			<TextView
			android:id="@+id/fragment_me_user_name_tv"
			android:layout_width="wrap_content"
			android:layout_height="22dp"
			<!--显示用户名称-->
			<LinearLayout
			android:id="@+id/user_name_ll"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_16"
			android:textColor="@color/text_E6FFFFFF"
			android:textSize="@dimen/text_18"
			android:layout_marginEnd="@dimen/dp_16"
			android:gravity="center"
			android:orientation="horizontal"
			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" />
			app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv">

			<ImageView
			android:id="@+id/fragment_me_user_name_next_iv"
			android:layout_width="16dp"
			android:layout_height="@dimen/dp_16"
			android:layout_marginStart="3dp"
			android:src="@drawable/next"
			app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv"
			app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv"
			app:layout_constraintTop_toTopOf="@+id/fragment_me_user_name_tv" />
			<TextView
			android:id="@+id/fragment_me_user_name_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:gravity="end\|center_vertical"
			android:paddingStart="@dimen/dp_0"
			android:paddingEnd="@dimen/dp_3"
			android:textColor="@color/text_FFACACAC"
			android:textSize="@dimen/text_18" />

			<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_66FFFFFF"
			android:textSize="@dimen/text_14"
			<ImageView
			android:id="@+id/fragment_me_user_name_next_iv"
			android:layout_width="16dp"
			android:layout_height="@dimen/dp_16"
			android:src="@drawable/next" />
			</LinearLayout>
			<!--显示用户账号-->
			<LinearLayout
			android:id="@+id/account_ll"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="4.5dp"
			android:layout_marginEnd="@dimen/dp_16"
			android:gravity="center"
			android:orientation="horizontal"
			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" />
			app:layout_constraintTop_toBottomOf="@+id/user_name_ll">

			<ImageView
			android:id="@+id/fragment_me_user_role_next_iv"
			android:layout_width="@dimen/dp_16"
			android:layout_height="@dimen/dp_16"
			android:layout_marginStart="3dp"
			android:src="@drawable/next"
			app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_role_tv"
			app:layout_constraintStart_toEndOf="@+id/fragment_me_user_role_tv"
			app:layout_constraintTop_toTopOf="@+id/fragment_me_user_role_tv" />
			<TextView
			android:id="@+id/fragment_me_user_role_tv"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:gravity="end\|center_vertical"
			android:paddingStart="@dimen/dp_0"
			android:paddingEnd="@dimen/dp_3"
			android:textColor="@color/text_FF5B5B5B"
			android:textSize="@dimen/text_14" />

			<ImageView
			android:id="@+id/fragment_me_user_role_next_iv"
			android:layout_width="@dimen/dp_16"
			android:layout_height="@dimen/dp_16"
			android:src="@drawable/next" />
			</LinearLayout>


			</androidx.constraintlayout.widget.ConstraintLayout>

			<LinearLayout
			@@ -106,19 +128,20 @@
			android:layout_marginStart="@dimen/dp_16"
			android:layout_marginTop="@dimen/dp_20"
			android:layout_marginEnd="@dimen/dp_16"
			android:background="@drawable/search_bj_ff333738"
			android:background="@drawable/search_bj_ff1c1c1e"
			android:orientation="vertical"
			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_device_debug_il"
			layout="@layout/fragment_me_line" />
			<!--主账号才显示-->
			<include
			android:id="@+id/fragment_me_line_user_management_il"
			layout="@layout/fragment_me_line" />

			<!-- <include-->
			<!-- android:id="@+id/fragment_me_line_user_management_il"-->
			<!-- layout="@layout/fragment_me_line" />-->

			<include
			android:id="@+id/fragment_me_line_set_il"