From 3ad6cbe55a4c63f4b64f6c999bf3db0a2b0187a4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 16:55:37 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 37 ++++++++++++------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 34 ++++++-----------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java | 7 +--
3 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index b9d9b6c..7f53bb3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/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) {
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 94e57ba..84311c6 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
@@ -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";
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
index 073e220..8cfdf8c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
+++ b/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;
}
/**
--
Gitblit v1.8.0