Skip to content

Commit c976273

Browse files
rupy1014rupy1014
committed
analytics load call
1 parent 4e81d3a commit c976273

4 files changed

Lines changed: 8 additions & 14 deletions

File tree

‎bootpay/bootpay.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
<exclude-output />
3333
<content url="file://$MODULE_DIR$">
3434
<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" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3637
<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/compileDebugRenderscript/out" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4240
<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" />
4342
<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" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
4545
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,6 @@ public boolean shouldOverrideKeyEvent(WebView view, KeyEvent event) {
268268
}
269269

270270
public void transactionConfirm(String data) {
271-
// getContext().runOnUiThread(new Runnable() {
272-
// @Override
273-
// public void run() {
274-
// webview.loadUrl("javascript:(function(){" + str + "})()");
275-
// }
276-
// });
277271
load("var data = JSON.parse('" + data + "'); BootPay.transactionConfirm(data);");
278272
}
279273

@@ -304,12 +298,13 @@ private boolean start(Intent intent) {
304298
}
305299

306300
private void setAnalyticsData() {
307-
String.format(Locale.KOREA,
301+
String data = String.format(Locale.KOREA,
308302
"window.BootPay.setAnalyticsData({uuid:'%s',sk:'%s',sk_time:'%d',time:'%d'});"
309303
, UserInfo.getInstance(this.getContext()).getBootpayUuid()
310304
, UserInfo.getInstance(this.getContext()).getBootpaySk()
311305
, UserInfo.getInstance(this.getContext()).getBootpayLastTime()
312306
, System.currentTimeMillis() - UserInfo.getInstance(this.getContext()).getBootpayLastTime());
307+
load(data);
313308
}
314309

315310
private void setDevice() {
@@ -489,7 +484,6 @@ private void loadParams(String... script) {
489484
builder.append(";");
490485
String request = builder.toString();
491486

492-
// Log.d("params", request);
493487

494488
load(request);
495489
}

‎sample/sample.iml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<content url="file://$MODULE_DIR$">
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3635
<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/source/buildConfig/debug" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4140
<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" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
@@ -119,6 +119,5 @@
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" />
123122
</component>
124123
</module>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public void goOcr(View v) {
4141
.setPG(PG.PAYAPP) // 결제할 PG 사
4242
.setBootUser(bootUser)
4343
.setBootExtra(bootExtra)
44+
4445
.setUX(UX.APP2APP_OCR) // 결제수단
4546
.setName("맥\"북프로's 임다") // 결제할 상품명
4647
.setOrderId("1234") // 결제 고유번호expire_month

0 commit comments

Comments
 (0)