Bladeren bron

#convierte la lista en un primitivo de enteros

israel chavez 6 jaren geleden
bovenliggende
commit
b45cd2e78f
2 gewijzigde bestanden met toevoegingen van 50 en 41 verwijderingen
  1. 35 37
      .idea/workspace.xml
  2. 15 4
      android/src/main/java/edesarrollos/printer/PrinterPlugin.java

+ 35 - 37
.idea/workspace.xml

@@ -7,7 +7,6 @@
     <list default="true" id="1995f4dc-60d3-4cb6-b6b1-07187cdf9fce" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/src/main/java/edesarrollos/printer/PrinterPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/edesarrollos/printer/PrinterPlugin.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/printer.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/printer.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.dart_tool/" />
     <ignored path="$PROJECT_DIR$/.idea/" />
@@ -33,7 +32,7 @@
         <counts>
           <entry key="dart" value="16" />
           <entry key="gradle" value="2" />
-          <entry key="java" value="7" />
+          <entry key="java" value="8" />
           <entry key="xml" value="1" />
         </counts>
       </usages-collector>
@@ -41,20 +40,20 @@
         <counts>
           <entry key="Dart" value="16" />
           <entry key="Groovy" value="2" />
-          <entry key="JAVA" value="7" />
+          <entry key="JAVA" value="8" />
           <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="dart" value="1167" />
+          <entry key="dart" value="1184" />
           <entry key="gradle" value="3" />
           <entry key="java" value="9" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="Dart" value="1167" />
+          <entry key="Dart" value="1184" />
           <entry key="Groovy" value="3" />
           <entry key="JAVA" value="9" />
         </counts>
@@ -63,11 +62,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/printer.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="94">
-              <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="4" />
+            <state relative-caret-position="240">
+              <caret line="36" column="79" selection-start-line="36" selection-start-column="79" selection-end-line="36" selection-end-column="79" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -75,6 +74,18 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/android/src/main/java/edesarrollos/printer/PrinterPlugin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="266">
+              <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="Git.Settings">
@@ -84,9 +95,9 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/android/build.gradle" />
-        <option value="$PROJECT_DIR$/android/src/main/java/edesarrollos/printer/PrinterPlugin.java" />
         <option value="$PROJECT_DIR$/example/lib/main.dart" />
         <option value="$PROJECT_DIR$/lib/printer.dart" />
+        <option value="$PROJECT_DIR$/android/src/main/java/edesarrollos/printer/PrinterPlugin.java" />
       </list>
     </option>
   </component>
@@ -108,22 +119,6 @@
               <item name="printer" type="b2602c69:ProjectViewProjectNode" />
               <item name="printer" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="printer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="printer" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="printer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="printer" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="printer" type="b2602c69:ProjectViewProjectNode" />
-              <item name="printer" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -178,7 +173,7 @@
   <component name="PropertiesComponent">
     <property name="dart.analysis.tool.window.force.activate" value="false" />
     <property name="io.flutter.reload.alreadyRun" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../eServicio" />
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
@@ -215,7 +210,7 @@
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.34039333" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.34039333" />
       <window_info id="Designer" order="1" />
       <window_info id="Captures" order="2" side_tool="true" />
       <window_info id="Structure" order="3" side_tool="true" />
@@ -227,7 +222,7 @@
       <window_info anchor="bottom" id="Run" order="1" />
       <window_info anchor="bottom" id="TODO" order="2" />
       <window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Debug" order="4" visible="true" weight="0.4885246" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.4885246" />
       <window_info anchor="bottom" id="Terminal" order="5" weight="0.3295082" />
       <window_info anchor="bottom" id="Event Log" order="6" side_tool="true" />
       <window_info anchor="bottom" id="Flutter Performance" order="7" side_tool="true" />
@@ -293,13 +288,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/src/main/java/edesarrollos/printer/PrinterPlugin.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="14" column="34" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="373">
@@ -312,13 +300,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/printer.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="94">
-          <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="4" />
+        <state relative-caret-position="240">
+          <caret line="36" column="79" selection-start-line="36" selection-start-column="79" selection-end-line="36" selection-end-column="79" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/android/src/main/java/edesarrollos/printer/PrinterPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 15 - 4
android/src/main/java/edesarrollos/printer/PrinterPlugin.java

@@ -16,7 +16,9 @@ import com.qs.helper.printer.bt.*;
 
 import java.nio.Buffer;
 import java.nio.IntBuffer;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -117,13 +119,13 @@ public class PrinterPlugin implements MethodCallHandler {
           result.success(false);
           break;
         }
-        int[] mapa = call.argument("map");
+        ArrayList<Integer> mapa = call.argument("map");
         if (mapa == null) {
           result.success(false);
           break;
         }
         Bitmap bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
-        bitmap.copyPixelsFromBuffer(IntBuffer.wrap(mapa));
+        bitmap.copyPixelsFromBuffer(IntBuffer.wrap(convertIntegers(mapa)));
         BlueService.printImage(bitmap);
         result.success(true);
         break;
@@ -138,13 +140,13 @@ public class PrinterPlugin implements MethodCallHandler {
           result.success(false);
           break;
         }
-        int[] mapa2 = call.argument("map");
+        ArrayList<Integer> mapa2 = call.argument("map");
         if (mapa2 == null) {
           result.success(false);
           break;
         }
         Bitmap bitmap2 = Bitmap.createBitmap(w2, h2, Bitmap.Config.ARGB_8888);
-        bitmap2.copyPixelsFromBuffer(IntBuffer.wrap(mapa2));
+        bitmap2.copyPixelsFromBuffer(IntBuffer.wrap(convertIntegers(mapa2)));
         BlueService.printImage2(bitmap2);
         result.success(true);
         break;
@@ -156,4 +158,13 @@ public class PrinterPlugin implements MethodCallHandler {
         break;
     }
   }
+
+  private int[] convertIntegers(List<Integer> integers) {
+    int[] ret = new int[integers.size()];
+    Iterator<Integer> iterator = integers.iterator();
+    for (int i = 0; i < ret.length; i++) {
+      ret[i] = iterator.next();
+    }
+    return ret;
+  }
 }