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 e320cb9..6a895ce 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 @@ -32,6 +32,8 @@ import com.casic.br.ktd.vm.TaskViewModel import com.casic.br.ktd.vm.VehicleViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.extensions.timestampToLastMonthDate import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -99,6 +101,22 @@ } taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + val time = System.currentTimeMillis() + taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + 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) { + if (it.code == 200) { + binding.dayTaskCountView.text = it.data.taskCount.toString() + binding.dayTaskDistanceView.text = it.data.km.toString() + } + } + taskViewModel.getTasksByPage("", "", "", "", 1) taskViewModel.taskList.observe(this) { if (it.code == 200) { 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 e320cb9..6a895ce 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 @@ -32,6 +32,8 @@ import com.casic.br.ktd.vm.TaskViewModel import com.casic.br.ktd.vm.VehicleViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.extensions.timestampToLastMonthDate import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -99,6 +101,22 @@ } taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + val time = System.currentTimeMillis() + taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + 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) { + if (it.code == 200) { + binding.dayTaskCountView.text = it.data.taskCount.toString() + binding.dayTaskDistanceView.text = it.data.km.toString() + } + } + taskViewModel.getTasksByPage("", "", "", "", 1) taskViewModel.taskList.observe(this) { if (it.code == 200) { 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 new file mode 100644 index 0000000..71ecaa0 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java @@ -0,0 +1,53 @@ +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 e320cb9..6a895ce 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 @@ -32,6 +32,8 @@ import com.casic.br.ktd.vm.TaskViewModel import com.casic.br.ktd.vm.VehicleViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.extensions.timestampToLastMonthDate import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -99,6 +101,22 @@ } taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + val time = System.currentTimeMillis() + taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + 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) { + if (it.code == 200) { + binding.dayTaskCountView.text = it.data.taskCount.toString() + binding.dayTaskDistanceView.text = it.data.km.toString() + } + } + taskViewModel.getTasksByPage("", "", "", "", 1) taskViewModel.taskList.observe(this) { if (it.code == 200) { 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 new file mode 100644 index 0000000..71ecaa0 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java @@ -0,0 +1,53 @@ +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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 1312360..42116fa 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -175,4 +175,13 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 根据时间获取巡检任务和公里数 + */ + @POST("/system/busOverView/taskCount") + suspend fun getTaskCount( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file 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 e320cb9..6a895ce 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 @@ -32,6 +32,8 @@ import com.casic.br.ktd.vm.TaskViewModel import com.casic.br.ktd.vm.VehicleViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.extensions.timestampToLastMonthDate import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -99,6 +101,22 @@ } taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + val time = System.currentTimeMillis() + taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + 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) { + if (it.code == 200) { + binding.dayTaskCountView.text = it.data.taskCount.toString() + binding.dayTaskDistanceView.text = it.data.km.toString() + } + } + taskViewModel.getTasksByPage("", "", "", "", 1) taskViewModel.taskList.observe(this) { if (it.code == 200) { 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 new file mode 100644 index 0000000..71ecaa0 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java @@ -0,0 +1,53 @@ +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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 1312360..42116fa 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -175,4 +175,13 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 根据时间获取巡检任务和公里数 + */ + @POST("/system/busOverView/taskCount") + suspend fun getTaskCount( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 74190fb..7f47552 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -315,4 +315,19 @@ AuthenticationHelper.token, requestBody, limitMap, offsetMap ) } + + /** + * 根据时间获取巡检任务和公里数 + */ + suspend fun getTaskCount(beginDate: String, endDate: String, timeType: String): String { + val param = JsonObject() + param.addProperty("beginDate", beginDate) + param.addProperty("endDate", endDate) + param.addProperty("timeType", timeType) + + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getTaskCount(AuthenticationHelper.token, requestBody) + } } \ No newline at end of file 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 e320cb9..6a895ce 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 @@ -32,6 +32,8 @@ import com.casic.br.ktd.vm.TaskViewModel import com.casic.br.ktd.vm.VehicleViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.extensions.timestampToLastMonthDate import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -99,6 +101,22 @@ } taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + val time = System.currentTimeMillis() + taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + 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) { + if (it.code == 200) { + binding.dayTaskCountView.text = it.data.taskCount.toString() + binding.dayTaskDistanceView.text = it.data.km.toString() + } + } + taskViewModel.getTasksByPage("", "", "", "", 1) taskViewModel.taskList.observe(this) { if (it.code == 200) { 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 new file mode 100644 index 0000000..71ecaa0 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java @@ -0,0 +1,53 @@ +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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 1312360..42116fa 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -175,4 +175,13 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 根据时间获取巡检任务和公里数 + */ + @POST("/system/busOverView/taskCount") + suspend fun getTaskCount( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 74190fb..7f47552 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -315,4 +315,19 @@ AuthenticationHelper.token, requestBody, limitMap, offsetMap ) } + + /** + * 根据时间获取巡检任务和公里数 + */ + suspend fun getTaskCount(beginDate: String, endDate: String, timeType: String): String { + val param = JsonObject() + param.addProperty("beginDate", beginDate) + param.addProperty("endDate", endDate) + param.addProperty("timeType", timeType) + + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getTaskCount(AuthenticationHelper.token, requestBody) + } } \ No newline at end of file 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 38d68c2..31a146f 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,6 +5,7 @@ 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.retrofit.RetrofitServiceManager @@ -24,6 +25,7 @@ val taskList = MutableLiveData() val addTaskResult = MutableLiveData() val detailResult = MutableLiveData() + val taskCountModel = MutableLiveData() fun getTasksByPage( beginDate: String, endDate: String, taskName: String, taskCode: String, offset: Int @@ -93,4 +95,16 @@ it.printStackTrace() loadState.value = LoadState.Fail }) + + fun getTaskCount(beginDate: String, endDate: String, timeType: String) = launch({ + val response = RetrofitServiceManager.getTaskCount(beginDate, endDate, timeType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + taskCountModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + }, { + it.printStackTrace() + }) } \ No newline at end of file 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 e320cb9..6a895ce 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 @@ -32,6 +32,8 @@ import com.casic.br.ktd.vm.TaskViewModel import com.casic.br.ktd.vm.VehicleViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.extensions.timestampToLastMonthDate import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -99,6 +101,22 @@ } taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] + val time = System.currentTimeMillis() + taskViewModel.getTaskCount(time.timestampToLastMonthDate()!!, time.timestampToDate(), "") + 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) { + if (it.code == 200) { + binding.dayTaskCountView.text = it.data.taskCount.toString() + binding.dayTaskDistanceView.text = it.data.km.toString() + } + } + taskViewModel.getTasksByPage("", "", "", "", 1) taskViewModel.taskList.observe(this) { if (it.code == 200) { 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 new file mode 100644 index 0000000..71ecaa0 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/TaskCountModel.java @@ -0,0 +1,53 @@ +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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 1312360..42116fa 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -175,4 +175,13 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 根据时间获取巡检任务和公里数 + */ + @POST("/system/busOverView/taskCount") + suspend fun getTaskCount( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 74190fb..7f47552 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -315,4 +315,19 @@ AuthenticationHelper.token, requestBody, limitMap, offsetMap ) } + + /** + * 根据时间获取巡检任务和公里数 + */ + suspend fun getTaskCount(beginDate: String, endDate: String, timeType: String): String { + val param = JsonObject() + param.addProperty("beginDate", beginDate) + param.addProperty("endDate", endDate) + param.addProperty("timeType", timeType) + + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getTaskCount(AuthenticationHelper.token, requestBody) + } } \ No newline at end of file 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 38d68c2..31a146f 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,6 +5,7 @@ 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.retrofit.RetrofitServiceManager @@ -24,6 +25,7 @@ val taskList = MutableLiveData() val addTaskResult = MutableLiveData() val detailResult = MutableLiveData() + val taskCountModel = MutableLiveData() fun getTasksByPage( beginDate: String, endDate: String, taskName: String, taskCode: String, offset: Int @@ -93,4 +95,16 @@ it.printStackTrace() loadState.value = LoadState.Fail }) + + fun getTaskCount(beginDate: String, endDate: String, timeType: String) = launch({ + val response = RetrofitServiceManager.getTaskCount(beginDate, endDate, timeType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + taskCountModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + }, { + it.printStackTrace() + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 8800166..b1b65d6 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -70,13 +70,14 @@ android:textSize="@dimen/sp_18" /> @@ -116,12 +117,13 @@ android:orientation="horizontal"> @@ -170,13 +172,14 @@ android:textSize="@dimen/sp_18" /> @@ -216,12 +219,13 @@ android:orientation="horizontal">