Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug print bitmap on android #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug print bitmap on android #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions android/src/main/java/net/infoxication/reactstarprnt/RNStarPrntModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import android.text.TextPaint;
import android.net.Uri;
import android.provider.MediaStore;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.StaticLayout;
import android.text.Layout;
import android.util.Base64;
Expand Down Expand Up @@ -164,7 +164,22 @@ public void connect(final String portName, final String emulation, final Boolean

String portSettings = getPortSettingsOption(emulation);
if (starIoExtManager != null && starIoExtManager.getPort() != null) {
starIoExtManager.disconnect(null);
starIoExtManager.disconnect(new IConnectionCallback() {
@Override
public void onConnected(ConnectResult connectResult) {
if (connectResult == ConnectResult.Success || connectResult == ConnectResult.AlreadyConnected) {

promise.resolve("Printer Connected");

} else {
promise.reject("CONNECT_ERROR", "Error Connecting to the printer");
}
}
@Override
public void onDisconnected() {
//Do nothing
}
});
}
starIoExtManager = new StarIoExtManager(hasBarcodeReader ? StarIoExtManager.Type.WithBarcodeReader : StarIoExtManager.Type.Standard, portName, portSettings, 10000, context);
starIoExtManager.setListener(starIoExtManagerListener);
Expand Down Expand Up @@ -565,23 +580,23 @@ else if (command.hasKey("appendBytes")) {
}else builder.appendQrCode(command.getString("appendQrCode").getBytes(encoding), qrCodeModel, qrCodeLevel, cell);
} else if (command.hasKey("appendBitmap")){
ContentResolver contentResolver = context.getContentResolver();
String uriString = command.getString("appendBitmap");
String _uriString = command.getString("appendBitmap");
String uriString = _uriString.substring(_uriString.indexOf(",") + 1);
boolean diffusion = (command.hasKey("diffusion")) ? command.getBoolean("diffusion") : true;
int width = (command.hasKey("width")) ? command.getInt("width") : 576;
boolean bothScale = (command.hasKey("bothScale")) ? command.getBoolean("bothScale") : true;
ICommandBuilder.BitmapConverterRotation rotation = (command.hasKey("rotation")) ? getConverterRotation(command.getString("rotation")) : getConverterRotation("Normal");
try {
Uri imageUri = Uri.parse(uriString);
Bitmap bitmap = MediaStore.Images.Media.getBitmap(contentResolver, imageUri);
if(command.hasKey("absolutePosition")){
int position = command.getInt("absolutePosition");
builder.appendBitmapWithAbsolutePosition(bitmap, diffusion, width, bothScale, rotation, position);
}else if(command.hasKey("alignment")){
ICommandBuilder.AlignmentPosition alignmentPosition = getAlignment(command.getString("alignment"));
builder.appendBitmapWithAlignment(bitmap, diffusion, width, bothScale, rotation, alignmentPosition);
}else builder.appendBitmap(bitmap, diffusion, width, bothScale, rotation);
} catch (IOException e) {

final byte[] decodedBytes = Base64.decode(uriString, Base64.DEFAULT);
Bitmap bitmap = BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length);
if(command.hasKey("absolutePosition")){
int position = command.getInt("absolutePosition");
builder.appendBitmapWithAbsolutePosition(bitmap, diffusion, width, bothScale, rotation, position);
}else if(command.hasKey("alignment")){
ICommandBuilder.AlignmentPosition alignmentPosition = getAlignment(command.getString("alignment"));
builder.appendBitmapWithAlignment(bitmap, diffusion, width, bothScale, rotation, alignmentPosition);
}else {
builder.appendBitmap(bitmap, diffusion, width, bothScale, rotation);
}
} else if (command.hasKey("appendBitmapText")){
int fontSize = (command.hasKey("fontSize")) ? command.getInt("fontSize") : 25;
Expand Down