From 94fab70704a4309cd24c611197e2f210ff733ad4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Sep 2020 19:58:22 +0800 Subject: [PATCH 1/5] fix bug --- app/build.gradle | 20 ------------------ .../guide/guide/GuideStageFiveFragment.kt | 7 +++++- .../guide/guide/GuideStageFourFragment.kt | 7 +++++- .../guide/guide/GuideStageOneFragment.kt | 5 +++++ .../guide/guide/GuideStageThreeFragment.kt | 7 +++++- .../guide/guide/GuideStageTwoFragment.kt | 7 +++++- .../layout/module_guide_item_stage_five.xml | 3 ++- .../layout/module_guide_item_stage_four.xml | 3 ++- .../layout/module_guide_item_stage_one.xml | 3 ++- .../layout/module_guide_item_stage_three.xml | 3 ++- .../layout/module_guide_item_stage_two.xml | 3 ++- ...module_guide_item_stage_five_launcher.png} | Bin ...module_guide_item_stage_four_launcher.png} | Bin ... module_guide_item_stage_one_launcher.png} | Bin ...odule_guide_item_stage_three_launcher.png} | Bin ... module_guide_item_stage_two_launcher.png} | Bin ...module_guide_item_stage_five_launcher.png} | Bin ...module_guide_item_stage_four_launcher.png} | Bin ... module_guide_item_stage_one_launcher.png} | Bin ...odule_guide_item_stage_three_launcher.png} | Bin ... module_guide_item_stage_two_launcher.png} | Bin 21 files changed, 39 insertions(+), 29 deletions(-) rename modules/mogo-module-guide/src/main/res/mipmap-mdpi/{module_guide_item_stage_five.png => module_guide_item_stage_five_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-mdpi/{module_guide_item_stage_four.png => module_guide_item_stage_four_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-mdpi/{module_guide_item_stage_one.png => module_guide_item_stage_one_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-mdpi/{module_guide_item_stage_three.png => module_guide_item_stage_three_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-mdpi/{module_guide_item_stage_two.png => module_guide_item_stage_two_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-xhdpi/{module_guide_item_stage_five.png => module_guide_item_stage_five_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-xhdpi/{module_guide_item_stage_four.png => module_guide_item_stage_four_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-xhdpi/{module_guide_item_stage_one.png => module_guide_item_stage_one_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-xhdpi/{module_guide_item_stage_three.png => module_guide_item_stage_three_launcher.png} (100%) rename modules/mogo-module-guide/src/main/res/mipmap-xhdpi/{module_guide_item_stage_two.png => module_guide_item_stage_two_launcher.png} (100%) 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 From b61e5903aaca0d95dd5af3822dd5711c19c844c7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Sep 2020 20:03:54 +0800 Subject: [PATCH 2/5] fix bug --- .../authprovider/module/MogoModuleAuthorize.kt | 3 +-- .../java/com/mogo/module/authorize/util/DeviceUtil.kt | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt index c6061c6e64..33361ceba2 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt @@ -6,7 +6,6 @@ import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeManagerImpl import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeRegisterHandler import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow import com.mogo.module.authorize.util.SharedPreferenceUtil -import com.mogo.module.authorize.util.isDeviceOfD import com.mogo.service.module.IMogoModuleProvider class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMogoAuthorizeModuleProvider { @@ -22,7 +21,7 @@ class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IM } override fun invokeAuthorization(tag: String) { - if(isDeviceOfD() && !SharedPreferenceUtil.hasGuide()){ + if(!SharedPreferenceUtil.hasGuide()){ val guideService = ARouter.getInstance().build("/guide/showFragment").navigation() if(guideService is IMogoModuleProvider){ guideService.init(AbsMogoApplication.getApp().applicationContext) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt deleted file mode 100644 index 8884512894..0000000000 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.mogo.module.authorize.util - -import com.mogo.module.common.utils.CarSeries.* - -fun isDeviceOfD(): Boolean { - return when (getSeries()) { - CAR_SERIES_D80X, CAR_SERIES_D81X, CAR_SERIES_D82X, CAR_SERIES_D84X -> true - else -> false - } -} \ No newline at end of file From f9183115cb8c147fa8e3d9f0d4f9078790365ace Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Sep 2020 20:04:28 +0800 Subject: [PATCH 3/5] remove deviceUtil --- .../main/java/com/mogo/module/guide/util/DeviceUtil.kt | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/DeviceUtil.kt diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/DeviceUtil.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/DeviceUtil.kt deleted file mode 100644 index 970611850e..0000000000 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/DeviceUtil.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.mogo.module.guide.util - -import com.mogo.module.common.utils.CarSeries.* - -fun isDeviceOfD(): Boolean { - return when (getSeries()) { - CAR_SERIES_D80X, CAR_SERIES_D81X, CAR_SERIES_D82X, CAR_SERIES_D84X -> true - else -> false - } -} \ No newline at end of file From 89f715d6f4c2499239b4db14f301bd99908682ad Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 25 Sep 2020 10:39:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=8D=E6=B3=A8=E5=86=8C=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/adapter/holder/V2XRoadEventVH.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index 5f24ee6022..75b246063c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -2,6 +2,7 @@ package com.mogo.module.v2x.adapter.holder; import android.content.Intent; import android.text.TextUtils; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -52,6 +53,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; * @author donghongyu */ public class V2XRoadEventVH extends V2XBaseViewHolder { + private static final String TAG = "V2XRoadEventVH"; private MogoImageView ivEventImg; private MogoImageView ivReportHead; private ImageView ivEventPlay; @@ -161,7 +163,16 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { @Override public void onViewDetachedFromWindow(View v) { -// Logger.w(MODULE_NAME, "列表View V2XRoadEventDetailVH 触发 onViewDetachedFromWindow"); + Log.d(TAG,"onViewDetachedFromWindow unRegister"); + // 反注册语音交互 + V2XVoiceManager.INSTANCE + .unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CALL_CHATTING) + .unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_ZAN) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_ZAN_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_FEEDBACK_TRUE) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_FEEDBACK_ERROR) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP); } }); } From b12416edd8d988c6ca9d09ac07935f2163f943a3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Sep 2020 11:13:16 +0800 Subject: [PATCH 5/5] changed the sp_guide to module_common --- .idea/misc.xml | 2 +- .../com/mogo/commons/debug/DebugConfig.java | 6 ----- gradle.properties | 2 +- .../authorize/util/SharedPreferenceUtil.kt | 2 +- .../com/mogo/module/common/utils/SPConst.java | 22 +++++++++++++++++++ .../extensions/entrance/EntranceFragment.java | 4 ++-- .../com/mogo/module/guide/GuideBizManager.kt | 2 ++ .../module/guide/util/SharedPreferenceUtil.kt | 11 +++++++--- .../service/impl/adas/MogoADASController.java | 8 +------ 9 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java 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 0b86cc6de1..59f680eff2 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 @@ -251,12 +251,6 @@ public class DebugConfig { DebugConfig.sRoadEventAnimated = sRoadEventAnimated; } - private static String SP_GUIDE = "SP_GUIDE_2020_09_09"; - - public static String getSpGuide() { - return SP_GUIDE; - } - private static boolean isSkinSupported = false; public static void setSkinSupported( boolean isSkinSupported ) { diff --git a/gradle.properties b/gradle.properties index 8185180f2a..759e45f8cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -101,7 +101,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.7.1 +CARCHATTING_VERSION=1.7.3 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.4.1 # loglib 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 6418cae142..9262e0184b 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,7 +1,7 @@ package com.mogo.module.authorize.util import com.mogo.commons.AbsMogoApplication -import com.mogo.commons.debug.DebugConfig.getSpGuide +import com.mogo.module.common.utils.SPConst.getSpGuide import com.mogo.utils.storage.SharedPrefsMgr object SharedPreferenceUtil { diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java new file mode 100644 index 0000000000..36ed5551d0 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java @@ -0,0 +1,22 @@ +package com.mogo.module.common.utils; + +/** + * 多模块之间SP状态公共类 + */ +public class SPConst { + + private static String SP_GUIDE = "SP_GUIDE_2020_09_09"; + + //用于多模块之间引导状态判断 + public static String getSpGuide() { + return SP_GUIDE; + } + + private static String SP_GUIDE_FIRST_TIME_RECORD = "SP_GUIDE_FIRST_TIME_RECORD"; + + //用于多模块之间首次引导时间记录 + public static String getSPGuideRecord(){ + return SP_GUIDE_FIRST_TIME_RECORD; + } + +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 83e4e1752c..16e297a17d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.graphics.Rect; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -74,6 +73,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; +import static com.mogo.module.common.utils.SPConst.getSpGuide; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_TIME; import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT; @@ -354,7 +354,7 @@ public class EntranceFragment extends MvpFragment