From 65c8197f6af79e29a8339f86a33c255840d5c568 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 四月 2017 16:22:46 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java | 1
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 102 +++++++++++++++++++++++++++------------------------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 4 +-
4 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
index 3903fe7..587fbb2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
+++ b/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);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index 564b981..550b208 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -2,57 +2,63 @@
public class CommonVariables {
- public static class ImageType {
- public static final int FACE1 = 101; //姝ｉ潰鐓х墖1锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
- public static final int FACE2 = 102; //姝ｉ潰鐓х墖2锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
- public static final int FACE_L_SIDE = 103; //锛堜富浣撹瀵燂紝<=45搴︼級宸︿晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- public static final int FACE_R_SIDE = 104; //锛堜富浣撹瀵燂紝<=45搴︼級鍙充晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- public static final int FACE_T_SIDE = 105; //锛堜富浣撹瀵燂紝<=45搴︼級椤朵晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- public static final int FACE_B_SIDE = 106; //锛堜富浣撹瀵燂紝<=45搴︼級搴曚晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
- public static final int FACE_UPLOADED = 107; //涓婁紶鐓х墖锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
- public static final int ICON = 108; // 鍥炬爣锛堝瓨鏀惧埌Image琛級
- public static final int IDENTIFICATION_CARD = 109; //韬唤璇佺収鐗囷紙瀛樻斁鍒癐mage琛級
- public static final int BUSINESS_CARD = 110; //鍚嶇墖鐓х墖锛堝瓨鏀惧埌Image琛級
- public static final int OTHER_CARD = 111; //鍏朵粬璇佷欢锛堝瓨鏀惧埌Image琛級
- }
-
- public static class Type {
- public static final int NORMAL_VISITOR = 201; //鏅�氳瀹�
- public static final int BLACK_LIST = 202; //榛戝悕鍗�
- public static final int TEACHER = 203; //鏁欏笀
- public static final int STUDENT = 204; //瀛︾敓
- public static final int LEADER = 205; //棰嗗骞查儴
- }
-
- public static class StatusID {
- public static final int NO_REGISTER = 301; //鏈敞鍐�
- public static final int REGISTERED = 302; //宸叉敞鍐岋紙璁垮锛�
- public static final int VISITOR_ENTERED = 303; //鏉ヨ鐧昏锛堣瀹級
- public static final int VISITOR_EXITED = 304; //绛剧锛堣瀹級
- public static final int EMP_ENTERED = 305; //绛惧埌锛堝憳宸ワ級
- public static final int EMP_EXITED = 306; //绛鹃��锛堝憳宸ワ級
- }
-
- public static class EnterOrExit {
- public static final int ENTER = 401; //杩�
- public static final int EXIT = 402; //鍑�
- }
-
- public class DictionaryType {
- public static final String GENDER = "gender";
- public static final String ID_TYPE = "id_type";
- public static final String COUNTRY = "country";
- public static final String VISIT_REASON = "visit_reason";
- public static final String VISIT_TYPE = "visit_type";
+ public static class ImageType {
+ public static final int FACE1 = 101; //姝ｉ潰鐓х墖1锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
+ public static final int FACE2 = 102; //姝ｉ潰鐓х墖2锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
+ public static final int FACE_L_SIDE = 103; //锛堜富浣撹瀵燂紝<=45搴︼級宸︿晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_R_SIDE = 104; //锛堜富浣撹瀵燂紝<=45搴︼級鍙充晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_T_SIDE = 105; //锛堜富浣撹瀵燂紝<=45搴︼級椤朵晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_B_SIDE = 106; //锛堜富浣撹瀵燂紝<=45搴︼級搴曚晶鑴哥収鐗囷紙瀛樻斁鍒癊mployeeFace/VisitFace琛級
+ public static final int FACE_UPLOADED = 107; //涓婁紶鐓х墖锛堝瓨鏀惧埌EmployeeFace/VisitFace琛級
+ public static final int ICON = 108; // 鍥炬爣锛堝瓨鏀惧埌Image琛級
+ public static final int IDENTIFICATION_CARD = 109; //韬唤璇佺収鐗囷紙瀛樻斁鍒癐mage琛級
+ public static final int BUSINESS_CARD = 110; //鍚嶇墖鐓х墖锛堝瓨鏀惧埌Image琛級
+ public static final int OTHER_CARD = 111; //鍏朵粬璇佷欢锛堝瓨鏀惧埌Image琛級
}
- public static class Page {
- public static final String PAGE_SIZE = "pageSize";
- public static final String PAGE_NUM = "pageNum";
- public static final int hasMorePages = 1;
- public static final int noMorePage = 2;
+ public static class Type {
+ public static final int NORMAL_VISITOR = 201; //鏅�氳瀹�
+ public static final int BLACK_LIST = 202; //榛戝悕鍗�
+ public static final int TEACHER = 203; //鏁欏笀
+ public static final int STUDENT = 204; //瀛︾敓
+ public static final int LEADER = 205; //棰嗗骞查儴
+ }
+
+ 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; //绛鹃��锛堝憳宸ワ級
+ }
+
+ public static class EnterOrExit {
+ public static final int ENTER = 401; //杩�
+ public static final int EXIT = 402; //鍑�
+ }
+
+ public class DictionaryType {
+ public static final String GENDER = "gender";
+ public static final String ID_TYPE = "id_type";
+ public static final String COUNTRY = "country";
+ public static final String VISIT_REASON = "visit_reason";
+ public static final String VISIT_TYPE = "visit_type";
+ }
+
+ public static class Page {
+ public static final String PAGE_SIZE = "pageSize";
+ public static final String PAGE_NUM = "pageNum";
+ public static final int hasMorePages = 1;
+ public static final int noMorePage = 2;
public static final int reachBottom = 3;
- }
+ }
public static class Surveillance {
public static final int VISIT_REGISTER_ITEM_TYPE = 1;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 2b63d0e..f94d912 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/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());
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
index 6cecef4..8f923c9 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
+++ b/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"
--
Gitblit v1.8.0