xuxiuxi

2017-04-19 a9c8b39ffcb8f8a5f922cb0fce18861b3463d438

git-svn-id: http://192.168.1.226/svn/proxy@489 454eff88-639b-444f-9e54-f578c98de674

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

@@ -13,10 +13,6 @@

import org.xutils.x;

/**
 * Created by zhangbo on 2017/2/15.
 */

public class BaseApplication extends Application{

    private static BaseApplication application;
@@ -45,7 +41,7 @@
        Fresco.initialize(this);
        initOkHttpUtils();
        application = this;
        DeviceMng.getInstance().findPlace();
        DeviceMng.getInstance().findDevice();
        DictionaryMng.getInstance().loadAllDictionaryData();
    }


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java

@@ -21,7 +21,7 @@
        /**

         * 公司主键

         */

        public static final String companyId = "companyId";

        public static final String deviceCompanyId = "deviceCompanyId";

        /**

         * 设备地点

         */

@@ -35,7 +35,7 @@
    // 设备主键

    private String deviceId;

    // 公司主键

    private String companyId;

    private String deviceCompanyId;

    // 设备地点

    private String deviceName;

    // 设备授权码

@@ -58,15 +58,15 @@
    /**

     * Get 公司主键

     */

    public String getCompanyId() {

        return companyId;

    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    /**

     * Set 公司主键

     */

    public void setCompanyId(String companyId) {

        this.companyId = companyId;

    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    /**

@@ -99,7 +99,7 @@


    public String toString() {

        return 

             ",设备主键 =" + deviceId   +  ",公司主键 =" + companyId  +  ",设备地点 =" + deviceName + 
             ",设备主键 =" + deviceId   +  ",公司主键 =" + deviceCompanyId  +  ",设备地点 =" + deviceName +

             ",设备授权码 ="+ authorizationId;

    }

}


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

@@ -47,9 +47,9 @@
    public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {

        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);

        if (isVisitorList) {

            params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());

            params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());

        } else {

            params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());

            params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());

        }

        params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);

        params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");


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

@@ -22,7 +22,7 @@
        return instance;

    }



    public void findPlace() {

    public void findDevice() {

        try {

            RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);

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


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

@@ -59,7 +59,7 @@
    public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {

        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);

        params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));

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

        params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());

        params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());

        params.addBodyParameter("enterOrExit", CommonVariables.EnterOrExit.ENTER+"");

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