From 09209c150fb0c9115eed71dee60141eb9bbb9637 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 3 Feb 2025 18:53:50 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B8=EC=9D=B8=EC=9D=B8=EC=A6=9D=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20-=20=EC=95=B1=20=EC=9E=AC=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/other.xml | 362 ------------------ .../sodalive/mypage/MyPageFragment.kt | 18 +- .../sodalive/mypage/MyPageViewModel.kt | 4 +- 3 files changed, 19 insertions(+), 365 deletions(-) delete mode 100644 .idea/other.xml diff --git a/.idea/other.xml b/.idea/other.xml deleted file mode 100644 index e3e6e5d..0000000 --- a/.idea/other.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt index 8757999..4994456 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt @@ -8,6 +8,7 @@ import android.view.View import android.webkit.URLUtil import android.widget.LinearLayout import android.widget.Toast +import androidx.media3.common.util.UnstableApi import coil.load import coil.transform.CircleCropTransformation import com.google.gson.Gson @@ -34,8 +35,10 @@ import kr.co.vividnext.sodalive.mypage.profile.ProfileUpdateActivity import kr.co.vividnext.sodalive.mypage.service_center.ServiceCenterActivity import kr.co.vividnext.sodalive.settings.SettingsActivity import kr.co.vividnext.sodalive.settings.notification.MemberRole +import kr.co.vividnext.sodalive.splash.SplashActivity import org.koin.android.ext.android.inject +@UnstableApi class MyPageFragment : BaseFragment(FragmentMyBinding::inflate) { private val viewModel: MyPageViewModel by inject() @@ -138,7 +141,20 @@ class MyPageFragment : BaseFragment(FragmentMyBinding::inflat val bootpayResponse = Gson().fromJson(it, BootpayResponse::class.java) val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) requireActivity().runOnUiThread { - viewModel.authVerify(request) + viewModel.authVerify(request) { + startActivity( + Intent( + requireContext(), + SplashActivity::class.java + ).apply { + addFlags( + Intent.FLAG_ACTIVITY_CLEAR_TASK or + Intent.FLAG_ACTIVITY_NEW_TASK + ) + } + ) + requireActivity().finish() + } } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt index 2293c52..b5aa8ab 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt @@ -60,7 +60,7 @@ class MyPageViewModel( ) } - fun authVerify(request: AuthVerifyRequest) { + fun authVerify(request: AuthVerifyRequest, onSuccess: () -> Unit) { if (!_isLoading.value!!) { _isLoading.value = true } @@ -72,7 +72,7 @@ class MyPageViewModel( .subscribe( { if (it.success) { - getUserInfo() + onSuccess() } else { if (it.message != null) { _toastLiveData.postValue(it.message)