From 510a8cabf50ea69342a8fd1bd0020cc51215212a Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Fri, 8 Nov 2024 15:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E6=9C=AA=E5=AE=8C=E7=BB=93=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E7=BB=93=E2=80=9D=E7=AD=9B=E9=80=89=EF=BC=9Bspinner?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=89=E9=A1=B9=E5=90=8E=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?collapse()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/project/survey/ui/approval/ApprovalActivity.kt | 6 +++--- .../survey/ui/controlnet/FirstControlNetworkActivity.kt | 1 + .../survey/ui/controlnet/SpecialControlNetworkActivity.kt | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) 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