VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -100,4 +100,10 @@ public static final String CAMERA2 = "device_camera2"; } public static class DeviceType { public static final String ANDROID_DEVICE = "android_device"; public static final String CAMERA1 = "camera1"; public static final String CAMERA2 = "camera2"; } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
@@ -19,27 +19,93 @@ */ public static final String deviceId = "deviceId"; /** * 公司主键 * 设备所属公司 */ public static final String deviceCompanyId = "deviceCompanyId"; public static final String companyId = "companyId"; /** * 设备地点 * 设备名称 */ public static final String deviceName = "deviceName"; /** * 设备授权码 * 设备类型 */ public static final String authorizationId = "authorizationId"; public static final String type = "type"; /** * 设备地址 */ public static final String address = "address"; /** * 学校名称 */ public static final String schoolName = "schoolName"; /** * 品牌 */ public static final String brandId = "brandId"; /** * IP */ public static final String ip = "ip"; /** * 端口 */ public static final String port = "port"; /** * 分辨率 */ public static final String resolutionId = "resolutionId"; /** * 用户名 */ public static final String username = "username"; /** * 密码 */ public static final String password = "password"; /** * 通讯协议 */ public static final String protocolId = "protocolId"; /** * 序列号 */ public static final String sn = "sn"; /** * 所属设备id */ public static final String belongId = "belongId"; } // 设备主键 private String deviceId; // 公司主键 private String deviceCompanyId; // 设备地点 // 设备所属公司 private String companyId; // 设备名称 private String deviceName; // 设备授权码 private String authorizationId; // 设备类型 private String type; // 设备地址 private String address; // 学校名称 private String schoolName; // 品牌 private String brandId; // IP private String ip; // 端口 private String port; // 分辨率 private String resolutionId; // 用户名 private String username; // 密码 private String password; // 通讯协议 private String protocolId; // 序列号 private String sn; // 所属设备id private String belongId; /** * Get 设备主键 @@ -56,50 +122,210 @@ } /** * Get 公司主键 * Get 设备所属公司 */ public String getDeviceCompanyId() { return deviceCompanyId; public String getCompanyId() { return companyId; } /** * Set 公司主键 * Set 设备所属公司 */ public void setDeviceCompanyId(String deviceCompanyId) { this.deviceCompanyId = deviceCompanyId; public void setCompanyId(String companyId) { this.companyId = companyId; } /** * Get 设备地点 * Get 设备名称 */ public String getDeviceName() { return deviceName; } /** * Set 设备地点 * Set 设备名称 */ public void setDeviceName(String deviceName) { this.deviceName = deviceName; } /** * Get 设备授权码 * Get 设备类型 * ：camera1, camera2, main_device */ public String getAuthorizationId() { return authorizationId; public String getType() { return type; } /** * Set 设备授权码 * Set 设备类型 * ：camera1, camera2, main_device */ public void setAuthorizationId(String authorizationId) { this.authorizationId = authorizationId; public void setType(String type) { this.type = type; } /** * Get 设备地址 */ public String getAddress() { return address; } /** * Set 设备地址 */ public void setAddress(String address) { this.address = address; } /** * Get 学校名称 */ public String getSchoolName() { return schoolName; } /** * Set 学校名称 */ public void setSchoolName(String schoolName) { this.schoolName = schoolName; } /** * Get 品牌 */ public String getBrandId() { return brandId; } /** * Set 品牌 */ public void setBrandId(String brandId) { this.brandId = brandId; } /** * Get IP */ public String getIp() { return ip; } /** * Set IP */ public void setIp(String ip) { this.ip = ip; } /** * Get 端口 */ public String getPort() { return port; } /** * Set 端口 */ public void setPort(String port) { this.port = port; } /** * Get 分辨率 */ public String getResolutionId() { return resolutionId; } /** * Set 分辨率 */ public void setResolutionId(String resolutionId) { this.resolutionId = resolutionId; } /** * Get 用户名 */ public String getUsername() { return username; } /** * Set 用户名 */ public void setUsername(String username) { this.username = username; } /** * Get 密码 */ public String getPassword() { return password; } /** * Set 密码 */ public void setPassword(String password) { this.password = password; } /** * Get 通讯协议 */ public String getProtocolId() { return protocolId; } /** * Set 通讯协议 */ public void setProtocolId(String protocolId) { this.protocolId = protocolId; } /** * Get 序列号 */ public String getSn() { return sn; } /** * Set 序列号 */ public void setSn(String sn) { this.sn = sn; } /** * Get 所属设备id */ public String getBelongId() { return belongId; } /** * Set 所属设备id */ public void setBelongId(String belongId) { this.belongId = belongId; } public String toString() { return ",设备主键 =" + deviceId + ",公司主键 =" + deviceCompanyId + ",设备地点 =" + deviceName + ",设备授权码 ="+ authorizationId; ",设备主键 =" + deviceId + ",设备所属公司 ="+ companyId + ",设备名称 =" + deviceName + ",设备类型 =" + type + ",设备地址 =" + address + ",学校名称 =" + schoolName + ",品牌 =" + brandId + ",IP =" + ip + ",端口 =" + port + ",分辨率 =" + resolutionId + ",用户名 =" + username + ",密码 =" + password + ",通讯协议 =" + protocolId + ",序列号 =" + sn + ",所属设备id ="+ belongId ; } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/DeviceQueryCondition.java
New file @@ -0,0 +1,95 @@ package cn.com.basic.face.discern.query.condition; public class DeviceQueryCondition extends BaseCondition { public static final class FieldNames { /** * */ public static final String sn = "sn"; /** * */ public static final String type = "type"; /** * */ public static final String companyId = "companyId"; /** * */ public static final String belongId = "belongId"; } // private String sn; // private String type; // private String companyId; // private String belongId; /** * Get */ public String getSn() { return sn; } /** * Set */ public void setSn(String sn) { this.sn = sn; } /** * Get */ public String getType() { return type; } /** * Set */ public void setType(String type) { this.type = type; } /** * Get */ public String getCompanyId() { return companyId; } /** * Set */ public void setCompanyId(String companyId) { this.companyId = companyId; } /** * Get */ public String getBelongId() { return belongId; } /** * Set */ public void setBelongId(String belongId) { this.belongId = belongId; } public String toString() { return ", =" + sn + ", =" + type + ", =" + companyId + ", =" + belongId ; } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java
@@ -3,74 +3,254 @@ public class DeviceQueryItem { // 设备主键 // private String deviceId; // 公司主键 private String deviceCompanyId; // 设备地点 // private String companyId; // private String deviceName; // 设备授权码 private String authorizationId; // private String type; // private String address; // private String schoolName; // private String brandId; // private String ip; // private String port; // private String resolutionId; // private String username; // private String password; // private String protocolId; // private String sn; // private String belongId; /** * Get 设备主键 * Get */ public String getDeviceId() { return deviceId; } /** * Set 设备主键 * Set */ public void setDeviceId(String deviceId) { this.deviceId = deviceId; } /** * Get 公司主键 * Get */ public String getDeviceCompanyId() { return deviceCompanyId; public String getCompanyId() { return companyId; } /** * Set 公司主键 * Set */ public void setDeviceCompanyId(String deviceCompanyId) { this.deviceCompanyId = deviceCompanyId; public void setCompanyId(String companyId) { this.companyId = companyId; } /** * Get 设备地点 * Get */ public String getDeviceName() { return deviceName; } /** * Set 设备地点 * Set */ public void setDeviceName(String deviceName) { this.deviceName = deviceName; } /** * Get 设备授权码 * Get */ public String getAuthorizationId() { return authorizationId; public String getType() { return type; } /** * Set 设备授权码 * Set */ public void setAuthorizationId(String authorizationId) { this.authorizationId = authorizationId; public void setType(String type) { this.type = type; } /** * Get */ public String getAddress() { return address; } /** * Set */ public void setAddress(String address) { this.address = address; } /** * Get */ public String getSchoolName() { return schoolName; } /** * Set */ public void setSchoolName(String schoolName) { this.schoolName = schoolName; } /** * Get */ public String getBrandId() { return brandId; } /** * Set */ public void setBrandId(String brandId) { this.brandId = brandId; } /** * Get */ public String getIp() { return ip; } /** * Set */ public void setIp(String ip) { this.ip = ip; } /** * Get */ public String getPort() { return port; } /** * Set */ public void setPort(String port) { this.port = port; } /** * Get */ public String getResolutionId() { return resolutionId; } /** * Set */ public void setResolutionId(String resolutionId) { this.resolutionId = resolutionId; } /** * Get */ public String getUsername() { return username; } /** * Set */ public void setUsername(String username) { this.username = username; } /** * Get */ public String getPassword() { return password; } /** * Set */ public void setPassword(String password) { this.password = password; } /** * Get */ public String getProtocolId() { return protocolId; } /** * Set */ public void setProtocolId(String protocolId) { this.protocolId = protocolId; } /** * Get */ public String getSn() { return sn; } /** * Set */ public void setSn(String sn) { this.sn = sn; } /** * Get */ public String getBelongId() { return belongId; } /** * Set */ public void setBelongId(String belongId) { this.belongId = belongId; } public String toString() { return ",设备主键 =" + deviceId + ",公司主键 =" + deviceCompanyId + ",设备地点 =" + deviceName + ",设备授权码 ="+ authorizationId; ", =" + deviceId + ", =" + companyId + ", =" + deviceName + ", =" + type + ", =" + address + ", =" + schoolName + ", =" + brandId + ", =" + ip + ", =" + port + ", =" + resolutionId + ", =" + username + ", =" + password + ", =" + protocolId + ", =" + sn + ", =" + belongId ; } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -74,7 +74,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().getDeviceCompanyId()); params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getDevice().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
@@ -52,7 +52,7 @@ return; } RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY); String deviceCompanyId = BaseApplication.getInstance().getDevice().getDeviceCompanyId(); String deviceCompanyId = BaseApplication.getInstance().getDevice().getCompanyId(); if (isVisitorList) { params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId); } else { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -61,7 +61,8 @@ // return; // } RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY); params.addBodyParameter(Device.FieldNames.authorizationId, authorationId); 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); @@ -90,6 +91,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); }
@@ -74,7 +74,7 @@ } 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().getDeviceCompanyId()); params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getCompanyId()); params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId()); params.addBodyParameter("InOrOutCamera", cameraInOrOut+""); x.http().post(params, new BaseCommonCallBack() { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -3,8 +3,8 @@ public class AppApi { // public final static String IMAGE_URL_BASE = "http://192.168.1.141/AI/img/"; // public final static String BASE_URL = "http://192.168.1.141/AI/"; public final static String IMAGE_URL_BASE = "http://192.168.1.27/face/img/"; public final static String BASE_URL = "http://192.168.1.27/face/"; public final static String IMAGE_URL_BASE = "http://192.168.1.17/face/img/"; public final static String BASE_URL = "http://192.168.1.17/face/"; public static final String REGISTER_ADD = "Register/o_add.do";
@@ -72,7 +72,7 @@ RefByteArray faceListPb = new RefByteArray(); try { COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getDeviceCompanyId()); COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getCompanyId()); } catch (Exception e) { COMPANY_ID = 0; }
