Skip to content

Commit 93e0539

Browse files
rupy1014rupy1014
committed
user_info addr 필드 추가
1 parent c976273 commit 93e0539

File tree

8 files changed

+73
-62
lines changed

8 files changed

+73
-62
lines changed

‎bootpay/bootpay.iml‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":bootpay" />
7-
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.2" />
8-
<option name="LAST_KNOWN_AGP_VERSION" value="3.3.2" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.6.3" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.6.3" />
99
</configuration>
1010
</facet>
1111
<facet type="android" name="Android">
@@ -19,31 +19,29 @@
1919
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2020
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2121
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
22-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
23-
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2424
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2525
<option name="PROJECT_TYPE" value="1" />
2626
</configuration>
2727
</facet>
2828
</component>
2929
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
30-
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
30+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
3232
<exclude-output />
3333
<content url="file://$MODULE_DIR$">
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
46-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
4745
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4846
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -91,41 +89,39 @@
9189
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
9290
<orderEntry type="sourceFolder" forTests="false" />
9391
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
94-
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
92+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
9593
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
9694
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
95+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
96+
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
9797
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
9898
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
99-
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
100-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
10199
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
102100
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
103101
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
104-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
105102
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
103+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
104+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
105+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
106+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
106107
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31@jar" level="project" />
107108
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.6.0@jar" level="project" />
108-
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
109109
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.6.0@jar" level="project" />
110110
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.6.0@jar" level="project" />
111111
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.0@jar" level="project" />
112112
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.0.0@jar" level="project" />
113113
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.0.0@jar" level="project" />
114-
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.8.0@jar" level="project" />
115-
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2@jar" level="project" />
116114
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.40@jar" level="project" />
117-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
118-
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.0.0@jar" level="project" />
119115
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.40@jar" level="project" />
120116
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
121-
<orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.0@jar" level="project" />
122-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
123-
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
117+
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
118+
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.8.0@jar" level="project" />
119+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2@jar" level="project" />
120+
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.0.0@jar" level="project" />
124121
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:26.1.0@aar" level="project" />
125-
<orderEntry type="library" name="Gradle: com.github.franmontiel:PersistentCookieJar:v1.0.1@aar" level="project" />
126-
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
127122
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar" level="project" />
128123
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:26.1.0@aar" level="project" />
124+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
129125
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar" level="project" />
130126
<orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
131127
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.0@aar" level="project" />
@@ -134,5 +130,6 @@
134130
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:26.1.0@aar" level="project" />
135131
<orderEntry type="library" name="Gradle: com.android.support:support-compat:26.1.0@aar" level="project" />
136132
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar" level="project" />
133+
<orderEntry type="library" name="Gradle: com.github.franmontiel:PersistentCookieJar:v1.0.1@aar" level="project" />
137134
</component>
138135
</module>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void onPageFinished(WebView view, String url) {
125125
// setDevelopMode();
126126
// useOneStoreApi();
127127

128-
Log.d("bootpay", "onPageFinished");
128+
// Log.d("bootpay", "onPageFinished");
129129

130130
loadParams(
131131
request(
@@ -160,7 +160,7 @@ public void onPageFinished(WebView view, String url) {
160160
public boolean shouldOverrideUrlLoading(WebView view, String url) {
161161
Intent intent = parse(url);
162162

163-
Log.d("bootpay url", url);
163+
// Log.d("bootpay url", url);
164164

165165
if (isIntent(url)) {
166166
if (isExistInfo(intent, view.getContext()) || isExistPackage(intent, view.getContext()))
@@ -484,6 +484,7 @@ private void loadParams(String... script) {
484484
builder.append(";");
485485
String request = builder.toString();
486486

487+
// Log.d("bootpay request -----", request);
487488

488489
load(request);
489490
}
@@ -524,7 +525,7 @@ private void setting(Context context) {
524525

525526
@Override
526527
public void postUrl(String url, byte[] postData) {
527-
Log.d("Post", url);
528+
// Log.d("Post", url);
528529
super.postUrl(url, postData);
529530
}
530531

‎bootpay/src/main/java/kr/co/bootpay/model/BootUser.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class BootUser {
1212
private int gender = -1; //1:남자 0:여자
1313
private String area; // [서울,인천,대구,광주,부산,울산,경기,강원,충청북도,충북,충청남도,충남,전라북도,전북,전라남도,전남,경상북도,경북,경상남도,경남,제주,세종,대전] 중 택 1
1414
private String phone; //구매자의 전화번호 (페이앱 필수)
15+
private String addr;
1516

1617
public BootUser setID(String value) {
1718
this.id = value;
@@ -48,6 +49,12 @@ public BootUser setPhone(String value) {
4849
return this;
4950
}
5051

52+
53+
public BootUser setAddr(String addr) {
54+
this.addr = addr;
55+
return this;
56+
}
57+
5158
public String getId() {
5259
return id;
5360
}
@@ -120,6 +127,11 @@ private String area() {
120127
return String.format(Locale.KOREA, "area: '%s'", this.area);
121128
}
122129

130+
public String addr() {
131+
if(this.addr == null) return "";
132+
return String.format(Locale.KOREA, "addr: '%s'", this.addr);
133+
}
134+
123135
public String toJson() {
124136
return user(
125137
id(),
@@ -128,12 +140,15 @@ public String toJson() {
128140
phone(),
129141
email(),
130142
gender(),
131-
area()
143+
area(),
144+
addr()
132145
);
133146
}
134147

135148
public final String toGson() {
136149
if(this == null) return "";
137150
return new Gson().toJson(this);
138151
}
152+
153+
139154
}

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
google()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.3.2'
12+
classpath 'com.android.tools.build:gradle:3.6.3'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1515

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 21 19:26:06 KST 2019
1+
#Fri May 08 11:23:35 KST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)