sujinwen

2017-07-25 c7caa54d8d58af6159f2c758ad5d6687d461a333

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java

@@ -69,6 +69,7 @@


                params.addBodyParameter(Device.FieldNames.sn, authorationId);

                params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);

                params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());

                x.http().post(params, new BaseCommonCallBack() {

                    public void success() {

                        loadAfterReturn(getList(Device.class));

@@ -98,6 +99,7 @@
                        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);

                        params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());

                        x.http().post(params, new BaseCommonCallBack() {

                            public void success() {

                                List<Device> devices = resultBean.getList(Device.class);

@@ -112,6 +114,7 @@
                        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);

                        params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());

                        x.http().post(params, new BaseCommonCallBack() {

                            public void success() {

                                List<Device> devices = resultBean.getList(Device.class);

@@ -195,7 +198,7 @@
        return sharedPreferences.getString(key, "");

    }



    public String getCamera1Address() {

    public String getCamera2Address() {

        String username = "admin";

        String password = "admin12345";

        String ip = "192.168.1.70";

@@ -217,11 +220,12 @@


//        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.132:554/h264/ch1/sub/av_stream";

//        return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/sub/av_stream";

        return "rtsp://admin:admin12345@192.168.1.202:554/h264/ch1/main/av_stream";

//        return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/main/av_stream";

    }



    public String getCamera2Address() {

    public String getCamera1Address() {

        String username = "admin";

        String password = "a1234567";

        String ip = "192.168.1.68";

@@ -245,7 +249,8 @@
        //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/sub/av_stream";

        return "rtsp://Admin:1234@192.168.1.22/h264";

//        return "rtsp://Admin:1234@192.168.1.22/h264";

        return "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";

    }