feat : divide new activity mode, webview mode

iamport · Apr 5, 2021 · 7bc01b1 · 7bc01b1
1 parent 06ebe45
commit 7bc01b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 31 deletions.
diff --git a/sdk/src/main/java/com/iamport/sdk/domain/core/Iamport.kt b/sdk/src/main/java/com/iamport/sdk/domain/core/Iamport.kt
@@ -161,34 +161,12 @@ object Iamport {
     }
 
 
-    // TODO 이거 쓰자
-    fun init(componentActivity: ComponentActivity, webView: WebView) {
-
-        if (!iamportCreated()) {
-            return
-        }
-
-        d("INITIALIZE IAMPORT SDK for activity")
-
-        clear()
-        createInitialData()
-
-        // TODO 웹뷰 액티비티에 대한 응답 콜백이었음
-//        webViewLauncher = componentActivity.registerForActivityResult(WebViewActivityContract()) {
-//            callback(it)
-//        }
-
-        this.activity = componentActivity
-        this.iamportSdk =
-            IamportSdk(
-                activity = componentActivity,
-                webViewLauncher = webViewLauncher,
-                webView = webView,
-                close = close,
-                finish = finish
-            )
+    // webview 사용 모드
+    fun setWebView(webview : WebView) {
+        iamportSdk?.setWebView(webview)
     }
 
+
     /**
      * SDK Activity 열기 위한 Contract for Fragment
      * @param fragment : Host Fragment
@@ -254,7 +232,7 @@ object Iamport {
         return isPolling()?.value?.peekContent() ?: false
     }
 
-    private val callback = fun(iamPortResponse: IamPortResponse?) {
+    val callback = fun(iamPortResponse: IamPortResponse?) {
 //        impCallbackImpl?.result(iamPortResponse)
         impCallbackFunction?.invoke(iamPortResponse)
     }

diff --git a/sdk/src/main/java/com/iamport/sdk/presentation/activity/IamportSdk.kt b/sdk/src/main/java/com/iamport/sdk/presentation/activity/IamportSdk.kt
@@ -85,7 +85,7 @@ internal class IamportSdk(
         clearData()
     }
 
-    // webview 모드임
+    // webview 사용 모드
     fun setWebView(webview: WebView) {
         this.webview = webview
     }
@@ -311,14 +311,15 @@ internal class IamportSdk(
     private fun requestWebViewPayment(it: Payment) {
         d("requestWebViewPayment $it")
         clearData()
-        activity?.let { activity ->
-            webview?.let { webView ->
+        webview?.let { webView ->
+            hostHelper.activity?.let { activity ->
                 IamPortWebView().initStart(activity, webView, it) // webview only 모드
             } ?: run {
+                w("Cannot found activity, So running activity mode")
                 webViewLauncher?.launch(it) // new activity 모드
             }
         } ?: run {
-            e("Cannot found activity")
+            webViewLauncher?.launch(it) // new activity 모드
         }
     }