feat(task): 添加任务列表查询功能
- 在TaskListData中添加默认的userId和tenantId参数 - 在Service中新增glassesTaskSearch接口用于任务搜索 - 修改IntentRecognizeHelper使用MyApplication的appComponent1组件 - 更新WelcomeActivity中的语音识别文本为"查看我的任务列表?" - 添加对非决策中心跳转情况的日志记录 - 配置新的基础URL和应用组件用于任务服务接口
这个提交包含在:
父节点
3d10fe43a4
当前提交
7bc0a53ed9
@ -15,13 +15,19 @@ import com.xuqm.base.di.manager.HttpManager;
|
|||||||
*/
|
*/
|
||||||
public class MyApplication extends App {
|
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
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
super.onCreate();
|
super.onCreate();
|
||||||
appComponent = HttpManager.getAppComponent(baseUrl, new HeaderInterceptor(getApplicationContext()));
|
appComponent = HttpManager.getAppComponent(baseUrl, new HeaderInterceptor(getApplicationContext()));
|
||||||
|
appComponent1 = HttpManager.getAppComponent(baseUrl1, new HeaderInterceptor(getApplicationContext()));
|
||||||
|
|
||||||
initSdk();
|
initSdk();
|
||||||
|
|
||||||
@ -33,7 +39,6 @@ public class MyApplication extends App {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void initSdk() {
|
void initSdk() {
|
||||||
// 如果SDK已经初始化了,则直接返回
|
// 如果SDK已经初始化了,则直接返回
|
||||||
if (GlassSdk.isReady()) {
|
if (GlassSdk.isReady()) {
|
||||||
|
|||||||
@ -1,14 +1,11 @@
|
|||||||
package com.nova.brain.glass.helper
|
package com.nova.brain.glass.helper
|
||||||
|
|
||||||
import android.content.Context
|
import com.nova.brain.glass.MyApplication
|
||||||
import android.widget.Toast
|
|
||||||
import com.nova.brain.glass.helper.IntentRecognizeHelper.dispose
|
import com.nova.brain.glass.helper.IntentRecognizeHelper.dispose
|
||||||
import com.nova.brain.glass.helper.IntentRecognizeHelper.recognize
|
import com.nova.brain.glass.helper.IntentRecognizeHelper.recognize
|
||||||
import com.nova.brain.glass.model.RecognizeAction
|
import com.nova.brain.glass.model.RecognizeAction
|
||||||
import com.nova.brain.glass.model.data.RecognizeData
|
import com.nova.brain.glass.model.data.RecognizeData
|
||||||
import com.nova.brain.glass.repository.HeaderInterceptor
|
|
||||||
import com.nova.brain.glass.repository.Service
|
import com.nova.brain.glass.repository.Service
|
||||||
import com.rokid.utils.ContextUtil.getApplicationContext
|
|
||||||
import com.xuqm.base.di.manager.HttpManager
|
import com.xuqm.base.di.manager.HttpManager
|
||||||
import com.xuqm.base.extensions.showMessage
|
import com.xuqm.base.extensions.showMessage
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
@ -32,8 +29,6 @@ object IntentRecognizeHelper {
|
|||||||
private var questionIndex = 0
|
private var questionIndex = 0
|
||||||
private var disposable: Disposable? = null
|
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
|
* @param context 用于显示 Toast
|
||||||
@ -53,10 +48,8 @@ object IntentRecognizeHelper {
|
|||||||
disposable?.dispose()
|
disposable?.dispose()
|
||||||
val question = text ?: nextQuestion()
|
val question = text ?: nextQuestion()
|
||||||
disposable = HttpManager.getApi(
|
disposable = HttpManager.getApi(
|
||||||
HttpManager.getAppComponent(
|
MyApplication.appComponent1, Service::class.java
|
||||||
baseUrl,
|
)
|
||||||
HeaderInterceptor(getApplicationContext())
|
|
||||||
), Service::class.java)
|
|
||||||
.recognize(RecognizeData(text = question, scence = scence))
|
.recognize(RecognizeData(text = question, scence = scence))
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
|
|||||||
@ -10,11 +10,11 @@ package com.nova.brain.glass.model.data
|
|||||||
// "isOverdue": 0 // 是否逾期, 0 正常,1 超期,2全部
|
// "isOverdue": 0 // 是否逾期, 0 正常,1 超期,2全部
|
||||||
//}
|
//}
|
||||||
data class TaskListData(
|
data class TaskListData(
|
||||||
val userId: String,
|
|
||||||
val tenantId: Int,
|
|
||||||
val taskType: String,
|
val taskType: String,
|
||||||
val keyword: String,
|
val keyword: String,
|
||||||
val dateRange: Int,
|
val dateRange: Int,
|
||||||
val dateType: Int,
|
val dateType: Int,
|
||||||
val isOverdue: Int=2
|
val isOverdue: Int=2,
|
||||||
|
val userId: String = "AI0022",
|
||||||
|
val tenantId: Int = 1,
|
||||||
)
|
)
|
||||||
|
|||||||
@ -3,6 +3,7 @@ package com.nova.brain.glass.repository
|
|||||||
import com.nova.brain.glass.model.RecognizeModel
|
import com.nova.brain.glass.model.RecognizeModel
|
||||||
import com.nova.brain.glass.model.data.ChatData
|
import com.nova.brain.glass.model.data.ChatData
|
||||||
import com.nova.brain.glass.model.data.RecognizeData
|
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.TopicData
|
||||||
import com.nova.brain.glass.model.data.TopicModel
|
import com.nova.brain.glass.model.data.TopicModel
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
@ -31,4 +32,7 @@ interface Service {
|
|||||||
@POST("/cbrain-gateway/cbraindep/docqa/tbtopic/save")
|
@POST("/cbrain-gateway/cbraindep/docqa/tbtopic/save")
|
||||||
fun tbtopic(@Body body: TopicData): Observable<TopicModel>
|
fun tbtopic(@Body body: TopicData): Observable<TopicModel>
|
||||||
|
|
||||||
|
@POST("/cbrain-gateway/cbrain-task-server/cbrain-task/task/glassesTaskSearch")
|
||||||
|
fun glassesTaskSearch(@Body body: TaskListData): Observable<TopicModel>
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -4,6 +4,7 @@ import android.content.Intent
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
|
import android.util.Log
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import com.nova.brain.glass.R
|
import com.nova.brain.glass.R
|
||||||
import com.nova.brain.glass.databinding.ActivityWelcomeBinding
|
import com.nova.brain.glass.databinding.ActivityWelcomeBinding
|
||||||
@ -56,13 +57,15 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
|
|||||||
private fun triggerRecognize() {
|
private fun triggerRecognize() {
|
||||||
startDotsAnim()
|
startDotsAnim()
|
||||||
IntentRecognizeHelper.recognize(
|
IntentRecognizeHelper.recognize(
|
||||||
text = "当前阶段,最紧急的任务是什么?",
|
text = "查看我的任务列表?",
|
||||||
onSuccess = { action ->
|
onSuccess = { action ->
|
||||||
if (action.name == "goToDecisionCenter") {
|
if (action.name == "goToDecisionCenter") {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(this, ChatActivity::class.java)
|
Intent(this, ChatActivity::class.java)
|
||||||
.putExtra("question", action.params.question)
|
.putExtra("question", action.params.question)
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
Log.d("WelcomeActivity", "triggerRecognize onSuccess: $action")
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onComplete = {
|
onComplete = {
|
||||||
|
|||||||
正在加载...
在新工单中引用
屏蔽一个用户