diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt index dd34228..2f604a4 100644 --- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt @@ -118,7 +118,7 @@ */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { return api.getGuideVideoByPage( - AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT + AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT * 2 ) } diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt index dd34228..2f604a4 100644 --- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt @@ -118,7 +118,7 @@ */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { return api.getGuideVideoByPage( - AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT + AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT * 2 ) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt index ea0e5c9..06e0770 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt @@ -9,6 +9,7 @@ import com.casic.br.ar.app.databinding.ActivityVideoGuideBinding import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.VideoGuideModel +import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.vm.VideoGuideViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -31,9 +32,26 @@ private var dataBeans: MutableList = ArrayList() private var classId = "" private var page = 1 + private var maxPage = 1000 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + if (page == 1) { + "已经是第一页了".show(this) + return@setOnClickListener + } + page-- + getGuideVideoByPage() + } + binding.included.nextPageView.setOnClickListener { + if (page == maxPage) { + "已经是最后一页了".show(this) + return@setOnClickListener + } + page++ + getGuideVideoByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -43,6 +61,8 @@ getGuideVideoByPage() videoGuideViewModel.videosResult.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(2024052401) diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt index dd34228..2f604a4 100644 --- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt @@ -118,7 +118,7 @@ */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { return api.getGuideVideoByPage( - AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT + AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT * 2 ) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt index ea0e5c9..06e0770 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt @@ -9,6 +9,7 @@ import com.casic.br.ar.app.databinding.ActivityVideoGuideBinding import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.VideoGuideModel +import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.vm.VideoGuideViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -31,9 +32,26 @@ private var dataBeans: MutableList = ArrayList() private var classId = "" private var page = 1 + private var maxPage = 1000 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + if (page == 1) { + "已经是第一页了".show(this) + return@setOnClickListener + } + page-- + getGuideVideoByPage() + } + binding.included.nextPageView.setOnClickListener { + if (page == maxPage) { + "已经是最后一页了".show(this) + return@setOnClickListener + } + page++ + getGuideVideoByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -43,6 +61,8 @@ getGuideVideoByPage() videoGuideViewModel.videosResult.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(2024052401) diff --git a/app/src/main/res/layout/activity_video_guide.xml b/app/src/main/res/layout/activity_video_guide.xml index b473864..7ead2a4 100644 --- a/app/src/main/res/layout/activity_video_guide.xml +++ b/app/src/main/res/layout/activity_video_guide.xml @@ -19,8 +19,12 @@ + app:spanCount="5" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt index dd34228..2f604a4 100644 --- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt @@ -118,7 +118,7 @@ */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { return api.getGuideVideoByPage( - AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT + AuthenticationHelper.token, keywords, classId, offset, LocaleConstant.PAGE_LIMIT * 2 ) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt index ea0e5c9..06e0770 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/VideoGuideActivity.kt @@ -9,6 +9,7 @@ import com.casic.br.ar.app.databinding.ActivityVideoGuideBinding import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.VideoGuideModel +import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.vm.VideoGuideViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -31,9 +32,26 @@ private var dataBeans: MutableList = ArrayList() private var classId = "" private var page = 1 + private var maxPage = 1000 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + if (page == 1) { + "已经是第一页了".show(this) + return@setOnClickListener + } + page-- + getGuideVideoByPage() + } + binding.included.nextPageView.setOnClickListener { + if (page == maxPage) { + "已经是最后一页了".show(this) + return@setOnClickListener + } + page++ + getGuideVideoByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -43,6 +61,8 @@ getGuideVideoByPage() videoGuideViewModel.videosResult.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(2024052401) diff --git a/app/src/main/res/layout/activity_video_guide.xml b/app/src/main/res/layout/activity_video_guide.xml index b473864..7ead2a4 100644 --- a/app/src/main/res/layout/activity_video_guide.xml +++ b/app/src/main/res/layout/activity_video_guide.xml @@ -19,8 +19,12 @@ + app:spanCount="5" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_guide_video_g.xml b/app/src/main/res/layout/item_guide_video_g.xml index def131c..4162cd2 100644 --- a/app/src/main/res/layout/item_guide_video_g.xml +++ b/app/src/main/res/layout/item_guide_video_g.xml @@ -7,8 +7,8 @@ android:orientation="vertical"> + android:src="@drawable/ic_standard_pdf" /> + android:textColor="@color/white" + android:textSize="@dimen/sp_12" /> \ No newline at end of file