signature in void
This commit is contained in:
parent
9dbb722357
commit
4ffdc1f679
@ -2,6 +2,7 @@ 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;
|
||||||
@ -264,6 +265,19 @@ 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
|
||||||
|
|||||||
@ -452,6 +452,7 @@ 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -292,6 +292,7 @@ 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -478,6 +478,46 @@
|
|||||||
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>
|
||||||
|
|
||||||
|
|||||||
@ -461,6 +461,7 @@
|
|||||||
<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>
|
||||||
|
|||||||
@ -1420,9 +1420,12 @@ public abstract class BaseXPrint {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void addSignatureBitmap(PayDetail payDetail) {
|
private void addSignatureBitmap(PayDetail payDetail) {
|
||||||
if (payDetail.getESignHexData() != null) {
|
byte[] blob = payDetail.getESignBlob();
|
||||||
Bitmap signatureBitmap = BitmapUtils.hexStringToBitmap(payDetail.getESignHexData());
|
if (blob != null && blob.length > 0) {
|
||||||
printer.appendImage(signatureBitmap, AlignEnum.CENTER);
|
Bitmap signatureBitmap = android.graphics.BitmapFactory.decodeByteArray(blob, 0, blob.length);
|
||||||
|
if (signatureBitmap != null) {
|
||||||
|
printer.appendImage(signatureBitmap, AlignEnum.CENTER);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user