xuxiuxi
2017-04-19 65c8197f6af79e29a8339f86a33c255840d5c568


git-svn-id: http://192.168.1.226/svn/proxy@497 454eff88-639b-444f-9e54-f578c98de674
4个文件已修改
13 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
@@ -78,6 +78,7 @@
                TextView fragment_visit_left_person_row_name = viewHolder.findViewById(R.id.fragment_attendance_left_person_row_name);
                SimpleDraweeView fragment_visit_left_person_row_photo = viewHolder.findViewById(R.id.fragment_attendance_left_person_row_photo);
                TextView fragment_visit_left_person_row_status = viewHolder.findViewById(R.id.fragment_attendance_left_person_row_status);
                fragment_visit_left_person_row_status.setText("已签到");
                RelativeLayout fragment_attendance_left_relative_layout = viewHolder.findViewById(R.id.fragment_attendance_left_relative_layout);
                final AttendanceQueryItem item = getItem(position);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -27,8 +27,14 @@
    public static class StatusID {
        public static final int NO_REGISTER = 301; //未注册
        public static final int REGISTERED = 302; //已注册(访客)
    }
    public static class VisitType {
        public static final int VISITOR_ENTERED = 303; //来访登记(访客)
        public static final int VISITOR_EXITED = 304; //签离(访客)
    }
    public static class AttendanceType {
        public static final int EMP_ENTERED = 305; //签到(员工)
        public static final int EMP_EXITED = 306; //签退(员工)
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -177,9 +177,9 @@
        params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId());
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        params.addBodyParameter(Visit.FieldNames.enterTime, sdf.format(new Date()));
        params.addBodyParameter(Visit.FieldNames.currentStateId, ""+CommonVariables.StatusID.VISITOR_ENTERED);
        params.addBodyParameter(Visit.FieldNames.currentStateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);
        params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.StatusID.VISITOR_ENTERED);
        params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);
        params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date()));
        params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId());
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -180,7 +180,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="摄像机1"
                        android:drawableLeft="@drawable/u251"
                        android:drawableLeft="@drawable/u233"
                        android:drawablePadding="20dp"
                        android:gravity="center_vertical"
                        android:textSize="@dimen/text_size_big"