From c769d1392f1b540d61d78027d5a1295fb156bb4f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 02 六月 2017 16:17:10 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 d676d8c..dfed82e 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
@@ -74,8 +74,8 @@
         }
         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().getDeviceCompanyId());
-        params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
+        params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+        params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
         params.addBodyParameter("InOrOutCamera", cameraInOrOut+"");
         x.http().post(params, new BaseCommonCallBack() {
             public void success() {
@@ -93,8 +93,9 @@
                     if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
                             || type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
                             ) {
+                        //item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
                         if (prevVisitorList.size() > 3 ) {
-                            item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
+
                         }
                         item.setCreateTime(new Date());
                         newVisitorList.add(0, item);

--
Gitblit v1.8.0