From 7b6628f2efb53e8246663f50267cacb35f577051 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 22 七月 2017 12:24:22 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java |   46 ++++++++++++++--------------------------------
 1 files changed, 14 insertions(+), 32 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..9fba7b2 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
@@ -10,6 +10,7 @@
 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;
@@ -36,7 +37,7 @@
         return instance;
     }
 
-    public void add(RequestParams params, String idCardHeadPhoto) {
+    public void add(RequestParams params, String idCardHeadPhoto, OfflineVisitorRegisterItem offlineVisitorRegisterItem) {
         if (!BaseApplication.deviceAvailable) {
             return;
         }
@@ -85,18 +86,22 @@
                     public void success() {
                         Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
                         VisitorRegisterFragment.getInstance().resetForm();
+                        MainActivity.selectPage(2);
+                        //CheckInFragment.getInstance().checkInFromHomePage();
                     }
                 });
             }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) {
@@ -213,7 +218,7 @@
                 e.printStackTrace();
             }
         } else {
-            RegisterDao.getInstance().add(params, idCardHeadPhoto);
+            RegisterDao.getInstance().addAttender(params, idCardHeadPhoto);
             Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
         }
 
@@ -236,46 +241,23 @@
         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.getRawSurveillancePhoto());
+        params.addBodyParameter("surveillancePhoto", item.getSurveillancePhoto());
+        params.addBodyParameter("uploadCustomPhoto", item.getUploadCustomPhoto());
+        params.addBodyParameter("idCardPhoto", item.getIdCardPhoto());
         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() {

--
Gitblit v1.8.0