xuxiuxi
2017-04-13 233bc2ed60cb00b8ecde0034b5bf59f870af6440


git-svn-id: http://192.168.1.226/svn/proxy@449 454eff88-639b-444f-9e54-f578c98de674
3个文件已添加
2个文件已修改
209 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/res/drawable/u194.png 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/drawable/u39.png 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/drawable/u41.png 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml 164 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/drawable/u194.png
VisitFace/DemoForBsk/app/src/main/res/drawable/u39.png
VisitFace/DemoForBsk/app/src/main/res/drawable/u41.png
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -72,10 +72,6 @@
                        android:gravity="center_vertical"
                        android:textSize="@dimen/text_size_big"
                        android:textColor="@color/colorText_5"/>
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="1dp"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
            </RelativeLayout>
            <RelativeLayout
@@ -105,11 +101,14 @@
                        android:gravity="center_vertical"
                        android:textSize="@dimen/text_size_big"
                        android:textColor="@color/colorText_5"/>
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="1dp"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
                <View
                    android:layout_width="match_parent"
                    android:layout_height="1dp"
                    android:background="@color/colorText_b"
                    android:layout_marginLeft="24dp"
                    />
            </RelativeLayout>
            <RelativeLayout
                android:background="@android:color/white"
@@ -138,11 +137,13 @@
                        android:gravity="center_vertical"
                        android:textSize="@dimen/text_size_big"
                        android:textColor="@color/colorText_5"/>
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="1dp"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
                <View
                    android:layout_width="match_parent"
                    android:layout_height="1dp"
                    android:background="@color/colorText_b"
                    android:layout_marginLeft="24dp"
                    />
            </RelativeLayout>
            <TextView
                android:layout_width="match_parent"
@@ -179,10 +180,6 @@
                        android:gravity="center_vertical"
                        android:textSize="@dimen/text_size_big"
                        android:textColor="@color/colorText_5"/>
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="1dp"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
            </RelativeLayout>
            <RelativeLayout
@@ -212,12 +209,20 @@
                        android:gravity="center_vertical"
                        android:textSize="@dimen/text_size_big"
                        android:textColor="@color/colorText_5"/>
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="1dp"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
                <View
                    android:layout_width="match_parent"
                    android:layout_height="1dp"
                    android:background="@color/colorText_b"
                    android:layout_marginLeft="24dp"
                    />
            </RelativeLayout>
            <View
                android:layout_width="match_parent"
                android:layout_height="1dp"
                android:background="@color/colorText_b"
                android:layout_marginLeft="24dp"
                />
        </LinearLayout>
    </LinearLayout>
</LinearLayout>
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
@@ -2,5 +2,167 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical" android:layout_width="match_parent"
    android:layout_height="match_parent">
    <ScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent">
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center_horizontal"
            android:orientation="vertical">
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="76dp"
                android:gravity="right|center_vertical"
                android:orientation="horizontal">
                <TextView
                    android:id="@+id/fragment_device_right_delete"
                    android:layout_width="40dp"
                    android:layout_height="36dp"
                    android:gravity="center"
                    android:textColor="@android:color/white"
                    android:background="@drawable/u194"
                    android:text=""/>
                <TextView
                    android:id="@+id/fragment_device_right_add"
                    android:layout_width="40dp"
                    android:layout_height="36dp"
                    android:gravity="center"
                    android:layout_marginLeft="10dp"
                    android:textColor="@android:color/white"
                    android:background="@drawable/u249"
                    android:text=""/>
                <TextView
                    android:id="@+id/fragment_device_right_save"
                    android:layout_width="40dp"
                    android:layout_height="36dp"
                    android:gravity="center"
                    android:layout_marginLeft="10dp"
                    android:layout_marginRight="10dp"
                    android:textColor="@android:color/white"
                    android:background="@drawable/u208"
                    android:text=""/>
            </LinearLayout>
            <LinearLayout
                android:orientation="vertical"
                android:layout_width="596dp"
                android:layout_height="wrap_content"
                >
                <LinearLayout
                    android:orientation="vertical"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">
                    <LinearLayout
                        android:paddingTop="13dp"
                        android:paddingBottom="13dp"
                        android:gravity="center_horizontal"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal">
                        <LinearLayout
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:orientation="horizontal"
                            android:layout_weight="1"
                            >
                            <TextView
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:textSize="@dimen/text_size_navigation"
                                android:text="无线WIFI设置"
                                android:gravity="left"
                                android:layout_gravity="left"
                                android:textColor="@color/colorPrimary"/>
                        </LinearLayout>
                        <Switch
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_weight="0"
                            android:checked="true"
                            />
                    </LinearLayout>
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/view_size_1"
                        android:background="@color/colorText_b"
                        android:layout_marginLeft="5dp"/>
                </LinearLayout>
                <LinearLayout
                    android:orientation="vertical"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">
                    <LinearLayout
                        android:paddingTop="13dp"
                        android:gravity="center_horizontal"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal">
                        <LinearLayout
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:orientation="horizontal"
                            android:layout_weight="1"
                            >
                            <TextView
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:textSize="@dimen/text_size_big"
                                android:text="选择网络"
                                android:gravity="left"
                                android:layout_gravity="left"
                                android:textColor="@color/colorText_b"
                                />
                        </LinearLayout>
                    </LinearLayout>
                </LinearLayout>
                <LinearLayout
                    android:orientation="vertical"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">
                    <LinearLayout
                        android:paddingTop="13dp"
                        android:paddingBottom="13dp"
                        android:gravity="center_horizontal"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal">
                        <LinearLayout
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:orientation="horizontal"
                            android:layout_weight="1"
                            >
                            <TextView
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:textSize="@dimen/text_size_big"
                                android:text="网络1"
                                android:gravity="left"
                                android:layout_gravity="left"
                                />
                        </LinearLayout>
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:background="@drawable/u39"
                            />
                        <TextView
                            android:layout_width="10dp"
                            android:layout_height="wrap_content"
                            />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:background="@drawable/u41"
                            />
                    </LinearLayout>
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/view_size_1"
                        android:background="@color/colorText_b"
                        android:layout_marginLeft="5dp"/>
                </LinearLayout>
            </LinearLayout>
        </LinearLayout>
    </ScrollView>
</LinearLayout>