Failed commit: Default

sujinwen

2017-07-25 b55e4a856a84dfeada680b099eeb0f2850c0488e

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

@@ -21,9 +21,12 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;

import cn.com.basic.face.discern.entity.Device;

import cn.com.basic.face.util.SharedPreferencesUtils;

import cn.com.basic.face.util.SyncUpAndDownThread;



public class DeviceMng {

    public static DeviceMng instance = new DeviceMng();



    private SyncUpAndDownThread syncUpAndDownThread = null;



    public static String authorationId = "101";



@@ -141,6 +144,12 @@
                    }

                }

            });

            synchronized (this) {

                if (syncUpAndDownThread == null) {

                    syncUpAndDownThread = new SyncUpAndDownThread();

                syncUpAndDownThread.start();

            }

            }

        } else {

            Toast.makeText(BaseApplication.getInstance(), "数据库中找不到该设备", Toast.LENGTH_SHORT).show();

        }

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