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

doum

14 小时以前 0cc81c61f36d0072b6252737e3d106ba0d4518a3

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

@@ -365,7 +365,7 @@
        <androidx.core.widget.NestedScrollView
            android:id="@+id/nsv"
            android:layout_width="match_parent"
            android:layout_height="200dp"
            android:layout_height="700dp"
            app:layout_constraintTop_toTopOf="parent"
            android:background="@color/white"
            android:visibility="gone">
@@ -384,23 +384,26 @@

                </TextView>

                <TextView
                    android:id="@+id/tv11"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="清空"
                    android:textColor="#ff279baa"
                    android:textSize="20sp"
                    android:textStyle="bold"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:commandType="@{55}"
                    app:onClickCommand="@{model.myTypeCommand}"/>


            </androidx.constraintlayout.widget.ConstraintLayout>

        </androidx.core.widget.NestedScrollView>

        <TextView
            android:id="@+id/tv11"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="清空"
            android:textColor="#ff279baa"
            android:textSize="20sp"
            android:textStyle="bold"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:commandType="@{55}"
            app:onClickCommand="@{model.myTypeCommand}"/>

        <ImageView
            android:id="@+id/img"
            android:layout_width="50dp"