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/util/RtspFaceNative.java |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index 6ed3406..8604f22 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -1,20 +1,15 @@
 package cn.com.basic.face.util;
 
 import android.graphics.Bitmap;
-import android.util.Base64;
 import android.util.Log;
 import android.view.Surface;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
 import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-import cn.com.basic.face.fragment.RegisterFragment;
 import cn.com.basic.face.service.SurveillanceMng;
 
 /**
@@ -72,7 +67,7 @@
         RefByteArray faceListPb = new RefByteArray();
 
         try {
-            COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getCompanyId());
+            COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
         } catch (Exception e) {
             COMPANY_ID = 0;
         }

--
Gitblit v1.8.0