wangguannan
/
ShangHaiProjectSurvey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

控制网spinner样式修改

Browse Source
main
chenglifeng 6 months ago
parent fe2e1cc9a3
commit 71abe1845a
5 changed files with 23 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/com/project/survey/ui/controlnet/FirstControlNetworkActivity.kt
  2. 10
      app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkActivity.kt
  3. 2
      app/src/main/res/layout/activity_first_control_network.xml
  4. 4
      app/src/main/res/layout/activity_special_control_network.xml
  5. 13
      app/src/main/res/layout/list_popup_item_spinner.xml

4
app/src/main/java/com/project/survey/ui/controlnet/FirstControlNetworkActivity.kt
Unescape View File

@ -43,7 +43,7 @@ class FirstControlNetworkActivity : BaseBindingActivity<ActivityFirstControlNetw
private var currentPage = 1
private var currentVersion: String? = null
private val listPopupWindow by lazy { ListPopupWindow(this) }
private val versionList = arrayListOf(FirstControlNetworkVersionBean("版本号"))
private val versionList = arrayListOf(FirstControlNetworkVersionBean("全部版本"))
override fun initView() {
immersionToolbar(mBinding.toolbar, R.string.head_control_network)
@ -65,7 +65,7 @@ class FirstControlNetworkActivity : BaseBindingActivity<ActivityFirstControlNetw
versionList.addAll(it)
// mBinding.spinner.setItems(list)
val adapter = ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, versionList.map { it.KZWZBCG_VERSION })
val adapter = ArrayAdapter<String>(this, R.layout.list_popup_item_spinner, versionList.map { it.KZWZBCG_VERSION })
listPopupWindow.setAdapter(adapter)
mBinding.tvSpinner.text = versionList[0].KZWZBCG_VERSION

10
app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkActivity.kt
Unescape View File

@ -42,7 +42,7 @@ class SpecialControlNetworkActivity :
// private var versionList = ArrayList<SpecialControlNetworkVersionBean>()
private var versionNameList =
arrayListOf(SpecialControlNetworkVersionBean("版本号", "控制网名称"))
arrayListOf(SpecialControlNetworkVersionBean("全部版本", "全部名称"))
private var versionList = ArrayList<String>()
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<String>(
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<String>(this, android.R.layout.simple_list_item_1, versionList)
ArrayAdapter<String>(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()

2
app/src/main/res/layout/activity_first_control_network.xml
Unescape View File

@ -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"

4
app/src/main/res/layout/activity_special_control_network.xml
Unescape View File

@ -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"

13
app/src/main/res/layout/list_popup_item_spinner.xml
Unescape View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="@dimen/sw_40dp"
android:paddingHorizontal="@dimen/sw_12dp"
android:paddingVertical="@dimen/sw_10dp"
android:textColor="@color/text_color_5b5a5e"
android:textSize="@dimen/sw_11sp"
tools:text="版本" />
Write Preview
Loading…
Cancel
Save