Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd

app/proguard-rules.pro

@@ -335,6 +335,7 @@
 
 #-----ZhiDaoService-----
 -keep class com.zhidao.auto.platform.**{*;}
+-keep class com.zhidao.auto.carcorder.**{*;}
 -keep class com.zhidaohulian.**{*;}
 -keep class com.zhidao.boot.**{*;}
 -keep class com.elegant.**{*;}

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -58,11 +58,12 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );
 
         //运营位卡片，需要默认显示，放在第一个加载
-        if ( DebugConfig.isLauncher() ) {
+        if (DebugConfig.isLauncher() ) {
             MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
         }
-
-        MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
+        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){
+            MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
+        }
         MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) );
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) );
 

gradle.properties

@@ -63,9 +63,9 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.1.6
+MOGO_MODULE_TANLU_VERSION=1.3.1.11
 # 车聊聊
-CARCHATTING_VERSION=1.4.6
+CARCHATTING_VERSION=1.4.8
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.3.4
 # 视频引导
@@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.1.6
+TANLULIB_VERSION=1.3.1.11
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块

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

@@ -15,7 +15,6 @@ import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Compani
 import com.mogo.service.MogoServicePaths
 import com.mogo.service.auth.IMogoAuthManager
 import com.mogo.service.module.IMogoModuleLifecycle
-import com.mogo.service.module.ModuleType
 import com.mogo.utils.logger.Logger
 
 @Route(path = MogoServicePaths.PATH_AGREEMENT)
@@ -63,7 +62,7 @@ class MogoAuthorizeProvider : IMogoAuthManager {
         return null
     }
 
-    override fun resetContext(context: Context?) {
+    override fun showAuth(context: Context?) {
         mContext = context
         if (mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) {
             mogoAuthShow.invokeAuthorizeForShow(mContext!!)
@@ -74,11 +73,14 @@ class MogoAuthorizeProvider : IMogoAuthManager {
         }
     }
 
+    override fun dismiss() {
+        mogoAuthShow.hideAuthorizeView()
+    }
+
     override fun init(context: Context) {
         //todo 引导判断暂时去掉  后续引导流程更改完再放开
 //       todo  if (isDeviceOfD() && hasGuide() && mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) {
         // todo F系列暂时没有授权功能 1.1需求中添加 全量上
-
     }
 
     override fun getAppPackage(): String? {

modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt

@@ -68,7 +68,9 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog
     }
 
     fun hideAuthorizeView() {
-        authorizeDialog?.dismiss()
+        if (authorizeDialog != null && authorizeDialog!!.isShowing) {
+            authorizeDialog?.dismiss()
+        }
     }
 
     private fun pushLayoutToMainWindow(tag: String) {

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -115,7 +115,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
         }
         mServiceApis.getShareManager().resetContext(this);
-        mServiceApis.getAuthManagerApi().resetContext(this);
+        mServiceApis.getAuthManagerApi().showAuth(this);
         mMogoStatusManager = mServiceApis.getStatusManagerApi();
         mMogoStatusManager.setMainPageLaunchedStatus( TAG, true );
         AutopilotServiceManage.getInstance().init( getContext() );
@@ -245,6 +245,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         super.onPause();
         mMogoStatusManager.setMainPageResumeStatus( TAG, false );
         mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
+        mServiceApis.getAuthManagerApi().dismiss();
         if ( shouldCloseADASPanel() ) {
             mServiceApis.getAdasControllerApi().closeADAS();
         }