extra option field 추가

rupy1014 · rupy1014 · commit bb2aac5b1d30 · 2020-09-17T17:15:41.000+09:00
diff --git a/bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java b/bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java
@@ -518,33 +518,33 @@ private void requestDialog() {
         dialog = new BootpayDialog().setRequest(request)
             .setOnResponseListener(listener != null ? listener : new EventListener() {
                 @Override
-                public void onClose(String message) {
-                    if(close != null ) close.onClose(message);
+                public void onClose(String data) {
+                    if(close != null ) close.onClose(data);
                 }
 
                 @Override
-                public void onReady(String message) {
-                    if(ready != null ) ready.onReady(message);
+                public void onReady(String data) {
+                    if(ready != null ) ready.onReady(data);
                 }
 
                 @Override
-                public void onError(String message) {
-                    if(error != null ) error.onError(message);
+                public void onError(String data) {
+                    if(error != null ) error.onError(data);
                 }
 
                 @Override
-                public void onCancel(String message) {
-                    if(cancel != null ) cancel.onCancel(message);
+                public void onCancel(String data) {
+                    if(cancel != null ) cancel.onCancel(data);
                 }
 
                 @Override
-                public void onConfirm(String message) {
-                    if(confirm != null ) confirm.onConfirm(message);
+                public void onConfirm(String data) {
+                    if(confirm != null ) confirm.onConfirm(data);
                 }
 
                 @Override
-                public void onDone(String message) {
-                    if(done != null ) done.onDone(message);
+                public void onDone(String data) {
+                    if(done != null ) done.onDone(data);
                 }
         });
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/BootpayFlutterActivity.java b/bootpay/src/main/java/kr/co/bootpay/BootpayFlutterActivity.java
@@ -6,21 +6,21 @@
 
 public class BootpayFlutterActivity extends AppCompatActivity implements EventListener {
     @Override
-    public void onError(String message) {}
+    public void onError(String data) {}
 
     @Override
-    public void onCancel(String message) {}
+    public void onCancel(String data) {}
 
     @Override
-    public void onClose(String message) {}
+    public void onClose(String data) {}
 
     @Override
-    public void onReady(String message) {}
+    public void onReady(String data) {}
 
     @Override
-    public void onConfirm(String message) {}
+    public void onConfirm(String data) {}
 
     @Override
-    public void onDone(String message) {}
+    public void onDone(String data) {}
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/listener/CancelListener.java b/bootpay/src/main/java/kr/co/bootpay/listener/CancelListener.java
@@ -1,6 +1,6 @@
 package kr.co.bootpay.listener;
 
 public interface CancelListener {
-    void onCancel(String message);
+    void onCancel(String data);
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/listener/CloseListener.java b/bootpay/src/main/java/kr/co/bootpay/listener/CloseListener.java
@@ -1,6 +1,6 @@
 package kr.co.bootpay.listener;
 
 public interface CloseListener {
-    void onClose(String message);
+    void onClose(String data);
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/listener/ConfirmListener.java b/bootpay/src/main/java/kr/co/bootpay/listener/ConfirmListener.java
@@ -1,6 +1,6 @@
 package kr.co.bootpay.listener;
 
 public interface ConfirmListener {
-    void onConfirm(String message);
+    void onConfirm(String data);
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/listener/DoneListener.java b/bootpay/src/main/java/kr/co/bootpay/listener/DoneListener.java
@@ -1,6 +1,6 @@
 package kr.co.bootpay.listener;
 
 public interface DoneListener {
-    void onDone(String message);
+    void onDone(String data);
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/listener/ErrorListener.java b/bootpay/src/main/java/kr/co/bootpay/listener/ErrorListener.java
@@ -1,6 +1,6 @@
 package kr.co.bootpay.listener;
 
 public interface ErrorListener {
-    void onError(String message);
+    void onError(String data);
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/listener/EventListener.java b/bootpay/src/main/java/kr/co/bootpay/listener/EventListener.java
@@ -2,16 +2,16 @@
 
 
 public interface EventListener extends CancelListener, ErrorListener, DoneListener, CloseListener,  ReadyListener, ConfirmListener {
-    void onError(String var1);
+    void onError(String data);
 
-    void onCancel(String var1);
+    void onCancel(String data);
 
-    void onClose(String var1);
+    void onClose(String data);
 
-    void onReady(String var1);
+    void onReady(String data);
 
-    void onConfirm(String var1);
+    void onConfirm(String data);
 
-    void onDone(String var1);
+    void onDone(String data);
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/listener/ReadyListener.java b/bootpay/src/main/java/kr/co/bootpay/listener/ReadyListener.java
@@ -1,6 +1,6 @@
 package kr.co.bootpay.listener;
 
 public interface ReadyListener {
-    void onReady(String message);
+    void onReady(String data);
 }
 
diff --git a/bootpay/src/main/java/kr/co/bootpay/model/BootExtra.java b/bootpay/src/main/java/kr/co/bootpay/model/BootExtra.java
@@ -25,6 +25,12 @@ public final class BootExtra {
     private int escrow = 0; // 에스크로 쓸지 안쓸지
     private int popup = -1; //1이면 popup, 아니면 iframe 연동
     private int quick_popup = -1; //1: popup 호출시 버튼을 띄우지 않는다. 아닐 경우 버튼을 호출한다
+    private String offer_period; //결제창 제공기간에 해당하는 string 값, 지원하는 PG만 적용됨
+
+    private String theme = "purple"; // 통합 결제창 색상 지정 (purple, red, custom 지정 가능 )
+    private String custom_background = ""; // theme가 custom인 경우 배경 색 지정 가능 ( ex: #f2f2f2 )
+    private String custom_font_color = ""; // theme가 custom인 경우 폰트색 지정 가능 ( ex: #333333 )
+
 
 
     public final String getApp_scheme() {
@@ -180,6 +186,10 @@ public final String toJson() {
                 appScheme(),
                 dispCashResult(),
                 escrow(),
+                offer_period(),
+                theme(),
+                custom_background(),
+                custom_font_color(),
                 oneStore()
         );
     }
@@ -230,4 +240,44 @@ public final BootExtra setQuick_popup(int quick_popup) {
         this.quick_popup = quick_popup;
         return this;
     }
+
+    public String offer_period() {
+        if(this.offer_period == null) return "";
+        return String.format(Locale.KOREA, "offer_period: '%s'", this.offer_period);
+    }
+
+    public final BootExtra setOffer_period(String offer_period) {
+        this.offer_period = offer_period;
+        return this;
+    }
+
+    public final BootExtra setTheme(String theme) {
+        this.theme = theme;
+        return this;
+    }
+
+    public final BootExtra setCustom_background(String custom_background) {
+        this.custom_background = custom_background;
+        return this;
+    }
+
+    public final BootExtra setCustom_font_color(String custom_font_color) {
+        this.custom_font_color = custom_font_color;
+        return this;
+    }
+
+    public String theme() {
+        if(this.theme == null) return "";
+        return String.format(Locale.KOREA, "theme: '%s'", this.theme);
+    }
+
+    public String custom_background() {
+        if(this.custom_background == null) return "";
+        return String.format(Locale.KOREA, "custom_background: '%s'", this.custom_background);
+    }
+
+    public String custom_font_color() {
+        if(this.custom_font_color == null) return "";
+        return String.format(Locale.KOREA, "custom_font_color: '%s'", this.custom_font_color);
+    }
 }
diff --git a/bootpay/src/main/java/kr/co/bootpay/model/Payload.java b/bootpay/src/main/java/kr/co/bootpay/model/Payload.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 public class Payload {
+
     private String application_id = "";
     private String pg = "";
     private String method = "";
diff --git a/sample/src/main/java/bootpay/co/kr/samplepayment/App2AppActivity.java b/sample/src/main/java/bootpay/co/kr/samplepayment/App2AppActivity.java
@@ -52,27 +52,27 @@ public void goOcr(View v) {
                 .addItem("키보드", 1, "ITEM_CODE_KEYBOARD", 200, "패션", "여성상의", "블라우스") // 주문정보에 담길 상품정보, 통계를 위해 사용
                 .onDone(new DoneListener() { // 결제완료시 호출, 아이템 지급 등 데이터 동기화 로직을 수행합니다
                     @Override
-                    public void onDone(@Nullable String message) {
-                        Log.d("done", message);
+                    public void onDone(@Nullable String data) {
+                        Log.d("done", data);
                     }
                 })
                 .onCancel(new CancelListener() { // 결제 취소시 호출
                     @Override
-                    public void onCancel(@Nullable String message) {
+                    public void onCancel(@Nullable String data) {
 
-                        Log.d("cancel", message);
+                        Log.d("cancel", data);
                     }
                 })
                 .onError(new ErrorListener() { // 에러가 났을때 호출되는 부분
                     @Override
-                    public void onError(@Nullable String message) {
-                        Log.d("error", message);
+                    public void onError(@Nullable String data) {
+                        Log.d("error", data);
                     }
                 })
                 .onClose(
                         new CloseListener() { //결제창이 닫힐때 실행되는 부분
                             @Override
-                            public void onClose(String message) {
+                            public void onClose(String data) {
                                 Log.d("close", "close");
                             }
                         })
diff --git a/sample/src/main/java/bootpay/co/kr/samplepayment/FlutterActivity.java b/sample/src/main/java/bootpay/co/kr/samplepayment/FlutterActivity.java
@@ -82,32 +82,32 @@ public void onClick_request(View v) {
 
 
     @Override
-    public void onError(String message) {
-        Log.d("bootpay  error", message);
+    public void onError(String data) {
+        Log.d("bootpay  error", data);
     }
 
     @Override
-    public void onCancel(String message) {
-        Log.d("bootpay  cancel", message);
+    public void onCancel(String data) {
+        Log.d("bootpay  cancel", data);
     }
 
     @Override
-    public void onClose(String message) {
+    public void onClose(String data) {
         Log.d("bootpay  close", "close");
     }
 
     @Override
-    public void onReady(String message) {
-        Log.d("bootpay  ready", message);
+    public void onReady(String data) {
+        Log.d("bootpay  ready", data);
     }
 
     @Override
-    public void onConfirm(String message) {
-        Log.d("bootpay  confirm", message);
+    public void onConfirm(String data) {
+        Log.d("bootpay  confirm", data);
     }
 
     @Override
-    public void onDone(String message) {
-        Log.d("bootpay  done", message);
+    public void onDone(String data) {
+        Log.d("bootpay  done", data);
     }
 }
diff --git a/sample/src/main/java/bootpay/co/kr/samplepayment/MainActivity.java b/sample/src/main/java/bootpay/co/kr/samplepayment/MainActivity.java
diff --git a/sample/src/main/java/bootpay/co/kr/samplepayment/NativeActivity.java b/sample/src/main/java/bootpay/co/kr/samplepayment/NativeActivity.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package kr.co.bootpay.listener;`
`2`	`2`
`3`	`3`	`public interface CancelListener {`
`4`		`- void onCancel(String message);`
	`4`	`+ void onCancel(String data);`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package kr.co.bootpay.listener;`
`2`	`2`
`3`	`3`	`public interface CloseListener {`
`4`		`- void onClose(String message);`
	`4`	`+ void onClose(String data);`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package kr.co.bootpay.listener;`
`2`	`2`
`3`	`3`	`public interface ConfirmListener {`
`4`		`- void onConfirm(String message);`
	`4`	`+ void onConfirm(String data);`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package kr.co.bootpay.listener;`
`2`	`2`
`3`	`3`	`public interface DoneListener {`
`4`		`- void onDone(String message);`
	`4`	`+ void onDone(String data);`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package kr.co.bootpay.listener;`
`2`	`2`
`3`	`3`	`public interface ErrorListener {`
`4`		`- void onError(String message);`
	`4`	`+ void onError(String data);`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package kr.co.bootpay.listener;`
`2`	`2`
`3`	`3`	`public interface ReadyListener {`
`4`		`- void onReady(String message);`
	`4`	`+ void onReady(String data);`
`5`	`5`	`}`
`6`	`6`