Added GetPrinterStatusTask function

Removed unit tests folders as I won't create unit tests on this wrapper
ltrudu · Jun 25, 2024 · fedcdc4 · fedcdc4
1 parent 173acba
commit fedcdc4
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 82 deletions.
diff --git a/PrintWrapper/build.gradle b/PrintWrapper/build.gradle
@@ -63,8 +63,6 @@ dependencies {
     implementation files('libs/jackson-databind-2.2.3.jar')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.tom-roush:pdfbox-android:2.0.27.0'
 
 }

diff --git a/PrintWrapper/src/androidTest/java/com/zebra/printwrapper/ExampleInstrumentedTest.java b/PrintWrapper/src/androidTest/java/com/zebra/printwrapper/ExampleInstrumentedTest.java
diff --git a/PrintWrapper/src/main/java/com/zebra/printwrapper/GetPrinterStatusTask.java b/PrintWrapper/src/main/java/com/zebra/printwrapper/GetPrinterStatusTask.java
@@ -0,0 +1,45 @@
+package com.zebra.printwrapper;
+
+import com.zebra.sdk.comm.Connection;
+import com.zebra.sdk.comm.ConnectionException;
+import com.zebra.sdk.printer.PrinterStatus;
+import com.zebra.sdk.printer.ZebraPrinter;
+import com.zebra.sdk.printer.ZebraPrinterFactory;
+import com.zebra.sdk.printer.ZebraPrinterLanguageUnknownException;
+import com.zebra.sdk.printer.discovery.DiscoveredPrinter;
+
+public class GetPrinterStatusTask extends ExecutorTask<DiscoveredPrinter, Boolean, PrinterStatus>{
+    @Override
+    protected PrinterStatus doInBackground(DiscoveredPrinter... printerParams) {
+        DiscoveredPrinter selectedPrinter = printerParams[0];
+        PrinterStatus printerStatus = null;
+        if(selectedPrinter != null)
+        {
+            if(selectedPrinter.getConnection() != null ) {
+                Connection connection = selectedPrinter.getConnection();
+                if(connection.isConnected() == false) {
+                    try {
+                        connection.open();
+                        ZebraPrinter printer = ZebraPrinterFactory.getInstance(connection);
+                        if(printer != null)
+                        {
+                            printerStatus = printer.getCurrentStatus();
+                        }
+                    } catch (ConnectionException e) {
+                        throw new RuntimeException(e);
+                    } catch (ZebraPrinterLanguageUnknownException e) {
+                        throw new RuntimeException(e);
+                    }
+                    finally {
+                        try {
+                            connection.close();
+                        } catch (ConnectionException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }
+            }
+        }
+    return printerStatus;
+    }
+}
diff --git a/PrintWrapper/src/main/java/com/zebra/printwrapper/SGDHelper.java b/PrintWrapper/src/main/java/com/zebra/printwrapper/SGDHelper.java
@@ -82,29 +82,6 @@ public static Connection connectToPrinter(DiscoveredPrinter printer, SGDHelperCa
         }
 
         if (printer instanceof DiscoveredPrinterBluetooth) {
-            //class BluetoothConnectionQuickClose extends BluetoothConnection {
-//
-            //    public BluetoothConnectionQuickClose(String address) {
-            //        super(address);
-            //    }
-//
-            //    @Override
-            //    public void close() throws ConnectionException {
-            //        this.friendlyName = "";
-            //        if (this.isConnected) {
-            //            this.isConnected = false;
-//
-            //            try {
-            //                this.inputStream.close();
-            //                this.outputStream.close();
-            //                this.commLink.close();
-            //            } catch (IOException e) {
-            //                // Ugly... don't even know if it will be helpful or not...
-            //                throw new ConnectionException(e.getMessage());
-            //            }
-            //        }
-            //    }
-            //}
             if (callback != null) {
                 callback.onMessage("Connecting to bluetooth Printer: " + printer.address);
             }
@@ -145,20 +122,6 @@ public static Connection connectToPrinter(DiscoveredPrinter printer, SGDHelperCa
                 throw new PrinterWrapperException(new Exception("SGDHelper.connectToPrinter: Could not establish connection with BluetoothPrinter."));
             }
         } else if (printer instanceof DiscoveredPrinterNetwork) {
-            //class MultiChannelQuickClose extends MultichannelTcpConnection {
-//
-            //    public MultiChannelQuickClose(DiscoveredPrinter printer) {
-            //        super(printer);
-            //    }
-//
-            //    @Override
-            //    public void close() throws ConnectionException {
-            //        if (this.isConnected()) {
-            //            this.closePrintingChannel();
-            //            this.closeStatusChannel();
-            //        }
-            //    }
-            //}
             if (callback != null) {
                 callback.onMessage("Connecting to Network Printer: " + printer.address);
             }

diff --git a/PrintWrapper/src/test/java/com/zebra/printwrapper/ExampleUnitTest.java b/PrintWrapper/src/test/java/com/zebra/printwrapper/ExampleUnitTest.java