diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index 6a895ce..32c1356 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -27,6 +27,7 @@ import com.casic.br.ktd.model.DeviceListModel import com.casic.br.ktd.model.TaskListModel import com.casic.br.ktd.model.VehicleListModel +import com.casic.br.ktd.utils.DateType import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.TaskViewModel @@ -102,15 +103,17 @@ taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] val time = System.currentTimeMillis() - taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + taskViewModel.getTaskCount( + time.timestampToLastMonthDate()!!, time.timestampToDate(), DateType.MONTH + ) taskViewModel.taskCountModel.observe(this) { if (it.code == 200) { binding.monthTaskCountView.text = it.data.taskCount.toString() binding.monthTaskDistanceView.text = it.data.km.toString() } } - taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), "") - taskViewModel.taskCountModel.observe(this) { + taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), DateType.DAY) + taskViewModel.dayTaskModel.observe(this) { if (it.code == 200) { binding.dayTaskCountView.text = it.data.taskCount.toString() binding.dayTaskDistanceView.text = it.data.km.toString() diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index 6a895ce..32c1356 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -27,6 +27,7 @@ import com.casic.br.ktd.model.DeviceListModel import com.casic.br.ktd.model.TaskListModel import com.casic.br.ktd.model.VehicleListModel +import com.casic.br.ktd.utils.DateType import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.TaskViewModel @@ -102,15 +103,17 @@ taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] val time = System.currentTimeMillis() - taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + taskViewModel.getTaskCount( + time.timestampToLastMonthDate()!!, time.timestampToDate(), DateType.MONTH + ) taskViewModel.taskCountModel.observe(this) { if (it.code == 200) { binding.monthTaskCountView.text = it.data.taskCount.toString() binding.monthTaskDistanceView.text = it.data.km.toString() } } - taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), "") - taskViewModel.taskCountModel.observe(this) { + taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), DateType.DAY) + taskViewModel.dayTaskModel.observe(this) { if (it.code == 200) { binding.dayTaskCountView.text = it.data.taskCount.toString() binding.dayTaskDistanceView.text = it.data.km.toString() diff --git a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java deleted file mode 100644 index 71ecaa0..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.ktd.model; - -public class TaskCountModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private Integer taskCount; - private Double km; - - public Integer getTaskCount() { - return taskCount; - } - - public void setTaskCount(Integer taskCount) { - this.taskCount = taskCount; - } - - public Double getKm() { - return km; - } - - public void setKm(Double km) { - this.km = km; - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index 6a895ce..32c1356 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -27,6 +27,7 @@ import com.casic.br.ktd.model.DeviceListModel import com.casic.br.ktd.model.TaskListModel import com.casic.br.ktd.model.VehicleListModel +import com.casic.br.ktd.utils.DateType import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.TaskViewModel @@ -102,15 +103,17 @@ taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] val time = System.currentTimeMillis() - taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + taskViewModel.getTaskCount( + time.timestampToLastMonthDate()!!, time.timestampToDate(), DateType.MONTH + ) taskViewModel.taskCountModel.observe(this) { if (it.code == 200) { binding.monthTaskCountView.text = it.data.taskCount.toString() binding.monthTaskDistanceView.text = it.data.km.toString() } } - taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), "") - taskViewModel.taskCountModel.observe(this) { + taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), DateType.DAY) + taskViewModel.dayTaskModel.observe(this) { if (it.code == 200) { binding.dayTaskCountView.text = it.data.taskCount.toString() binding.dayTaskDistanceView.text = it.data.km.toString() diff --git a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java deleted file mode 100644 index 71ecaa0..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.ktd.model; - -public class TaskCountModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private Integer taskCount; - private Double km; - - public Integer getTaskCount() { - return taskCount; - } - - public void setTaskCount(Integer taskCount) { - this.taskCount = taskCount; - } - - public Double getKm() { - return km; - } - - public void setKm(Double km) { - this.km = km; - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java b/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java new file mode 100644 index 0000000..5940483 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java @@ -0,0 +1,53 @@ +package com.casic.br.ktd.model; + +public class TaskStatisticsModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private Integer taskCount; + private Double km; + + public Integer getTaskCount() { + return taskCount; + } + + public void setTaskCount(Integer taskCount) { + this.taskCount = taskCount; + } + + public Double getKm() { + return km; + } + + public void setKm(Double km) { + this.km = km; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index 6a895ce..32c1356 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -27,6 +27,7 @@ import com.casic.br.ktd.model.DeviceListModel import com.casic.br.ktd.model.TaskListModel import com.casic.br.ktd.model.VehicleListModel +import com.casic.br.ktd.utils.DateType import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.TaskViewModel @@ -102,15 +103,17 @@ taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] val time = System.currentTimeMillis() - taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + taskViewModel.getTaskCount( + time.timestampToLastMonthDate()!!, time.timestampToDate(), DateType.MONTH + ) taskViewModel.taskCountModel.observe(this) { if (it.code == 200) { binding.monthTaskCountView.text = it.data.taskCount.toString() binding.monthTaskDistanceView.text = it.data.km.toString() } } - taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), "") - taskViewModel.taskCountModel.observe(this) { + taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), DateType.DAY) + taskViewModel.dayTaskModel.observe(this) { if (it.code == 200) { binding.dayTaskCountView.text = it.data.taskCount.toString() binding.dayTaskDistanceView.text = it.data.km.toString() diff --git a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java deleted file mode 100644 index 71ecaa0..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.ktd.model; - -public class TaskCountModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private Integer taskCount; - private Double km; - - public Integer getTaskCount() { - return taskCount; - } - - public void setTaskCount(Integer taskCount) { - this.taskCount = taskCount; - } - - public Double getKm() { - return km; - } - - public void setKm(Double km) { - this.km = km; - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java b/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java new file mode 100644 index 0000000..5940483 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java @@ -0,0 +1,53 @@ +package com.casic.br.ktd.model; + +public class TaskStatisticsModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private Integer taskCount; + private Double km; + + public Integer getTaskCount() { + return taskCount; + } + + public void setTaskCount(Integer taskCount) { + this.taskCount = taskCount; + } + + public Double getKm() { + return km; + } + + public void setKm(Double km) { + this.km = km; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/utils/DateType.kt b/app/src/main/java/com/casic/br/ktd/utils/DateType.kt new file mode 100644 index 0000000..f94b10c --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/utils/DateType.kt @@ -0,0 +1,18 @@ +package com.casic.br.ktd.utils + +sealed class DateType { + /** + * 天 + */ + object DAY : DateType() + + /** + * 周 + */ + object WEEK : DateType() + + /** + * 月 + */ + object MONTH : DateType() +} diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index 6a895ce..32c1356 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -27,6 +27,7 @@ import com.casic.br.ktd.model.DeviceListModel import com.casic.br.ktd.model.TaskListModel import com.casic.br.ktd.model.VehicleListModel +import com.casic.br.ktd.utils.DateType import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.TaskViewModel @@ -102,15 +103,17 @@ taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] val time = System.currentTimeMillis() - taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + taskViewModel.getTaskCount( + time.timestampToLastMonthDate()!!, time.timestampToDate(), DateType.MONTH + ) taskViewModel.taskCountModel.observe(this) { if (it.code == 200) { binding.monthTaskCountView.text = it.data.taskCount.toString() binding.monthTaskDistanceView.text = it.data.km.toString() } } - taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), "") - taskViewModel.taskCountModel.observe(this) { + taskViewModel.getTaskCount(time.timestampToDate(), time.timestampToDate(), DateType.DAY) + taskViewModel.dayTaskModel.observe(this) { if (it.code == 200) { binding.dayTaskCountView.text = it.data.taskCount.toString() binding.dayTaskDistanceView.text = it.data.km.toString() diff --git a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java deleted file mode 100644 index 71ecaa0..0000000 --- a/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.br.ktd.model; - -public class TaskCountModel { - - private Integer code; - private DataModel data; - private String message; - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private Integer taskCount; - private Double km; - - public Integer getTaskCount() { - return taskCount; - } - - public void setTaskCount(Integer taskCount) { - this.taskCount = taskCount; - } - - public Double getKm() { - return km; - } - - public void setKm(Double km) { - this.km = km; - } - } -} diff --git a/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java b/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java new file mode 100644 index 0000000..5940483 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskStatisticsModel.java @@ -0,0 +1,53 @@ +package com.casic.br.ktd.model; + +public class TaskStatisticsModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private Integer taskCount; + private Double km; + + public Integer getTaskCount() { + return taskCount; + } + + public void setTaskCount(Integer taskCount) { + this.taskCount = taskCount; + } + + public Double getKm() { + return km; + } + + public void setKm(Double km) { + this.km = km; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/utils/DateType.kt b/app/src/main/java/com/casic/br/ktd/utils/DateType.kt new file mode 100644 index 0000000..f94b10c --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/utils/DateType.kt @@ -0,0 +1,18 @@ +package com.casic.br.ktd.utils + +sealed class DateType { + /** + * 天 + */ + object DAY : DateType() + + /** + * 周 + */ + object WEEK : DateType() + + /** + * 月 + */ + object MONTH : DateType() +} diff --git a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt index 31a146f..98e687b 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/TaskViewModel.kt @@ -5,10 +5,11 @@ import com.casic.br.ktd.extensions.separateResponseCode import com.casic.br.ktd.extensions.toErrorMessage import com.casic.br.ktd.model.ActionResultModel -import com.casic.br.ktd.model.TaskCountModel import com.casic.br.ktd.model.TaskDetailModel import com.casic.br.ktd.model.TaskListModel +import com.casic.br.ktd.model.TaskStatisticsModel import com.casic.br.ktd.retrofit.RetrofitServiceManager +import com.casic.br.ktd.utils.DateType import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.launch @@ -25,7 +26,8 @@ val taskList = MutableLiveData() val addTaskResult = MutableLiveData() val detailResult = MutableLiveData() - val taskCountModel = MutableLiveData() + val taskCountModel = MutableLiveData() + val dayTaskModel = MutableLiveData() fun getTasksByPage( beginDate: String, endDate: String, taskName: String, taskCode: String, offset: Int @@ -96,13 +98,19 @@ loadState.value = LoadState.Fail }) - fun getTaskCount(beginDate: String, endDate: String, timeType: String) = launch({ - val response = RetrofitServiceManager.getTaskCount(beginDate, endDate, timeType) + fun getTaskCount(beginDate: String, endDate: String, type: DateType) = launch({ + val response = RetrofitServiceManager.getTaskCount(beginDate, endDate, "") val responseCode = response.separateResponseCode() if (responseCode == 200) { - taskCountModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) + if (type == DateType.DAY) { + dayTaskModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + taskCountModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } } }, { it.printStackTrace()