diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt index 1f640d4..a7170dd 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt @@ -61,9 +61,9 @@ class ApprovalActivity : BaseBindingActivity(), OnRefre else -> R.string.initiated } ) - // type为已办理时,显示 - mBinding.llScreen.isVisibleOrGone(type == PI_APPROVED) - end = if (type == PI_APPROVED) { + // type为已办理和所有时,显示 + mBinding.llScreen.isVisibleOrGone(type == PI_APPROVED || type == PI_OWNER) + end = if (type == PI_APPROVED || type == PI_OWNER) { mBinding.tvUncompleted.isSelected = true mBinding.tvCompleted.isSelected = false 0 diff --git a/app/src/main/java/com/project/survey/ui/controlnet/FirstControlNetworkActivity.kt b/app/src/main/java/com/project/survey/ui/controlnet/FirstControlNetworkActivity.kt index 9690875..b3adce8 100644 --- a/app/src/main/java/com/project/survey/ui/controlnet/FirstControlNetworkActivity.kt +++ b/app/src/main/java/com/project/survey/ui/controlnet/FirstControlNetworkActivity.kt @@ -91,6 +91,7 @@ class FirstControlNetworkActivity : BaseBindingActivity + mBinding.spinner.collapse() val versionBean = item as FirstControlNetworkVersionBean currentVersion = if ("版本号" == versionBean.KZWZBCG_VERSION) null else versionBean.KZWZBCG_VERSION diff --git a/app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkActivity.kt b/app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkActivity.kt index 5995617..35b5592 100644 --- a/app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkActivity.kt +++ b/app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkActivity.kt @@ -96,6 +96,7 @@ class SpecialControlNetworkActivity : override fun initListener() { // 控制网名称 mBinding.spinnerName.setOnItemSelectedListener { view, position, id, item -> + mBinding.spinnerName.collapse() val bean = item as String currentName = if ("控制网名称" == bean) null else bean @@ -111,6 +112,7 @@ class SpecialControlNetworkActivity : } // 版本号 mBinding.spinnerVersion.setOnItemSelectedListener { _, _, _, item -> + mBinding.spinnerVersion.collapse() val version = item as String currentVersion = if ("版本号" == version) null else version