Skip to content

Commit

Permalink
feat(changed): add addTextLang method, get rid of legacy code
Browse files Browse the repository at this point in the history
  • Loading branch information
@tr3v3r
tr3v3r committed Mar 15, 2024
1 parent 64e7f04 commit 05b993f
Show file tree
Hide file tree
Showing 50 changed files with 130 additions and 5,969 deletions.
443 changes: 1 addition & 442 deletions android/src/main/java/com/reactnativeescposprinter/EposStringHelper.java
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion android/src/main/java/com/reactnativeescposprinter/EscPosPrinterDiscoveryModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
Expand Down
233 changes: 2 additions & 231 deletions android/src/main/java/com/reactnativeescposprinter/EscPosPrinterErrorManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,244 +1,15 @@
package com.reactnativeescposprinter;

import com.epson.epos2.Epos2Exception;
import com.epson.epos2.Epos2CallbackCode;
import com.epson.epos2.printer.Printer;
import com.epson.epos2.printer.PrinterStatusInfo;
import com.facebook.react.bridge.Arguments;

import org.json.JSONException;
import org.json.JSONObject;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableMapKeySetIterator;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.Arguments;

public class EscPosPrinterErrorManager {

public static int getErrorStatus(Epos2Exception e) {
return e.getErrorStatus();
}

public static String getEposExceptionText(int state) {

String return_text = "";
switch (state) {
case Epos2Exception.ERR_PARAM:
return_text = "ERR_PARAM";
break;
case Epos2Exception.ERR_CONNECT:
return_text = "ERR_CONNECT";
break;
case Epos2Exception.ERR_TIMEOUT:
return_text = "ERR_TIMEOUT";
break;
case Epos2Exception.ERR_MEMORY:
return_text = "ERR_MEMORY";
break;
case Epos2Exception.ERR_ILLEGAL:
return_text = "ERR_ILLEGAL";
break;
case Epos2Exception.ERR_PROCESSING:
return_text = "ERR_PROCESSING";
break;
case Epos2Exception.ERR_NOT_FOUND:
return_text = "ERR_NOT_FOUND";
break;
case Epos2Exception.ERR_IN_USE:
return_text = "ERR_IN_USE";
break;
case Epos2Exception.ERR_TYPE_INVALID:
return_text = "ERR_TYPE_INVALID";
break;
case Epos2Exception.ERR_DISCONNECT:
return_text = "ERR_DISCONNECT";
break;
case Epos2Exception.ERR_ALREADY_OPENED:
return_text = "ERR_ALREADY_OPENED";
break;
case Epos2Exception.ERR_ALREADY_USED:
return_text = "ERR_ALREADY_USED";
break;
case Epos2Exception.ERR_BOX_COUNT_OVER:
return_text = "ERR_BOX_COUNT_OVER";
break;
case Epos2Exception.ERR_BOX_CLIENT_OVER:
return_text = "ERR_BOX_CLIENT_OVER";
break;
case Epos2Exception.ERR_UNSUPPORTED:
return_text = "ERR_UNSUPPORTED";
break;
case Epos2Exception.ERR_FAILURE:
return_text = "ERR_FAILURE";
break;
default:
return_text = String.format("%d", state);
break;
}
return return_text;
}

public static String getCodeText(int state) {
String return_text = "";
switch (state) {
case Epos2CallbackCode.CODE_SUCCESS:
return_text = "PRINT_SUCCESS";
break;
case Epos2CallbackCode.CODE_PRINTING:
return_text = "PRINTING";
break;
case Epos2CallbackCode.CODE_ERR_AUTORECOVER:
return_text = "ERR_AUTORECOVER";
break;
case Epos2CallbackCode.CODE_ERR_COVER_OPEN:
return_text = "ERR_COVER_OPEN";
break;
case Epos2CallbackCode.CODE_ERR_CUTTER:
return_text = "ERR_CUTTER";
break;
case Epos2CallbackCode.CODE_ERR_MECHANICAL:
return_text = "ERR_MECHANICAL";
break;
case Epos2CallbackCode.CODE_ERR_EMPTY:
return_text = "ERR_EMPTY";
break;
case Epos2CallbackCode.CODE_ERR_UNRECOVERABLE:
return_text = "ERR_UNRECOVERABLE";
break;
case Epos2CallbackCode.CODE_ERR_FAILURE:
return_text = "ERR_FAILURE";
break;
case Epos2CallbackCode.CODE_ERR_NOT_FOUND:
return_text = "ERR_NOT_FOUND";
break;
case Epos2CallbackCode.CODE_ERR_SYSTEM:
return_text = "ERR_SYSTEM";
break;
case Epos2CallbackCode.CODE_ERR_PORT:
return_text = "ERR_PORT";
break;
case Epos2CallbackCode.CODE_ERR_TIMEOUT:
return_text = "ERR_TIMEOUT";
break;
case Epos2CallbackCode.CODE_ERR_JOB_NOT_FOUND:
return_text = "ERR_JOB_NOT_FOUND";
break;
case Epos2CallbackCode.CODE_ERR_SPOOLER:
return_text = "ERR_SPOOLER";
break;
case Epos2CallbackCode.CODE_ERR_BATTERY_LOW:
return_text = "ERR_BATTERY_LOW";
break;
case Epos2CallbackCode.CODE_ERR_TOO_MANY_REQUESTS:
return_text = "ERR_TOO_MANY_REQUESTS";
break;
case Epos2CallbackCode.CODE_ERR_REQUEST_ENTITY_TOO_LARGE:
return_text = "ERR_REQUEST_ENTITY_TOO_LARGE";
break;
case Epos2CallbackCode.CODE_CANCELED:
return_text = "CODE_CANCELED";
break;
case Epos2CallbackCode.CODE_ERR_NO_MICR_DATA:
return_text = "ERR_NO_MICR_DATA";
break;
case Epos2CallbackCode.CODE_ERR_ILLEGAL_LENGTH:
return_text = "ERR_ILLEGAL_LENGTH";
break;
case Epos2CallbackCode.CODE_ERR_NO_MAGNETIC_DATA:
return_text = "ERR_NO_MAGNETIC_DATA";
break;
case Epos2CallbackCode.CODE_ERR_RECOGNITION:
return_text = "ERR_RECOGNITION";
break;
case Epos2CallbackCode.CODE_ERR_READ:
return_text = "ERR_READ";
break;
case Epos2CallbackCode.CODE_ERR_NOISE_DETECTED:
return_text = "ERR_NOISE_DETECTED";
break;
case Epos2CallbackCode.CODE_ERR_PAPER_JAM:
return_text = "ERR_PAPER_JAM";
break;
case Epos2CallbackCode.CODE_ERR_PAPER_PULLED_OUT:
return_text = "ERR_PAPER_PULLED_OUT";
break;
case Epos2CallbackCode.CODE_ERR_CANCEL_FAILED:
return_text = "ERR_CANCEL_FAILED";
break;
case Epos2CallbackCode.CODE_ERR_PAPER_TYPE:
return_text = "ERR_PAPER_TYPE";
break;
case Epos2CallbackCode.CODE_ERR_WAIT_INSERTION:
return_text = "ERR_WAIT_INSERTION";
break;
case Epos2CallbackCode.CODE_ERR_ILLEGAL:
return_text = "ERR_ILLEGAL";
break;
case Epos2CallbackCode.CODE_ERR_INSERTED:
return_text = "ERR_INSERTED";
break;
case Epos2CallbackCode.CODE_ERR_WAIT_REMOVAL:
return_text = "ERR_WAIT_REMOVAL";
break;
case Epos2CallbackCode.CODE_ERR_DEVICE_BUSY:
return_text = "ERR_DEVICE_BUSY";
break;
case Epos2CallbackCode.CODE_ERR_IN_USE:
return_text = "ERR_IN_USE";
break;
case Epos2CallbackCode.CODE_ERR_CONNECT:
return_text = "ERR_CONNECT";
break;
case Epos2CallbackCode.CODE_ERR_DISCONNECT:
return_text = "ERR_DISCONNECT";
break;
case Epos2CallbackCode.CODE_ERR_MEMORY:
return_text = "ERR_MEMORY";
break;
case Epos2CallbackCode.CODE_ERR_PROCESSING:
return_text = "ERR_PROCESSING";
break;
case Epos2CallbackCode.CODE_ERR_PARAM:
return_text = "ERR_PARAM";
break;
case Epos2CallbackCode.CODE_RETRY:
return_text = "RETRY";
break;
case Epos2CallbackCode.CODE_ERR_DIFFERENT_MODEL:
return_text = "ERR_DIFFERENT_MODEL";
break;
case Epos2CallbackCode.CODE_ERR_DIFFERENT_VERSION:
return_text = "ERR_DIFFERENT_VERSION";
break;
case Epos2CallbackCode.CODE_ERR_DATA_CORRUPTED:
return_text = "ERR_DATA_CORRUPTED";
break;
default:
return_text = String.format("%d", state);
break;
}
return return_text;
}

public static int getEposGetWidthResult(int resultCode) {
int result = 0;

switch (resultCode) {
case Printer.SETTING_PAPERWIDTH_58_0:
result = 58;
break;
case Printer.SETTING_PAPERWIDTH_60_0:
result = 60;
break;
case Printer.SETTING_PAPERWIDTH_80_0:
result = 80;
break;
default:
result = 0;
break;
}
public class EscPosPrinterErrorManager {

return result;
}

public static String convertMapToString(ReadableMap readableMap) {
try{
Expand Down
50 changes: 27 additions & 23 deletions android/src/main/java/com/reactnativeescposprinter/EscPosPrinterModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.modules.core.DeviceEventManagerModule;

import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;

Expand All @@ -21,29 +19,9 @@
import com.epson.epos2.printer.Printer;
import com.epson.epos2.Epos2Exception;
import com.epson.epos2.Epos2CallbackCode;
import com.epson.epos2.printer.ReceiveListener;
import com.epson.epos2.printer.PrinterStatusInfo;
import com.epson.epos2.printer.PrinterSettingListener;

import com.facebook.react.bridge.UiThreadUtil;

import android.content.res.AssetManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.Base64;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.Timer;
import java.util.TimerTask;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.Arguments;

import android.os.Handler;
import java.util.concurrent.Callable;

import com.facebook.react.bridge.ReadableMap;
import android.util.Log;

import com.reactnativeescposprinter.ThePrinterManager;
import com.reactnativeescposprinter.ThePrinter;
Expand Down Expand Up @@ -315,6 +293,17 @@ public Map<String, Object> getConstants() {
constants.put("ALIGN_CENTER", Printer.ALIGN_CENTER);
constants.put("ALIGN_RIGHT", Printer.ALIGN_RIGHT);

// lang

constants.put("LANG_EN", Printer.LANG_EN);
constants.put("LANG_JA", Printer.LANG_JA);
constants.put("LANG_ZH_CN", Printer.LANG_ZH_CN);
constants.put("LANG_ZH_TW", Printer.LANG_ZH_TW);
constants.put("LANG_KO", Printer.LANG_KO);
constants.put("LANG_TH", Printer.LANG_TH);
constants.put("LANG_VI", Printer.LANG_VI);
constants.put("LANG_MULTI", Printer.LANG_MULTI);

return constants;
}

Expand Down Expand Up @@ -349,7 +338,7 @@ synchronized public void connect(String target, int timeout, Promise promise) {
promise.reject(EscPosPrinterErrorManager.getErrorTextData(ERR_INIT, ""));
} else {
try {
thePrinter.connect(timeout, false);
thePrinter.connect(timeout);
promise.resolve(null);
} catch(Exception e) {
processError(promise,e, "");
Expand Down Expand Up @@ -387,6 +376,21 @@ synchronized public void addText(String target, String data, Promise promise) {
}
}

@ReactMethod
synchronized public void addTextLang(String target, int lang, Promise promise) {
ThePrinter thePrinter = thePrinterManager_.getObject(target);
if (thePrinter == null) {
promise.reject(EscPosPrinterErrorManager.getErrorTextData(ERR_INIT, ""));
} else {
try {
thePrinter.addTextLang(lang);
promise.resolve(null);
} catch(Exception e) {
processError(promise, e, "");
}
}
}

@ReactMethod
synchronized public void addFeedLine(String target, int line, Promise promise) {
ThePrinter thePrinter = thePrinterManager_.getObject(target);
Expand Down
1 change: 0 additions & 1 deletion android/src/main/java/com/reactnativeescposprinter/EscPosPrinterPackage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext r
List<NativeModule> modules = new ArrayList<>();
modules.add(new EscPosPrinterModule(reactContext));
modules.add(new EscPosPrinterDiscoveryModule(reactContext));
modules.add(new ThePrinterWrapper(reactContext));
return modules;
}

Expand Down
1 change: 1 addition & 0 deletions android/src/main/java/com/reactnativeescposprinter/ImageManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ public static Bitmap getBitmapFromSource(ReadableMap source, Context mContext) t
}



10 changes: 0 additions & 10 deletions android/src/main/java/com/reactnativeescposprinter/MainActivityState.java
View file

This file was deleted.

Loading

0 comments on commit 05b993f

Please sign in to comment.