토스페이먼츠 추가

Author: rupy1014

bootpay/src/main/java/kr/co/bootpay/Bootpay.java

@@ -179,6 +179,8 @@ public static String getPG(PG pg) {
                 return "onestore";
             case WELCOME:
                 return "welcome";
+            case TOSS:
+                return "toss";
             default:
                 return "";
         }

bootpay/src/main/java/kr/co/bootpay/BootpayKeyValue.java

@@ -24,6 +24,7 @@ private static void pgHashInit() {
         pgHash.put("KICC", "easypay");
         pgHash.put("원스토어", "onestore");
         pgHash.put("웰컴페이먼츠", "welcome");
+        pgHash.put("토스페이먼츠", "toss");
 
     }
 

bootpay/src/main/java/kr/co/bootpay/BootpayWebView.java

@@ -647,32 +647,54 @@ private class Client extends WebChromeClient {
         @SuppressLint("JavascriptInterface")
         @Override
         public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
-            WebView.HitTestResult result = view.getHitTestResult();
-            String url = result.getExtra();
-
-            if (isNewWindow(url) && isPopup(url)) {
-                start(view, createFrom(url));
-            } else if (resultMsg != null) {
-                BootpayWebView newWindow = new BootpayWebView(view.getContext());
-                if(request != null) {
-                    newWindow.setRequest(request)
-                            .setDialog(dialog)
-                            .setOnResponseListener(listener);
-                } else if(listener != null){
-                    newWindow.setOnResponseListener(listener);
-                }
 
-                addView(newWindow,
-                        new FrameLayout.LayoutParams(
+            BootpayWebView newWindow = new BootpayWebView(view.getContext());
+            if(request != null) {
+                newWindow.setRequest(request)
+                        .setDialog(dialog)
+                        .setOnResponseListener(listener);
+            } else if(listener != null){
+                newWindow.setOnResponseListener(listener);
+            }
+
+            addView(newWindow,
+                    new FrameLayout.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             Gravity.NO_GRAVITY)
-                );
+            );
 
-                WebView.WebViewTransport tr = (WebView.WebViewTransport) resultMsg.obj;
-                tr.setWebView(newWindow);
-                resultMsg.sendToTarget();
-            }
+            WebView.WebViewTransport tr = (WebView.WebViewTransport) resultMsg.obj;
+            tr.setWebView(newWindow);
+            resultMsg.sendToTarget();
+
+
+//            WebView.HitTestResult result = view.getHitTestResult();
+//            String url = result.getExtra();
+//
+//            if (isNewWindow(url) && isPopup(url)) {
+//                start(view, createFrom(url));
+//            } else if (resultMsg != null) {
+//                BootpayWebView newWindow = new BootpayWebView(view.getContext());
+//                if(request != null) {
+//                    newWindow.setRequest(request)
+//                            .setDialog(dialog)
+//                            .setOnResponseListener(listener);
+//                } else if(listener != null){
+//                    newWindow.setOnResponseListener(listener);
+//                }
+//
+//                addView(newWindow,
+//                        new FrameLayout.LayoutParams(
+//                            ViewGroup.LayoutParams.MATCH_PARENT,
+//                            ViewGroup.LayoutParams.MATCH_PARENT,
+//                            Gravity.NO_GRAVITY)
+//                );
+//
+//                WebView.WebViewTransport tr = (WebView.WebViewTransport) resultMsg.obj;
+//                tr.setWebView(newWindow);
+//                resultMsg.sendToTarget();
+//            }
 
 
             return true;

bootpay/src/main/java/kr/co/bootpay/enums/PG.java

@@ -18,4 +18,5 @@ public enum PG {
     ONESTORE,
     WELCOME,
     BOOTPAY,
+    TOSS
 }

bootpay/src/main/java/kr/co/bootpay/valid/PGAvailable.java

@@ -87,6 +87,8 @@ public static PG stringToPG(String pg) {
                 return PG.ONESTORE;
             case "welcome":
                 return PG.WELCOME;
+            case "toss":
+                return PG.TOSS;
             case "bootpay":
                 return PG.BOOTPAY;
             default:
@@ -130,6 +132,8 @@ public static String pgToString(PG pg) {
                 return "onestore";
             case WELCOME:
                 return "welcome";
+            case TOSS:
+                return "toss";
         }
         return "";
     }

sample/src/main/java/bootpay/co/kr/samplepayment/NativeActivity.java

@@ -72,7 +72,7 @@ public void onClick_request(View v) {
 
     void goPGPay() {
         BootUser bootUser = new BootUser().setAddr("서울시 동작구 상도로 369").setEmail("ru10008@gamil.com").setPhone("010-1234-2314");
-        BootExtra bootExtra = new BootExtra().setQuotas(new int[] {1,2,3}).setPopup(1).setQuickPopup(1);
+        BootExtra bootExtra = new BootExtra().setQuotas(new int[] {1,2,3}).setPopup(0).setQuickPopup(0);
 
 //        Payload payload = new Payload();
 //        payload.setOrder_id("1232352354")
@@ -87,8 +87,8 @@ void goPGPay() {
         Bootpay.init(getFragmentManager())
                 .setContext(this)
                 .setApplicationId(application_id) // 해당 프로젝트(안드로이드)의 application id 값
-                .setPG(PG.NICEPAY) // 결제할 PG 사
-                .setMethod(Method.VBANK)
+                .setPG(PG.TOSS) // 결제할 PG 사
+                .setMethod(Method.CARD)
 //                .setEasyPayUserToken("wef")
 //                .setMethodList(Arrays.asList(Method.EASY_CARD, Method.PHONE, Method.BANK, Method.CARD, Method.VBANK))
                 .setBootExtra(bootExtra)