xuxiuxi
2017-07-23 3ad6cbe55a4c63f4b64f6c999bf3db0a2b0187a4


git-svn-id: http://192.168.1.226/svn/proxy@835 454eff88-639b-444f-9e54-f578c98de674
3个文件已修改
78 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -1,35 +1,31 @@
package cn.com.basic.face.service;
import android.graphics.Bitmap;
import android.widget.Toast;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.common.ResultBean;
import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem;
import cn.com.basic.face.fragment.AttenderRegisterFragment;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.fragment.VisitorRegisterFragment;
import cn.com.basic.face.service.sqlite.CheckInDao;
import cn.com.basic.face.service.sqlite.RegisterDao;
import cn.com.basic.face.service.sqlite.VisitDao;
import cn.com.basic.face.util.AppApi;
import org.xutils.http.RequestParams;
import org.xutils.x;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileWriter;
import java.util.List;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.util.FileUtil;
import cn.com.basic.face.util.IdCard;
import cn.com.basic.face.util.NativeImg;
import cn.com.basic.face.util.SqliteSqlUtil;
public class RegisterMng {
@@ -103,14 +99,31 @@
                e.printStackTrace();
            }
        } else {
            RegisterDao.getInstance().add(offlineVisitorRegisterItem);
            VisitDao.getInstance().findLeftVisitorList("", 1);
            Toast.makeText(BaseApplication.getInstance(),"添加成功", Toast.LENGTH_SHORT).show();
            VisitorRegisterFragment.getInstance().resetForm();
            try {
                long registerId = RegisterDao.getInstance().add(offlineVisitorRegisterItem);
                if (registerId > 0) {
                    MainActivity.selectPage(2);
                    ResultBean resultBean = (ResultBean) CheckInDao.getInstance().findCheckInLeftVisitorListByVisitorId(registerId);
                    CheckInMng.getInstance().findCheckInLeftListAfterReturn(resultBean, true, false, false);
                    List<CheckInQueryItem> list = (List<CheckInQueryItem>)resultBean.getData();
                    if (list != null && list.size() > 0) {
                        CheckInFragment.getInstance().checkInFromHomePage(list.get(0));
                    }
                    Toast.makeText(BaseApplication.getInstance(),"添加成功", Toast.LENGTH_SHORT).show();
                    VisitorRegisterFragment.getInstance().resetForm();
                } else {
                    MainActivity.getInstance().runOnUiThread(new Runnable() {
                        @Override
                        public void run() {
                            Toast.makeText(MainActivity.getInstance(), "添加失败", Toast.LENGTH_SHORT).show();
                        }
                    });
                }
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }
    public void compareSurveillancePhotoAndIdCardPhoto(RequestParams params, final IdCard idCard) {
        if (!BaseApplication.deviceAvailable) {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
@@ -160,40 +160,30 @@
        return c.getInt(0) > 0 ? true : false;
    }
    public ResultBean findCheckInLeftListById(long registerId) {
    public ResultBean findCheckInLeftVisitorListByVisitorId(long registerId) {
        SQLiteDatabase db = MainActivity.getInstance().db;
        ResultBean resultBean = new ResultBean();
        try {
            String sql="SELECT" +
                    " a.register_id," +
                    "a.username," +
                    "a.surveillance_photo," +
                    "d.company_name," +
                    "a.tel," +
                    "a.identify_num," +
                    "b.dept_name," +
                    "d.company_id," +
                    "e.post_name," +
                    "a.mobile_phone," +
                    "a.warning" +
                    " a.username," +
                    " a.surveillance_photo," +
                    " d.company_name," +
                    " a.tel," +
                    " a.identify_num," +
                    " b.dept_name," +
                    " d.company_id," +
                    " e.post_name," +
                    " a.mobile_phone," +
                    " a.warning" +
                    " FROM" +
                    " register a" +
                    " LEFT JOIN company d ON d.company_id = a.company_id" +
                    " LEFT JOIN department b ON a.department_id = b.dept_id" +
                    " LEFT JOIN post e ON e.post_id = a.post_id" +
                    " LEFT JOIN ( SELECT register_id, device_company_id from employee  ) f ON f.register_id = a.register_id" +
                    " WHERE" +
                    " 1 = 1";
            String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
            if(true) {
                sql +=  " AND f.device_company_id = " + deviceCompanyId;
            }else{
                sql +=  " AND ( f.device_company_id != " + deviceCompanyId+" OR f.device_company_id IS NULL"+")";
            }
            if("" != null && !"".trim().isEmpty()) {
                sql += " AND a.register_id='"+ registerId + "'";
            }
            sql += " AND a.register_id='"+ registerId + "'";
            sql+=" order by a.name_en";
            String count = "select count(*) as count from (" + sql + " ) _table";
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
@@ -31,7 +31,7 @@
     * 访客注册
     * @return
     */
    public List<CheckInQueryItem> add(Register item) {
    public long add(Register item) {
        ContentValues contentValues = new ContentValues();
        contentValues.put("register_id",item.getRegisterId());
        contentValues.put("username",item.getUsername());
@@ -40,7 +40,7 @@
        contentValues.put("country_id", item.getCountryId());
        contentValues.put("province", item.getProvince());
        contentValues.put("city", item.getCity());
        contentValues.put("companyId", item.getCompanyId());
        contentValues.put("company_id", item.getCompanyId());
        contentValues.put("company", item.getCompany());
        contentValues.put("birthday", item.getBirthday());
        contentValues.put("tel", item.getTel());
@@ -69,8 +69,7 @@
        contentValues.put("raw_surveillance_photo_height", item.getRawSurveillancePhotoHeight());
        contentValues.put("create_time", item.getCreateTime());
        long registerId = MainActivity.getInstance().db.insert("register", "", contentValues);
        List<CheckInQueryItem> checkInQueryItemList = (List<CheckInQueryItem>)CheckInDao.getInstance().findCheckInLeftListById(registerId).getData();
        return checkInQueryItemList;
        return registerId;
    }
    /**