From 52ea58f2f56819140a2153d982192a14b5182f5c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 8 Sep 2020 16:46:20 +0800 Subject: [PATCH] add indicator --- config.gradle | 1 + modules/mogo-module-guide/build.gradle | 1 + .../com/mogo/module/guide/fragment/GuideFragment.kt | 10 ++++++++++ .../mogo/module/guide/guide/GuideStageFiveFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageFourFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageOneFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageThreeFragment.kt | 4 ++++ .../mogo/module/guide/guide/GuideStageTwoFragment.kt | 4 ++++ .../src/main/res/layout/module_guide_fragment.xml | 9 +++++++++ .../mogo-module-guide/src/main/res/values/color.xml | 2 ++ 10 files changed, 43 insertions(+) diff --git a/config.gradle b/config.gradle index 0a9540a611..f69f3e2397 100644 --- a/config.gradle +++ b/config.gradle @@ -84,6 +84,7 @@ targetSdkVersion : 22, // material material : 'com.google.android.material:material:1.1.0', + indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4', // modules moduletanlu : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}", diff --git a/modules/mogo-module-guide/build.gradle b/modules/mogo-module-guide/build.gradle index bc18471261..44fa50b8ed 100644 --- a/modules/mogo-module-guide/build.gradle +++ b/modules/mogo-module-guide/build.gradle @@ -52,6 +52,7 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.aspectj + implementation rootProject.ext.dependencies.indicator if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt index b9fbdb5303..bf596646f4 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt @@ -1,13 +1,17 @@ package com.mogo.module.guide.fragment +import androidx.recyclerview.widget.RecyclerView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.GuideBizManager import com.mogo.module.guide.R import com.mogo.module.guide.util.speak import com.mogo.utils.logger.Logger +import com.zhpan.indicator.enums.IndicatorSlideMode +import com.zhpan.indicator.enums.IndicatorStyle import kotlinx.android.synthetic.main.module_guide_fragment.* + class GuideFragment : MvpFragment(), GuideConstract.View { companion object { @@ -28,6 +32,12 @@ class GuideFragment : MvpFragment(), GuideC Logger.d(TAG, "init Views") adapter = GuideAdapter(this) moduleGuideViewPager.adapter = adapter + (moduleGuideViewPager.getChildAt(0) as RecyclerView).layoutManager!!.isItemPrefetchEnabled = false + moduleGuideIndicator.setSliderColor(context!!.resources.getColor(R.color.module_guide_indicator_dark),context!!.resources.getColor(R.color.module_guide_indicator_white)) + .setSliderWidth(context!!.resources.getDimension(R.dimen.dp_11)) + .setSlideMode(IndicatorSlideMode.NORMAL) + .setIndicatorStyle(IndicatorStyle.CIRCLE) + .setupWithViewPager(moduleGuideViewPager) } fun moveToNext() { diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt index 9b2313a63f..50da098a41 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt @@ -29,6 +29,10 @@ class GuideStageFiveFragment : MvpFragment>, View.OnClic override fun initViews() { module_guide_page_left.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_five),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.closeGuideFragment() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt index 23730d54d6..3af2541b61 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt @@ -30,6 +30,10 @@ class GuideStageFourFragment : MvpFragment>, View.OnClic module_guide_page_left.setOnClickListener(this) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_four),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt index 1f92a4ad19..4a288fbb1c 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt @@ -33,6 +33,10 @@ class GuideStageOneFragment : MvpFragment>, View.OnClick AnalyticsUtil.track(INVOKE_TRACK_SHOW, hashMapOf("pages_num" to 1)) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_one),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt index 47c22aa36b..6dc6a4ac4a 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt @@ -30,6 +30,10 @@ class GuideStageThreeFragment : MvpFragment>, View.OnCli module_guide_page_left.setOnClickListener(this) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_three),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt index d103ac8ed9..23a59b8afc 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt @@ -30,6 +30,10 @@ class GuideStageTwoFragment : MvpFragment>, View.OnClick module_guide_page_left.setOnClickListener(this) module_guide_page_right.setOnClickListener(this) module_guide_tv_jump.setOnClickListener(this) + } + + override fun onResume() { + super.onResume() speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_two),object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml index d8c3c419fb..40809dd6ff 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_fragment.xml @@ -12,4 +12,13 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/values/color.xml b/modules/mogo-module-guide/src/main/res/values/color.xml index 7ee5cd71b6..1620e6c437 100644 --- a/modules/mogo-module-guide/src/main/res/values/color.xml +++ b/modules/mogo-module-guide/src/main/res/values/color.xml @@ -1,4 +1,6 @@ #3B91FF + #ccffffff + #ffffff \ No newline at end of file