diff --git a/app/src/main/java/com/casic/br/app/extensions/String.kt b/app/src/main/java/com/casic/br/app/extensions/String.kt index 1acff17..10036ff 100644 --- a/app/src/main/java/com/casic/br/app/extensions/String.kt +++ b/app/src/main/java/com/casic/br/app/extensions/String.kt @@ -62,7 +62,7 @@ "安全帽" ).contains(this) - "非居民用户" -> return listOf( + "非居用户" -> return listOf( "燃气计量器具", "可燃气体报警控制器", "燃气探测器", "燃气管道", "防爆灯", "切断阀", "排烟设施", "阀门" diff --git a/app/src/main/java/com/casic/br/app/extensions/String.kt b/app/src/main/java/com/casic/br/app/extensions/String.kt index 1acff17..10036ff 100644 --- a/app/src/main/java/com/casic/br/app/extensions/String.kt +++ b/app/src/main/java/com/casic/br/app/extensions/String.kt @@ -62,7 +62,7 @@ "安全帽" ).contains(this) - "非居民用户" -> return listOf( + "非居用户" -> return listOf( "燃气计量器具", "可燃气体报警控制器", "燃气探测器", "燃气管道", "防爆灯", "切断阀", "排烟设施", "阀门" diff --git a/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt b/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt index 7984479..0493c7e 100644 --- a/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt +++ b/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt @@ -30,6 +30,31 @@ override fun initOnCreate(savedInstanceState: Bundle?) { checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + val baseModel = it.data + if (baseModel.basisList.isEmpty()) { + "抱歉，此项行业标准暂时无数据".show(requireContext()) + return@observe + } + + val stringBuilder = StringBuilder() + baseModel.basisList.forEachIndexed { index, base -> + val line = "《${base.specificationName}》-${base.chapter}-${base.content}" + if (index == baseModel.basisList.size - 1) { + stringBuilder.append(line) + } else { + stringBuilder.append(line).append("\r\n") + } + } + + //显示行业标准 + CheckStandardSheet.Builder() + .setContext(requireContext()) + .setSheetValue(stringBuilder.toString()) + .build().show() + } + } checkManifestViewModel.targetManifestResult.observe(this) { if (it.code == 200) { if (it.data.isEmpty()) { @@ -50,26 +75,9 @@ viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") .setText(R.id.troubleNameView, item.checkStandard) .setOnClickListener(R.id.showImageView) { - if (item.basisList.isEmpty()) { - "抱歉，此项行业标准暂时无数据".show(requireContext()) - return@setOnClickListener - } - - val stringBuilder = StringBuilder() - item.basisList.forEachIndexed { index, base -> - val line = "《${base.specificationName}》-${base.chapter}-${base.content}" - if (index == item.basisList.size - 1) { - stringBuilder.append(line) - } else { - stringBuilder.append(line).append("\r\n") - } - } - - //显示行业标准 - CheckStandardSheet.Builder() - .setContext(requireContext()) - .setSheetValue(stringBuilder.toString()) - .build().show() + checkManifestViewModel.getCheckManifestDetailById( + requireContext(), item.id + ) } } } diff --git a/app/src/main/java/com/casic/br/app/extensions/String.kt b/app/src/main/java/com/casic/br/app/extensions/String.kt index 1acff17..10036ff 100644 --- a/app/src/main/java/com/casic/br/app/extensions/String.kt +++ b/app/src/main/java/com/casic/br/app/extensions/String.kt @@ -62,7 +62,7 @@ "安全帽" ).contains(this) - "非居民用户" -> return listOf( + "非居用户" -> return listOf( "燃气计量器具", "可燃气体报警控制器", "燃气探测器", "燃气管道", "防爆灯", "切断阀", "排烟设施", "阀门" diff --git a/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt b/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt index 7984479..0493c7e 100644 --- a/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt +++ b/app/src/main/java/com/casic/br/app/fragment/TargetCheckManifestFragment.kt @@ -30,6 +30,31 @@ override fun initOnCreate(savedInstanceState: Bundle?) { checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + val baseModel = it.data + if (baseModel.basisList.isEmpty()) { + "抱歉，此项行业标准暂时无数据".show(requireContext()) + return@observe + } + + val stringBuilder = StringBuilder() + baseModel.basisList.forEachIndexed { index, base -> + val line = "《${base.specificationName}》-${base.chapter}-${base.content}" + if (index == baseModel.basisList.size - 1) { + stringBuilder.append(line) + } else { + stringBuilder.append(line).append("\r\n") + } + } + + //显示行业标准 + CheckStandardSheet.Builder() + .setContext(requireContext()) + .setSheetValue(stringBuilder.toString()) + .build().show() + } + } checkManifestViewModel.targetManifestResult.observe(this) { if (it.code == 200) { if (it.data.isEmpty()) { @@ -50,26 +75,9 @@ viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") .setText(R.id.troubleNameView, item.checkStandard) .setOnClickListener(R.id.showImageView) { - if (item.basisList.isEmpty()) { - "抱歉，此项行业标准暂时无数据".show(requireContext()) - return@setOnClickListener - } - - val stringBuilder = StringBuilder() - item.basisList.forEachIndexed { index, base -> - val line = "《${base.specificationName}》-${base.chapter}-${base.content}" - if (index == item.basisList.size - 1) { - stringBuilder.append(line) - } else { - stringBuilder.append(line).append("\r\n") - } - } - - //显示行业标准 - CheckStandardSheet.Builder() - .setContext(requireContext()) - .setSheetValue(stringBuilder.toString()) - .build().show() + checkManifestViewModel.getCheckManifestDetailById( + requireContext(), item.id + ) } } } diff --git a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt index 844e943..949ba83 100644 --- a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt @@ -43,7 +43,7 @@ "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌", "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪", "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌", - "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头", + "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头", "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器", "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露", "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥",