diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } 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 43f2894..bc715a9 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 @@ -5,7 +5,9 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.equipment.* +import com.casic.xz.meterage.fragment.equipment.BasicInformationFragment +import com.casic.xz.meterage.fragment.equipment.StateChangeLogFragment +import com.casic.xz.meterage.fragment.equipment.UsageRecordFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_equipment.rootView @@ -20,18 +22,18 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(WeeklyRecordFragment()) +// fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) //TODO 周检记录 检定证书 接口未定 - val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") +// val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") + val equipmentPageTitles = arrayOf("基础信息", "状态变更记录", "使用记录") equipmentViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - equipmentViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(equipmentViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } 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 43f2894..bc715a9 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 @@ -5,7 +5,9 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.equipment.* +import com.casic.xz.meterage.fragment.equipment.BasicInformationFragment +import com.casic.xz.meterage.fragment.equipment.StateChangeLogFragment +import com.casic.xz.meterage.fragment.equipment.UsageRecordFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_equipment.rootView @@ -20,18 +22,18 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(WeeklyRecordFragment()) +// fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) //TODO 周检记录 检定证书 接口未定 - val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") +// val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") + val equipmentPageTitles = arrayOf("基础信息", "状态变更记录", "使用记录") equipmentViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - equipmentViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(equipmentViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 37ef2f1..fdc80ae 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -38,7 +38,6 @@ trainViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - trainViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(trainViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } 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 43f2894..bc715a9 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 @@ -5,7 +5,9 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.equipment.* +import com.casic.xz.meterage.fragment.equipment.BasicInformationFragment +import com.casic.xz.meterage.fragment.equipment.StateChangeLogFragment +import com.casic.xz.meterage.fragment.equipment.UsageRecordFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_equipment.rootView @@ -20,18 +22,18 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(WeeklyRecordFragment()) +// fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) //TODO 周检记录 检定证书 接口未定 - val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") +// val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") + val equipmentPageTitles = arrayOf("基础信息", "状态变更记录", "使用记录") equipmentViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - equipmentViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(equipmentViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 37ef2f1..fdc80ae 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -38,7 +38,6 @@ trainViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - trainViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(trainViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6666d0b..c46802f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,7 +7,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,7 +18,10 @@ class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { private val kTag = "OutfieldDetectionDetailActivity" - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + + //TODO 审批流程 接口未定 +// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -53,7 +55,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) - fragmentPages.add(ApprovalLogFragment()) +// fragmentPages.add(ApprovalLogFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } 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 43f2894..bc715a9 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 @@ -5,7 +5,9 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.equipment.* +import com.casic.xz.meterage.fragment.equipment.BasicInformationFragment +import com.casic.xz.meterage.fragment.equipment.StateChangeLogFragment +import com.casic.xz.meterage.fragment.equipment.UsageRecordFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_equipment.rootView @@ -20,18 +22,18 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(WeeklyRecordFragment()) +// fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) //TODO 周检记录 检定证书 接口未定 - val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") +// val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") + val equipmentPageTitles = arrayOf("基础信息", "状态变更记录", "使用记录") equipmentViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - equipmentViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(equipmentViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 37ef2f1..fdc80ae 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -38,7 +38,6 @@ trainViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - trainViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(trainViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6666d0b..c46802f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,7 +7,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,7 +18,10 @@ class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { private val kTag = "OutfieldDetectionDetailActivity" - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + + //TODO 审批流程 接口未定 +// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -53,7 +55,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) - fragmentPages.add(ApprovalLogFragment()) +// fragmentPages.add(ApprovalLogFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 6c902ab..1783a5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -5,7 +5,10 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.device.* +import com.casic.xz.meterage.fragment.device.BasicInformationFragment +import com.casic.xz.meterage.fragment.device.MeasurementStaffFragment +import com.casic.xz.meterage.fragment.device.SupportEquipmentFragment +import com.casic.xz.meterage.fragment.device.VerifyRegulationFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_standard_device_detail.* @@ -22,13 +25,14 @@ fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) fragmentPages.add(VerifyRegulationFragment(deviceId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + //TODO 检定证书 接口未定 +// val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - deiceViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(deiceViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } 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 43f2894..bc715a9 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 @@ -5,7 +5,9 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.equipment.* +import com.casic.xz.meterage.fragment.equipment.BasicInformationFragment +import com.casic.xz.meterage.fragment.equipment.StateChangeLogFragment +import com.casic.xz.meterage.fragment.equipment.UsageRecordFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_equipment.rootView @@ -20,18 +22,18 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(WeeklyRecordFragment()) +// fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) //TODO 周检记录 检定证书 接口未定 - val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") +// val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") + val equipmentPageTitles = arrayOf("基础信息", "状态变更记录", "使用记录") equipmentViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - equipmentViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(equipmentViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 37ef2f1..fdc80ae 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -38,7 +38,6 @@ trainViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - trainViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(trainViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6666d0b..c46802f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,7 +7,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,7 +18,10 @@ class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { private val kTag = "OutfieldDetectionDetailActivity" - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + + //TODO 审批流程 接口未定 +// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -53,7 +55,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) - fragmentPages.add(ApprovalLogFragment()) +// fragmentPages.add(ApprovalLogFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 6c902ab..1783a5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -5,7 +5,10 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.device.* +import com.casic.xz.meterage.fragment.device.BasicInformationFragment +import com.casic.xz.meterage.fragment.device.MeasurementStaffFragment +import com.casic.xz.meterage.fragment.device.SupportEquipmentFragment +import com.casic.xz.meterage.fragment.device.VerifyRegulationFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_standard_device_detail.* @@ -22,13 +25,14 @@ fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) fragmentPages.add(VerifyRegulationFragment(deviceId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + //TODO 检定证书 接口未定 +// val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - deiceViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(deiceViewPager) } diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml index f71ce73..efb652f 100644 --- a/app/src/main/res/layout/activity_business_statistics.xml +++ b/app/src/main/res/layout/activity_business_statistics.xml @@ -20,8 +20,8 @@ style="@style/taskTopLayoutStyle"> @@ -31,6 +31,8 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:fontFamily="sans-serif-black" + android:gravity="center" + android:singleLine="true" android:text="0" android:textColor="#39ceeb" android:textSize="@dimen/sp_20" /> @@ -50,8 +52,8 @@ style="@style/taskTopLayoutStyle"> @@ -80,8 +82,8 @@ style="@style/taskTopLayoutStyle"> @@ -99,8 +101,8 @@ style="@style/taskTopLayoutStyle"> diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index f3efbee..3469449 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -57,7 +57,6 @@ detectionViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - detectionViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(detectionViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index de8462b..6bb5e9e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -60,7 +60,6 @@ taskViewPager.adapter = SubViewPagerAdapter( childFragmentManager, fragmentPages, samplePageTitles ) - taskViewPager.offscreenPageLimit = samplePageTitles.size //绑定 topTabLayout.setupWithViewPager(taskViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 5c79fe9..f0f57d2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -4,12 +4,14 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_entrust_log.* +import kotlinx.android.synthetic.main.include_empty_view.* class LogRecordFragment(private val entrustId: String) : KotlinBaseFragment() { @@ -20,46 +22,51 @@ entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { if (it.code == 200) { - val logAdapter = object : NormalRecyclerAdapter( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } 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 43f2894..bc715a9 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 @@ -5,7 +5,9 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.equipment.* +import com.casic.xz.meterage.fragment.equipment.BasicInformationFragment +import com.casic.xz.meterage.fragment.equipment.StateChangeLogFragment +import com.casic.xz.meterage.fragment.equipment.UsageRecordFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_equipment.rootView @@ -20,18 +22,18 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(WeeklyRecordFragment()) +// fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) //TODO 周检记录 检定证书 接口未定 - val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") +// val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") + val equipmentPageTitles = arrayOf("基础信息", "状态变更记录", "使用记录") equipmentViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - equipmentViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(equipmentViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 37ef2f1..fdc80ae 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -38,7 +38,6 @@ trainViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - trainViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(trainViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6666d0b..c46802f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,7 +7,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,7 +18,10 @@ class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { private val kTag = "OutfieldDetectionDetailActivity" - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + + //TODO 审批流程 接口未定 +// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -53,7 +55,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) - fragmentPages.add(ApprovalLogFragment()) +// fragmentPages.add(ApprovalLogFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 6c902ab..1783a5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -5,7 +5,10 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.device.* +import com.casic.xz.meterage.fragment.device.BasicInformationFragment +import com.casic.xz.meterage.fragment.device.MeasurementStaffFragment +import com.casic.xz.meterage.fragment.device.SupportEquipmentFragment +import com.casic.xz.meterage.fragment.device.VerifyRegulationFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_standard_device_detail.* @@ -22,13 +25,14 @@ fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) fragmentPages.add(VerifyRegulationFragment(deviceId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + //TODO 检定证书 接口未定 +// val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - deiceViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(deiceViewPager) } diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml index f71ce73..efb652f 100644 --- a/app/src/main/res/layout/activity_business_statistics.xml +++ b/app/src/main/res/layout/activity_business_statistics.xml @@ -20,8 +20,8 @@ style="@style/taskTopLayoutStyle"> @@ -31,6 +31,8 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:fontFamily="sans-serif-black" + android:gravity="center" + android:singleLine="true" android:text="0" android:textColor="#39ceeb" android:textSize="@dimen/sp_20" /> @@ -50,8 +52,8 @@ style="@style/taskTopLayoutStyle"> @@ -80,8 +82,8 @@ style="@style/taskTopLayoutStyle"> @@ -99,8 +101,8 @@ style="@style/taskTopLayoutStyle"> diff --git a/app/src/main/res/layout/fragment_entrust_log.xml b/app/src/main/res/layout/fragment_entrust_log.xml index f5c09cf..b8cbdf5 100644 --- a/app/src/main/res/layout/fragment_entrust_log.xml +++ b/app/src/main/res/layout/fragment_entrust_log.xml @@ -3,7 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/white" + android:orientation="vertical"> + + ( - R.layout.item_entrust_log_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: LogDetailModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该委托需求暂无操作记录") + } else { + emptyView.hide() + val logAdapter = object : NormalRecyclerAdapter( + R.layout.item_entrust_log_rv_l, it.data ) { - when (position) { - 0 -> { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LogDetailModel.DataModel + ) { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) - viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.ic_dot_red) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_red + ) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot_gray + ) + } + else -> { + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.ic_dot + ) + } } - it.data.size - 1 -> { - viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot_gray - ) - } - else -> { - viewHolder.setImageResource( - R.id.tagImageView, R.drawable.ic_dot - ) - } + + viewHolder.setText(R.id.statusView, item.dealType) + .setText(R.id.operatorNameView, item.createUserName) + .setText(R.id.remarkView, item.recordContent) + .setText(R.id.operateTimeView, item.createTime) } - - viewHolder.setText(R.id.statusView, item.dealType) - .setText(R.id.operatorNameView, item.createUserName) - .setText(R.id.remarkView, item.recordContent) - .setText(R.id.operateTimeView, item.createTime) } + logRecyclerView.adapter = logAdapter } - logRecyclerView.adapter = logAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt index 475e8a3..d5fb358 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -4,49 +4,56 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionDetailModel 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 kotlinx.android.synthetic.main.fragment_od_task_device.* +import kotlinx.android.synthetic.main.include_empty_view.* class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { override fun initData() { - val supportAdapter = object : - NormalRecyclerAdapter( - R.layout.item_device_support_rv_l, devices.toMutableList() - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel - ) { - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.red.convertColor(requireContext()) - ) - } else { - viewHolder.setTextColor( - R.id.expirationDateView, R.color.gray.convertColor(requireContext()) - ) - } + if (devices.isEmpty()) { + emptyView.showEmptyPage("该检测任务暂无设备信息") + } else { + emptyView.hide() + val supportAdapter = object : + NormalRecyclerAdapter( + R.layout.item_device_support_rv_l, devices.toMutableList() + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: OutfieldDetectionDetailModel.DataModel.EquipmentInfoListModel + ) { + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.expirationDateView, R.color.gray.convertColor(requireContext()) + ) + } - viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) - .setText(R.id.deviceNameView, item.equipmentName) - .setText(R.id.modelView, item.modelNo) - .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") - .setText( - R.id.expirationDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) + viewHolder.setText(R.id.nameTagView, item.equipmentName.last().toString()) + .setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号：${item.equipmentNo}") + .setText( + R.id.expirationDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + } } + supportRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + supportRecyclerView.adapter = supportAdapter } - supportRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - supportRecyclerView.adapter = supportAdapter } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt index 4a95805..09ce2fa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/BigImageActivity.kt @@ -43,7 +43,6 @@ pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") imagePagerView.adapter = BigImageAdapter(this, urls) imagePagerView.currentItem = index - imagePagerView.offscreenPageLimit = imageSize imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 0e48703..ba764dc 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -79,7 +79,6 @@ false } mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt index 18dfd9f..103ad29 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt @@ -49,10 +49,18 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.remindEquipmentCount.observe(this) { - equipOvertimeCountView.text = it.toString() + equipOvertimeCountView.text = if (it > 99) { + "99+" + } else { + it.toString() + } } equipmentViewModel.remindDeviceCount.observe(this) { - deviceOvertimeCountView.text = it.toString() + deviceOvertimeCountView.text = if (it > 999) { + "99+" + } else { + it.toString() + } } weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt index 0e55e51..8a557d3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -9,7 +9,6 @@ import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment -import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -45,14 +44,17 @@ certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + //TODO 异常报告接口未定 fragmentPages.add(BasicInformationFragment(args[1])) val pageTitles = if (args[0] == "草稿箱") { - arrayOf("基础信息", "异常报告") +// arrayOf("基础信息", "异常报告") + arrayOf("基础信息") } else { fragmentPages.add(ApprovalProcessFragment(args[3])) - arrayOf("基础信息", "审批流程", "异常报告") +// arrayOf("基础信息", "审批流程", "异常报告") + arrayOf("基础信息", "审批流程") } - fragmentPages.add(ExceptionReportFragment()) +// fragmentPages.add(ExceptionReportFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt index 0681d55..6a77ca7 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt @@ -47,7 +47,6 @@ contractViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - contractViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(contractViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index e2ded84..0d82baa 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -45,7 +45,6 @@ customerViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - customerViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(customerViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index b2e3329..11c979c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -52,7 +52,6 @@ entrustViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, entrustPageTitles ) - entrustViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(entrustViewPager) } 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 43f2894..bc715a9 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 @@ -5,7 +5,9 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.equipment.* +import com.casic.xz.meterage.fragment.equipment.BasicInformationFragment +import com.casic.xz.meterage.fragment.equipment.StateChangeLogFragment +import com.casic.xz.meterage.fragment.equipment.UsageRecordFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_equipment.rootView @@ -20,18 +22,18 @@ val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!! fragmentPages.add(BasicInformationFragment(equipmentId)) - fragmentPages.add(WeeklyRecordFragment()) +// fragmentPages.add(WeeklyRecordFragment()) fragmentPages.add(StateChangeLogFragment(equipmentId)) fragmentPages.add(UsageRecordFragment(equipmentId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) //TODO 周检记录 检定证书 接口未定 - val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") +// val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") + val equipmentPageTitles = arrayOf("基础信息", "状态变更记录", "使用记录") equipmentViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, equipmentPageTitles ) - equipmentViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(equipmentViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 37ef2f1..fdc80ae 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -38,7 +38,6 @@ trainViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - trainViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(trainViewPager) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6666d0b..c46802f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,7 +7,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,7 +18,10 @@ class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { private val kTag = "OutfieldDetectionDetailActivity" - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + + //TODO 审批流程 接口未定 +// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -53,7 +55,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) - fragmentPages.add(ApprovalLogFragment()) +// fragmentPages.add(ApprovalLogFragment()) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 6c902ab..1783a5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -5,7 +5,10 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.fragment.device.* +import com.casic.xz.meterage.fragment.device.BasicInformationFragment +import com.casic.xz.meterage.fragment.device.MeasurementStaffFragment +import com.casic.xz.meterage.fragment.device.SupportEquipmentFragment +import com.casic.xz.meterage.fragment.device.VerifyRegulationFragment import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_standard_device_detail.* @@ -22,13 +25,14 @@ fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) fragmentPages.add(VerifyRegulationFragment(deviceId)) - fragmentPages.add(CertificateFragment()) +// fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + //TODO 检定证书 接口未定 +// val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) - deiceViewPager.offscreenPageLimit = fragmentPages.size //绑定 topTabLayout.setupWithViewPager(deiceViewPager) } diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml index f71ce73..efb652f 100644 --- a/app/src/main/res/layout/activity_business_statistics.xml +++ b/app/src/main/res/layout/activity_business_statistics.xml @@ -20,8 +20,8 @@ style="@style/taskTopLayoutStyle"> @@ -31,6 +31,8 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:fontFamily="sans-serif-black" + android:gravity="center" + android:singleLine="true" android:text="0" android:textColor="#39ceeb" android:textSize="@dimen/sp_20" /> @@ -50,8 +52,8 @@ style="@style/taskTopLayoutStyle"> @@ -80,8 +82,8 @@ style="@style/taskTopLayoutStyle"> @@ -99,8 +101,8 @@ style="@style/taskTopLayoutStyle"> diff --git a/app/src/main/res/layout/fragment_entrust_log.xml b/app/src/main/res/layout/fragment_entrust_log.xml index f5c09cf..b8cbdf5 100644 --- a/app/src/main/res/layout/fragment_entrust_log.xml +++ b/app/src/main/res/layout/fragment_entrust_log.xml @@ -3,7 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/white" + android:orientation="vertical"> + + + android:background="@color/white" + android:orientation="vertical"> + +