Kyaw_Min_Khant/mob_pos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed SendingToHost to Processing

Browse Source
This commit is contained in:
moon 2026-05-22 22:50:28 +06:30
parent ba24c60058
commit 6ddf0dda6c
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt
View File

@ -24,7 +24,7 @@ import com.mob.utsmyanmar.ui.print_receipt.PrintReceiptScreen
import com.mob.utsmyanmar.ui.refund_rrn.InputRrnRoute import com.mob.utsmyanmar.ui.refund_rrn.InputRrnRoute
import com.mob.utsmyanmar.ui.sign_on.SignOnResultScreen import com.mob.utsmyanmar.ui.sign_on.SignOnResultScreen
import com.mob.utsmyanmar.ui.sign_on.SignOnRoute import com.mob.utsmyanmar.ui.sign_on.SignOnRoute
import com.mob.utsmyanmar.ui.sending_to_host.SendingToHostRoute import com.mob.utsmyanmar.ui.sending_to_host.ProcessingRoute
import com.mob.utsmyanmar.ui.settlement.SettlementScreen import com.mob.utsmyanmar.ui.settlement.SettlementScreen
import com.mob.utsmyanmar.ui.transaction_result.TransactionResultRoute import com.mob.utsmyanmar.ui.transaction_result.TransactionResultRoute
import com.mob.utsmyanmar.ui.sale_void.TranDetailPage import com.mob.utsmyanmar.ui.sale_void.TranDetailPage
@ -118,7 +118,7 @@ fun AppNavGraph(
onBack = { navController.popBackStack() }, onBack = { navController.popBackStack() },
onStartSettlement = { onStartSettlement = {
sharedViewModel.transactionsType.value = com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType.SETTLEMENT sharedViewModel.transactionsType.value = com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType.SETTLEMENT
navController.navigate(Routes.SendingToHost.route) { navController.navigate(Routes.Processing.route) {
popUpTo(Routes.Settlement.route) { popUpTo(Routes.Settlement.route) {
inclusive = true inclusive = true
} }
@ -147,7 +147,7 @@ fun AppNavGraph(
onProceedVoid = { payDetail -> onProceedVoid = { payDetail ->
sharedViewModel.transactionsType.value = com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType.VOID sharedViewModel.transactionsType.value = com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType.VOID
sharedViewModel.payDetail.value = payDetail sharedViewModel.payDetail.value = payDetail
navController.navigate(Routes.SendingToHost.route) { navController.navigate(Routes.Processing.route) {
popUpTo(Routes.VoidTranDetail.route) { popUpTo(Routes.VoidTranDetail.route) {
inclusive = true inclusive = true
} }
@ -320,8 +320,8 @@ fun AppNavGraph(
launchSingleTop = true launchSingleTop = true
} }
}, },
onNavigateSendingToHost = { onNavigateProcessing = {
navController.navigate(Routes.SendingToHost.route) { navController.navigate(Routes.Processing.route) {
popUpTo(Routes.PinPad.route) { popUpTo(Routes.PinPad.route) {
inclusive = true inclusive = true
} }
@ -338,8 +338,8 @@ fun AppNavGraph(
InputRrnRoute( InputRrnRoute(
sharedViewModel = sharedViewModel, sharedViewModel = sharedViewModel,
onBack = { navController.popBackStack() }, onBack = { navController.popBackStack() },
onNavigateSendingToHost = { onNavigateProcessing = {
navController.navigate(Routes.SendingToHost.route) { navController.navigate(Routes.Processing.route) {
popUpTo(Routes.InputRrn.route) { popUpTo(Routes.InputRrn.route) {
inclusive = true inclusive = true
} }
@ -349,14 +349,14 @@ fun AppNavGraph(
) )
} }
composable(Routes.SendingToHost.route) { composable(Routes.Processing.route) {
val sharedViewModel: SharedViewModel = hiltViewModel(activity) val sharedViewModel: SharedViewModel = hiltViewModel(activity)
SendingToHostRoute( ProcessingRoute(
sharedViewModel = sharedViewModel, sharedViewModel = sharedViewModel,
onNavigateTransactionResult = { onNavigateTransactionResult = {
navController.navigate(Routes.TransactionResult.route) { navController.navigate(Routes.TransactionResult.route) {
popUpTo(Routes.SendingToHost.route) { popUpTo(Routes.Processing.route) {
inclusive = true inclusive = true
} }
launchSingleTop = true launchSingleTop = true

2
app/src/main/java/com/mob/utsmyanmar/ui/navigation/Routes.kt
View File

@ -23,7 +23,7 @@ sealed class Routes(val route: String) {
data object ProcessingCard : Routes("processing_card") data object ProcessingCard : Routes("processing_card")
data object PinPad : Routes("pin_pad") data object PinPad : Routes("pin_pad")
data object InputRrn : Routes("input_rrn") data object InputRrn : Routes("input_rrn")
data object SendingToHost : Routes("sending_to_host") data object Processing : Routes("processing")
data object TransactionResult : Routes("transaction_result") data object TransactionResult : Routes("transaction_result")
data object PrintReceipt : Routes("print_receipt") data object PrintReceipt : Routes("print_receipt")
} }

4
app/src/main/java/com/mob/utsmyanmar/ui/pinpad/PinPadRoute.kt
View File

@ -18,7 +18,7 @@ fun PinPadRoute(
sharedViewModel: SharedViewModel, sharedViewModel: SharedViewModel,
transProcessViewModel: TransProcessViewModel, transProcessViewModel: TransProcessViewModel,
onNavigateInputRrn: () -> Unit, onNavigateInputRrn: () -> Unit,
onNavigateSendingToHost: () -> Unit, onNavigateProcessing: () -> Unit,
onBack: () -> Unit onBack: () -> Unit
) { ) {
val pinText by pinPadViewModel.pinText.collectAsStateWithLifecycle() val pinText by pinPadViewModel.pinText.collectAsStateWithLifecycle()
@ -41,7 +41,7 @@ fun PinPadRoute(
if (sharedViewModel.transactionsType.value == TransactionsType.REFUND) { if (sharedViewModel.transactionsType.value == TransactionsType.REFUND) {
onNavigateInputRrn() onNavigateInputRrn()
} else { } else {
onNavigateSendingToHost() onNavigateProcessing()
} }
} }

6
app/src/main/java/com/mob/utsmyanmar/ui/refund_rrn/InputRrnRoute.kt
View File

@ -5,7 +5,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import com.mob.utsmyanmar.ui.components.NumericEntryScreen import com.mob.utsmyanmar.ui.amount.NumericEntryScreen
import com.mob.utsmyanmar.viewmodel.SharedViewModel import com.mob.utsmyanmar.viewmodel.SharedViewModel
import com.utsmyanmar.paylibs.utils.POSUtil import com.utsmyanmar.paylibs.utils.POSUtil
@ -15,7 +15,7 @@ private const val RRN_MAX_LENGTH = 12
fun InputRrnRoute( fun InputRrnRoute(
sharedViewModel: SharedViewModel, sharedViewModel: SharedViewModel,
onBack: () -> Unit, onBack: () -> Unit,
onNavigateSendingToHost: () -> Unit onNavigateProcessing: () -> Unit
) { ) {
var rrn by rememberSaveable { var rrn by rememberSaveable {
mutableStateOf(sharedViewModel.rrNNo.value.orEmpty()) mutableStateOf(sharedViewModel.rrNNo.value.orEmpty())
@ -42,7 +42,7 @@ fun InputRrnRoute(
payDetail.referNo = trimmedRrn payDetail.referNo = trimmedRrn
sharedViewModel.payDetail.value = payDetail sharedViewModel.payDetail.value = payDetail
} }
onNavigateSendingToHost() onNavigateProcessing()
}, },
onKeyClick = { value -> onKeyClick = { value ->
rrn = appendRrnValue(rrn, value) rrn = appendRrnValue(rrn, value)

4
app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostRoute.kt
View File

@ -8,7 +8,7 @@ import kotlinx.coroutines.delay
private const val MOCK_HOST_DELAY_MS = 2000L private const val MOCK_HOST_DELAY_MS = 2000L
@Composable @Composable
fun SendingToHostRoute( fun ProcessingRoute(
sharedViewModel: SharedViewModel, sharedViewModel: SharedViewModel,
onNavigateTransactionResult: () -> Unit onNavigateTransactionResult: () -> Unit
) { ) {
@ -18,5 +18,5 @@ fun SendingToHostRoute(
onNavigateTransactionResult() onNavigateTransactionResult()
} }
SendingToHostScreen() ProcessingScreen()
} }

8
app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostScreen.kt
View File

@ -25,7 +25,7 @@ import com.mob.utsmyanmar.ui.theme.Primary
import com.mob.utsmyanmar.ui.theme.White import com.mob.utsmyanmar.ui.theme.White
@Composable @Composable
fun SendingToHostScreen() { fun ProcessingScreen() {
Scaffold( Scaffold(
containerColor = White containerColor = White
) { paddingValues -> ) { paddingValues ->
@ -57,7 +57,7 @@ fun SendingToHostScreen() {
Spacer(modifier = Modifier.height(20.dp)) Spacer(modifier = Modifier.height(20.dp))
Text( Text(
text = "Sending Data", text = "Processing",
color = White, color = White,
fontSize = 24.sp, fontSize = 24.sp,
fontWeight = FontWeight.Bold fontWeight = FontWeight.Bold
@ -66,7 +66,7 @@ fun SendingToHostScreen() {
Spacer(modifier = Modifier.height(10.dp)) Spacer(modifier = Modifier.height(10.dp))
Text( Text(
text = "Please wait while we send transaction data to host.", text = "Please wait while your transaction is being processed.",
color = White, color = White,
fontSize = 15.sp, fontSize = 15.sp,
textAlign = TextAlign.Center textAlign = TextAlign.Center
@ -77,7 +77,7 @@ fun SendingToHostScreen() {
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(24.dp))
Text( Text(
text = "Mock host communication in progress.", text = "Transaction processing in progress.",
color = Black, color = Black,
fontSize = 14.sp, fontSize = 14.sp,
textAlign = TextAlign.Center textAlign = TextAlign.Center

8
paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java
View File

@ -347,12 +347,12 @@ public class ISOSocket {
* If it is not secondary, go with primary * If it is not secondary, go with primary
*/ */
if (!isSwitchIp) { if (!isSwitchIp) {
serverIP = getIp(); // serverIP = getIp();
serverPort = getPort(); // serverPort = getPort();
// serverIP = "posuat.myanmarorientalbank.com"; // serverIP = "posuat.myanmarorientalbank.com";
// serverPort = 5033; // serverPort = 5033;
// serverIP = "10.255.255.195"; serverIP = "192.168.100.9";
// serverPort = 5555; serverPort = 5001;
} else { } else {
isSwitchIp = false; isSwitchIp = false;
} }