From 5b60471f5b036686a01f3dd4e3709f483e0387ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=A4=A7=E5=BE=B7?= <fandd@shuto.cn>
Date: Tue, 10 Oct 2023 16:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=89=93=E5=8D=B0=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E5=8F=82=E6=95=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cordova/plugin/jcprinter/JcPrinter.java   | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/android/cordova/plugin/jcprinter/JcPrinter.java b/src/android/cordova/plugin/jcprinter/JcPrinter.java
index 11f05db..3781ef5 100644
--- a/src/android/cordova/plugin/jcprinter/JcPrinter.java
+++ b/src/android/cordova/plugin/jcprinter/JcPrinter.java
@@ -28,9 +28,11 @@ import androidx.core.app.ActivityCompat;
 import com.gengcon.www.jcprintersdk.bean.ImageDataInfo;
 import com.gengcon.www.jcprintersdk.callback.PrintCallback;
 
+import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
@@ -98,23 +100,26 @@ public class JcPrinter extends CordovaPlugin {
                     return true;
                 case "action":
                     String methodName = args.optString(0);
-                    JSONArray methodJsonArgs = args.getJSONArray(1);
-                    Object[] methodArgs = new Object[methodJsonArgs.length()];
-                    for(int i=0;i<methodJsonArgs.length();i++){
-                        Object obj = methodJsonArgs.opt(i);
-                        if(obj instanceof JSONArray){
-                            Object[] array = new Object[((JSONArray) obj).length()];
-                            for(int j=0;j<((JSONArray) obj).length();j++){
-                                array[i] = ((JSONArray) obj).opt(j);
-                            }
-                            obj = array;
-                        }
-                        methodArgs[i] = obj;
-                    }
+                    Log.d(TAG,"action-method:"+methodName);
                     for(Method m:this.methods){
                         String name = m.getName();
                         if(m.getName().equals(methodName)){
                             try {
+                                JSONArray methodJsonArgs = args.getJSONArray(1);
+                                Object[] methodArgs = new Object[methodJsonArgs.length()];
+                                for(int i=0;i<methodJsonArgs.length();i++){
+                                    Object obj = methodJsonArgs.opt(i);
+                                    if(obj instanceof JSONArray){
+                                        Class a = m.getParameterTypes()[i].getComponentType();
+                                        Object array = Array.newInstance(a,((JSONArray) obj).length());
+                                        for(int j=0;j<((JSONArray) obj).length();j++){
+                                            Array.set(array,j,((JSONArray) obj).opt(j));
+                                        }
+                                        methodArgs[i] = array;
+                                    }else{
+                                        methodArgs[i] = obj;
+                                    }
+                                }
                                 m.invoke(Util.getInstance(),methodArgs);
                                 callbackContext.success();
                             } catch (IllegalAccessException | InvocationTargetException e) {
@@ -123,11 +128,14 @@ public class JcPrinter extends CordovaPlugin {
                             return true;
                         }
                     }
+
+
                 case "generateLabelJson":
                     callbackContext.success(new String(Util.getInstance().generateLabelJson()));
                     return true;
             }
         }catch (Exception e){
+            e.printStackTrace();
             callbackContext.error(e.getMessage());
         }
         return false;
@@ -310,10 +318,8 @@ public class JcPrinter extends CordovaPlugin {
                     return;
                 }
                 List<String>pageData = new ArrayList<>();
-                JSONArray array= data.optJSONArray(pageIndex);
-                for(int i=0;i<array.length();i++){
-                  pageData.add(array.optString(i));
-                }
+                String dataStr= data.optString(pageIndex-1);
+                pageData.add(dataStr);
                 Util.getInstance().commitData(pageData,info);
             }
         });