Dev/convoai api (#70)

* [Android] Add message parser log.

* [Android] Add message parser log.

* [Android] Update log.

* [Android] Update log.

* [Android] Update message parse log.

* [FEAT] ios version 1.6.0

* [Android]Add conversational ai api.

* [Android]Update ConversationalAIAPI.

* [Android] Update log.

* [Android]Fixbugs.

* Add client component functionality

* [FEAT] ios agent state

* [FIX] mute state

* [Android]Add v1.6.0 ui.

* [FIX] state view

* [FIX] ios self subrender

* [FIX] remove volume process

* [Android] Update ConversationalAI API.

* modify the code

* Add subtitle rendering v2 version

* [Android] Fixs agent state event. TEN-2018.

* [Android] Filter other users transcription.

* [Android] Preserve cookies when switching environments.TEN-2021.

* bug fix

* bug fix

* [Android]Fixs agentUid.

* bug fix

* [Android]Fix SSO login exception causing infinite loop.

* [FIX] TEN-2089

* [Android]Update agent state view.

* Modify comments

* [Android] Update IConversationalAIAPI's model file hierarchy.

* Modify details, add readme

* [Android]Add conversation ai api README.

* Modify comments and readme files

* [Android]Update conversation ai api README.

* update readme file

* Update readme

* update read me

* Update function comments

* Dev/convoai api temp (#66)

* [Android]Update transcription interrupt mark ms.

* update transcription code

* [Android]ConversationalAI config: enableLog defaults to true (logs to rtc log file)  .

* Update function comments

* [Android]Update method comments.

* [FIX] update enable log default value is true

* [Android]pts Remove 20ms.

* [FIX] ios proj

---------

Co-authored-by: zhangwei <[email protected]>
Co-authored-by: qinhui <>
Co-authored-by: HeZhengQing <[email protected]>

* update readme

* Add convo api version

* [FIX] convoai api version

* [FEAT] update build number

* [FIX] global sign up

* [FIX] merge conflict

---------

Co-authored-by: zhangwei <[email protected]>
Co-authored-by: HeZhengQing <[email protected]>
Co-authored-by: qinhui <>
Co-authored-by: alienzh <[email protected]>

Author: 4 people

Android/scenes/convoai/src/main/java/io/agora/scene/convoai/ui/CovLivingActivity.kt

@@ -1,6 +1,7 @@
 package io.agora.scene.convoai.ui
 
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.graphics.PorterDuff
 import android.os.Build
@@ -13,6 +14,7 @@ import android.view.WindowManager
 import android.webkit.CookieManager
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.app.NotificationManagerCompat
@@ -180,11 +182,27 @@ class CovLivingActivity : BaseActivity<CovActivityLivingBinding>() {
 
     private var mLoginDialog: LoginDialog? = null
 
-    private lateinit var activityResultLauncher: ActivityResultLauncher<Intent>
+    private lateinit var activityResultLauncher: ActivityResultLauncher<Int>
     private lateinit var mPermissionHelp: PermissionHelp
 
     private val mLoginViewModel: LoginViewModel by viewModels()
 
+    private class SSOWebViewContract : ActivityResultContract<Int, String?>() {
+        override fun createIntent(context: Context, input: Int): Intent {
+            return Intent(context, SSOWebViewActivity::class.java).apply {
+                putExtra(SSOWebViewActivity.EXTRA_TYPE, input)
+            }
+        }
+
+        override fun parseResult(resultCode: Int, intent: Intent?): String? {
+            return if (resultCode == Activity.RESULT_OK) {
+                intent?.getStringExtra(SSOWebViewActivity.EXTRA_TOKEN)
+            } else {
+                null
+            }
+        }
+    }
+
     private var conversationalAIAPI: IConversationalAIAPI? = null
 
     override fun getViewBinding(): CovActivityLivingBinding {
@@ -932,22 +950,16 @@ class CovLivingActivity : BaseActivity<CovActivityLivingBinding>() {
         "Are you ok?",
         "How are you?"
     )
+
     private fun setupView() {
-        activityResultLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                if (result.resultCode == Activity.RESULT_OK) {
-                    val data: Intent? = result.data
-                    val token = data?.getStringExtra("token")
-                    if (token != null) {
-                        SSOUserManager.saveToken(token)
-                        mLoginViewModel.getUserInfoByToken(token)
-                    } else {
-                        showLoginLoading(false)
-                    }
-                } else {
-                    showLoginLoading(false)
-                }
+        activityResultLauncher = registerForActivityResult(SSOWebViewContract()) { token: String? ->
+            if (token != null) {
+                SSOUserManager.saveToken(token)
+                mLoginViewModel.getUserInfoByToken(token)
+            } else {
+                showLoginLoading(false)
             }
+        }
         mPermissionHelp = PermissionHelp(this)
         mBinding?.apply {
             window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -1305,9 +1317,13 @@ class CovLivingActivity : BaseActivity<CovActivityLivingBinding>() {
                     }
 
                     override fun onClickStartSSO() {
-                        activityResultLauncher.launch(
-                            Intent(this@CovLivingActivity, SSOWebViewActivity::class.java)
-                        )
+                        activityResultLauncher.launch(SSOWebViewActivity.TYPE_LOGIN)
+                        showLoginLoading(true)
+                    }
+
+                    override fun onClickSignupSSO() {
+                        cleanCookie()
+                        activityResultLauncher.launch(SSOWebViewActivity.TYPE_SIGNUP)
                         showLoginLoading(true)
                     }
 

iOS/Scenes/ConvoAI/ConvoAI/ConvoAI/Classes/Main/Chat/ChatViewController.swift

@@ -488,10 +488,9 @@ public class ChatViewController: UIViewController {
         ConvoAILogger.info("\(tag) \(txt)")
     }
 
-    private func goToSSOViewController() {
+    private func goToSSO(urlString: String) {
         let ssoWebVC = SSOWebViewController()
-        let baseUrl = AppContext.shared.baseServerUrl
-        ssoWebVC.urlString = "\(baseUrl)/v1/convoai/sso/login"
+        ssoWebVC.urlString = urlString
         ssoWebVC.completionHandler = { [weak self] token in
             guard let self = self else { return }
             if let token = token {
@@ -509,8 +508,6 @@ public class ChatViewController: UIViewController {
                         SVProgressHUD.showInfo(withStatus: err.localizedDescription)
                     }
                 }
-            } else {
-                AppContext.loginManager()?.logout()
             }
         }
         self.navigationController?.pushViewController(ssoWebVC, animated: false)
@@ -990,7 +987,13 @@ private extension ChatViewController {
             let loginVC = LoginViewController()
             loginVC.modalPresentationStyle = .overFullScreen
             loginVC.loginAction = { [weak self] in
-                self?.goToSSOViewController()
+                let baseUrl = AppContext.shared.baseServerUrl
+                self?.goToSSO(urlString: "\(baseUrl)/v1/convoai/sso/login")
+            }
+            loginVC.signupAction = { [weak self] in
+                SSOWebViewController.clearWebViewCache()
+                let baseUrl = AppContext.shared.baseServerUrl
+                self?.goToSSO(urlString: "\(baseUrl)/v1/convoai/sso/signup")
             }
             self.present(loginVC, animated: false)
         }