From d6119c2d7fe2f802dd224d77bf2d95eeeedb4526 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 七月 2017 16:08:15 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java |   93 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 80 insertions(+), 13 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 1f50ccf..ebb95a2 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
@@ -7,6 +7,7 @@
 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;
@@ -22,7 +23,7 @@
 public class DeviceMng {
     public static DeviceMng instance = new DeviceMng();
 
-    public static String authorationId = null;
+    public static String authorationId = "101";
 
     public static DeviceMng getInstance() {
         return instance;
@@ -50,17 +51,61 @@
 
     public void load () {
         try {
-            if (authorationId == null || authorationId.trim().length() <= 1) {
-                getAuthorationId();
-                return;
-            }
+//            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();
                     }
@@ -84,7 +129,23 @@
     }
 
     public void saveLanSetting(Map<String, String> fields) {
-        SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, 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) {
@@ -128,7 +189,10 @@
 //            port = camera1.getString("fragment_device_right_camera1_port", "");
 //        }
 
-        return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
+//        return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
+//        return "rtsp://Admin:1234@192.168.1.22/h264";
+        return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
+
     }
 
     public String getCamera2Address() {
@@ -147,11 +211,14 @@
 //        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", ""))) {
+//        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://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
+//        return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
+        return "rtsp://admin:a1234567@192.168.1.69:554/h264/ch1/main/av_stream";
     }
 
 }

--
Gitblit v1.8.0