Compare commits

..

No commits in common. "4ffdc1f67956e68f3834dbced7993c03371f05f0" and "bd90bc4a31b55affa71bbaf477edfde5e943c0b6" have entirely different histories.

9 changed files with 3 additions and 74 deletions

View File

@ -2,7 +2,6 @@ package com.utsmm.kbz.ui.adapters;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -265,19 +264,6 @@ public class MyBindingAdapter {
imageView.setImageBitmap(bitmap); imageView.setImageBitmap(bitmap);
} }
@BindingAdapter("signatureBlob")
public static void setSignatureFromBlob(ImageView imageView, byte[] blob) {
if (blob != null && blob.length > 0) {
Bitmap bitmap = BitmapFactory.decodeByteArray(blob, 0, blob.length);
if (bitmap != null) {
imageView.setImageBitmap(bitmap);
imageView.setVisibility(View.VISIBLE);
return;
}
}
imageView.setVisibility(View.GONE);
}
@BindingAdapter({"mmpayData"}) @BindingAdapter({"mmpayData"})
public static void setMMPayQRCode(AppCompatImageView imageView,String data) { public static void setMMPayQRCode(AppCompatImageView imageView,String data) {
//250 //250

View File

@ -578,7 +578,6 @@ public class ProcessingFragment extends DataBindingFragment {
request.setDE14(PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate())); request.setDE14(PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate()));
request.setDE43(formatDE43(cardHolderName)); request.setDE43(formatDE43(cardHolderName));
request.setDE48(payDetail.getAID()); request.setDE48(payDetail.getAID());
request.setDE115("");
return request; return request;
} }

View File

@ -134,7 +134,6 @@ public class SignatureFragment extends DataBindingFragment {
private void updateData() { private void updateData() {
PayDetail payDetail = sharedViewModel.payDetail.getValue(); PayDetail payDetail = sharedViewModel.payDetail.getValue();
payDetail.setESignHexData(BitmapUtils.bitmapToHexString(mSignaturePad.getSignatureBitmap()));
byte[] blob = BitmapUtils.bitmapToBytes(mSignaturePad.getSignatureBitmap()); byte[] blob = BitmapUtils.bitmapToBytes(mSignaturePad.getSignatureBitmap());
payDetail.setESignBlob(blob); payDetail.setESignBlob(blob);
sharedViewModel.payDetail.setValue(payDetail); sharedViewModel.payDetail.setValue(payDetail);

View File

@ -452,7 +452,6 @@ public class EmvTransactionProcessViewModel extends EmvBaseViewModel implements
public void processVoidDB(PayDetail payResult) { public void processVoidDB(PayDetail payResult) {
mPayDetail.setIsCanceled(true); mPayDetail.setIsCanceled(true);
updatePayDetail(mPayDetail); updatePayDetail(mPayDetail);
payResult.setESignBlob(mPayDetail.getESignBlob());
repository.insertPayDetail(updateCurrentDateAndTime(payResult)); repository.insertPayDetail(updateCurrentDateAndTime(payResult));
} }

View File

@ -292,7 +292,6 @@ public class TransProcessViewModel extends ViewModel implements ProcessingTransa
public void processVoidDB(PayDetail payResult) { public void processVoidDB(PayDetail payResult) {
payDetail.setIsCanceled(true); payDetail.setIsCanceled(true);
updatePayDetail(payDetail); updatePayDetail(payDetail);
payResult.setESignBlob(payDetail.getESignBlob());
repository.insertPayDetail(updateCurrentDateAndTime(payResult)); repository.insertPayDetail(updateCurrentDateAndTime(payResult));
} }

View File

@ -478,46 +478,6 @@
tools:text="12/12/2024 12:12:12" /> tools:text="12/12/2024 12:12:12" />
</LinearLayout> </LinearLayout>
<!-- Divider -->
<View
android:id="@+id/signatureDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorPrimary"
android:alpha="0.2"
android:visibility="@{sharedViewModel.payDetail.ESignBlob != null ? View.VISIBLE : View.GONE}" />
<!-- Original Signature -->
<LinearLayout
android:id="@+id/signatureSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingVertical="12dp"
android:visibility="@{sharedViewModel.payDetail.ESignBlob != null ? View.VISIBLE : View.GONE}">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/txt_signature"
android:textColor="@color/colorPrimary"
android:textSize="15sp"
android:fontFamily="sans-serif"
android:alpha="0.8"
android:layout_marginBottom="8dp" />
<ImageView
android:id="@+id/ivOriginalSignature"
android:layout_width="match_parent"
android:layout_height="120dp"
android:scaleType="fitCenter"
android:background="@drawable/bg_edittext_primary_border"
android:padding="4dp"
app:signatureBlob="@{sharedViewModel.payDetail.ESignBlob}" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

View File

@ -461,7 +461,6 @@
<string name="txt_batch_number">Batch Number</string> <string name="txt_batch_number">Batch Number</string>
<string name="txt_base_amount">Base Amount</string> <string name="txt_base_amount">Base Amount</string>
<string name="txt_date_time">Date/Time</string> <string name="txt_date_time">Date/Time</string>
<string name="txt_signature">Signature</string>
<string name="txt_tip_adjust_not_allowed">TIP ADJUST NOT ALLOW</string> <string name="txt_tip_adjust_not_allowed">TIP ADJUST NOT ALLOW</string>
<string name="txt_wave_pay">WavePay</string> <string name="txt_wave_pay">WavePay</string>
<string name="txt_connecting_to_host">Connecting to host</string> <string name="txt_connecting_to_host">Connecting to host</string>

View File

@ -25,8 +25,6 @@ public class EReceiptCardRequest {
private String DE43; private String DE43;
private String DE48; private String DE48;
private String DE115;
public EReceiptCardRequest() {} public EReceiptCardRequest() {}
// GETTERS // GETTERS
@ -89,9 +87,6 @@ public class EReceiptCardRequest {
public String getDE38(){ return DE38; } public String getDE38(){ return DE38; }
public String getDE22(){ return DE22; } public String getDE22(){ return DE22; }
public String getBatchNumber(){ return batchNumber; } public String getBatchNumber(){ return batchNumber; }
public String getDE115(){
return DE115;
}
// SETTERS // SETTERS
public void setDE3(String DE3) { public void setDE3(String DE3) {
this.DE3 = DE3; this.DE3 = DE3;
@ -168,8 +163,4 @@ public class EReceiptCardRequest {
public void setDE48(String DE48){ public void setDE48(String DE48){
this.DE48 = DE48; this.DE48 = DE48;
} }
public void setDE115(String DE115) {
this.DE115 = DE115;
}
} }

View File

@ -1420,12 +1420,9 @@ public abstract class BaseXPrint {
} }
private void addSignatureBitmap(PayDetail payDetail) { private void addSignatureBitmap(PayDetail payDetail) {
byte[] blob = payDetail.getESignBlob(); if (payDetail.getESignHexData() != null) {
if (blob != null && blob.length > 0) { Bitmap signatureBitmap = BitmapUtils.hexStringToBitmap(payDetail.getESignHexData());
Bitmap signatureBitmap = android.graphics.BitmapFactory.decodeByteArray(blob, 0, blob.length); printer.appendImage(signatureBitmap, AlignEnum.CENTER);
if (signatureBitmap != null) {
printer.appendImage(signatureBitmap, AlignEnum.CENTER);
}
} }
} }