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 53b432d..6e42989 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 @@ -72,9 +72,14 @@ class TaskListActivity : binding.shang.setOnClickListener { toPre() } + + viewModel.taskCount.observe(this) { count -> + binding.tvTaskHeader.text = "查询到您当前有${count}条任务,信息如下:" + } } override fun initData() { + viewModel.searchParams = TaskListData( taskType = intent.getStringExtra("taskType") ?: "", keyword = intent.getStringExtra("keyword") ?: "", 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 69a84ea..421c770 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 @@ -1,5 +1,6 @@ package com.nova.brain.glass.viewmodel +import androidx.lifecycle.MutableLiveData import com.nova.brain.glass.MyApplication import com.nova.brain.glass.model.TaskItem import com.nova.brain.glass.model.data.TaskListData @@ -15,6 +16,8 @@ class TaskListVM : BaseListViewModel() { var searchParams: TaskListData = TaskListData(taskType = "", keyword = "", dateRange = 0, dateType = 0) + val taskCount = MutableLiveData() + override fun loadData(page: Int, onResponse: Response) { add( HttpManager.getApi(MyApplication.appComponent1, Service::class.java) @@ -31,6 +34,7 @@ class TaskListVM : BaseListViewModel() { aiDescription = it.aiDescription ) } ?: emptyList() + taskCount.value = response.data?.total ?: items.size onResponse.onResponse(ArrayList(items)) }, { onResponse.onResponse(arrayListOf()) diff --git a/app/src/main/res/layout/activity_task_list.xml b/app/src/main/res/layout/activity_task_list.xml index 853e7a3..bd3693e 100644 --- a/app/src/main/res/layout/activity_task_list.xml +++ b/app/src/main/res/layout/activity_task_list.xml @@ -12,7 +12,7 @@ android:id="@+id/tvTaskHeader" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="查询到您当前有5条任务,信息如下:" + android:text="查询到您当前有0条任务,信息如下:" android:textColor="#ff40FF5E" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/base/src/main/res/drawable/ic_no_data.xml b/base/src/main/res/drawable/ic_no_data.xml index ddf33f6..85b54db 100644 --- a/base/src/main/res/drawable/ic_no_data.xml +++ b/base/src/main/res/drawable/ic_no_data.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/base/src/main/res/layout/empty_view.xml b/base/src/main/res/layout/empty_view.xml index 6f55af6..a744b97 100644 --- a/base/src/main/res/layout/empty_view.xml +++ b/base/src/main/res/layout/empty_view.xml @@ -21,8 +21,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:text="玩命加载中..." - android:textColor="@color/text_black" + android:text="加载中..." + android:textColor="#ff40FF5E" android:textSize="12sp" /> @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:text="暂无数据" - android:textColor="@color/text_black" + android:textColor="#ff40FF5E" android:textSize="12sp" /> @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:text="加载失败" - android:textColor="@color/text_black" + android:textColor="#ff40FF5E" android:textSize="12sp" /> @@ -94,7 +94,7 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:text="网络异常" - android:textColor="@color/text_black" + android:textColor="#ff40FF5E" android:textSize="12sp" />