bio easycard changed return_data format

Author: rupy1014

bootpay/src/main/java/kr/co/bootpay/bio/BootpayBioDialog.java

@@ -23,7 +23,10 @@
 import androidx.fragment.app.DialogFragment;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
+import java.lang.reflect.Type;
+import java.util.Map;
 import java.util.concurrent.Executor;
 
 import dev.samstevens.totp.code.CodeGenerator;

bootpay/src/main/java/kr/co/bootpay/bio/activity/BootpayBioActivity.java

@@ -32,11 +32,14 @@
 import androidx.viewpager.widget.ViewPager;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.skydoves.powerspinner.PowerSpinnerView;
 
+import java.lang.reflect.Type;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Executor;
 
 import dev.samstevens.totp.code.CodeGenerator;
@@ -70,6 +73,9 @@
 
 import static androidx.biometric.BiometricManager.BIOMETRIC_SUCCESS;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 
 public class BootpayBioActivity extends FragmentActivity implements BootpayBioRestImplement, IBioActivityFunction, IBioPayFunction {
 
@@ -600,7 +606,17 @@ public void callbackEasyCardRequest(ResReceiptID res) {
     public void callbackEasyTransaction(String data) {
         progress.dismiss();
         DoneListener done = CurrentBioRequest.getInstance().done;
-        if(done != null) done.onDone(data);
+
+
+        try {
+            JSONObject jsonObject = new JSONObject(data);
+            if(done != null) done.onDone(jsonObject.get("data").toString());
+        } catch (JSONException e) {
+            if(done != null) done.onDone(data);
+            e.printStackTrace();
+        }
+//        Type resType = new TypeToken<Map<String, String>>(){}.getType();
+//        Map<String, String> result = new Gson().fromJson(data, resType);
     }
 
     @Override

bootpay/src/main/java/kr/co/bootpay/bio/api/BioApiPresenter.java

@@ -1,11 +1,15 @@
 package kr.co.bootpay.bio.api;
 
+import android.util.Log;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.reflect.TypeToken;
 
-import org.json.JSONObject;
-
+import java.lang.reflect.Type;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Executors;
 
 import io.reactivex.Observer;
@@ -213,8 +217,13 @@ public void postEasyConfirm(String deviceUUID, String userToken, String receipt_
                             @Override
                             public void onComplete() {
                                 try {
-                                    JSONObject jsonObject = new JSONObject(easyConfirm.toString());
-                                    scope.parent.callbackEasyTransaction(jsonObject.getString("data"));
+//                                    easyConfirm.
+//                                    Log.d("bootpay", "data: " + easyConfirm.string());
+//                                    Type resType = new TypeToken<Map<String, String>>(){}.getType();
+//                                    Map<String, String> result = new Gson().fromJson(easyConfirm.string(), resType);
+//
+//                                    Log.d("bootpay", "result: " + result.get("data"));
+                                    scope.parent.callbackEasyTransaction(easyConfirm.string());
                                 } catch (Exception ee) {
                                     ee.printStackTrace();
                                 }