From 71abe1845a8d9536fd1b72c9cc9af01dded4f64b Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Wed, 13 Nov 2024 19:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=BD=91spinner=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/controlnet/FirstControlNetworkActivity.kt | 4 ++-- .../ui/controlnet/SpecialControlNetworkActivity.kt | 10 +++++----- .../res/layout/activity_first_control_network.xml | 2 +- .../res/layout/activity_special_control_network.xml | 4 ++-- app/src/main/res/layout/list_popup_item_spinner.xml | 13 +++++++++++++ 5 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/layout/list_popup_item_spinner.xml 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 a8514b9..3fb2595 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 @@ -43,7 +43,7 @@ class FirstControlNetworkActivity : BaseBindingActivity(this, android.R.layout.simple_list_item_1, versionList.map { it.KZWZBCG_VERSION }) + val adapter = ArrayAdapter(this, R.layout.list_popup_item_spinner, versionList.map { it.KZWZBCG_VERSION }) listPopupWindow.setAdapter(adapter) mBinding.tvSpinner.text = versionList[0].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 c96759f..b648b14 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 @@ -42,7 +42,7 @@ class SpecialControlNetworkActivity : // private var versionList = ArrayList() private var versionNameList = - arrayListOf(SpecialControlNetworkVersionBean("版本号", "控制网名称")) + arrayListOf(SpecialControlNetworkVersionBean("全部版本", "全部名称")) private var versionList = ArrayList() private val nameListPopupWindow by lazy { ListPopupWindow(this) } @@ -72,7 +72,7 @@ class SpecialControlNetworkActivity : // mBinding.spinnerName.setItems(versionList.map { v -> v.KZW_NAME }) val nameAdapter = ArrayAdapter( this, - android.R.layout.simple_list_item_1, + R.layout.list_popup_item_spinner, versionNameList.map { it.KZW_NAME }) nameListPopupWindow.setAdapter(nameAdapter) mBinding.tvSpinnerName.text = versionNameList[0].KZW_NAME @@ -80,7 +80,7 @@ class SpecialControlNetworkActivity : versionList.clear() versionList.addAll(versionNameList[0].version_array.split(",").toList()) versionAdapter = - ArrayAdapter(this, android.R.layout.simple_list_item_1, versionList) + ArrayAdapter(this, R.layout.list_popup_item_spinner, versionList) versionListPopupWindow.setAdapter(versionAdapter) mBinding.tvSpinnerVersion.text = versionList[0] // mBinding.spinnerVersion.setItems(versionList) @@ -127,7 +127,7 @@ class SpecialControlNetworkActivity : nameListPopupWindow.setOnItemClickListener { adapterView, view, i, l -> nameListPopupWindow.dismiss() currentName = if (i == 0) null else versionNameList[i].KZW_NAME - mBinding.tvSpinnerName.text = currentName ?: "控制网名称" + mBinding.tvSpinnerName.text = currentName ?: versionNameList[0].KZW_NAME versionList.clear() versionList.addAll(versionNameList[i].version_array.split(",").toList()) @@ -136,7 +136,7 @@ class SpecialControlNetworkActivity : currentVersion = if (currentName == null) null else if (versionList.isEmpty()) null else versionList[0] - mBinding.tvSpinnerVersion.text = currentVersion ?: "版本号" + mBinding.tvSpinnerVersion.text = currentVersion ?: versionNameList[0].version_array currentPage = 1 fetchData() diff --git a/app/src/main/res/layout/activity_first_control_network.xml b/app/src/main/res/layout/activity_first_control_network.xml index 5b11eb8..be139ae 100644 --- a/app/src/main/res/layout/activity_first_control_network.xml +++ b/app/src/main/res/layout/activity_first_control_network.xml @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical" - android:textColor="@color/text_color_20" + android:textColor="@color/text_color_5b5a5e" android:textSize="@dimen/sw_11sp" android:paddingHorizontal="@dimen/sw_16dp" android:drawableEnd="@drawable/ms_ic_arrow_up" diff --git a/app/src/main/res/layout/activity_special_control_network.xml b/app/src/main/res/layout/activity_special_control_network.xml index 49c85a0..1c8d6b4 100644 --- a/app/src/main/res/layout/activity_special_control_network.xml +++ b/app/src/main/res/layout/activity_special_control_network.xml @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical" - android:textColor="@color/text_color_20" + android:textColor="@color/text_color_5b5a5e" android:textSize="@dimen/sw_11sp" android:paddingHorizontal="@dimen/sw_16dp" android:drawableEnd="@drawable/ms_ic_arrow_up" @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical" - android:textColor="@color/text_color_20" + android:textColor="@color/text_color_5b5a5e" android:textSize="@dimen/sw_11sp" android:paddingHorizontal="@dimen/sw_16dp" android:drawableEnd="@drawable/ms_ic_arrow_up" diff --git a/app/src/main/res/layout/list_popup_item_spinner.xml b/app/src/main/res/layout/list_popup_item_spinner.xml new file mode 100644 index 0000000..04a8ca9 --- /dev/null +++ b/app/src/main/res/layout/list_popup_item_spinner.xml @@ -0,0 +1,13 @@ + + \ No newline at end of file