Skip to content

Commit 8706007

Browse files
author
ehowlsla
committed
상품명 ' 글자 허용
1 parent e1908ec commit 8706007

File tree

13 files changed

+32
-38
lines changed

13 files changed

+32
-38
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ allprojects {
3232
```gradle
3333
dependencies {
3434
...
35-
implementation 'com.github.bootpay:client_android_java:2.0.123'
35+
implementation 'com.github.bootpay:client_android_java:2.0.125'
3636
}
3737
```
3838

‎bootpay/bootpay.iml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -111,42 +111,27 @@
111111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
112112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
113113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
116114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
117-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
118115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
120116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
121117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
122118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
123-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
124119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
125120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
126121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
127122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
128-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
129-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
130-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
131123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
132-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
133124
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
134-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
135125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
136-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/platform_r_txt" />
137-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
138126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
139127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
140128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
141129
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
142130
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
143-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
144131
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
145-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
146132
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
147133
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
148134
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
149-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
150135
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
151136
</content>
152137
<orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import android.os.Handler
1414
import android.os.Looper
1515
import android.os.Message
1616
import android.util.AttributeSet
17+
import android.util.Log
1718
import android.view.KeyEvent
1819
import android.view.View
1920
import android.webkit.*
@@ -127,7 +128,10 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
127128
start(intent)
128129
else
129130
gotoMarket(intent)
130-
} else if (isMarket(url))
131+
}
132+
else if (isMarket(url))
133+
start(intent)
134+
else if (isSpecialCase(url))
131135
start(intent)
132136
else
133137
url.contains("https://testquickpay")
@@ -169,6 +173,8 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
169173
private fun isExistPackage(intent: Intent?): Boolean =
170174
intent != null && context.packageManager.getLaunchIntentForPackage(intent.`package`) != null
171175

176+
private fun isSpecialCase(url: String?) = url?.matches(Regex("^shinhan\\S+\$")) ?: false
177+
172178
private fun parse(url: String): Intent? {
173179
return try {
174180
Intent.parseUri(url, Intent.URI_INTENT_SCHEME)
@@ -236,7 +242,7 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
236242

237243
private fun applicationId() = request?.application_id?.let { "application_id:'$it'" } ?: ""
238244

239-
private fun name() = request?.name?.let { "name:'$it'" } ?: ""
245+
private fun name() = request?.name?.let { "name:'${it.replace("'", "\\'")}'" } ?: ""
240246

241247
private fun pg() = request?.pg?.let { "pg:'$it'" } ?: ""
242248

@@ -271,7 +277,7 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
271277
// }"
272278

273279
private fun items() = "items:${
274-
request?.items?.map { "{item_name:'${it.name}',qty:${it.qty},unique:'${it.unique}',price:${it.price},cat1:'${it.cat1}',cat2:'${it.cat2}',cat3:'${it.cat3}'}" }
280+
request?.items?.map { "{item_name:'${it.name.replace("'", "\\'")}',qty:${it.qty},unique:'${it.unique}',price:${it.price},cat1:'${it.cat1}',cat2:'${it.cat2}',cat3:'${it.cat3}'}" }
275281
}"
276282

277283
// private fun quotas() = ""
@@ -288,6 +294,8 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
288294
}
289295

290296
private fun loadParams(vararg script: String) {
297+
298+
Log.d("loadParams", script.joinToString(""));
291299
load("${script.joinToString("")};")
292300
}
293301

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal class BootpayAnalyticsPresenter(context: Context) {
1717
private val rest: RestService by lazy { RestService(context) }
1818
private val executor: Scheduler by lazy { Schedulers.from(Executors.newCachedThreadPool()) }
1919

20-
private val ver = "2.0.123"
20+
private val ver = "2.0.125"
2121

2222
fun login(
2323
id: String?,

‎sample/.DS_Store‎

0 Bytes
Binary file not shown.

‎sample/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ dependencies {
2727
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
2828
testImplementation 'junit:junit:4.12'
2929
implementation project(path: ':bootpay')
30-
}
30+
}

‎sample/release/output.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"sample-release.apk","fullName":"release","baseName":"release"},"path":"sample-release.apk","properties":{}}]

‎sample/release/sample-release.apk‎

2.2 MB
Binary file not shown.

‎sample/release/sample-release.apk.zip‎

2.2 MB
Binary file not shown.

‎sample/sample.iml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,33 +86,25 @@
8686
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
9089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
9796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
10098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
10199
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
102100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
103101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
105102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
107103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
108104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
110105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
111106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
114107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
116108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
117109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
118110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
@@ -125,9 +117,7 @@
125117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
126118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
127119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
128-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
129120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
130-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
131121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
132122
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
133123
<excludeFolder url="file://$MODULE_DIR$/build/reports" />

0 commit comments

Comments
 (0)