xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source
This commit is contained in:
squallzhjch
2023-05-23 09:48:21 +08:00
parent dc6b4b91e5 1050eed1d6
commit 6d0f36068d
11 changed files with 205 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
View File

@@ -386,9 +386,12 @@ class MainViewModel @Inject constructor(
if (layerConfigList != null && !layerConfigList.isEmpty()) {
val omdbVisibleList = layerConfigList.filter { importConfig ->
importConfig.tableGroupName == "OMDB数据"
}.first().tables.filter { tableInfo ->
}.first().tableMap.filter {
entry ->
val tableInfo = entry.value
!tableInfo.checked
}.map { tableInfo ->
}.map { entry ->
val tableInfo = entry.value
tableInfo.table
}.toList()
com.navinfo.collect.library.system.Constant.HAD_LAYER_INVISIABLE_ARRAY =

10
app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerExpandableListAdapter.kt
View File

@@ -17,7 +17,7 @@ class LayerManagerExpandableListAdapter(private val context: Context, val parent
}
override fun getChildrenCount(groupPosition: Int): Int {
return parentItems[groupPosition].tables.size
return parentItems[groupPosition].tableMap.size
}
@@ -25,8 +25,8 @@ class LayerManagerExpandableListAdapter(private val context: Context, val parent
return parentItems[groupPosition]
}
override fun getChild(groupPosition: Int, childPosition: Int): Any {
return parentItems[groupPosition].tables[childPosition]
override fun getChild(groupPosition: Int, childPosition: Int): TableInfo? {
return parentItems[groupPosition].tableMap[parentItems[groupPosition].tableMap.keys.elementAt(childPosition)]
}
override fun getGroupId(groupPosition: Int): Long = groupPosition.toLong()
@@ -58,7 +58,7 @@ class LayerManagerExpandableListAdapter(private val context: Context, val parent
viewHolder.parentCheckBox.isChecked = parentItem.checked
viewHolder.parentCheckBox.setOnClickListener {
parentItem.checked = !parentItem.checked
parentItem.tables.forEach { it.checked = parentItem.checked }
parentItem.tableMap.forEach { it.value.checked = parentItem.checked }
notifyDataSetChanged()
}
if (isExpanded) {
@@ -93,7 +93,7 @@ class LayerManagerExpandableListAdapter(private val context: Context, val parent
viewHolder.childCheckBox.isChecked = childItem.checked
viewHolder.childCheckBox.setOnClickListener {
childItem.checked = !childItem.checked
parentItems[groupPosition].checked = parentItems[groupPosition].tables.all { it.checked }
parentItems[groupPosition].checked = parentItems[groupPosition].tableMap.all { it.value.checked }
notifyDataSetChanged()
}