inicis webapp sample update

Author: ehowlsla

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

@@ -83,7 +83,6 @@ public void handleMessage(Message msg) {
 
     private EventListener listener;
 
-//    private Dialog dialog;
 
     public BootpayWebView(Context context) {
         this(context, null);
@@ -110,6 +109,7 @@ public BootpayWebView(Context context, AttributeSet attrs, int defStyleAttr) {
             @Override
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
+                if (request == null) return;
                 if (!isLoaded) {
                     isLoaded = true;
                     setDevice();
@@ -459,6 +459,7 @@ private void loadParams(String... script) {
     @SuppressLint("setJavaScriptEnabled")
     private void setting(Context context) {
         setWebChromeClient(new Client());
+//        if(javascriptInterfaceObject == null) addJavascriptInterface(new AndroidBridge(), "Android");
         addJavascriptInterface(new AndroidBridge(), "Android");
         CookieManager.getInstance().setAcceptCookie(true);
         WebSettings s = getSettings();
@@ -565,6 +566,7 @@ private void onDoneHandled(String data) {
 
     private class Client extends WebChromeClient {
 
+        @SuppressLint("JavascriptInterface")
         @Override
         public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
             WebView.HitTestResult result = view.getHitTestResult();
@@ -574,9 +576,16 @@ public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGest
                 start(view, createFrom(url));
             } else if (resultMsg != null) {
                 BootpayWebView newWindow = new BootpayWebView(view.getContext());
-                newWindow.setRequest(request)
-                        .setDialog(dialog)
-                        .setOnResponseListener(listener);
+                if(request != null) {
+                    newWindow.setRequest(request)
+                            .setDialog(dialog)
+                            .setOnResponseListener(listener);
+                } else if(listener != null){
+                    newWindow.setOnResponseListener(listener);
+                }
+//                if(javascriptInterfaceObject != null)
+//                    newWindow.setJavascriptInterface(javascriptInterfaceObject, javascriptInterfaceName);
+
 
                 addView(newWindow);
                 WebView.WebViewTransport tr = (WebView.WebViewTransport) resultMsg.obj;

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

@@ -78,6 +78,8 @@ public void onClick_request(View v) {
                 .setApplicationId(application_id) // 해당 프로젝트(안드로이드)의 application id 값
                 .setPG(PG.INICIS) // 결제할 PG 사
                 .setMethod(Method.BANK)
+                .setBootExtra(bootExtra)
+                .setBootUser(bootUser)
 //                .setUserPhone("010-1234-5678") // 구매자 전화번호
                 .setUX(UX.PG_DIALOG)
 //                .setMethod(Method.CARD) // 결제수단

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

@@ -22,11 +22,15 @@
 import java.net.URISyntaxException;
 
 import kr.co.bootpay.Bootpay;
+import kr.co.bootpay.BootpayWebView;
+import kr.co.bootpay.listener.EventListener;
 
 
-public class WebAppActivity extends Activity implements WebAppBridgeInterface {
-    WebView webview;
-    final String url = "https://test-shop.bootpay.co.kr";
+public class WebAppActivity extends Activity  {
+//    WebView webview;
+    BootpayWebView webview;
+    final String url = "https://g-cdn.bootpay.co.kr/test/payment/index.html";
+//    final String url = "https://test-shop.bootpay.co.kr";
 
 
 
@@ -38,42 +42,51 @@ public class WebAppActivity extends Activity implements WebAppBridgeInterface {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_webapp);
+
         webview = findViewById(R.id.webview);
-        webview.setWebViewClient(new BWebviewClient());
-
-        webview.setWebChromeClient(new BChromeClient());
-        webview.addJavascriptInterface(new WebAppBridge(this), "Android");
-        CookieManager.getInstance().setAcceptCookie(true);
-        webview.getSettings().setJavaScriptEnabled(true);
-        webview.getSettings().setDomStorageEnabled(true);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webview.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
-            CookieManager.getInstance().setAcceptThirdPartyCookies(webview, true);
-        }
-
-        webview.setWebChromeClient(new WebChromeClient() {
+        webview.setOnResponseListener(new EventListener() {
             @Override
-            public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
-                return super.onJsAlert(view, url, message, result);
+            public void onError(String data) {
+                System.out.println("bootpay error");
+                System.out.println(data);
             }
-        });
-        webview.loadUrl(url);
-    }
 
-    void setDevice() {
-        doJavascript("BootPay.setDevice('ANDROID');");
-    }
+            @Override
+            public void onCancel(String data) {
+                System.out.println("bootpay cancel");
+                System.out.println(data);
+            }
 
-    void startTrace() {
-        doJavascript("BootPay.startTrace();");
-    }
+            @Override
+            public void onClose(String data) {
+                System.out.println("bootpay close");
+                System.out.println(data);
+            }
 
-    void registerAppId() {
-        doJavascript("BootPay.setApplicationId('" + android_application_id + "');");
-    }
+            @Override
+            public void onReady(String data) {
+                System.out.println("bootpay ready");
+                System.out.println(data);
+            }
 
-    void registerAppIdDemo() {
-        doJavascript("window.setApplicationId('" + android_application_id + "');");
+            @Override
+            public void onConfirm(String data) {
+                boolean iWantPay = true;
+                if(iWantPay == true) { // 재고가 있을 경우
+                    doJavascript("BootPay.transactionConfirm( " + data + ");");
+                } else {
+                    doJavascript("BootPay.removePaymentWindow();");
+                }
+            }
+
+            @Override
+            public void onDone(String data) {
+                System.out.println("bootpay done");
+                System.out.println(data);
+
+            }
+        });
+        webview.loadUrl(url);
     }
 
     void doJavascript(String script) {
@@ -85,165 +98,4 @@ public void run() {
             }
         });
     }
-
-    @Override
-    public void error(String data) {
-        System.out.println(data);
-    }
-
-    @Override
-    public void close(String data) {
-        System.out.println(data);
-    }
-
-    @Override
-    public void cancel(String data) {
-        System.out.println(data);
-    }
-
-    @Override
-    public void ready(String data) {
-        System.out.println(data);
-    }
-
-    @Override
-    public void confirm(String data) {
-        boolean iWantPay = true;
-        if(iWantPay == true) { // 재고가 있을 경우
-            doJavascript("BootPay.transactionConfirm( " + data + ");");
-        } else {
-            doJavascript("BootPay.removePaymentWindow();");
-        }
-    }
-
-    @Override
-    public void done(String data) {
-        System.out.println(data);
-    }
-
-    private class BWebviewClient extends WebViewClient {
-        private boolean isLoaded = false;
-
-
-        @Override
-        public void onPageFinished(WebView view, String url) {
-            super.onPageFinished(view, url);
-            if(isLoaded) return;
-            isLoaded = true;
-            registerAppId();
-            setDevice();
-            startTrace();
-            registerAppIdDemo();
-        }
-
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            Intent intent = parse(url);
-            if (isIntent(url)) {
-                if (isExistInfo(intent, view.getContext()) || isExistPackage(intent, view.getContext()))
-                    return start(intent, view.getContext());
-                else
-                    return gotoMarket(intent, view.getContext());
-            } else if (isMarket(url)) {
-                if (!(isExistInfo(intent, view.getContext()) || isExistPackage(intent, view.getContext())))
-                    return gotoMarket(intent, view.getContext());
-                else
-                    return true;
-            } else if (isSpecialCase(url)) {
-                if (isExistInfo(intent, view.getContext()) || isExistPackage(intent, view.getContext()))
-                    return start(intent, view.getContext());
-                else
-                    return gotoMarket(intent, view.getContext());
-            }
-            return url.contains("https://bootpaymark");
-        }
-
-        private Boolean isSpecialCase(String url) {
-            return url.matches("^shinhan\\S+$")
-                    || url.startsWith("kftc-bankpay://")
-                    || url.startsWith("v3mobileplusweb://")
-                    || url.startsWith("hdcardappcardansimclick://")
-                    || url.startsWith("mpocket.online.ansimclick://");
-        }
-
-        private Intent parse(String url) {
-            try {
-                Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
-                if(intent.getPackage() == null) {
-                    if (url == null) return intent;
-                    if (url.startsWith("shinhan-sr-ansimclick")) intent.setPackage("com.shcard.smartpay");
-                    else if (url.startsWith("kftc-bankpay")) intent.setPackage("com.kftc.bankpay");
-                    else if (url.startsWith("ispmobile")) intent.setPackage("kvp.jjy.MispAndroid320");
-                    else if (url.startsWith("hdcardappcardansimclick")) intent.setPackage("com.hyundaicard.appcard");
-                    else if (url.startsWith("kb-acp")) intent.setPackage("com.kbcard.kbkookmincard");
-                    else if (url.startsWith("mpocket.online.ansimclick")) intent.setPackage("kr.co.samsungcard.mpocket");
-                    else if (url.startsWith("lotteappcard")) intent.setPackage("com.lcacApp");
-                    else if (url.startsWith("cloudpay")) intent.setPackage("com.hanaskcard.paycla");
-                    else if (url.startsWith("nhappvardansimclick")) intent.setPackage("nh.smart.nhallonepay");
-                    else if (url.startsWith("citispay")) intent.setPackage("kr.co.citibank.citimobile");
-                    else if (url.startsWith("kakaotalk")) intent.setPackage("com.kakao.talk");
-                }
-                return intent;
-            } catch (URISyntaxException e) {
-                e.printStackTrace();
-                return null;
-            }
-        }
-
-        private Boolean isIntent(String url) {
-            return url.matches("^intent:?\\w*://\\S+$");
-        }
-
-        private Boolean isMarket(String url) {
-            return url.matches("^market://\\S+$");
-        }
-
-
-
-        private Boolean isExistInfo(Intent intent, Context context) {
-            try {
-                return intent != null && context.getPackageManager().getPackageInfo(intent.getPackage(), PackageManager.GET_ACTIVITIES) != null;
-            } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
-                return false;
-            }
-        }
-
-        private Boolean isExistPackage(Intent intent, Context context) {
-            return intent != null &&  intent.getPackage() != null && context.getPackageManager().getLaunchIntentForPackage(intent.getPackage()) != null;
-        }
-
-        private boolean start(Intent intent, Context context) {
-            context.startActivity(intent);
-            return true;
-        }
-
-        private boolean gotoMarket(Intent intent, Context context) {
-            context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + intent.getPackage())));
-            return true;
-        }
-    }
-
-
-    private class BChromeClient extends WebChromeClient {
-        @Override
-        public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
-            return super.onCreateWindow(view, isDialog, isUserGesture, resultMsg);
-        }
-
-        @Override
-        public void onCloseWindow(WebView window) {
-            super.onCloseWindow(window);
-        }
-
-        @Override
-        public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
-            new AlertDialog.Builder(view.getContext())
-                    .setMessage(message)
-                    .setCancelable(true)
-                    .create()
-                    .show();
-            return true;
-        }
-    }
 }

sample/src/main/res/layout/activity_webapp.xml

@@ -4,9 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+    <!--<WebView-->
+        <!--android:id="@+id/webview"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"/>-->
+     <kr.co.bootpay.BootpayWebView
+         android:id="@+id/webview"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         />
 
 </LinearLayout>