VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -22,23 +22,40 @@ return application; } private Device device; private Device androidDevice; private Device camera1; private Device camera2; public static boolean deviceAvailable = false; public void setDevice(Device device) { this.device = device; public void setAndroidDevice(Device device) { this.androidDevice = device; if (device != null && device.getDeviceId() != null && !"".equals(device.getDeviceId())) { deviceAvailable = true; DictionaryMng.getInstance().loadAllDictionaryData(); } } public Device getDevice() { if (device == null) { device = new Device(); public void setCamera1(Device camera1) { this.camera1 = camera1; if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) { DictionaryMng.getInstance().loadAllDictionaryData(); } return device; } public void setCamera2(Device camera2) { this.camera2 = camera2; if (camera2 != null && camera2.getDeviceId() != null && !"".equals(camera2.getDeviceId())) { DictionaryMng.getInstance().loadAllDictionaryData(); } } public Device getAndroidDevice() { if (androidDevice == null) { androidDevice = new Device(); } return androidDevice; } @Override VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -211,7 +211,7 @@ params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.VisitType.VISITOR_ENTERED); params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date())); params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId()); params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId()); CheckInMng.getInstance().add(params, visitReasonId); } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
@@ -14,6 +14,7 @@ import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.dialog.SelectDialog; import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.entity.Device; import cn.com.basic.face.service.DeviceMng; import cn.com.basic.face.util.Constant; import cn.com.basic.face.util.OkClickedListener; @@ -304,5 +305,17 @@ },fragment_device_right_lan_protocol.getText().toString()); } public void setAndroidDevice(Device androidDevice) { } public void setCamera1(Device camera1) { } public void setCamera2(Device camera2) { } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -14,7 +14,6 @@ import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition; import cn.com.basic.face.discern.query.item.AttendanceDetailQueryItem; import cn.com.basic.face.discern.query.item.AttendanceQueryItem; import cn.com.basic.face.discern.query.item.VisitQueryItem; import cn.com.basic.face.fragment.AttendanceFragment; import cn.com.basic.face.util.AppApi; import cn.com.basic.face.util.DateUtil; @@ -74,7 +73,7 @@ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY); params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.time, sdf.format(sdf.parse(item.getTime()))); params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, item.getRegisterId()); params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getDevice().getCompanyId()); params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId()); params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20"); x.http().post(params, new BaseCommonCallBack() { public void success() { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -5,7 +5,6 @@ import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.query.condition.CheckInQueryCondition; import cn.com.basic.face.discern.query.item.PhoneCallQueryItem; import cn.com.basic.face.fragment.CheckInFragment; import cn.com.basic.face.util.AppApi; @@ -18,7 +17,6 @@ import java.util.List; import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.util.CharacterParser; @@ -52,7 +50,7 @@ return; } RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY); String deviceCompanyId = BaseApplication.getInstance().getDevice().getCompanyId(); String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId(); if (isVisitorList) { params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId); } else { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -7,6 +7,7 @@ import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.fragment.DeviceFragment; import cn.com.basic.face.util.AppApi; import org.xutils.http.RequestParams; @@ -65,9 +66,45 @@ params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE); x.http().post(params, new BaseCommonCallBack() { public void success() { List<Device> places = resultBean.getListBeanOfType(Device.class); if (places.size() > 0) { BaseApplication.getInstance().setDevice(places.get(0)); List<Device> devices = resultBean.getListBeanOfType(Device.class); if (devices.size() > 0) { final Device device = devices.get(0); BaseApplication.getInstance().setAndroidDevice(device); MainActivity.getInstance().runOnUiThread(new Runnable() { @Override public void run() { DeviceFragment.getInstance().setAndroidDevice(device); 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); x.http().post(params, new BaseCommonCallBack() { public void success() { List<Device> devices = resultBean.getListBeanOfType(Device.class); if (devices.size() > 0) { final Device camera1 = devices.get(0); BaseApplication.getInstance().setCamera1(camera1); DeviceFragment.getInstance().setCamera1(camera1); } } }); 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); x.http().post(params, new BaseCommonCallBack() { public void success() { List<Device> devices = resultBean.getListBeanOfType(Device.class); if (devices.size() > 0) { final Device camera2 = devices.get(0); BaseApplication.getInstance().setCamera2(camera2); DeviceFragment.getInstance().setCamera2(camera2); } } }); } }); } else { Toast.makeText(BaseApplication.getInstance(), "数据库中找不到该设备", Toast.LENGTH_SHORT).show(); } @@ -92,22 +129,22 @@ public void saveLanSetting(Map<String, String> fields) { RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY); params.addBodyParameter(Device.FieldNames.sn, authorationId); params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE); x.http().post(params, new BaseCommonCallBack() { public void success() { List<Device> places = resultBean.getListBeanOfType(Device.class); if (places.size() > 0) { BaseApplication.getInstance().setDevice(places.get(0)); } else { Toast.makeText(BaseApplication.getInstance(), "数据库中找不到该设备", Toast.LENGTH_SHORT).show(); } } }); SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, fields); // RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY); // params.addBodyParameter(Device.FieldNames.sn, authorationId); // params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE); // x.http().post(params, new BaseCommonCallBack() { // public void success() { // List<Device> places = resultBean.getListBeanOfType(Device.class); // if (places.size() > 0) { // BaseApplication.getInstance().setAndroidDevice(places.get(0)); // } else { // Toast.makeText(BaseApplication.getInstance(), "数据库中找不到该设备", Toast.LENGTH_SHORT).show(); // } // } // }); // // // SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, fields); } public void saveSchoolSetting(Map<String, String> fields) { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -20,7 +20,6 @@ import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition; import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.discern.query.item.PhoneCallQueryItem; import cn.com.basic.face.fragment.CheckInFragment; import cn.com.basic.face.fragment.PhoneCallFragment; import cn.com.basic.face.util.AppApi; import cn.com.basic.face.util.CharacterParser; @@ -131,7 +130,7 @@ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.PHONE_CALL_ADD); params.addBodyParameter(PhoneCall.FieldNames.date, sdf.format(new Date())); params.addBodyParameter(PhoneCall.FieldNames.calleeId, interviewee.getRegisterId()); params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId()); params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId()); params.addBodyParameter(PhoneCall.FieldNames.callerId, visitor.getRegisterId()); x.http().post(params, new BaseCommonCallBack() { public void success() { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -74,8 +74,8 @@ } 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("deviceId", BaseApplication.getInstance().getDevice().getDeviceId()); params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId()); params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId()); params.addBodyParameter("InOrOutCamera", cameraInOrOut+""); x.http().post(params, new BaseCommonCallBack() { public void success() { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -1,20 +1,15 @@ package cn.com.basic.face.util; import android.graphics.Bitmap; import android.util.Base64; import android.util.Log; import android.view.Surface; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.query.item.SurveillanceQueryItem; import cn.com.basic.face.fragment.RegisterFragment; import cn.com.basic.face.service.SurveillanceMng; /** @@ -72,7 +67,7 @@ RefByteArray faceListPb = new RefByteArray(); try { COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getCompanyId()); COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getAndroidDevice().getCompanyId()); } catch (Exception e) { COMPANY_ID = 0; }
