Skip to content

Commit d0bee9a

Browse files
rupy1014rupy1014
committed
onestore support
1 parent aedab9b commit d0bee9a

5 files changed

Lines changed: 86 additions & 84 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import kr.co.bootpay.pref.UserInfo;
3737

3838
public class BootpayWebView extends WebView {
39-
private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.2.3/production.html";
39+
private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.2.4/production.html";
4040

4141
private Dialog dialog;
4242
// private ConnectivityManager connManager;

‎bootpay/src/main/java/kr/co/bootpay/api/ApiPresenter.java‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void request(Request request) {
4343
UX ux = request.getUX();
4444
request.getBoot_extra().setUX(ux.toString());
4545
if(ux == UX.BOOTPAY_REMOTE_LINK) {
46-
request_link(request);
46+
// request_link(request);
4747
} else if(ux == UX.BOOTPAY_REMOTE_ORDER) {
4848
request_form(request);
4949
} else if(ux == UX.BOOTPAY_REMOTE_PRE) {
@@ -52,58 +52,58 @@ public void request(Request request) {
5252
}
5353

5454
public void request_link(Request request) {
55-
String userJson = request.getBoot_user().toGson();
56-
String extraJson = request.getBoot_extra().toGson();
57-
String sms_payload = request.getSms_payload().toGson();
58-
59-
service.getApi().request_link(
60-
request.getApplicationId(),
61-
"2", //Android
62-
request.getMethod(),
63-
new Gson().toJson(request.getMethods()),
64-
request.getPG(),
65-
request.getPrice(),
66-
request.getTaxFree(),
67-
request.getName(),
68-
new Gson().toJson(request.getItems()),
69-
request.getIsShowAgree(),
70-
UserInfo.getInstance(service.getContext()).getBootpayUuid(),
71-
UserInfo.getInstance(service.getContext()).getBootpaySk(),
72-
System.currentTimeMillis(),
73-
userJson,
74-
UserInfo.getInstance(service.getContext()).getBootpayUserId(),
75-
request.getBootKey(),
76-
params(request),
77-
request.getOrderId(),
78-
request.getUseOrderId(),
79-
request.getAccountExpireAt(),
80-
extraJson,
81-
sms_payload
82-
).retry(3)
83-
.subscribeOn(Schedulers.from(Executors.newCachedThreadPool()))
84-
.subscribe(
85-
new Observer<LoginResult>() {
86-
@Override
87-
public void onComplete() {
88-
// activity.requestSuccess();
89-
}
90-
91-
@Override
92-
public void onSubscribe(Disposable d) {
93-
94-
}
95-
96-
@Override
97-
public void onNext(LoginResult res) {
98-
// Log.d("res", res.toString());
99-
100-
}
101-
102-
@Override
103-
public void onError(Throwable e) {
104-
e.printStackTrace();
105-
}
106-
});
55+
// String userJson = request.getBoot_user().toGson();
56+
// String extraJson = request.getBoot_extra().toGson();
57+
// String sms_payload = request.getSms_payload().toGson();
58+
//
59+
// service.getApi().request_link(
60+
// request.getApplicationId(),
61+
// "2", //Android
62+
// request.getMethod(),
63+
// new Gson().toJson(request.getMethods()),
64+
// request.getPG(),
65+
// request.getPrice(),
66+
// request.getTaxFree(),
67+
// request.getName(),
68+
// new Gson().toJson(request.getItems()),
69+
// request.getIsShowAgree(),
70+
// UserInfo.getInstance(service.getContext()).getBootpayUuid(),
71+
// UserInfo.getInstance(service.getContext()).getBootpaySk(),
72+
// System.currentTimeMillis(),
73+
// userJson,
74+
// UserInfo.getInstance(service.getContext()).getBootpayUserId(),
75+
// request.getBootKey(),
76+
// params(request),
77+
// request.getOrderId(),
78+
// request.getUseOrderId(),
79+
// request.getAccountExpireAt(),
80+
// extraJson,
81+
// sms_payload
82+
// ).retry(3)
83+
// .subscribeOn(Schedulers.from(Executors.newCachedThreadPool()))
84+
// .subscribe(
85+
// new Observer<LoginResult>() {
86+
// @Override
87+
// public void onComplete() {
88+
//// activity.requestSuccess();
89+
// }
90+
//
91+
// @Override
92+
// public void onSubscribe(Disposable d) {
93+
//
94+
// }
95+
//
96+
// @Override
97+
// public void onNext(LoginResult res) {
98+
//// Log.d("res", res.toString());
99+
//
100+
// }
101+
//
102+
// @Override
103+
// public void onError(Throwable e) {
104+
// e.printStackTrace();
105+
// }
106+
// });
107107

108108
}
109109

‎bootpay/src/main/java/kr/co/bootpay/api/ApiService.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -59,35 +59,35 @@ public Context getContext() {
5959
public ApiRestApi getApi() { return api; }
6060

6161
public interface ApiRestApi {
62-
@FormUrlEncoded
63-
@POST("/app/rest/remote_link")
64-
Observable<LoginResult> request_link(
65-
@Field("application_id") String application_id,
66-
@Field("device_type") String device_type,
67-
@Field("method") String method,
68-
@Field("methods") String methods,
69-
@Field("pg") String pg,
70-
71-
@Field("price") Double price,
72-
@Field("tax_free") Double tax_free,
73-
@Field("name") String name,
74-
@Field("items") String items,
75-
@Field("show_agree_window") Boolean show_agree_window,
76-
77-
@Field("uuid") String uuid,
78-
@Field("sk") String sk,
79-
@Field("time") Long time,
80-
@Field("user_info") String user_info,
81-
@Field("user_id") String user_id,
82-
83-
@Field("boot_key") String boot_key,
84-
@Field("params") String params,
85-
@Field("order_id") String order_id,
86-
@Field("use_order_id") Boolean use_order_id,
87-
@Field("account_expire_at") String account_expire_at,
88-
89-
@Field("boot_extra") String extra,
90-
@Field("sms_payload") String sms_payload);
62+
// @FormUrlEncoded
63+
// @POST("/app/rest/remote_link")
64+
// Observable<LoginResult> request_link(
65+
// @Field("application_id") String application_id,
66+
// @Field("device_type") String device_type,
67+
// @Field("method") String method,
68+
// @Field("methods") String methods,
69+
// @Field("pg") String pg,
70+
//
71+
// @Field("price") Double price,
72+
// @Field("tax_free") Double tax_free,
73+
// @Field("name") String name,
74+
// @Field("items") String items,
75+
// @Field("show_agree_window") Boolean show_agree_window,
76+
//
77+
// @Field("uuid") String uuid,
78+
// @Field("sk") String sk,
79+
// @Field("time") Long time,
80+
// @Field("user_info") String user_info,
81+
// @Field("user_id") String user_id,
82+
//
83+
// @Field("boot_key") String boot_key,
84+
// @Field("params") String params,
85+
// @Field("order_id") String order_id,
86+
// @Field("use_order_id") Boolean use_order_id,
87+
// @Field("account_expire_at") String account_expire_at,
88+
//
89+
// @Field("boot_extra") String extra,
90+
// @Field("sms_payload") String sms_payload);
9191

9292
@FormUrlEncoded
9393
@POST("/app/rest/remote_form")

‎sample/sample.iml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,8 @@
119119
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.0@aar" level="project" />
120120
<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" />
121121
<orderEntry type="module" module-name="bootpay" />
122+
<orderEntry type="module" module-name="bootpay" />
123+
<orderEntry type="module" module-name="bootpay" />
124+
<orderEntry type="module" module-name="bootpay" />
122125
</component>
123126
</module>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ void startBootPay(String userToken) {
173173
.setPG(PG.ONESTORE) // 결제할 PG 사
174174
.setEasyPayUserToken(userToken)
175175
.setMethodList(Arrays.asList(Method.EASY_CARD, Method.PHONE, Method.BANK, Method.CARD, Method.VBANK))
176-
// .setMethod(Method.EASY)
177176
.setBootExtra(bootExtra)
178177
.setBootUser(bootUser)
179178
// .setUserPhone("010-1234-5678") // 구매자 전화번호

0 commit comments

Comments
 (0)