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 7bb0ef6..9453060 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 @@ -54,6 +54,28 @@ ): String /** + * 设置甲烷阈值 + */ + @FormUrlEncoded + @POST("/device/setThreshold") + suspend fun setMethaneThreshold( + @Header("token") token: String, + @Field("gasIp") gasIp: String, + @Field("gasPort") gasPort: String, + @Field("threshold") threshold: String + ): String + + /** + * 查询甲烷阈值 + */ + @GET("/device/getThreshold") + suspend fun getMethaneThreshold( + @Header("token") token: String, + @Query("gasIp") gasIp: String, + @Query("gasPort") gasPort: String + ): String + + /** * 报警列表 */ @GET("/alarm/listPage") 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 7bb0ef6..9453060 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 @@ -54,6 +54,28 @@ ): String /** + * 设置甲烷阈值 + */ + @FormUrlEncoded + @POST("/device/setThreshold") + suspend fun setMethaneThreshold( + @Header("token") token: String, + @Field("gasIp") gasIp: String, + @Field("gasPort") gasPort: String, + @Field("threshold") threshold: String + ): String + + /** + * 查询甲烷阈值 + */ + @GET("/device/getThreshold") + suspend fun getMethaneThreshold( + @Header("token") token: String, + @Query("gasIp") gasIp: String, + @Query("gasPort") gasPort: String + ): String + + /** * 报警列表 */ @GET("/alarm/listPage") 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 d9d0218..d5bbde4 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 @@ -69,6 +69,20 @@ } /** + * 设置甲烷阈值 + */ + suspend fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String): String { + return api.setMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort, threshold) + } + + /** + * 查询甲烷阈值 + */ + suspend fun getMethaneThreshold(gasIp: String, gasPort: String): String { + return api.getMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort) + } + + /** * 报警列表 */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { 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 7bb0ef6..9453060 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 @@ -54,6 +54,28 @@ ): String /** + * 设置甲烷阈值 + */ + @FormUrlEncoded + @POST("/device/setThreshold") + suspend fun setMethaneThreshold( + @Header("token") token: String, + @Field("gasIp") gasIp: String, + @Field("gasPort") gasPort: String, + @Field("threshold") threshold: String + ): String + + /** + * 查询甲烷阈值 + */ + @GET("/device/getThreshold") + suspend fun getMethaneThreshold( + @Header("token") token: String, + @Query("gasIp") gasIp: String, + @Query("gasPort") gasPort: String + ): String + + /** * 报警列表 */ @GET("/alarm/listPage") 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 d9d0218..d5bbde4 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 @@ -69,6 +69,20 @@ } /** + * 设置甲烷阈值 + */ + suspend fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String): String { + return api.setMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort, threshold) + } + + /** + * 查询甲烷阈值 + */ + suspend fun getMethaneThreshold(gasIp: String, gasPort: String): String { + return api.getMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort) + } + + /** * 报警列表 */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { 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 513db5e..a3e9478 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 @@ -151,7 +151,7 @@ fenceTextView.setOnClickListener { BottomActionSheet.Builder() .setContext(this) - .setActionItemTitle(arrayListOf("监控区域", "云台角度")) + .setActionItemTitle(arrayListOf("监控区域", "云台参数")) .setItemTextColor(R.color.mainThemeColor.convertColor(this)) .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { 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 7bb0ef6..9453060 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 @@ -54,6 +54,28 @@ ): String /** + * 设置甲烷阈值 + */ + @FormUrlEncoded + @POST("/device/setThreshold") + suspend fun setMethaneThreshold( + @Header("token") token: String, + @Field("gasIp") gasIp: String, + @Field("gasPort") gasPort: String, + @Field("threshold") threshold: String + ): String + + /** + * 查询甲烷阈值 + */ + @GET("/device/getThreshold") + suspend fun getMethaneThreshold( + @Header("token") token: String, + @Query("gasIp") gasIp: String, + @Query("gasPort") gasPort: String + ): String + + /** * 报警列表 */ @GET("/alarm/listPage") 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 d9d0218..d5bbde4 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 @@ -69,6 +69,20 @@ } /** + * 设置甲烷阈值 + */ + suspend fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String): String { + return api.setMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort, threshold) + } + + /** + * 查询甲烷阈值 + */ + suspend fun getMethaneThreshold(gasIp: String, gasPort: String): String { + return api.getMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort) + } + + /** * 报警列表 */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { 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 513db5e..a3e9478 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 @@ -151,7 +151,7 @@ fenceTextView.setOnClickListener { BottomActionSheet.Builder() .setContext(this) - .setActionItemTitle(arrayListOf("监控区域", "云台角度")) + .setActionItemTitle(arrayListOf("监控区域", "云台参数")) .setItemTextColor(R.color.mainThemeColor.convertColor(this)) .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { diff --git a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt new file mode 100644 index 0000000..229b1bb --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt @@ -0,0 +1,59 @@ +package com.casic.br.operationsite.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.br.operationsite.base.BaseApplication +import com.casic.br.operationsite.extensions.separateResponseCode +import com.casic.br.operationsite.extensions.toErrorMessage +import com.casic.br.operationsite.model.CommonResultModel +import com.casic.br.operationsite.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +class DeviceViewModel : BaseViewModel() { + + private val gson = Gson() + val setThresholdResult = MutableLiveData() + val thresholdResult = MutableLiveData() + + fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.setMethaneThreshold(gasIp, gasPort, threshold) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + setThresholdResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getMethaneThreshold(gasIp: String, gasPort: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getMethaneThreshold(gasIp, gasPort) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + thresholdResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) +} \ 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 7bb0ef6..9453060 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 @@ -54,6 +54,28 @@ ): String /** + * 设置甲烷阈值 + */ + @FormUrlEncoded + @POST("/device/setThreshold") + suspend fun setMethaneThreshold( + @Header("token") token: String, + @Field("gasIp") gasIp: String, + @Field("gasPort") gasPort: String, + @Field("threshold") threshold: String + ): String + + /** + * 查询甲烷阈值 + */ + @GET("/device/getThreshold") + suspend fun getMethaneThreshold( + @Header("token") token: String, + @Query("gasIp") gasIp: String, + @Query("gasPort") gasPort: String + ): String + + /** * 报警列表 */ @GET("/alarm/listPage") 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 d9d0218..d5bbde4 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 @@ -69,6 +69,20 @@ } /** + * 设置甲烷阈值 + */ + suspend fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String): String { + return api.setMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort, threshold) + } + + /** + * 查询甲烷阈值 + */ + suspend fun getMethaneThreshold(gasIp: String, gasPort: String): String { + return api.getMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort) + } + + /** * 报警列表 */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { 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 513db5e..a3e9478 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 @@ -151,7 +151,7 @@ fenceTextView.setOnClickListener { BottomActionSheet.Builder() .setContext(this) - .setActionItemTitle(arrayListOf("监控区域", "云台角度")) + .setActionItemTitle(arrayListOf("监控区域", "云台参数")) .setItemTextColor(R.color.mainThemeColor.convertColor(this)) .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { diff --git a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt new file mode 100644 index 0000000..229b1bb --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt @@ -0,0 +1,59 @@ +package com.casic.br.operationsite.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.br.operationsite.base.BaseApplication +import com.casic.br.operationsite.extensions.separateResponseCode +import com.casic.br.operationsite.extensions.toErrorMessage +import com.casic.br.operationsite.model.CommonResultModel +import com.casic.br.operationsite.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +class DeviceViewModel : BaseViewModel() { + + private val gson = Gson() + val setThresholdResult = MutableLiveData() + val thresholdResult = MutableLiveData() + + fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.setMethaneThreshold(gasIp, gasPort, threshold) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + setThresholdResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getMethaneThreshold(gasIp: String, gasPort: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getMethaneThreshold(gasIp, gasPort) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + thresholdResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_border_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_border_radius_5.xml new file mode 100644 index 0000000..4614915 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_border_radius_5.xml @@ -0,0 +1,10 @@ + + + + + + + \ 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 7bb0ef6..9453060 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 @@ -54,6 +54,28 @@ ): String /** + * 设置甲烷阈值 + */ + @FormUrlEncoded + @POST("/device/setThreshold") + suspend fun setMethaneThreshold( + @Header("token") token: String, + @Field("gasIp") gasIp: String, + @Field("gasPort") gasPort: String, + @Field("threshold") threshold: String + ): String + + /** + * 查询甲烷阈值 + */ + @GET("/device/getThreshold") + suspend fun getMethaneThreshold( + @Header("token") token: String, + @Query("gasIp") gasIp: String, + @Query("gasPort") gasPort: String + ): String + + /** * 报警列表 */ @GET("/alarm/listPage") 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 d9d0218..d5bbde4 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 @@ -69,6 +69,20 @@ } /** + * 设置甲烷阈值 + */ + suspend fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String): String { + return api.setMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort, threshold) + } + + /** + * 查询甲烷阈值 + */ + suspend fun getMethaneThreshold(gasIp: String, gasPort: String): String { + return api.getMethaneThreshold(AuthenticationHelper.token!!, gasIp, gasPort) + } + + /** * 报警列表 */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { 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 513db5e..a3e9478 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 @@ -151,7 +151,7 @@ fenceTextView.setOnClickListener { BottomActionSheet.Builder() .setContext(this) - .setActionItemTitle(arrayListOf("监控区域", "云台角度")) + .setActionItemTitle(arrayListOf("监控区域", "云台参数")) .setItemTextColor(R.color.mainThemeColor.convertColor(this)) .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { diff --git a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt new file mode 100644 index 0000000..229b1bb --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt @@ -0,0 +1,59 @@ +package com.casic.br.operationsite.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.br.operationsite.base.BaseApplication +import com.casic.br.operationsite.extensions.separateResponseCode +import com.casic.br.operationsite.extensions.toErrorMessage +import com.casic.br.operationsite.model.CommonResultModel +import com.casic.br.operationsite.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +class DeviceViewModel : BaseViewModel() { + + private val gson = Gson() + val setThresholdResult = MutableLiveData() + val thresholdResult = MutableLiveData() + + fun setMethaneThreshold(gasIp: String, gasPort: String, threshold: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.setMethaneThreshold(gasIp, gasPort, threshold) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + setThresholdResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getMethaneThreshold(gasIp: String, gasPort: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getMethaneThreshold(gasIp, gasPort) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + thresholdResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_border_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_border_radius_5.xml new file mode 100644 index 0000000..4614915 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_border_radius_5.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_methane.xml b/app/src/main/res/layout/activity_methane.xml index 1ab0ffc..cc354d6 100644 --- a/app/src/main/res/layout/activity_methane.xml +++ b/app/src/main/res/layout/activity_methane.xml @@ -96,23 +96,46 @@ android:layout_marginBottom="@dimen/dp_7" android:background="@drawable/bg_solid_layout_white_radius_10" android:gravity="center_vertical" - android:orientation="horizontal"> + android:orientation="vertical"> - + + + +