VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -113,7 +113,7 @@ public static boolean FACE_SERVER = false; public static boolean ID_CARD = false; public static boolean EMULATOR = false; public static boolean EMULATOR = true; public static boolean androidOffline() { return true; VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OfflineSurveillance.java
@@ -8,11 +8,12 @@ public class OfflineSurveillance implements Serializable { private String surveillanceId; private String rawDataPath; private String camera_in_or_out; private String create_time; private String deviceCompanyId; private String surveillanceId; private String rawDataPath; private String camera_in_or_out; private String create_time; private String deviceCompanyId; private String deviceId; public String getSurveillanceId() { return surveillanceId; @@ -53,4 +54,12 @@ public void setDeviceCompanyId(String deviceCompanyId) { this.deviceCompanyId = deviceCompanyId; } public String getDeviceId() { return deviceId; } public void setDeviceId(String deviceId) { this.deviceId = deviceId; } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
@@ -10,6 +10,7 @@ import java.util.List; import java.util.UUID; import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.entity.OfflineSurveillance; import cn.com.basic.face.discern.query.item.SurveillanceQueryItem; @@ -94,13 +95,16 @@ * @return */ public List<OfflineSurveillance> getSurveillanceList(){ String sql="select * from offline_surveillance"; String sql="select surveillance_id,raw_data_path,camera_in_or_out,create_time,device_id from offline_surveillance limit 0, 10"; List<OfflineSurveillance> list=new ArrayList<OfflineSurveillance>(); OfflineSurveillance result=null; Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{}); if(c.moveToFirst()){ String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId(); String deviceId = BaseApplication.getInstance().getAndroidDevice().getDeviceId(); while (c.moveToNext()) { result=new OfflineSurveillance(); result.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id"))); result.setDeviceCompanyId(deviceCompanyId); result.setDeviceId(deviceId); result.setCamera_in_or_out(c.getString(c.getColumnIndex("camera_in_or_out"))); result.setCreate_time(c.getString(c.getColumnIndex("create_time"))); result.setRawDataPath(c.getString(c.getColumnIndex("raw_data_path"))); @@ -111,9 +115,11 @@ } //删除已上传给服务器的数据 public void delSurllanceList(){ String sql="delete from offline_surveillance"; MainActivity.getInstance().db.execSQL(sql); public void delSurllanceList(List<OfflineSurveillance> list){ for (OfflineSurveillance item : list) { String sql="delete from offline_surveillance where 1=1 and surveillance_id='"+item.getSurveillanceId()+"'"; MainActivity.getInstance().db.execSQL(sql); } } //获取未同步数据总数 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncUpThread.java
@@ -20,7 +20,10 @@ import cn.com.basic.face.service.sync.up.CompanyUpSync; import cn.com.basic.face.service.sync.up.DeviceUpSync; import cn.com.basic.face.service.sync.up.DictionaryUpSync; import cn.com.basic.face.service.sync.up.FileUpSync; import cn.com.basic.face.service.sync.up.OfflineSurveillanceUpSync; import cn.com.basic.face.service.sync.up.RegisterUpSync; import cn.com.basic.face.service.sync.up.VisitUpSync; import cn.com.basic.face.service.sync.up.VisitorRegisterUpSync; public class SyncUpThread extends Thread { @@ -33,20 +36,19 @@ firstUpSync = DictionaryUpSync.getInstance(); DeviceUpSync deviceUpSync = DeviceUpSync.getInstance(); CompanyUpSync companyUpSync = CompanyUpSync.getInstance(); VisitorRegisterUpSync visitorRegisterUpSync = VisitorRegisterUpSync.getInstance(); AttenderRegisterUpSync attenderRegisterUpSync = AttenderRegisterUpSync.getInstance(); OfflineSurveillanceUpSync offlineSurveillanceUpSync = OfflineSurveillanceUpSync.getInstance(); CheckInUpSync checkInUpSync = CheckInUpSync.getInstance(); FileUpSync fileUpSync = new FileUpSync(); OfflineSurveillanceUpSync offlineSurveillanceUpSync = new OfflineSurveillanceUpSync(); RegisterUpSync registerUpSync = new RegisterUpSync(); VisitUpSync visitUpSync = new VisitUpSync(); firstUpSync.setNext(companyUpSync); companyUpSync.setNext(deviceUpSync); deviceUpSync.setNext(visitorRegisterUpSync); visitorRegisterUpSync.setNext(attenderRegisterUpSync); attenderRegisterUpSync.setNext(checkInUpSync); checkInUpSync.setNext(offlineSurveillanceUpSync); deviceUpSync.setNext(fileUpSync); fileUpSync.setNext(offlineSurveillanceUpSync); offlineSurveillanceUpSync.setNext(registerUpSync); registerUpSync.setNext(visitUpSync); } Date lastTime = new Date();
@@ -7,6 +7,7 @@ import java.io.File; import java.io.FileWriter; import java.util.List; import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.discern.common.BaseCommonCallBack; @@ -75,17 +76,18 @@ @Override public void doSync() { try{ final String tableName = "offline_surveillance"; RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.UP_SYNCHRON); params.addBodyParameter("tableName", tableName); params.addBodyParameter("data", JSONArray.toJSONString(SurveillanceDao.getInstance().getSurveillanceList())); params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { SurveillanceDao.getInstance().delSurllanceList(); sync(); } }); final String tableName = "offline_surveillance"; RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.UP_SYNCHRON); params.addBodyParameter("tableName", tableName); final List list = SurveillanceDao.getInstance().getSurveillanceList(); params.addBodyParameter("data", JSONArray.toJSONString(list)); params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { SurveillanceDao.getInstance().delSurllanceList(list); sync(); } }); }catch(Exception e){ e.printStackTrace(); @@ -101,6 +103,7 @@ } return true; } public boolean More() { return SurveillanceDao.getInstance().hasMoreOfflineSurveillance(); } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -8,9 +8,9 @@ //public final static String BASE_URL = "http://192.168.1.51/face/"; // public final static String BASE_URL = "http://192.168.1.51:8333/face/"; //public final static String BASE_URL = "http://192.168.1.101:8080/face/"; // public final static String BASE_URL = "http://192.168.1.36:8080/face/"; public final static String BASE_URL = "http://192.168.1.81:8080/face/"; // public final static String BASE_URL = "http://192.168.1.51:8333/face/"; public final static String BASE_URL = "http://192.168.1.53:8082/face/"; // public final static String BASE_URL = "http://192.168.1.53:8082/face/"; // public final static String BASE_URL="http://192.168.1.160:8080/ssm/";
@@ -61,6 +61,13 @@ File[] photoFiles = dir.listFiles(); if (photoFiles != null) { for (File file : photoFiles) { if (file.isDirectory()) { continue; } String name = file.getName(); if (name.length() != "c248fe8f-6da5-4ec9-bffa-1a11bcf2fdc7".length()) { continue; } if (file.isFile()) { return file; } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -158,7 +158,7 @@ if (BaseApplication.getInstance().networkAvailable()) { SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s, cameraIdx+"", new byte[]{}); } else { SurveillanceMng.getInstance().addOfflineBitmap(bitmapList, faceListPb.arr, CommonVariables.Camera.IN+""); SurveillanceDao.getInstance().saveOfflineUnknownToLocal(bitmapList, faceListPb.arr, cameraIdx+""); } }catch(Exception e){
