diff --git a/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt index 1c7271c..cd7c75c 100644 --- a/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt +++ b/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt @@ -65,6 +65,9 @@ object AsrHelper : OfflineCmdListener { /** goToTaskCenter 命中时的回调，由各 Activity 在 onResume/onPause 中注册/清空 */ var onGoToTaskCenter: ((action: RecognizeAction) -> Unit)? = null + /** list 场景下由 TaskListActivity 注册，返回当前列表数据作为 extra 传给服务端 */ + var extraProvider: (() -> List)? = null + /** scene == "decision" 时直接用 ASR 文本发起对话，由 ChatActivity 注册 */ var onDirectChat: ((text: String) -> Unit)? = null @@ -192,16 +195,22 @@ object AsrHelper : OfflineCmdListener { if (scene == "decision") { onDirectChat?.invoke(text) } else { + val listActions = if (scene == "list") + listOf("goToDecisionCenter") + else + listOf("goToTaskCenter", "goToDecisionCenter") IntentRecognizeHelper.recognize( text = text, scence = scene, + extra = extraProvider?.invoke() ?: emptyList(), + actions = listActions, onSuccess = { action -> when (action.name) { "goToDecisionCenter" -> onGoToDecisionCenter?.invoke(action) "goToTaskCenter" -> onGoToTaskCenter?.invoke(action) else -> Log.d(TAG, "unhandled action: $action") } - } + }, ) } } 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 e41fdcb..b961d0a 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 @@ -29,19 +29,19 @@ object IntentRecognizeHelper { private var questionIndex = 0 private var disposable: Disposable? = null - /** - * @param context 用于显示 Toast * @param text 指定问题文本；为 null 时自动轮换内置问题 * @param scence 场景标识，默认 "home" + * @param extra 额外上下文数据（如 list 场景下的任务列表），原样传给服务端 + * @param actions 允许的 action 列表，默认全部 * @param onSuccess 识别成功且 code=="0" 时回调，参数为 [RecognizeAction] - */ - /** * @param onComplete 无论成功失败都会回调，用于调用方重置 loading 状态 */ fun recognize( text: String? = null, scence: String = "home", + extra: List = emptyList(), + actions: List = listOf("goToTaskCenter", "goToDecisionCenter"), onSuccess: (action: RecognizeAction) -> Unit, onComplete: () -> Unit = {} ) { @@ -50,7 +50,7 @@ object IntentRecognizeHelper { disposable = HttpManager.getApi( MyApplication.appComponent1, Service::class.java ) - .recognize(RecognizeData(text = question, scence = scence)) + .recognize(RecognizeData(text = question, scence = scence, extra = extra, actions = actions)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ model -> @@ -59,7 +59,7 @@ object IntentRecognizeHelper { } else { model.message.showMessage() } - onComplete() // 无论成功失败都执行 + onComplete() }, { e -> "请求失败: ${e.message}".showMessage() onComplete() diff --git a/app/src/main/java/com/nova/brain/glass/model/RecognizeModel.kt b/app/src/main/java/com/nova/brain/glass/model/RecognizeModel.kt index ebb92c5..301b2f3 100644 --- a/app/src/main/java/com/nova/brain/glass/model/RecognizeModel.kt +++ b/app/src/main/java/com/nova/brain/glass/model/RecognizeModel.kt @@ -53,4 +53,7 @@ data class RecognizeParams( val taskType: String? = null, val tenantId: Int? = null, val userId: String? = null, + // list 场景下服务端返回的任务定位字段 + val taskId: String? = null, + val taskIndex: Int? = null, ) \ No newline at end of file diff --git a/app/src/main/java/com/nova/brain/glass/model/data/RecognizeData.kt b/app/src/main/java/com/nova/brain/glass/model/data/RecognizeData.kt index b7bfcdc..e9f69ac 100644 --- a/app/src/main/java/com/nova/brain/glass/model/data/RecognizeData.kt +++ b/app/src/main/java/com/nova/brain/glass/model/data/RecognizeData.kt @@ -3,14 +3,23 @@ package com.nova.brain.glass.model.data //{ // "text": "查看下C919第45架机的零部件采购情况", // "scence": "home", -// "extra": [], -// "actions": [ -// "goToTaskCenter","goToDecisionCenter" -// ] +// "extra": [ +// { "index": 1, "id": "xxx", "taskType": "审核任务", "processStatus": "进行中", "aiDescription": "..." } +// ], +// "actions": ["goToDecisionCenter"] //} data class RecognizeData( val text: String, val scence: String = "home", - val extra: List = emptyList(), - val actions: List = listOf("goToTaskCenter","goToDecisionCenter") + val extra: List = emptyList(), + val actions: List = listOf("goToTaskCenter", "goToDecisionCenter") ) + +// list 场景下传给服务端，帮助 NLP 定位用户所说的任务 +data class TaskExtraItem( + val index: Int, // 列表中的显示序号（1-based） + val id: String, + val taskType: String, + val processStatus: String, + val aiDescription: String +) \ No newline at end of file diff --git a/app/src/main/java/com/nova/brain/glass/repository/HeaderInterceptor.kt b/app/src/main/java/com/nova/brain/glass/repository/HeaderInterceptor.kt index d585316..aec0374 100644 --- a/app/src/main/java/com/nova/brain/glass/repository/HeaderInterceptor.kt +++ b/app/src/main/java/com/nova/brain/glass/repository/HeaderInterceptor.kt @@ -23,11 +23,11 @@ class HeaderInterceptor(val context: Context) : Interceptor { //请求定制：添加请求头 val requestBuilder = original.newBuilder() - .header("Authorization", "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJBSTAwMjIiLCJyblN0ciI6Im1OWUxobGZqWDJ2bEJMc21RdnFxSUE4dU9ZN0NOY3AzIiwidXNlckluZm8iOnsic3RhZmZObyI6IkFJMDAyMiJ9fQ.4BHcVpdkznqaQwPsyTn1my3_Zo0AliOILj_PjbCIK3k") + .header("Authorization", "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJyb2tpZCIsInJuU3RyIjoiQTU3NlV1VVV3V2s5NEpxSjlQcU9keDE1bE1tdU5JYmMiLCJ1c2VySW5mbyI6eyJzdGFmZk5vIjoicm9raWQifX0.qp1zWjYjqtmFS7Udo7Ga-a_XhVNwRUByXYomu6P6yxg") .addHeader("Content-Type", "application/json;charset=UTF-8") .addHeader("Cookie", "__itrace_wid=87125211-8742-4f12-b5ca-32b9b6c860e4; locale=zh-Hans; _webtracing_device_id=t_13501877-b9b303fc-d3f52eb530e026b0") .addHeader("Environment", "1") - .addHeader("currentUserId", "AI0022") + .addHeader("currentUserId", "rokid1") .addHeader("terminal", "1") .addHeader("modulename", "web") .addHeader("currentUserName", "") diff --git a/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt index 6e42989..0148cdc 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt @@ -6,9 +6,11 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.LinearLayoutManager import com.nova.brain.glass.R import com.nova.brain.glass.databinding.ActivityTaskListBinding +import com.nova.brain.glass.helper.AsrHelper import com.nova.brain.glass.helper.OfflineCmdListener import com.nova.brain.glass.helper.OfflineCmdServiceHelper import com.nova.brain.glass.model.TaskItem +import com.nova.brain.glass.model.data.TaskExtraItem import com.nova.brain.glass.model.data.TaskListData import com.nova.brain.glass.viewmodel.TaskListVM import com.xuqm.base.adapter.BasePagedAdapter @@ -190,12 +192,38 @@ class TaskListActivity : OfflineCmdServiceHelper.addListenerList() LogHelper.d(">>>>>>>>>>>>--------------------") OfflineCmdServiceHelper.addOnLineListener(offlineCmdListener) + AsrHelper.scene = "list" + AsrHelper.extraProvider = { + viewModel.currentItems.mapIndexed { i, item -> + TaskExtraItem( + index = i + 1, + id = item.id, + taskType = item.taskType, + processStatus = item.processStatus, + aiDescription = item.aiDescription + ) + } + } + AsrHelper.onGoToDecisionCenter = { action -> + val taskId = action.params.taskId + val taskIndex = action.params.taskIndex + when { + taskId != null -> { + val position = viewModel.currentItems.indexOfFirst { it.id == taskId } + if (position >= 0) openTask(position) + } + taskIndex != null -> openVisibleTask(taskIndex - 1) + } + } } override fun onPause() { super.onPause() OfflineCmdServiceHelper.removeListenerList() OfflineCmdServiceHelper.removeOnLineListener(offlineCmdListener) + AsrHelper.scene = "home" + AsrHelper.extraProvider = null + AsrHelper.onGoToDecisionCenter = null } private val adapter = object : CommonPagedAdapter(R.layout.item_task_list) { diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/TaskListVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/TaskListVM.kt index 421c770..2088674 100644 --- a/app/src/main/java/com/nova/brain/glass/viewmodel/TaskListVM.kt +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/TaskListVM.kt @@ -18,9 +18,12 @@ class TaskListVM : BaseListViewModel() { val taskCount = MutableLiveData() + var currentItems: List = emptyList() + private set + override fun loadData(page: Int, onResponse: Response) { add( - HttpManager.getApi(MyApplication.appComponent1, Service::class.java) + HttpManager.getApi(Service::class.java) .glassesTaskSearch(searchParams) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -34,6 +37,7 @@ class TaskListVM : BaseListViewModel() { aiDescription = it.aiDescription ) } ?: emptyList() + currentItems = items taskCount.value = response.data?.total ?: items.size onResponse.onResponse(ArrayList(items)) }, {