unity sdk 지원을 위한 리팩토링, 코틀린 제거

Author: ehowlsla

bootpay/bootpay.iml

@@ -23,7 +23,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />

bootpay/build.gradle

@@ -18,10 +18,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
 }
 
 dependencies {

bootpay/src/main/java/kr/co/bootpay/analytics/AnalyticsPresenter.java

@@ -13,6 +13,7 @@
 import kr.co.bootpay.secure.BootpaySimpleAES256;
 import kr.co.bootpay.model.StatLogin;
 import kr.co.bootpay.pref.UserInfo;
+import rx.Observer;
 import rx.Scheduler;
 import rx.schedulers.Schedulers;
 
@@ -55,10 +56,38 @@ public void login(String id,
                 )
                 .retry(3)
                 .subscribeOn(thread)
-                .subscribe(res -> {
-                            if(res.getData() != null)
-                                UserInfo.getInstance(service.getContext()).setBootpayUserId(res.getData().getUserId());
-                }, Throwable::printStackTrace);
+                .subscribe(
+                        new Observer<LoginResult>() {
+                            @Override
+                            public void onCompleted() {
+
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+                                e.printStackTrace();
+
+                            }
+
+                            @Override
+                            public void onNext(LoginResult res) {
+                                if(res.getData() != null)
+                                    UserInfo.getInstance(service.getContext()).setBootpayUserId(res.getData().getUserId());
+                            }
+                        });
+
+
+//        service.getApi()
+//                .login(
+//                        aes.strEncode(json),
+//                        aes.getSessionKey()
+//                )
+//                .retry(3)
+//                .subscribeOn(thread)
+//                .subscribe(res -> {
+//                            if(res.getData() != null)
+//                                UserInfo.getInstance(service.getContext()).setBootpayUserId(res.getData().getUserId());
+//                }, Throwable::printStackTrace);
     }
 
     public void call(String url,
@@ -86,8 +115,27 @@ public void call(String url,
                 )
                 .retry(3)
                 .subscribeOn(thread)
-                .subscribe(res -> Log.d("BootpayAnalytics", "call"),
-                        Throwable::printStackTrace);
+                .subscribe(
+                        new Observer<LoginResult>() {
+                            @Override
+                            public void onCompleted() {
+
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+                                e.printStackTrace();
+
+                            }
+
+                            @Override
+                            public void onNext(LoginResult res) {
+                                Log.d("BootpayAnalytics", "call");
+                            }
+                        });
+
+//                .subscribe(res -> Log.d("BootpayAnalytics", "call"),
+//                        Throwable::printStackTrace);
 
     }
 

sample/sample.iml

@@ -88,6 +88,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />