kcp bankpay bug fixed

Author: rupy1014

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

@@ -159,6 +159,7 @@ public void onPageFinished(WebView view, String url) {
             @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());
@@ -188,12 +189,11 @@ private Boolean isSpecialCase(String url) {
 
             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("kftc-bankpay")) intent.setPackage("com.kftc.bankpay.android");
                         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");
@@ -266,6 +266,12 @@ public boolean shouldOverrideKeyEvent(WebView view, KeyEvent event) {
     }
 
     public void transactionConfirm(String data) {
+//        getContext().runOnUiThread(new Runnable() {
+//            @Override
+//            public void run() {
+//                webview.loadUrl("javascript:(function(){" + str + "})()");
+//            }
+//        });
         load("var data = JSON.parse('" + data + "'); BootPay.transactionConfirm(data);");
     }
 
@@ -410,7 +416,7 @@ private String userJson() {
     private String extraJson() {
         if(request.getBoot_extra() == null) return "";
         if(request.getBoot_extra().toJson().length() == 0) return "";
-        return String.format(Locale.KOREA, "bootExtra: %s", request.getBoot_extra().toJson());
+        return String.format(Locale.KOREA, "extra: %s", request.getBoot_extra().toJson());
     }
 
     private String listToString(List<String> array) {

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

@@ -16,6 +16,7 @@ public final class BootExtra {
     private String app_scheme_host; //app2app 결제시 return 받을 intent scheme host
     private String ux; //다양한 결제시나리오를 지원하기 위한 용도로 사용됨
     private String disp_cash_result = "Y"; // 현금영수증 보일지 말지.. 가상계좌 KCP 옵션
+    private int escrow = 0; // 에스크로 쓸지 안쓸지
 
 
     public final String getApp_scheme() {
@@ -140,6 +141,10 @@ private String dispCashResult() {
         return String.format(Locale.KOREA, "disp_cash_result: '%s'", this.disp_cash_result);
     }
 
+    private String escrow() {
+        return String.format(Locale.KOREA, "escrow: %d", this.escrow);
+    }
+
     public final String toJson() {
         return extra(
                 startAt(),
@@ -149,7 +154,8 @@ public final String toJson() {
                 quotas(),
                 ux(),
                 appScheme(),
-                dispCashResult()
+                dispCashResult(),
+                escrow()
         );
     }
 
@@ -165,4 +171,12 @@ public String getDisp_cash_result() {
     public void setDisp_cash_result(String disp_cash_result) {
         this.disp_cash_result = disp_cash_result;
     }
+
+    public int getEscrow() {
+        return escrow;
+    }
+
+    public void setEscrow(int escrow) {
+        this.escrow = escrow;
+    }
 }

sample/sample.iml

@@ -120,5 +120,8 @@
     <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" />
     <orderEntry type="module" module-name="bootpay" />
     <orderEntry type="module" module-name="bootpay" />
+    <orderEntry type="module" module-name="bootpay" />
+    <orderEntry type="module" module-name="bootpay" />
+    <orderEntry type="module" module-name="bootpay" />
   </component>
 </module>

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

@@ -26,7 +26,6 @@
 
 public class NativeActivity extends Activity {
     private int stuck = 1;
-//5b9f51264457636ab9a07cdc
     private String application_id = "5b8f6a4d396fa665fdc2b5e8";
 
 
@@ -37,11 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // 초기설정 - 해당 프로젝트(안드로이드)의 application id 값을 설정합니다. 결제와 통계를 위해 꼭 필요합니다.
         BootpayAnalytics.init(this, application_id);
-//        BootpayAnalytics.init(this, "5b14c0ffb6d49c40cda92c4e");
 
-//        Bootpay.useOnestoreApi(this);
-
-//        BootpayAnalytics.init(this, "59a7e647396fa64fcad4a8c2");
 
         // 통계 - 유저 로그인 시점에 호출
         BootpayAnalytics.login(
@@ -67,15 +62,16 @@ public void startTrace() {
     public void onClick_request(View v) {
         BootUser bootUser = new BootUser().setPhone("010-1234-5678");
         BootExtra bootExtra = new BootExtra().setQuotas(new int[] {0,2,3});
+        bootExtra.setEscrow(1);
 
 //        bootExtra.setEndAt()
 //        bootExtra.setStartAt()
 
         Bootpay.init(getFragmentManager())
                 .setContext(this)
                 .setApplicationId(application_id) // 해당 프로젝트(안드로이드)의 application id 값
-                .setPG(PG.INICIS) // 결제할 PG 사
-                .setMethod(Method.BANK)
+                .setPG(PG.DANAL) // 결제할 PG 사
+                .setMethod(Method.CARD)
                 .setBootExtra(bootExtra)
                 .setBootUser(bootUser)
 //                .setUserPhone("010-1234-5678") // 구매자 전화번호