This commit is contained in:
moon 2026-05-25 11:02:15 +06:30
parent 0ed4113366
commit 5e2cfa3821
3 changed files with 12 additions and 7 deletions

View File

@ -94,6 +94,7 @@ fun DashboardScreen2(
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
deviceInfoViewModel.loadDeviceInfo(); deviceInfoViewModel.loadDeviceInfo();
} }
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val mainHandler = remember { Handler(Looper.getMainLooper()) } val mainHandler = remember { Handler(Looper.getMainLooper()) }
@ -150,10 +151,10 @@ fun DashboardScreen2(
dialogMessage = processingMessage(activeHostAction) dialogMessage = processingMessage(activeHostAction)
val signOnProcess = EchoTestProcess.getInstance() val signOnProcess = EchoTestProcess.getInstance()
val request = if (activeHostAction == "Log-Off") { val request = when (activeHostAction) {
signOnProcess.enqueueLogOff() "Echo Test" -> signOnProcess.enqueue(false)
} else { "Log-Off" -> signOnProcess.enqueueLogOff()
signOnProcess.enqueueLogOn() else -> signOnProcess.enqueueLogOn()
} }
request request
@ -274,6 +275,10 @@ fun DashboardScreen2(
scope.launch { drawerState.close() } scope.launch { drawerState.close() }
openHostActionDialog("Log-On") openHostActionDialog("Log-On")
} }
DrawerItem("Echo Test", Icons.Default.Sync) {
scope.launch { drawerState.close() }
openHostActionDialog("Echo Test")
}
DrawerItem("Log-Off", Icons.Default.Dashboard) { DrawerItem("Log-Off", Icons.Default.Dashboard) {
scope.launch { drawerState.close() } scope.launch { drawerState.close() }
openHostActionDialog("Log-Off") openHostActionDialog("Log-Off")

View File

@ -25,7 +25,7 @@ import sunmi.sunmiui.utils.LogUtil;
public class EchoTestProcess { public class EchoTestProcess {
private static final String TAG = EchoTestProcess.class.getSimpleName(); private static final String TAG = EchoTestProcess.class.getSimpleName();
private TradeData tradeData; private TradeData tradeData;
private PayDetail payDetail; private PayDetail payDetail;
private static EchoTestProcess INSTANCE; private static EchoTestProcess INSTANCE;
@ -47,7 +47,7 @@ public class EchoTestProcess {
private EchoTestProcess() { private EchoTestProcess() {
tradeData = Params.newTrade(true); tradeData = Params.newTrade(true);
payDetail = tradeData.getPayDetail(); payDetail = tradeData.getPayDetail();
isoMsgX = new ISOMsgX.ISOMsgXBuilder(ISOVersion.VERSION_1993, ISOMode.BOTH_HEADER_TPDU,HostName.BPC).build(); isoMsgX = new ISOMsgX.ISOMsgXBuilder(ISOVersion.VERSION_1993, ISOMode.ONLY_HEADER,HostName.FINEXUS).build();
} }
public StartSignOn enqueue(boolean isSecondary) { public StartSignOn enqueue(boolean isSecondary) {

View File

@ -28,7 +28,7 @@ public class FieldConfig {
public static int[][] FieldTypeConfig128 = public static int[][] FieldTypeConfig128 =
{ {
// /* FLD 00 */ {0, SDK_8583_LEN_BCD, 4, SDK_8583_DATA_BCD, SDK_8583_ALIGN_L, '0'}, // /* FLD 00 */ {0, SDK_8583_LEN_BCD, 4, SDK_8583_DATA_BCD, SDK_8583_ALIGN_L, '0'},
/* FLD 00 */ {0, SDK_8583_LEN_BCD, 4, SDK_8583_DATA_ASC, SDK_8583_ALIGN_L, '0'}, /* FLD 00 */ {0, SDK_8583_LEN_BCD, 4, SDK_8583_DATA_BCD, SDK_8583_ALIGN_L, '0'},
/* FLD 01 */ {0, SDK_8583_LEN_BCD, 8, SDK_8583_DATA_BIT, SDK_8583_ALIGN_L, 0}, /* FLD 01 */ {0, SDK_8583_LEN_BCD, 8, SDK_8583_DATA_BIT, SDK_8583_ALIGN_L, 0},
/* FLD 02 */ {2, SDK_8583_LEN_ASC, 19, SDK_8583_DATA_ASC, SDK_8583_ALIGN_L, '0'}, /* FLD 02 */ {2, SDK_8583_LEN_ASC, 19, SDK_8583_DATA_ASC, SDK_8583_ALIGN_L, '0'},