diff --git a/app/build.gradle b/app/build.gradle index 536d5ac6c6..7d01b75284 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,8 +109,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 @@ -129,8 +127,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 @@ -149,8 +145,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 @@ -169,8 +163,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 @@ -189,8 +181,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' // 是否支持查询导航目的地车友 @@ -209,8 +199,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' // 是否支持查询导航目的地车友 @@ -229,8 +217,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 @@ -249,8 +235,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 @@ -269,8 +253,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' // 是否支持查询导航目的地车友 @@ -289,8 +271,6 @@ android { manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.bydautoIndependentApiValue] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' // 是否支持查询导航目的地车友 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 814a846509..3be1e1ba10 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,5 +1,6 @@ package com.mogo.module.guide.guide +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -7,6 +8,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.* +import kotlinx.android.synthetic.main.module_guide_item_stage_four.* class GuideStageFiveFragment : MvpFragment> { @@ -25,7 +28,9 @@ class GuideStageFiveFragment : MvpFragment> { } override fun initViews() { - + if(!DebugConfig.isLauncher()){ + moduleGuidePageFive.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_five) + } } override fun onResume() { 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 5770e9a986..d207097fc7 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,5 +1,6 @@ package com.mogo.module.guide.guide +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -7,6 +8,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_four.* +import kotlinx.android.synthetic.main.module_guide_item_stage_three.* class GuideStageFourFragment : MvpFragment> { @@ -25,7 +28,9 @@ class GuideStageFourFragment : MvpFragment> { } override fun initViews() { - + if(!DebugConfig.isLauncher()){ + moduleGuidePageFour.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_four) + } } override fun onResume() { 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 93a9f606c4..eb7ba93654 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,5 +1,6 @@ package com.mogo.module.guide.guide +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -7,6 +8,7 @@ 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_one.* class GuideStageOneFragment : MvpFragment> { @@ -27,6 +29,9 @@ class GuideStageOneFragment : MvpFragment> { override fun initViews() { containerFragment?.visibleRight() + if(!DebugConfig.isLauncher()){ + moduleGuidePageOne.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_one) + } } override fun onResume() { 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 f8cb5fdcc3..701250634e 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,5 +1,6 @@ package com.mogo.module.guide.guide +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -7,6 +8,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_three.* +import kotlinx.android.synthetic.main.module_guide_item_stage_two.* class GuideStageThreeFragment : MvpFragment> { @@ -25,7 +28,9 @@ class GuideStageThreeFragment : MvpFragment> { } override fun initViews() { - + if(!DebugConfig.isLauncher()){ + moduleGuidePageThree.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_three) + } } override fun onResume() { 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 862148061c..ec4c348998 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,5 +1,6 @@ package com.mogo.module.guide.guide +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -7,6 +8,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_one.* +import kotlinx.android.synthetic.main.module_guide_item_stage_two.* class GuideStageTwoFragment : MvpFragment> { @@ -25,7 +28,9 @@ class GuideStageTwoFragment : MvpFragment> { } override fun initViews() { - + if(!DebugConfig.isLauncher()){ + moduleGuidePageTwo.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_two) + } } override fun onResume() { 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 586f730d9b..a7842257a8 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,7 +1,8 @@ + android:background="@mipmap/module_guide_item_stage_five_launcher"> \ 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 69c79b5c8c..a0a61c5541 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 @@ -1,6 +1,7 @@ + android:background="@mipmap/module_guide_item_stage_four_launcher"> \ 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 b1115882b3..217f6c1c9c 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,8 +1,9 @@ + android:background="@mipmap/module_guide_item_stage_one_launcher"> \ 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 52de1ceff2..7721a4fde7 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 @@ -1,6 +1,7 @@ + android:background="@mipmap/module_guide_item_stage_three_launcher"> \ 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 4e402f8994..4c79d09447 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 @@ -1,6 +1,7 @@ + android:background="@mipmap/module_guide_item_stage_two_launcher"> \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_five.png b/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_five_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_five.png rename to modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_five_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_four.png b/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_four_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_four.png rename to modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_four_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_one.png b/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_one_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_one.png rename to modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_one_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three.png b/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three.png rename to modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_two.png b/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_two_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_two.png rename to modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_two_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_five.png b/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_five_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_five.png rename to modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_five_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_four.png b/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_four_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_four.png rename to modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_four_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_one.png b/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_one_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_one.png rename to modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_one_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_three.png b/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_three_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_three.png rename to modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_three_launcher.png diff --git a/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_two.png b/modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_two_launcher.png similarity index 100% rename from modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_two.png rename to modules/mogo-module-guide/src/main/res/mipmap-xhdpi/module_guide_item_stage_two_launcher.png