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/DeviceMng.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index 297acfa..353dec7 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -2,7 +2,12 @@
import android.content.Context;
import android.content.SharedPreferences;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
import android.widget.Toast;
+
+import com.bsk.zhangbo.demoforbsk.R;
+import com.lidroid.xutils.view.annotation.event.OnClick;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
@@ -30,6 +35,7 @@
import cn.com.basic.face.util.SharedPreferencesUtils;
import cn.com.basic.face.service.sync.SyncUpThread;
import cn.com.basic.face.util.SqliteSqlUtil;
+import cn.com.basic.face.util.ToastUtil;
public class DeviceMng {
public static DeviceMng instance = new DeviceMng();
@@ -172,7 +178,7 @@
}
}
} else {
- Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
+ ToastUtil.show("鏁版嵁搴撲腑鎵句笉鍒拌璁惧");
}
}
@@ -233,6 +239,10 @@
String password = "admin12345";
String ip = "192.168.1.70";
String port = "554";
+ DeviceQueryItem camera2 = DeviceFragment.getInstance().getCamera2();
+ if (camera2 != null) {
+ return "rtsp://admin:admin12345@"+camera2.getIp()+":554/h264/ch1/main/av_stream";
+ }
return "rtsp://admin:admin12345@192.168.1.202:554/h264/ch1/main/av_stream";
}
@@ -241,12 +251,16 @@
String password = "a1234567";
String ip = "192.168.1.68";
String port = "554";
+ DeviceQueryItem camera1 = DeviceFragment.getInstance().getCamera1();
+ if (camera1 != null) {
+ return "rtsp://admin:a1234567@"+camera1.getIp()+":554/h264/ch1/main/av_stream";
+ }
return "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
}
- public void updateDevice(RequestParams params, Device camera) {
+ public void updateCamera(RequestParams params, Device camera) {
if (BaseApplication.getInstance().networkAvailable()) {
- params.setUri(AppApi.BASE_URL +AppApi.DEVICE_EDIT);
+ params.setUri(AppApi.BASE_URL +AppApi.CAMERA_UPDATE);
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
@@ -255,8 +269,24 @@
}
});
} else {
- DeviceDao.getInstance().updateDevice(camera);
+ DeviceDao.getInstance().updateCamera(camera);
}
}
+ public void updateAndroidDevice(RequestParams params, Device androidDevice) {
+ if (BaseApplication.getInstance().networkAvailable()) {
+ params.setUri(AppApi.BASE_URL +AppApi.ANDROID_DEVICE_UPDATE);
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+ Toast.makeText(BaseApplication.getInstance(),"淇敼鎴愬姛", Toast.LENGTH_SHORT).show();
+ }
+ });
+ } else {
+ DeviceDao.getInstance().updateAndroidDevice(androidDevice);
+ }
+ }
+
+
}
--
Gitblit v1.8.0