npay support

Author: rupy1014

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

@@ -8,6 +8,7 @@
 import android.os.AsyncTask;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.util.Log;
 
 
 import com.google.android.gms.ads.identifier.AdvertisingIdClient;
@@ -18,6 +19,10 @@ public class Bootpay {
     private static Context context;
     protected  static BootpayBuilder builder;
 
+    public static void setContext(Context context) {
+        Bootpay.context = context;
+    }
+
 
     public static void useOnestoreApi(Context context) {
         useOnestoreApi(context, true);
@@ -72,8 +77,8 @@ protected String doInBackground(final Void... params) {
 
             try {
 
+//                Log.d("intent", e.getMessage());
                 return AdvertisingIdClient.getAdvertisingIdInfo(context).getId();
-//                Logger.logDebug("adid : " + adId);
             } catch (IllegalStateException ex) {
                 ex.printStackTrace();
 //                Logger.logError("IllegalStateException");
@@ -109,6 +114,7 @@ public static BootpayBuilder init(Fragment fragment) {
     }
 
     public static BootpayBuilder init(FragmentManager fragmentManager) {
+//        fragmentManager.c
         return builder = new BootpayBuilder(fragmentManager);
     }
 

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

@@ -59,6 +59,7 @@ public BootpayBuilder(FragmentManager manager) {
     }
 
     public BootpayBuilder setContext(Context context) {
+        Bootpay.setContext(context);
         this.context = context;
         return this;
     }
@@ -308,6 +309,9 @@ public BootpayBuilder setMethod(Method method) {
             case KAKAO:
                 request.setMethod("kakao");
                 break;
+            case NPAY:
+                request.setMethod("npay");
+                break;
         }
         return this;
     }
@@ -428,7 +432,7 @@ private void validCheck() {
         if(ux == null || ux == UX.NONE) { request.setUX(UX.PG_DIALOG); }
         ux = request.getUX();
         if(ux == UX.PG_DIALOG) {
-            if (fragmentManager == null && fragmentManager.isDestroyed()) { error("fragment 값은 null 이 될 수 없습니다."); }
+            if (fragmentManager == null || fragmentManager.isDestroyed()) { error("fragment 값은 null 이 될 수 없습니다."); }
 
         } else if(ux == UX.APP2APP_CARD_SIMPLE
                 || ux == UX.APP2APP_NFC

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

@@ -13,15 +13,19 @@
 import android.os.Message;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.webkit.CookieManager;
 import android.webkit.JavascriptInterface;
 import android.webkit.JsResult;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 import java.net.URISyntaxException;
 import java.util.List;
@@ -33,7 +37,7 @@
 import kr.co.bootpay.pref.UserInfo;
 
 public class BootpayWebView extends WebView {
-private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.2.0/production.html";
+private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.2.1/production.html";
 
     private Dialog dialog;
 //    private ConnectivityManager connManager;
@@ -110,6 +114,10 @@ public BootpayWebView(Context context, AttributeSet attrs, int defStyleAttr) {
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
                 if (request == null) return;
+//                if ("about:blank".equals(url)) {
+//                    loadUrl(BOOTPAY);
+//                    return;
+//                }
                 if (!isLoaded) {
                     isLoaded = true;
                     setDevice();
@@ -594,11 +602,14 @@ public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGest
                 } else if(listener != null){
                     newWindow.setOnResponseListener(listener);
                 }
-//                if(javascriptInterfaceObject != null)
-//                    newWindow.setJavascriptInterface(javascriptInterfaceObject, javascriptInterfaceName);
 
+                addView(newWindow,
+                        new FrameLayout.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            Gravity.NO_GRAVITY)
+                );
 
-                addView(newWindow);
                 WebView.WebViewTransport tr = (WebView.WebViewTransport) resultMsg.obj;
                 tr.setWebView(newWindow);
                 resultMsg.sendToTarget();

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

@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
         BootpayAnalytics.init(this, application_id);
 //        BootpayAnalytics.init(this, "5b14c0ffb6d49c40cda92c4e");
 
-        Bootpay.useOnestoreApi(this);
+//        Bootpay.useOnestoreApi(this);
 
 //        BootpayAnalytics.init(this, "59a7e647396fa64fcad4a8c2");
 
@@ -74,8 +74,8 @@ public void onClick_request(View v) {
         Bootpay.init(getFragmentManager())
                 .setContext(this)
                 .setApplicationId(application_id) // 해당 프로젝트(안드로이드)의 application id 값
-                .setPG(PG.DANAL) // 결제할 PG 사
-                .setMethod(Method.CARD)
+                .setPG(PG.INICIS) // 결제할 PG 사
+                .setMethod(Method.BANK)
                 .setBootExtra(bootExtra)
                 .setBootUser(bootUser)
 //                .setUserPhone("010-1234-5678") // 구매자 전화번호