xuxiuxi

2017-08-01 785fd3c3e9984f301018b3b5deb91ecc2c8da124

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java

@@ -4,6 +4,7 @@

import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.discern.query.item.DeviceQueryItem;
import cn.com.basic.face.service.InternetAccessThread;
import cn.com.basic.face.service.DictionaryMng;

@@ -23,8 +24,8 @@
    }

    private Device androidDevice;
    private Device camera1;
    private Device camera2;
    private DeviceQueryItem camera1;
    private DeviceQueryItem camera2;


    public static boolean deviceAvailable = false;
@@ -37,14 +38,14 @@
        }
    }

    public void setCamera1(Device camera1) {
    public void setCamera1(DeviceQueryItem camera1) {
        this.camera1 = camera1;
        if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
            DictionaryMng.getInstance().loadAllDictionaryData();
        }
    }

    public void setCamera2(Device camera2) {
    public void setCamera2(DeviceQueryItem camera2) {
        this.camera2 = camera2;
        if (camera2 != null && camera2.getDeviceId() != null && !"".equals(camera2.getDeviceId())) {
            DictionaryMng.getInstance().loadAllDictionaryData();