xuqinmin12/c-brain-glass
0
0
派生 0
代码 工单 合并请求 版本发布 百科 动态

feat(task): 添加任务详情页跳转和ASR语音控制功能

浏览代码 
- 在AsrHelper中新增onOpenTaskDetail回调处理openTaskDetail语音命令
- 实现TaskListActivity中的routeToTask方法，根据任务类型跳转到对应详情页
- 添加FoActivity页面接收aiDescription和taskType参数并显示任务头部标题
- 集成ASR语音识别功能，支持通过语音命令打开指定任务详情页
- 在FoActivity布局中添加底部提示文本显示返回操作说明
- 清理废弃的IntentRecognizeHelper依赖和相关代码逻辑
这个提交包含在：
徐勤民 2026-04-18 14:25:48 +08:00
父节点 efa48f0094
当前提交 1207cfd177
共有 4 个文件被更改，包括 50 次插入 和 26 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

4
app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt
查看文件

@ -68,6 +68,9 @@ object AsrHelper : OfflineCmdListener {
/** list 场景下由 TaskListActivity 注册，返回当前列表数据作为 extra 传给服务端 */ /** list 场景下由 TaskListActivity 注册，返回当前列表数据作为 extra 传给服务端 */
var extraProvider: (() -> List<Any>)? = null var extraProvider: (() -> List<Any>)? = null
/** openTaskDetail 命中时的回调，由 TaskListActivity 在 onResume/onPause 中注册/清空 */
var onOpenTaskDetail: ((action: RecognizeAction) -> Unit)? = null
/** scene == "decision" 时直接用 ASR 文本发起对话，由 ChatActivity 注册 */ /** scene == "decision" 时直接用 ASR 文本发起对话，由 ChatActivity 注册 */
var onDirectChat: ((text: String) -> Unit)? = null var onDirectChat: ((text: String) -> Unit)? = null
@ -208,6 +211,7 @@ object AsrHelper : OfflineCmdListener {
when (action.name) { when (action.name) {
"goToDecisionCenter" -> onGoToDecisionCenter?.invoke(action) "goToDecisionCenter" -> onGoToDecisionCenter?.invoke(action)
"goToTaskCenter" -> onGoToTaskCenter?.invoke(action) "goToTaskCenter" -> onGoToTaskCenter?.invoke(action)
"openTaskDetail" -> onOpenTaskDetail?.invoke(action)
else -> Log.d(TAG, "unhandled action: $action") else -> Log.d(TAG, "unhandled action: $action")
} }
}, },

5
app/src/main/java/com/nova/brain/glass/ui/FoActivity.kt
查看文件

