From a9c8b39ffcb8f8a5f922cb0fce18861b3463d438 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 四月 2017 11:30:45 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java |   28 +++++-----------------------
 1 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 901937e..3f19cd0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -56,29 +56,10 @@
         });
     }
 
-    public List getRegisterList() {
-        return new ArrayList();
-    }
-
-    public List getCheckInList() {
-        return new ArrayList();
-    }
-
-    public void getList() {
-        List registerList = new ArrayList();
-        List checkInList = new ArrayList();
-        List blendInList = blendIn(registerList, checkInList);
-        SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(null, true);
-    }
-
-    public List blendIn(List registerList, List checkInList) {
-        return null;
-    }
-
     public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
         RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
         params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
-        params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getCompanyId());
+        params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
         params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
         params.addBodyParameter("enterOrExit", CommonVariables.EnterOrExit.ENTER+"");
         x.http().post(params, new BaseCommonCallBack() {
@@ -87,6 +68,10 @@
                 if (item.getType() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
                         || item.getType() == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
                         ) {
+                    if (bitmapList != null && bitmapList.size() > 0) {
+                        item.setBitmap(bitmapList.get(0));
+                    }
+
                     List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
 
                     List list = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
@@ -99,9 +84,6 @@
 
             }
         });
-        if (bitmapList != null && bitmapList.size() > 0) {
-            //RegisterFragment.getInstance().get_fragment_register_choose_photo().setImageBitmap(bitmapList.get(0));
-        }
     }
 
     private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {

--
Gitblit v1.8.0