Failed commit: Default

sujinwen

2017-07-25 fa10ea854ee7c833a2ca4b7e6a7131809f34aa30

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

@@ -198,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";

@@ -225,7 +225,7 @@
//        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";