cordova-plugin-netcontroll-integration 1.0.152 → 1.0.154

package/README.md

@@ -1,5 +1,5 @@
-Versao 1.0.152
+Versao 1.0.154
 
 Funções internas de integração XMenu / NetControll
 
-- Ajuste Rede GPOS700
+- Comunicação segunda tela TPRO Elgin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-netcontroll-integration",
-  "version": "1.0.152",
+  "version": "1.0.154",
   "description": "Plugin cordova de integracao para uso interno (NetControll/ XMenu)",
   "cordova": {
     "id": "cordova-plugin-netcontroll-integration",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-netcontroll-integration" version="1.0.152"
+<plugin id="cordova-plugin-netcontroll-integration" version="1.0.154"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -116,6 +116,7 @@
         <resource-file src="src/libs/elgin/minipdvm8-v01.00.00-release.aar" target="libs/elgin/minipdvm8-v01.00.00-release.aar" />
         <resource-file src="src/libs/elgin/satelgin-8.1.1-release.aar" target="libs/elgin/satelgin-8.1.1-release.aar" />
         <resource-file src="src/libs/elgin/scanner-v1.1-release.aar" target="libs/elgin/scanner-v1.1-release.aar" />
+        <resource-file src="src/libs/elgin/display-v02.00.00-release.aar" target="libs/elgin/display-v02.00.00-release.aar" />
         
 
 

package/src/android/Elgin/ElginM10Terminal.java

@@ -10,10 +10,14 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 
+import android.Manifest;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.os.Bundle;
 import android.os.AsyncTask;
 
 import com.elgin.e1.Balanca.BalancaE1;
+import com.elgin.e1.display.E1_Display;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
@@ -22,9 +26,16 @@ import com.izettle.html2bitmap.content.WebViewContent;
 
 
 import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AppCompatActivity;
+
+import androidx.core.content.ContextCompat;
+
 import android.app.Activity;
 // import android.graphics.Bitmap;
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 // import android.util.Log;
 // import android.widget.Toast;
 // import android.net.Uri;
@@ -59,6 +70,7 @@ import com.google.zxing.common.BitMatrix;
 import android.graphics.BitmapFactory;
 // import android.graphics.Matrix;
 
+import android.os.Environment;
 import android.util.Base64;
 import java.io.ByteArrayOutputStream;
 // import java.util.Objects;
@@ -77,7 +89,9 @@ import com.elgin.e1.Impressora.Termica;
 
 import javax.security.auth.callback.Callback;
 
-public class ElginM10Terminal {
+import io.cordova.hellocordova.MainActivity;
+
+public class ElginM10Terminal extends AppCompatActivity {
     //Cordova/Java Params
     private Activity mActivity;
     private Context mContext;
@@ -99,6 +113,11 @@ public class ElginM10Terminal {
     private int SerialLength;
     private char SerialParity;
     private int SerialStopbits;
+    private E1_Display imin;
+
+    String[] permissions = new String[]{
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+    };
 
     public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         this.webView = webView;
@@ -115,8 +134,8 @@ public class ElginM10Terminal {
     }
 
     public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
-        if(action.equals("AbreConexaoImpressora")){
-            try{
+        if (action.equals("AbreConexaoImpressora")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 int tipo = params.getInt("tipo");
@@ -125,26 +144,24 @@ public class ElginM10Terminal {
                 int parametro = params.getInt("parametro");
 
                 int result = Termica.AbreConexaoImpressora(tipo, modelo, conexao, parametro);
-
+                //cordova.plugin.netcontroll.integration.util.NetControllPrinter.RequestPermissions(this.mActivity, this.mContext);
+                if(ContextCompat.checkSelfPermission(this.mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+                    ActivityCompat.requestPermissions(this.mActivity, permissions, 0);
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("AbreConexaoImpressora error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("FechaConexaoImpressora")){
-            try{
+        } else if (action.equals("FechaConexaoImpressora")) {
+            try {
                 int result = Termica.FechaConexaoImpressora();
                 callbackContext.success(result);
-            } catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("FechaConexaoImpressora error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("AvancaPapel")){
-            try{
+        } else if (action.equals("AvancaPapel")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 int linhas = params.getInt("linhas");
@@ -152,14 +169,12 @@ public class ElginM10Terminal {
                 int result = Termica.AvancaPapel(linhas);
 
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("AvancaPapel error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("Corte")){
-            try{
+        } else if (action.equals("Corte")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 int avanco = params.getInt("avanco");
@@ -167,14 +182,12 @@ public class ElginM10Terminal {
                 int result = Termica.Corte(avanco);
 
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("Corte error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("ImpressaoTexto")){
-            try{
+        } else if (action.equals("ImpressaoTexto")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 String dados = params.getString("dados");
@@ -185,14 +198,12 @@ public class ElginM10Terminal {
                 int result = Termica.ImpressaoTexto(dados, posicao, stilo, tamanho);
 
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("ImpressaoTexto error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("ImpressaoCodigoBarras")){
-            try{
+        } else if (action.equals("ImpressaoCodigoBarras")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 int tipo = params.getInt("tipo");
@@ -204,14 +215,12 @@ public class ElginM10Terminal {
                 int result = Termica.ImpressaoCodigoBarras(tipo, dados, altura, largura, HRI);
 
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("ImpressaoCodigoBarras error: " + e.toString());
             }
             return true;
-        }
-
-        else if (action.equals("DefinePosicao")){
-            try{
+        } else if (action.equals("DefinePosicao")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 int posicao = params.getInt("posicao");
@@ -219,14 +228,12 @@ public class ElginM10Terminal {
                 int result = Termica.DefinePosicao(posicao);
 
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("DefinePosicao error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("ImpressaoQRCode")){
-            try{
+        } else if (action.equals("ImpressaoQRCode")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 String dados = params.getString("dados");
@@ -235,15 +242,13 @@ public class ElginM10Terminal {
 
                 int result = Termica.ImpressaoQRCode(dados, tamanho, nivelCorrecao);
 
-                callbackContext.success(result) ;
-            }catch (Exception e){
+                callbackContext.success(result);
+            } catch (Exception e) {
                 callbackContext.error("ImpressaoQRCode error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("ImprimeXMLNFCe")){
-            try{
+        } else if (action.equals("ImprimeXMLNFCe")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 String dados = params.getString("dados");
@@ -254,14 +259,12 @@ public class ElginM10Terminal {
                 int result = Termica.ImprimeXMLNFCe(dados, indexcsc, csc, param);
 
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("ImprimeXMLNFCe error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("ImprimeXMLSAT")){
-            try{
+        } else if (action.equals("ImprimeXMLSAT")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 String dados = params.getString("dados");
@@ -271,25 +274,21 @@ public class ElginM10Terminal {
 
                 callbackContext.success(result);
 
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("ImprimeXMLSAT error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("AbreGavetaElgin")){
-            try{
+        } else if (action.equals("AbreGavetaElgin")) {
+            try {
                 int result = Termica.AbreGavetaElgin();
 
                 callbackContext.success(result);
-            } catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("AbreGavetaElgin error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("ConfigurarBalanca")){
-            try{
+        } else if (action.equals("ConfigurarBalanca")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 this.ModelBalanca = params.getString("modelBalanca");
@@ -318,35 +317,31 @@ public class ElginM10Terminal {
                 int retorno2 = BalancaE1.ConfigurarProtocoloComunicacao(this.Protocol);
 
                 callbackContext.success(String.format("\nConfigurarModeloBalanca: %d\nConfigurarProtocoloComunicacao: %d", retorno1, retorno2));
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("ConfigurarBalanca error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("LerPesoBalanca")){
-            try{
-                if (this.ModelBalanca == null ||  this.ModelBalanca == "" ) {
+        } else if (action.equals("LerPesoBalanca")) {
+            try {
+                if (this.ModelBalanca == null || this.ModelBalanca == "") {
                     callbackContext.error("LerPesoBalanca error: Balança não configurada");
                     return false;
                 }
                 int retorno1 = BalancaE1.AbrirSerial(this.SerialBaudrate, this.SerialLength, this.SerialParity, this.SerialStopbits); // Configuracao serial da balanca...
                 String retorno2 = BalancaE1.LerPeso(1);
                 int retorno3 = BalancaE1.Fechar();
-                if (retorno1 == 0 ) {
+                if (retorno1 == 0) {
                     callbackContext.success(retorno2);
                 } else {
                     callbackContext.error(String.format("\nAbrirSerial: %d\nLerPeso: %s\nFechar: %d", retorno1, retorno2, retorno3));
                     return false;
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("StatusImpressora error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("StatusImpressora")){
-            try{
+        } else if (action.equals("StatusImpressora")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
 
                 int param = params.getInt("param");
@@ -354,14 +349,12 @@ public class ElginM10Terminal {
                 int result = Termica.StatusImpressora(param);
 
                 callbackContext.success(result);
-            }catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("StatusImpressora error: " + e.toString());
             }
             return true;
-        }
-
-        else if(action.equals("ImprimeImagemBase64")){
-            try{
+        } else if (action.equals("ImprimeImagemBase64")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
                 String base64String = params.getString("base64String");
                 int result = 0;
@@ -376,7 +369,7 @@ public class ElginM10Terminal {
                 }
                 // // // // callbackContext.success(decodedString);
                 callbackContext.success(result);
-            } catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("AbreGavetaElgin error: " + e.toString());
             }
             return true;
@@ -409,17 +402,14 @@ public class ElginM10Terminal {
             //     callbackContext.error("ImprimirImagem error: " + e.toString());
             // }
             // return true;
-        }
-
-
-        else if (action.equals("ImpressaoTextoNetPrint")) {
+        } else if (action.equals("ImpressaoTextoNetPrint")) {
             JSONObject params = args.getJSONObject(0);
             try {
                 String dados = params.getString("dados");
                 Boolean negrito = false;
                 try {
                     negrito = params.getBoolean("negrito");
-                }catch (Exception ex){
+                } catch (Exception ex) {
                 }
                 boolean abrirGaveta = cordova.plugin.netcontroll.integration.util.NetControllPrinter.EnviarAberturaGaveta(dados);
                 String html = cordova.plugin.netcontroll.integration.util.NetControllPrinter.ConverterTextoImpressoToHtml(dados, negrito);
@@ -442,7 +432,7 @@ public class ElginM10Terminal {
                             callbackContext.error("Result - ConverterHtmlToBitmap: " + "Error Detail: " + errorPost);
                         }
                         if (abrirGaveta) {
-	                        Termica.AbreGavetaElgin();
+                            Termica.AbreGavetaElgin();
                         }
                     }
                 });
@@ -450,10 +440,8 @@ public class ElginM10Terminal {
                 callbackContext.error("ImpressaoTextoNetPrint error: " + e.toString());
             }
             return true;
-        }
-
-        else if (action.equals("ImpressaoBase64NetPrint")) {
-            try{
+        } else if (action.equals("ImpressaoBase64NetPrint")) {
+            try {
                 JSONObject params = args.getJSONObject(0);
                 String base64String = params.getString("base64String");
                 Bitmap dadosBmp = cordova.plugin.netcontroll.integration.util.NetControllPrinter.ConverterBase64ToBitmap(base64String);
@@ -464,12 +452,55 @@ public class ElginM10Terminal {
                 } else {
                     callbackContext.success("Impresso Base64 Ok");
                 }
-            } catch (Exception e){
+            } catch (Exception e) {
                 callbackContext.error("PrintTesteBase64 error: " + e.toString());
             }
             return true;
+
+        } else if (action.equals("InicializaDisplay")) {
+            try {
+                imin.init(this.mActivity, E1_Display.DisplayDevices.TPRO);
+
+                if(ContextCompat.checkSelfPermission(this.mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                    ActivityCompat.requestPermissions(this.mActivity, permissions, 0);
+                }
+                int result = -1;
+                result = imin.InicializaDisplay();
+                if (result != 0) {
+                    callbackContext.error("Erro ao iniciar o display");
+                } else {
+                    callbackContext.success("InicializaDisplay Ok");
+                }
+            } catch (Exception e) {
+                callbackContext.error("InicializaDisplay error: " + e.toString());
+            }
+            return true;
+
+        } else if (action.equals("ApresentaImagemDisplayBitmap")) {
+            JSONObject params = args.getJSONObject(0);
+            try {
+                String dados = params.getString("dados");
+                cordova.plugin.netcontroll.integration.util.NetControllPrinter.ConverterHtmlToBitmap(dados, mContext, bitmap -> {
+                    if (bitmap != null) {
+                        try {
+                            int retorno = -1;
+                            if (bitmap != null) {
+                                retorno = imin.ApresentaImagemDisplay(bitmap);
+                            }
+                            if (retorno != 0) {
+                                callbackContext.error("Erro ao Exibir img bitmap: " + retorno);
+                            } else {
+                                callbackContext.success("ApresentaImagemDisplayBitmap Ok");
+                            }
+                        } catch (Exception errorPost) {
+                            callbackContext.error("Result - ApresentaImagemDisplayBitmap: " + "Error Detail: " + errorPost);
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                callbackContext.error("ApresentaImagemDisplayBitmap error: " + e.toString());
+            }
         }
-        return false;
+        return true;
     }
-}
-
+}

package/src/build.gradle

@@ -40,6 +40,7 @@ dependencies {
     implementation(name: 'elgin/InterfaceAutomacao-v2.0.0.12', ext: 'aar')
     implementation(name: 'elgin/cloudpossdk-s-1.0.2', ext: 'aar')
     implementation(name: 'elgin/minipdvm8-v01.00.00-release', ext: 'aar')
+    implementation(name: 'elgin/display-v02.00.00-release', ext: 'aar')
 
 
     //______________________________   UseRede   ______________________________

package/www/Elgin/M10Terminal.js

@@ -84,6 +84,13 @@ exports.ImpressaoTextoNetPrintOld = function (params, success, error) {
     ImpressaoTextoNetPrintHelper(params.dados, success, error);
 }
 
+exports.InicializaDisplay = function (success, error) {
+    exec(success, error, 'NetControllCordovaPluginsIntegration', 'Elgin.M10Terminal.InicializaDisplay');
+}
+
+exports.ApresentaImagemDisplayBitmap = function (params, success, error) {
+    exec(success, error, 'NetControllCordovaPluginsIntegration', 'Elgin.M10Terminal.ApresentaImagemDisplayBitmap', [params]);
+}
 
 function ImpressaoTextoNetPrintHelper(textoImpresso, success, onError) {
     console.log('ImpressaoTextoNetPrintHelper');

package/www/Rede/RedeGpos700.js

@@ -7,7 +7,6 @@ exports.Testar = function (params, success, error) {
 }
 
 exports.InicializaImpressao = function (params, success, error) {
-    debugger;
     exec(success, error, 'NetControllCordovaPluginsIntegration', 'Rede.Gpos700.InicializaImpressao', [params]);
 }