From 3cceac30dc1c5a7cf5bd4f95e327e855cdcf304d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 02 六月 2017 16:01:35 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 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 61376e0..f74447c 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 = "101";
public static DeviceMng getInstance() {
return instance;
@@ -50,8 +50,19 @@
public void load () {
try {
+// if (authorationId == null || authorationId.trim().length() <= 1) {
+// getAuthorationId();
+// MainActivity.getInstance().runOnUiThread(new Runnable() {
+// @Override
+// public void run() {
+// Toast.makeText(MainActivity.getInstance(), "璇峰～鍐欒澶囧簭鍒楀彿", Toast.LENGTH_SHORT).show();
+// }
+// });
+// return;
+// }
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
- params.addBodyParameter(Device.FieldNames.authorizationId, authorationId);
+ params.addBodyParameter(Device.FieldNames.sn, authorationId);
+ params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<Device> places = resultBean.getListBeanOfType(Device.class);
@@ -68,16 +79,40 @@
}
}
+ 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);
}
public void saveLanSetting(Map<String, String> fields) {
+
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
+ params.addBodyParameter(Device.FieldNames.sn, authorationId);
+ params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ List<Device> places = resultBean.getListBeanOfType(Device.class);
+ if (places.size() > 0) {
+ BaseApplication.getInstance().setDevice(places.get(0));
+ } else {
+ Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+
+
SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, fields);
}
public void saveSchoolSetting(Map<String, String> fields) {
SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.SCHOOL, fields);
+ getAuthorationId();
}
public void saveCamera1Setting(Map<String, String> fields) {
@@ -116,7 +151,7 @@
// port = camera1.getString("fragment_device_right_camera1_port", "");
// }
- return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/main/av_stream";
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
}
public String getCamera2Address() {
@@ -139,7 +174,7 @@
// port = camera1.getString("fragment_device_right_camera1_port", "");
// }
- return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/main/av_stream";
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
}
}
--
Gitblit v1.8.0