diff --git a/app/src/main/java/com/nova/brain/glass/MyApplication.java b/app/src/main/java/com/nova/brain/glass/MyApplication.java index ab24c96..8e838e2 100644 --- a/app/src/main/java/com/nova/brain/glass/MyApplication.java +++ b/app/src/main/java/com/nova/brain/glass/MyApplication.java @@ -15,13 +15,19 @@ import com.xuqm.base.di.manager.HttpManager; */ public class MyApplication extends App { - public static String baseUrl = "http://192.168.6.20"; -// public static String baseUrl = "http://22fs132201.imwork.net"; + public static String baseUrl = "http://22fs132201.imwork.net"; + private static String baseUrl1 = "https://22v1322u01.vicp.fun"; + +// public static String baseUrl = "http://192.168.6.20"; +// private static String baseUrl1 = "http://192.168.6.20:12119"; + + public static AppComponent appComponent1; @Override public void onCreate() { super.onCreate(); appComponent = HttpManager.getAppComponent(baseUrl, new HeaderInterceptor(getApplicationContext())); + appComponent1 = HttpManager.getAppComponent(baseUrl1, new HeaderInterceptor(getApplicationContext())); initSdk(); @@ -33,7 +39,6 @@ public class MyApplication extends App { } - void initSdk() { // 如果SDK已经初始化了,则直接返回 if (GlassSdk.isReady()) { diff --git a/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt index bba74b0..e41fdcb 100644 --- a/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt +++ b/app/src/main/java/com/nova/brain/glass/helper/IntentRecognizeHelper.kt @@ -1,14 +1,11 @@ package com.nova.brain.glass.helper -import android.content.Context -import android.widget.Toast +import com.nova.brain.glass.MyApplication import com.nova.brain.glass.helper.IntentRecognizeHelper.dispose import com.nova.brain.glass.helper.IntentRecognizeHelper.recognize import com.nova.brain.glass.model.RecognizeAction import com.nova.brain.glass.model.data.RecognizeData -import com.nova.brain.glass.repository.HeaderInterceptor import com.nova.brain.glass.repository.Service -import com.rokid.utils.ContextUtil.getApplicationContext import com.xuqm.base.di.manager.HttpManager import com.xuqm.base.extensions.showMessage import io.reactivex.android.schedulers.AndroidSchedulers @@ -32,8 +29,6 @@ object IntentRecognizeHelper { private var questionIndex = 0 private var disposable: Disposable? = null -// private val baseUrl: String = "https://22v1322u01.vicp.fun" - private val baseUrl: String = "http://192.168.6.20:12119" /** * @param context 用于显示 Toast @@ -53,10 +48,8 @@ object IntentRecognizeHelper { disposable?.dispose() val question = text ?: nextQuestion() disposable = HttpManager.getApi( - HttpManager.getAppComponent( - baseUrl, - HeaderInterceptor(getApplicationContext()) - ), Service::class.java) + MyApplication.appComponent1, Service::class.java + ) .recognize(RecognizeData(text = question, scence = scence)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/nova/brain/glass/model/data/TaskListData.kt b/app/src/main/java/com/nova/brain/glass/model/data/TaskListData.kt index f3d0f2d..88070b6 100644 --- a/app/src/main/java/com/nova/brain/glass/model/data/TaskListData.kt +++ b/app/src/main/java/com/nova/brain/glass/model/data/TaskListData.kt @@ -10,11 +10,11 @@ package com.nova.brain.glass.model.data // "isOverdue": 0 // 是否逾期, 0 正常,1 超期,2全部 //} data class TaskListData( - val userId: String, - val tenantId: Int, val taskType: String, val keyword: String, val dateRange: Int, val dateType: Int, - val isOverdue: Int=2 + val isOverdue: Int=2, + val userId: String = "AI0022", + val tenantId: Int = 1, ) diff --git a/app/src/main/java/com/nova/brain/glass/repository/Service.kt b/app/src/main/java/com/nova/brain/glass/repository/Service.kt index 985bea1..3014a65 100644 --- a/app/src/main/java/com/nova/brain/glass/repository/Service.kt +++ b/app/src/main/java/com/nova/brain/glass/repository/Service.kt @@ -3,6 +3,7 @@ package com.nova.brain.glass.repository import com.nova.brain.glass.model.RecognizeModel import com.nova.brain.glass.model.data.ChatData import com.nova.brain.glass.model.data.RecognizeData +import com.nova.brain.glass.model.data.TaskListData import com.nova.brain.glass.model.data.TopicData import com.nova.brain.glass.model.data.TopicModel import io.reactivex.Observable @@ -31,4 +32,7 @@ interface Service { @POST("/cbrain-gateway/cbraindep/docqa/tbtopic/save") fun tbtopic(@Body body: TopicData): Observable + @POST("/cbrain-gateway/cbrain-task-server/cbrain-task/task/glassesTaskSearch") + fun glassesTaskSearch(@Body body: TaskListData): Observable + } \ No newline at end of file diff --git a/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt index deefb6f..550ac33 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/WelcomeActivity.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.os.Bundle import android.os.Handler import android.os.Looper +import android.util.Log import androidx.lifecycle.ViewModelProvider import com.nova.brain.glass.R import com.nova.brain.glass.databinding.ActivityWelcomeBinding @@ -56,13 +57,15 @@ class WelcomeActivity : BaseActivity() { private fun triggerRecognize() { startDotsAnim() IntentRecognizeHelper.recognize( - text = "当前阶段,最紧急的任务是什么?", + text = "查看我的任务列表?", onSuccess = { action -> if (action.name == "goToDecisionCenter") { startActivity( Intent(this, ChatActivity::class.java) .putExtra("question", action.params.question) ) + } else { + Log.d("WelcomeActivity", "triggerRecognize onSuccess: $action") } }, onComplete = {