Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -11,7 +11,8 @@
        android:layout_height="225dp"
        android:layout_marginStart="@dimen/dp_48"
        android:layout_marginEnd="@dimen/dp_48"
        android:background="@drawable/loading_confirmation_bj"
        android:background="@drawable/dalog_bj_ff222222"
        android:paddingBottom="@dimen/dp_24"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -27,8 +28,8 @@
            android:layout_marginTop="@dimen/dp_25"
            android:layout_marginEnd="@dimen/dp_20"
            android:text="wifi_ssid"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_18" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_16" />

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/loading_confirmation_input_cl"
@@ -49,14 +50,14 @@
                android:layout_marginEnd="@dimen/dp_40"
                android:background="@null"
                android:gravity="center_vertical|start"
                android:hint="@string/home_login_请输入密码"
                android:inputType="textPassword"
                android:inputType="text"
                android:lines="1"
                android:maxLines="1"
                android:paddingStart="@dimen/dp_16"
                android:paddingEnd="@dimen/dp_16"
                android:textColor="@color/text_FF000000"
                android:textColorHint="@color/text_25000000"
                android:textColor="@color/text_FFACACAC"
                android:textColorHint="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -65,11 +66,11 @@
                />

            <ImageView
                android:id="@+id/loading_confirmation_hide_iv"
                android:layout_width="23dp"
                android:layout_height="18dp"
                android:id="@+id/loading_confirmation_clear_iv"
                android:layout_width="@dimen/dp_20"
                android:layout_height="@dimen/dp_20"
                android:layout_marginEnd="@dimen/dp_16"
                android:src="@drawable/hide"
                android:src="@drawable/clear"
                app:layout_constraintBottom_toBottomOf="@+id/loading_confirmation_input_et"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintTop_toTopOf="@+id/loading_confirmation_input_et" />
@@ -87,8 +88,10 @@
        <LinearLayout
            android:id="@+id/dialog_confirm_bottom_line_ly"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_52"
            android:layout_height="@dimen/dp_41"
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            android:orientation="horizontal">


@@ -97,42 +100,43 @@
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_un_ff39383d_24"
                android:gravity="center">

                <TextView
                    android:id="@+id/dialog_cancel_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_取消"
                    android:textColor="@color/text_7C8590"
                    android:textSize="@dimen/text_18" />
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />


            </LinearLayout>

            <View
                android:layout_width="0.5dp"
                android:layout_height="@dimen/dp_23"
                android:layout_gravity="center"
                android:background="@color/text_E1E1E1" />
                android:layout_width="9.5dp"
                android:layout_height="match_parent" />

            <LinearLayout
                android:id="@+id/dialog_confirm_ly"
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff39383d_24"
                android:gravity="center">

                <TextView
                    android:id="@+id/dialog_confirm_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_确认"
                    android:textColor="@color/text_FF245EC3"
                    android:textSize="@dimen/text_18" />
                    android:text="@string/loading_affirm"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />
            </LinearLayout>
        </LinearLayout>


    </RelativeLayout>