diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 79acb39060..084326da6e 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -261,4 +261,10 @@ public class DebugConfig { public static boolean isLoadGuideModule() { return sLoadGuideModule; } + + private static String SP_GUIDE = "SP_GUIDE_2020_09_09"; + + public static String getSpGuide(){ + return SP_GUIDE; + } } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt index d585622cde..6418cae142 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt @@ -1,12 +1,12 @@ package com.mogo.module.authorize.util import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.debug.DebugConfig.getSpGuide import com.mogo.utils.storage.SharedPrefsMgr object SharedPreferenceUtil { private const val HAS_AUTH = "HAS_AUTH" - private const val HAS_GUIDE = "HAS_GUIDE" private const val AUTHORIZE_UPDATE_TIME = "AUTHORIZE_UPDATE_TIME" fun needAuthorization(type: Int): Boolean { @@ -30,6 +30,6 @@ object SharedPreferenceUtil { } fun hasGuide(): Boolean { - return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(HAS_GUIDE, false) + return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(getSpGuide(), false) } } \ No newline at end of file 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 bf596646f4..4bc53f8531 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,6 +1,8 @@ package com.mogo.module.guide.fragment +import android.view.View import androidx.recyclerview.widget.RecyclerView +import androidx.viewpager2.widget.ViewPager2 import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.GuideBizManager @@ -10,6 +12,7 @@ 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.* +import kotlinx.android.synthetic.main.module_guide_item_include.* class GuideFragment : MvpFragment(), GuideConstract.View { @@ -34,10 +37,36 @@ class GuideFragment : MvpFragment(), GuideC 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)) + .setSliderWidth(context!!.resources.getDimension(R.dimen.dp_22)) .setSlideMode(IndicatorSlideMode.NORMAL) .setIndicatorStyle(IndicatorStyle.CIRCLE) .setupWithViewPager(moduleGuideViewPager) + visibleRight() + module_guide_page_left.setOnClickListener { + moveToBack() + } + module_guide_page_right.setOnClickListener { + moveToNext() + } + module_guide_tv_jump.setOnClickListener { + closeGuideFragment() + } + } + + fun visibleLeft(){ + module_guide_page_left.visibility = View.VISIBLE + } + + fun invisibleLeft(){ + module_guide_page_left.visibility = View.GONE + } + + fun visibleRight(){ + module_guide_page_right.visibility = View.VISIBLE + } + + fun invisibleRight(){ + module_guide_page_right.visibility = View.GONE } fun moveToNext() { @@ -47,10 +76,10 @@ class GuideFragment : MvpFragment(), GuideC } } - fun moveToBack() { + private fun moveToBack() { val count = adapter?.itemCount val backCount = moduleGuideViewPager.currentItem - 1 - if (moduleGuideViewPager.currentItem != count && backCount != 0) { + if (moduleGuideViewPager.currentItem != count) { moduleGuideViewPager.currentItem = backCount } } 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 50da098a41..2598e06f6c 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 @@ -1,6 +1,5 @@ package com.mogo.module.guide.guide -import android.view.View import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -8,9 +7,8 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.speak -import kotlinx.android.synthetic.main.module_guide_item_stage_five.* -class GuideStageFiveFragment : MvpFragment>, View.OnClickListener { +class GuideStageFiveFragment : MvpFragment> { private var containerFragment: GuideFragment? = null @@ -27,30 +25,19 @@ 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 { + containerFragment?.invisibleRight() + speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_five), object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.closeGuideFragment() } }) } - override fun onClick(v: View) { - when (v.id) { - R.id.module_guide_page_left -> { - containerFragment?.moveToBack() - } - R.id.module_guide_tv_jump -> { - containerFragment?.closeGuideFragment() - } - } - } - class GuideLocationPresenter : Presenter { constructor(view: IView?) : super(view) 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 3af2541b61..fe9a84a81d 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 @@ -1,6 +1,5 @@ package com.mogo.module.guide.guide -import android.view.View import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -8,9 +7,8 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.speak -import kotlinx.android.synthetic.main.module_guide_item_include.* -class GuideStageFourFragment : MvpFragment>, View.OnClickListener { +class GuideStageFourFragment : MvpFragment> { private var containerFragment: GuideFragment? = null @@ -27,34 +25,19 @@ class GuideStageFourFragment : MvpFragment>, View.OnClic } override fun initViews() { - 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 { + containerFragment?.visibleRight() + speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_four), object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() } }) } - override fun onClick(v: View) { - when (v.id) { - R.id.module_guide_page_left -> { - containerFragment?.moveToBack() - } - R.id.module_guide_page_right -> { - containerFragment?.moveToNext() - } - R.id.module_guide_tv_jump -> { - containerFragment?.closeGuideFragment() - } - } - } - class GuideNavigationPresenter : Presenter { constructor(view: IView?) : super(view) 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 4a288fbb1c..a4c572b32a 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 @@ -1,6 +1,5 @@ package com.mogo.module.guide.guide -import android.view.View import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -10,10 +9,9 @@ import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.AnalyticsUtil import com.mogo.module.guide.util.AnalyticsUtil.INVOKE_TRACK_SHOW import com.mogo.module.guide.util.speak -import kotlinx.android.synthetic.main.module_guide_item_stage_one.* -class GuideStageOneFragment : MvpFragment>, View.OnClickListener { +class GuideStageOneFragment : MvpFragment> { private var containerFragment: GuideFragment? = null @@ -31,30 +29,19 @@ class GuideStageOneFragment : MvpFragment>, View.OnClick override fun initViews() { AnalyticsUtil.track(INVOKE_TRACK_SHOW, hashMapOf("pages_num" to 1)) - module_guide_page_right.setOnClickListener(this) - module_guide_tv_jump.setOnClickListener(this) + containerFragment?.visibleRight() } override fun onResume() { super.onResume() - speak(context!!,context!!.resources.getString(R.string.module_guide_voice_page_one),object : IMogoVoiceCmdCallBack { + containerFragment?.invisibleLeft() + speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_one), object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() } }) } - override fun onClick(v: View) { - when (v.id) { - R.id.module_guide_page_right -> { - containerFragment?.moveToNext() - } - R.id.module_guide_tv_jump -> { - containerFragment?.closeGuideFragment() - } - } - } - class GuideStartPresenter : Presenter { constructor(view: IView?) : super(view) 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 6dc6a4ac4a..853c04a47c 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 @@ -1,6 +1,5 @@ package com.mogo.module.guide.guide -import android.view.View import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -8,9 +7,8 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.speak -import kotlinx.android.synthetic.main.module_guide_item_include.* -class GuideStageThreeFragment : MvpFragment>, View.OnClickListener { +class GuideStageThreeFragment : MvpFragment> { private var containerFragment: GuideFragment? = null @@ -27,34 +25,18 @@ class GuideStageThreeFragment : MvpFragment>, View.OnCli } override fun initViews() { - 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 { + speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_three), object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() } }) } - override fun onClick(v: View) { - when (v.id) { - R.id.module_guide_page_left -> { - containerFragment?.moveToBack() - } - R.id.module_guide_page_right -> { - containerFragment?.moveToNext() - } - R.id.module_guide_tv_jump -> { - containerFragment?.closeGuideFragment() - } - } - } - class GuideOnLineCarPresenter : Presenter { constructor(view: IView?) : super(view) 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 23a59b8afc..10700d5969 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 @@ -1,6 +1,5 @@ package com.mogo.module.guide.guide -import android.view.View import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -8,9 +7,8 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.module.guide.R import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.speak -import kotlinx.android.synthetic.main.module_guide_item_include.* -class GuideStageTwoFragment : MvpFragment>, View.OnClickListener { +class GuideStageTwoFragment : MvpFragment> { private var containerFragment: GuideFragment? = null @@ -27,34 +25,19 @@ class GuideStageTwoFragment : MvpFragment>, View.OnClick } override fun initViews() { - 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 { + containerFragment?.visibleLeft() + speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_two), object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { containerFragment?.moveToNext() } }) } - override fun onClick(v: View) { - when (v.id) { - R.id.module_guide_page_left -> { - containerFragment?.moveToBack() - } - R.id.module_guide_page_right -> { - containerFragment?.moveToNext() - } - R.id.module_guide_tv_jump -> { - containerFragment?.closeGuideFragment() - } - } - } - class GuideCardPresenter : Presenter { constructor(view: IView?) : super(view) diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/SharedPreferenceUtil.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/SharedPreferenceUtil.kt index 5a1fcb87e3..e34e5b0bbf 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/SharedPreferenceUtil.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/SharedPreferenceUtil.kt @@ -1,18 +1,17 @@ package com.mogo.module.guide.util import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.debug.DebugConfig import com.mogo.utils.storage.SharedPrefsMgr object SharedPreferenceUtil { - const val HAS_GUIDE = "HAS_GUIDE" - fun hasGuide(): Boolean { - return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(HAS_GUIDE, false) + return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(DebugConfig.getSpGuide(), false) } fun setGuideFinish() { - SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putBoolean(HAS_GUIDE, true) + SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putBoolean(DebugConfig.getSpGuide(), true) } } \ No newline at end of file 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 40809dd6ff..c0ab9b03e5 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 @@ -21,4 +21,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> + + \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml index fafcf06a94..3db0f73706 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml @@ -9,6 +9,7 @@ android:layout_width="@dimen/dp_52" android:layout_height="@dimen/dp_87" android:layout_marginRight="@dimen/dp_92" + android:visibility="gone" android:src="@mipmap/module_guide_right_page" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -19,6 +20,7 @@ android:layout_width="@dimen/dp_52" android:layout_height="@dimen/dp_87" android:layout_marginLeft="@dimen/dp_92" + android:visibility="gone" android:src="@mipmap/module_guide_left_page" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_five.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_five.xml index 1e697fcb8d..586f730d9b 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_five.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_five.xml @@ -1,31 +1,7 @@ - - - \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_four.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_four.xml index 6cc75dab99..69c79b5c8c 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_four.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_four.xml @@ -3,8 +3,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@mipmap/module_guide_item_stage_four"> - - \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_one.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_one.xml index 02c4191b75..b1115882b3 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_one.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_one.xml @@ -1,31 +1,8 @@ - - \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_three.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_three.xml index 695c9c539e..52de1ceff2 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_three.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_three.xml @@ -3,8 +3,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@mipmap/module_guide_item_stage_three"> - - \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_two.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_two.xml index 14ef76dd79..4e402f8994 100644 --- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_two.xml +++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_two.xml @@ -3,8 +3,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@mipmap/module_guide_item_stage_two"> - - \ 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 1620e6c437..5405f26c5a 100644 --- a/modules/mogo-module-guide/src/main/res/values/color.xml +++ b/modules/mogo-module-guide/src/main/res/values/color.xml @@ -1,6 +1,6 @@ #3B91FF - #ccffffff + #33ffffff #ffffff \ No newline at end of file diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index c18301d8de..15b69e9ce3 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -35,6 +35,8 @@ import org.json.JSONObject; import java.util.List; +import static com.mogo.commons.debug.DebugConfig.getSpGuide; + /** * @author congtaowang * @since 2020-03-10 @@ -79,7 +81,7 @@ public class MogoADASController implements IMogoADASController { // TODO: 2020/9/4 和引导模块交互 if ( DebugConfig.isLoadGuideModule() ) { - if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( "HAS_GUIDE", false ) ) { + if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) { return; } }