Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/res/layout/fragment_me.xml

@@ -3,7 +3,8 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/me_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:background="@drawable/bj">

    <TextView
        android:id="@+id/me_title_tv"
@@ -36,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: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_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"
@@ -58,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>