diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt new file mode 100644 index 0000000..00b028b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.equipment + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class WeeklyRecordFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_equipment_weekly_record + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt new file mode 100644 index 0000000..00b028b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.equipment + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class WeeklyRecordFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_equipment_weekly_record + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index dbf1293..2a1a6d5 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -35,6 +35,12 @@ "合同发票", "业务统计", "客户列表", "外场检测" ) val MIME_TYPES = arrayOf(MimeType.DOC, MimeType.DOCX, MimeType.PDF) + val BACKGROUND_COLOR = arrayOf( + R.color.color_A, R.color.color_B, R.color.color_C, R.color.color_D + ) + val TEXT_COLOR = arrayOf( + R.color.textColor_A, R.color.textColor_B, R.color.textColor_C, R.color.textColor_D + ) /** * ============================================================================================= diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt new file mode 100644 index 0000000..00b028b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.equipment + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class WeeklyRecordFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_equipment_weekly_record + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index dbf1293..2a1a6d5 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -35,6 +35,12 @@ "合同发票", "业务统计", "客户列表", "外场检测" ) val MIME_TYPES = arrayOf(MimeType.DOC, MimeType.DOCX, MimeType.PDF) + val BACKGROUND_COLOR = arrayOf( + R.color.color_A, R.color.color_B, R.color.color_C, R.color.color_D + ) + val TEXT_COLOR = arrayOf( + R.color.textColor_A, R.color.textColor_B, R.color.textColor_C, R.color.textColor_D + ) /** * ============================================================================================= diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 4a7e35c..3e0a290 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -20,7 +20,7 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(InspectionRecordFragment()) + fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt new file mode 100644 index 0000000..00b028b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.equipment + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class WeeklyRecordFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_equipment_weekly_record + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index dbf1293..2a1a6d5 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -35,6 +35,12 @@ "合同发票", "业务统计", "客户列表", "外场检测" ) val MIME_TYPES = arrayOf(MimeType.DOC, MimeType.DOCX, MimeType.PDF) + val BACKGROUND_COLOR = arrayOf( + R.color.color_A, R.color.color_B, R.color.color_C, R.color.color_D + ) + val TEXT_COLOR = arrayOf( + R.color.textColor_A, R.color.textColor_B, R.color.textColor_C, R.color.textColor_D + ) /** * ============================================================================================= diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 4a7e35c..3e0a290 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -20,7 +20,7 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(InspectionRecordFragment()) + fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml deleted file mode 100644 index 3728533..0000000 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt new file mode 100644 index 0000000..00b028b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.equipment + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class WeeklyRecordFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_equipment_weekly_record + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index dbf1293..2a1a6d5 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -35,6 +35,12 @@ "合同发票", "业务统计", "客户列表", "外场检测" ) val MIME_TYPES = arrayOf(MimeType.DOC, MimeType.DOCX, MimeType.PDF) + val BACKGROUND_COLOR = arrayOf( + R.color.color_A, R.color.color_B, R.color.color_C, R.color.color_D + ) + val TEXT_COLOR = arrayOf( + R.color.textColor_A, R.color.textColor_B, R.color.textColor_C, R.color.textColor_D + ) /** * ============================================================================================= diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 4a7e35c..3e0a290 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -20,7 +20,7 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(InspectionRecordFragment()) + fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml deleted file mode 100644 index 3728533..0000000 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_state_change_log.xml b/app/src/main/res/layout/fragment_equipment_state_change_log.xml index d578419..e39fcbf 100644 --- a/app/src/main/res/layout/fragment_equipment_state_change_log.xml +++ b/app/src/main/res/layout/fragment_equipment_state_change_log.xml @@ -5,9 +5,17 @@ android:layout_height="match_parent" android:background="@color/white"> - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt new file mode 100644 index 0000000..00b028b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.equipment + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class WeeklyRecordFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_equipment_weekly_record + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index dbf1293..2a1a6d5 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -35,6 +35,12 @@ "合同发票", "业务统计", "客户列表", "外场检测" ) val MIME_TYPES = arrayOf(MimeType.DOC, MimeType.DOCX, MimeType.PDF) + val BACKGROUND_COLOR = arrayOf( + R.color.color_A, R.color.color_B, R.color.color_C, R.color.color_D + ) + val TEXT_COLOR = arrayOf( + R.color.textColor_A, R.color.textColor_B, R.color.textColor_C, R.color.textColor_D + ) /** * ============================================================================================= diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 4a7e35c..3e0a290 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -20,7 +20,7 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(InspectionRecordFragment()) + fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml deleted file mode 100644 index 3728533..0000000 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_state_change_log.xml b/app/src/main/res/layout/fragment_equipment_state_change_log.xml index d578419..e39fcbf 100644 --- a/app/src/main/res/layout/fragment_equipment_state_change_log.xml +++ b/app/src/main/res/layout/fragment_equipment_state_change_log.xml @@ -5,9 +5,17 @@ android:layout_height="match_parent" android:background="@color/white"> - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_weekly_record.xml b/app/src/main/res/layout/fragment_equipment_weekly_record.xml new file mode 100644 index 0000000..3728533 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_weekly_record.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt index aa9b92b..c2deab4 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Context.kt @@ -3,8 +3,11 @@ import android.content.Context import android.view.ViewGroup import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.utils.LocaleConstant +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.dp2px import com.qmuiteam.qmui.util.QMUIDisplayHelper +import kotlin.random.Random fun Context.initLayoutImmersionBar(rootView: ViewGroup) { var statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this) @@ -13,4 +16,19 @@ } rootView.setPadding(0, statusBarHeight, 0, 0) rootView.requestLayout() +} + +/** + * 随机生成颜色 + * */ +fun Context.generateColor(): IntArray { + val colorCollection = ArrayList(LocaleConstant.BACKGROUND_COLOR.size) + for (i in 0 until LocaleConstant.BACKGROUND_COLOR.size) { + colorCollection.add( + intArrayOf(LocaleConstant.BACKGROUND_COLOR[i], LocaleConstant.TEXT_COLOR[i]) + ) + } + + val colorArray = colorCollection[Random.nextInt(colorCollection.size)] + return intArrayOf(colorArray[0].convertColor(this), colorArray[1].convertColor(this)) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt deleted file mode 100644 index dd02b42..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/InspectionRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.equipment - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class InspectionRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_equipment_inspection_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 56ba98b..d346545 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,15 +1,19 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentStateChangeModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_state_change_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class StateChangeLogFragment(private val id: String) : KotlinBaseFragment() { @@ -20,37 +24,49 @@ equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { if (it.code == 200) { - val stateLogAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_state_change_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentStateChangeModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无状态变更记录") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_state_change_log_rv_l, it.data ) { - val name = if (item.applyPersonName.isNullOrBlank()) { - "无" - } else { - item.applyPersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentStateChangeModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.stateView, R.color.gray.convertColor(requireContext()) - ) - } + val name = if (item.applyPersonName.isNullOrBlank()) { + "无" + } else { + item.applyPersonName + } - viewHolder.setText(R.id.nameTagView, name.last().toString()) - .setText(R.id.userNameView, name) - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") - .setText(R.id.stateView, item.managerStateName) + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.stateView, R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ).setText(R.id.stateView, item.managerStateName) + } } - } - stateLogRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - stateLogRecyclerView.adapter = stateLogAdapter + stateLogRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + stateLogRecyclerView.adapter = stateLogAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt new file mode 100644 index 0000000..00b028b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.equipment + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class WeeklyRecordFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_equipment_weekly_record + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index dbf1293..2a1a6d5 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -35,6 +35,12 @@ "合同发票", "业务统计", "客户列表", "外场检测" ) val MIME_TYPES = arrayOf(MimeType.DOC, MimeType.DOCX, MimeType.PDF) + val BACKGROUND_COLOR = arrayOf( + R.color.color_A, R.color.color_B, R.color.color_C, R.color.color_D + ) + val TEXT_COLOR = arrayOf( + R.color.textColor_A, R.color.textColor_B, R.color.textColor_C, R.color.textColor_D + ) /** * ============================================================================================= diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 4a7e35c..3e0a290 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -20,7 +20,7 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(InspectionRecordFragment()) + fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml deleted file mode 100644 index 3728533..0000000 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_state_change_log.xml b/app/src/main/res/layout/fragment_equipment_state_change_log.xml index d578419..e39fcbf 100644 --- a/app/src/main/res/layout/fragment_equipment_state_change_log.xml +++ b/app/src/main/res/layout/fragment_equipment_state_change_log.xml @@ -5,9 +5,17 @@ android:layout_height="match_parent" android:background="@color/white"> - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_weekly_record.xml b/app/src/main/res/layout/fragment_equipment_weekly_record.xml new file mode 100644 index 0000000..3728533 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_weekly_record.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_state_change_log_rv_l.xml b/app/src/main/res/layout/item_equipment_state_change_log_rv_l.xml index c5513c8..050eeca 100644 --- a/app/src/main/res/layout/item_equipment_state_change_log_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_state_change_log_rv_l.xml @@ -6,21 +6,16 @@ android:orientation="horizontal" android:padding="@dimen/dp_15"> - - - - +