From c34f11fb7407594f7c1eb69b11f84a45d13cfa1a Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期一, 24 四月 2017 11:55:11 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceCheckOutQueryItem.java | 27 ++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceDetailQueryItem.java | 8 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceVisitQueryItem.java | 109 +++++++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java | 8 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java | 22 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java | 56 ++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java | 40 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 6 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/EmployeeQueryItem.java | 43 +++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceAttendanceQueryItem.java | 27 ++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java | 6 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 52 ++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java | 142 ++++++------ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java | 11 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java | 9 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java | 22 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java | 18 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java | 46 ++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java | 4 21 files changed, 435 insertions(+), 225 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 418a591..779cebe 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 @@ -106,7 +106,7 @@ fragment_visit_left_person_row_name.setText(item.getUsername()); //fragment_visit_left_person_row_status.setText(item.getStatus()); - fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); + fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()); View fragment_visit_left_line = viewHolder.findViewById(R.id.fragment_attendance_left_line); fragment_visit_left_line.setVisibility(View.VISIBLE); diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java index 6c88741..be0646f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java @@ -74,8 +74,8 @@ if (data instanceof CheckInQueryItem) { CheckInQueryItem item = (CheckInQueryItem) data; fragment_check_in_left_visitor_row_name.setText(item.getUsername()); - if (item.getImagePath() != null && !item.getImagePath().equals("")) { - fragment_check_in_left_visitor_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); + if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) { + fragment_check_in_left_visitor_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto())); } else { fragment_check_in_left_visitor_row_photo.setImageResource(R.drawable.u68); } @@ -151,8 +151,8 @@ CheckInQueryItem item = (CheckInQueryItem) data; fragment_check_in_left_interviewee_row_name.setText(item.getUsername()); fragment_check_in_left_interviewee_row_dept.setText(item.getDeptName()); - if (item.getImagePath() != null && !item.getImagePath().equals("")) { - fragment_check_in_left_interviewee_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); + if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) { + fragment_check_in_left_interviewee_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto())); } else { fragment_check_in_left_interviewee_row_photo.setImageResource(R.drawable.u68); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java index 8b30c07..23aa365 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java @@ -72,8 +72,8 @@ } fragment_visit_left_person_row_name.setText(item.getUsername()); fragment_visit_left_person_row_status.setText(item.getCurrentStatus()); - if (item.getImagePath() != null && !"".equals(item.getImagePath())) { - fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); + if (item.getSurveillancePhoto() != null && !"".equals(item.getSurveillancePhoto())) { + fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()); } else { fragment_visit_left_person_row_photo.setImageResource(R.drawable.u68); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceDetailQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceDetailQueryItem.java index 23c3b61..31c5c22 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceDetailQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceDetailQueryItem.java @@ -9,7 +9,7 @@ private String time; // 璁惧鍦扮偣 private String deviceName; - // 鍚嶇О + // private String attendanceType; /** @@ -41,14 +41,14 @@ } /** - * Get 鍚嶇О + * Get */ public String getAttendanceType() { return attendanceType; } /** - * Set 鍚嶇О + * Set */ public void setAttendanceType(String attendanceType) { this.attendanceType = attendanceType; @@ -56,7 +56,7 @@ public String toString() { return - ",绛惧埌鏃堕棿 =" + time + ",璁惧鍦扮偣 =" + deviceName + ",鍚嶇О =" + attendanceType + ",绛惧埌鏃堕棿 =" + time + ",璁惧鍦扮偣 =" + deviceName + ", =" + attendanceType ; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java index 7c9b226..6bb7d31 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java @@ -7,8 +7,8 @@ private String registerId; // 浜哄憳鍚嶅瓧 private String username; - // 鍥剧墖鍦板潃 - private String imagePath; + // 鐩戞帶鍥剧墖 + private String surveillancePhoto; // 璇佷欢缂栧彿 private String identifyNum; // 鍚嶇О @@ -17,9 +17,9 @@ private String postName; // 閮ㄩ棬鍚嶇О private String deptName; - // + // private String time; - // + // private String attendanceType; /** @@ -28,7 +28,7 @@ public String getRegisterId() { return registerId; } - + /** * Set 浜哄憳涓婚敭 */ @@ -42,7 +42,7 @@ public String getUsername() { return username; } - + /** * Set 浜哄憳鍚嶅瓧 */ @@ -51,17 +51,17 @@ } /** - * Get 鍥剧墖鍦板潃 + * Get 鐩戞帶鍥剧墖 */ - public String getImagePath() { - return imagePath; + public String getSurveillancePhoto() { + return surveillancePhoto; } - + /** - * Set 鍥剧墖鍦板潃 + * Set 鐩戞帶鍥剧墖 */ - public void setImagePath(String imagePath) { - this.imagePath = imagePath; + public void setSurveillancePhoto(String surveillancePhoto) { + this.surveillancePhoto = surveillancePhoto; } /** @@ -70,7 +70,7 @@ public String getIdentifyNum() { return identifyNum; } - + /** * Set 璇佷欢缂栧彿 */ @@ -84,7 +84,7 @@ public String getGender() { return gender; } - + /** * Set 鍚嶇О */ @@ -98,7 +98,7 @@ public String getPostName() { return postName; } - + /** * Set 鑱屼綅鍚嶇О */ @@ -112,7 +112,7 @@ public String getDeptName() { return deptName; } - + /** * Set 閮ㄩ棬鍚嶇О */ @@ -121,38 +121,38 @@ } /** - * Get + * Get */ public String getTime() { return time; } - + /** - * Set + * Set */ public void setTime(String time) { this.time = time; } /** - * Get + * Get */ public String getAttendanceType() { return attendanceType; } - + /** - * Set + * Set */ public void setAttendanceType(String attendanceType) { this.attendanceType = attendanceType; } public String toString() { - return - ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鍥剧墖鍦板潃 =" + imagePath + - ",璇佷欢缂栧彿 =" + identifyNum + ",鍚嶇О =" + gender + ",鑱屼綅鍚嶇О =" + postName + - ",閮ㄩ棬鍚嶇О =" + deptName + ", =" + time + ", =" + attendanceType - ; + return + ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto + + ",璇佷欢缂栧彿 =" + identifyNum + ",鍚嶇О =" + gender + ",鑱屼綅鍚嶇О =" + postName + + ",閮ㄩ棬鍚嶇О =" + deptName + ", =" + time + ", =" + attendanceType + ; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java index f006ec9..a98265b 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java @@ -7,8 +7,8 @@ private String registerId; // 浜哄憳鍚嶅瓧 private String username; - // 鍥剧墖鍦板潃 - private String imagePath; + // 鐩戞帶鍥剧墖 + private String surveillancePhoto; // 鍏徃鍚嶇О private String companyName; // 搴ф満鐢佃瘽 @@ -30,7 +30,7 @@ public String getRegisterId() { return registerId; } - + /** * Set 浜哄憳涓婚敭 */ @@ -44,7 +44,7 @@ public String getUsername() { return username; } - + /** * Set 浜哄憳鍚嶅瓧 */ @@ -53,17 +53,17 @@ } /** - * Get 鍥剧墖鍦板潃 + * Get 鐩戞帶鍥剧墖 */ - public String getImagePath() { - return imagePath; + public String getSurveillancePhoto() { + return surveillancePhoto; } - + /** - * Set 鍥剧墖鍦板潃 + * Set 鐩戞帶鍥剧墖 */ - public void setImagePath(String imagePath) { - this.imagePath = imagePath; + public void setSurveillancePhoto(String surveillancePhoto) { + this.surveillancePhoto = surveillancePhoto; } /** @@ -72,7 +72,7 @@ public String getCompanyName() { return companyName; } - + /** * Set 鍏徃鍚嶇О */ @@ -86,7 +86,7 @@ public String getTel() { return tel; } - + /** * Set 搴ф満鐢佃瘽 */ @@ -100,7 +100,7 @@ public String getIdentifyNum() { return identifyNum; } - + /** * Set 璇佷欢缂栧彿 */ @@ -114,7 +114,7 @@ public String getDeptName() { return deptName; } - + /** * Set 閮ㄩ棬鍚嶇О */ @@ -128,7 +128,7 @@ public String getCompanyId() { return companyId; } - + /** * Set 鍏徃涓婚敭 */ @@ -142,7 +142,7 @@ public String getPostName() { return postName; } - + /** * Set 鑱屼綅鍚嶇О */ @@ -156,7 +156,7 @@ public String getMobilePhone() { return mobilePhone; } - + /** * Set 绉诲姩鐢佃瘽 */ @@ -165,10 +165,10 @@ } public String toString() { - return - ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鍥剧墖鍦板潃 =" + imagePath + - ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum + - ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName + - ",绉诲姩鐢佃瘽 =" + mobilePhone; + return + ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto + + ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum + + ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName + + ",绉诲姩鐢佃瘽 =" + mobilePhone; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java index 34ea2dd..22acb74 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java @@ -4,9 +4,9 @@ public class DeviceQueryItem { // 璁惧涓婚敭 - private String id; + private String deviceId; // 鍏徃涓婚敭 - private String companyId; + private String deviceCompanyId; // 璁惧鍦扮偣 private String deviceName; // 璁惧鎺堟潈鐮� @@ -15,29 +15,29 @@ /** * Get 璁惧涓婚敭 */ - public String getId() { - return id; + public String getDeviceId() { + return deviceId; } /** * Set 璁惧涓婚敭 */ - public void setId(String id) { - this.id = id; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; } /** * Get 鍏徃涓婚敭 */ - public String getCompanyId() { - return companyId; + public String getDeviceCompanyId() { + return deviceCompanyId; } /** * Set 鍏徃涓婚敭 */ - public void setCompanyId(String companyId) { - this.companyId = companyId; + public void setDeviceCompanyId(String deviceCompanyId) { + this.deviceCompanyId = deviceCompanyId; } /** @@ -70,7 +70,7 @@ public String toString() { return - ",璁惧涓婚敭 =" + id + ",鍏徃涓婚敭 =" + companyId + ",璁惧鍦扮偣 =" + deviceName + + ",璁惧涓婚敭 =" + deviceId + ",鍏徃涓婚敭 =" + deviceCompanyId + ",璁惧鍦扮偣 =" + deviceName + ",璁惧鎺堟潈鐮� ="+ authorizationId; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/EmployeeQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/EmployeeQueryItem.java new file mode 100644 index 0000000..69389bb --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/EmployeeQueryItem.java @@ -0,0 +1,43 @@ +package cn.com.basic.face.discern.query.item; + + +public class EmployeeQueryItem { + + // 浜哄憳涓婚敭 + private String registerId; + // + private String deviceCompanyId; + + /** + * Get 浜哄憳涓婚敭 + */ + public String getRegisterId() { + return registerId; + } + + /** + * Set 浜哄憳涓婚敭 + */ + public void setRegisterId(String registerId) { + this.registerId = registerId; + } + + /** + * Get + */ + public String getDeviceCompanyId() { + return deviceCompanyId; + } + + /** + * Set + */ + public void setDeviceCompanyId(String deviceCompanyId) { + this.deviceCompanyId = deviceCompanyId; + } + + public String toString() { + return + ",浜哄憳涓婚敭 =" + registerId + ", =" + deviceCompanyId; + } +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java index 2c32026..8fc2d8f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java @@ -13,9 +13,9 @@ private String calleeDept; // 鑱屼綅鍚嶇О private String postName; - // 鍥剧墖鍦板潃 + // 鐩戞帶鍥剧墖 private String callerImage; - // 鍥剧墖鍦板潃 + // 鐩戞帶鍥剧墖 private String calleeImage; // 绉诲姩鐢佃瘽 private String mobilePhone; @@ -28,7 +28,7 @@ public String getCaller() { return caller; } - + /** * Set 浜哄憳鍚嶅瓧 */ @@ -42,7 +42,7 @@ public String getCallee() { return callee; } - + /** * Set 浜哄憳鍚嶅瓧 */ @@ -56,7 +56,7 @@ public String getCallerDept() { return callerDept; } - + /** * Set 閮ㄩ棬鍚嶇О */ @@ -70,7 +70,7 @@ public String getCalleeDept() { return calleeDept; } - + /** * Set 閮ㄩ棬鍚嶇О */ @@ -84,7 +84,7 @@ public String getPostName() { return postName; } - + /** * Set 鑱屼綅鍚嶇О */ @@ -93,28 +93,28 @@ } /** - * Get 鍥剧墖鍦板潃 + * Get 鐩戞帶鍥剧墖 */ public String getCallerImage() { return callerImage; } - + /** - * Set 鍥剧墖鍦板潃 + * Set 鐩戞帶鍥剧墖 */ public void setCallerImage(String callerImage) { this.callerImage = callerImage; } /** - * Get 鍥剧墖鍦板潃 + * Get 鐩戞帶鍥剧墖 */ public String getCalleeImage() { return calleeImage; } - + /** - * Set 鍥剧墖鍦板潃 + * Set 鐩戞帶鍥剧墖 */ public void setCalleeImage(String calleeImage) { this.calleeImage = calleeImage; @@ -126,7 +126,7 @@ public String getMobilePhone() { return mobilePhone; } - + /** * Set 绉诲姩鐢佃瘽 */ @@ -140,7 +140,7 @@ public String getTel() { return tel; } - + /** * Set 搴ф満鐢佃瘽 */ @@ -149,10 +149,10 @@ } public String toString() { - return - ",浜哄憳鍚嶅瓧 =" + caller + ",浜哄憳鍚嶅瓧 =" + callee + ",閮ㄩ棬鍚嶇О =" + callerDept + - ",閮ㄩ棬鍚嶇О =" + calleeDept + ",鑱屼綅鍚嶇О =" + postName + ",鍥剧墖鍦板潃 =" + callerImage + - ",鍥剧墖鍦板潃 =" + calleeImage + ",绉诲姩鐢佃瘽 =" + mobilePhone + ",搴ф満鐢佃瘽 =" + tel - ; + return + ",浜哄憳鍚嶅瓧 =" + caller + ",浜哄憳鍚嶅瓧 =" + callee + ",閮ㄩ棬鍚嶇О =" + callerDept + + ",閮ㄩ棬鍚嶇О =" + calleeDept + ",鑱屼綅鍚嶇О =" + postName + ",鐩戞帶鍥剧墖 =" + callerImage + + ",鐩戞帶鍥剧墖 =" + calleeImage + ",绉诲姩鐢佃瘽 =" + mobilePhone + ",搴ф満鐢佃瘽 =" + tel + ; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java index 0558930..8d135ff 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java @@ -7,8 +7,8 @@ private String registerId; // 浜哄憳鍚嶅瓧 private String username; - // 鍥剧墖鍦板潃 - private String imagePath; + // 鐩戞帶鍥剧墖 + private String surveillancePhoto; // 鍏徃鍚嶇О private String companyName; // 搴ф満鐢佃瘽 @@ -55,17 +55,17 @@ } /** - * Get 鍥剧墖鍦板潃 + * Get 鐩戞帶鍥剧墖 */ - public String getImagePath() { - return imagePath; + public String getSurveillancePhoto() { + return surveillancePhoto; } /** - * Set 鍥剧墖鍦板潃 + * Set 鐩戞帶鍥剧墖 */ - public void setImagePath(String imagePath) { - this.imagePath = imagePath; + public void setSurveillancePhoto(String surveillancePhoto) { + this.surveillancePhoto = surveillancePhoto; } /** @@ -182,7 +182,7 @@ public String toString() { return - ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鍥剧墖鍦板潃 =" + imagePath + + ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto + ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum + ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName + ",绉诲姩鐢佃瘽 =" + mobilePhone + ", =" + type ; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceAttendanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceAttendanceQueryItem.java new file mode 100644 index 0000000..60227de --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceAttendanceQueryItem.java @@ -0,0 +1,27 @@ +package cn.com.basic.face.discern.query.item; + + +public class SurveillanceAttendanceQueryItem { + + // 浜哄憳涓婚敭 + private String registerId; + + /** + * Get 浜哄憳涓婚敭 + */ + public String getRegisterId() { + return registerId; + } + + /** + * Set 浜哄憳涓婚敭 + */ + public void setRegisterId(String registerId) { + this.registerId = registerId; + } + + public String toString() { + return + ",浜哄憳涓婚敭 =" + registerId; + } +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceCheckOutQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceCheckOutQueryItem.java new file mode 100644 index 0000000..695a687 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceCheckOutQueryItem.java @@ -0,0 +1,27 @@ +package cn.com.basic.face.discern.query.item; + + +public class SurveillanceCheckOutQueryItem { + + // 璁块棶浜嬩欢涓婚敭 + private String visitId; + + /** + * Get 璁块棶浜嬩欢涓婚敭 + */ + public String getVisitId() { + return visitId; + } + + /** + * Set 璁块棶浜嬩欢涓婚敭 + */ + public void setVisitId(String visitId) { + this.visitId = visitId; + } + + public String toString() { + return + ",璁块棶浜嬩欢涓婚敭 ="+ visitId ; + } +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java index a17c989..9d2da9b 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java @@ -1,6 +1,5 @@ package cn.com.basic.face.discern.query.item; - import android.graphics.Bitmap; public class SurveillanceQueryItem { @@ -19,9 +18,10 @@ private String mobilePhone; // 娉ㄥ唽鎴栫櫥璁� private int registerOrCheckIn; - private Bitmap bitmap; // 杩涙憚鍍忓ご鎴栧嚭鎽勫儚澶� - private int inOrOutCamera; + private String inOrOutCamera; + + private Bitmap bitmap; /** * Get 浜哄憳涓婚敭 @@ -122,19 +122,19 @@ return registerOrCheckIn; } - public void setBitmap(Bitmap bitmap) { - this.bitmap = bitmap; + public String getInOrOutCamera() { + return inOrOutCamera; } - public Bitmap getBitmap() { - return bitmap; + public void setInOrOutCamera(String inOrOutCamera) { + this.inOrOutCamera = inOrOutCamera; } - public int getInOrOutCamera() { - return inOrOutCamera; + public Bitmap getBitmap() { + return bitmap; } - public void setInOrOutCamera(int inOrOutCamera) { - this.inOrOutCamera = inOrOutCamera; + public void setBitmap(Bitmap bitmap) { + this.bitmap = bitmap; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceVisitQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceVisitQueryItem.java new file mode 100644 index 0000000..3846304 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceVisitQueryItem.java @@ -0,0 +1,109 @@ +package cn.com.basic.face.discern.query.item; + + +public class SurveillanceVisitQueryItem { + + // 浜哄憳涓婚敭 + private String registerId; + // 浜哄憳鍚嶅瓧 + private String username; + // 璇佷欢缂栧彿 + private String identifyNum; + // 鍏徃鍚嶇О + private String companyName; + // 鐩戞帶鍥剧墖 + private String surveillancePhoto; + // 绉诲姩鐢佃瘽 + private String mobilePhone; + + /** + * Get 浜哄憳涓婚敭 + */ + public String getRegisterId() { + return registerId; + } + + /** + * Set 浜哄憳涓婚敭 + */ + public void setRegisterId(String registerId) { + this.registerId = registerId; + } + + /** + * Get 浜哄憳鍚嶅瓧 + */ + public String getUsername() { + return username; + } + + /** + * Set 浜哄憳鍚嶅瓧 + */ + public void setUsername(String username) { + this.username = username; + } + + /** + * Get 璇佷欢缂栧彿 + */ + public String getIdentifyNum() { + return identifyNum; + } + + /** + * Set 璇佷欢缂栧彿 + */ + public void setIdentifyNum(String identifyNum) { + this.identifyNum = identifyNum; + } + + /** + * Get 鍏徃鍚嶇О + */ + public String getCompanyName() { + return companyName; + } + + /** + * Set 鍏徃鍚嶇О + */ + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + /** + * Get 鐩戞帶鍥剧墖 + */ + public String getSurveillancePhoto() { + return surveillancePhoto; + } + + /** + * Set 鐩戞帶鍥剧墖 + */ + public void setSurveillancePhoto(String surveillancePhoto) { + this.surveillancePhoto = surveillancePhoto; + } + + /** + * Get 绉诲姩鐢佃瘽 + */ + public String getMobilePhone() { + return mobilePhone; + } + + /** + * Set 绉诲姩鐢佃瘽 + */ + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + public String toString() { + return + ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",璇佷欢缂栧彿 =" + identifyNum + + ",鍏徃鍚嶇О =" + companyName + ",鐩戞帶鍥剧墖 =" + surveillancePhoto + ",绉诲姩鐢佃瘽 =" + mobilePhone + ; + } +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java index 243c165..a5c34ae 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java @@ -9,8 +9,8 @@ private String registerId; // 浜哄憳鍚嶅瓧 private String username; - // 鍥剧墖鍦板潃 - private String imagePath; + // 鐩戞帶鍥剧墖 + private String surveillancePhoto; // 鍏徃鍚嶇О private String companyName; // 搴ф満鐢佃瘽 @@ -25,27 +25,27 @@ private String postName; // 绉诲姩鐢佃瘽 private String mobilePhone; - // + // private String type; - // + // private String gender; - // + // private String identityType; - // + // private String birthday; - // + // private String countryName; - // + // private String visitee; - // + // private String visitReason; - // + // private String enterTime; - // + // private String exitTime; - // + // private String currentStatus; - // + // private String idCardPhoto; /** @@ -54,7 +54,7 @@ public String getRegisterId() { return registerId; } - + /** * Set 浜哄憳涓婚敭 */ @@ -68,7 +68,7 @@ public String getUsername() { return username; } - + /** * Set 浜哄憳鍚嶅瓧 */ @@ -77,17 +77,17 @@ } /** - * Get 鍥剧墖鍦板潃 + * Get 鐩戞帶鍥剧墖 */ - public String getImagePath() { - return imagePath; + public String getSurveillancePhoto() { + return surveillancePhoto; } - + /** - * Set 鍥剧墖鍦板潃 + * Set 鐩戞帶鍥剧墖 */ - public void setImagePath(String imagePath) { - this.imagePath = imagePath; + public void setSurveillancePhoto(String surveillancePhoto) { + this.surveillancePhoto = surveillancePhoto; } /** @@ -96,7 +96,7 @@ public String getCompanyName() { return companyName; } - + /** * Set 鍏徃鍚嶇О */ @@ -110,7 +110,7 @@ public String getTel() { return tel; } - + /** * Set 搴ф満鐢佃瘽 */ @@ -124,7 +124,7 @@ public String getIdentifyNum() { return identifyNum; } - + /** * Set 璇佷欢缂栧彿 */ @@ -138,7 +138,7 @@ public String getDeptName() { return deptName; } - + /** * Set 閮ㄩ棬鍚嶇О */ @@ -152,7 +152,7 @@ public String getCompanyId() { return companyId; } - + /** * Set 鍏徃涓婚敭 */ @@ -166,7 +166,7 @@ public String getPostName() { return postName; } - + /** * Set 鑱屼綅鍚嶇О */ @@ -180,7 +180,7 @@ public String getMobilePhone() { return mobilePhone; } - + /** * Set 绉诲姩鐢佃瘽 */ @@ -189,168 +189,168 @@ } /** - * Get + * Get */ public String getType() { return type; } - + /** - * Set + * Set */ public void setType(String type) { this.type = type; } /** - * Get + * Get */ public String getGender() { return gender; } - + /** - * Set + * Set */ public void setGender(String gender) { this.gender = gender; } /** - * Get + * Get */ public String getIdentityType() { return identityType; } - + /** - * Set + * Set */ public void setIdentityType(String identityType) { this.identityType = identityType; } /** - * Get + * Get */ public String getBirthday() { return birthday; } - + /** - * Set + * Set */ public void setBirthday(String birthday) { this.birthday = birthday; } /** - * Get + * Get */ public String getCountryName() { return countryName; } - + /** - * Set + * Set */ public void setCountryName(String countryName) { this.countryName = countryName; } /** - * Get + * Get */ public String getVisitee() { return visitee; } - + /** - * Set + * Set */ public void setVisitee(String visitee) { this.visitee = visitee; } /** - * Get + * Get */ public String getVisitReason() { return visitReason; } - + /** - * Set + * Set */ public void setVisitReason(String visitReason) { this.visitReason = visitReason; } /** - * Get + * Get */ public String getEnterTime() { return enterTime; } - + /** - * Set + * Set */ public void setEnterTime(String enterTime) { this.enterTime = enterTime; } /** - * Get + * Get */ public String getExitTime() { return exitTime; } - + /** - * Set + * Set */ public void setExitTime(String exitTime) { this.exitTime = exitTime; } /** - * Get + * Get */ public String getCurrentStatus() { return currentStatus; } - + /** - * Set + * Set */ public void setCurrentStatus(String currentStatus) { this.currentStatus = currentStatus; } /** - * Get + * Get */ public String getIdCardPhoto() { return idCardPhoto; } - + /** - * Set + * Set */ public void setIdCardPhoto(String idCardPhoto) { this.idCardPhoto = idCardPhoto; } public String toString() { - return - ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鍥剧墖鍦板潃 =" + imagePath + - ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum + - ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName + - ",绉诲姩鐢佃瘽 =" + mobilePhone + ", =" + type + ", =" + gender + - ", =" + identityType + ", =" + birthday + ", =" + countryName + - ", =" + visitee + ", =" + visitReason + ", =" + enterTime + - ", =" + exitTime + ", =" + currentStatus + ", =" + idCardPhoto - ; + return + ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鐩戞帶鍥剧墖 =" + surveillancePhoto + + ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum + + ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName + + ",绉诲姩鐢佃瘽 =" + mobilePhone + ", =" + type + ", =" + gender + + ", =" + identityType + ", =" + birthday + ", =" + countryName + + ", =" + visitee + ", =" + visitReason + ", =" + enterTime + + ", =" + exitTime + ", =" + currentStatus + ", =" + idCardPhoto + ; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java index 1b7caac..ced36bd 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java @@ -121,12 +121,12 @@ fragment_attendance_right_gender.setText(item.getGender()); fragment_attendance_right_post.setText(item.getPostName()); fragment_attendance_right_dept.setText(item.getDeptName()); - if (item.getImagePath() != null && !"".equals(item.getImagePath())) { - fragment_attendance_right_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); + if (item.getSurveillancePhoto() != null && !"".equals(item.getSurveillancePhoto())) { + fragment_attendance_right_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()); fragment_attendance_right_photo_placeholder_text_view.setVisibility(View.INVISIBLE); fragment_attendance_right_photo_placeholder_image.setVisibility(View.INVISIBLE); } else { - fragment_attendance_right_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); + fragment_attendance_right_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()); fragment_attendance_right_photo_placeholder_text_view.setVisibility(View.VISIBLE); fragment_attendance_right_photo_placeholder_image.setVisibility(View.VISIBLE); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java index 15dc336..5d30323 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java @@ -355,7 +355,7 @@ public void onClick(View v) {} public void setRegisterInfo(CheckInQueryItem item) { - fragment_register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); + fragment_register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto())); } public ImageView get_fragment_register_choose_photo() { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java index 21d69de..7bd9bda 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java @@ -130,11 +130,11 @@ fragment_visit_right_status.setText(item.getCurrentStatus()); fragment_visit_right_visit_time.setText(item.getEnterTime()); fragment_visit_right_exit_time.setText(item.getExitTime()); - if (item.getImagePath() != null && !"".equals(item.getImagePath())) { - fragment_visit_right_head_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); + if (item.getSurveillancePhoto() != null && !"".equals(item.getSurveillancePhoto())) { + fragment_visit_right_head_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()); fragment_visit_right_head_photo_placeholder_image.setVisibility(View.INVISIBLE); } else { - fragment_visit_right_head_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); + fragment_visit_right_head_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()); fragment_visit_right_head_photo_placeholder_image.setVisibility(View.VISIBLE); } if (item.getIdCardPhoto() != null && !"".equals(item.getIdCardPhoto())) { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java index 1948e1e..0a78ae1 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java @@ -31,32 +31,32 @@ if (!BaseApplication.deviceAvailable) { return; } - RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY); - params.addBodyParameter(CommonVariables.Page.PAGE_NUM, "1"); - params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "10"); - x.http().post(params, new BaseCommonCallBack() { - public void success() { - List<SurveillanceQueryItem> list = getList(SurveillanceQueryItem.class); - if (isVisit) { - int i = 0; - for (SurveillanceQueryItem item : list) { - if (i % 5 == 0) { - item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE); - } else { - item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE); - } - i++; - } - - List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>(); - fillBlank(list, doubleList); - - SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true); - } else { - SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(list, true); - } - } - }); +// RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY); +// params.addBodyParameter(CommonVariables.Page.PAGE_NUM, "1"); +// params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "10"); +// x.http().post(params, new BaseCommonCallBack() { +// public void success() { +// List<SurveillanceQueryItem> list = getList(SurveillanceQueryItem.class); +// if (isVisit) { +// int i = 0; +// for (SurveillanceQueryItem item : list) { +// if (i % 5 == 0) { +// item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE); +// } else { +// item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE); +// } +// i++; +// } +// +// List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>(); +// fillBlank(list, doubleList); +// +// SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true); +// } else { +// SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(list, true); +// } +// } +// }); } public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java index ba020ca..c8127fa 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java @@ -61,12 +61,13 @@ fragment_check_in_right_interviewee_cell_name.setText(item.getUsername()); fragment_check_in_right_interviewee_cell_dept.setText(item.getDeptName()); fragment_check_in_right_interviewee_cell_post.setText(item.getPostName()); - fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); - if (item.getImagePath() != null && !item.getImagePath().equals("")) { + fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto())); + if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) { fragment_check_in_right_interviewee_cell_photo_placeholder.setVisibility(INVISIBLE); } else { - fragment_check_in_right_interviewee_cell_photo_placeholder.setVisibility(VISIBLE); + fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + "u45.png")); } + } public CheckInQueryItem getInterviewee() { @@ -84,9 +85,11 @@ } public void resetForm() { - fragment_check_in_right_interviewee_cell_name.setText(""); + fragment_check_in_right_interviewee_cell_name.setText("琚浜哄憳濮撳悕"); fragment_check_in_right_interviewee_cell_dept.setText(""); fragment_check_in_right_interviewee_cell_post.setText(""); + fragment_check_in_right_interviewee_cell_photo_placeholder.setText("娣诲姞\n琚浜哄憳"); + fragment_check_in_right_interviewee_cell_photo_placeholder.setVisibility(VISIBLE); fragment_check_in_right_interviewee_cell_photo.setImageURI(null); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java index 90eed30..5a31840 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java @@ -64,11 +64,11 @@ fragment_check_in_right_visitor_cell_company_name.setText(item.getCompanyName()); fragment_check_in_right_visitor_cell_identity_number.setText(item.getIdentifyNum()); fragment_check_in_right_visitor_cell_mobile_phone.setText(item.getMobilePhone()); - fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); - if (item.getImagePath() != null && !item.getImagePath().equals("")) { + fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto())); + if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) { fragment_check_in_right_visitor_cell_photo_placeholder.setVisibility(INVISIBLE); } else { - fragment_check_in_right_visitor_cell_photo_placeholder.setVisibility(VISIBLE); + fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + "u45.png")); } } @@ -82,11 +82,12 @@ } public void resetForm() { - fragment_check_in_right_visitor_cell_name.setText(""); + fragment_check_in_right_visitor_cell_name.setText("鏉ヨ浜哄憳濮撳悕"); fragment_check_in_right_visitor_cell_company_name.setText(""); fragment_check_in_right_visitor_cell_identity_number.setText(""); fragment_check_in_right_visitor_cell_mobile_phone.setText(""); fragment_check_in_right_visitor_cell_photo.setImageURI(null); + fragment_check_in_right_visitor_cell_photo_placeholder.setVisibility(VISIBLE); } } -- Gitblit v1.8.0