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

weimingfei

2025-10-31 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

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

@@ -27,6 +27,18 @@
            android:layout_marginTop="90dp"
            android:layout_marginLeft="45dp"/>

        <TextView
            android:id="@+id/tv_djs"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="30s"
            android:textColor="@color/white"
            android:textSize="24sp"
            app:layout_constraintTop_toTopOf="parent"
            android:layout_marginTop="33dp"
            app:layout_constraintEnd_toEndOf="parent"
            android:layout_marginRight="30dp"/>

        <androidx.constraintlayout.widget.ConstraintLayout
            android:layout_width="match_parent"
            android:layout_height="0dp"
@@ -76,7 +88,7 @@
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:background="@null"
                android:text="15055153182"
                android:text="18656077929"
                android:textColor="#111111"
                android:hint="请输入登录账号"
                android:textColorHint="#999999"
@@ -126,7 +138,7 @@
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:background="@null"
                android:text="123456a"
                android:text="Whyc2025"
                android:hint="请输入账号密码"
                android:textColorHint="#999999"
                android:textSize="24sp"
@@ -174,7 +186,7 @@
            android:id="@+id/tv_no"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="NO：28228293837"
            android:text="NO："
            android:textColor="#b3ffffff"
            android:textSize="18sp"
            app:layout_constraintBottom_toBottomOf="parent"