diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt index 0152c30..c23da61 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt @@ -2,6 +2,7 @@ package com.lukouguoji.gjj.viewModel import android.app.Activity import android.content.Intent +import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import com.lukouguoji.gjj.R import com.lukouguoji.gjj.activity.IntImpQueryEditActivity @@ -71,6 +72,20 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { val businessType = MutableLiveData("") val goodsCn = MutableLiveData("") + // 是否有筛选条件(任意一个非空则为 true) + val hasFilter: MediatorLiveData = MediatorLiveData().apply { + val update = { _: Any? -> + value = listOf(spCode, flightNo, origin, awbType, businessType, goodsCn) + .any { !it.value.isNullOrEmpty() } + } + addSource(spCode, update) + addSource(flightNo, update) + addSource(origin, update) + addSource(awbType, update) + addSource(businessType, update) + addSource(goodsCn, update) + } + /////////////////////////////////////////////////////////////////////////// // 方法区 /////////////////////////////////////////////////////////////////////////// diff --git a/module_gjj/src/main/res/drawable/bg_red_dot.xml b/module_gjj/src/main/res/drawable/bg_red_dot.xml new file mode 100644 index 0000000..3291181 --- /dev/null +++ b/module_gjj/src/main/res/drawable/bg_red_dot.xml @@ -0,0 +1,5 @@ + + + + diff --git a/module_gjj/src/main/res/layout/activity_int_imp_query.xml b/module_gjj/src/main/res/layout/activity_int_imp_query.xml index 1a0083d..1b4af06 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_query.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_query.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools"> + - + android:layout_marginLeft="16dp"> + + + + + +