diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 174f10d..b1e4a6c 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/purple_500" /> @@ -89,25 +84,17 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="申请时间:applyTime" - android:textColor="@color/gray" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> + android:text="1天前" + app:qmui_backgroundColor="@color/red" /> \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8f54fe..f3b368d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 174f10d..b1e4a6c 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/purple_500" /> @@ -89,25 +84,17 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="申请时间:applyTime" - android:textColor="@color/gray" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> + android:text="1天前" + app:qmui_backgroundColor="@color/red" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_customer_lv.xml b/app/src/main/res/layout/item_select_customer_lv.xml index e552239..9d9c0d9 100644 --- a/app/src/main/res/layout/item_select_customer_lv.xml +++ b/app/src/main/res/layout/item_select_customer_lv.xml @@ -29,28 +29,16 @@ + app:qmui_backgroundColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/gray" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 174f10d..b1e4a6c 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/purple_500" /> @@ -89,25 +84,17 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="申请时间:applyTime" - android:textColor="@color/gray" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> + android:text="1天前" + app:qmui_backgroundColor="@color/red" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_customer_lv.xml b/app/src/main/res/layout/item_select_customer_lv.xml index e552239..9d9c0d9 100644 --- a/app/src/main/res/layout/item_select_customer_lv.xml +++ b/app/src/main/res/layout/item_select_customer_lv.xml @@ -29,28 +29,16 @@ + app:qmui_backgroundColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/gray" /> + app:qmui_borderColor="@color/blue" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 174f10d..b1e4a6c 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/purple_500" /> @@ -89,25 +84,17 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="申请时间:applyTime" - android:textColor="@color/gray" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> + android:text="1天前" + app:qmui_backgroundColor="@color/red" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_customer_lv.xml b/app/src/main/res/layout/item_select_customer_lv.xml index e552239..9d9c0d9 100644 --- a/app/src/main/res/layout/item_select_customer_lv.xml +++ b/app/src/main/res/layout/item_select_customer_lv.xml @@ -29,28 +29,16 @@ + app:qmui_backgroundColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/gray" /> + app:qmui_borderColor="@color/blue" /> + app:qmui_borderColor="@color/green" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_borderColor="@color/red" /> + app:qmui_borderColor="@color/blue" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 174f10d..b1e4a6c 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/purple_500" /> @@ -89,25 +84,17 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="申请时间:applyTime" - android:textColor="@color/gray" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> + android:text="1天前" + app:qmui_backgroundColor="@color/red" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_customer_lv.xml b/app/src/main/res/layout/item_select_customer_lv.xml index e552239..9d9c0d9 100644 --- a/app/src/main/res/layout/item_select_customer_lv.xml +++ b/app/src/main/res/layout/item_select_customer_lv.xml @@ -29,28 +29,16 @@ + app:qmui_backgroundColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/gray" /> + app:qmui_borderColor="@color/blue" /> + app:qmui_borderColor="@color/green" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_borderColor="@color/red" /> + app:qmui_borderColor="@color/blue" /> + app:qmui_backgroundColor="@color/blue" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 174f10d..b1e4a6c 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/purple_500" /> @@ -89,25 +84,17 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="申请时间:applyTime" - android:textColor="@color/gray" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> + android:text="1天前" + app:qmui_backgroundColor="@color/red" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_customer_lv.xml b/app/src/main/res/layout/item_select_customer_lv.xml index e552239..9d9c0d9 100644 --- a/app/src/main/res/layout/item_select_customer_lv.xml +++ b/app/src/main/res/layout/item_select_customer_lv.xml @@ -29,28 +29,16 @@ + app:qmui_backgroundColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/gray" /> + app:qmui_borderColor="@color/blue" /> + app:qmui_borderColor="@color/green" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_borderColor="@color/red" /> + app:qmui_borderColor="@color/blue" /> + app:qmui_backgroundColor="@color/blue" /> @@ -45,17 +45,12 @@ + app:qmui_borderColor="@color/themeColor" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index 85a8cb1..ee85e5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -5,14 +5,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.OutfieldDetectionListModel +import com.casic.xz.meterage.view.home.OutfieldDetectionDetailActivity import com.casic.xz.meterage.vm.OutfieldDetectionViewModel 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.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_outfield_detection.* @@ -149,6 +152,7 @@ R.id.applyTimeView, "申请时间:${item.applyTime.formatToYearMonthDay()}" ) + .setText(R.id.overTimeView, "${deltaT / 24}天前") .setText(R.id.directorView, item.director) .setText(R.id.phoneView, item.phone) } @@ -162,7 +166,9 @@ override fun onItemClicked( position: Int, t: OutfieldDetectionListModel.DataModel.RowsModel ) { - + requireContext().navigatePageTo( + addAll(t.id, t.decisionItem) + ) } }) } 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 new file mode 100644 index 0000000..6e5dd53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -0,0 +1,50 @@ +package com.casic.xz.meterage.view.home + +import android.util.Log +import android.view.View +import androidx.fragment.app.Fragment +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* + +class OutfieldDetectionDetailActivity : ApplicationBaseActivity() { + + private val kTag = "OutfieldDetectionDetailActivity" + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") + private var fragmentPages: ArrayList = ArrayList() + private lateinit var args: ArrayList + + override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } + + override fun initData() { + args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + if (args[1].isBlank()) { + approvalView.visibility = View.GONE + } else { + approvalView.visibility = View.VISIBLE + when (args[1]) { + "1" -> approvalView.text = "同意" + "2" -> approvalView.text = "驳回" + "3" -> approvalView.text = "拒绝" + } + } + + Log.d(kTag, "initData => $args") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_outfield_detection_detail.xml b/app/src/main/res/layout/activity_outfield_detection_detail.xml new file mode 100644 index 0000000..0f7331f --- /dev/null +++ b/app/src/main/res/layout/activity_outfield_detection_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_rv_l.xml b/app/src/main/res/layout/item_contract_rv_l.xml index 70d4d29..c510d81 100644 --- a/app/src/main/res/layout/item_contract_rv_l.xml +++ b/app/src/main/res/layout/item_contract_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/themeColor" /> @@ -38,6 +38,7 @@ android:id="@+id/deviceNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:singleLine="true" android:text="校准检定设备" android:textColor="@color/black" @@ -45,17 +46,12 @@ + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_backgroundColor="@color/red" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/green" /> + app:qmui_borderColor="@color/blue" /> + android:layout_height="match_parent" + android:gravity="center_vertical"> + app:qmui_backgroundColor="@color/green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 5051c2e..280ce66 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -37,6 +37,7 @@ android:id="@+id/userNameView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:singleLine="true" android:text="胡书琦" android:textColor="@color/black" @@ -44,17 +45,11 @@ + app:qmui_backgroundColor="@color/green" /> + app:qmui_backgroundColor="@color/green" /> + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> + app:qmui_backgroundColor="@color/purple_500" /> diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 5d1ebca..d27e309 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -24,20 +24,15 @@ + app:qmui_backgroundColor="@color/blue" /> + app:qmui_backgroundColor="@color/green" /> diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 174f10d..b1e4a6c 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -23,16 +23,11 @@ + app:qmui_backgroundColor="@color/purple_500" /> @@ -89,25 +84,17 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="申请时间:applyTime" - android:textColor="@color/gray" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> + android:text="1天前" + app:qmui_backgroundColor="@color/red" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_customer_lv.xml b/app/src/main/res/layout/item_select_customer_lv.xml index e552239..9d9c0d9 100644 --- a/app/src/main/res/layout/item_select_customer_lv.xml +++ b/app/src/main/res/layout/item_select_customer_lv.xml @@ -29,28 +29,16 @@ + app:qmui_backgroundColor="@color/themeColor" /> + app:qmui_backgroundColor="@color/gray" /> + app:qmui_borderColor="@color/blue" /> + app:qmui_borderColor="@color/green" /> + app:qmui_borderColor="@color/themeColor" /> + app:qmui_borderColor="@color/red" /> + app:qmui_borderColor="@color/blue" /> + app:qmui_backgroundColor="@color/blue" /> @@ -45,17 +45,12 @@ + app:qmui_borderColor="@color/themeColor" /> @drawable/button_white_selector + + + + +