Merge branch 'dev' into library

wxr

2022-12-01 2588ab0681d9ef96f98114a1de018b420e3ee1da

 AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml

@@ -14,6 +14,20 @@
        android:paddingLeft="@dimen/px_30"

        android:paddingRight="@dimen/px_30">





        <TextView

            android:id="@+id/tv_device_info"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_centerVertical="true"

            android:layout_marginRight="@dimen/px_30"

            android:layout_toLeftOf="@id/iv_device_pic"

            android:singleLine="true"

            android:text="@string/device_info"

            android:textColor="@color/lc_demo_color_2c2c2c"

            android:textSize="@dimen/px_36"></TextView>





        <TextView

            android:id="@+id/tv_device_name"

            android:layout_width="match_parent"

@@ -121,6 +135,14 @@
            android:layout_centerVertical="true"

            android:src="@mipmap/lc_demo_common_btn_next"></ImageView>

    </RelativeLayout>



    <View

        android:layout_width="match_parent"

        android:layout_height="@dimen/px_1"

        android:background="@color/lc_demo_color_d9d9d9"

        android:paddingLeft="@dimen/px_30"

        android:paddingRight="@dimen/px_30"></View>



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/px_130"

@@ -131,7 +153,7 @@


        <TextView

            android:id="@+id/tvFormat_sd"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_centerVertical="true"

            android:text="@string/format_sd"

@@ -143,7 +165,7 @@
        android:layout_marginTop="@dimen/px_1"

        android:id="@+id/rl_cur_wifi"

        android:layout_width="match_parent"

        android:layout_height="@dimen/px_130"

        android:layout_height="0dp"

        android:background="@color/lc_demo_color_ffffff"

        android:gravity="center_vertical"

        android:paddingLeft="@dimen/px_30"