From c41c02a52bb12a5724f4d9e9d2e9a33167de88a4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 22 五月 2017 17:02:19 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 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 6c64ea4..1f50ccf 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
@@ -22,7 +22,7 @@
public class DeviceMng {
public static DeviceMng instance = new DeviceMng();
- public static final String authorationId = "101";
+ public static String authorationId = null;
public static DeviceMng getInstance() {
return instance;
@@ -50,6 +50,10 @@
public void load () {
try {
+ if (authorationId == null || authorationId.trim().length() <= 1) {
+ getAuthorationId();
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
params.addBodyParameter(Device.FieldNames.authorizationId, authorationId);
x.http().post(params, new BaseCommonCallBack() {
@@ -68,6 +72,13 @@
}
}
+ public void getAuthorationId() {
+ SharedPreferences school = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.SCHOOL);
+ if (!"".equals(school.getString("fragment_device_right_device_info_sn", ""))) {
+ authorationId = school.getString("fragment_device_right_device_info_sn", "");
+ }
+ }
+
public void saveWifiSetting(Map<String, String> fields) {
SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.WIFI, fields);
}
@@ -78,6 +89,7 @@
public void saveSchoolSetting(Map<String, String> fields) {
SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.SCHOOL, fields);
+ getAuthorationId();
}
public void saveCamera1Setting(Map<String, String> fields) {
@@ -102,19 +114,19 @@
String ip = "192.168.1.70";
String port = "554";
- SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA1);
- if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
- username = camera1.getString("fragment_device_right_camera1_username", "");
- }
- if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
- password = camera1.getString("fragment_device_right_camera1_password", "");
- }
- if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {
- ip = camera1.getString("fragment_device_right_camera1_ip", "");
- }
- if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {
- port = camera1.getString("fragment_device_right_camera1_port", "");
- }
+// SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA1);
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
+// username = camera1.getString("fragment_device_right_camera1_username", "");
+// }
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
+// password = camera1.getString("fragment_device_right_camera1_password", "");
+// }
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {
+// ip = camera1.getString("fragment_device_right_camera1_ip", "");
+// }
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {
+// port = camera1.getString("fragment_device_right_camera1_port", "");
+// }
return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
}
@@ -125,19 +137,19 @@
String ip = "192.168.1.68";
String port = "554";
- SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA2);
- if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
- username = camera1.getString("fragment_device_right_camera1_username", "");
- }
- if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
- password = camera1.getString("fragment_device_right_camera1_password", "");
- }
- if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {
- ip = camera1.getString("fragment_device_right_camera1_ip", "");
- }
- if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {
- port = camera1.getString("fragment_device_right_camera1_port", "");
- }
+// SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA2);
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
+// username = camera1.getString("fragment_device_right_camera1_username", "");
+// }
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
+// password = camera1.getString("fragment_device_right_camera1_password", "");
+// }
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {
+// ip = camera1.getString("fragment_device_right_camera1_ip", "");
+// }
+// if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {
+// port = camera1.getString("fragment_device_right_camera1_port", "");
+// }
return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
}
--
Gitblit v1.8.0