Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -15,8 +15,8 @@
        android:id="@+id/as_regards_icon_iv"
        android:layout_width="53.5dp"
        android:layout_height="53.5dp"
        android:src="@drawable/version_icon"
        android:layout_marginTop="@dimen/dp_29"
        android:src="@drawable/logo"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
@@ -53,7 +53,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" />

    <!--版本更新-->
    <RelativeLayout
        android:id="@+id/as_regards_version_updating_rl"
        android:layout_width="match_parent"
@@ -103,7 +103,7 @@
            android:textSize="@dimen/text_15" />

    </RelativeLayout>

    <!--服务协议-->
    <RelativeLayout
        android:id="@+id/service_agreement_rl"
        android:layout_width="match_parent"
@@ -142,7 +142,7 @@


    </RelativeLayout>

    <!--隐私政策-->
    <RelativeLayout
        android:id="@+id/privacy_policy_rl"
        android:layout_width="match_parent"
@@ -181,6 +181,45 @@


    </RelativeLayout>
    <!--联系我们-->
    <RelativeLayout
        android:id="@+id/contact_us_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:background="@color/text_FFFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl">

        <TextView
            android:id="@+id/contact_us_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_21"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/contact_us"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_15"

            />

        <LinearLayout
            android:id="@+id/contact_us_ll"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_13">
            <!--标准图标-->
            <ImageView
                android:id="@+id/contact_us_ll_right_next_iv"
                android:layout_width="@dimen/dp_16"
                android:layout_height="@dimen/dp_16"
                android:src="@drawable/next" />
        </LinearLayout>


    </RelativeLayout>


</androidx.constraintlayout.widget.ConstraintLayout>