Skip to content

Commit 4e98570

Browse files
author
ehowlsla
committed
bootpay 3.0 api added
1 parent 8f97b45 commit 4e98570

37 files changed

+341
-266
lines changed

‎bootpay/.DS_Store‎

0 Bytes
Binary file not shown.

‎bootpay/bootpay.iml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,15 @@
8787
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
9290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
9391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
9492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
9694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
9795
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
9996
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
10097
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
10198
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
10399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
104100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
105101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -114,34 +110,37 @@
114110
<orderEntry type="jdk" jdkName="Android API 26 Platform (1)" jdkType="Android SDK" />
115111
<orderEntry type="sourceFolder" forTests="false" />
116112
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
117-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.31@jar" level="project" />
118113
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
114+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.40@jar" level="project" />
115+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.6.0@jar" level="project" />
116+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.0.0@jar" level="project" />
119117
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
120-
<orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.3.0@jar" level="project" />
118+
<orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.0@jar" level="project" />
121119
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
122-
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava:2.5.0@jar" level="project" />
120+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.0@jar" level="project" />
123121
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
124122
<orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
125123
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
126124
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
127-
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0@jar" level="project" />
128125
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
126+
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.8.0@jar" level="project" />
127+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.6.0@jar" level="project" />
129128
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
129+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.0.0@jar" level="project" />
130+
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.0.0@jar" level="project" />
130131
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.0@aar" level="project" />
131132
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
132133
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
133-
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.5.0@jar" level="project" />
134134
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar" level="project" />
135135
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
136136
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
137-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31@jar" level="project" />
138137
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:26.1.0@aar" level="project" />
139138
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
140139
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31@jar" level="project" />
141140
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
142-
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0@jar" level="project" />
143141
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
144-
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.5.0@jar" level="project" />
142+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2@jar" level="project" />
143+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.40@jar" level="project" />
145144
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:26.1.0@aar" level="project" />
146145
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar" level="project" />
147146
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:26.1.0@aar" level="project" />
@@ -152,8 +151,7 @@
152151
<orderEntry type="library" name="Gradle: com.android.support:support-compat:26.1.0@aar" level="project" />
153152
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
154153
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:26.1.0@aar" level="project" />
155-
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0@jar" level="project" />
156-
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.0@jar" level="project" />
157154
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar" level="project" />
155+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.6.0@jar" level="project" />
158156
</component>
159157
</module>

‎bootpay/build.gradle‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,28 @@ dependencies {
5151
})
5252
// jitpack 배포시 아래 주석을 풀어서 사용
5353
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31" // build for use kotlin in unity development
54+
5455
implementation 'com.google.code.gson:gson:2.8.5'
55-
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
56-
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
57-
implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
58-
implementation 'com.squareup.retrofit2:adapter-rxjava:2.5.0'
59-
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
56+
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
57+
implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
58+
implementation 'com.squareup.retrofit2:converter-moshi:2.6.0'
59+
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.0'
60+
61+
implementation 'com.squareup.okhttp3:okhttp:4.0.0'
62+
implementation 'com.squareup.okhttp3:logging-interceptor:4.0.0'
63+
6064
implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
6165

66+
// implementation 'com.squareup.okhttp3:logging-interceptor:4.0.0'
67+
68+
// implementation 'com.google.code.gson:gson:2.8.5'
69+
// implementation 'com.squareup.retrofit2:retrofit:2.5.0'
70+
// implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
71+
// implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
72+
// implementation 'com.squareup.retrofit2:adapter-rxjava:2.5.0'
73+
// implementation 'com.squareup.okhttp3:okhttp:3.10.0'
74+
// implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
75+
6276
implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
6377

6478

‎bootpay/src/.DS_Store‎

0 Bytes
Binary file not shown.

‎bootpay/src/main/.DS_Store‎

0 Bytes
Binary file not shown.

‎bootpay/src/main/java/.DS_Store‎

0 Bytes
Binary file not shown.

‎bootpay/src/main/java/kr/.DS_Store‎

0 Bytes
Binary file not shown.

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

4 KB
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,20 @@
88

99
import com.google.gson.Gson;
1010

11-
import org.json.JSONObject;
12-
13-
import java.util.ArrayList;
14-
import java.util.Collection;
1511
import java.util.List;
1612

17-
import kr.co.bootpay.analytics.AnalyticsService;
1813
import kr.co.bootpay.api.ApiPresenter;
1914
import kr.co.bootpay.api.ApiService;
2015
import kr.co.bootpay.enums.Method;
2116
import kr.co.bootpay.enums.PG;
2217
import kr.co.bootpay.enums.UX;
23-
import kr.co.bootpay.listner.CancelListener;
24-
import kr.co.bootpay.listner.CloseListener;
25-
import kr.co.bootpay.listner.ConfirmListener;
26-
import kr.co.bootpay.listner.DoneListener;
27-
import kr.co.bootpay.listner.ErrorListener;
28-
import kr.co.bootpay.listner.EventListener;
29-
import kr.co.bootpay.listner.ReadyListener;
18+
import kr.co.bootpay.listener.CancelListener;
19+
import kr.co.bootpay.listener.CloseListener;
20+
import kr.co.bootpay.listener.ConfirmListener;
21+
import kr.co.bootpay.listener.DoneListener;
22+
import kr.co.bootpay.listener.ErrorListener;
23+
import kr.co.bootpay.listener.EventListener;
24+
import kr.co.bootpay.listener.ReadyListener;
3025
import kr.co.bootpay.model.BootExtra;
3126
import kr.co.bootpay.model.Item;
3227
import kr.co.bootpay.model.RemoteOrderForm;
@@ -195,12 +190,12 @@ public BootpayBuilder setUseOrderId(boolean use_order_id) {
195190
}
196191

197192
public BootpayBuilder setBootUser(BootUser bootUser) {
198-
request.setBootUser(bootUser);
193+
request.setBoot_user(bootUser);
199194
return this;
200195
}
201196

202197
public BootpayBuilder setBootExtra(BootExtra bootExtra) {
203-
request.setBootExtra(bootExtra);
198+
request.setBoot_extra(bootExtra);
204199
return this;
205200
}
206201

@@ -210,12 +205,12 @@ public BootpayBuilder setBootExtra(BootExtra bootExtra) {
210205
// }
211206

212207
public BootpayBuilder setRemoteOrderForm(RemoteOrderForm remoteForm) {
213-
request.setRemoteOrderForm(remoteForm);
208+
request.setRemote_order_form(remoteForm);
214209
return this;
215210
}
216211

217212
public BootpayBuilder setRemoteOrderPre(RemoteOrderPre remotePre) {
218-
request.setRemoteOrderPre(remotePre);
213+
request.setRemote_order_pre(remotePre);
219214
return this;
220215
}
221216

@@ -235,7 +230,7 @@ public BootpayBuilder setRemoteOrderPre(RemoteOrderPre remotePre) {
235230
// }
236231

237232
public BootpayBuilder setSMSPayload(SMSPayload smsPayload) {
238-
request.setSmsPayload(smsPayload);
233+
request.setSms_payload(smsPayload);
239234
return this;
240235
}
241236

@@ -251,8 +246,8 @@ public BootpayBuilder setMethods(List<String> methods) {
251246
return this;
252247
}
253248

254-
// public BootpayBuilder setSmsUse(Boolean sms_use) {
255-
// request.setSmsUse(sms_use);
249+
// public BootpayBuilder setSms_use(Boolean sms_use) {
250+
// request.setSms_use(sms_use);
256251
// return this;
257252
// }
258253

0 commit comments

Comments
 (0)