Merge branch 'wjc_new' into lwj_new

mac

2024-05-30 619d22243b0b44f81d6b2bb82c9e087b0dca6f3b

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

@@ -28,7 +28,7 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/wechat_id"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"

            />
@@ -40,7 +40,7 @@
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />

    </RelativeLayout>
@@ -61,7 +61,7 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/email_address"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />

        <TextView
@@ -71,7 +71,7 @@
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />

    </RelativeLayout>