xuxiuxi
2017-05-04 15d0c49e85159b9e27870aff5280c0cd95b103c4


git-svn-id: http://192.168.1.226/svn/proxy@600 454eff88-639b-444f-9e54-f578c98de674
2个文件已修改
90 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -419,6 +419,8 @@
    public void fragment_register_id_card_photo_click(View view) {
        Intent takePicture = new Intent(MainActivity.getInstance(), PictureTaker.class);
        startActivityForResult(takePicture, fragment_register_id_card_photo_);
//        Intent takePicture = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
//        startActivityForResult(takePicture, fragment_register_id_card_photo_);
    }
    @Override
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml
@@ -21,12 +21,12 @@
                android:layout_width="@dimen/w596dp"
                android:layout_height="wrap_content"
                >
                <LinearLayout
                    android:layout_width="@dimen/w611dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/h20dp"
                    android:orientation="vertical">
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
@@ -35,15 +35,37 @@
                        android:textSize="@dimen/w16dp"
                        android:text="所有学校设置"
                        android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
                        android:layout_marginBottom="@dimen/h25dp"
                        />
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/view_size_1"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
                <LinearLayout
                    android:layout_width="@dimen/w611dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/h10dp"
                    android:orientation="vertical">
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textStyle="bold"
                        android:layout_marginTop="@dimen/h15dp"
                        android:textSize="@dimen/w14dp"
                        android:layout_marginBottom="@dimen/h6dp"
                        android:text="学校名称"
                        />
                    <EditText
                        android:id="@+id/fragment_check_in_right_visitor_reason"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:background="@null"
                        android:layout_marginTop="@dimen/h15dp"
                        android:layout_marginBottom="@dimen/h12dp"
                        android:text="朝阳小学"
                        android:text=""
                        android:hint="请填写学校名称"
                        android:textColorHint="@color/colorText_b"
                        android:textSize="@dimen/w14dp"
                        android:textColor="@color/colorText_b"
                        />
@@ -52,6 +74,66 @@
                        android:layout_height="@dimen/view_size_1"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
                <LinearLayout
                    android:layout_width="@dimen/w611dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/h10dp"
                    android:orientation="vertical">
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textStyle="bold"
                        android:layout_marginTop="@dimen/h15dp"
                        android:textSize="@dimen/w14dp"
                        android:layout_marginBottom="@dimen/h6dp"
                        android:text="设备序列号"
                        />
                    <EditText
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:background="@null"
                        android:layout_marginBottom="@dimen/h12dp"
                        android:text=""
                        android:hint="显示默认的设备序列号"
                        android:textColorHint="@color/colorText_b"
                        android:textSize="@dimen/w14dp"
                        android:textColor="@color/colorText_b"
                        />
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/view_size_1"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
                <LinearLayout
                    android:layout_width="@dimen/w611dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/h10dp"
                    android:orientation="vertical">
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textStyle="bold"
                        android:layout_marginTop="@dimen/h15dp"
                        android:textSize="@dimen/w14dp"
                        android:layout_marginBottom="@dimen/h6dp"
                        android:text="设备地点"
                        />
                    <EditText
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:background="@null"
                        android:layout_marginBottom="@dimen/h12dp"
                        android:text=""
                        android:hint="请填写设备地点"
                        android:textSize="@dimen/w14dp"
                        android:textColorHint="@color/colorText_b"
                        android:textColor="@color/colorText_b"
                        />
                    <View
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/view_size_1"
                        android:background="@color/colorText_b"/>
                </LinearLayout>
            </LinearLayout>
        </LinearLayout>
    </ScrollView>