diff --git a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java index 62927e1..1993111 100644 --- a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java +++ b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java @@ -69,8 +69,8 @@ private String id; private String images; private String inspectionId; - private Integer lat; - private Integer lng; + private Double lat; + private Double lng; private String name; private String type; private String user; @@ -131,19 +131,19 @@ this.inspectionId = inspectionId; } - public Integer getLat() { + public Double getLat() { return lat; } - public void setLat(Integer lat) { + public void setLat(Double lat) { this.lat = lat; } - public Integer getLng() { + public Double getLng() { return lng; } - public void setLng(Integer lng) { + public void setLng(Double lng) { this.lng = lng; } diff --git a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java index 62927e1..1993111 100644 --- a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java +++ b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java @@ -69,8 +69,8 @@ private String id; private String images; private String inspectionId; - private Integer lat; - private Integer lng; + private Double lat; + private Double lng; private String name; private String type; private String user; @@ -131,19 +131,19 @@ this.inspectionId = inspectionId; } - public Integer getLat() { + public Double getLat() { return lat; } - public void setLat(Integer lat) { + public void setLat(Double lat) { this.lat = lat; } - public Integer getLng() { + public Double getLng() { return lng; } - public void setLng(Integer lng) { + public void setLng(Double lng) { this.lng = lng; } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt index f6ef74e..f961ead 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt @@ -163,9 +163,9 @@ /** * 根据巡检ID获取巡检路径点 */ - @GET("/") + @GET("/route/searchById") suspend fun getRouteByInspectId( @Header("token") token: String, - @Query("id") id: String + @Query("inspectionId") id: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java index 62927e1..1993111 100644 --- a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java +++ b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java @@ -69,8 +69,8 @@ private String id; private String images; private String inspectionId; - private Integer lat; - private Integer lng; + private Double lat; + private Double lng; private String name; private String type; private String user; @@ -131,19 +131,19 @@ this.inspectionId = inspectionId; } - public Integer getLat() { + public Double getLat() { return lat; } - public void setLat(Integer lat) { + public void setLat(Double lat) { this.lat = lat; } - public Integer getLng() { + public Double getLng() { return lng; } - public void setLng(Integer lng) { + public void setLng(Double lng) { this.lng = lng; } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt index f6ef74e..f961ead 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt @@ -163,9 +163,9 @@ /** * 根据巡检ID获取巡检路径点 */ - @GET("/") + @GET("/route/searchById") suspend fun getRouteByInspectId( @Header("token") token: String, - @Query("id") id: String + @Query("inspectionId") id: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt index f1f2577..4387e1c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt @@ -170,7 +170,7 @@ /** * 根据巡检ID获取巡检路径点 */ - suspend fun getRouteByInspectId(id: String): String { - return api.getRouteByInspectId(AuthenticationHelper.token!!, id) + suspend fun getRouteByInspectId(inspectionId: String): String { + return api.getRouteByInspectId(AuthenticationHelper.token!!, inspectionId) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java index 62927e1..1993111 100644 --- a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java +++ b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java @@ -69,8 +69,8 @@ private String id; private String images; private String inspectionId; - private Integer lat; - private Integer lng; + private Double lat; + private Double lng; private String name; private String type; private String user; @@ -131,19 +131,19 @@ this.inspectionId = inspectionId; } - public Integer getLat() { + public Double getLat() { return lat; } - public void setLat(Integer lat) { + public void setLat(Double lat) { this.lat = lat; } - public Integer getLng() { + public Double getLng() { return lng; } - public void setLng(Integer lng) { + public void setLng(Double lng) { this.lng = lng; } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt index f6ef74e..f961ead 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt @@ -163,9 +163,9 @@ /** * 根据巡检ID获取巡检路径点 */ - @GET("/") + @GET("/route/searchById") suspend fun getRouteByInspectId( @Header("token") token: String, - @Query("id") id: String + @Query("inspectionId") id: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt index f1f2577..4387e1c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt @@ -170,7 +170,7 @@ /** * 根据巡检ID获取巡检路径点 */ - suspend fun getRouteByInspectId(id: String): String { - return api.getRouteByInspectId(AuthenticationHelper.token!!, id) + suspend fun getRouteByInspectId(inspectionId: String): String { + return api.getRouteByInspectId(AuthenticationHelper.token!!, inspectionId) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 2c43c86..a02545c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -132,7 +132,12 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, value) + val config = if (value.startsWith("http://")) { + value + } else { + "http://${value}" + } + SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, config) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java index 62927e1..1993111 100644 --- a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java +++ b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java @@ -69,8 +69,8 @@ private String id; private String images; private String inspectionId; - private Integer lat; - private Integer lng; + private Double lat; + private Double lng; private String name; private String type; private String user; @@ -131,19 +131,19 @@ this.inspectionId = inspectionId; } - public Integer getLat() { + public Double getLat() { return lat; } - public void setLat(Integer lat) { + public void setLat(Double lat) { this.lat = lat; } - public Integer getLng() { + public Double getLng() { return lng; } - public void setLng(Integer lng) { + public void setLng(Double lng) { this.lng = lng; } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt index f6ef74e..f961ead 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt @@ -163,9 +163,9 @@ /** * 根据巡检ID获取巡检路径点 */ - @GET("/") + @GET("/route/searchById") suspend fun getRouteByInspectId( @Header("token") token: String, - @Query("id") id: String + @Query("inspectionId") id: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt index f1f2577..4387e1c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt @@ -170,7 +170,7 @@ /** * 根据巡检ID获取巡检路径点 */ - suspend fun getRouteByInspectId(id: String): String { - return api.getRouteByInspectId(AuthenticationHelper.token!!, id) + suspend fun getRouteByInspectId(inspectionId: String): String { + return api.getRouteByInspectId(AuthenticationHelper.token!!, inspectionId) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 2c43c86..a02545c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -132,7 +132,12 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, value) + val config = if (value.startsWith("http://")) { + value + } else { + "http://${value}" + } + SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, config) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index d4723ab..730792f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -22,21 +22,17 @@ val eventListResult = MutableLiveData() fun getEventListByPage(page: Int) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.getEventListByPage(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success eventListResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.get()) } }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() }) fun deleteEventById(id: String) = launch({ diff --git a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java index 62927e1..1993111 100644 --- a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java +++ b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java @@ -69,8 +69,8 @@ private String id; private String images; private String inspectionId; - private Integer lat; - private Integer lng; + private Double lat; + private Double lng; private String name; private String type; private String user; @@ -131,19 +131,19 @@ this.inspectionId = inspectionId; } - public Integer getLat() { + public Double getLat() { return lat; } - public void setLat(Integer lat) { + public void setLat(Double lat) { this.lat = lat; } - public Integer getLng() { + public Double getLng() { return lng; } - public void setLng(Integer lng) { + public void setLng(Double lng) { this.lng = lng; } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt index f6ef74e..f961ead 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt @@ -163,9 +163,9 @@ /** * 根据巡检ID获取巡检路径点 */ - @GET("/") + @GET("/route/searchById") suspend fun getRouteByInspectId( @Header("token") token: String, - @Query("id") id: String + @Query("inspectionId") id: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt index f1f2577..4387e1c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt @@ -170,7 +170,7 @@ /** * 根据巡检ID获取巡检路径点 */ - suspend fun getRouteByInspectId(id: String): String { - return api.getRouteByInspectId(AuthenticationHelper.token!!, id) + suspend fun getRouteByInspectId(inspectionId: String): String { + return api.getRouteByInspectId(AuthenticationHelper.token!!, inspectionId) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 2c43c86..a02545c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -132,7 +132,12 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, value) + val config = if (value.startsWith("http://")) { + value + } else { + "http://${value}" + } + SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, config) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index d4723ab..730792f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -22,21 +22,17 @@ val eventListResult = MutableLiveData() fun getEventListByPage(page: Int) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.getEventListByPage(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success eventListResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.get()) } }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() }) fun deleteEventById(id: String) = launch({ diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index c17f908..7906817 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -26,21 +26,17 @@ val inspectEvent = MutableLiveData() fun getInspectionListByPage(page: Int) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.getInspectionListByPage(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success inspectionListResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.get()) } }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() }) fun getInspectDetail(id: String) = launch({ @@ -140,8 +136,8 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getRouteByInspectId(id: String) = launch({ - val response = RetrofitServiceManager.getRouteByInspectId(id) + fun getRouteByInspectId(inspectionId: String) = launch({ + val response = RetrofitServiceManager.getRouteByInspectId(inspectionId) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java index 62927e1..1993111 100644 --- a/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java +++ b/app/src/main/java/com/casic/birmm/inspect/model/EventListModel.java @@ -69,8 +69,8 @@ private String id; private String images; private String inspectionId; - private Integer lat; - private Integer lng; + private Double lat; + private Double lng; private String name; private String type; private String user; @@ -131,19 +131,19 @@ this.inspectionId = inspectionId; } - public Integer getLat() { + public Double getLat() { return lat; } - public void setLat(Integer lat) { + public void setLat(Double lat) { this.lat = lat; } - public Integer getLng() { + public Double getLng() { return lng; } - public void setLng(Integer lng) { + public void setLng(Double lng) { this.lng = lng; } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt index f6ef74e..f961ead 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitService.kt @@ -163,9 +163,9 @@ /** * 根据巡检ID获取巡检路径点 */ - @GET("/") + @GET("/route/searchById") suspend fun getRouteByInspectId( @Header("token") token: String, - @Query("id") id: String + @Query("inspectionId") id: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt index f1f2577..4387e1c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/retrofit/RetrofitServiceManager.kt @@ -170,7 +170,7 @@ /** * 根据巡检ID获取巡检路径点 */ - suspend fun getRouteByInspectId(id: String): String { - return api.getRouteByInspectId(AuthenticationHelper.token!!, id) + suspend fun getRouteByInspectId(inspectionId: String): String { + return api.getRouteByInspectId(AuthenticationHelper.token!!, inspectionId) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index 2c43c86..a02545c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -132,7 +132,12 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { - SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, value) + val config = if (value.startsWith("http://")) { + value + } else { + "http://${value}" + } + SaveKeyValues.putValue(LocaleConstant.DEFAULT_SERVER_CONFIG, config) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index d4723ab..730792f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -22,21 +22,17 @@ val eventListResult = MutableLiveData() fun getEventListByPage(page: Int) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.getEventListByPage(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success eventListResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.get()) } }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() }) fun deleteEventById(id: String) = launch({ diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index c17f908..7906817 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -26,21 +26,17 @@ val inspectEvent = MutableLiveData() fun getInspectionListByPage(page: Int) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.getInspectionListByPage(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success inspectionListResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.get()) } }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() }) fun getInspectDetail(id: String) = launch({ @@ -140,8 +136,8 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getRouteByInspectId(id: String) = launch({ - val response = RetrofitServiceManager.getRouteByInspectId(id) + fun getRouteByInspectId(inspectionId: String) = launch({ + val response = RetrofitServiceManager.getRouteByInspectId(inspectionId) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/res/layout/fragment_query_event.xml b/app/src/main/res/layout/fragment_query_event.xml index 0e28f88..db4129f 100644 --- a/app/src/main/res/layout/fragment_query_event.xml +++ b/app/src/main/res/layout/fragment_query_event.xml @@ -4,8 +4,8 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" - android:orientation="vertical"> + android:background="@color/mainBackground" + android:orientation="vertical"> () fun getEventListByPage(page: Int) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.getEventListByPage(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success eventListResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.get()) } }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() }) fun deleteEventById(id: String) = launch({ diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index c17f908..7906817 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -26,21 +26,17 @@ val inspectEvent = MutableLiveData() fun getInspectionListByPage(page: Int) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.getInspectionListByPage(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success inspectionListResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.get()) } }, { - loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() }) fun getInspectDetail(id: String) = launch({ @@ -140,8 +136,8 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getRouteByInspectId(id: String) = launch({ - val response = RetrofitServiceManager.getRouteByInspectId(id) + fun getRouteByInspectId(inspectionId: String) = launch({ + val response = RetrofitServiceManager.getRouteByInspectId(inspectionId) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/res/layout/fragment_query_event.xml b/app/src/main/res/layout/fragment_query_event.xml index 0e28f88..db4129f 100644 --- a/app/src/main/res/layout/fragment_query_event.xml +++ b/app/src/main/res/layout/fragment_query_event.xml @@ -4,8 +4,8 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" - android:orientation="vertical"> + android:background="@color/mainBackground" + android:orientation="vertical"> + android:background="@color/mainBackground" + android:orientation="vertical">