xuxiuxi
2017-07-26 b1793f4381ec6f66390afaae0c2314db711ff1ed


git-svn-id: http://192.168.1.226/svn/proxy@912 454eff88-639b-444f-9e54-f578c98de674
6个文件已修改
77 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
                }
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);
                }
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 {
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()) {
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;
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"));