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

@@ -86,19 +86,9 @@ fun AppNavGraph(
         }
 
         composable(Routes.Signature.route) {
-            val sharedViewModel: SharedViewModel = hiltViewModel(activity)
             SignaturePad(
                 onBack = { navController.popBackStack() },
-                onConfirm = { _, bitmap, signatureBlob ->
+                onConfirm = { navController.popBackStack() }
-                    sharedViewModel.signBitmap = bitmap
-                    sharedViewModel.updateSignatureBlob(signatureBlob)
-                    navController.navigate(Routes.TransactionResult.route) {
-                        popUpTo(Routes.Signature.route) {
-                            inclusive = true
-                        }
-                        launchSingleTop = true
-                    }
-                }
             )
         }
 
@@ -673,14 +663,6 @@ fun AppNavGraph(
                         launchSingleTop = true
                     }
                 },
-                onNavigateSignature = {
-                    navController.navigate(Routes.Signature.route) {
-                        popUpTo(Routes.Processing.route) {
-                            inclusive = true
-                        }
-                        launchSingleTop = true
-                    }
-                },
                 onNavigateMain = {
                     navController.navigate(Routes.Dashboard.route) {
                         popUpTo(Routes.Dashboard.route) {

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

@@ -2,15 +2,21 @@ package com.mob.utsmyanmar.ui.sending_to_host
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.mob.utsmyanmar.model.TransResultStatus
-import com.mob.utsmyanmar.model.TransactionStatus
-import com.mob.utsmyanmar.ui.settlement.SettlementViewModel
 import com.mob.utsmyanmar.viewmodel.SharedViewModel
 import com.mob.utsmyanmar.viewmodel.TransProcessViewModel
-import com.utsmyanmar.paylibs.model.enums.TransCVM
+import kotlinx.coroutines.delay
+import androidx.compose.runtime.getValue
+import com.mob.utsmyanmar.ui.transaction_result.TransactionResultState
+import com.mob.utsmyanmar.viewmodel.ProcessingTransaction
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import androidx.compose.runtime.collectAsState
+import com.mob.utsmyanmar.model.TransactionStatus
+import com.mob.utsmyanmar.ui.settlement.SettlementViewModel
 import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType
+import kotlinx.coroutines.channels.Channel
 
 private const val MOCK_HOST_DELAY_MS = 2000L
 
@@ -20,7 +26,6 @@ fun ProcessingRoute(
     transProcessViewModel: TransProcessViewModel,
     settlementViewModel: SettlementViewModel,
     onNavigateTransactionResult: () -> Unit,
-    onNavigateSignature: () -> Unit,
     onNavigateMain: ()-> Unit
 ) {
 
@@ -55,11 +60,7 @@ fun ProcessingRoute(
             when(transStatus) {
                 TransResultStatus.SUCCESS -> {
                     sharedViewModel.payDetail.value = transProcessViewModel.payDetailResult.value
-                    if (requiresSignature(sharedViewModel.payDetail.value)) {
+                    onNavigateTransactionResult()
-                        onNavigateSignature()
-                    } else {
-                        onNavigateTransactionResult()
-                    }
                 }
 
                 TransResultStatus.FAIL -> {
@@ -74,6 +75,12 @@ fun ProcessingRoute(
         }
     }
 
+
+
+
+
+
+
     if(sharedViewModel.transactionsType.value == TransactionsType.SETTLEMENT) {
         ProcessingScreen(settlementStatus.processingState)
     } else {
@@ -82,8 +89,3 @@ fun ProcessingRoute(
 
 
 }
-
-private fun requiresSignature(payDetail: com.utsmyanmar.paylibs.model.PayDetail?): Boolean {
-    return payDetail?.transCVM == TransCVM.SIGNATURE && !payDetail.isFreeSign
-//    return true;
-}

app/src/main/java/com/mob/utsmyanmar/ui/signature_pad/SignaturePad.kt

@@ -1,7 +1,5 @@
 package com.mob.utsmyanmar.ui.signature_pad
 
-import android.graphics.Bitmap
-import android.graphics.Paint
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectDragGestures
@@ -29,88 +27,34 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.graphics.createBitmap
 import com.mob.utsmyanmar.ui.components.appbar.AppBar
 import com.mob.utsmyanmar.ui.theme.MOBPOSTheme
-import java.io.ByteArrayOutputStream
-import android.graphics.Canvas as AndroidCanvas
-import android.graphics.Path as AndroidPath
 import com.mob.utsmyanmar.ui.theme.Color as AppColor
 
 @Composable
 fun SignaturePad(
     modifier: Modifier = Modifier,
     signatureColor: Color = Color.Black,
+    strokeWidth: Float = 8f,
     onBack: () -> Unit = {},
-    // signatureBlob is null for Digital mode (using stored signature) or when nothing was drawn
+    onConfirm: () -> Unit = {}
-    onConfirm: (SignatureMode, Bitmap?, signatureBlob: ByteArray?) -> Unit = { _, _, _ -> }
 ) {
     val paths = remember { mutableStateListOf<List<Offset>>() }
     val currentPath = remember { mutableStateListOf<Offset>() }
     var selectedMode by remember { mutableStateOf(SignatureMode.Manual) }
-    var canvasSize by remember { mutableStateOf(Size.Zero) }
-    var strokeWidth = 6f
-
     fun clearSignature() {
         paths.clear()
         currentPath.clear()
     }
 
-
-    fun buildBitmap(): Bitmap? {
-        if (selectedMode == SignatureMode.Digital) return null
-        if (paths.isEmpty() && currentPath.isEmpty()) return null
-        if (canvasSize.width <= 0f || canvasSize.height <= 0f) return null
-
-        val bitmap =
-            createBitmap(canvasSize.width.toInt(), canvasSize.height.toInt(), Bitmap.Config.RGB_565)
-        val canvas = AndroidCanvas(bitmap)
-        canvas.drawColor(android.graphics.Color.WHITE) // fill white background first
-
-        val paint = Paint().apply {
-            color = android.graphics.Color.BLACK
-            style = Paint.Style.STROKE
-            isAntiAlias = true
-            strokeCap = Paint.Cap.ROUND
-            strokeJoin = Paint.Join.ROUND
-            strokeWidth = 10f
-        }
-
-        fun drawStroke(points: List<Offset>) {
-            if (points.size < 2) return
-            val path = AndroidPath().apply {
-                moveTo(points.first().x, points.first().y)
-                for (index in 1 until points.size) {
-                    lineTo(points[index].x, points[index].y)
-                }
-            }
-            canvas.drawPath(path, paint)
-        }
-
-        paths.forEach(::drawStroke)
-        drawStroke(currentPath)
-
-        return bitmap
-    }
-
-    fun bitmapToBlob(bitmap: Bitmap): ByteArray {
-        ByteArrayOutputStream().use { stream ->
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
-            return stream.toByteArray()
-        }
-    }
-
     Scaffold(
         topBar = {
             AppBar(
@@ -129,14 +73,10 @@ fun SignaturePad(
         ) {
             Box(
                 modifier = Modifier
-                    .fillMaxWidth(0.85f) // narrower than full width, adjust as needed
+                    .weight(1f)
-                    .height(180.dp)      // fixed height instead of weight(1f)
+                    .fillMaxWidth()
-                    .align(Alignment.CenterHorizontally)
                     .background(Color.White, RoundedCornerShape(16.dp))
                     .padding(12.dp)
-                    .onSizeChanged { size ->
-                        canvasSize = Size(size.width.toFloat(), size.height.toFloat())
-                    }
                     .pointerInput(Unit) {
                         detectDragGestures(
                             onDragStart = { startOffset ->
@@ -186,10 +126,9 @@ fun SignaturePad(
                 }
             }
 
-            Column(
+            Column (
-                modifier = Modifier
+                modifier = Modifier.fillMaxWidth().height(150.dp),
-                    .fillMaxWidth()
+//                horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    .height(150.dp)
             ) {
                 SignatureModeOption(
                     title = "Manual Sign",
@@ -224,15 +163,7 @@ fun SignaturePad(
                 }
 
                 Button(
-                    onClick = {
+                    onClick = onConfirm,
-                        val bitmap = buildBitmap()
-                        if (selectedMode == SignatureMode.Manual && bitmap == null) {
-                            // nothing drawn yet on Manual mode — block confirm
-                            return@Button
-                        }
-                        val signatureBlob = bitmap?.let { bitmapToBlob(it) }
-                        onConfirm(selectedMode, bitmap, signatureBlob)
-                    },
                     modifier = Modifier
                         .weight(1f)
                         .height(50.dp),
@@ -248,7 +179,7 @@ fun SignaturePad(
     }
 }
 
-enum class SignatureMode {
+private enum class SignatureMode {
     Manual,
     Digital
 }
@@ -297,4 +228,4 @@ fun SignaturePadPreview() {
     MOBPOSTheme {
         SignaturePad()
     }
-}
+}

app/src/main/java/com/mob/utsmyanmar/viewmodel/SharedViewModel.kt

@@ -4,9 +4,9 @@ import android.graphics.Bitmap
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import com.mob.utsmyanmar.model.SettlementType
-import com.utsmyanmar.baselib.db.dao.PayDetailDao
+import com.mob.utsmyanmar.ui.processing_card.ProcessingCardState
+import com.mob.utsmyanmar.ui.sending_to_host.ProcessingState
 import com.utsmyanmar.baselib.network.model.sirius.SiriusRequest
 import com.utsmyanmar.baselib.network.model.sirius.SiriusResponse
 import com.utsmyanmar.baselib.repo.Repository
@@ -21,20 +21,19 @@ import com.utsmyanmar.paylibs.utils.AccountType
 import com.utsmyanmar.paylibs.utils.PrintStatus
 import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation
 import com.utsmyanmar.paylibs.utils.enums.HostType
-import com.utsmyanmar.paylibs.utils.enums.TransMenu
 import com.utsmyanmar.paylibs.utils.iso_utils.TransactionType
+import com.utsmyanmar.paylibs.utils.enums.TransMenu
 import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.reactivex.rxjava3.core.Observable
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.asStateFlow
 import sunmi.sunmiui.utils.LogUtil
 import javax.inject.Inject
 
 @HiltViewModel
 class SharedViewModel @Inject constructor(
-    private val repository: Repository,
+    private val repository: Repository
-    private val payDetailDao: PayDetailDao
 ) : ViewModel() {
 
     companion object {
@@ -317,7 +316,7 @@ class SharedViewModel @Inject constructor(
 
     private fun printReceipt(isMerchantCopy: Boolean) {
         PrintXReceipt.getInstance()
-            .printSmileReceipt(payDetail.value, isMerchantCopy, signBitmap, object : PrintXStatus {
+            .printSmileReceipt(payDetail.value, isMerchantCopy, object : PrintXStatus {
 
                 override fun onSuccess() {
 
@@ -352,7 +351,7 @@ class SharedViewModel @Inject constructor(
         }
 
         PrintXReceipt.getInstance()
-            .printSmileReceipt(getPayDetail(), isFirstPrint, signBitmap, object : PrintXStatus {
+            .printSmileReceipt(getPayDetail(), isFirstPrint, object : PrintXStatus {
 
                 override fun onSuccess() {
 
@@ -667,13 +666,4 @@ class SharedViewModel @Inject constructor(
             SystemParamsOperation.getInstance().wavePayStatus
         )
     }
-    fun updateSignatureBlob(signatureBlob: ByteArray?) {
-        val current = payDetail.value ?: return
-        current.signatureBlob = signatureBlob
-        payDetail.value = current
-
-        viewModelScope.launch(Dispatchers.IO) {
-            payDetailDao.updateSignatureBlob(current.voucherNo, signatureBlob)
-        }
-    }
 }

baselib/src/main/java/com/utsmyanmar/baselib/db/AppDatabase.java

@@ -25,9 +25,9 @@ import com.utsmyanmar.baselib.db.model.RidEntity;
 import com.utsmyanmar.paylibs.model.PayDetail;
 
 
-@Database(entities = {PayDetail.class, ChipAidEntity.class, PayWaveEntity.class, PayPassEntity.class, QuickPassEntity.class, RidEntity.class, MPUCtlsEntity.class, BinEntity.class}, version = 13, exportSchema = false)
+@Database(entities = {PayDetail.class, ChipAidEntity.class, PayWaveEntity.class, PayPassEntity.class, QuickPassEntity.class, RidEntity.class, MPUCtlsEntity.class, BinEntity.class},version = 12,exportSchema = false)
 @TypeConverters({SettleDataConverter.class, TransCVMConverter.class, CardSchemeConverter.class})
-public abstract class AppDatabase extends RoomDatabase {
+public abstract class AppDatabase  extends RoomDatabase {
     public static volatile AppDatabase INSTANCE;
 
     public abstract PayDetailDao payDetailDao();

baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java

@@ -5,9 +5,13 @@ import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
 import androidx.room.Query;
+import androidx.room.Transaction;
 import androidx.room.Update;
 
 import com.utsmyanmar.paylibs.model.PayDetail;
+import com.utsmyanmar.paylibs.system.SingleLiveEvent;
+import com.utsmyanmar.paylibs.utils.iso_utils.TransactionType;
+import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
 
 import java.util.List;
 
@@ -153,7 +157,4 @@ public interface PayDetailDao {
     @Query("SELECT * FROM paydetail ORDER BY PID DESC")
     LiveData<List<PayDetail>> getAllTrans();
 
-    @Query("UPDATE paydetail SET signatureBlob = :blob WHERE voucherNo = :voucherNo")
-    void updateSignatureBlob(String voucherNo, byte[] blob);
-
 }

baselib/src/main/java/com/utsmyanmar/baselib/di/DatabaseModule.java

@@ -1,6 +1,10 @@
 package com.utsmyanmar.baselib.di;
 
 
+
+
+import static com.utsmyanmar.baselib.db.AppDatabase.INSTANCE;
+
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -12,6 +16,8 @@ import androidx.room.Room;
 import androidx.room.RoomDatabase;
 import androidx.room.migration.Migration;
 import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.sqlite.db.SupportSQLiteOpenHelper;
+
 
 import com.utsmyanmar.baselib.db.AppDatabase;
 import com.utsmyanmar.baselib.db.dao.BinDao;
@@ -22,6 +28,8 @@ import com.utsmyanmar.baselib.db.dao.PayPassDao;
 import com.utsmyanmar.baselib.db.dao.PayWaveDao;
 import com.utsmyanmar.baselib.db.dao.QuickPassDao;
 import com.utsmyanmar.baselib.db.dao.RidDao;
+import com.utsmyanmar.baselib.util.SecureKeyUtil;
+
 
 import java.io.File;
 import java.io.IOException;
@@ -31,12 +39,13 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.UnrecoverableEntryException;
-import java.security.cert.CertificateException;
 import java.util.concurrent.Executors;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
+import javax.inject.Provider;
 import javax.inject.Singleton;
+import java.security.cert.CertificateException;
 
 import dagger.Module;
 import dagger.Provides;
@@ -344,14 +353,6 @@ public class DatabaseModule {
         }
     };
 
-    static final Migration MIGRATION_12_13 = new Migration(12, 13) {
-        @Override
-        public void migrate(SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE paydetail "
-                    + " ADD COLUMN signatureBlob BLOB");
-        }
-    };
-
     private static byte[] getDatabaseKey(Context context) throws KeyStoreException, CertificateException,
             NoSuchAlgorithmException, IOException, NoSuchProviderException,
             InvalidAlgorithmParameterException, UnrecoverableEntryException {
@@ -397,14 +398,13 @@ public class DatabaseModule {
     @Provides
     @Singleton
     public static AppDatabase provideAppDatabase(Application application) {
-        return Room.databaseBuilder(application, AppDatabase.class, "mob")
+                return Room.databaseBuilder(application, AppDatabase.class,"yoma")
 //                .fallbackToDestructiveMigration()
                 .addMigrations(MIGRATION_7_8)
                 .addMigrations(MIGRATION_8_9)
                 .addMigrations(MIGRATION_9_10)
                 .addMigrations(MIGRATION_10_11)
                 .addMigrations(MIGRATION_11_12)
-                .addMigrations(MIGRATION_12_13)
                 .allowMainThreadQueries()
                 .addCallback(new RoomDatabase.Callback() {
                     @Override
@@ -414,9 +414,9 @@ public class DatabaseModule {
                             @Override
                             public void run() {
 
-                                /*
+                              /*
-                                 *  init here
+                              *  init here
-                                 * */
+                              * */
                             }
                         });
                     }
@@ -425,6 +425,8 @@ public class DatabaseModule {
     }
 
 
+
+
     private static boolean isDatabaseFileCorruptOrWrongKey(Application application) {
         File dbFile = application.getDatabasePath(DATABASE_NAME);
         return dbFile.exists() && dbFile.length() > 0;
@@ -464,11 +466,11 @@ public class DatabaseModule {
                 .putLong("db_recreated_time", System.currentTimeMillis())
                 .apply();
     }
-
+    
 
     @Provides
     @Singleton
-    public static PayDetailDao providePayDetailDao(AppDatabase appDatabase) {
+    public static PayDetailDao providePayDetailDao(AppDatabase appDatabase){
         return appDatabase.payDetailDao();
     }
 
@@ -505,13 +507,9 @@ public class DatabaseModule {
 
     @Provides
     @Singleton
-    public static MPUCtlsDao provideMPUCtlsDao(AppDatabase appDatabase) {
+    public static MPUCtlsDao provideMPUCtlsDao(AppDatabase appDatabase) { return appDatabase.mpuCtlsDao(); }
-        return appDatabase.mpuCtlsDao();
-    }
 
     @Provides
     @Singleton
-    public static BinDao provideBinDao(AppDatabase appDatabase) {
+    public static BinDao provideBinDao(AppDatabase appDatabase) { return appDatabase.binDao(); }
-        return appDatabase.binDao();
-    }
 }

paylibs/src/main/java/com/utsmyanmar/paylibs/model/PayDetail.java

@@ -74,7 +74,6 @@ public class PayDetail implements Serializable {
     public String cardOrgCode = "";             // International credit card company code (domain 63.1)
     public String reference = "";               // Remarks
     public String eSignHexData = "";            // Electronic signature hexadecimal data
-    private byte[] signatureBlob;                // Signature store as blob type
 
     public int transPlatform;                   // Supported trading platforms: 0: bank card 1: Alipay 2: WeChat 3: UnionPay wallet
     public int transactionType;                 // 1: Consumption 2: Consumption cancellation; 3: Return 4. Pre-authorization 5. Pre-authorization cancellation 6. Pre-authorization completed 7. Pre-authorization completed cancellation 8. Settlement 9. Sign-in 10. Sign-out 11. Transaction query
@@ -1360,11 +1359,4 @@ public class PayDetail implements Serializable {
         this.currency = currency;
     }
 
-    public byte[] getSignatureBlob() {
-        return signatureBlob;
-    }
-
-    public void setSignatureBlob(byte[] signatureBlob) {
-        this.signatureBlob = signatureBlob;
-    }
 }

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java

@@ -722,7 +722,8 @@ public abstract class BaseXPrint {
             sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback);
             sunmiPrinterService.setAlignment(1, innerResultCallback);
 
-            String cvmText;
+            // default
+            String cvmText = "NO SIGNATURE REQUIRED";
             switch (payDetail.getTransCVM()) {
                 case SIGNATURE: cvmText = "SIGN : -----------------------------";
                     break;
@@ -734,9 +735,8 @@ public abstract class BaseXPrint {
                     cvmText = "NO SIGNATURE REQUIRED";
                     break;
             }
-            addSignatureBitmap(payDetail);
-            sunmiPrinterService.printText(cvmText, innerResultCallback);
 
+            sunmiPrinterService.printText(cvmText, innerResultCallback);
 
 //            if (payDetail.getIsFreeSign()) {
 //                sunmiPrinterService.printText("NO SIGNATURE REQUIRED", innerResultCallback);
@@ -948,14 +948,4 @@ public abstract class BaseXPrint {
 
         }
     };
-
-    private void addSignatureBitmap(PayDetail payDetail) throws RemoteException {
-        byte[] signatureBlob = payDetail.getSignatureBlob();
-        if (signatureBlob != null && signatureBlob.length > 0) {
-            Bitmap signatureBitmap = android.graphics.BitmapFactory.decodeByteArray(signatureBlob, 0, signatureBlob.length);
-            if (signatureBitmap != null) {
-                sunmiPrinterService.printBitmap(signatureBitmap, innerResultCallback);
-            }
-        }
-    }
 }

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintX.java

@@ -2,7 +2,6 @@ package com.utsmyanmar.paylibs.print.printx;
 
 import com.utsmyanmar.paylibs.model.PayDetail;
 import com.utsmyanmar.paylibs.utils.enums.HostType;
-import android.graphics.Bitmap;
 
 import java.util.List;
 
@@ -10,7 +9,7 @@ public interface PrintX {
 
     void printSimple();
 
-    void printSmileReceipt(PayDetail payDetail, boolean isMerchantCopy, Bitmap signBitmap, PrintXStatus printXStatus);
+    void printSmileReceipt(PayDetail payDetail, boolean isMerchantCopy,PrintXStatus printXStatus);
 
     void printISOReceipt(PayDetail payDetail);
 

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java

@@ -3,8 +3,16 @@ package com.utsmyanmar.paylibs.print.printx;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.os.RemoteException;
 
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
 import com.utsmyanmar.paylibs.Constant;
 import com.utsmyanmar.paylibs.PayLibsUtils;
 import com.utsmyanmar.paylibs.R;
@@ -23,8 +31,10 @@ import com.utsmyanmar.paylibs.utils.enums.HostType;
 import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
 import com.utsmyanmar.paylibs.utils.print_utils.BitmapUtils;
 
+import java.io.ByteArrayOutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -110,7 +120,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
 
 
     @Override
-    public void printSmileReceipt(PayDetail payDetail, boolean isMerchantCopy, Bitmap signBitmap, PrintXStatus printXStatus) {
+    public void printSmileReceipt(PayDetail payDetail, boolean isMerchantCopy,PrintXStatus printXStatus) {
         try {
             this.callbackStatus = printXStatus;
 
@@ -119,9 +129,9 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
             } else if (payDetail.getTransactionType() == TransactionsType.SETTLEMENT.value) {
                 printSmileSettlementReport(payDetail,printXStatus);
             } else if (payDetail.getICC55() == null || payDetail.getICC55().isEmpty() || payDetail.getAccountType().equals(CardScheme.MPU_CTLS.name)) {
-                printSmileMPUReceipt(payDetail, isMerchantCopy, signBitmap);
+                printSmileMPUReceipt(payDetail, isMerchantCopy);
             } else if (!payDetail.getICC55().equals("")) {
-                printSmileEMVReceipt(payDetail, isMerchantCopy, signBitmap);
+                printSmileEMVReceipt(payDetail, isMerchantCopy);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -246,7 +256,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
         }
     }
 
-    private void printSmileMPUReceipt(PayDetail payDetail, boolean isMerchantCopy, Bitmap signBitmap) {
+    private void printSmileMPUReceipt(PayDetail payDetail, boolean isMerchantCopy) {
         try {
 
             setHeight(0x12);
@@ -258,7 +268,6 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
 
             if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT)) {
                 printTransFooter(false,payDetail, isMerchantCopy);
-//                printSignatureBlock(payDetail, signBitmap);
             } else {
                 String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();
                 sunmiPrinterService.printText("\n", null);
@@ -273,7 +282,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
         }
     }
 
-    private void printSmileEMVReceipt(PayDetail payDetail, boolean isMerchantCopy, Bitmap signBitmap) {
+    private void printSmileEMVReceipt(PayDetail payDetail, boolean isMerchantCopy) {
         try {
             setHeight(0x12);
             printLogo();
@@ -283,7 +292,6 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
 
             if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT)) {
                 printTransFooter(false,payDetail, isMerchantCopy);
-//                printSignatureBlock(payDetail, signBitmap);
             } else {
                 String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();
                 sunmiPrinterService.setFontSize(textSize, null);
@@ -299,10 +307,13 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
         }
     }
 
+
     private void printTransDetailWave(PayDetail payDetail) {
         try {
 
-//            payDetail.getCustomerMobile() // as channel typeိ
+//            payDetail.getCustomerMobile() // as channel type
+
+
 
             if(payDetail.getTransactionType() == TransactionsType.WAVEPAY.value && payDetail.getQrTransStatus() == 1 ) {
                 sunmiPrinterService.printColumnsString(new String[]{"PAYMENT TYPE ",": "+ (payDetail.getCustomerMobile() == null || payDetail.getCustomerMobile().isEmpty() ? "-": payDetail.getCustomerMobile().toUpperCase())}, new int[]{2, 2}, new int[]{0, 0}, null);

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXReceipt.java

@@ -3,7 +3,6 @@ package com.utsmyanmar.paylibs.print.printx;
 import com.utsmyanmar.paylibs.model.PayDetail;
 import com.utsmyanmar.paylibs.utils.enums.HostType;
 
-import android.graphics.Bitmap;
 import java.util.List;
 
 public class PrintXReceipt {
@@ -22,8 +21,8 @@ public class PrintXReceipt {
         printX.printSimple();
     }
 
-    public void printSmileReceipt(PayDetail payDetail,boolean isMerchantCopy, Bitmap signBitmap,PrintXStatus printXStatus) {
+    public void printSmileReceipt(PayDetail payDetail,boolean isMerchantCopy,PrintXStatus printXStatus) {
-        printX.printSmileReceipt(payDetail,isMerchantCopy,signBitmap,printXStatus);
+        printX.printSmileReceipt(payDetail,isMerchantCopy,printXStatus);
     }
 
     public void printSmileSettlementReport(PayDetail payDetail,PrintXStatus printXStatus) {