Merge remote-tracking branch 'origin/dev' into dev

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

app/build.gradle

@@ -114,8 +114,6 @@ android {
             manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue]
             // 是否使用高德sdk自定义导航
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
-            // 是否加载引导模块
-            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
             // 是否支持换肤
             buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
             // 是否支持查询导航目的地车友
@@ -136,8 +134,6 @@ android {
             manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue]
             // 是否使用高德sdk自定义导航
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
-            // 是否加载引导模块
-            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
             // 是否支持换肤
             buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
             // 是否支持查询导航目的地车友
@@ -158,8 +154,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'
             // 是否支持查询导航目的地车友
@@ -180,8 +174,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'
             // 是否支持查询导航目的地车友
@@ -202,8 +194,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'
             // 是否支持查询导航目的地车友
@@ -224,8 +214,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'
             // 是否支持查询导航目的地车友
@@ -246,8 +234,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'
             // 是否支持查询导航目的地车友
@@ -266,8 +252,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'
             // 是否支持查询导航目的地车友
@@ -288,8 +272,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'
             // 是否支持查询导航目的地车友
@@ -310,8 +292,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'
             // 是否支持查询导航目的地车友

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 ) {

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

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)

modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt

@@ -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
-    }
-}

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 {

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;
+    }
+
+}

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;
@@ -358,7 +358,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         debugTopView();
 
-        boolean isShowGuide = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(DebugConfig.getSpGuide(), false);
+        boolean isShowGuide = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(getSpGuide(), false);
         Logger.d(TAG, " isShowGuide = " + isShowGuide);
         if (isShowGuide) {
             UiThreadHandler.postDelayed(() -> {

modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt

@@ -11,6 +11,7 @@ import com.mogo.module.guide.GuideConstant.Companion.PATH_GUIDE_MODULE_NAME
 import com.mogo.module.guide.fragment.GuideFragment
 import com.mogo.module.guide.util.SharedPreferenceUtil.hasGuide
 import com.mogo.module.guide.util.SharedPreferenceUtil.setGuideFinish
+import com.mogo.module.guide.util.SharedPreferenceUtil.setGuideRecord
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
 import com.mogo.service.fragmentmanager.FragmentDescriptor
@@ -48,6 +49,7 @@ object GuideBizManager {
     fun removeGuideFragmentToStack() {
         Logger.d("GuideBizManager", "removeGuideFragmentToStack")
         setGuideFinish()
+        setGuideRecord()
         serviceApi?.let {
             it.fragmentManagerApi.pop()
         }

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<IView, Presenter<IView>> {
 
@@ -25,7 +28,9 @@ class GuideStageFiveFragment : MvpFragment<IView, Presenter<IView>> {
     }
 
     override fun initViews() {
-
+        if(!DebugConfig.isLauncher()){
+            moduleGuidePageFive.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_five)
+        }
     }
 
     override fun onResume() {

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<IView, Presenter<IView>> {
 
@@ -25,7 +28,9 @@ class GuideStageFourFragment : MvpFragment<IView, Presenter<IView>> {
     }
 
     override fun initViews() {
-
+        if(!DebugConfig.isLauncher()){
+            moduleGuidePageFour.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_four)
+        }
     }
 
     override fun onResume() {

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<IView, Presenter<IView>> {
@@ -27,6 +29,9 @@ class GuideStageOneFragment : MvpFragment<IView, Presenter<IView>> {
 
     override fun initViews() {
         containerFragment?.visibleRight()
+        if(!DebugConfig.isLauncher()){
+            moduleGuidePageOne.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_one)
+        }
     }
 
     override fun onResume() {

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<IView, Presenter<IView>> {
 
@@ -25,7 +28,9 @@ class GuideStageThreeFragment : MvpFragment<IView, Presenter<IView>> {
     }
 
     override fun initViews() {
-
+        if(!DebugConfig.isLauncher()){
+            moduleGuidePageThree.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_three)
+        }
     }
 
     override fun onResume() {

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<IView, Presenter<IView>> {
 
@@ -25,7 +28,9 @@ class GuideStageTwoFragment : MvpFragment<IView, Presenter<IView>> {
     }
 
     override fun initViews() {
-
+        if(!DebugConfig.isLauncher()){
+            moduleGuidePageTwo.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_two)
+        }
     }
 
     override fun onResume() {

modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/DeviceUtil.kt

@@ -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
-    }
-}

modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/SharedPreferenceUtil.kt

@@ -1,17 +1,22 @@
 package com.mogo.module.guide.util
 
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.commons.debug.DebugConfig
+import com.mogo.module.common.utils.SPConst.getSPGuideRecord
+import com.mogo.module.common.utils.SPConst.getSpGuide
 import com.mogo.utils.storage.SharedPrefsMgr
 
 object SharedPreferenceUtil {
 
     fun hasGuide(): Boolean {
-        return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(DebugConfig.getSpGuide(), false)
+        return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(getSpGuide(), false)
     }
 
     fun setGuideFinish() {
-        SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putBoolean(DebugConfig.getSpGuide(), true)
+        SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putBoolean(getSpGuide(), true)
+    }
+
+    fun setGuideRecord() {
+        SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putLong(getSPGuideRecord(), System.currentTimeMillis())
     }
 
 }

modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_five.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/moduleGuidePageFive"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/module_guide_item_stage_five">
+    android:background="@mipmap/module_guide_item_stage_five_launcher">
 
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_four.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/moduleGuidePageFour"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/module_guide_item_stage_four">
+    android:background="@mipmap/module_guide_item_stage_four_launcher">
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_one.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/moduleGuidePageOne"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/module_guide_item_stage_one">
+    android:background="@mipmap/module_guide_item_stage_one_launcher">
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_three.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/moduleGuidePageThree"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/module_guide_item_stage_three">
+    android:background="@mipmap/module_guide_item_stage_three_launcher">
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-guide/src/main/res/layout/module_guide_item_stage_two.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/moduleGuidePageTwo"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/module_guide_item_stage_two">
+    android:background="@mipmap/module_guide_item_stage_two_launcher">
 </androidx.constraintlayout.widget.ConstraintLayout>

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<V2XEventShowEntity> {
+    private static final String TAG = "V2XRoadEventVH";
     private MogoImageView ivEventImg;
     private MogoImageView ivReportHead;
     private ImageView ivEventPlay;
@@ -161,7 +163,16 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
 
             @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);
             }
         });
     }

services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

@@ -5,22 +5,16 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
-import android.os.RemoteException;
 import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoOverlayManager;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.utils.CarSeries;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
-import com.mogo.service.impl.MogoServiceApis;
 import com.mogo.service.impl.singleton.SingletonsHolder;
-import com.mogo.service.impl.statusmanager.MogoStatusManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.skin.support.SkinMode;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
@@ -35,7 +29,7 @@ import org.json.JSONObject;
 
 import java.util.List;
 
-import static com.mogo.commons.debug.DebugConfig.getSpGuide;
+import static com.mogo.module.common.utils.SPConst.getSpGuide;
 
 /**
  * @author congtaowang