diff --git a/app/src/main/java/com/ckkj/defense_device/home/HomeMenuFragment.kt b/app/src/main/java/com/ckkj/defense_device/home/HomeMenuFragment.kt index 9e8e804..3140b40 100644 --- a/app/src/main/java/com/ckkj/defense_device/home/HomeMenuFragment.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/HomeMenuFragment.kt @@ -392,6 +392,8 @@ class HomeMenuFragment : Fragment() { Log.d("DeviceList", "deviceBeanList size = ${deviceBeanList.size}") updateDeviceList() } else { + binding.rvDeviceList.visibility = View.GONE + binding.layoutNoPermission.visibility = View.VISIBLE Toast.makeText(requireContext(), response.msg, Toast.LENGTH_SHORT).show() if (isLoadMore) { hasMore = false @@ -401,6 +403,8 @@ class HomeMenuFragment : Fragment() { } } catch (e: Exception) { withContext(Dispatchers.Main) { + binding.rvDeviceList.visibility = View.GONE + binding.layoutNoPermission.visibility = View.VISIBLE Toast.makeText(requireContext(), R.string.network_error, Toast.LENGTH_SHORT).show() isLoading = false if (isLoadMore) { diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/LinkedUserActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/LinkedUserActivity.kt index ecdb0bb..1f76e90 100644 --- a/app/src/main/java/com/ckkj/defense_device/liveVideo/LinkedUserActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/LinkedUserActivity.kt @@ -257,6 +257,7 @@ class LinkedUserActivity : AppCompatActivity() { updateFamilyMembersList(response.data as List) } } else { + hide() Toast.makeText(this@LinkedUserActivity, response.msg, Toast.LENGTH_SHORT).show() } } @@ -264,11 +265,18 @@ class LinkedUserActivity : AppCompatActivity() { e.printStackTrace() withContext(Dispatchers.Main) { binding.swipeRefresh.isRefreshing = false + hide() Toast.makeText(this@LinkedUserActivity, "网络请求失败", Toast.LENGTH_SHORT).show() } } } } + private fun hide() { + binding.searchLayout.visibility = View.GONE + binding.rvLinkedUser.visibility = View.GONE + binding.butting?.visibility = View.GONE + binding.layoutNoPermission?.visibility = View.VISIBLE + } private fun updateDeviceUserList(deviceUserList: List) { fullUserList.clear() diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/VoiceSettingsActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/VoiceSettingsActivity.kt index e07ecef..68f2261 100644 --- a/app/src/main/java/com/ckkj/defense_device/liveVideo/VoiceSettingsActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/VoiceSettingsActivity.kt @@ -79,29 +79,31 @@ class VoiceSettingsActivity : AppCompatActivity() { private fun updateDeviceAlertAudio() { deviceId?.let { id -> val newAlertAudio = if (binding.swWarningVoice.isChecked) "1" else "0" - // 只有状态发生变化时才请求 - if (newAlertAudio != originalAlertAudio) { - CoroutineScope(Dispatchers.IO).launch { - try { - val deviceBean = DeviceBean(id = id, alertAudio = newAlertAudio) - val response = apiService.updateDeviceInfo(deviceBean) - withContext(Dispatchers.Main) { - if (response.code == 200 && response.data != null) { - Toast.makeText(this@VoiceSettingsActivity, "修改成功", Toast.LENGTH_SHORT).show() - } else { + // 点击返回时总是触发网络请求 + CoroutineScope(Dispatchers.IO).launch { + try { + val deviceBean = DeviceBean(id = id, alertAudio = newAlertAudio) + val response = apiService.updateDeviceInfo(deviceBean) + withContext(Dispatchers.Main) { + if (response.code == 200 && response.data != null) { + Toast.makeText(this@VoiceSettingsActivity, "修改成功", Toast.LENGTH_SHORT).show() + } else { + // 仅在状态实际发生变化时才显示错误提示 + if (newAlertAudio != originalAlertAudio) { Toast.makeText(this@VoiceSettingsActivity, response.msg, Toast.LENGTH_SHORT).show() } - finish() } - } catch (e: Exception) { - withContext(Dispatchers.Main) { + finish() + } + } catch (e: Exception) { + withContext(Dispatchers.Main) { + // 仅在状态实际发生变化时才显示失败提示 + if (newAlertAudio != originalAlertAudio) { Toast.makeText(this@VoiceSettingsActivity, "修改失败", Toast.LENGTH_SHORT).show() - finish() } + finish() } } - } else { - finish() } } } diff --git a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt index a3deaad..b1ebe55 100644 --- a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt @@ -5,6 +5,7 @@ import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.os.Bundle import android.os.CountDownTimer +import android.util.Log import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity @@ -194,6 +195,7 @@ class LoginActivity : AppCompatActivity() { try { val response = RetrofitNetwork.getNetworkService().getCode(phone) withContext(Dispatchers.Main) { + Log.d("VerificationCode", "code = ${response.code}, msg = ${response.msg}") if (response.code == 200) { Toast.makeText(this@LoginActivity, getString(R.string.code_sent_to, phone), Toast.LENGTH_SHORT).show() startCountDown() diff --git a/app/src/main/res/layout/linked_user_activity.xml b/app/src/main/res/layout/linked_user_activity.xml index 77fe971..8f2e129 100644 --- a/app/src/main/res/layout/linked_user_activity.xml +++ b/app/src/main/res/layout/linked_user_activity.xml @@ -35,60 +35,91 @@ android:textStyle="bold" /> - - - - - - - - - - - - + + + - + android:paddingVertical="12dp" + android:layout_marginTop="8dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + +