가상계좌 결제처리 추가

Author: ehowlsla

README.md

@@ -33,7 +33,7 @@ allprojects {
 ```gradle
 dependencies {
     ...
-    implementation 'com.github.bootpay:client_android_java:2.0.6'
+    implementation 'com.github.bootpay:client_android_java:2.0.7'
 }
 ```
 

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

@@ -73,6 +73,8 @@ public static class Builder {
         private Request result = new Request();
         private EventListener listener;
         private ErrorListener error;
+        private ReadyListener ready;
+        private CloseListener close;
         private DoneListener done;
         private CancelListener cancel;
         private ConfirmListener confirm;
@@ -241,6 +243,11 @@ public Builder onConfirm(ConfirmListener listener) {
             return this;
         }
 
+        public Builder onReady(ReadyListener listener) {
+            ready = listener;
+            return this;
+        }
+
         public Builder onError(ErrorListener listener) {
             error = listener;
             return this;
@@ -251,6 +258,11 @@ public Builder onDone(DoneListener listener) {
             return this;
         }
 
+        public Builder onClose(CloseListener listener) {
+            close = listener;
+            return this;
+        }
+
         public Builder setUserEmail(String email) {
             result.setUserEmail(email);
             return this;
@@ -290,6 +302,16 @@ public void show() {
             dialog = new BootpayDialog()
                     .setData(result)
                     .setOnResponseListener(listener != null ? listener : new EventListener() {
+                        @Override
+                        public void onClose(@org.jetbrains.annotations.Nullable String message) {
+                            close.onClose(message);
+                        }
+
+                        @Override
+                        public void onReady(@org.jetbrains.annotations.Nullable String message) {
+                            ready.onReady(message);
+                        }
+
                         @Override
                         public void onError(@org.jetbrains.annotations.Nullable String message) {
                             error.onError(message);
@@ -301,8 +323,8 @@ public void onCancel(@org.jetbrains.annotations.Nullable String message) {
                         }
 
                         @Override
-                        public void onConfirmed(@org.jetbrains.annotations.Nullable String message) {
-                            confirm.onConfirmed(message);
+                        public void onConfirm(@org.jetbrains.annotations.Nullable String message) {
+                            confirm.onConfirm(message);
                         }
 
                         @Override

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

@@ -26,10 +26,14 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
     companion object {
         private const val BOOTPAY = "https://inapp.bootpay.co.kr/2.0.6/production.html"
 
+        private const val CLOSE = -3
+
         private const val ERROR = -2
 
         private const val CANCEL = -1
 
+        private const val READY = 0
+
         private const val CONFIRM = 1
 
         private const val DONE = 2
@@ -44,9 +48,11 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
             super.handleMessage(msg)
             val data = msg.obj.toString()
             when (msg.what) {
+                CLOSE   -> onCloseHandled(data)
                 ERROR   -> onErrorHandled(data)
                 CANCEL  -> onCancelHandled(data)
-                CONFIRM -> onConfirmeHandled(data)
+                READY   -> onReadyHandled(data)
+                CONFIRM -> onConfirmHandled(data)
                 DONE    -> onDoneHandled(data)
             }
         }
@@ -99,7 +105,9 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
                             ),
                             error(),
                             cancel(),
+                            ready(),
                             confirm(),
+                            close(),
                             done()
                     )
                 }
@@ -199,6 +207,10 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
 
     private fun error() = ".error(function(data){Android.error(JSON.stringify(data));})"
 
+    private fun ready() = ".ready(function(data){Android.ready(JSON.stringify(data));})"
+
+    private fun close() = ".close(function(data){Android.close('close');})"
+
     private fun confirm() = ".confirm(function(data){Android.confirm(JSON.stringify(data));})"
 
     private fun cancel() = ".cancel(function(data){Android.cancel(JSON.stringify(data));})"
@@ -287,6 +299,15 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
     }
 
     private inner class AndroidBridge: IScriptFuction {
+        @JavascriptInterface
+        override fun close(data: String) {
+            eventHandler.sendMessage(Message.obtain(eventHandler, CLOSE, data))
+        }
+
+        @JavascriptInterface
+        override fun ready(data: String) {
+            eventHandler.sendMessage(Message.obtain(eventHandler, READY, data))
+        }
 
         @JavascriptInterface
         override fun error(data: String) {
@@ -309,23 +330,32 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
         }
     }
 
+    private fun onCloseHandled(data: String) {
+        listener?.onClose(data)
+        dialog?.dismiss()
+    }
+
     private fun onErrorHandled(data: String) {
         listener?.onError(data)
-        dialog?.dismiss()
+//        dialog?.dismiss()
     }
 
     private fun onCancelHandled(data: String) {
         listener?.onCancel(data)
-        dialog?.dismiss()
+//        dialog?.dismiss()
+    }
+
+    private fun onReadyHandled(data: String) {
+        listener?.onReady(data)
     }
 
-    private fun onConfirmeHandled(data: String) {
-        listener?.onConfirmed(data)
+    private fun onConfirmHandled(data: String) {
+        listener?.onConfirm(data)
     }
 
     private fun onDoneHandled(data: String) {
         listener?.onDone(data)
-        dialog?.dismiss()
+//        dialog?.dismiss()
     }
 
     private inner class Client: WebChromeClient() {

bootpay/src/main/java/kr/co/bootpay/CloseListener.kt

@@ -0,0 +1,6 @@
+package kr.co.bootpay
+
+@FunctionalInterface
+interface CloseListener {
+    fun onClose(message: String?)
+}

bootpay/src/main/java/kr/co/bootpay/ConfirmListener.kt

@@ -2,5 +2,5 @@ package kr.co.bootpay
 
 @FunctionalInterface
 interface ConfirmListener {
-    fun onConfirmed(message: String?)
+    fun onConfirm(message: String?)
 }

bootpay/src/main/java/kr/co/bootpay/EventListener.kt

@@ -1,11 +1,15 @@
 package kr.co.bootpay
 
-interface EventListener : CancelListener, ConfirmListener, ErrorListener, DoneListener {
+interface EventListener : CancelListener, ReadyListener, ConfirmListener, ErrorListener, DoneListener, CloseListener {
     override fun onError(message: String?)
 
     override fun onCancel(message: String?)
 
-    override fun onConfirmed(message: String?)
+    override fun onClose(message: String?)
+
+    override fun onReady(message: String?)
+
+    override fun onConfirm(message: String?)
 
     override fun onDone(message: String?)
 }

bootpay/src/main/java/kr/co/bootpay/IScriptFuction.kt

@@ -6,9 +6,15 @@ interface IScriptFuction {
     @JavascriptInterface
     fun error(data: String)
 
+    @JavascriptInterface
+    fun close(data: String)
+
     @JavascriptInterface
     fun cancel(data: String)
 
+    @JavascriptInterface
+    fun ready(data: String)
+
     @JavascriptInterface
     fun confirm(data: String)