Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

15 小时以前 22881a4d6409c7d17867e1d40bf81a13578208df

 keyCabinet-android/app/src/main/res/layout/main_activity.xml

@@ -22,21 +22,6 @@
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"/>

        <TextView
            android:id="@+id/tv_m"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="内存"
            android:textSize="30sp"
            android:textColor="@color/white"
            android:gravity="center"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            android:paddingLeft="0dp"
            android:paddingRight="10dp"
            android:visibility="gone"
            />

        <com.facebook.drawee.view.SimpleDraweeView
            android:id="@+id/img1"
            android:layout_width="match_parent"
@@ -420,5 +405,20 @@
            app:layout_constraintStart_toStartOf="parent"
            />

        <TextView
            android:id="@+id/tv_m"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text=""
            android:textSize="30sp"
            android:textColor="@color/black"
            android:gravity="center"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            android:paddingLeft="0dp"
            android:paddingRight="10dp"
            android:visibility="gone"
            />

    </androidx.constraintlayout.widget.ConstraintLayout>
</layout>