From 8d434f2a76348a759486cb7a95042a211bcc81db Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期日, 23 七月 2017 14:51:18 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 115 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 82 insertions(+), 33 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 426e767..b9d9b6c 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 @@ -6,10 +6,13 @@ 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.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.RegisterDao; import cn.com.basic.face.service.sqlite.VisitDao; @@ -27,6 +30,7 @@ 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 { @@ -36,7 +40,7 @@ return instance; } - public void add(RequestParams params, String idCardHeadPhoto) { + public void add(RequestParams params, String idCardHeadPhoto, Register offlineVisitorRegisterItem) { if (!BaseApplication.deviceAvailable) { return; } @@ -73,6 +77,7 @@ params.addBodyParameter("surveillancePhoto", surveillancePhotoFile); params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile); params.addBodyParameter("idCardPhoto", idCardPhotoFile); + params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId()); if (idCardHeadPhoto != null && !"".equals(idCardHeadPhoto)) { File f5 = new File(idCardHeadPhoto); if (!f5.exists()) { @@ -83,20 +88,29 @@ x.http().post(params, new BaseCommonCallBack() { @Override public void success() { + SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class)); Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show(); VisitorRegisterFragment.getInstance().resetForm(); + MainActivity.selectPage(2); + List<CheckInQueryItem> checkInLeftVisitorList = getList(CheckInQueryItem.class); + CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(checkInLeftVisitorList); + if (checkInLeftVisitorList.size() > 0) { + CheckInFragment.getInstance().checkInFromHomePage(checkInLeftVisitorList.get(0)); + } } }); }catch(Exception e) { e.printStackTrace(); } } else { - RegisterDao.getInstance().add(params, idCardHeadPhoto); + RegisterDao.getInstance().add(offlineVisitorRegisterItem); VisitDao.getInstance().findLeftVisitorList("", 1); Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show(); VisitorRegisterFragment.getInstance().resetForm(); } } + + public void compareSurveillancePhotoAndIdCardPhoto(RequestParams params, final IdCard idCard) { if (!BaseApplication.deviceAvailable) { @@ -124,6 +138,7 @@ params.addBodyParameter("f0", f0); params.addBodyParameter("surveillancePhoto", surveillancePhotoFile); params.addBodyParameter("idCardPhoto", idCardHeadPhotoFile); + params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { @Override public void success() { @@ -195,6 +210,7 @@ params.addBodyParameter("surveillancePhoto", surveillancePhotoFile); params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile); params.addBodyParameter("idCardPhoto", idCardPhotoFile); + params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId()); if (idCardHeadPhoto != null && !"".equals(idCardHeadPhoto)) { File f5 = new File(idCardHeadPhoto); if (!f5.exists()) { @@ -205,6 +221,7 @@ x.http().post(params, new BaseCommonCallBack() { @Override public void success() { + SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class)); Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show(); AttenderRegisterFragment.getInstance().resetForm(); } @@ -213,7 +230,7 @@ e.printStackTrace(); } } else { - RegisterDao.getInstance().add(params, idCardHeadPhoto); + RegisterDao.getInstance().addAttender(params, idCardHeadPhoto); Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show(); } @@ -236,49 +253,28 @@ params.addBodyParameter("width", item.getRawSurveillancePhotoWidth()); params.addBodyParameter("height", item.getRawSurveillancePhotoHeight()); - File rawSurveillancePhoto= FileUtil.getFile(item.getRawSurveillancePhotoPath()); - File surveillancePhoto= FileUtil.getFile(item.getSurveillancePhotoPath()); - File uploadCustomPhoto= FileUtil.getFile(item.getUploadCustomPhotoPath()); - File idCardPhoto= FileUtil.getFile(item.getIdCardPhotoPath()); - params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhoto); - params.addBodyParameter("surveillancePhoto", surveillancePhoto); - params.addBodyParameter("uploadCustomPhoto", uploadCustomPhoto); - params.addBodyParameter("idCardPhoto", idCardPhoto); + item.loadFiles(); + + params.addBodyParameter("rawSurveillancePhoto", item.getRawSurveillancePhotoPath()); + params.addBodyParameter("surveillancePhoto", item.getSurveillancePhoto()); + params.addBodyParameter("uploadCustomPhoto", item.getUploadCustomPhoto()); + params.addBodyParameter("idCardPhoto", item.getIdCardPhoto()); + params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId()); try { File path = BaseApplication.getInstance().getFilesDir(); - File rawSurveillancePhotoFile = new File(path, "rawSurveillancePhoto"); - if (!rawSurveillancePhotoFile.exists()) { - rawSurveillancePhotoFile.createNewFile(); - } File f0 = new File(path, "f0"); if (!f0.exists()) { f0.createNewFile(); } - File surveillancePhotoFile = new File(path, "surveillancePhoto"); - if (!surveillancePhotoFile.exists()) { - surveillancePhotoFile.createNewFile(); - } - File uploadCustomPhotoFile = new File(path, "uploadCustomPhoto"); - if (!uploadCustomPhotoFile.exists()) { - uploadCustomPhotoFile.createNewFile(); - } - File idCardPhotoFile = new File(path, "idCardPhoto"); - if (!idCardPhotoFile.exists()) { - idCardPhotoFile.createNewFile(); - } - FileWriter fw0 = new FileWriter(f0); fw0.write("test1"); fw0.close(); params.setUri(AppApi.BASE_URL +AppApi.REGISTER_ADD); params.addBodyParameter("f0", f0); - params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile); - params.addBodyParameter("surveillancePhoto", surveillancePhotoFile); - params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile); - params.addBodyParameter("idCardPhoto", idCardPhotoFile); x.http().post(params, new BaseCommonCallBack() { @Override public void success() { + SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class)); Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show(); VisitorRegisterFragment.getInstance().resetForm(); RegisterDao.getInstance().removeOfflineVisitorRegister(item); @@ -294,8 +290,61 @@ } public void sendOfflineAttenderRegisterToServer() { - OfflineAttenderRegisterItem item = RegisterDao.getInstance().readOfflineAttenderRegister(); + if (!BaseApplication.deviceAvailable) { + return; + } + try { + RequestParams params = new RequestParams(); + File path = BaseApplication.getInstance().getFilesDir(); + File rawSurveillancePhotoFile = new File(path, "rawSurveillancePhoto_attender"); + if (!rawSurveillancePhotoFile.exists()) { + rawSurveillancePhotoFile.createNewFile(); + } + File f0 = new File(path, "f0"); + if (!f0.exists()) { + f0.createNewFile(); + } + File surveillancePhotoFile = new File(path, "surveillancePhoto_attender"); + if (!surveillancePhotoFile.exists()) { + surveillancePhotoFile.createNewFile(); + } + File uploadCustomPhotoFile = new File(path, "uploadCustomPhoto_attender"); + if (!uploadCustomPhotoFile.exists()) { + uploadCustomPhotoFile.createNewFile(); + } + File idCardPhotoFile = new File(path, "idCardPhoto_attender"); + if (!idCardPhotoFile.exists()) { + idCardPhotoFile.createNewFile(); + } + FileWriter fw0 = new FileWriter(f0); + fw0.write("test1"); + fw0.close(); + params.setUri(AppApi.BASE_URL +AppApi.ATTENDER_REGISTER_ADD); + params.addBodyParameter("f0", f0); + params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile); + params.addBodyParameter("surveillancePhoto", surveillancePhotoFile); + params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile); + params.addBodyParameter("idCardPhoto", idCardPhotoFile); + params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId()); +// if (idCardHeadPhoto != null && !"".equals(idCardHeadPhoto)) { +// File f5 = new File(idCardHeadPhoto); +// if (!f5.exists()) { +// f5.createNewFile(); +// } +// params.addBodyParameter("idCardHeadPhoto_attender", f5); +// } + x.http().post(params, new BaseCommonCallBack() { + @Override + public void success() { + SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class)); + Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show(); + AttenderRegisterFragment.getInstance().resetForm(); + } + }); + }catch(Exception e) { + e.printStackTrace(); + } } public boolean hasOfflineAttenderRegisterData() { -- Gitblit v1.8.0