diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index f35e2f3..86ede00 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -15,6 +15,7 @@ class DeviceControllerFragment : KotlinBaseFragment() { + private val kTag = "DeviceFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var speed = 5 @@ -88,6 +89,14 @@ } binding.currentSpeedView.text = "速度：${speed}" } + + binding.addPointButton.setOnClickListener { + + } + + binding.getPointsButton.setOnClickListener { + + } } private fun executeCommand(action: String) { diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index f35e2f3..86ede00 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -15,6 +15,7 @@ class DeviceControllerFragment : KotlinBaseFragment() { + private val kTag = "DeviceFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var speed = 5 @@ -88,6 +89,14 @@ } binding.currentSpeedView.text = "速度：${speed}" } + + binding.addPointButton.setOnClickListener { + + } + + binding.getPointsButton.setOnClickListener { + + } } private fun executeCommand(action: 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 cb7a9c2..c093f36 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 @@ -155,32 +155,4 @@ @Query("pwd") pwd: String, @Query("Speed") Speed: String ): String - - /** - * 自动巡检点位列表 - */ - @GET("/") - suspend fun getPoints( - @Header("token") token: String, - @Query("projectId") projectId: String, - @Query("deviceId") deviceId: String - ): String - - /** - * 添加自动巡检点位 - */ - @POST("/") - suspend fun addPoint( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** - * 删除自动巡检点位 - */ - @GET("/") - suspend fun deletePoint( - @Header("token") token: String, - @Query("id") id: String - ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index f35e2f3..86ede00 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -15,6 +15,7 @@ class DeviceControllerFragment : KotlinBaseFragment() { + private val kTag = "DeviceFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var speed = 5 @@ -88,6 +89,14 @@ } binding.currentSpeedView.text = "速度：${speed}" } + + binding.addPointButton.setOnClickListener { + + } + + binding.getPointsButton.setOnClickListener { + + } } private fun executeCommand(action: 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 cb7a9c2..c093f36 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 @@ -155,32 +155,4 @@ @Query("pwd") pwd: String, @Query("Speed") Speed: String ): String - - /** - * 自动巡检点位列表 - */ - @GET("/") - suspend fun getPoints( - @Header("token") token: String, - @Query("projectId") projectId: String, - @Query("deviceId") deviceId: String - ): String - - /** - * 添加自动巡检点位 - */ - @POST("/") - suspend fun addPoint( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** - * 删除自动巡检点位 - */ - @GET("/") - suspend fun deletePoint( - @Header("token") token: String, - @Query("id") id: String - ): String } \ No newline at end of file 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 d2b25a8..08a5f66 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 @@ -224,25 +224,4 @@ val service = RetrofitFactory.createRetrofit("http://$httpConfig") return service.executeDeviceCommand(action, "admin", "admin", speed.toString()) } - - suspend fun getPoints(deviceId: String): String { - return api.getPoints(AuthenticationHelper.token!!, RuntimeCache.projectId, deviceId) - } - - suspend fun addPoint(deviceId: String, horizontalAngle: String, verticalAngle: String): String { - val param = JsonObject() - param.addProperty("projectId", RuntimeCache.projectId) - param.addProperty("deviceId", deviceId) - param.addProperty("horizontalAngle", horizontalAngle) - param.addProperty("verticalAngle", verticalAngle) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.addPoint(AuthenticationHelper.token!!, requestBody) - } - - suspend fun deletePoint(id: String): String { - return api.deletePoint(AuthenticationHelper.token!!, id) - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index f35e2f3..86ede00 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -15,6 +15,7 @@ class DeviceControllerFragment : KotlinBaseFragment() { + private val kTag = "DeviceFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var speed = 5 @@ -88,6 +89,14 @@ } binding.currentSpeedView.text = "速度：${speed}" } + + binding.addPointButton.setOnClickListener { + + } + + binding.getPointsButton.setOnClickListener { + + } } private fun executeCommand(action: 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 cb7a9c2..c093f36 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 @@ -155,32 +155,4 @@ @Query("pwd") pwd: String, @Query("Speed") Speed: String ): String - - /** - * 自动巡检点位列表 - */ - @GET("/") - suspend fun getPoints( - @Header("token") token: String, - @Query("projectId") projectId: String, - @Query("deviceId") deviceId: String - ): String - - /** - * 添加自动巡检点位 - */ - @POST("/") - suspend fun addPoint( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** - * 删除自动巡检点位 - */ - @GET("/") - suspend fun deletePoint( - @Header("token") token: String, - @Query("id") id: String - ): String } \ No newline at end of file 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 d2b25a8..08a5f66 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 @@ -224,25 +224,4 @@ val service = RetrofitFactory.createRetrofit("http://$httpConfig") return service.executeDeviceCommand(action, "admin", "admin", speed.toString()) } - - suspend fun getPoints(deviceId: String): String { - return api.getPoints(AuthenticationHelper.token!!, RuntimeCache.projectId, deviceId) - } - - suspend fun addPoint(deviceId: String, horizontalAngle: String, verticalAngle: String): String { - val param = JsonObject() - param.addProperty("projectId", RuntimeCache.projectId) - param.addProperty("deviceId", deviceId) - param.addProperty("horizontalAngle", horizontalAngle) - param.addProperty("verticalAngle", verticalAngle) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.addPoint(AuthenticationHelper.token!!, requestBody) - } - - suspend fun deletePoint(id: String): String { - return api.deletePoint(AuthenticationHelper.token!!, id) - } } \ No newline at end of file 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 index 64b2de9..aae8c42 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt @@ -1,10 +1,8 @@ package com.casic.br.operationsite.vm import androidx.lifecycle.ViewModel -import com.casic.br.operationsite.extensions.getResponseHeader import com.casic.br.operationsite.retrofit.RetrofitServiceManager import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.unpackingResponse class DeviceViewModel : ViewModel() { /** @@ -13,63 +11,4 @@ fun executeDeviceCommand(action: String, speed: Int) = launch({ RetrofitServiceManager.executeDeviceCommand(action, speed) }) - - fun getPoints( - deviceId: String, - onLoading: () -> Unit, - onSuccess: (Any) -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.getPoints(deviceId) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess(unpackingResponse(response)) - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) - - fun addPoint( - deviceId: String, - horizontalAngle: String, - verticalAngle: String, - onLoading: () -> Unit, - onSuccess: () -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.addPoint(deviceId, horizontalAngle, verticalAngle) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess() - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) - - fun deletePoint( - id: String, - onLoading: () -> Unit, - onSuccess: () -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.deletePoint(id) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess() - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index f35e2f3..86ede00 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -15,6 +15,7 @@ class DeviceControllerFragment : KotlinBaseFragment() { + private val kTag = "DeviceFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } private var speed = 5 @@ -88,6 +89,14 @@ } binding.currentSpeedView.text = "速度：${speed}" } + + binding.addPointButton.setOnClickListener { + + } + + binding.getPointsButton.setOnClickListener { + + } } private fun executeCommand(action: 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 cb7a9c2..c093f36 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 @@ -155,32 +155,4 @@ @Query("pwd") pwd: String, @Query("Speed") Speed: String ): String - - /** - * 自动巡检点位列表 - */ - @GET("/") - suspend fun getPoints( - @Header("token") token: String, - @Query("projectId") projectId: String, - @Query("deviceId") deviceId: String - ): String - - /** - * 添加自动巡检点位 - */ - @POST("/") - suspend fun addPoint( - @Header("token") token: String, - @Body requestBody: RequestBody - ): String - - /** - * 删除自动巡检点位 - */ - @GET("/") - suspend fun deletePoint( - @Header("token") token: String, - @Query("id") id: String - ): String } \ No newline at end of file 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 d2b25a8..08a5f66 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 @@ -224,25 +224,4 @@ val service = RetrofitFactory.createRetrofit("http://$httpConfig") return service.executeDeviceCommand(action, "admin", "admin", speed.toString()) } - - suspend fun getPoints(deviceId: String): String { - return api.getPoints(AuthenticationHelper.token!!, RuntimeCache.projectId, deviceId) - } - - suspend fun addPoint(deviceId: String, horizontalAngle: String, verticalAngle: String): String { - val param = JsonObject() - param.addProperty("projectId", RuntimeCache.projectId) - param.addProperty("deviceId", deviceId) - param.addProperty("horizontalAngle", horizontalAngle) - param.addProperty("verticalAngle", verticalAngle) - - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - return api.addPoint(AuthenticationHelper.token!!, requestBody) - } - - suspend fun deletePoint(id: String): String { - return api.deletePoint(AuthenticationHelper.token!!, id) - } } \ No newline at end of file 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 index 64b2de9..aae8c42 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/DeviceViewModel.kt @@ -1,10 +1,8 @@ package com.casic.br.operationsite.vm import androidx.lifecycle.ViewModel -import com.casic.br.operationsite.extensions.getResponseHeader import com.casic.br.operationsite.retrofit.RetrofitServiceManager import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.unpackingResponse class DeviceViewModel : ViewModel() { /** @@ -13,63 +11,4 @@ fun executeDeviceCommand(action: String, speed: Int) = launch({ RetrofitServiceManager.executeDeviceCommand(action, speed) }) - - fun getPoints( - deviceId: String, - onLoading: () -> Unit, - onSuccess: (Any) -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.getPoints(deviceId) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess(unpackingResponse(response)) - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) - - fun addPoint( - deviceId: String, - horizontalAngle: String, - verticalAngle: String, - onLoading: () -> Unit, - onSuccess: () -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.addPoint(deviceId, horizontalAngle, verticalAngle) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess() - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) - - fun deletePoint( - id: String, - onLoading: () -> Unit, - onSuccess: () -> Unit, - onFailed: (String) -> Unit - ) = launch({ - onLoading() - val response = RetrofitServiceManager.deletePoint(id) - val header = response.getResponseHeader() - if (header.first == 200) { - onSuccess() - } else { - onFailed(header.second) - } - }, { - it.printStackTrace() - onFailed(it.message ?: "Unknown error") - }) } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_controller.xml b/app/src/main/res/layout/fragment_device_controller.xml index d2801eb..7ba76a3 100644 --- a/app/src/main/res/layout/fragment_device_controller.xml +++ b/app/src/main/res/layout/fragment_device_controller.xml @@ -92,24 +92,17 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="查询预置点" /> + android:text="查询预置点" + android:textSize="@dimen/sp_16" />