Skip to content

Commit bb2aac5

Browse files
rupy1014rupy1014
committed
extra option field 추가
1 parent 276230a commit bb2aac5

15 files changed

Lines changed: 155 additions & 103 deletions

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -518,33 +518,33 @@ private void requestDialog() {
518518
dialog = new BootpayDialog().setRequest(request)
519519
.setOnResponseListener(listener != null ? listener : new EventListener() {
520520
@Override
521-
public void onClose(String message) {
522-
if(close != null ) close.onClose(message);
521+
public void onClose(String data) {
522+
if(close != null ) close.onClose(data);
523523
}
524524

525525
@Override
526-
public void onReady(String message) {
527-
if(ready != null ) ready.onReady(message);
526+
public void onReady(String data) {
527+
if(ready != null ) ready.onReady(data);
528528
}
529529

530530
@Override
531-
public void onError(String message) {
532-
if(error != null ) error.onError(message);
531+
public void onError(String data) {
532+
if(error != null ) error.onError(data);
533533
}
534534

535535
@Override
536-
public void onCancel(String message) {
537-
if(cancel != null ) cancel.onCancel(message);
536+
public void onCancel(String data) {
537+
if(cancel != null ) cancel.onCancel(data);
538538
}
539539

540540
@Override
541-
public void onConfirm(String message) {
542-
if(confirm != null ) confirm.onConfirm(message);
541+
public void onConfirm(String data) {
542+
if(confirm != null ) confirm.onConfirm(data);
543543
}
544544

545545
@Override
546-
public void onDone(String message) {
547-
if(done != null ) done.onDone(message);
546+
public void onDone(String data) {
547+
if(done != null ) done.onDone(data);
548548
}
549549
});
550550

‎bootpay/src/main/java/kr/co/bootpay/BootpayFlutterActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66

77
public class BootpayFlutterActivity extends AppCompatActivity implements EventListener {
88
@Override
9-
public void onError(String message) {}
9+
public void onError(String data) {}
1010

1111
@Override
12-
public void onCancel(String message) {}
12+
public void onCancel(String data) {}
1313

1414
@Override
15-
public void onClose(String message) {}
15+
public void onClose(String data) {}
1616

1717
@Override
18-
public void onReady(String message) {}
18+
public void onReady(String data) {}
1919

2020
@Override
21-
public void onConfirm(String message) {}
21+
public void onConfirm(String data) {}
2222

2323
@Override
24-
public void onDone(String message) {}
24+
public void onDone(String data) {}
2525
}
2626

‎bootpay/src/main/java/kr/co/bootpay/listener/CancelListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package kr.co.bootpay.listener;
22

33
public interface CancelListener {
4-
void onCancel(String message);
4+
void onCancel(String data);
55
}
66

‎bootpay/src/main/java/kr/co/bootpay/listener/CloseListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package kr.co.bootpay.listener;
22

33
public interface CloseListener {
4-
void onClose(String message);
4+
void onClose(String data);
55
}
66

‎bootpay/src/main/java/kr/co/bootpay/listener/ConfirmListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package kr.co.bootpay.listener;
22

33
public interface ConfirmListener {
4-
void onConfirm(String message);
4+
void onConfirm(String data);
55
}
66

‎bootpay/src/main/java/kr/co/bootpay/listener/DoneListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package kr.co.bootpay.listener;
22

33
public interface DoneListener {
4-
void onDone(String message);
4+
void onDone(String data);
55
}
66

‎bootpay/src/main/java/kr/co/bootpay/listener/ErrorListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package kr.co.bootpay.listener;
22

33
public interface ErrorListener {
4-
void onError(String message);
4+
void onError(String data);
55
}
66

‎bootpay/src/main/java/kr/co/bootpay/listener/EventListener.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33

44
public interface EventListener extends CancelListener, ErrorListener, DoneListener, CloseListener, ReadyListener, ConfirmListener {
5-
void onError(String var1);
5+
void onError(String data);
66

7-
void onCancel(String var1);
7+
void onCancel(String data);
88

9-
void onClose(String var1);
9+
void onClose(String data);
1010

11-
void onReady(String var1);
11+
void onReady(String data);
1212

13-
void onConfirm(String var1);
13+
void onConfirm(String data);
1414

15-
void onDone(String var1);
15+
void onDone(String data);
1616
}
1717

‎bootpay/src/main/java/kr/co/bootpay/listener/ReadyListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package kr.co.bootpay.listener;
22

33
public interface ReadyListener {
4-
void onReady(String message);
4+
void onReady(String data);
55
}
66

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ public final class BootExtra {
2525
private int escrow = 0; // 에스크로 쓸지 안쓸지
2626
private int popup = -1; //1이면 popup, 아니면 iframe 연동
2727
private int quick_popup = -1; //1: popup 호출시 버튼을 띄우지 않는다. 아닐 경우 버튼을 호출한다
28+
private String offer_period; //결제창 제공기간에 해당하는 string 값, 지원하는 PG만 적용됨
29+
30+
private String theme = "purple"; // 통합 결제창 색상 지정 (purple, red, custom 지정 가능 )
31+
private String custom_background = ""; // theme가 custom인 경우 배경 색 지정 가능 ( ex: #f2f2f2 )
32+
private String custom_font_color = ""; // theme가 custom인 경우 폰트색 지정 가능 ( ex: #333333 )
33+
2834

2935

3036
public final String getApp_scheme() {
@@ -180,6 +186,10 @@ public final String toJson() {
180186
appScheme(),
181187
dispCashResult(),
182188
escrow(),
189+
offer_period(),
190+
theme(),
191+
custom_background(),
192+
custom_font_color(),
183193
oneStore()
184194
);
185195
}
@@ -230,4 +240,44 @@ public final BootExtra setQuick_popup(int quick_popup) {
230240
this.quick_popup = quick_popup;
231241
return this;
232242
}
243+
244+
public String offer_period() {
245+
if(this.offer_period == null) return "";
246+
return String.format(Locale.KOREA, "offer_period: '%s'", this.offer_period);
247+
}
248+
249+
public final BootExtra setOffer_period(String offer_period) {
250+
this.offer_period = offer_period;
251+
return this;
252+
}
253+
254+
public final BootExtra setTheme(String theme) {
255+
this.theme = theme;
256+
return this;
257+
}
258+
259+
public final BootExtra setCustom_background(String custom_background) {
260+
this.custom_background = custom_background;
261+
return this;
262+
}
263+
264+
public final BootExtra setCustom_font_color(String custom_font_color) {
265+
this.custom_font_color = custom_font_color;
266+
return this;
267+
}
268+
269+
public String theme() {
270+
if(this.theme == null) return "";
271+
return String.format(Locale.KOREA, "theme: '%s'", this.theme);
272+
}
273+
274+
public String custom_background() {
275+
if(this.custom_background == null) return "";
276+
return String.format(Locale.KOREA, "custom_background: '%s'", this.custom_background);
277+
}
278+
279+
public String custom_font_color() {
280+
if(this.custom_font_color == null) return "";
281+
return String.format(Locale.KOREA, "custom_font_color: '%s'", this.custom_font_color);
282+
}
233283
}

0 commit comments

Comments
 (0)