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)