From 4408acfca4df00c19fbc5c51fcb04970233b5f76 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Wed, 27 May 2026 19:55:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor(net):=20=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BB=A4=E7=89=8C=E5=92=8C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉 getDeviceToken 方法及其相关逻辑 - 注释掉 getDeviceConfig 方法及其相关逻辑 - 注释掉 getAccessToken 方法及其相关逻辑 - 保留了 UiState 相关的状态流定义 - 维持了其他网络请求方法的正常功能 --- .../intelligent/shelves/net/NetViewModel.kt | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/net/NetViewModel.kt b/app/src/main/java/com/shuwei/intelligent/shelves/net/NetViewModel.kt index 62159df..f62ffc1 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/net/NetViewModel.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/net/NetViewModel.kt @@ -30,53 +30,53 @@ class NetViewModel : ViewModel() { private val _updateOverdueStateUiState = MutableStateFlow(UiState.Initial) val updateOverdueStateUiState: StateFlow = _updateOverdueStateUiState - fun getDeviceToken(deviceId: String) { - viewModelScope.launch { - _getDeviceTokenUiState.value = UiState.Loading - runCatching { - val response = apiService.getDeviceToken(qrcodeId = deviceId) - if (response.isSuccess()) { - _getDeviceTokenUiState.value = UiState.Success(response) - } else { - _getDeviceTokenUiState.value = UiState.Error(response.msg ?: "请求失败") - } - }.onFailure { - _getDeviceTokenUiState.value = UiState.Error(it.message ?: "请求异常") - } - } - } +// fun getDeviceToken(deviceId: String) { +// viewModelScope.launch { +// _getDeviceTokenUiState.value = UiState.Loading +// runCatching { +// val response = apiService.getDeviceToken(qrcodeId = deviceId) +// if (response.isSuccess()) { +// _getDeviceTokenUiState.value = UiState.Success(response) +// } else { +// _getDeviceTokenUiState.value = UiState.Error(response.msg ?: "请求失败") +// } +// }.onFailure { +// _getDeviceTokenUiState.value = UiState.Error(it.message ?: "请求异常") +// } +// } +// } - fun getDeviceConfig(deviceId: String, deviceToken: String) { - viewModelScope.launch { - _getDeviceConfigUiState.value = UiState.Loading - runCatching { - val response = apiService.getDeviceInfo(equipmentCode = deviceId) - if (response.isSuccess()) { - _getDeviceConfigUiState.value = UiState.Success(response) - } else { - _getDeviceConfigUiState.value = UiState.Error(response.msg ?: "请求失败") - } - }.onFailure { - _getDeviceConfigUiState.value = UiState.Error(it.message ?: "请求异常") - } - } - } +// fun getDeviceConfig(deviceId: String, deviceToken: String) { +// viewModelScope.launch { +// _getDeviceConfigUiState.value = UiState.Loading +// runCatching { +// val response = apiService.getDeviceInfo(equipmentCode = deviceId) +// if (response.isSuccess()) { +// _getDeviceConfigUiState.value = UiState.Success(response) +// } else { +// _getDeviceConfigUiState.value = UiState.Error(response.msg ?: "请求失败") +// } +// }.onFailure { +// _getDeviceConfigUiState.value = UiState.Error(it.message ?: "请求异常") +// } +// } +// } - fun getAccessToken(deviceId: String) { - viewModelScope.launch { - _getAccessTokenUiState.value = UiState.Loading - runCatching { - val response = apiService.getAccessToken(qrcodeId = deviceId) - if (response.isSuccess()) { - _getAccessTokenUiState.value = UiState.Success(response) - } else { - _getAccessTokenUiState.value = UiState.Error(response.msg ?: "请求失败") - } - }.onFailure { - _getAccessTokenUiState.value = UiState.Error(it.message ?: "请求异常") - } - } - } +// fun getAccessToken(deviceId: String) { +// viewModelScope.launch { +// _getAccessTokenUiState.value = UiState.Loading +// runCatching { +// val response = apiService.getAccessToken(qrcodeId = deviceId) +// if (response.isSuccess()) { +// _getAccessTokenUiState.value = UiState.Success(response) +// } else { +// _getAccessTokenUiState.value = UiState.Error(response.msg ?: "请求失败") +// } +// }.onFailure { +// _getAccessTokenUiState.value = UiState.Error(it.message ?: "请求异常") +// } +// } +// } fun getShelfList(deviceId: String) { viewModelScope.launch {