From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 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 6b36aad..0cebae6 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
@@ -1,39 +1,25 @@
package cn.com.basic.face.service;
-import android.os.AsyncTask;
-import android.util.Base64;
-import android.widget.Toast;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-
import org.xutils.http.RequestParams;
import org.xutils.x;
import java.io.File;
import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
-import cn.com.basic.face.discern.common.ResultBean;
-import cn.com.basic.face.discern.entity.Device;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-import cn.com.basic.face.fragment.RegisterFragment;
-import cn.com.basic.face.fragment.SurveillanceFragment;
+import cn.com.basic.face.discern.query.item.UnknownQueryItem;
+import cn.com.basic.face.service.sqlite.SurveillanceDao;
import cn.com.basic.face.util.AppApi;
-import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.FileUtil;
-import cn.com.basic.face.util.PostData;
+import cn.com.basic.face.util.SqliteSqlUtil;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
-import cn.com.basic.face.util.Uploader;
+import cn.com.basic.face.util.UnknownSurveillanceQueryItemUtil;
public class SurveillanceMng {
@@ -41,6 +27,11 @@
public static SurveillanceMng getInstance() {
return instance;
+ }
+
+ public void addOfflineBitmap(final List<SurveillanceQueryItem> bitmapList, final byte[] rawData, final String cameraInOrOut) {
+ SurveillanceDao.getInstance().saveOfflineUnknownToLocal(bitmapList, rawData, cameraInOrOut);
+ UnknownSurveillanceQueryItemUtil.getInstance().addItems(bitmapList);
}
public static class SurveillanceListThread extends Thread {
@@ -51,7 +42,11 @@
MainActivity.getInstance().runOnUiThread(new Runnable() {
@Override
public void run() {
- SurveillanceQueryItemUtil.getInstance().removeTimeoutItemAndShow();
+ if (BaseApplication.getInstance().networkAvailable()) {
+ SurveillanceQueryItemUtil.getInstance().removeTimeoutItemAndShow();
+ } else {
+ UnknownSurveillanceQueryItemUtil.getInstance().removeTimeoutItemAndShow();
+ }
}
});
Thread.sleep(1000*60*5);
@@ -77,7 +72,6 @@
File rawSurveillancePhotoFile = FileUtil.writeToFile("rawSurveillancePhotoFile_"+fileIndex, byteArray);
File surveillancePhotoFile = FileUtil.writeToFile("surveillancePhotoFile_"+fileIndex, surveillancePhotoBytes);
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
params.addBodyParameter("InOrOutCamera", cameraInOrOut + "");
params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
@@ -98,11 +92,13 @@
params.setUri(AppApi.BASE_URL + AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("f0", f0);
params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
try {
- SurveillanceQueryItemUtil.getInstance().addItems(resultBean.getListBeanOfType(SurveillanceQueryItem.class), bitmapList);
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+ SurveillanceQueryItemUtil.getInstance().addItems(resultBean.getList(SurveillanceQueryItem.class), bitmapList, cameraInOrOut);
} catch(Exception e) {
e.printStackTrace();
}
@@ -113,4 +109,8 @@
}
}
+ public void removePhotoFileWhenStorageIsSlow() {
+
+ }
+
}
--
Gitblit v1.8.0