From 7e7f99a8c753e7a2a70fd854a79bf75b861bdc66 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 25 五月 2017 17:45:47 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 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..ed676f0 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,6 +50,16 @@ 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); x.http().post(params, new BaseCommonCallBack() { @@ -68,6 +78,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 +95,7 @@ public void saveSchoolSetting(Map<String, String> fields) { SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.SCHOOL, fields); + getAuthorationId(); } public void saveCamera1Setting(Map<String, String> fields) { @@ -116,7 +134,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 +157,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