diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 4eea640..10c25b4 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -18,6 +18,8 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel import com.casic.app.smartwell.sanxi.utils.BroadcastReceiverManager import com.casic.app.smartwell.sanxi.utils.Constant +import com.casic.app.smartwell.sanxi.utils.DialogHelper +import com.casic.app.smartwell.sanxi.utils.LoadState import com.casic.app.smartwell.sanxi.view.SearchAlarmActivity import com.casic.app.smartwell.sanxi.view.WellDetailActivity import com.casic.app.smartwell.sanxi.vm.AlarmViewModel @@ -53,7 +55,9 @@ Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 - + isRefresh = true + pageIndex = 1 + obtainAlarmListByPage() } }) } @@ -96,6 +100,24 @@ weakReferenceHandler.sendEmptyMessage(2022051101) } }) + + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(requireActivity(), "处理中，请稍后") + } + is LoadState.Success -> { + DialogHelper.dismissLoadingDialog() + //刷新列表 + BroadcastReceiverManager.instance.sendBroadcast( + Constant.CANCEL_ALARM_ACTION, "" + ) + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) } private fun obtainAlarmListByPage() { @@ -155,7 +177,7 @@ "操作失败，告警ID异常".show() return } -// fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult(alarmId!!) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 4eea640..10c25b4 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -18,6 +18,8 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel import com.casic.app.smartwell.sanxi.utils.BroadcastReceiverManager import com.casic.app.smartwell.sanxi.utils.Constant +import com.casic.app.smartwell.sanxi.utils.DialogHelper +import com.casic.app.smartwell.sanxi.utils.LoadState import com.casic.app.smartwell.sanxi.view.SearchAlarmActivity import com.casic.app.smartwell.sanxi.view.WellDetailActivity import com.casic.app.smartwell.sanxi.vm.AlarmViewModel @@ -53,7 +55,9 @@ Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 - + isRefresh = true + pageIndex = 1 + obtainAlarmListByPage() } }) } @@ -96,6 +100,24 @@ weakReferenceHandler.sendEmptyMessage(2022051101) } }) + + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(requireActivity(), "处理中，请稍后") + } + is LoadState.Success -> { + DialogHelper.dismissLoadingDialog() + //刷新列表 + BroadcastReceiverManager.instance.sendBroadcast( + Constant.CANCEL_ALARM_ACTION, "" + ) + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) } private fun obtainAlarmListByPage() { @@ -155,7 +177,7 @@ "操作失败，告警ID异常".show() return } -// fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult(alarmId!!) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index d02db3f..40f503b 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -216,6 +216,17 @@ ): String /** + * 消警 + * + * @param alarmId 告警ID + */ + @GET("/alarm/cancelAlarmById") + suspend fun obtainOperationResult( + @Header("token") token: String, + @Query("alarmId") alarmId: String + ): String + + /** * 获取获取闸井列表 * * @param keywords 关键字 @@ -248,20 +259,6 @@ ): String /** - * 闸井布防撤防 - * - * @param wellId 窨井ID - * @param bfzt 0：撤防，1：布防 - */ - @FormUrlEncoded - @POST("/well/bfcf") - suspend fun obtainOperationResult( - @Header("token") token: String, - @Field("wellId") wellId: String, - @Field("bfzt") bfzt: String - ): String - - /** * 获取工单详情 * * @param id 工单id diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 4eea640..10c25b4 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -18,6 +18,8 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel import com.casic.app.smartwell.sanxi.utils.BroadcastReceiverManager import com.casic.app.smartwell.sanxi.utils.Constant +import com.casic.app.smartwell.sanxi.utils.DialogHelper +import com.casic.app.smartwell.sanxi.utils.LoadState import com.casic.app.smartwell.sanxi.view.SearchAlarmActivity import com.casic.app.smartwell.sanxi.view.WellDetailActivity import com.casic.app.smartwell.sanxi.vm.AlarmViewModel @@ -53,7 +55,9 @@ Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 - + isRefresh = true + pageIndex = 1 + obtainAlarmListByPage() } }) } @@ -96,6 +100,24 @@ weakReferenceHandler.sendEmptyMessage(2022051101) } }) + + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(requireActivity(), "处理中，请稍后") + } + is LoadState.Success -> { + DialogHelper.dismissLoadingDialog() + //刷新列表 + BroadcastReceiverManager.instance.sendBroadcast( + Constant.CANCEL_ALARM_ACTION, "" + ) + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) } private fun obtainAlarmListByPage() { @@ -155,7 +177,7 @@ "操作失败，告警ID异常".show() return } -// fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult(alarmId!!) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index d02db3f..40f503b 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -216,6 +216,17 @@ ): String /** + * 消警 + * + * @param alarmId 告警ID + */ + @GET("/alarm/cancelAlarmById") + suspend fun obtainOperationResult( + @Header("token") token: String, + @Query("alarmId") alarmId: String + ): String + + /** * 获取获取闸井列表 * * @param keywords 关键字 @@ -248,20 +259,6 @@ ): String /** - * 闸井布防撤防 - * - * @param wellId 窨井ID - * @param bfzt 0：撤防，1：布防 - */ - @FormUrlEncoded - @POST("/well/bfcf") - suspend fun obtainOperationResult( - @Header("token") token: String, - @Field("wellId") wellId: String, - @Field("bfzt") bfzt: String - ): String - - /** * 获取工单详情 * * @param id 工单id diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt index c958f57..4d2727f 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt @@ -215,6 +215,13 @@ return api.obtainMonthOrder(AuthenticationHelper.token!!, startDate, endDate) } + /** + * 消警 + */ + suspend fun obtainOperationResult(alarmId: String): String { + return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) + } + // /** // * 获取获取闸井列表 // */ diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 4eea640..10c25b4 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -18,6 +18,8 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel import com.casic.app.smartwell.sanxi.utils.BroadcastReceiverManager import com.casic.app.smartwell.sanxi.utils.Constant +import com.casic.app.smartwell.sanxi.utils.DialogHelper +import com.casic.app.smartwell.sanxi.utils.LoadState import com.casic.app.smartwell.sanxi.view.SearchAlarmActivity import com.casic.app.smartwell.sanxi.view.WellDetailActivity import com.casic.app.smartwell.sanxi.vm.AlarmViewModel @@ -53,7 +55,9 @@ Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 - + isRefresh = true + pageIndex = 1 + obtainAlarmListByPage() } }) } @@ -96,6 +100,24 @@ weakReferenceHandler.sendEmptyMessage(2022051101) } }) + + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(requireActivity(), "处理中，请稍后") + } + is LoadState.Success -> { + DialogHelper.dismissLoadingDialog() + //刷新列表 + BroadcastReceiverManager.instance.sendBroadcast( + Constant.CANCEL_ALARM_ACTION, "" + ) + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) } private fun obtainAlarmListByPage() { @@ -155,7 +177,7 @@ "操作失败，告警ID异常".show() return } -// fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult(alarmId!!) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index d02db3f..40f503b 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -216,6 +216,17 @@ ): String /** + * 消警 + * + * @param alarmId 告警ID + */ + @GET("/alarm/cancelAlarmById") + suspend fun obtainOperationResult( + @Header("token") token: String, + @Query("alarmId") alarmId: String + ): String + + /** * 获取获取闸井列表 * * @param keywords 关键字 @@ -248,20 +259,6 @@ ): String /** - * 闸井布防撤防 - * - * @param wellId 窨井ID - * @param bfzt 0：撤防，1：布防 - */ - @FormUrlEncoded - @POST("/well/bfcf") - suspend fun obtainOperationResult( - @Header("token") token: String, - @Field("wellId") wellId: String, - @Field("bfzt") bfzt: String - ): String - - /** * 获取工单详情 * * @param id 工单id diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt index c958f57..4d2727f 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt @@ -215,6 +215,13 @@ return api.obtainMonthOrder(AuthenticationHelper.token!!, startDate, endDate) } + /** + * 消警 + */ + suspend fun obtainOperationResult(alarmId: String): String { + return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) + } + // /** // * 获取获取闸井列表 // */ diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt index c48debf..18bdef3 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt @@ -10,6 +10,7 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel import com.casic.app.smartwell.sanxi.model.AlarmTypeModel import com.casic.app.smartwell.sanxi.model.DayAlarmModel +import com.casic.app.smartwell.sanxi.utils.LoadState import com.casic.app.smartwell.sanxi.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -120,4 +121,20 @@ }, { it.printStackTrace() }) + + fun obtainOperationResult(alarmId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainOperationResult(alarmId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "操作成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) } \ No newline at end of file