diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt new file mode 100644 index 0000000..7232e3d --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt @@ -0,0 +1,11 @@ +package com.casic.br.operationsite.model + +data class WorkerHealthModel( + val bloodOxygen: String, + val deviceCode: String, + val deviceId: String, + val groupCode: String, + val heartRate: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt new file mode 100644 index 0000000..7232e3d --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt @@ -0,0 +1,11 @@ +package com.casic.br.operationsite.model + +data class WorkerHealthModel( + val bloodOxygen: String, + val deviceCode: String, + val deviceId: String, + val groupCode: String, + val heartRate: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java deleted file mode 100644 index 767c20b..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.casic.br.operationsite.model; - -import java.util.List; - -public class WorkerModel { - - private int code; - private List data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private boolean alarmFlag; - private String bloodOxygen; - private String braceletCode; - private String cell; - private String co; - private String gas; - private String gasTime; - private String h2s; - private String hatCode; - private String hatId; - private String heartRate; - private String lat; - private String lng; - private String location; - private String o2; - private String signal; - private String time; - private String vastCode; - private String workerId; - private String workerName; - - public boolean isAlarmFlag() { - return alarmFlag; - } - - public void setAlarmFlag(boolean alarmFlag) { - this.alarmFlag = alarmFlag; - } - - public String getBloodOxygen() { - return bloodOxygen; - } - - public void setBloodOxygen(String bloodOxygen) { - this.bloodOxygen = bloodOxygen; - } - - public String getBraceletCode() { - return braceletCode; - } - - public void setBraceletCode(String braceletCode) { - this.braceletCode = braceletCode; - } - - public String getCell() { - return cell; - } - - public void setCell(String cell) { - this.cell = cell; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } - - public String getH2s() { - return h2s; - } - - public void setH2s(String h2s) { - this.h2s = h2s; - } - - public String getHatCode() { - return hatCode; - } - - public void setHatCode(String hatCode) { - this.hatCode = hatCode; - } - - public String getHatId() { - return hatId; - } - - public void setHatId(String hatId) { - this.hatId = hatId; - } - - public String getHeartRate() { - return heartRate; - } - - public void setHeartRate(String heartRate) { - this.heartRate = heartRate; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSignal() { - return signal; - } - - public void setSignal(String signal) { - this.signal = signal; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getVastCode() { - return vastCode; - } - - public void setVastCode(String vastCode) { - this.vastCode = vastCode; - } - - public String getWorkerId() { - return workerId; - } - - public void setWorkerId(String workerId) { - this.workerId = workerId; - } - - public String getWorkerName() { - return workerName; - } - - public void setWorkerName(String workerName) { - this.workerName = workerName; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt new file mode 100644 index 0000000..7232e3d --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt @@ -0,0 +1,11 @@ +package com.casic.br.operationsite.model + +data class WorkerHealthModel( + val bloodOxygen: String, + val deviceCode: String, + val deviceId: String, + val groupCode: String, + val heartRate: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java deleted file mode 100644 index 767c20b..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.casic.br.operationsite.model; - -import java.util.List; - -public class WorkerModel { - - private int code; - private List data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private boolean alarmFlag; - private String bloodOxygen; - private String braceletCode; - private String cell; - private String co; - private String gas; - private String gasTime; - private String h2s; - private String hatCode; - private String hatId; - private String heartRate; - private String lat; - private String lng; - private String location; - private String o2; - private String signal; - private String time; - private String vastCode; - private String workerId; - private String workerName; - - public boolean isAlarmFlag() { - return alarmFlag; - } - - public void setAlarmFlag(boolean alarmFlag) { - this.alarmFlag = alarmFlag; - } - - public String getBloodOxygen() { - return bloodOxygen; - } - - public void setBloodOxygen(String bloodOxygen) { - this.bloodOxygen = bloodOxygen; - } - - public String getBraceletCode() { - return braceletCode; - } - - public void setBraceletCode(String braceletCode) { - this.braceletCode = braceletCode; - } - - public String getCell() { - return cell; - } - - public void setCell(String cell) { - this.cell = cell; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } - - public String getH2s() { - return h2s; - } - - public void setH2s(String h2s) { - this.h2s = h2s; - } - - public String getHatCode() { - return hatCode; - } - - public void setHatCode(String hatCode) { - this.hatCode = hatCode; - } - - public String getHatId() { - return hatId; - } - - public void setHatId(String hatId) { - this.hatId = hatId; - } - - public String getHeartRate() { - return heartRate; - } - - public void setHeartRate(String heartRate) { - this.heartRate = heartRate; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSignal() { - return signal; - } - - public void setSignal(String signal) { - this.signal = signal; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getVastCode() { - return vastCode; - } - - public void setVastCode(String vastCode) { - this.vastCode = vastCode; - } - - public String getWorkerId() { - return workerId; - } - - public void setWorkerId(String workerId) { - this.workerId = workerId; - } - - public String getWorkerName() { - return workerName; - } - - public void setWorkerName(String workerName) { - this.workerName = workerName; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt new file mode 100644 index 0000000..5381988 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt @@ -0,0 +1,13 @@ +package com.casic.br.operationsite.model + +data class WorkerPositionModel( + val deviceCode: String, + val deviceId: String, + val gdLat: String, + val gdLng: String, + val groupCode: String, + val lat: String, + val lng: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt new file mode 100644 index 0000000..7232e3d --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt @@ -0,0 +1,11 @@ +package com.casic.br.operationsite.model + +data class WorkerHealthModel( + val bloodOxygen: String, + val deviceCode: String, + val deviceId: String, + val groupCode: String, + val heartRate: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java deleted file mode 100644 index 767c20b..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.casic.br.operationsite.model; - -import java.util.List; - -public class WorkerModel { - - private int code; - private List data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private boolean alarmFlag; - private String bloodOxygen; - private String braceletCode; - private String cell; - private String co; - private String gas; - private String gasTime; - private String h2s; - private String hatCode; - private String hatId; - private String heartRate; - private String lat; - private String lng; - private String location; - private String o2; - private String signal; - private String time; - private String vastCode; - private String workerId; - private String workerName; - - public boolean isAlarmFlag() { - return alarmFlag; - } - - public void setAlarmFlag(boolean alarmFlag) { - this.alarmFlag = alarmFlag; - } - - public String getBloodOxygen() { - return bloodOxygen; - } - - public void setBloodOxygen(String bloodOxygen) { - this.bloodOxygen = bloodOxygen; - } - - public String getBraceletCode() { - return braceletCode; - } - - public void setBraceletCode(String braceletCode) { - this.braceletCode = braceletCode; - } - - public String getCell() { - return cell; - } - - public void setCell(String cell) { - this.cell = cell; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } - - public String getH2s() { - return h2s; - } - - public void setH2s(String h2s) { - this.h2s = h2s; - } - - public String getHatCode() { - return hatCode; - } - - public void setHatCode(String hatCode) { - this.hatCode = hatCode; - } - - public String getHatId() { - return hatId; - } - - public void setHatId(String hatId) { - this.hatId = hatId; - } - - public String getHeartRate() { - return heartRate; - } - - public void setHeartRate(String heartRate) { - this.heartRate = heartRate; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSignal() { - return signal; - } - - public void setSignal(String signal) { - this.signal = signal; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getVastCode() { - return vastCode; - } - - public void setVastCode(String vastCode) { - this.vastCode = vastCode; - } - - public String getWorkerId() { - return workerId; - } - - public void setWorkerId(String workerId) { - this.workerId = workerId; - } - - public String getWorkerName() { - return workerName; - } - - public void setWorkerName(String workerName) { - this.workerName = workerName; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt new file mode 100644 index 0000000..5381988 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt @@ -0,0 +1,13 @@ +package com.casic.br.operationsite.model + +data class WorkerPositionModel( + val deviceCode: String, + val deviceId: String, + val gdLat: String, + val gdLng: String, + val groupCode: String, + val lat: String, + val lng: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index fa15bc2..523adce 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -80,8 +80,8 @@ /** * 获取工作区域作业人员 */ - @GET("/overview/workerList") - suspend fun getWorkers( + @GET("/v3/overview/workerList") + suspend fun getWorkSiteWorkers( @Header("token") token: String, @Query("projectId") projectId: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt new file mode 100644 index 0000000..7232e3d --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt @@ -0,0 +1,11 @@ +package com.casic.br.operationsite.model + +data class WorkerHealthModel( + val bloodOxygen: String, + val deviceCode: String, + val deviceId: String, + val groupCode: String, + val heartRate: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java deleted file mode 100644 index 767c20b..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.casic.br.operationsite.model; - -import java.util.List; - -public class WorkerModel { - - private int code; - private List data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private boolean alarmFlag; - private String bloodOxygen; - private String braceletCode; - private String cell; - private String co; - private String gas; - private String gasTime; - private String h2s; - private String hatCode; - private String hatId; - private String heartRate; - private String lat; - private String lng; - private String location; - private String o2; - private String signal; - private String time; - private String vastCode; - private String workerId; - private String workerName; - - public boolean isAlarmFlag() { - return alarmFlag; - } - - public void setAlarmFlag(boolean alarmFlag) { - this.alarmFlag = alarmFlag; - } - - public String getBloodOxygen() { - return bloodOxygen; - } - - public void setBloodOxygen(String bloodOxygen) { - this.bloodOxygen = bloodOxygen; - } - - public String getBraceletCode() { - return braceletCode; - } - - public void setBraceletCode(String braceletCode) { - this.braceletCode = braceletCode; - } - - public String getCell() { - return cell; - } - - public void setCell(String cell) { - this.cell = cell; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } - - public String getH2s() { - return h2s; - } - - public void setH2s(String h2s) { - this.h2s = h2s; - } - - public String getHatCode() { - return hatCode; - } - - public void setHatCode(String hatCode) { - this.hatCode = hatCode; - } - - public String getHatId() { - return hatId; - } - - public void setHatId(String hatId) { - this.hatId = hatId; - } - - public String getHeartRate() { - return heartRate; - } - - public void setHeartRate(String heartRate) { - this.heartRate = heartRate; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSignal() { - return signal; - } - - public void setSignal(String signal) { - this.signal = signal; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getVastCode() { - return vastCode; - } - - public void setVastCode(String vastCode) { - this.vastCode = vastCode; - } - - public String getWorkerId() { - return workerId; - } - - public void setWorkerId(String workerId) { - this.workerId = workerId; - } - - public String getWorkerName() { - return workerName; - } - - public void setWorkerName(String workerName) { - this.workerName = workerName; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt new file mode 100644 index 0000000..5381988 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt @@ -0,0 +1,13 @@ +package com.casic.br.operationsite.model + +data class WorkerPositionModel( + val deviceCode: String, + val deviceId: String, + val gdLat: String, + val gdLng: String, + val groupCode: String, + val lat: String, + val lng: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index fa15bc2..523adce 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -80,8 +80,8 @@ /** * 获取工作区域作业人员 */ - @GET("/overview/workerList") - suspend fun getWorkers( + @GET("/v3/overview/workerList") + suspend fun getWorkSiteWorkers( @Header("token") token: String, @Query("projectId") projectId: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index f025e48..c15f888 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -80,8 +80,8 @@ /** * 获取工作区域作业人员 */ - suspend fun getWorkers(projectId: String): String { - return api.getWorkers(AuthenticationHelper.token!!, projectId) + suspend fun getWorkSiteWorkers(projectId: String): String { + return api.getWorkSiteWorkers(AuthenticationHelper.token!!, projectId) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt new file mode 100644 index 0000000..7232e3d --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt @@ -0,0 +1,11 @@ +package com.casic.br.operationsite.model + +data class WorkerHealthModel( + val bloodOxygen: String, + val deviceCode: String, + val deviceId: String, + val groupCode: String, + val heartRate: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java deleted file mode 100644 index 767c20b..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.casic.br.operationsite.model; - -import java.util.List; - -public class WorkerModel { - - private int code; - private List data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private boolean alarmFlag; - private String bloodOxygen; - private String braceletCode; - private String cell; - private String co; - private String gas; - private String gasTime; - private String h2s; - private String hatCode; - private String hatId; - private String heartRate; - private String lat; - private String lng; - private String location; - private String o2; - private String signal; - private String time; - private String vastCode; - private String workerId; - private String workerName; - - public boolean isAlarmFlag() { - return alarmFlag; - } - - public void setAlarmFlag(boolean alarmFlag) { - this.alarmFlag = alarmFlag; - } - - public String getBloodOxygen() { - return bloodOxygen; - } - - public void setBloodOxygen(String bloodOxygen) { - this.bloodOxygen = bloodOxygen; - } - - public String getBraceletCode() { - return braceletCode; - } - - public void setBraceletCode(String braceletCode) { - this.braceletCode = braceletCode; - } - - public String getCell() { - return cell; - } - - public void setCell(String cell) { - this.cell = cell; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } - - public String getH2s() { - return h2s; - } - - public void setH2s(String h2s) { - this.h2s = h2s; - } - - public String getHatCode() { - return hatCode; - } - - public void setHatCode(String hatCode) { - this.hatCode = hatCode; - } - - public String getHatId() { - return hatId; - } - - public void setHatId(String hatId) { - this.hatId = hatId; - } - - public String getHeartRate() { - return heartRate; - } - - public void setHeartRate(String heartRate) { - this.heartRate = heartRate; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSignal() { - return signal; - } - - public void setSignal(String signal) { - this.signal = signal; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getVastCode() { - return vastCode; - } - - public void setVastCode(String vastCode) { - this.vastCode = vastCode; - } - - public String getWorkerId() { - return workerId; - } - - public void setWorkerId(String workerId) { - this.workerId = workerId; - } - - public String getWorkerName() { - return workerName; - } - - public void setWorkerName(String workerName) { - this.workerName = workerName; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt new file mode 100644 index 0000000..5381988 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt @@ -0,0 +1,13 @@ +package com.casic.br.operationsite.model + +data class WorkerPositionModel( + val deviceCode: String, + val deviceId: String, + val gdLat: String, + val gdLng: String, + val groupCode: String, + val lat: String, + val lng: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index fa15bc2..523adce 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -80,8 +80,8 @@ /** * 获取工作区域作业人员 */ - @GET("/overview/workerList") - suspend fun getWorkers( + @GET("/v3/overview/workerList") + suspend fun getWorkSiteWorkers( @Header("token") token: String, @Query("projectId") projectId: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index f025e48..c15f888 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -80,8 +80,8 @@ /** * 获取工作区域作业人员 */ - suspend fun getWorkers(projectId: String): String { - return api.getWorkers(AuthenticationHelper.token!!, projectId) + suspend fun getWorkSiteWorkers(projectId: String): String { + return api.getWorkSiteWorkers(AuthenticationHelper.token!!, projectId) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 312df92..f843778 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.annotation.SuppressLint import android.graphics.Color import android.os.Bundle import android.util.Log @@ -18,8 +19,12 @@ import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.ActivitySiteTabBinding import com.casic.br.operationsite.extensions.initImmersionBar +import com.casic.br.operationsite.model.LatestGasDataModel +import com.casic.br.operationsite.model.MultiGasDataModel import com.casic.br.operationsite.model.WorkSiteDeviceModel -import com.casic.br.operationsite.model.WorkerModel +import com.casic.br.operationsite.model.WorkSiteWorkerModel +import com.casic.br.operationsite.model.WorkerHealthModel +import com.casic.br.operationsite.model.WorkerPositionModel import com.casic.br.operationsite.utils.AuthenticationHelper import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.LoginViewModel @@ -36,6 +41,7 @@ import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +@SuppressLint("SetTextI18n") class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnMapClickListener, AMap.OnInfoWindowClickListener { @@ -43,7 +49,7 @@ private val kTag = "WorkSiteTabActivity" private val context = this private val devices = ArrayList() - private val workers = ArrayList() + private val workers = ArrayList() private val gson = Gson() private lateinit var aMap: AMap private lateinit var workSiteViewModel: WorkSiteViewModel @@ -200,14 +206,25 @@ } } - workSiteViewModel.getWorkers(this, RuntimeCache.projectId) - workSiteViewModel.workerLiveData.observe(this) { + workSiteViewModel.getWorkSiteWorkers(this, RuntimeCache.projectId) + workSiteViewModel.workSiteWorkerLiveData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() it.data.forEach { worker -> - if (worker.lat.isNotBlank() && worker.lng.isNotBlank()) { - val latitude = worker.lat.toDouble() - val longitude = worker.lng.toDouble() + val locationObject = worker.location + if (locationObject == "") { + Log.e(kTag, "initOnCreate: worker's location is empty") + return@observe + } + + val typeToken = object : TypeToken() {}.type + val position = gson.fromJson( + locationObject.toString(), typeToken + ) + + if (position.gdLat.isNotBlank() && position.gdLng.isNotBlank()) { + val latitude = position.gdLat.toDouble() + val longitude = position.gdLng.toDouble() workers.add(worker) val bitmap = BitmapDescriptorFactory.fromBitmap( @@ -215,7 +232,8 @@ ) val options = MarkerOptions() .position(LatLng(latitude, longitude)) - .title(worker.workerId) + .title(worker.id) + .snippet(position.deviceCode) //安全帽设备编号 .icon(bitmap) allMarkerOptions.add(options) } @@ -342,13 +360,6 @@ timeView.text = "数据更新时间：${gas.ts.toLong().timestampToCompleteDate()}" } - data class LatestGasDataModel( - val deviceCode: String, - val gasUnit: String, - val gasValue: String, - val ts: String - ) - private fun renderWorkerWindow(marker: Marker, view: View) { val workerNameView = view.findViewById(R.id.workerNameView) val heartRateView = view.findViewById(R.id.heartRateView) @@ -360,19 +371,39 @@ val timeView = view.findViewById(R.id.timeView) val workerId = marker.options.title - workers.forEach { - if (it.workerId == workerId) { - userHelmetCode = it.hatCode - workerNameView.text = "名称：${it.workerName}" - heartRateView.text = "心率：${it.heartRate}bpm" - bloodOxygenView.text = "血氧：${it.bloodOxygen}%" - coValueView.text = "一氧化碳：${it.co}ppm" - gasValueView.text = "甲烷：${it.gas}ppm" - h2sValueView.text = "硫化氢：${it.co}ppm" - o2ValueView.text = "氧气：${it.o2}%VOL" - timeView.text = "时间：${it.time}" - } + val worker = workers.find { it.id == workerId } + if (worker == null) { + return } + + val healthObject = worker.health + if (healthObject == "") { + Log.e(kTag, "renderWorkerWindow: worker's health data is empty") + return + } + val health = gson.fromJson( + healthObject.toString(), object : TypeToken() {}.type + ) + + userHelmetCode = marker.options.snippet + + workerNameView.text = "名称：${worker.workerName}" + heartRateView.text = "心率：${health.heartRate}bpm" + bloodOxygenView.text = "血氧：${health.bloodOxygen}%" + + val multiGasObject = worker.multiGas + if (multiGasObject == "") { + Log.e(kTag, "renderWorkerWindow: multiGas data is empty") + return + } + val multiGas = gson.fromJson( + healthObject.toString(), object : TypeToken() {}.type + ) + coValueView.text = "一氧化碳：${multiGas.coValue}ppm" + gasValueView.text = "甲烷：${multiGas.exValue}%LEL" + h2sValueView.text = "硫化氢：${multiGas.h2sValue}ppm" + o2ValueView.text = "氧气：${multiGas.o2Value}%VOL" + timeView.text = "时间：${multiGas.uploadTimestamp.toLong().timestampToCompleteDate()}" } override fun onInfoWindowClick(marker: Marker?) { @@ -426,13 +457,13 @@ navigatePageTo() } -// binding.reloadDataView.setOnClickListener { -// aMap.clear() -// -// workSiteViewModel.getWorkers(this, RuntimeCache.projectId) -// -// workSiteViewModel.getWorkSiteArea(this, RuntimeCache.projectId) -// } + binding.reloadDataView.setOnClickListener { + aMap.clear() + + workSiteViewModel.getWorkSiteWorkers(this, RuntimeCache.projectId) + + workSiteViewModel.getWorkSiteDevices(this, RuntimeCache.projectId) + } } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt new file mode 100644 index 0000000..5192f68 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/LatestGasDataModel.kt @@ -0,0 +1,8 @@ +package com.casic.br.operationsite.model + +data class LatestGasDataModel( + val deviceCode: String, + val gasUnit: String, + val gasValue: String, + val ts: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt new file mode 100644 index 0000000..b61f78b --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/MultiGasDataModel.kt @@ -0,0 +1,15 @@ +package com.casic.br.operationsite.model + +data class MultiGasDataModel( + val bloodOxygen: String, + val coValue: String, + val deviceCode: String, + val deviceId: String, + val exValue: String, + val groupCode: String, + val h2sValue: String, + val o2Value: String, + val projectId: String, + val projectName: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java new file mode 100644 index 0000000..09a1ba2 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteWorkerModel.java @@ -0,0 +1,244 @@ +package com.casic.br.operationsite.model; + +import java.util.List; + +public class WorkSiteWorkerModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private boolean alarmFlag; + private String createTime; + private String deptId; + private String deptName; + private String enterReason; + private String gender; + private String genderName; + private Object health; + private String id; + private String idCardNumber; + private String isRegister; + private Object location; + private Object multiGas; + private String ownerShip; + private String phoneNumber; + private String registerTime; + private String status; + private String statusName; + private String workerAvatar; + private String workerName; + private String workerType; + private String workerTypeName; + + public boolean isAlarmFlag() { + return alarmFlag; + } + + public void setAlarmFlag(boolean alarmFlag) { + this.alarmFlag = alarmFlag; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getEnterReason() { + return enterReason; + } + + public void setEnterReason(String enterReason) { + this.enterReason = enterReason; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderName() { + return genderName; + } + + public void setGenderName(String genderName) { + this.genderName = genderName; + } + + public Object getHealth() { + return health; + } + + public void setHealth(Object health) { + this.health = health; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getIsRegister() { + return isRegister; + } + + public void setIsRegister(String isRegister) { + this.isRegister = isRegister; + } + + public Object getLocation() { + return location; + } + + public void setLocation(Object location) { + this.location = location; + } + + public Object getMultiGas() { + return multiGas; + } + + public void setMultiGas(Object multiGas) { + this.multiGas = multiGas; + } + + public String getOwnerShip() { + return ownerShip; + } + + public void setOwnerShip(String ownerShip) { + this.ownerShip = ownerShip; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(String registerTime) { + this.registerTime = registerTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getWorkerAvatar() { + return workerAvatar; + } + + public void setWorkerAvatar(String workerAvatar) { + this.workerAvatar = workerAvatar; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerType() { + return workerType; + } + + public void setWorkerType(String workerType) { + this.workerType = workerType; + } + + public String getWorkerTypeName() { + return workerTypeName; + } + + public void setWorkerTypeName(String workerTypeName) { + this.workerTypeName = workerTypeName; + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt new file mode 100644 index 0000000..7232e3d --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerHealthModel.kt @@ -0,0 +1,11 @@ +package com.casic.br.operationsite.model + +data class WorkerHealthModel( + val bloodOxygen: String, + val deviceCode: String, + val deviceId: String, + val groupCode: String, + val heartRate: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java deleted file mode 100644 index 767c20b..0000000 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.casic.br.operationsite.model; - -import java.util.List; - -public class WorkerModel { - - private int code; - private List data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataModel { - private boolean alarmFlag; - private String bloodOxygen; - private String braceletCode; - private String cell; - private String co; - private String gas; - private String gasTime; - private String h2s; - private String hatCode; - private String hatId; - private String heartRate; - private String lat; - private String lng; - private String location; - private String o2; - private String signal; - private String time; - private String vastCode; - private String workerId; - private String workerName; - - public boolean isAlarmFlag() { - return alarmFlag; - } - - public void setAlarmFlag(boolean alarmFlag) { - this.alarmFlag = alarmFlag; - } - - public String getBloodOxygen() { - return bloodOxygen; - } - - public void setBloodOxygen(String bloodOxygen) { - this.bloodOxygen = bloodOxygen; - } - - public String getBraceletCode() { - return braceletCode; - } - - public void setBraceletCode(String braceletCode) { - this.braceletCode = braceletCode; - } - - public String getCell() { - return cell; - } - - public void setCell(String cell) { - this.cell = cell; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public String getGas() { - return gas; - } - - public void setGas(String gas) { - this.gas = gas; - } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } - - public String getH2s() { - return h2s; - } - - public void setH2s(String h2s) { - this.h2s = h2s; - } - - public String getHatCode() { - return hatCode; - } - - public void setHatCode(String hatCode) { - this.hatCode = hatCode; - } - - public String getHatId() { - return hatId; - } - - public void setHatId(String hatId) { - this.hatId = hatId; - } - - public String getHeartRate() { - return heartRate; - } - - public void setHeartRate(String heartRate) { - this.heartRate = heartRate; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSignal() { - return signal; - } - - public void setSignal(String signal) { - this.signal = signal; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getVastCode() { - return vastCode; - } - - public void setVastCode(String vastCode) { - this.vastCode = vastCode; - } - - public String getWorkerId() { - return workerId; - } - - public void setWorkerId(String workerId) { - this.workerId = workerId; - } - - public String getWorkerName() { - return workerName; - } - - public void setWorkerName(String workerName) { - this.workerName = workerName; - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt new file mode 100644 index 0000000..5381988 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerPositionModel.kt @@ -0,0 +1,13 @@ +package com.casic.br.operationsite.model + +data class WorkerPositionModel( + val deviceCode: String, + val deviceId: String, + val gdLat: String, + val gdLng: String, + val groupCode: String, + val lat: String, + val lng: String, + val projectId: String, + val uploadTimestamp: String +) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index fa15bc2..523adce 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -80,8 +80,8 @@ /** * 获取工作区域作业人员 */ - @GET("/overview/workerList") - suspend fun getWorkers( + @GET("/v3/overview/workerList") + suspend fun getWorkSiteWorkers( @Header("token") token: String, @Query("projectId") projectId: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index f025e48..c15f888 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -80,8 +80,8 @@ /** * 获取工作区域作业人员 */ - suspend fun getWorkers(projectId: String): String { - return api.getWorkers(AuthenticationHelper.token!!, projectId) + suspend fun getWorkSiteWorkers(projectId: String): String { + return api.getWorkSiteWorkers(AuthenticationHelper.token!!, projectId) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 312df92..f843778 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.annotation.SuppressLint import android.graphics.Color import android.os.Bundle import android.util.Log @@ -18,8 +19,12 @@ import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.ActivitySiteTabBinding import com.casic.br.operationsite.extensions.initImmersionBar +import com.casic.br.operationsite.model.LatestGasDataModel +import com.casic.br.operationsite.model.MultiGasDataModel import com.casic.br.operationsite.model.WorkSiteDeviceModel -import com.casic.br.operationsite.model.WorkerModel +import com.casic.br.operationsite.model.WorkSiteWorkerModel +import com.casic.br.operationsite.model.WorkerHealthModel +import com.casic.br.operationsite.model.WorkerPositionModel import com.casic.br.operationsite.utils.AuthenticationHelper import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.LoginViewModel @@ -36,6 +41,7 @@ import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +@SuppressLint("SetTextI18n") class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnMapClickListener, AMap.OnInfoWindowClickListener { @@ -43,7 +49,7 @@ private val kTag = "WorkSiteTabActivity" private val context = this private val devices = ArrayList() - private val workers = ArrayList() + private val workers = ArrayList() private val gson = Gson() private lateinit var aMap: AMap private lateinit var workSiteViewModel: WorkSiteViewModel @@ -200,14 +206,25 @@ } } - workSiteViewModel.getWorkers(this, RuntimeCache.projectId) - workSiteViewModel.workerLiveData.observe(this) { + workSiteViewModel.getWorkSiteWorkers(this, RuntimeCache.projectId) + workSiteViewModel.workSiteWorkerLiveData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() it.data.forEach { worker -> - if (worker.lat.isNotBlank() && worker.lng.isNotBlank()) { - val latitude = worker.lat.toDouble() - val longitude = worker.lng.toDouble() + val locationObject = worker.location + if (locationObject == "") { + Log.e(kTag, "initOnCreate: worker's location is empty") + return@observe + } + + val typeToken = object : TypeToken() {}.type + val position = gson.fromJson( + locationObject.toString(), typeToken + ) + + if (position.gdLat.isNotBlank() && position.gdLng.isNotBlank()) { + val latitude = position.gdLat.toDouble() + val longitude = position.gdLng.toDouble() workers.add(worker) val bitmap = BitmapDescriptorFactory.fromBitmap( @@ -215,7 +232,8 @@ ) val options = MarkerOptions() .position(LatLng(latitude, longitude)) - .title(worker.workerId) + .title(worker.id) + .snippet(position.deviceCode) //安全帽设备编号 .icon(bitmap) allMarkerOptions.add(options) } @@ -342,13 +360,6 @@ timeView.text = "数据更新时间：${gas.ts.toLong().timestampToCompleteDate()}" } - data class LatestGasDataModel( - val deviceCode: String, - val gasUnit: String, - val gasValue: String, - val ts: String - ) - private fun renderWorkerWindow(marker: Marker, view: View) { val workerNameView = view.findViewById(R.id.workerNameView) val heartRateView = view.findViewById(R.id.heartRateView) @@ -360,19 +371,39 @@ val timeView = view.findViewById(R.id.timeView) val workerId = marker.options.title - workers.forEach { - if (it.workerId == workerId) { - userHelmetCode = it.hatCode - workerNameView.text = "名称：${it.workerName}" - heartRateView.text = "心率：${it.heartRate}bpm" - bloodOxygenView.text = "血氧：${it.bloodOxygen}%" - coValueView.text = "一氧化碳：${it.co}ppm" - gasValueView.text = "甲烷：${it.gas}ppm" - h2sValueView.text = "硫化氢：${it.co}ppm" - o2ValueView.text = "氧气：${it.o2}%VOL" - timeView.text = "时间：${it.time}" - } + val worker = workers.find { it.id == workerId } + if (worker == null) { + return } + + val healthObject = worker.health + if (healthObject == "") { + Log.e(kTag, "renderWorkerWindow: worker's health data is empty") + return + } + val health = gson.fromJson( + healthObject.toString(), object : TypeToken() {}.type + ) + + userHelmetCode = marker.options.snippet + + workerNameView.text = "名称：${worker.workerName}" + heartRateView.text = "心率：${health.heartRate}bpm" + bloodOxygenView.text = "血氧：${health.bloodOxygen}%" + + val multiGasObject = worker.multiGas + if (multiGasObject == "") { + Log.e(kTag, "renderWorkerWindow: multiGas data is empty") + return + } + val multiGas = gson.fromJson( + healthObject.toString(), object : TypeToken() {}.type + ) + coValueView.text = "一氧化碳：${multiGas.coValue}ppm" + gasValueView.text = "甲烷：${multiGas.exValue}%LEL" + h2sValueView.text = "硫化氢：${multiGas.h2sValue}ppm" + o2ValueView.text = "氧气：${multiGas.o2Value}%VOL" + timeView.text = "时间：${multiGas.uploadTimestamp.toLong().timestampToCompleteDate()}" } override fun onInfoWindowClick(marker: Marker?) { @@ -426,13 +457,13 @@ navigatePageTo() } -// binding.reloadDataView.setOnClickListener { -// aMap.clear() -// -// workSiteViewModel.getWorkers(this, RuntimeCache.projectId) -// -// workSiteViewModel.getWorkSiteArea(this, RuntimeCache.projectId) -// } + binding.reloadDataView.setOnClickListener { + aMap.clear() + + workSiteViewModel.getWorkSiteWorkers(this, RuntimeCache.projectId) + + workSiteViewModel.getWorkSiteDevices(this, RuntimeCache.projectId) + } } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt index d5225fb..2cbf3dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt @@ -7,7 +7,7 @@ import com.casic.br.operationsite.model.WorkSiteDetailModel import com.casic.br.operationsite.model.WorkSiteDeviceModel import com.casic.br.operationsite.model.WorkSiteListModel -import com.casic.br.operationsite.model.WorkerModel +import com.casic.br.operationsite.model.WorkSiteWorkerModel import com.casic.br.operationsite.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -25,7 +25,7 @@ val worksiteLiveData = MutableLiveData() val detailLiveData = MutableLiveData() val workSiteDeviceLiveData = MutableLiveData() - val workerLiveData = MutableLiveData() + val workSiteWorkerLiveData = MutableLiveData() fun getProjectListByPage( context: Context, keywords: String, state: String, page: Int @@ -88,14 +88,14 @@ it.printStackTrace() }) - fun getWorkers(context: Context, projectId: String) = launch({ + fun getWorkSiteWorkers(context: Context, projectId: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getWorkers(projectId) + val response = RetrofitServiceManager.getWorkSiteWorkers(projectId) when (response.getResponseCode()) { 200 -> { loadState.value = LoadState.Success - workerLiveData.value = gson.fromJson( - response, object : TypeToken() {}.type + workSiteWorkerLiveData.value = gson.fromJson( + response, object : TypeToken() {}.type ) }