From b1793f4381ec6f66390afaae0c2314db711ff1ed Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 12:20:03 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java | 34 ++++++++--------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java | 9 ++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java | 7 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java | 9 ++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 16 +++++++-
6 files changed, 54 insertions(+), 23 deletions(-)
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 936a023..7a0e444 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
@@ -160,7 +160,12 @@
fragment_check_in_left_interviewee_row_name.setText(item.getUsername());
fragment_check_in_left_interviewee_row_dept.setText(item.getDeptName());
if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) {
- fragment_check_in_left_interviewee_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto()));
+ Bitmap bitmap = FileUtil.loadBitmap(item.getSurveillancePhoto());
+ if (bitmap != null) {
+ fragment_check_in_left_interviewee_row_photo.setImageBitmap(bitmap);
+ } else {
+ 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 23aa365..32c8e2f 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
@@ -1,5 +1,6 @@
package cn.com.basic.face.adapter;
+import android.graphics.Bitmap;
import android.view.View;
import android.widget.RadioButton;
import android.widget.RelativeLayout;
@@ -13,6 +14,7 @@
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.item.VisitQueryItem;
import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.util.FileUtil;
public class VisitFragment {
@@ -73,7 +75,12 @@
fragment_visit_left_person_row_name.setText(item.getUsername());
fragment_visit_left_person_row_status.setText(item.getCurrentStatus());
if (item.getSurveillancePhoto() != null && !"".equals(item.getSurveillancePhoto())) {
- fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto());
+ Bitmap bitmap = FileUtil.loadBitmap(item.getSurveillancePhoto());
+ if (bitmap != null) {
+ fragment_visit_left_person_row_photo.setImageBitmap(bitmap);
+ } else {
+ 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/fragment/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
index c1da2d1..c3e05c0 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
@@ -1,5 +1,6 @@
package cn.com.basic.face.fragment;
+import android.graphics.Bitmap;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
@@ -13,6 +14,7 @@
import cn.com.basic.face.discern.query.item.VisitQueryItem;
import cn.com.basic.face.service.VisitMng;
import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.util.FileUtil;
import cn.com.basic.face.widget.visit.VisitLeftListView;
import com.facebook.drawee.view.SimpleDraweeView;
@@ -130,14 +132,24 @@
fragment_visit_right_visit_time.setText(item.getEnterTime());
fragment_visit_right_exit_time.setText(item.getExitTime());
if (item.getSurveillancePhoto() != null && !"".equals(item.getSurveillancePhoto())) {
- fragment_visit_right_head_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto());
+ Bitmap bitmap = FileUtil.loadBitmap(item.getSurveillancePhoto());
+ if (bitmap != null) {
+ fragment_visit_right_head_photo.setImageBitmap(bitmap);
+ } else {
+ 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.getSurveillancePhoto());
fragment_visit_right_head_photo_placeholder_image.setVisibility(View.VISIBLE);
}
if (item.getIdCardPhoto() != null && !"".equals(item.getIdCardPhoto())) {
- fragment_visit_right_card_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getIdCardPhoto());
+ Bitmap bitmap = FileUtil.loadBitmap(item.getIdCardPhoto());
+ if (bitmap != null) {
+ fragment_visit_right_card_photo.setImageBitmap(bitmap);
+ } else {
+ fragment_visit_right_card_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getIdCardPhoto());
+ }
fragment_visit_right_card_photo_placeholder_image.setVisibility(View.INVISIBLE);
fragment_visit_right_card_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
} else {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
index da49fc3..989b679 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
@@ -69,7 +69,7 @@
if(isVisitorList) {
sql += " AND ( f.device_company_id != " + deviceCompanyId+" OR f.device_company_id IS NULL"+")";
}else{
- sql += " AND f.device_company_id = " + deviceCompanyId;
+ sql += " AND ( f.device_company_id = " + deviceCompanyId + " or a.visitor_or_attender='attender')";
}
if(searchText != null && !searchText.trim().isEmpty()) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java
index 42b7bb0..ba58534 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java
@@ -46,7 +46,7 @@
.append(" LEFT JOIN dictionary l on l.dict_id=i.current_state_id ")
.append(" WHERE ").append(" 1 = 1 AND a.register_id IS NOT NULL ");
if(searchText != null && !searchText.trim().isEmpty()) {
- sb.append(" AND b.username LIKE '%").append(searchText).append("%'");
+ sb.append(" AND a.username LIKE '%").append(searchText).append("%'");
}
sb.append(" ORDER BY i.enter_time desc ");
StringBuilder count = new StringBuilder(sb.length());
@@ -62,23 +62,23 @@
aqi.setUsername(c.getString(c.getColumnIndex("username")));
aqi.setSurveillancePhoto(c.getString(c.getColumnIndex("surveillance_photo")));
aqi.setIdentifyNum(c.getString(c.getColumnIndex("company_name")));
- aqi.setPostName(c.getString(c.getColumnIndex("tel")));
- aqi.setGender(c.getString(c.getColumnIndex("identify_num")));
+ aqi.setTel(c.getString(c.getColumnIndex("tel")));
+ aqi.setIdentifyNum(c.getString(c.getColumnIndex("identify_num")));
aqi.setDeptName(c.getString(c.getColumnIndex("dept_name")));
- aqi.setRegisterId(c.getString(c.getColumnIndex("company_id")));
- aqi.setUsername(c.getString(c.getColumnIndex("post_name")));
- aqi.setSurveillancePhoto(c.getString(c.getColumnIndex("mobile_phone")));
- aqi.setIdentifyNum(c.getString(c.getColumnIndex("type")));
- aqi.setPostName(c.getString(c.getColumnIndex("gender")));
- aqi.setGender(c.getString(c.getColumnIndex("identity_type")));
- aqi.setDeptName(c.getString(c.getColumnIndex("birthday")));
- aqi.setRegisterId(c.getString(c.getColumnIndex("country_name")));
- aqi.setUsername(c.getString(c.getColumnIndex("visitee")));
- aqi.setSurveillancePhoto(c.getString(c.getColumnIndex("visit_reason")));
- aqi.setIdentifyNum(c.getString(c.getColumnIndex("enter_time")));
- aqi.setPostName(c.getString(c.getColumnIndex("exit_time")));
- aqi.setGender(c.getString(c.getColumnIndex("current_status")));
- aqi.setDeptName(c.getString(c.getColumnIndex("id_card_photo")));
+ aqi.setCompanyId(c.getString(c.getColumnIndex("company_id")));
+ aqi.setPostName(c.getString(c.getColumnIndex("post_name")));
+ aqi.setMobilePhone(c.getString(c.getColumnIndex("mobile_phone")));
+ aqi.setType(c.getString(c.getColumnIndex("type")));
+ aqi.setGender(c.getString(c.getColumnIndex("gender")));
+ aqi.setIdentityType(c.getString(c.getColumnIndex("identity_type")));
+ aqi.setBirthday(c.getString(c.getColumnIndex("birthday")));
+ aqi.setCountryName(c.getString(c.getColumnIndex("country_name")));
+ aqi.setVisitee(c.getString(c.getColumnIndex("visitee")));
+ aqi.setVisitReason(c.getString(c.getColumnIndex("visit_reason")));
+ aqi.setEnterTime(c.getString(c.getColumnIndex("enter_time")));
+ aqi.setExitTime(c.getString(c.getColumnIndex("exit_time")));
+ aqi.setCurrentStatus(c.getString(c.getColumnIndex("current_status")));
+ aqi.setIdCardPhoto(c.getString(c.getColumnIndex("id_card_photo")));
list.add(aqi);
}
Integer total = null;
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 5301f2c..ac58a71 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
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.checkin;
import android.content.Context;
+import android.graphics.Bitmap;
import android.net.Uri;
import android.util.AttributeSet;
import android.util.TypedValue;
@@ -29,6 +30,7 @@
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.service.PhoneCallMng;
import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.util.FileUtil;
public class CheckInRightIntervieweeCell extends LinearLayout{
@@ -67,8 +69,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.getSurveillancePhoto()));
if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) {
+ Bitmap bitmap = FileUtil.loadBitmap(item.getSurveillancePhoto());
+ if (bitmap != null) {
+ fragment_check_in_right_interviewee_cell_photo.setImageBitmap(bitmap);
+ } else {
+ fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto()));
+ }
fragment_check_in_right_interviewee_cell_photo_placeholder.setVisibility(INVISIBLE);
} else {
fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + "u45.png"));
--
Gitblit v1.8.0