version update 2.1.1

Author: ehowlsla

README.md

@@ -32,7 +32,7 @@ allprojects {
 ```gradle
 dependencies {
     ...
-    implementation 'com.github.bootpay:client_android_java:2.0.19'
+    implementation 'com.github.bootpay:client_android_java:2.1.1'
 }
 ```
 

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

@@ -184,6 +184,11 @@ public Builder setOrderId(String orderId) {
             return this;
         }
 
+        public Builder setUseOrderId(Integer use_order_id) {
+            result.setUse_order_id(use_order_id);
+            return this;
+        }
+
         public Builder setExpireMonth(int expireMonth) {
             result.setExtraExpireMonth(expireMonth);
             return this;

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

@@ -26,7 +26,7 @@ import java.net.URISyntaxException
 internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0): WebView(context, attrs, defStyleAttr) {
 
     companion object {
-        private const val BOOTPAY = "https://inapp.bootpay.co.kr/2.0.19/production.html"
+        private const val BOOTPAY = "https://inapp.bootpay.co.kr/2.1.1/production.html"
 
         private const val CLOSE = -3
 
@@ -109,7 +109,8 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
                                     ),
                                     params(),
                                     accountExpireAt(),
-                                    order_id()
+                                    order_id(),
+                                    use_order_id()
                             ),
                             error(),
                             cancel(),
@@ -284,6 +285,8 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
 
     private fun order_id() = request?.order_id?.let { "order_id:'$it'" } ?: ""
 
+    private fun use_order_id() = request?.use_order_id?.let { "use_order_id:'$it'" } ?: "0"
+
     fun setData(request: Request?): BootpayWebView {
         this.request = request
         return this

bootpay/src/main/java/kr/co/bootpay/analytics/BootpayAnalyticsPresenter.kt

@@ -17,7 +17,7 @@ internal class BootpayAnalyticsPresenter(context: Context) {
     private val rest: RestService by lazy { RestService(context) }
     private val executor: Scheduler by lazy { Schedulers.from(Executors.newCachedThreadPool()) }
 
-    private val ver = "2.0.19"
+    private val ver = "2.1.1"
 
     fun login(
             id: String?,

bootpay/src/main/java/kr/co/bootpay/model/Request.kt

@@ -11,6 +11,7 @@ class Request {
     var price: Long = 0
     var pg: String = ""
     var order_id: String = ""
+    var use_order_id: Int = 0
     var method: String = ""
     var account_expire_at: String = ""
     var unit: String = ""

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

@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <meta content="5b14c0ffb6d49c40cda92c4e" name="bootpay-application-id">
-    <script src="https://cdn.bootpay.co.kr/js/bootpay-2.0.19.min.js" type="application/javascript"></script>
+    <script src="https://cdn.bootpay.co.kr/js/bootpay-2.1.1.min.js" type="application/javascript"></script>
     <script>
 function payTest() {
     var android_application_id = '5b14c0ffb6d49c40cda92c4e'

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

@@ -30,8 +30,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_native);
 
         // 초기설정 - 해당 프로젝트(안드로이드)의 application id 값을 설정합니다. 결제와 통계를 위해 꼭 필요합니다.
-        BootpayAnalytics.init(this, "59a7e647396fa64fcad4a8c2");
-//        BootpayAnalytics.init(this, "59bfc733e13f337dbd6ca489");
+        BootpayAnalytics.init(this, "5b14c0ffb6d49c40cda92c4e");
+//        BootpayAnalytics.init(this, "59a7e647396fa64fcad4a8c2");
+
 
 
         // 통계 - 유저 로그인 시점에 호출
@@ -60,9 +61,9 @@ public void onClick_request(View v) {
 //        결제호출
         Bootpay.init(getFragmentManager())
                 .setApplicationId("5b14c0ffb6d49c40cda92c4e") // 해당 프로젝트(안드로이드)의 application id 값
-                .setPG(PG.INICIS) // 결제할 PG 사
+                .setPG(PG.DANAL) // 결제할 PG 사
                 .setUserPhone("010-1234-5678") // 구매자 전화번호
-                .setMethod(Method.CARD) // 결제수단
+                .setMethod(Method.PHONE) // 결제수단
                 .setName("맥\"북프로's 임다") // 결제할 상품명
                 .setOrderId("1234") // 결제 고유번호expire_month
 //                .setAccountExpireAt("2018-09-22") // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )

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

@@ -156,7 +156,7 @@ private Boolean isMarket(String url) {
         }
 
         private Boolean isSpecialCase(String url) {
-            return url.matches("^shinhan\\S+$");
+            return url.matches("^shinhan\\S+$") || url.startsWith("kftc-bankpay://");
         }
 
         private Boolean isExistInfo(Intent intent, Context context) {