Skip to content

Commit ddf00e8

Browse files
committed
npay support
1 parent 1877b70 commit ddf00e8

File tree

6 files changed

+10
-15
lines changed

6 files changed

+10
-15
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ public void onCreate(Bundle savedInstanceState) {
3838
@Override
3939
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
4040
bootpay = new BootpayWebView(inflater.getContext());
41+
42+
43+
4144
afterViewInit();
45+
// bootpay.getSettings().setUserAgentString(userAgent + "/뭥미");
4246
return bootpay;
4347
}
4448

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
import kr.co.bootpay.pref.UserInfo;
3434

3535
public class BootpayWebView extends WebView {
36-
private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.1.0/production.html";
37-
//private static final String BOOTPAY = "https://inapp.bootpay.co.kr/2.1.1/production.html";
36+
private static final String BOOTPAY = "https://inapp.bootpay.co.kr/3.2.0/production.html";
3837

3938
private Dialog dialog;
4039
// private ConnectivityManager connManager;
@@ -98,6 +97,7 @@ public BootpayWebView(Context context, AttributeSet attrs) {
9897

9998
public BootpayWebView(Context context, AttributeSet attrs, int defStyleAttr) {
10099
super(context, attrs, defStyleAttr);
100+
101101
// connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
102102
setFocusable(true);
103103
setFocusableInTouchMode(true);

bootpay/src/main/java/kr/co/bootpay/enums/Method.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ public enum Method {
1414
SELECT,
1515
PAYCO, // 페이코 직접호출
1616
KAKAO, // 카카오 직접호출
17+
NPAY, // 네이버페이
1718
}

bootpay/src/main/java/kr/co/bootpay/valid/PGAvailable.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class PGAvailable {
1616
put(PG.DANAL, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.SUBSCRIPT_CARD, Method.AUTH));
1717
put(PG.INICIS, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
1818
put(PG.NICEPAY, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.KAKAO));
19-
put(PG.PAYAPP, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.KAKAO));
19+
put(PG.PAYAPP, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.KAKAO, Method.NPAY));
2020
put(PG.LGUP, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
2121
put(PG.KAKAO, Arrays.asList(Method.EASY, Method.SUBSCRIPT_CARD));
2222
put(PG.PAYCO, Arrays.asList(Method.EASY));
@@ -146,6 +146,8 @@ public static String methodToString(Method method) {
146146
return "auth";
147147
case EASY:
148148
return "easy";
149+
case NPAY:
150+
return "npay";
149151
}
150152
return "";
151153
}

sample/sample.iml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,5 @@
120120
<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" />
121121
<orderEntry type="module" module-name="bootpay" />
122122
<orderEntry type="module" module-name="bootpay" />
123-
<orderEntry type="module" module-name="bootpay" />
124-
<orderEntry type="module" module-name="bootpay" />
125-
<orderEntry type="module" module-name="bootpay" />
126-
<orderEntry type="module" module-name="bootpay" />
127-
<orderEntry type="module" module-name="bootpay" />
128123
</component>
129124
</module>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,8 @@
2727
public class NativeActivity extends Activity {
2828
private int stuck = 1;
2929
//5b9f51264457636ab9a07cdc
30-
// private String application_id = "5b9f51264457636ab9a07cdc";
3130
private String application_id = "5b8f6a4d396fa665fdc2b5e8";
3231

33-
// private String application_id = "5dc42bf24f74b40034c5f484";
34-
35-
36-
37-
38-
3932

4033
@Override
4134
protected void onCreate(Bundle savedInstanceState) {

0 commit comments

Comments
 (0)