@ -24,7 +24,9 @@ class FoActivity : BaseActivity<ActivityFoBinding>() {
} }
override fun initData() { override fun initData() {
super.initData() super.initData()
val html = "" val html = intent.getStringExtra("aiDescription") ?: ""
val taskType = intent.getStringExtra("taskType") ?: ""
binding.tvTaskHeader.text = taskType
val styledHtml = """<html><head><style> val styledHtml = """<html><head><style>
* { color: #40FF5E !important; } * { color: #40FF5E !important; }
body { margin: 0; padding: 0; background: transparent; } body { margin: 0; padding: 0; background: transparent; }
@ -37,7 +39,6 @@ class FoActivity : BaseActivity<ActivityFoBinding>() {
setBackgroundColor(android.graphics.Color.TRANSPARENT) setBackgroundColor(android.graphics.Color.TRANSPARENT)
loadDataWithBaseURL(null, styledHtml, "text/html", "UTF-8", null) loadDataWithBaseURL(null, styledHtml, "text/html", "UTF-8", null)
} }
} }
override fun onResume() { override fun onResume() {

46
app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt
查看文件

@ -8,7 +8,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.nova.brain.glass.R import com.nova.brain.glass.R
import com.nova.brain.glass.databinding.ActivityTaskListBinding import com.nova.brain.glass.databinding.ActivityTaskListBinding
import com.nova.brain.glass.helper.AsrHelper import com.nova.brain.glass.helper.AsrHelper
import com.nova.brain.glass.helper.IntentRecognizeHelper
import com.nova.brain.glass.helper.OfflineCmdListener import com.nova.brain.glass.helper.OfflineCmdListener
import com.nova.brain.glass.helper.OfflineCmdServiceHelper import com.nova.brain.glass.helper.OfflineCmdServiceHelper
import com.nova.brain.glass.model.TaskItem import com.nova.brain.glass.model.TaskItem
@ -108,27 +107,23 @@ class TaskListActivity :
private fun openTask(position: Int) { private fun openTask(position: Int) {
val item = viewModel.currentItems.getOrNull(position) ?: return val item = viewModel.currentItems.getOrNull(position) ?: return
Log.d("TaskListActivity", "openTask position=$position item=$item") routeToTask(item)
// TODO: 根据 item.taskType / item.params 路由到对应 Activity
IntentRecognizeHelper.recognize(
text = "查看第三条任务",
scence="list",
actions = listOf("openTaskDetail", "openTaskDetailWithFilter"),
extra = viewModel.currentItems.mapIndexed { i, item ->
TaskExtraItem(
index = i + 1,
id = item.id,
taskType = item.taskType,
processStatus = item.processStatus,
aiDescription = item.aiDescription
)
},
onSuccess = { action ->
},
onComplete = {
} }
private fun routeToTask(item: TaskItem) {
when (item.taskType) {
"复材MES任务" -> startActivity(
Intent(this, FoActivity::class.java)
.putExtra("aiDescription", item.aiDescription)
.putExtra("taskType", item.taskType)
) )
"审核任务" -> startActivity(
Intent(this, ReviewActivity::class.java)
.putExtra("taskId", item.id)
.putExtra("taskType", item.taskType)
)
else -> Log.d("TaskListActivity", "unknown taskType: ${item.taskType}")
}
} }
override fun onResume() { override fun onResume() {
@ -148,9 +143,17 @@ class TaskListActivity :
} }
} }
AsrHelper.onGoToDecisionCenter = { action -> AsrHelper.onGoToDecisionCenter = { action ->
// 暂只打日志，等确认返回结构后处理
Log.d("TaskListActivity", "recognize result: $action") Log.d("TaskListActivity", "recognize result: $action")
} }
AsrHelper.onOpenTaskDetail = { action ->
val taskId = action.params.taskId
val item = if (taskId.isNullOrEmpty()) {
viewModel.currentItems.firstOrNull()
} else {
viewModel.currentItems.firstOrNull { it.id == taskId }
}
item?.let { routeToTask(it) }
}
} }
override fun onPause() { override fun onPause() {
@ -160,6 +163,7 @@ class TaskListActivity :
AsrHelper.scene = "home" AsrHelper.scene = "home"
AsrHelper.extraProvider = null AsrHelper.extraProvider = null
AsrHelper.onGoToDecisionCenter = null AsrHelper.onGoToDecisionCenter = null
AsrHelper.onOpenTaskDetail = null
} }
private val adapter = object : CommonPagedAdapter<TaskItem>(R.layout.item_task_list) { private val adapter = object : CommonPagedAdapter<TaskItem>(R.layout.item_task_list) {

19
app/src/main/res/layout/activity_fo.xml
查看文件

@ -22,11 +22,26 @@
android:id="@+id/content" android:id="@+id/content"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="10dp" android:layout_marginVertical="10dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@+id/hint"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvTaskHeader" /> app:layout_constraintTop_toBottomOf="@+id/tvTaskHeader" />
<TextView
android:id="@+id/hint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:layout_marginEnd="28dp"
android:layout_marginBottom="56dp"
android:gravity="center"
android:lineSpacingExtra="6dp"
android:text="双击或语音输入“返回”返回上级页面"
android:textColor="#4AFE59"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</layout> </layout>