add deviceType condition

modules/mogo-module-authorize/build.gradle

@@ -57,10 +57,12 @@ dependencies {
         implementation rootProject.ext.dependencies.mogoutils
         implementation rootProject.ext.dependencies.mogocommons
         implementation rootProject.ext.dependencies.mogoserviceapi
+        implementation rootProject.ext.dependencies.modulecommon
     } else {
         implementation project(":foudations:mogo-utils")
         implementation project(":foudations:mogo-commons")
         implementation project(':services:mogo-service-api')
+        implementation project(":modules:mogo-module-common")
     }
 }
 

modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt

@@ -6,6 +6,7 @@ import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListen
 import com.mogo.module.authorize.model.proxy.AuthorizeProxy
 import com.mogo.module.authorize.model.proxy.toAuthorizeType
 import com.mogo.module.authorize.util.SharedPreferenceUtil.needAuthorization
+import com.mogo.module.authorize.util.isDeviceOfD
 import com.mogo.utils.logger.Logger
 
 open abstract class MogoAuthorizeManagerImpl : IMogoAuthorizeInvoke {
@@ -17,9 +18,13 @@ open abstract class MogoAuthorizeManagerImpl : IMogoAuthorizeInvoke {
     private val baseController: IMogoAuthorizeController by lazy { IMogoAuthorizeController() }
 
     override fun needAuthorize(tag: String): Boolean {
-        Logger.d(TAG, "needAuthorize update agreement in background")
-        baseController.updateAgreementVersion(tag.toAuthorizeType())
-        return needAuthorization(tag.toAuthorizeType())
+        return if (isDeviceOfD()) {
+            Logger.d(TAG, "needAuthorize update agreement in background")
+            baseController.updateAgreementVersion(tag.toAuthorizeType())
+            needAuthorization(tag.toAuthorizeType())
+        } else {
+            false
+        }
     }
 
     override fun invokeAuthorizeContent(tag: String) {

modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt

@@ -14,6 +14,7 @@ import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant.Companion
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN
 import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow
 import com.mogo.module.authorize.util.SharedPreferenceUtil.hasGuide
+import com.mogo.module.authorize.util.isDeviceOfD
 import com.mogo.service.module.IMogoModuleLifecycle
 import com.mogo.service.module.IMogoModuleProvider
 import com.mogo.service.module.ModuleType
@@ -63,10 +64,10 @@ class MogoAuthorizeProvider : IMogoModuleProvider {
     }
 
     override fun init(context: Context?) {
-        if (hasGuide() && mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) {
+        if (isDeviceOfD() && hasGuide() && mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) {
             mogoAuthShow.invokeAuthorizeForShow()
         } else {
-            Logger.d(TAG, "wait for guide invoke")
+            Logger.d(TAG, "not do match self startUp condition ,wait for someone invoke")
         }
     }
 

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

@@ -0,0 +1,10 @@
+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-guide/build.gradle

@@ -59,12 +59,14 @@ dependencies {
         implementation rootProject.ext.dependencies.moduleservice
         implementation rootProject.ext.dependencies.mogoserviceapi
         implementation rootProject.ext.dependencies.mogomoduleauth
+        implementation rootProject.ext.dependencies.modulecommon
     } else {
         implementation project(":foudations:mogo-utils")
         implementation project(":foudations:mogo-commons")
         implementation project(":modules:mogo-module-service")
         implementation project(':services:mogo-service-api')
         implementation project(':modules:mogo-module-authorize')
+        implementation project(":modules:mogo-module-common")
     }
 }
 

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

@@ -4,6 +4,9 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN
 import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager
+import com.mogo.module.common.utils.CarSeries
+import com.mogo.module.common.utils.CarSeries.CAR_SERIES_C80X
+import com.mogo.module.common.utils.CarSeries.CAR_SERIES_F80X
 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

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

@@ -11,10 +11,12 @@ import com.mogo.map.marker.IMogoMarkerClickListener
 import com.mogo.map.navi.IMogoNaviListener
 import com.mogo.module.guide.GuideConstant.Companion.PATH_GUIDE_FRAGMENT
 import com.mogo.module.guide.GuideConstant.Companion.PATH_GUIDE_MODULE_NAME
+import com.mogo.module.guide.util.isDeviceOfD
 import com.mogo.service.module.IMogoModuleLifecycle
 import com.mogo.service.module.IMogoModuleProvider
 import com.mogo.service.module.ModuleType
 import com.mogo.utils.UiThreadHandler
+import com.mogo.utils.logger.Logger
 
 @Route(path = PATH_GUIDE_FRAGMENT)
 class MogoGuideProvider : IMogoModuleProvider {
@@ -59,9 +61,14 @@ class MogoGuideProvider : IMogoModuleProvider {
     }
 
     override fun init(context: Context?) {
-        UiThreadHandler.postDelayed({
-            GuideBizManager.init()
-        }, 5000L)
+        if (isDeviceOfD()) {
+            UiThreadHandler.postDelayed({
+                GuideBizManager.init()
+            }, 5000L)
+        } else {
+            Logger.d("MogoGuideProvider", "device type is not D")
+        }
+
     }
 
     override fun getAppPackage(): String? {

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

@@ -42,7 +42,6 @@ class GuideFragment : MvpFragment<GuideConstract.View, GuidePresenter>(), GuideC
     fun closeGuideFragment() {
         Logger.d(TAG, "closeGuideFragment")
         destroy()
-        invokeAuthorize()
     }
 
     private fun destroy() {

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

@@ -0,0 +1,10 @@
+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
+    }
+}