Skip to content

Commit 2c2330f

Browse files
author
ehowlsla
committed
iframe popup bug fixed
1 parent a75d1e0 commit 2c2330f

File tree

5 files changed

+31
-10
lines changed

5 files changed

+31
-10
lines changed

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import kr.co.bootpay.pref.UserInfo;
3434

3535
public class BootpayWebView extends WebView {
36-
private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.0.2/production.html";
36+
private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.0.4/production.html";
3737
//private static final String BOOTPAY = "https://inapp.bootpay.co.kr/2.1.1/production.html";
3838

3939
private Dialog dialog;
@@ -580,6 +580,25 @@ public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGest
580580
tr.setWebView(newWindow);
581581
resultMsg.sendToTarget();
582582
}
583+
// else {
584+
// WebView newWebView = new WebView(view.getContext());
585+
// WebSettings webSettings = newWebView.getSettings();
586+
// webSettings.setJavaScriptEnabled(true);
587+
//
588+
// final Dialog dialog = new Dialog(view.getContext());
589+
// dialog.setContentView(newWebView);
590+
// dialog.show();
591+
// newWebView.setWebChromeClient(new WebChromeClient() {
592+
// @Override
593+
// public void onCloseWindow(WebView window) {
594+
// dialog.dismiss();
595+
// }
596+
// });
597+
// ((WebView.WebViewTransport)resultMsg.obj).setWebView(newWebView);
598+
// resultMsg.sendToTarget();
599+
// }
600+
601+
583602
return true;
584603
}
585604

bootpay/src/main/java/kr/co/bootpay/analytics/AnalyticsPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class AnalyticsPresenter {
2121
AnalyticsService service;
2222
Scheduler thread;
23-
private final String ver = "3.0.0";
23+
private final String ver = "3.0.4";
2424

2525
public AnalyticsPresenter(AnalyticsService service) {
2626
this.service = service;

sample/src/main/assets/html/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
55
<meta name="viewport" content="width=device-width, initial-scale=1, bootUser-scalable=no">
66
<meta content="5b14c0ffb6d49c40cda92c4e" name="bootpay-application-id">
7-
<script src="https://cdn.bootpay.co.kr/js/bootpay-3.0.2.min.js" type="application/javascript"></script>
7+
<script src="https://cdn.bootpay.co.kr/js/bootpay-3.0.4.min.js" type="application/javascript"></script>
88
<script>
99
function payTest() {
1010
var android_application_id = '5b14c0ffb6d49c40cda92c4e'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ public void onClick_request(View v) {
5858
// 결제호출
5959
Bootpay.init(getFragmentManager())
6060
.setApplicationId("5b14c0ffb6d49c40cda92c4e") // 해당 프로젝트(안드로이드)의 application id 값
61-
.setPG(PG.KICC) // 결제할 PG 사
61+
.setPG(PG.INICIS) // 결제할 PG 사
6262
.setContext(this)
6363
.setBootUser(bootUser)
6464
.setBootExtra(bootExtra)
6565
// .setUserPhone("010-1234-5678") // 구매자 전화번호
66-
.setMethod(Method.CARD) // 결제수단
66+
.setMethod(Method.BANK) // 결제수단
6767
.setName("맥\"북프로's 임다") // 결제할 상품명
6868
.setOrderId("1234") // 결제 고유번호expire_month
6969
// .setAccountExpireAt("2018-09-22") // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ public class NativeActivity extends Activity {
2828
private int stuck = 1;
2929
//5b9f51264457636ab9a07cdc
3030
// private String application_id = "5b9f51264457636ab9a07cdc";
31-
private String application_id = "5b14c0ffb6d49c40cda92c4e";
31+
// private String application_id = "5b14c0ffb6d49c40cda92c4e";
32+
33+
private String application_id = "5ab306a4396fa616d1ba3e69";
3234

3335

3436
@Override
@@ -72,14 +74,14 @@ public void onClick_request(View v) {
7274
Bootpay.init(getFragmentManager())
7375
.setContext(this)
7476
.setApplicationId("5b14c0ffb6d49c40cda92c4e") // 해당 프로젝트(안드로이드)의 application id 값
75-
.setPG(PG.PAYLETTER) // 결제할 PG 사
77+
.setPG(PG.INICIS) // 결제할 PG 사
7678
// .setUserPhone("010-1234-5678") // 구매자 전화번호
77-
.setUX(UX.PG_SUBSCRIPT)
78-
.setMethod(Method.SUBSCRIPT_CARD) // 결제수단
79+
// .setUX(UX.PG_SUBSCRIPT)
80+
.setMethod(Method.BANK) // 결제수단
7981
//.isShowAgree(true)
8082
.setName("맥북프로임다") // 결제할 상품명
8183
.setOrderId("1234") // 결제 고유번호
82-
.setPrice(0) // 결제할 금액
84+
.setPrice(1000) // 결제할 금액
8385

8486
.addItem("마우스", 1, "ITEM_CODE_MOUSE", 100) // 주문정보에 담길 상품정보, 통계를 위해 사용
8587
.addItem("키보드", 1, "ITEM_CODE_KEYBOARD", 200, "패션", "여성상의", "블라우스") // 주문정보에 담길 상품정보, 통계를 위해 사용

0 commit comments

Comments
 (0)