diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index afe4899..aa7f17b 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -31,6 +31,7 @@ class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckManifestActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private val gson by lazy { Gson() } private lateinit var configViewModel: ConfigViewModel @@ -89,12 +90,22 @@ } } + private fun createFirstElement(): DictionaryModel.DataModel { + val model = DictionaryModel.DataModel() + model.id = System.currentTimeMillis().toString() + model.name = "全部" + model.value = "" + return model + } + override fun initOnCreate(savedInstanceState: Bundle?) { + sceneModels.add(0, createFirstElement()) val sceneJsonValue = intent.getStringExtra(Constant.INTENT_PARAM) //转为实体类 - sceneModels = gson.fromJson>( + val dictionaryModels = gson.fromJson>( sceneJsonValue, object : TypeToken>() {}.type ) + sceneModels.addAll(dictionaryModels) val sceneArray = ArrayList() sceneModels.forEach { sceneArray.add(it.name) @@ -106,7 +117,8 @@ configViewModel.getDictionaryByCode(this, "securityCategory") configViewModel.dictionary.observe(this) { if (it.code == 200) { - typeModels = it.data + typeModels.add(0, createFirstElement()) + typeModels.addAll(it.data) val typeArray = ArrayList() typeModels.forEach { dic -> typeArray.add(dic.name)