bootpay 3.3.0 update

Author: rupy1014

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

@@ -36,7 +36,7 @@
 import kr.co.bootpay.pref.UserInfo;
 
 public class BootpayWebView extends WebView {
-private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.2.6/production.html";
+private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.3.0/production.html";
 
     private Dialog dialog;
 //    private ConnectivityManager connManager;
@@ -98,6 +98,35 @@ public BootpayWebView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
+    private void goBootpayRequest() {
+        loadParams(
+                request(
+                        price(),
+                        easyPayUserToken(),
+                        applicationId(),
+                        name(),
+                        pg(),
+//                                    userPhone(),
+                        agree(),
+                        method(),
+                        methods(),
+                        items(),
+                        params(),
+                        accountExpireAt(),
+                        orderId(),
+                        useOrderId(),
+                        userJson(),
+                        extraJson()
+                ),
+                error(),
+                cancel(),
+                ready(),
+                confirm(),
+                close(),
+                done()
+        );
+    }
+
     public BootpayWebView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
@@ -124,35 +153,18 @@ public void onPageFinished(WebView view, String url) {
 
 //                    setDevelopMode();
 //                    useOneStoreApi();
+//                    if(extraJson())
 
-//                    Log.d("bootpay", "onPageFinished");
+                    if(request.getBoot_extra().getQuick_popup() == 1) {
+                        setQuickPopup();
+                        goBootpayRequest();
 
-                    loadParams(
-                            request(
-                                    price(),
-                                    easyPayUserToken(),
-                                    applicationId(),
-                                    name(),
-                                    pg(),
-//                                    userPhone(),
-                                    agree(),
-                                    method(),
-                                    methods(),
-                                    items(),
-                                    params(),
-                                    accountExpireAt(),
-                                    orderId(),
-                                    useOrderId(),
-                                    userJson(),
-                                    extraJson()
-                            ),
-                            error(),
-                            cancel(),
-                            ready(),
-                            confirm(),
-                            close(),
-                            done()
-                    );
+                    } else {
+                        goBootpayRequest();
+                    }
+//                    request.getBoot_extra().
+
+//                    goBootpayRequest();
                 }
             }
 
@@ -316,6 +328,10 @@ private void setDevelopMode() {
         load("window.BootPay.setMode('development');");
     }
 
+    private void setQuickPopup() {
+        load("window.BootPay.startQuickPopup();");
+    }
+
 
 //    private void useOneStoreApi() {
 //        if(request != null && "onestore".equals(request.getPG())) {

bootpay/src/main/java/kr/co/bootpay/model/BootExtra.java

@@ -23,6 +23,8 @@ public final class BootExtra {
 
     private BootpayOneStore onestore;
     private int escrow = 0; // 에스크로 쓸지 안쓸지
+    private int popup = -1; //1이면 popup, 아니면 iframe 연동
+    private int quick_popup = -1; //1: popup 호출시 버튼을 띄우지 않는다. 아닐 경우 버튼을 호출한다
 
 
     public final String getApp_scheme() {
@@ -151,6 +153,14 @@ private String escrow() {
         return String.format(Locale.KOREA, "escrow: %d", this.escrow);
     }
 
+    private String popup() {
+        return String.format(Locale.KOREA, "popup: %d", this.popup);
+    }
+
+    private String quick_popup() {
+        return String.format(Locale.KOREA, "quick_popup: %d", this.quick_popup);
+    }
+
     private String oneStore() {
         if(this.onestore == null) return "";
         return String.format(Locale.KOREA, "onestore: %s", this.onestore.toJson());
@@ -165,6 +175,8 @@ public final String toJson() {
                 vbankResult(),
                 quotas(),
                 ux(),
+                popup(),
+                quick_popup(),
                 appScheme(),
                 dispCashResult(),
                 escrow(),
@@ -200,4 +212,22 @@ public BootpayOneStore getOnestore() {
     public void setOnestore(BootpayOneStore onestore) {
         this.onestore = onestore;
     }
+
+    public int getPopup() {
+        return popup;
+    }
+
+    public final BootExtra setPopup(int popup) {
+        this.popup = popup;
+        return this;
+    }
+
+    public int getQuick_popup() {
+        return quick_popup;
+    }
+
+    public final BootExtra setQuick_popup(int quick_popup) {
+        this.quick_popup = quick_popup;
+        return this;
+    }
 }

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

@@ -80,7 +80,7 @@ void goPGPay() {
                 .setContext(this)
                 .setApplicationId(application_id) // 해당 프로젝트(안드로이드)의 application id 값
                 .setPG(PG.DANAL) // 결제할 PG 사
-                .setMethod(Method.PHONE)
+                .setMethod(Method.CARD)
 //                .setEasyPayUserToken("wef")
 //                .setMethodList(Arrays.asList(Method.EASY_CARD, Method.PHONE, Method.BANK, Method.CARD, Method.VBANK))
                 .setBootExtra(bootExtra)