Merge branch 'wjc_new' into wxw_new

mac

2024-05-15 5397e103492099bb3fdece2b5de752605570ec2f

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

New file
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="@dimen/dp_171"
    android:layout_height="@dimen/dp_44">

    <TextView
        android:id="@+id/data_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_24"
        android:textColor="@color/text_90000000"
        android:textSize="@dimen/text_20"
        android:textStyle="bold"
        android:text="33"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <TextView
        android:id="@+id/data_type_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_17"
        android:layout_marginTop="3dp"
        android:textColor="@color/text_40000000"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/data_tv"
        app:layout_constraintStart_toStartOf="@+id/data_tv"
        app:layout_constraintTop_toBottomOf="@+id/data_tv" />

</androidx.constraintlayout.widget.ConstraintLayout>