From 58a24b1c56d0d9db2aff1eedfb3ab79ea95718cb Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 28 六月 2017 11:22:39 +0800
Subject: [PATCH] modify proto
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 161 insertions(+), 5 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 870dca6..09cdb4c 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
@@ -1,22 +1,29 @@
package cn.com.basic.face.service;
+import android.content.Context;
+import android.content.SharedPreferences;
import android.widget.Toast;
import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.fragment.DeviceFragment;
import cn.com.basic.face.util.AppApi;
import org.xutils.http.RequestParams;
import org.xutils.x;
import java.util.List;
+import java.util.Map;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.entity.Device;
+import cn.com.basic.face.util.SharedPreferencesUtils;
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;
@@ -44,13 +51,61 @@
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);
- if (places.size() > 0) {
- BaseApplication.getInstance().setDevice(places.get(0));
+ List<Device> devices = resultBean.getListBeanOfType(Device.class);
+ if (devices.size() > 0) {
+ final Device device = devices.get(0);
+ BaseApplication.getInstance().setAndroidDevice(device);
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ DeviceFragment.getInstance().setAndroidDevice(device);
+
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
+ params.addBodyParameter(Device.FieldNames.belongId, device.getBelongId());
+ params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.CAMERA1);
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ List<Device> devices = resultBean.getListBeanOfType(Device.class);
+ if (devices.size() > 0) {
+ final Device camera1 = devices.get(0);
+ BaseApplication.getInstance().setCamera1(camera1);
+ DeviceFragment.getInstance().setCamera1(camera1);
+ }
+ }
+ });
+
+
+ params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
+ params.addBodyParameter(Device.FieldNames.belongId, device.getBelongId());
+ params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.CAMERA2);
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ List<Device> devices = resultBean.getListBeanOfType(Device.class);
+ if (devices.size() > 0) {
+ final Device camera2 = devices.get(0);
+ BaseApplication.getInstance().setCamera2(camera2);
+ DeviceFragment.getInstance().setCamera2(camera2);
+ }
+ }
+ });
+ }
+ });
} else {
Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
}
@@ -62,4 +117,105 @@
}
}
+ 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().setAndroidDevice(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) {
+ SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.CAMERA1, fields);
+ }
+
+ public void saveCamera2Setting(Map<String, String> fields) {
+ SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.CAMERA2, fields);
+ }
+
+ public SharedPreferences loadSharedPreferences(String name) {
+ return MainActivity.getInstance().getSharedPreferences(name, Context.MODE_PRIVATE);
+ }
+
+ public String get(SharedPreferences sharedPreferences, String key) {
+ return sharedPreferences.getString(key, "");
+ }
+
+ public String getCamera1Address() {
+ String username = "admin";
+ String password = "admin12345";
+ 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", "");
+// }
+
+// return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
+ return "rtsp://Admin:1234@192.168.1.22/h264";
+
+ }
+
+ public String getCamera2Address() {
+ String username = "admin";
+ String password = "a1234567";
+ 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", "");
+// }
+
+ //return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
+ return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
+ }
+
}
--
Gitblit v1.8.0