diff --git a/.idea/.gitignore b/.idea/.gitignore index 64f5224..7bfc4ca 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -3,3 +3,4 @@ /workspace.xml /codeStyles +/deploymentTargetDropDown.xml diff --git a/.idea/.gitignore b/.idea/.gitignore index 64f5224..7bfc4ca 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -3,3 +3,4 @@ /workspace.xml /codeStyles +/deploymentTargetDropDown.xml diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt index da63560..90eb1ea 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -8,6 +8,7 @@ import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.vm.HiddenTroubleViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -28,9 +29,26 @@ private var sceneCode = "" private var dataBeans: MutableList = ArrayList() private var page = 1 + private var maxPage = 1000 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + if (page == 1) { + "已经是第一页了".show(this) + return@setOnClickListener + } + page-- + getHiddenTroubleByScene() + } + binding.included.nextPageView.setOnClickListener { + if (page == maxPage) { + "已经是最后一页了".show(this) + return@setOnClickListener + } + page++ + getHiddenTroubleByScene() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -44,6 +62,8 @@ getHiddenTroubleByScene() hiddenTroubleViewModel.troublesResult.observe(this) { if (it.code == 200) { + maxPage = it.data.total / LocaleConstant.PAGE_LIMIT + binding.included.currentPageView.text = "$page/${maxPage}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052701) diff --git a/.idea/.gitignore b/.idea/.gitignore index 64f5224..7bfc4ca 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -3,3 +3,4 @@ /workspace.xml /codeStyles +/deploymentTargetDropDown.xml diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt index da63560..90eb1ea 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -8,6 +8,7 @@ import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.vm.HiddenTroubleViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -28,9 +29,26 @@ private var sceneCode = "" private var dataBeans: MutableList = ArrayList() private var page = 1 + private var maxPage = 1000 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + if (page == 1) { + "已经是第一页了".show(this) + return@setOnClickListener + } + page-- + getHiddenTroubleByScene() + } + binding.included.nextPageView.setOnClickListener { + if (page == maxPage) { + "已经是最后一页了".show(this) + return@setOnClickListener + } + page++ + getHiddenTroubleByScene() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -44,6 +62,8 @@ getHiddenTroubleByScene() hiddenTroubleViewModel.troublesResult.observe(this) { if (it.code == 200) { + maxPage = it.data.total / LocaleConstant.PAGE_LIMIT + binding.included.currentPageView.text = "$page/${maxPage}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052701) diff --git a/app/src/main/res/layout/activity_scene_hidden_trouble.xml b/app/src/main/res/layout/activity_scene_hidden_trouble.xml index de84111..778e69d 100644 --- a/app/src/main/res/layout/activity_scene_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_scene_hidden_trouble.xml @@ -82,9 +82,12 @@ + + \ No newline at end of file