From b2c3ed901596b8ce7ea32347d6f91dcb8d642305 Mon Sep 17 00:00:00 2001 From: maxinyu Date: Mon, 15 Jun 2026 16:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../defense_device/home/PersonalFragment.kt | 46 +++++++++++-------- .../liveVideo/LiveVideoActivity.kt | 2 +- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/ckkj/defense_device/home/PersonalFragment.kt b/app/src/main/java/com/ckkj/defense_device/home/PersonalFragment.kt index cdb342e..abeecaf 100644 --- a/app/src/main/java/com/ckkj/defense_device/home/PersonalFragment.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/PersonalFragment.kt @@ -21,6 +21,7 @@ import com.ckkj.defense_device.utils.LanguageUtil import com.ckkj.defense_device.utils.RetrofitNetwork import com.ckkj.defense_device.utils.UserinfoUtil import com.ckkj.defense_device.utils.ActivityManager +import com.ckkj.defense_device.view.CustomDialogFragmentText import com.ckkj.defense_device.view.FamilySwitchDialog import com.ckkj.defense_device.view.LanguageDialog import com.gyf.immersionbar.ImmersionBar @@ -100,27 +101,36 @@ class PersonalFragment : Fragment() { } // 退出登录点击事件 binding.btnLogout.setOnClickListener { - CoroutineScope(Dispatchers.IO).launch { - try { - val response = RetrofitNetwork.getNetworkService().logout() - withContext(Dispatchers.Main) { - if (response.code == 200) { - UserinfoUtil.clearUserInfo() - val intent = Intent(requireContext(), com.ckkj.defense_device.login.LoginActivity::class.java) - intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK - startActivity(intent) - requireActivity().finish() - } else { - Toast.makeText(requireContext(), getString(R.string.logout_fail), Toast.LENGTH_SHORT).show() + val dialog = CustomDialogFragmentText() + .setTitle(getString(R.string.tip)) + .setMessage(getString(R.string.logout_confirm)) + .setShowInput(false) + .setNegativeText(getString(R.string.cancel)) + .setPositiveText(getString(R.string.confirm)) + .setOnConfirmListener { + CoroutineScope(Dispatchers.IO).launch { + try { + val response = RetrofitNetwork.getNetworkService().logout() + withContext(Dispatchers.Main) { + if (response.code == 200) { + UserinfoUtil.clearUserInfo() + val intent = Intent(requireContext(), com.ckkj.defense_device.login.LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + startActivity(intent) + requireActivity().finish() + } else { + Toast.makeText(requireContext(), getString(R.string.logout_fail), Toast.LENGTH_SHORT).show() + } + } + } catch (e: Exception) { + e.printStackTrace() + withContext(Dispatchers.Main) { + Toast.makeText(requireContext(), getString(R.string.logout_fail), Toast.LENGTH_SHORT).show() + } } } - } catch (e: Exception) { - e.printStackTrace() - withContext(Dispatchers.Main) { - Toast.makeText(requireContext(), getString(R.string.logout_fail), Toast.LENGTH_SHORT).show() - } } - } + dialog.show(childFragmentManager, "logout_dialog") } fetchCurrentFamily() return binding.root diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt index 9d8d46d..1ef93b2 100644 --- a/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt @@ -80,7 +80,7 @@ class LiveVideoActivity : BaseActivity() { } private fun initVideoPlayer() { - val videoUrl = "https://www.w3schools.com/html/movie.mp4"//"https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8" + val videoUrl ="http://220.203.23.195:9090/live/test001.live.flv" orientationUtils = OrientationUtils(this, binding.exoPlayContextId) orientationUtils?.isEnable = true