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

doum

16 小时以前 22881a4d6409c7d17867e1d40bf81a13578208df

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

@@ -17,6 +17,18 @@
        android:background="@color/white"
        >

        <EditText
            android:id="@+id/et_ewm"
            android:layout_width="100dp"
            android:layout_height="wrap_content"
            android:text=""
            android:inputType="number"
            app:layout_constraintTop_toTopOf="@+id/viewBack"
            app:layout_constraintBottom_toBottomOf="@+id/viewBack"
            app:layout_constraintStart_toStartOf="parent"
            android:background="@null"
            />

        <View
            android:id="@+id/viewBack"
            android:layout_width="0dp"
@@ -482,20 +494,7 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            android:background="@color/white"
            android:visibility="visible">

            <EditText
                android:id="@+id/et_ewm"
                android:layout_width="100dp"
                android:layout_height="wrap_content"
                android:text=""
                android:inputType="number"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                android:background="@null"
                android:layout_marginTop="20dp"
                />
            android:visibility="gone">

            <View
                android:id="@+id/v_c_sl"
@@ -703,10 +702,10 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:background="@drawable/shape_jiujin_ok"
            android:paddingLeft="80dp"
            android:paddingRight="80dp"
            android:paddingTop="50dp"
            android:paddingBottom="50dp"
            android:paddingLeft="60dp"
            android:paddingRight="60dp"
            android:paddingTop="40dp"
            android:paddingBottom="40dp"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -715,8 +714,8 @@

            <pl.droidsonroids.gif.GifImageView
                android:id="@+id/img_progress"
                android:layout_width="150dp"
                android:layout_height="150dp"
                android:layout_width="90dp"
                android:layout_height="90dp"
                android:src="@mipmap/zhuanquan"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
@@ -736,5 +735,23 @@

        </androidx.constraintlayout.widget.ConstraintLayout>

        <TextView
            android:id="@+id/message"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="@dimen/activity_vertical_margin"
            android:layout_marginRight="@dimen/activity_vertical_margin"
            android:text=""
            android:textColor="@color/white"
            android:textSize="24sp"
            android:padding="@dimen/activity_horizontal_margin"
            android:background="@drawable/toast_view_bg"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            android:gravity="center"
            android:visibility="gone"/>

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