From 0ed4113366795daad34eec62bae6d72eb81efaca Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Fri, 22 May 2026 23:24:58 +0630 Subject: [PATCH] local package --- .../mob/utsmyanmar/ui/sign_on/SignOnScreen.kt | 10 +-- .../utsmyanmar/ui/sign_on/SignOnViewModel.kt | 64 ++++++++++--------- .../utsmyanmar/paylibs/network/ISOSocket.java | 2 +- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnScreen.kt index cc205cc..82ab42f 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnScreen.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnScreen.kt @@ -43,12 +43,12 @@ import com.mob.utsmyanmar.ui.theme.Color as AppColor fun SignOnRoute( onBack: () -> Unit, onNavigateResult: (Boolean, String) -> Unit, - viewModel: SignOnViewModel = viewModel() + signOnViewModel: SignOnViewModel = viewModel() ) { - val state by viewModel.uiState.collectAsState() + val state by signOnViewModel.uiState.collectAsState() - LaunchedEffect(viewModel) { - viewModel.resultEvents.collect { result -> + LaunchedEffect(signOnViewModel) { + signOnViewModel.resultEvents.collect { result -> onNavigateResult(result.isSuccess, result.message) } } @@ -56,7 +56,7 @@ fun SignOnRoute( SignOnScreen( state = state, onBack = onBack, - onStartSignOn = viewModel::startSignOn + onStartSignOn = signOnViewModel::startSignOn ) } diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnViewModel.kt b/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnViewModel.kt index 1b2bbe8..df096ac 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnViewModel.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnViewModel.kt @@ -42,37 +42,39 @@ class SignOnViewModel : ViewModel() { canRetry = false ) } -// -// SignOnProcess.getInstance() -// .enqueue() -// .startSignOn(object : SignOnListener { -// override fun onSuccessSignOn() { -// dispatchResult( -// SignOnResult( -// isSuccess = true, -// message = "Sign on completed successfully." -// ) -// ) -// } -// -// override fun onFailureSignOn(resultCode: Integer?) { -// dispatchResult( -// SignOnResult( -// isSuccess = false, -// message = "Sign on failed. Response code: ${resultCode ?: -1}" -// ) -// ) -// } -// -// override fun onNetworkFailSignOn(message: String?) { -// dispatchResult( -// SignOnResult( -// isSuccess = false, -// message = message?.takeIf { it.isNotBlank() } ?: "Network error during sign on." -// ) -// ) -// } -// }) + + + SignOnProcess.getInstance() + .enqueue() + .startSignOn(object : SignOnListener { + override fun onSuccessSignOn() { + dispatchResult( + SignOnResult( + isSuccess = true, + message = "Sign on completed successfully." + ) + ) + } + + override fun onFailureSignOn(resultCode: Int?) { + dispatchResult( + SignOnResult( + isSuccess = false, + message = "Sign on failed. Response code: ${resultCode ?: -1}" + ) + ) + } + + + override fun onNetworkFailSignOn(message: String?) { + dispatchResult( + SignOnResult( + isSuccess = false, + message = message?.takeIf { it.isNotBlank() } ?: "Network error during sign on." + ) + ) + } + }) } private fun dispatchResult(result: SignOnResult) { diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java index 0fd4aa5..c27ce33 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java @@ -351,7 +351,7 @@ public class ISOSocket { // serverPort = getPort(); // serverIP = "posuat.myanmarorientalbank.com"; // serverPort = 5033; - serverIP = "192.168.100.9"; + serverIP = "192.168.100.2"; serverPort = 5001; } else { isSwitchIp = false;